Merge pull request #398 from SocketDotTech/feat/multisig-deploy-scripts

Feat/multisig deploy scripts
SocketDotTech · Feb 10, 2025 · 74f5fa9 · 74f5fa9
2 parents 79456a6 + d33fd49
commit 74f5fa9
Show file tree

Hide file tree

Showing 67 changed files with 8,658 additions and 9,583 deletions.
diff --git a/.env.example b/.env.example
@@ -111,3 +111,5 @@ ARENA_Z_RPC=' '
 INK_RPC=' '
 
 SONIC_RPC=' '
+
+BASE_SEPOLIA_RPC=' '
diff --git a/chainConfig.json b/chainConfig.json
@@ -27,11 +27,6 @@
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
       "feeUpdaterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5"
     },
-    "overrides": {
-      "type": 1,
-      "gasLimit": 3000000,
-      "gasPrice": 10000000
-    },
     "siblings": [1, 42161, 10, 8453]
   },
   "60808": {
@@ -42,8 +37,7 @@
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
       "feeUpdaterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5"
     },
-    "siblings": [42161, 10],
-    "overrides": {}
+    "siblings": [42161, 10]
   },
   "444444": {
     "roleOwners": {
@@ -53,8 +47,7 @@
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
       "feeUpdaterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5"
     },
-    "siblings": [421614, 80001, 11155111],
-    "overrides": {}
+    "siblings": [421614, 80001, 11155111]
   },
   "2863311531": {
     "roleOwners": {
@@ -64,10 +57,6 @@
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
       "feeUpdaterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5"
     },
-    "siblings": [421614, 11155420],
-    "overrides": {
-      "type": 1,
-      "gasPrice": 100000000
-    }
+    "siblings": [421614, 11155420]
   }
 }
diff --git a/contracts/mocks/MockSafe.sol b/contracts/mocks/MockSafe.sol
@@ -18,13 +18,13 @@ contract MockSafe {
         address to,
         uint256 value,
         bytes calldata data,
-        Enum.Operation operation,
-        uint256 safeTxGas,
-        uint256 baseGas,
-        uint256 gasPrice,
-        address gasToken,
-        address payable refundReceiver,
-        bytes memory signatures
+        Enum.Operation,
+        uint256,
+        uint256,
+        uint256,
+        address,
+        address payable,
+        bytes memory
     ) external payable returns (bool success) {
         lastTo = to;
         lastValue = value;
@@ -41,13 +41,13 @@ contract MockSafe {
         uint256 value,
         bytes calldata data,
         Enum.Operation operation,
-        uint256 safeTxGas,
-        uint256 baseGas,
-        uint256 gasPrice,
-        address gasToken,
-        address refundReceiver,
+        uint256,
+        uint256,
+        uint256,
+        address,
+        address,
         uint256 _nonce
-    ) external view returns (bytes32) {
+    ) external pure returns (bytes32) {
         return keccak256(abi.encode(to, value, data, operation, _nonce));
     }
 

diff --git a/contracts/utils/MultiSigWrapper.sol b/contracts/utils/MultiSigWrapper.sol
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,3 +111,5 @@ ARENA_Z_RPC=' '
		INK_RPC=' '

		SONIC_RPC=' '

		BASE_SEPOLIA_RPC=' '