From 0137cdda07d31eb3f741c598242313fa23fe78d8 Mon Sep 17 00:00:00 2001 From: Igor Yalovoy Date: Tue, 1 Jun 2021 21:03:00 +0300 Subject: [PATCH] Fix typo --- deployments/deploy-mainnet-31042021.log | 16 ++++++++-------- deployments/migrations/000-controller.js | 4 ++-- deployments/migrations/004-treasury.js | 4 ++-- deployments/migrations/005-garden-valuer.js | 4 ++-- deployments/migrations/006-gate.js | 6 +++--- deployments/migrations/007-garden-factory.js | 2 +- deployments/migrations/008-strategy-factory.js | 6 +++--- deployments/migrations/010-oracle.js | 4 ++-- deployments/migrations/011-kyber.js | 4 ++-- deployments/migrations/012-inch.js | 4 ++-- deployments/migrations/013-balancer.js | 4 ++-- deployments/migrations/014-uniswap.js | 4 ++-- deployments/migrations/015-sushiswap.js | 4 ++-- deployments/migrations/016-inch-pool.js | 4 ++-- deployments/migrations/017-yearn.js | 4 ++-- deployments/migrations/018-harvest.js | 4 ++-- deployments/migrations/019-compound.js | 4 ++-- deployments/migrations/020-aave.js | 4 ++-- deployments/migrations/021-buy-operation.js | 6 +++--- .../migrations/022-add-liquidity-operation.js | 6 +++--- .../migrations/023-deposit-vault-operation.js | 6 +++--- deployments/migrations/024-lend-operation.js | 6 +++--- deployments/migrations/025-gardennft.js | 4 ++-- deployments/migrations/026-strategynft.js | 6 +++--- 24 files changed, 60 insertions(+), 60 deletions(-) diff --git a/deployments/deploy-mainnet-31042021.log b/deployments/deploy-mainnet-31042021.log index 6540c2bac..d8ebeb630 100644 --- a/deployments/deploy-mainnet-31042021.log +++ b/deployments/deploy-mainnet-31042021.log @@ -3,12 +3,12 @@ contracts/PriceOracle.sol -> Deploy -> Done -> Set contracts/gardens/Garden.sol -> Deploy -> Done contracts/gardens/GardenFactory.sol -> Deploy -> Done -> Set contracts/integrations/passive/HarvestVaultIntegration.sol -> Deploy -> Done -> Set -contracts/integrations/trade/OneInchTradeIntegration.sol -> Deploy -> Done +contracts/integrations/trade/OneInchTradeIntegration.sol -> Deploy -> Done -> Set contracts/strategies/Strategy.sol -> Deploy -> Done -contracts/strategies/StrategyFactory.sol -> Deploy -> Done -contracts/strategies/StrategyNFT.sol -> Deploy -> Done -contracts/token/RewardsDistributor.sol -> Deploy -> Done -contracts/strategies/operations/AddLiquidityOperation.sol -> Deploy -> Done -contracts/strategies/operations/BuyOperation.sol -> Deploy -> Done -contracts/strategies/operations/DepositVaultOperation.sol -> Deploy -> Done -contracts/strategies/operations/LendOperation.sol -> Deploy -> Done +contracts/strategies/StrategyFactory.sol -> Deploy -> Done -> Set +contracts/strategies/StrategyNFT.sol -> Deploy -> Done -> Set +contracts/token/RewardsDistributor.sol -> Deploy -> Done -> Set +contracts/strategies/operations/AddLiquidityOperation.sol -> Deploy -> Done -> Set +contracts/strategies/operations/BuyOperation.sol -> Deploy -> Done -> Set +contracts/strategies/operations/DepositVaultOperation.sol -> Deploy -> Done -> Set +contracts/strategies/operations/LendOperation.sol -> Deploy -> Done -> Set diff --git a/deployments/migrations/000-controller.js b/deployments/migrations/000-controller.js index 6e2c4a15b..b3532b7be 100644 --- a/deployments/migrations/000-controller.js +++ b/deployments/migrations/000-controller.js @@ -10,7 +10,7 @@ module.exports = async ({ const { deployer } = await getNamedAccounts(); const signers = await ethers.getSigners(); const chainId = await getChainId(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); if (chainId === '31337') { @@ -29,7 +29,7 @@ module.exports = async ({ }, ); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); if (!(await controllerContract.isValidReserveAsset('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'))) { console.log('Setting reserve asset to WETH'); diff --git a/deployments/migrations/004-treasury.js b/deployments/migrations/004-treasury.js index e06a25938..995934f8f 100644 --- a/deployments/migrations/004-treasury.js +++ b/deployments/migrations/004-treasury.js @@ -9,12 +9,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'Treasury'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/005-garden-valuer.js b/deployments/migrations/005-garden-valuer.js index 33efe4ae3..14dd3e0df 100644 --- a/deployments/migrations/005-garden-valuer.js +++ b/deployments/migrations/005-garden-valuer.js @@ -9,12 +9,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'GardenValuer'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/006-gate.js b/deployments/migrations/006-gate.js index 559590d37..7859deb2c 100644 --- a/deployments/migrations/006-gate.js +++ b/deployments/migrations/006-gate.js @@ -9,12 +9,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'IshtarGate'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, @@ -27,7 +27,7 @@ module.exports = async ({ console.log(`Setting ishtar gate on controller ${deployment.address}`); await (await controllerContract.editIshtarGate(deployment.address, { gasPrice })).wait(); - const ishtarGate = await ethers.getContractAt('IshtarGate', deployment.address, singer); + const ishtarGate = await ethers.getContractAt('IshtarGate', deployment.address, signer); for (const address of [ '0x83f4622A18e38bE297e089fB055Dd5123bb0b279', '0x21584Cc5a52102AbB381286a5119E3be08431CfD', diff --git a/deployments/migrations/007-garden-factory.js b/deployments/migrations/007-garden-factory.js index d2242f640..3b6cd7116 100644 --- a/deployments/migrations/007-garden-factory.js +++ b/deployments/migrations/007-garden-factory.js @@ -9,7 +9,7 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer, owner } = await getNamedAccounts(); - const signer = await getSigner(signer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const gardenFactoryContract = 'GardenFactory'; diff --git a/deployments/migrations/008-strategy-factory.js b/deployments/migrations/008-strategy-factory.js index 5051d285b..d5e7a59c1 100644 --- a/deployments/migrations/008-strategy-factory.js +++ b/deployments/migrations/008-strategy-factory.js @@ -8,8 +8,8 @@ module.exports = async ({ getRapid, }) => { const { deploy } = deployments; - const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const { deployer, owner } = await getNamedAccounts(); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const strategyFactoryContract = 'StrategyFactory'; @@ -17,7 +17,7 @@ module.exports = async ({ const beaconContract = 'StrategyBeacon'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const strategy = await deploy(strategyContract, { from: deployer, diff --git a/deployments/migrations/010-oracle.js b/deployments/migrations/010-oracle.js index ead5a2e55..2e90db40b 100644 --- a/deployments/migrations/010-oracle.js +++ b/deployments/migrations/010-oracle.js @@ -11,11 +11,11 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const contract = 'PriceOracle'; const uniswapTWAPv3 = await deployments.get('UniswapTWAPV3'); diff --git a/deployments/migrations/011-kyber.js b/deployments/migrations/011-kyber.js index fb79f7d00..bd34abe9e 100644 --- a/deployments/migrations/011-kyber.js +++ b/deployments/migrations/011-kyber.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'KyberTradeIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/012-inch.js b/deployments/migrations/012-inch.js index 3f455bc70..36fae0375 100644 --- a/deployments/migrations/012-inch.js +++ b/deployments/migrations/012-inch.js @@ -11,7 +11,7 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer, owner } = await getNamedAccounts(); - const signer = await getSigner(owner); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'OneInchTradeIntegration'; @@ -25,7 +25,7 @@ module.exports = async ({ gasPrice, }); - if (!deployment.newlyDeployed) { + if (deployment.newlyDeployed) { console.log(`Adding integration ${contract}(${deployment.address}) to BabController`); await ( await controllerContract.addIntegration( diff --git a/deployments/migrations/013-balancer.js b/deployments/migrations/013-balancer.js index 7969b01c4..b46e8fa65 100644 --- a/deployments/migrations/013-balancer.js +++ b/deployments/migrations/013-balancer.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'BalancerIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/014-uniswap.js b/deployments/migrations/014-uniswap.js index c71702aa3..1a90561ae 100644 --- a/deployments/migrations/014-uniswap.js +++ b/deployments/migrations/014-uniswap.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'UniswapPoolIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/015-sushiswap.js b/deployments/migrations/015-sushiswap.js index c3545432c..f87ba1950 100644 --- a/deployments/migrations/015-sushiswap.js +++ b/deployments/migrations/015-sushiswap.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'SushiswapPoolIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/016-inch-pool.js b/deployments/migrations/016-inch-pool.js index 9a0b50b7a..f4d6e0882 100644 --- a/deployments/migrations/016-inch-pool.js +++ b/deployments/migrations/016-inch-pool.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'OneInchPoolIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/017-yearn.js b/deployments/migrations/017-yearn.js index add2e97c1..c3ac40e7e 100644 --- a/deployments/migrations/017-yearn.js +++ b/deployments/migrations/017-yearn.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'YearnVaultIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/018-harvest.js b/deployments/migrations/018-harvest.js index 9f8d14db1..a31e6e219 100644 --- a/deployments/migrations/018-harvest.js +++ b/deployments/migrations/018-harvest.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer, owner } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'HarvestVaultIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/019-compound.js b/deployments/migrations/019-compound.js index c7e12c2f3..8019662ce 100644 --- a/deployments/migrations/019-compound.js +++ b/deployments/migrations/019-compound.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'CompoundLendIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/020-aave.js b/deployments/migrations/020-aave.js index b1716900a..374375b4a 100644 --- a/deployments/migrations/020-aave.js +++ b/deployments/migrations/020-aave.js @@ -11,12 +11,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'AaveLendIntegration'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/021-buy-operation.js b/deployments/migrations/021-buy-operation.js index 657514f27..510a95d92 100644 --- a/deployments/migrations/021-buy-operation.js +++ b/deployments/migrations/021-buy-operation.js @@ -8,13 +8,13 @@ module.exports = async ({ getRapid, }) => { const { deploy } = deployments; - const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const { deployer, owner } = await getNamedAccounts(); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'BuyOperation'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/022-add-liquidity-operation.js b/deployments/migrations/022-add-liquidity-operation.js index 26389b0d3..de1e0930b 100644 --- a/deployments/migrations/022-add-liquidity-operation.js +++ b/deployments/migrations/022-add-liquidity-operation.js @@ -8,13 +8,13 @@ module.exports = async ({ getRapid, }) => { const { deploy } = deployments; - const { deployer } = await getNamedAccounts(); + const { deployer, owner } = await getNamedAccounts(); const gasPrice = await getRapid(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const contract = 'AddLiquidityOperation'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/023-deposit-vault-operation.js b/deployments/migrations/023-deposit-vault-operation.js index 0ae260c07..97e7bf9fd 100644 --- a/deployments/migrations/023-deposit-vault-operation.js +++ b/deployments/migrations/023-deposit-vault-operation.js @@ -8,13 +8,13 @@ module.exports = async ({ getRapid, }) => { const { deploy } = deployments; - const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const { deployer, owner } = await getNamedAccounts(); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'DepositVaultOperation'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/024-lend-operation.js b/deployments/migrations/024-lend-operation.js index cfdd674f8..935ca6f5c 100644 --- a/deployments/migrations/024-lend-operation.js +++ b/deployments/migrations/024-lend-operation.js @@ -8,13 +8,13 @@ module.exports = async ({ getRapid, }) => { const { deploy } = deployments; - const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const { deployer, owner } = await getNamedAccounts(); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'LendOperation'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/025-gardennft.js b/deployments/migrations/025-gardennft.js index a56ca7d8b..17355c07e 100644 --- a/deployments/migrations/025-gardennft.js +++ b/deployments/migrations/025-gardennft.js @@ -9,12 +9,12 @@ module.exports = async ({ }) => { const { deploy } = deployments; const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'GardenNFT'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer, diff --git a/deployments/migrations/026-strategynft.js b/deployments/migrations/026-strategynft.js index 9d38758a4..c914c04b8 100644 --- a/deployments/migrations/026-strategynft.js +++ b/deployments/migrations/026-strategynft.js @@ -8,13 +8,13 @@ module.exports = async ({ getRapid, }) => { const { deploy } = deployments; - const { deployer } = await getNamedAccounts(); - const singer = await getSigner(deployer); + const { deployer, owner } = await getNamedAccounts(); + const signer = await getSigner(deployer); const gasPrice = await getRapid(); const contract = 'StrategyNFT'; const controller = await deployments.get('BabControllerProxy'); - const controllerContract = await ethers.getContractAt('BabController', controller.address, singer); + const controllerContract = await ethers.getContractAt('BabController', controller.address, signer); const deployment = await deploy(contract, { from: deployer,