Mainnet deploy 19 (#608)

* Rinkeby deploy

* mainnet deploy 19

contracts/deployments/mainnet/.migrations.json

@@ -15,5 +15,6 @@
   "015_flipper": 1613166856,
   "016_chainlink_and_buyback": 1616629649,
   "017_3pool_strategy_update": 1621303419,
-  "018_upgrade_governor": 1624425881
+  "018_upgrade_governor": 1624425881,
+  "019_resolution_and_savings": 1625266338
 }

contracts/deployments/rinkeby/.migrations.json

@@ -16,5 +16,6 @@
   "015_flipper": 1613166556,
   "016_chainlink_and_buyback": 1616624684,
   "017_3pool_strategy_update": 1621302942,
-  "018_upgrade_governor": 1624425066
+  "018_upgrade_governor": 1624425066,
+  "019_resolution_and_savings": 1625264902
 }

contracts/hardhat.config.js

@@ -42,8 +42,9 @@ const {
 
 const MAINNET_DEPLOYER = "0x71F78361537A6f7B6818e7A760c8bC0146D93f50";
 // Mainnet contracts are governed by the Governor contract (which derives off Timelock).
-const MAINNET_GOVERNOR = "0x8e7bDFeCd1164C46ad51b58e49A611F954D23377";
-const MAINNET_MULTISIG = "0xe011fa2a6df98c69383457d87a056ed0103aa352";
+const MAINNET_GOVERNOR = "0x830622BDd79CC677eE6594E20bBda5B26568b781";
+// Multi-sig that controls the Governor. Aka "Guardian".
+const MAINNET_MULTISIG = "0xbe2AB3d3d8F6a32b96414ebbd865dBD276d3d899";
 const MAINNET_CLAIM_ADJUSTER = MAINNET_DEPLOYER;
 const MAINNET_STRATEGIST = "0xf14bbdf064e3f67f51cd9bd646ae3716ad938fdc";
 

contracts/storageLayout/mainnet/OUSD.json

@@ -93,7 +93,7 @@
     {
       "contract": "OUSD",
       "label": "rebaseState",
-      "type": "t_mapping(t_address,t_enum(RebaseOptions)12419)",
+      "type": "t_mapping(t_address,t_enum(RebaseOptions)14419)",
       "src": "contracts/token/OUSD.sol:50"
     }
   ],
@@ -110,10 +110,10 @@
     "t_mapping(t_address,t_uint256)": {
       "label": "mapping(address => uint256)"
     },
-    "t_mapping(t_address,t_enum(RebaseOptions)12419)": {
+    "t_mapping(t_address,t_enum(RebaseOptions)14419)": {
       "label": "mapping(address => enum OUSD.RebaseOptions)"
     },
-    "t_enum(RebaseOptions)12419": {
+    "t_enum(RebaseOptions)14419": {
       "label": "enum OUSD.RebaseOptions",
       "members": [
         "NotSet",

contracts/storageLayout/mainnet/VaultCore.json

@@ -21,7 +21,7 @@
     {
       "contract": "VaultStorage",
       "label": "assets",
-      "type": "t_mapping(t_address,t_struct(Asset)18894_storage)",
+      "type": "t_mapping(t_address,t_struct(Asset)18980_storage)",
       "src": "contracts/vault/VaultStorage.sol:55"
     },
     {
@@ -33,7 +33,7 @@
     {
       "contract": "VaultStorage",
       "label": "strategies",
-      "type": "t_mapping(t_address,t_struct(Strategy)18906_storage)",
+      "type": "t_mapping(t_address,t_struct(Strategy)18992_storage)",
       "src": "contracts/vault/VaultStorage.sol:63"
     },
     {
@@ -87,7 +87,7 @@
     {
       "contract": "VaultStorage",
       "label": "oUSD",
-      "type": "t_contract(OUSD)15327",
+      "type": "t_contract(OUSD)15436",
       "src": "contracts/vault/VaultStorage.sol:80"
     },
     {
@@ -134,13 +134,13 @@
     }
   ],
   "types": {
-    "t_mapping(t_address,t_struct(Asset)18894_storage)": {
+    "t_mapping(t_address,t_struct(Asset)18980_storage)": {
       "label": "mapping(address => struct VaultStorage.Asset)"
     },
     "t_address": {
       "label": "address"
     },
-    "t_struct(Asset)18894_storage": {
+    "t_struct(Asset)18980_storage": {
       "label": "struct VaultStorage.Asset",
       "members": [
         {
@@ -155,10 +155,10 @@
     "t_array(t_address)dyn_storage": {
       "label": "address[]"
     },
-    "t_mapping(t_address,t_struct(Strategy)18906_storage)": {
+    "t_mapping(t_address,t_struct(Strategy)18992_storage)": {
       "label": "mapping(address => struct VaultStorage.Strategy)"
     },
-    "t_struct(Strategy)18906_storage": {
+    "t_struct(Strategy)18992_storage": {
       "label": "struct VaultStorage.Strategy",
       "members": [
         {
@@ -174,7 +174,7 @@
     "t_uint256": {
       "label": "uint256"
     },
-    "t_contract(OUSD)15327": {
+    "t_contract(OUSD)15436": {
       "label": "contract OUSD"
     },
     "t_mapping(t_address,t_address)": {

contracts/utils/addresses.js

@@ -10,7 +10,7 @@ addresses.dead = "0x0000000000000000000000000000000000000001";
 
 addresses.mainnet = {};
 // Native stablecoins
-addresses.mainnet.Binance = "0x3f5CE5FBFe3E9af3971dD833D26bA9b5C936f0bE";
+addresses.mainnet.Binance = "0xf977814e90da44bfa03b6295a0616a897441acec";
 addresses.mainnet.DAI = "0x6b175474e89094c44da98b954eedeac495271d0f";
 addresses.mainnet.USDC = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
 addresses.mainnet.USDT = "0xdAC17F958D2ee523a2206206994597C13D831ec7";

contracts/utils/deploy.js

@@ -10,6 +10,7 @@ const {
   isFork,
   isRinkeby,
   isMainnetOrRinkebyOrFork,
+  isSmokeTest,
 } = require("../test/helpers.js");
 
 const {
@@ -19,6 +20,7 @@ const {
 
 const addresses = require("../utils/addresses.js");
 const { getTxOpts } = require("../utils/tx");
+const { proposeArgs } = require("../utils/governor");
 
 // Wait for 3 blocks confirmation on Mainnet/Rinkeby.
 const NUM_CONFIRMATIONS = isMainnet || isRinkeby ? 3 : 0;
@@ -275,9 +277,14 @@ function deploymentWithProposal(opts, fn) {
     } else {
       // Hardcoding gas estimate on Rinkeby since it fails for an undetermined reason...
       const gasLimit = isRinkeby ? 1000000 : null;
-      for (const proposal of proposals) {
-        const { contract, signature, args } = proposal;
-        log(`Sending goverance action ${signature} to ${address}`);
+
+      const { governorAddr } = await getNamedAccounts();
+      const sGovernor = await ethers.provider.getSigner(governorAddr);
+
+      for (const action of proposal.actions) {
+        const { contract, signature, args } = action;
+
+        log(`Sending governance action ${signature} to ${contract.address}`);
         await withConfirmation(
           contract
             .connect(sGovernor)

dapp/network.mainnet.json

@@ -5786,7 +5786,7 @@
       ]
     },
     "OUSD": {
-      "address": "0x9d6975591E777D95Eef3bCC2a727846DA25d7083",
+      "address": "0x23DCc0Cc5F08b9D85daF8d29490c7f74a655b359",
       "abi": [
         {
           "constant": true,
@@ -11828,7 +11828,7 @@
       ]
     },
     "VaultCore": {
-      "address": "0xf00d4B19458C594d4Ea9D0B9861EDfD2c444fA9A",
+      "address": "0xA4D15507112c0DB37E1320Bf3Fff8891DFd1D2Ed",
       "abi": [
         {
           "constant": true,

dapp/network.rinkeby.json

@@ -14753,7 +14753,7 @@
       ]
     },
     "OUSD": {
-      "address": "0x1e4277abF53A0BD4dACC22Fc0Ab2FF9eb2192786",
+      "address": "0x06bFb84169EFd5aFafa39cBbf5018EE8624ef29b",
       "abi": [
         {
           "constant": true,
@@ -20810,7 +20810,7 @@
       ]
     },
     "VaultCore": {
-      "address": "0x24203812AcB90c75860db158c637C286259059ba",
+      "address": "0xe5Aeb6fa44234a0648373F6711498E5A2E27B51d",
       "abi": [
         {
           "constant": true,