Migration 11 deployment (#491)

* rinkeby ousd upgrade * mainnet ousd upgrade * Add a unpauseCapital action to the propose script
OriginProtocol · Jan 9, 2021 · d051d2d · d051d2d
1 parent c48f44a
commit d051d2d
Show file tree

Hide file tree

Showing 10 changed files with 658 additions and 49 deletions.
diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json
@@ -6,5 +6,6 @@
   "007_upgrade_single_asset_staking": 1608527258,
   "008_ousd_reset": 1609285987,
   "009_ousd_fix": 1609736357,
-  "010_upgrade_single_asset_staking": 1609971639
+  "010_upgrade_single_asset_staking": 1609971639,
+  "011_ousd_fix": 1610148010
 }
diff --git a/contracts/deployments/mainnet/OUSD.json b/contracts/deployments/mainnet/OUSD.json
diff --git a/contracts/deployments/mainnet/solcInputs/c6e8cfbb76bbc7e6d6b3faaa7bf635b9.json b/contracts/deployments/mainnet/solcInputs/c6e8cfbb76bbc7e6d6b3faaa7bf635b9.json
diff --git a/contracts/deployments/rinkeby/.migrations.json b/contracts/deployments/rinkeby/.migrations.json
@@ -7,5 +7,6 @@
   "007_upgrade_single_asset_staking": 1608526958,
   "008_ousd_reset": 1609285987,
   "009_ousd_fix": 1609652662,
-  "010_upgrade_single_asset_staking": 1609968697
+  "010_upgrade_single_asset_staking": 1609968697,
+  "011_ousd_fix": 1610146101
 }
diff --git a/contracts/deployments/rinkeby/OUSD.json b/contracts/deployments/rinkeby/OUSD.json
diff --git a/contracts/deployments/rinkeby/solcInputs/c6e8cfbb76bbc7e6d6b3faaa7bf635b9.json b/contracts/deployments/rinkeby/solcInputs/c6e8cfbb76bbc7e6d6b3faaa7bf635b9.json
diff --git a/contracts/scripts/governor/propose.js b/contracts/scripts/governor/propose.js
@@ -158,7 +158,24 @@ async function proposeClaimOGNStakingGovernance() {
   return { args, description };
 }
 
-async function proposePauseDepositsArgs() {
+async function proposeUnpauseCapitalArgs() {
+  const vaultProxy = await ethers.getContract("VaultProxy");
+  const vaultAdmin = await ethers.getContractAt(
+    "VaultAdmin",
+    vaultProxy.address
+  );
+
+  const args = await proposeArgs([
+    {
+      contract: vaultAdmin,
+      signature: "unpauseCapital()",
+    },
+  ]);
+  const description = "Unpause capital";
+  return { args, description };
+}
+
+async function proposePauseCapitalArgs() {
   const vaultProxy = await ethers.getContract("VaultProxy");
   const vaultAdmin = await ethers.getContractAt(
     "VaultAdmin",
@@ -171,7 +188,7 @@ async function proposePauseDepositsArgs() {
       signature: "pauseCapital()",
     },
   ]);
-  const description = "Pause Deposits";
+  const description = "Pause capital";
   return { args, description };
 }
 
@@ -722,8 +739,11 @@ async function main(config) {
     console.log("prop17 proposal");
     argsMethod = proposeProp17Args;
   } else if (config.pauseCapital) {
-    console.log("pauseDeposit");
-    argsMethod = proposePauseDepositsArgs;
+    console.log("pauseCapital");
+    argsMethod = proposePauseCapitalArgs;
+  } else if (config.unpauseCapital) {
+    console.log("unpauseCapital");
+    argsMethod = proposeUnpauseCapitalArgs;
   } else if (config.claimOGNStakingGovernance) {
     console.log("proposeClaimOGNStakingGovernance");
     argsMethod = proposeClaimOGNStakingGovernance;
@@ -819,6 +839,7 @@ const config = {
   prop14: args["--prop14"],
   prop17: args["--prop17"],
   pauseCapital: args["--pauseCapital"],
+  unpauseCapital: args["--unpauseCapital"],
   claimOGNStakingGovernance: args["--claimOGNStakingGovernance"],
   upgradeStaking: args["--upgradeStaking"],
   vaultv2Governance: args["--vaultv2Governance"],

diff --git a/dapp/network.mainnet.json b/dapp/network.mainnet.json
@@ -4978,7 +4978,7 @@
       ]
     },
     "OUSD": {
-      "address": "0x159ea2fA3a92DAE6b9f21D6753AA6a8EA5bf77BA",
+      "address": "0x8E54F5776aC2d0322D94640E070856A04e446656",
       "abi": [
         {
           "constant": true,

diff --git a/dapp/network.rinkeby.json b/dapp/network.rinkeby.json
@@ -13945,7 +13945,7 @@
       ]
     },
     "OUSD": {
-      "address": "0x7Ee64B4505d3f1E4436E5fD51D4CE5946E6ff009",
+      "address": "0x8d631F7f08e8ECeae12E0aD57E889043E27A9a8C",
       "abi": [
         {
           "constant": true,

diff --git a/dapp/prod.network.json b/dapp/prod.network.json
@@ -4978,7 +4978,7 @@
       ]
     },
     "OUSD": {
-      "address": "0x159ea2fA3a92DAE6b9f21D6753AA6a8EA5bf77BA",
+      "address": "0x8E54F5776aC2d0322D94640E070856A04e446656",
       "abi": [
         {
           "constant": true,