OUSD deploy - migration 9 (#469)

* rinkeby ousd reset part2 * revert commented out deploy * mainnet ousd reset part2 * Add a log * Review feedback
OriginProtocol · Jan 4, 2021 · e129ed8 · e129ed8
1 parent be9a894
commit e129ed8
Show file tree

Hide file tree

Showing 15 changed files with 6,671 additions and 4,446 deletions.
diff --git a/contracts/deploy/009_ousd_fix.js b/contracts/deploy/009_ousd_fix.js
@@ -3,6 +3,7 @@ const hre = require("hardhat");
 const {
   isMainnet,
   isFork,
+  isRinkeby,
   isMainnetOrRinkebyOrFork,
 } = require("../test/helpers.js");
 const {
@@ -75,23 +76,31 @@ const fixOUSD = async () => {
     await executeProposal(propResetArgs, propResetDescription);
     log("Proposal executed.");
   } else {
+    // Hardcoding gas estimate on Rinkeby since it fails for an undetermined reason...
+    const gasLimit = isRinkeby ? 1000000 : null;
     await withConfirmation(
       cOUSDProxy
         .connect(sGovernor)
-        .upgradeTo(dOUSDReset.address, await getTxOpts())
+        .upgradeTo(dOUSDReset.address, await getTxOpts(gasLimit))
     );
     log("Upgraded OUSD to reset implementation");
 
     await withConfirmation(
       cOUSDReset
         .connect(sGovernor)
-        .setVaultAddress(cVaultProxy.address, await getTxOpts())
+        .setVaultAddress(cVaultProxy.address, await getTxOpts(gasLimit))
+    );
+    log("Vault address set");
+
+    await withConfirmation(
+      cOUSDReset.connect(sGovernor).reset(await getTxOpts(gasLimit))
     );
-    await withConfirmation(cOUSDReset.connect(sGovernor).reset());
     log("Called reset on OUSD");
 
     await withConfirmation(
-      cOUSDProxy.connect(sGovernor).upgradeTo(dOUSD.address, await getTxOpts())
+      cOUSDProxy
+        .connect(sGovernor)
+        .upgradeTo(dOUSD.address, await getTxOpts(gasLimit))
     );
     log("Upgraded OUSD to standard implementation");
   }

diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json
@@ -4,5 +4,6 @@
   "003_governor": 1608190277,
   "004_single_asset_staking": 1608192583,
   "007_upgrade_single_asset_staking": 1608527258,
-  "008_ousd_reset": 1609285987
+  "008_ousd_reset": 1609285987,
+  "009_ousd_fix": 1609736357
 }
diff --git a/contracts/deployments/mainnet/OUSD.json b/contracts/deployments/mainnet/OUSD.json
diff --git a/contracts/deployments/mainnet/OUSDReset.json b/contracts/deployments/mainnet/OUSDReset.json
diff --git a/contracts/deployments/mainnet/solcInputs/6c5ec0829f89df496fcae564eaa88d66.json b/contracts/deployments/mainnet/solcInputs/6c5ec0829f89df496fcae564eaa88d66.json
diff --git a/contracts/deployments/rinkeby/.migrations.json b/contracts/deployments/rinkeby/.migrations.json
@@ -4,5 +4,7 @@
   "002_upgrade_vault": 1605229268,
   "003_governor": 1608185281,
   "004_single_asset_staking": 1608185799,
-  "007_upgrade_single_asset_staking": 1608526958
+  "007_upgrade_single_asset_staking": 1608526958,
+  "008_ousd_reset": 1609285987,
+  "009_ousd_fix": 1609652662
 }
diff --git a/contracts/deployments/rinkeby/ChainlinkOracle.json b/contracts/deployments/rinkeby/ChainlinkOracle.json
diff --git a/contracts/deployments/rinkeby/OUSD.json b/contracts/deployments/rinkeby/OUSD.json
diff --git a/contracts/deployments/rinkeby/OUSDReset.json b/contracts/deployments/rinkeby/OUSDReset.json
diff --git a/contracts/deployments/rinkeby/solcInputs/6c5ec0829f89df496fcae564eaa88d66.json b/contracts/deployments/rinkeby/solcInputs/6c5ec0829f89df496fcae564eaa88d66.json
diff --git a/contracts/utils/deploy.js b/contracts/utils/deploy.js
@@ -187,6 +187,7 @@ const sendProposal = async (proposalArgs, description) => {
   const governor = await ethers.getContract("Governor");
 
   log(`Submitting proposal for ${description} to governor ${governor.address}`);
+  log(`Args: ${proposalArgs}`)
   await withConfirmation(
     governor
       .connect(sDeployer)

diff --git a/contracts/utils/tx.js b/contracts/utils/tx.js
@@ -38,12 +38,21 @@ async function premiumGasPrice(multiplier) {
  *
  * @returns {Promise<{gasPrice: ethers.BigNumber}|{}>}
  */
-async function getTxOpts() {
+/**
+ * Returns extra options to use when sending a tx to the network.
+ * @param {Number} gasLimit: Optional gas limit to set.
+ * @returns {Promise<void>}
+ */
+async function getTxOpts(gasLimit=null) {
+  let txOpts = {}
+  if (gasLimit) {
+    txOpts.gasLimit = gasLimit;
+  }
   if (process.env.GAS_PRICE_MULTIPLIER) {
     const gasPrice = await premiumGasPrice(process.env.GAS_PRICE_MULTIPLIER);
-    return { gasPrice };
+    txOpts.gasPrice = gasPrice;
   }
-  return {};
+  return txOpts;
 }
 
 module.exports = {