Deploy 18: rinkeby and mainnet files (#605)

* rinkeby deploy 18 * mainnet deploy 18
OriginProtocol · Jun 25, 2021 · 53b73ec · 53b73ec
1 parent 971e010
commit 53b73ec
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 110 deletions.
diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json
@@ -14,5 +14,6 @@
   "014_3pool_strategy": 1612999718,
   "015_flipper": 1613166856,
   "016_chainlink_and_buyback": 1616629649,
-  "017_3pool_strategy_update": 1621303419
+  "017_3pool_strategy_update": 1621303419,
+  "018_upgrade_governor": 1624425881
 }
diff --git a/contracts/deployments/mainnet/Governor.json b/contracts/deployments/mainnet/Governor.json
diff --git a/contracts/deployments/rinkeby/.migrations.json b/contracts/deployments/rinkeby/.migrations.json
@@ -15,5 +15,6 @@
   "014_3pool_strategy": 1612999014,
   "015_flipper": 1613166556,
   "016_chainlink_and_buyback": 1616624684,
-  "017_3pool_strategy_update": 1621302942
+  "017_3pool_strategy_update": 1621302942,
+  "018_upgrade_governor": 1624425066
 }
diff --git a/contracts/deployments/rinkeby/Governor.json b/contracts/deployments/rinkeby/Governor.json
diff --git a/contracts/storageLayout/mainnet/Governor.json b/contracts/storageLayout/mainnet/Governor.json
@@ -33,18 +33,18 @@
     {
       "contract": "Governor",
       "label": "proposals",
-      "type": "t_mapping(t_uint256,t_struct(Proposal)3007_storage)",
+      "type": "t_mapping(t_uint256,t_struct(Proposal)4236_storage)",
       "src": "contracts/governance/Governor.sol:31"
     }
   ],
   "types": {
     "t_uint256": {
       "label": "uint256"
     },
-    "t_mapping(t_uint256,t_struct(Proposal)3007_storage)": {
+    "t_mapping(t_uint256,t_struct(Proposal)4236_storage)": {
       "label": "mapping(uint256 => struct Governor.Proposal)"
     },
-    "t_struct(Proposal)3007_storage": {
+    "t_struct(Proposal)4236_storage": {
       "label": "struct Governor.Proposal",
       "members": [
         {

diff --git a/dapp/network.mainnet.json b/dapp/network.mainnet.json
@@ -4024,7 +4024,7 @@
       ]
     },
     "Governor": {
-      "address": "0x8e7bDFeCd1164C46ad51b58e49A611F954D23377",
+      "address": "0x830622BDd79CC677eE6594E20bBda5B26568b781",
       "abi": [
         {
           "constant": true,
@@ -4264,21 +4264,6 @@
           "stateMutability": "view",
           "type": "function"
         },
-        {
-          "constant": true,
-          "inputs": [],
-          "name": "setPendingAdminSign",
-          "outputs": [
-            {
-              "internalType": "bytes32",
-              "name": "",
-              "type": "bytes32"
-            }
-          ],
-          "payable": false,
-          "stateMutability": "view",
-          "type": "function"
-        },
         {
           "constant": false,
           "inputs": [

diff --git a/dapp/network.rinkeby.json b/dapp/network.rinkeby.json
@@ -4024,7 +4024,7 @@
       ]
     },
     "Governor": {
-      "address": "0xa39d23bA9Aa6Bb842a2A7f90ac8c0075e53E6507",
+      "address": "0x13b6F284F279D8C9ae691E18157E58965A358CAf",
       "abi": [
         {
           "constant": true,
@@ -4264,21 +4264,6 @@
           "stateMutability": "view",
           "type": "function"
         },
-        {
-          "constant": true,
-          "inputs": [],
-          "name": "setPendingAdminSign",
-          "outputs": [
-            {
-              "internalType": "bytes32",
-              "name": "",
-              "type": "bytes32"
-            }
-          ],
-          "payable": false,
-          "stateMutability": "view",
-          "type": "function"
-        },
         {
           "constant": false,
           "inputs": [

diff --git a/dapp/prod.network.json b/dapp/prod.network.json
@@ -4024,7 +4024,7 @@
       ]
     },
     "Governor": {
-      "address": "0x8e7bDFeCd1164C46ad51b58e49A611F954D23377",
+      "address": "0x830622BDd79CC677eE6594E20bBda5B26568b781",
       "abi": [
         {
           "constant": true,
@@ -4264,21 +4264,6 @@
           "stateMutability": "view",
           "type": "function"
         },
-        {
-          "constant": true,
-          "inputs": [],
-          "name": "setPendingAdminSign",
-          "outputs": [
-            {
-              "internalType": "bytes32",
-              "name": "",
-              "type": "bytes32"
-            }
-          ],
-          "payable": false,
-          "stateMutability": "view",
-          "type": "function"
-        },
         {
           "constant": false,
           "inputs": [