Deploy 32 (#850)

* Remove mintMultiple test call (code already removed before) * Show cvx token address in debug report * mainnet deploy 32
OriginProtocol · Dec 10, 2021 · 0b9d5ea · 0b9d5ea
1 parent 3fefd33
commit 0b9d5ea
Show file tree

Hide file tree

Showing 9 changed files with 515 additions and 53 deletions.
diff --git a/contracts/contracts/strategies/ConvexStrategy.sol b/contracts/contracts/strategies/ConvexStrategy.sol
@@ -31,7 +31,7 @@ contract ConvexStrategy is BaseCurveStrategy {
 
     address internal cvxDepositorAddress;
     address internal cvxRewardStakerAddress;
-    address internal cvxRewardTokenAddress;
+    address public cvxRewardTokenAddress;
     uint256 internal cvxDepositorPTokenId;
 
     /**

diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json
@@ -27,5 +27,6 @@
   "028_dai_default_aave": 1635960341,
   "029_convex": 1637241490,
   "030_staking_to_new_governor": 1637241517,
-  "031_staking_add_rescue": 1637241582
+  "031_staking_add_rescue": 1637241582,
+  "032_convex_rewards": 1638551616
 }
diff --git a/contracts/deployments/mainnet/ConvexStrategy.json b/contracts/deployments/mainnet/ConvexStrategy.json
diff --git a/contracts/deployments/mainnet/solcInputs/a9ed004f4d203a17c07bb1c3b7c6c7b7.json b/contracts/deployments/mainnet/solcInputs/a9ed004f4d203a17c07bb1c3b7c6c7b7.json
diff --git a/contracts/smoke/mintRedeemTest.js b/contracts/smoke/mintRedeemTest.js
@@ -199,7 +199,6 @@ async function afterDeploy(hre, beforeDeployData) {
   const ousdAfterMint = await testMint(hre, beforeDeployData);
   await testRedeem(ousdAfterMint);
   await testTransfer();
-  await testMultipleMint();
 }
 
 module.exports = {

diff --git a/contracts/storageLayout/mainnet/ConvexStrategy.json b/contracts/storageLayout/mainnet/ConvexStrategy.json
@@ -70,25 +70,25 @@
       "contract": "ConvexStrategy",
       "label": "cvxDepositorAddress",
       "type": "t_address",
-      "src": "contracts/strategies/ConvexStrategy.sol:27"
+      "src": "contracts/strategies/ConvexStrategy.sol:32"
     },
     {
       "contract": "ConvexStrategy",
       "label": "cvxRewardStakerAddress",
       "type": "t_address",
-      "src": "contracts/strategies/ConvexStrategy.sol:28"
+      "src": "contracts/strategies/ConvexStrategy.sol:33"
     },
     {
       "contract": "ConvexStrategy",
-      "label": "crvRewardTokenAddress",
+      "label": "cvxRewardTokenAddress",
       "type": "t_address",
-      "src": "contracts/strategies/ConvexStrategy.sol:29"
+      "src": "contracts/strategies/ConvexStrategy.sol:34"
     },
     {
       "contract": "ConvexStrategy",
       "label": "cvxDepositorPTokenId",
       "type": "t_uint256",
-      "src": "contracts/strategies/ConvexStrategy.sol:30"
+      "src": "contracts/strategies/ConvexStrategy.sol:35"
     }
   ],
   "types": {

diff --git a/contracts/tasks/debug.js b/contracts/tasks/debug.js
@@ -345,6 +345,10 @@ async function debug(taskArguments, hre) {
     "rewardTokenAddress:\t\t",
     await threePoolStrategy.rewardTokenAddress()
   );
+  console.log(
+    "cvxRewardTokenAddress:\t\t",
+    await threePoolStrategy.cvxRewardTokenAddress()
+  );
   console.log(
     "rewardLiquidationThreshold:\t",
     (await threePoolStrategy.rewardLiquidationThreshold()).toString()

diff --git a/dapp/network.mainnet.json b/dapp/network.mainnet.json
@@ -2374,8 +2374,27 @@
       ]
     },
     "ConvexStrategy": {
-      "address": "0x08f3a0637851aA1B0E0750aA3d46E0E356f349aC",
+      "address": "0x16156a06bD1bd2d80134EA1Ee7e5FaEBDbFa20aa",
       "abi": [
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "_oldAddress",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "_newAddress",
+              "type": "address"
+            }
+          ],
+          "name": "CvxRewardTokenAddressUpdated",
+          "type": "event"
+        },
         {
           "anonymous": false,
           "inputs": [
@@ -2636,6 +2655,19 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "cvxRewardTokenAddress",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -2693,7 +2725,7 @@
             },
             {
               "internalType": "address",
-              "name": "_crvRewardTokenAddress",
+              "name": "_cvxRewardTokenAddress",
               "type": "address"
             },
             {
@@ -2832,6 +2864,19 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_cvxRewardTokenAddress",
+              "type": "address"
+            }
+          ],
+          "name": "setCvxRewardTokenAddress",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
         {
           "inputs": [
             {

diff --git a/dapp/prod.network.json b/dapp/prod.network.json
@@ -2374,8 +2374,27 @@
       ]
     },
     "ConvexStrategy": {
-      "address": "0x08f3a0637851aA1B0E0750aA3d46E0E356f349aC",
+      "address": "0x16156a06bD1bd2d80134EA1Ee7e5FaEBDbFa20aa",
       "abi": [
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "_oldAddress",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "_newAddress",
+              "type": "address"
+            }
+          ],
+          "name": "CvxRewardTokenAddressUpdated",
+          "type": "event"
+        },
         {
           "anonymous": false,
           "inputs": [
@@ -2636,6 +2655,19 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "cvxRewardTokenAddress",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -2693,7 +2725,7 @@
             },
             {
               "internalType": "address",
-              "name": "_crvRewardTokenAddress",
+              "name": "_cvxRewardTokenAddress",
               "type": "address"
             },
             {
@@ -2832,6 +2864,19 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_cvxRewardTokenAddress",
+              "type": "address"
+            }
+          ],
+          "name": "setCvxRewardTokenAddress",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
         {
           "inputs": [
             {