Skip to content

Commit

Permalink
fix: Update paths on scripts imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@bingen
bingen committed Dec 13, 2024
1 parent 9938103 commit 5a34f92
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 70 deletions.
2 changes: 0 additions & 2 deletions contracts/scripts/DeployGovernance.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import {Hooks} from "V2-gov/src/utils/BaseHook.sol";

import {HookMiner} from "V2-gov/script/utils/HookMiner.sol";

import {ERC20Faucet} from "../test/TestContracts/ERC20Faucet.sol";

import "forge-std/console2.sol";

contract DeployGovernance is Script, Deployers {
Expand Down
79 changes: 40 additions & 39 deletions contracts/scripts/DeployLiquity2.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,49 +6,50 @@ import {IERC20Metadata} from "openzeppelin-contracts/contracts/token/ERC20/exten
import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
import {IERC20 as IERC20_GOV} from "openzeppelin/contracts/token/ERC20/IERC20.sol";

import {StringFormatting} from "../test/Utils/StringFormatting.sol";
import {Accounts} from "../test/TestContracts/Accounts.sol";
import {ERC20Faucet} from "../test/TestContracts/ERC20Faucet.sol";
import {ETH_GAS_COMPENSATION} from "../Dependencies/Constants.sol";
import {IBorrowerOperations} from "../Interfaces/IBorrowerOperations.sol";
import "../AddressesRegistry.sol";
import "../ActivePool.sol";
import "../BoldToken.sol";
import "../BorrowerOperations.sol";
import "../TroveManager.sol";
import "../TroveNFT.sol";
import "../CollSurplusPool.sol";
import "../DefaultPool.sol";
import "../GasPool.sol";
import "../HintHelpers.sol";
import "../MultiTroveGetter.sol";
import "../SortedTroves.sol";
import "../StabilityPool.sol";
import "../PriceFeeds/WETHPriceFeed.sol";
import "../PriceFeeds/WSTETHPriceFeed.sol";
import "../PriceFeeds/RETHPriceFeed.sol";
import "../CollateralRegistry.sol";
import "../test/TestContracts/PriceFeedTestnet.sol";
import "../test/TestContracts/MetadataDeployment.sol";
import "../Zappers/WETHZapper.sol";
import "../Zappers/GasCompZapper.sol";
import "../Zappers/LeverageLSTZapper.sol";
import "../Zappers/LeverageWETHZapper.sol";
import "../Zappers/Modules/Exchanges/HybridCurveUniV3ExchangeHelpers.sol";
import {BalancerFlashLoan} from "../Zappers/Modules/FlashLoans/BalancerFlashLoan.sol";
import "../Zappers/Modules/Exchanges/Curve/ICurveStableswapNGFactory.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/ISwapRouter.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/IQuoterV2.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Pool.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Factory.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/UniPriceConverter.sol";
import "../Zappers/Modules/Exchanges/HybridCurveUniV3Exchange.sol";
import {WETHTester} from "../test/TestContracts/WETHTester.sol";
import {StringFormatting} from "test/Utils/StringFormatting.sol";
import {Accounts} from "test/TestContracts/Accounts.sol";
import {ERC20Faucet} from "test/TestContracts/ERC20Faucet.sol";
import {ETH_GAS_COMPENSATION} from "src/Dependencies/Constants.sol";
import {IBorrowerOperations} from "src/Interfaces/IBorrowerOperations.sol";
import "src/AddressesRegistry.sol";
import "src/ActivePool.sol";
import "src/BoldToken.sol";
import "src/BorrowerOperations.sol";
import "src/TroveManager.sol";
import "src/TroveNFT.sol";
import "src/CollSurplusPool.sol";
import "src/DefaultPool.sol";
import "src/GasPool.sol";
import "src/HintHelpers.sol";
import "src/MultiTroveGetter.sol";
import "src/SortedTroves.sol";
import "src/StabilityPool.sol";
import "src/PriceFeeds/WETHPriceFeed.sol";
import "src/PriceFeeds/WSTETHPriceFeed.sol";
import "src/PriceFeeds/RETHPriceFeed.sol";
import "src/CollateralRegistry.sol";
import "test/TestContracts/PriceFeedTestnet.sol";
import "test/TestContracts/MetadataDeployment.sol";
import "src/Zappers/WETHZapper.sol";
import "src/Zappers/GasCompZapper.sol";
import "src/Zappers/LeverageLSTZapper.sol";
import "src/Zappers/LeverageWETHZapper.sol";
import "src/Zappers/Modules/Exchanges/HybridCurveUniV3ExchangeHelpers.sol";
import {BalancerFlashLoan} from "src/Zappers/Modules/FlashLoans/BalancerFlashLoan.sol";
import "src/Zappers/Modules/Exchanges/Curve/ICurveStableswapNGFactory.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/ISwapRouter.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/IQuoterV2.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Pool.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Factory.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/UniPriceConverter.sol";
import "src/Zappers/Modules/Exchanges/HybridCurveUniV3Exchange.sol";
import {WETHTester} from "test/TestContracts/WETHTester.sol";
import "forge-std/console2.sol";
import {IRateProvider, IWeightedPool, IWeightedPoolFactory} from "./Interfaces/Balancer/IWeightedPool.sol";
import {IVault} from "./Interfaces/Balancer/IVault.sol";
import {MockStakingV1} from "V2-gov/test/mocks/MockStakingV1.sol";
import {MockERC20Tester} from "V2-gov/test/mocks//MockERC20Tester.sol";

import {DeployGovernance} from "./DeployGovernance.s.sol";

Expand Down
6 changes: 3 additions & 3 deletions contracts/scripts/DeployOnlyExchangeHelpers.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";

import {Script} from "forge-std/Script.sol";

import "../Zappers/Modules/Exchanges/HybridCurveUniV3ExchangeHelpers.sol";
import "../Zappers/Modules/Exchanges/Curve/ICurveStableswapNGPool.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/IQuoterV2.sol";
import "src/Zappers/Modules/Exchanges/HybridCurveUniV3ExchangeHelpers.sol";
import "src/Zappers/Modules/Exchanges/Curve/ICurveStableswapNGPool.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/IQuoterV2.sol";

import "forge-std/console2.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/scripts/DeployOnlyGovernance.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.24;

import {DeployGovernance} from "./DeployGovernance.s.sol";

import {ERC20Faucet} from "../test/TestContracts/ERC20Faucet.sol";
import {ERC20Faucet} from "test/TestContracts/ERC20Faucet.sol";

import "forge-std/console2.sol";

Expand Down
10 changes: 5 additions & 5 deletions contracts/scripts/LiquidateTrove.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ pragma solidity 0.8.24;

import {Script} from "forge-std/Script.sol";
import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
import {IAddressesRegistry} from "../Interfaces/IAddressesRegistry.sol";
import {ICollateralRegistry} from "../Interfaces/ICollateralRegistry.sol";
import {LatestTroveData} from "../Types/LatestTroveData.sol";
import {ITroveManager} from "../Interfaces/ITroveManager.sol";
import {IPriceFeedTestnet} from "../test/TestContracts/Interfaces/IPriceFeedTestnet.sol";
import {IAddressesRegistry} from "src/Interfaces/IAddressesRegistry.sol";
import {ICollateralRegistry} from "src/Interfaces/ICollateralRegistry.sol";
import {LatestTroveData} from "src/Types/LatestTroveData.sol";
import {ITroveManager} from "src/Interfaces/ITroveManager.sol";
import {IPriceFeedTestnet} from "src/test/TestContracts/Interfaces/IPriceFeedTestnet.sol";

contract LiquidateTrove is Script {
using Strings for uint256;
Expand Down
16 changes: 8 additions & 8 deletions contracts/scripts/OpenTroves.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ pragma solidity 0.8.24;

import {Script} from "forge-std/Script.sol";
import {Clones} from "openzeppelin-contracts/contracts/proxy/Clones.sol";
import {ERC20Faucet} from "../test/TestContracts/ERC20Faucet.sol";
import {IBorrowerOperations} from "../Interfaces/IBorrowerOperations.sol";
import {ICollateralRegistry} from "../Interfaces/ICollateralRegistry.sol";
import {IHintHelpers} from "../Interfaces/IHintHelpers.sol";
import {ISortedTroves} from "../Interfaces/ISortedTroves.sol";
import {ITroveManager} from "../Interfaces/ITroveManager.sol";
import {ITroveNFT} from "../Interfaces/ITroveNFT.sol";
import {ERC20Faucet} from "test/TestContracts/ERC20Faucet.sol";
import {IBorrowerOperations} from "src/Interfaces/IBorrowerOperations.sol";
import {ICollateralRegistry} from "src/Interfaces/ICollateralRegistry.sol";
import {IHintHelpers} from "src/Interfaces/IHintHelpers.sol";
import {ISortedTroves} from "src/Interfaces/ISortedTroves.sol";
import {ITroveManager} from "src/Interfaces/ITroveManager.sol";
import {ITroveNFT} from "src/Interfaces/ITroveNFT.sol";

import {
ETH_GAS_COMPENSATION,
MAX_ANNUAL_INTEREST_RATE,
MIN_ANNUAL_INTEREST_RATE,
MIN_INTEREST_RATE_CHANGE_PERIOD
} from "../Dependencies/Constants.sol";
} from "src/Dependencies/Constants.sol";

function sqrt(uint256 y) pure returns (uint256 z) {
if (y > 3) {
Expand Down
16 changes: 8 additions & 8 deletions contracts/scripts/ProvideUniV3Liquidity.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ pragma solidity 0.8.24;
import {Script} from "forge-std/Script.sol";
import "openzeppelin-contracts/contracts/utils/math/Math.sol";

import {ERC20Faucet} from "../test/TestContracts/ERC20Faucet.sol";
import {WETHTester} from "../test/TestContracts/WETHTester.sol";

import "../Zappers/Modules/Exchanges/UniswapV3/ISwapRouter.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/IQuoterV2.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Pool.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Factory.sol";
import "../Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol";
import {ERC20Faucet} from "test/TestContracts/ERC20Faucet.sol";
import {WETHTester} from "test/TestContracts/WETHTester.sol";

import "src/Zappers/Modules/Exchanges/UniswapV3/ISwapRouter.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/IQuoterV2.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Pool.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Factory.sol";
import "src/Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol";

import "forge-std/console2.sol";

Expand Down
8 changes: 4 additions & 4 deletions contracts/scripts/RedeemCollateral.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ pragma solidity 0.8.24;
import {console} from "forge-std/console.sol";
import {Script} from "forge-std/Script.sol";
import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
import {StringFormatting} from "../test/Utils/StringFormatting.sol";
import {IBoldToken} from "../Interfaces/IBoldToken.sol";
import {ICollateralRegistry} from "../Interfaces/ICollateralRegistry.sol";
import {DECIMAL_PRECISION} from "../Dependencies/Constants.sol";
import {StringFormatting} from "test/Utils/StringFormatting.sol";
import {IBoldToken} from "src/Interfaces/IBoldToken.sol";
import {ICollateralRegistry} from "src/Interfaces/ICollateralRegistry.sol";
import {DECIMAL_PRECISION} from "src/Dependencies/Constants.sol";

contract RedeemCollateral is Script {
using Strings for *;
Expand Down

0 comments on commit 5a34f92

Please sign in to comment.