Feat/new root and fractal signer (#167)

* feat/new root and signer

* chore: prettier

* fix: deployment checks

* fix: remove old broadcasts

broadcast/MUGOV.sol/44787/run-latest.json

@@ -1,7 +1,7 @@
 {
   "transactions": [
     {
-      "hash": "0xe4850aa5addbf803e8088aa821dad511c4c81be35dd74311a87efa90402cf332",
+      "hash": "0xae41ff5fdc8b7a51026bcfb5b1588f96cade74b726a5ceb87a794e9ba7f3d418",
       "transactionType": "CALL",
       "contractName": null,
       "contractAddress": "0xAA963FC97281d9632d96700aB62A4D1340F9a28a",
@@ -11,16 +11,16 @@
         "type": "0x00",
         "from": "0x56fd3f2bee130e9867942d0f463a16fbe49b8d81",
         "to": "0xaa963fc97281d9632d96700ab62a4d1340f9a28a",
-        "gas": "0x9bcc",
+        "gas": "0x9bae",
         "value": "0x0",
         "data": "0x41b3d185",
-        "nonce": "0x265"
+        "nonce": "0x318"
       },
       "additionalContracts": [],
       "isFixedGasLimit": false
     },
     {
-      "hash": "0x141446a21eb8f954376e56776729c68269a57a0e72b741939078b8106eec91e3",
+      "hash": "0xba803bc3d53b0a94eb6be4773251be4f29db93f76207ead2c3c0c850c5cecd44",
       "transactionType": "CALL",
       "contractName": null,
       "contractAddress": "0xAA963FC97281d9632d96700aB62A4D1340F9a28a",
@@ -30,25 +30,25 @@
         "type": "0x00",
         "from": "0x56fd3f2bee130e9867942d0f463a16fbe49b8d81",
         "to": "0xaa963fc97281d9632d96700ab62a4d1340f9a28a",
-        "gas": "0x13e015",
+        "gas": "0x1365f5",
         "value": "0x56bc75e2d63100000",
-        "data": "0x65bbdaa000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000049d41c7d3f89543c730b3ab8128d511124382bb9000000000000000000000000000000000000000000000000000000000000036447546dc500000000000000000000000056fd3f2bee130e9867942d0f463a16fbe49b8d81000000000000000000000000aa963fc97281d9632d96700ab62a4d1340f9a28a6c6737ae0f6d30c687aa1ae814fa42ee0081fe871b1cd880321c200ee0668bd600000000000000000000000056fd3f2bee130e9867942d0f463a16fbe49b8d8100000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000000800000000000000000000000056fd3f2bee130e9867942d0f463a16fbe49b8d8100000000000000000000000099995570bc88340d726d15d172e668271fbc9e200000000000000000000000009999f469fa49bb921ea385f1de49dcbccfbc9a820000000000000000000000009999700347b57a3152e8b63123649949a9abe20d0000000000000000000000009999db67bf5151668aaff29ed4baca3926747ed70000000000000000000000009999c6de88ebdf0aff022d127c36541d53f8789a00000000000000000000000099994874b3b90e690287c85df1ba26e886ff87f000000000000000000000000099990ea09dd56949dbafe97fc34dbc69bda81027000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000036400000000000000000000000000000000000000000000000000000000000000054d55474f56000000000000000000000000000000000000000000000000000000",
-        "nonce": "0x266"
+        "data": "0x65bbdaa000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000008452a4d5c6cc09f29225a0c3aa0afe1b845397e20000000000000000000000000000000000000000000000000000000000000344b5a612c800000000000000000000000056fd3f2bee130e9867942d0f463a16fbe49b8d81fb9d4e884da909e46207d6bcfd7616ee8627f1bfcff5041b30ac3c0fff9910310000000000000000000000002fcab633adfa6af8266025d63228047033c3ced0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000000800000000000000000000000056fd3f2bee130e9867942d0f463a16fbe49b8d8100000000000000000000000099995570bc88340d726d15d172e668271fbc9e200000000000000000000000009999f469fa49bb921ea385f1de49dcbccfbc9a820000000000000000000000009999700347b57a3152e8b63123649949a9abe20d0000000000000000000000009999db67bf5151668aaff29ed4baca3926747ed70000000000000000000000009999c6de88ebdf0aff022d127c36541d53f8789a00000000000000000000000099994874b3b90e690287c85df1ba26e886ff87f000000000000000000000000099990ea09dd56949dbafe97fc34dbc69bda81027000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000034400000000000000000000000000000000000000000000000000000000000000054d55474f56000000000000000000000000000000000000000000000000000000",
+        "nonce": "0x319"
       },
       "additionalContracts": [],
       "isFixedGasLimit": false
     }
   ],
   "receipts": [
     {
-      "transactionHash": "0xe4850aa5addbf803e8088aa821dad511c4c81be35dd74311a87efa90402cf332",
+      "transactionHash": "0xae41ff5fdc8b7a51026bcfb5b1588f96cade74b726a5ceb87a794e9ba7f3d418",
       "transactionIndex": "0x0",
-      "blockHash": "0x731d1bf434e3e28d860230e623c42278815b2e6cae71301332fbdebc37dbfdca",
-      "blockNumber": "0x15767c6",
+      "blockHash": "0xc39723f678af8d30bf8522c2ee87d554e8928510b1a9b04a35721b461e14350d",
+      "blockNumber": "0x1659e7c",
       "from": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81",
       "to": "0xAA963FC97281d9632d96700aB62A4D1340F9a28a",
-      "cumulativeGasUsed": "0x70cc",
-      "gasUsed": "0x70cc",
+      "cumulativeGasUsed": "0x70b6",
+      "gasUsed": "0x70b6",
       "contractAddress": null,
       "logs": [],
       "status": "0x1",
@@ -57,34 +57,34 @@
       "effectiveGasPrice": "0x2540be400"
     },
     {
-      "transactionHash": "0x141446a21eb8f954376e56776729c68269a57a0e72b741939078b8106eec91e3",
+      "transactionHash": "0xba803bc3d53b0a94eb6be4773251be4f29db93f76207ead2c3c0c850c5cecd44",
       "transactionIndex": "0x1",
-      "blockHash": "0x731d1bf434e3e28d860230e623c42278815b2e6cae71301332fbdebc37dbfdca",
-      "blockNumber": "0x15767c6",
+      "blockHash": "0xc39723f678af8d30bf8522c2ee87d554e8928510b1a9b04a35721b461e14350d",
+      "blockNumber": "0x1659e7c",
       "from": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81",
       "to": "0xAA963FC97281d9632d96700aB62A4D1340F9a28a",
-      "cumulativeGasUsed": "0xed47b",
-      "gasUsed": "0xe63af",
+      "cumulativeGasUsed": "0xe7bfa",
+      "gasUsed": "0xe0b44",
       "contractAddress": null,
       "logs": [
         {
           "address": "0xAA963FC97281d9632d96700aB62A4D1340F9a28a",
           "topics": [
             "0x1bfe527f3548d9258c2512b6689f0acfccdd0557d80a53845db25fc57e93d8fe",
-            "0x00000000000000000000000000000000000000000000000000000000000000fd",
+            "0x0000000000000000000000000000000000000000000000000000000000000115",
             "0x00000000000000000000000056fd3f2bee130e9867942d0f463a16fbe49b8d81"
           ],
-          "data": "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000056bc75e2d631000000000000000000000000000000000000000000000000000000000000065ccb592",
-          "blockHash": "0x731d1bf434e3e28d860230e623c42278815b2e6cae71301332fbdebc37dbfdca",
-          "blockNumber": "0x15767c6",
-          "transactionHash": "0x141446a21eb8f954376e56776729c68269a57a0e72b741939078b8106eec91e3",
+          "data": "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000056bc75e2d63100000000000000000000000000000000000000000000000000000000000006613d5af",
+          "blockHash": "0xc39723f678af8d30bf8522c2ee87d554e8928510b1a9b04a35721b461e14350d",
+          "blockNumber": "0x1659e7c",
+          "transactionHash": "0xba803bc3d53b0a94eb6be4773251be4f29db93f76207ead2c3c0c850c5cecd44",
           "transactionIndex": "0x1",
           "logIndex": "0x0",
           "removed": false
         }
       ],
       "status": "0x1",
-      "logsBloom": "0x00000000400000000000000000000000000000000000000020000000000000000000000000000000000002000000010000000000000200000000000000000000000000000000000010000000010000000000000000000000080000000000000000000000000000000000000000000000000020000000000000000000000000000000000000200000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000",
+      "logsBloom": "0x00000000000000000000000000000100000000000000000020000000000000000000010000000000000002000000010000000000000200000000000000000000000000000000000010000000010000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000",
       "type": "0x0",
       "effectiveGasPrice": "0x2540be400"
     }
@@ -95,8 +95,7 @@
   ],
   "pending": [],
   "returns": {},
-  "timestamp": 1707914644,
+  "timestamp": 1712575924,
   "chain": 44787,
-  "multi": false,
-  "commit": "2bd4eec"
+  "commit": "5d0af32"
 }

data/airgrab.alfajores.csv

@@ -11,3 +11,4 @@
 0x9999C6De88eBdf0aff022D127C36541D53F8789A,100000000000000000000
 0x99994874b3B90E690287C85df1ba26E886FF87f0,100000000000000000000
 0x99990eA09DD56949DbaFe97fc34DBC69BDA81027,100000000000000000000
+0x12860B283318bb73195F22C54d88f094aFc3DF1a,100000000000000000000

data/airgrab.alfajores.tree.json

@@ -1,5 +1,5 @@
 {
-  "root": "0x6c6737ae0f6d30c687aa1ae814fa42ee0081fe871b1cd880321c200ee0668bd6",
+  "root": "0xfb9d4e884da909e46207d6bcfd7616ee8627f1bfcff5041b30ac3c0fff991031",
   "leaves": [
     "0x13a16b459a7566839cf6f9e0fbdd695fe32001aeab8cd888bf602299ff150c70",
     "0xf73b9ffdb8bb7aac6e8181bf2de4635652cb25e822bf24024d8b858d1fa82816",
@@ -13,7 +13,8 @@
     "0xe1979bd050487c9c78261462493ce3551f2b02f94d324c2294a6b4665725838c",
     "0x522ecc9c7b7de680172b0b4e613b8c91649caa21f3f50ed2f0a69c226e40632f",
     "0xdaee9b3c372d0f61565e3174defa6730f273d2c91f7941bbf1af44a6e0e5aef4",
-    "0x4450da4fbdba2a0a161077f25dfa71682a0d1a106120a028d73a7c9f0a7e6f68"
+    "0x4450da4fbdba2a0a161077f25dfa71682a0d1a106120a028d73a7c9f0a7e6f68",
+    "0xa3ae308c67c407781497421178a3710135b13b2b2991b2644fdd5ef2773d552e"
   ],
   "layers": [
     [
@@ -29,7 +30,8 @@
       "0xe1979bd050487c9c78261462493ce3551f2b02f94d324c2294a6b4665725838c",
       "0x522ecc9c7b7de680172b0b4e613b8c91649caa21f3f50ed2f0a69c226e40632f",
       "0xdaee9b3c372d0f61565e3174defa6730f273d2c91f7941bbf1af44a6e0e5aef4",
-      "0x4450da4fbdba2a0a161077f25dfa71682a0d1a106120a028d73a7c9f0a7e6f68"
+      "0x4450da4fbdba2a0a161077f25dfa71682a0d1a106120a028d73a7c9f0a7e6f68",
+      "0xa3ae308c67c407781497421178a3710135b13b2b2991b2644fdd5ef2773d552e"
     ],
     [
       "0x54624e812f25b4ae81c68882d86532bbc55a177c935333ba626fa22b5dfee703",
@@ -38,18 +40,18 @@
       "0x42f36eb1b363e7c65a4709629ebf61a23615a9ee09149b09f833a669139e8704",
       "0xe67340013a058ad16818df5601568727c59eea15aaae7f93b9eabfcd3e28c380",
       "0x4cae888a312579d256dd52525f446a342bee1125579336ea99321ed9a9a19ed1",
-      "0x4450da4fbdba2a0a161077f25dfa71682a0d1a106120a028d73a7c9f0a7e6f68"
+      "0xc8646341dfd546879a7a429d0e448bfbffade53be46980e999a75ba9423ef971"
     ],
     [
       "0x8a3638a4f163a47bbf3da9cf8009bc2a8b26103ad9913db36677d72753bd51e1",
       "0xab07dda19cc1758cd1e18c051f0373f11cad1e71b27a563465e45f2f323b8117",
       "0x2ccadd65f3cffacac9271fe0c3888a9608cafbfa7b74008b023cf8f42358555e",
-      "0x4450da4fbdba2a0a161077f25dfa71682a0d1a106120a028d73a7c9f0a7e6f68"
+      "0xc8646341dfd546879a7a429d0e448bfbffade53be46980e999a75ba9423ef971"
     ],
     [
       "0xc749565dc2b8d5c1bace4ab3f00bd70b7fc6e0145d7a78f3a6644ec798a60ab8",
-      "0xf3fc4f23fb8816b487eee470a1aa6ebd1d224298d56b27e6160ae6cff82bc864"
+      "0xc52bc742854b8f31d820df0030c29b136c099624e35dd3961f7f684d76c3d4dd"
     ],
-    ["0x6c6737ae0f6d30c687aa1ae814fa42ee0081fe871b1cd880321c200ee0668bd6"]
+    ["0xfb9d4e884da909e46207d6bcfd7616ee8627f1bfcff5041b30ac3c0fff991031"]
   ]
 }

remappings.txt

@@ -7,4 +7,4 @@ contracts/=contracts/
 mento-core-2.0.0/=lib/mento-core-2.0.0/contracts/
 mento-core-2.1.0/=lib/mento-core-2.1.0/contracts/
 mento-core-2.2.0/=lib/mento-core-2.2.0/contracts/
-mento-core-gov/=lib/mento-core-gov/contracts/
+mento-core-2.3.0/=lib/mento-core-2.3.0/contracts/

script/interfaces/ICeloGovernance.sol

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >0.5.13 <0.9;
+pragma experimental ABIEncoderV2;
 
 interface ICeloGovernance {
   struct Transaction {

script/interfaces/IGovernanceFactory.sol

@@ -13,7 +13,6 @@ interface IGovernanceFactory {
 
   function createGovernance(
     address watchdogMultiSig_,
-    address celoCommunityFund_,
     bytes32 airgrabRoot,
     address fractalSigner,
     MentoTokenAllocationParams calldata allocationParams

script/upgrades/MUGOV/MUGOVChecks.sol

@@ -32,7 +32,7 @@ contract MUGOVChecks is GovernanceScript, Test {
   ILocking locking;
 
   function setUp() public {
-    contracts.load("MUGOV-04-Create-Factory", "latest");
+    contracts.load("MUGOV-00-Create-Factory", "latest");
     airgrabMerkleRoot = readAirgrabMerkleRoot();
     governanceFactory = IGovernanceFactory(contracts.deployed("GovernanceFactory"));
 

script/upgrades/dependencies.json

@@ -15,7 +15,7 @@
     "GrandaMento": "0x03f6842b82dd2c9276931a17dd23d73c16454a49",
     "MentoLabsMultisig": "0x",
     "WatchdogMultisig": "0x",
-    "FractalSigner": "0x"
+    "FractalSigner": "0xacD08d6714ADba531beFF582e6FD5DA1AFD6bc65"
   },
   "62320": {
     "BridgedUSDC": "0xD4079B322c392D6b196f90AA4c439fC2C16d6770",
@@ -33,7 +33,7 @@
     "GrandaMento": "0xdfd641aB188Add84B317fB0b241F6b879E5EF906",
     "MentoLabsMultisig": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81",
     "WatchdogMultisig": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81",
-    "FractalSigner": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81"
+    "FractalSigner": "0x2fCAb633adFA6aF8266025D63228047033c3ceD0"
   },
   "44787": {
     "BridgedUSDC": "0x87D61dA3d668797786D73BC674F053f87111570d",
@@ -51,6 +51,6 @@
     "GrandaMento": "0xecf09fcd57b0c8b1fd3de92d59e234b88938485b",
     "MentoLabsMultisig": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81",
     "WatchdogMultisig": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81",
-    "FractalSigner": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81"
+    "FractalSigner": "0x2fCAb633adFA6aF8266025D63228047033c3ceD0"
   }
 }