Mainnet deploy 19 (#608)

* Rinkeby deploy

* mainnet deploy 19

Author: Franck

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/mainnet/OUSD.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/deployments/mainnet/VaultCore.json

@@ -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/deployments/mainnet/solcInputs/c2ea476b4aec8b6a8c5cdeb6adf2172f.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",