upgrade all rinkeby contracts

BendDAO · Mar 27, 2022 · c334f69 · c334f69
1 parent 0ea58c1
commit c334f69
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 56 deletions.
diff --git a/deployments/deployed-contracts-develop.json b/deployments/deployed-contracts-develop.json
@@ -93,41 +93,41 @@
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "ReserveLogic": {
-    "address": "0xa9C66965618aDb7Fe038EDa43FB02e4950661e79",
+    "address": "0x01bFC00Ec3b4f610a29AaFe1b7A1a8cb776f8A6F",
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "NftLogic": {
-    "address": "0xfDE8e984F406FBdF609064D59fEA015B854Bc890",
+    "address": "0xfe5068252eBe738e6dAFBFfEC2b3C88b7584feB7",
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "GenericLogic": {
-    "address": "0x130f11A46baf275616A91aB7Beb815EC5e0fea7a",
+    "address": "0x75f689173813bcd76F953602c0A0893a2709850E",
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "ValidationLogic": {
-    "address": "0x2B1f699E604511477242B07a93Bd9ACD348966fb",
+    "address": "0xd7f4c83900Ec3f92523cC4271fEf9e8B3a0d2d42",
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "LendPoolImpl": {
-    "address": "0xfD2Bfa1ce9d720cb75a30e8034b521945224007B"
+    "address": "0x7FE7454dFdbc266ee28D4b3230A6F9D103a4e269"
   },
   "LendPool": {
     "address": "0x7273847406a52B949F3E824fce7704E8e74244f5"
   },
   "LendPoolLiquidatorImpl": {
-    "address": "0x394bC760f3Ea2559b8aa5B2d1A6C52936056a6E4"
+    "address": "0xeA2a26e371cf6C982b77D68f44c2aae47eE46E68"
   },
   "LendPoolLiquidator": {
-    "address": "0x394bC760f3Ea2559b8aa5B2d1A6C52936056a6E4"
+    "address": "0xeA2a26e371cf6C982b77D68f44c2aae47eE46E68"
   },
   "LendPoolLoanImpl": {
-    "address": "0x967Fc83e00cDB6928b1aF87710D1C1654259F77d"
+    "address": "0xe6A56b57F95B7bb011b8DA4c769567588e451a14"
   },
   "LendPoolLoan": {
     "address": "0xfD45825533513ABfCa3D767f407C86C1c522a659"
   },
   "LendPoolConfiguratorImpl": {
-    "address": "0x58ce2dBCb05B9727ab9EbCd50CC2B93549826D9A"
+    "address": "0x3018Da417aEB6D8f173B7D06E659Ab253a6732A9"
   },
   "LendPoolConfigurator": {
     "address": "0xB941fC3ceC2E83a9Df305Cc8A3285D6E8bc29A01"
@@ -145,24 +145,22 @@
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "ReserveOracleImpl": {
-    "address": "0x4a44e0261800fE325Df5A8cf6D22e9D78C31EFE5"
+    "address": "0xD0e02704Ad463e5bF715295CeAF60658B6aA5866"
   },
   "ReserveOracle": {
     "address": "0xd30179fbB087088a77E1DD0903cCc64510287cB2"
   },
   "NFTOracleImpl": {
-    "address": "0xcFc4b72067c8a9F83DF5CeB80d0F5C4210130c4e"
+    "address": "0xe04062058c30E72F39353CadC032a9c145f398Fa"
   },
   "NFTOracle": {
     "address": "0xE283F4D306517200911F9c378aC68f020acb9f64"
   },
   "WETHGateway": {
-    "address": "0x564e1748ad5940cEA22f2a6Aa75F2849B6d22f32",
-    "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
+    "address": "0x564e1748ad5940cEA22f2a6Aa75F2849B6d22f32"
   },
   "PunkGateway": {
-    "address": "0xA979f811c3e2322845E99E8906bBB0a4f85e5A18",
-    "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
+    "address": "0xA979f811c3e2322845E99E8906bBB0a4f85e5A18"
   },
   "InterestRate": {
     "address": "0xbBbFaFACaBeEB2B3957eddf87e95434e81aeC25c",
@@ -178,21 +176,21 @@
     "address": "0xbBbFaFACaBeEB2B3957eddf87e95434e81aeC25c"
   },
   "WalletBalanceProvider": {
-    "address": "0xfa32Dc864c5348e6a1ce8844609CD63Bd866152f",
+    "address": "0x5eC4dF76fB25582132d57660AEDb70968B9DE50B",
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "BendProtocolDataProvider": {
-    "address": "0x6BC4141B9623c05f260E231Ea8500c0cEE05776a",
+    "address": "0x37D8011795d13bffe82De2d52C1552CC78fB99DD",
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "UIPoolDataProvider": {
-    "address": "0xbB72f40766CF22498d60FFdC6b402Ad575fAc512",
+    "address": "0x14EF74D00971e71A16FcEB96F552933baC1512c6",
     "deployer": "0xad93fB0e59eC703422dD38dCb7AcB8e323C8cc5B"
   },
   "PunkGatewayImpl": {
-    "address": "0xbd2F5E6C5c1430B021bEaB70dBA90F2faE0D7a49"
+    "address": "0x6C6e2504E5262b2abBedDF6Db981c3d9c66284b8"
   },
   "WETHGatewayImpl": {
-    "address": "0x440183FDddAcE7661a8027B42e09fB78Ae2b6301"
+    "address": "0x9db1f89a5573DD53c0330e880Bc106Dbe4E2537E"
   }
 }
diff --git a/deployments/deployed-contracts-rinkeby.json b/deployments/deployed-contracts-rinkeby.json
@@ -65,36 +65,35 @@
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "ReserveLogic": {
-    "address": "0xb576fe6919462341039e9E48Bc9AC52dd422d7C1",
+    "address": "0xE3328B18f501D76C652c6cBbc4A6067Adccb4104",
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "NftLogic": {
-    "address": "0x3a2aAe12a9FAEDAcd5b3AceD7d13FA8144E918fD",
+    "address": "0x5cB1FC1791C4f45a6410508fCE12B9eb4eeD59ef",
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "GenericLogic": {
-    "address": "0x3bF6Ca457Bd3C31aaA5834AED04cd4B3C50bb24f",
+    "address": "0xcAB8e6B304DB09D4D18dCd187FfC6099627F22A1",
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "ValidationLogic": {
-    "address": "0x2144F7c7748F1537631Dda56044d20481f29D2C4",
+    "address": "0x33E075aFDAE0c5a307B015A2FF904c5B10e2d3B7",
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "LendPoolImpl": {
-    "address": "0x6db251E64A24584fd8f2fBE0DAb9d737F6026473"
+    "address": "0x04B63e835Ca39EE9bA47D2AD252A6FB630B00192"
   },
   "LendPool": {
     "address": "0xa8D0e90bCB533d70067EEc37601fa7D5C5b3F13E"
   },
   "LendPoolLoanImpl": {
-    "address": "0x0E8389CC3AE38E4980B675648a640718c03aBBFC"
+    "address": "0xD6D70F62a4C312E07EE70397B63b76A87dC8E93a"
   },
   "LendPoolLoan": {
-    "address": "0xbc622a62bAC3B7de0659A0Dc7b50E4d59aF11377",
-    "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
+    "address": "0xbc622a62bAC3B7de0659A0Dc7b50E4d59aF11377"
   },
   "LendPoolConfiguratorImpl": {
-    "address": "0xd42154E69148279e697B170Aff03e91f3335404A"
+    "address": "0xbEf9f0029f3BB83080107a5268eF4b1BeF836881"
   },
   "LendPoolConfigurator": {
     "address": "0x97987245f5Cb66c1EF4A1f750eb6865931486Fd6"
@@ -112,18 +111,16 @@
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "ReserveOracleImpl": {
-    "address": "0x1F40213D227D6BdEEE8B5F68D09Af6a7baE17fF1"
+    "address": "0xe65198A9eEA6b5764bCc7Cc06E70eA32DC36D38b"
   },
   "ReserveOracle": {
-    "address": "0xEEa5BC7BEB4DD341E8BBa230E22df9CA45f0AE19",
-    "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
+    "address": "0xEEa5BC7BEB4DD341E8BBa230E22df9CA45f0AE19"
   },
   "NFTOracleImpl": {
-    "address": "0x5A0614a61781FfD636f4686537e2E8691181c32E"
+    "address": "0x129dCe9E3Bd218660AF5C2224DeBC54F577942B2"
   },
   "NFTOracle": {
-    "address": "0x04af5eF6100E1025560Be50FF244CB31f60d08c2",
-    "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
+    "address": "0x04af5eF6100E1025560Be50FF244CB31f60d08c2"
   },
   "WETHGateway": {
     "address": "0x42af361009B27Aa1Ff21f96E386795dE487D180E"
@@ -145,22 +142,22 @@
     "address": "0xcC99f8f4d833cD03763548E8F7a1AffA92C9F595"
   },
   "WalletBalanceProvider": {
-    "address": "0x88Cd6023908Da0c471e4240e9b591E4126c3dc29",
+    "address": "0x3fb2582769C555E363997Ddf0d1c29FD4a26FfA0",
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "BendProtocolDataProvider": {
-    "address": "0x1ce204D022A59c48CE5B28845C419c15283c3b80",
+    "address": "0x6a25DB7205d74adc18b998cC081CBBaACD925aAb",
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "UIPoolDataProvider": {
-    "address": "0x63D7Dfd72e291e8df962e24b9f8EcE6d18d06a5a",
+    "address": "0xd10c194Bb603907F91CC24fcCEb824870C384C1B",
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "LendPoolLiquidatorImpl": {
-    "address": "0x1F091fd39FdA1F248B9Dd0f40c59a7f6DEb61598"
+    "address": "0xbEaaFB13E019Eb517e62c237eE72b1D98112A5f7"
   },
   "LendPoolLiquidator": {
-    "address": "0x1F091fd39FdA1F248B9Dd0f40c59a7f6DEb61598"
+    "address": "0xbEaaFB13E019Eb517e62c237eE72b1D98112A5f7"
   },
   "DOODLE": {
     "address": "0x10cACFfBf3Cdcfb365FDdC4795079417768BaA74",
@@ -179,10 +176,10 @@
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "BendCollectorImpl": {
-    "address": "0x7fa1F11a10C8a9c6A646cA7B3248c244fD8bc69B"
+    "address": "0xEaE2d74a288Fc57992A133c93a84aE5F0553C6b4"
   },
   "BendCollector": {
-    "address": "0x7A02EE743Aadca63d60945971B7eD12c7f26b6d2"
+    "address": "0xEaE2d74a288Fc57992A133c93a84aE5F0553C6b4"
   },
   "WOW": {
     "address": "0xdfC14f7A536944467834EF7ce7b05a9a79BCDFaD",
@@ -201,9 +198,9 @@
     "deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
   },
   "PunkGatewayImpl": {
-    "address": "0xDb78CB5ee93c5215Dd5A8ac1b2F5cc90B774334a"
+    "address": "0xB7025f0b1FbCDC5C1B821478AC71c8c763333cb3"
   },
   "WETHGatewayImpl": {
-    "address": "0xE5ba6440E545742f212282604C44bA54Ce130940"
+    "address": "0x75b6Af46990a07Dc068586d6B23B5653acEc102F"
   }
-}
+}
diff --git a/tasks/full/bend-collector.ts b/tasks/full/bend-collector.ts
@@ -88,7 +88,7 @@ task("full:upgrade-bend-collector", "Upgrade bend collect contract")
       );
     }
 
-    await waitForTx(await bendCollector.initialize_v2());
+    //await waitForTx(await bendCollector.initialize_v2());
 
     console.log("Bend Collector: upgrade ok");
   });

diff --git a/tasks/misc/new-implementation.ts b/tasks/misc/new-implementation.ts
@@ -37,6 +37,7 @@ import {
   deployBTokensAndBNFTsHelper,
   deployInterestRate,
   deployGenericDebtToken,
+  deployBendCollector,
 } from "../../helpers/contracts-deployments";
 import { notFalsyOrZeroAddress, waitForTx } from "../../helpers/misc-utils";
 import { getEthersSignerByAddress, insertContractAddressInDb } from "../../helpers/contracts-helpers";
@@ -216,6 +217,11 @@ task("dev:deploy-new-implementation", "Deploy new implementation")
       const contractImpl = await deployBTokensAndBNFTsHelper([addressesProvider.address], verify);
       console.log("BTokensAndBNFTsHelper implementation address:", contractImpl.address);
     }
+
+    if (contract == "BendCollector") {
+      const contractImpl = await deployBendCollector([], verify);
+      console.log("BendCollector implementation address:", contractImpl.address);
+    }
   });
 
 task("dev:deploy-new-interest-rate", "Deploy new interest rate implementation")

diff --git a/tasks/verifications/general.ts b/tasks/verifications/general.ts
@@ -65,16 +65,6 @@ task("verify:general", "Verify general contracts at Etherscan")
     const wethGatewayImpl = await getWETHGatewayImpl();
     const punkGatewayImpl = await getPunkGatewayImpl();
 
-    // WETHGateway
-    console.log("\n- Verifying WETHGateway...\n");
-    await verifyContract(eContractid.WETHGatewayImpl, wethGatewayImpl, []);
-
-    // PunkGateway
-    console.log("\n- Verifying PunkGateway...\n");
-    await verifyContract(eContractid.PunkGatewayImpl, punkGatewayImpl, []);
-
-    return;
-
     const proxyAdminFund = await getBendProxyAdminById(eContractid.BendProxyAdminFund);
     await verifyContract(eContractid.BendProxyAdminFund, proxyAdminFund, []);