From 510d07dc481dbda3cedb03e76eb85dc0be79dd07 Mon Sep 17 00:00:00 2001
From: Igor Yalovoy <to@ylv.io>
Date: Tue, 1 Jun 2021 19:57:59 +0300
Subject: [PATCH] Prettify code

---
 deployments/deploy-mainnet-31042021.log        | 6 +++---
 deployments/migrations/005-garden-valuer.js    | 1 -
 deployments/migrations/007-garden-factory.js   | 7 +++----
 deployments/migrations/008-strategy-factory.js | 1 -
 deployments/migrations/012-inch.js             | 8 ++++----
 deployments/migrations/018-harvest.js          | 2 +-
 deployments/migrations/025-gardennft.js        | 1 -
 lib/plugins/upgrades.js                        | 6 +++++-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/deployments/deploy-mainnet-31042021.log b/deployments/deploy-mainnet-31042021.log
index ae5b6dfce..6540c2bac 100644
--- a/deployments/deploy-mainnet-31042021.log
+++ b/deployments/deploy-mainnet-31042021.log
@@ -1,8 +1,8 @@
 contracts/BabController.sol -> Upgrade -> Done
-contracts/PriceOracle.sol -> Deploy -> Done
+contracts/PriceOracle.sol -> Deploy -> Done -> Set
 contracts/gardens/Garden.sol -> Deploy -> Done
-contracts/gardens/GardenFactory.sol -> Deploy -> Done
-contracts/integrations/passive/HarvestVaultIntegration.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/strategies/Strategy.sol -> Deploy -> Done
 contracts/strategies/StrategyFactory.sol -> Deploy -> Done
diff --git a/deployments/migrations/005-garden-valuer.js b/deployments/migrations/005-garden-valuer.js
index e3a2e9896..33efe4ae3 100644
--- a/deployments/migrations/005-garden-valuer.js
+++ b/deployments/migrations/005-garden-valuer.js
@@ -23,7 +23,6 @@ module.exports = async ({
     gasPrice,
   });
 
-
   if (deployment.newlyDeployed) {
     console.log(`Setting garden valuer on controller ${deployment.address}`);
     await (await controllerContract.editGardenValuer(deployment.address, { gasPrice })).wait();
diff --git a/deployments/migrations/007-garden-factory.js b/deployments/migrations/007-garden-factory.js
index 1548b1d88..d2242f640 100644
--- a/deployments/migrations/007-garden-factory.js
+++ b/deployments/migrations/007-garden-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(signer);
   const gasPrice = await getRapid();
 
   const gardenFactoryContract = 'GardenFactory';
@@ -17,7 +17,7 @@ module.exports = async ({
   const beaconContract = 'GardenBeacon';
 
   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 garden = await deploy(gardenContract, {
     from: deployer,
@@ -60,4 +60,3 @@ module.exports = async ({
 };
 
 module.exports.tags = ['GardenFactory'];
-module.exports.dependencies = ['Controller'];
diff --git a/deployments/migrations/008-strategy-factory.js b/deployments/migrations/008-strategy-factory.js
index a54d5cd3c..5051d285b 100644
--- a/deployments/migrations/008-strategy-factory.js
+++ b/deployments/migrations/008-strategy-factory.js
@@ -41,7 +41,6 @@ module.exports = async ({
     gasPrice,
   });
 
-
   if (strategyFactory.newlyDeployed) {
     console.log(`Setting strategy factory on controller ${strategyFactory.address}`);
     await (await controllerContract.editStrategyFactory(strategyFactory.address, { gasPrice })).wait();
diff --git a/deployments/migrations/012-inch.js b/deployments/migrations/012-inch.js
index 39c6df9a5..3f455bc70 100644
--- a/deployments/migrations/012-inch.js
+++ b/deployments/migrations/012-inch.js
@@ -10,13 +10,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(owner);
   const gasPrice = await getRapid();
   const contract = 'OneInchTradeIntegration';
 
   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,
@@ -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/018-harvest.js b/deployments/migrations/018-harvest.js
index 3d8cc28bd..9f8d14db1 100644
--- a/deployments/migrations/018-harvest.js
+++ b/deployments/migrations/018-harvest.js
@@ -10,7 +10,7 @@ module.exports = async ({
   getRapid,
 }) => {
   const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
+  const { deployer, owner } = await getNamedAccounts();
   const singer = await getSigner(deployer);
   const gasPrice = await getRapid();
   const contract = 'HarvestVaultIntegration';
diff --git a/deployments/migrations/025-gardennft.js b/deployments/migrations/025-gardennft.js
index 791cf010b..a56ca7d8b 100644
--- a/deployments/migrations/025-gardennft.js
+++ b/deployments/migrations/025-gardennft.js
@@ -23,7 +23,6 @@ module.exports = async ({
     gasPrice,
   });
 
-
   if (deployment.newlyDeployed) {
     console.log(`Setting garden NFT on controller ${deployment.address}`);
     await (await controllerContract.editGardenNFT(deployment.address, { gasPrice })).wait();
diff --git a/lib/plugins/upgrades.js b/lib/plugins/upgrades.js
index a3174acf0..4d9ac1837 100644
--- a/lib/plugins/upgrades.js
+++ b/lib/plugins/upgrades.js
@@ -120,7 +120,11 @@ extendEnvironment((hre) => {
   const { deployments } = hre;
 
   async function getContract(contractName, deploymentName, signer) {
-    return await ethers.getContractAt(contractName, (await deployments.get(deploymentName || contractName)).address, signer);
+    return await ethers.getContractAt(
+      contractName,
+      (await deployments.get(deploymentName || contractName)).address,
+      signer,
+    );
   }
 
   hre.upgradesDeployer = {