Merge branch 'master' into feat/multisig-wrapper

Author: arthcp

.env.example

@@ -42,8 +42,6 @@ OPTIMISM_SEPOLIA_RPC=''
 POLYGON_RPC='https://rpc.ankr.com/polygon'
 POLYGON_MUMBAI_RPC='https://matic-mumbai.chainstacklabs.com'
 
-AVAX_RPC='https://api.avax.network/ext/bc/C/rpc'
-
 BSC_RPC='https://bsc-dataseed1.binance.org'
 BSC_TESTNET_RPC='https://data-seed-prebsc-1-s1.binance.org:8545'
 
@@ -64,8 +62,6 @@ BASE_RPC=''
 MODE_RPC=''
 ANCIENT8_TESTNET_RPC=''
 ANCIENT8_TESTNET2_RPC=''
-HOOK_TESTNET_RPC=''
-HOOK_RPC=''
 PARALLEL_RPC=''
 MANTLE_RPC=''
 REYA_CRONOS_RPC=''
@@ -91,3 +87,27 @@ DL_API_DEV_URL=''
 DL_API_PROD_URL=''
 
 NEOX_TESTNET_RPC=' '
+NEOX_T4_TESTNET_RPC=' '
+NEOX_RPC=' '
+GNOSIS_RPC=' '
+LINEA_RPC=' '
+ZKEVM_RPC=' '
+AVALANCHE_RPC=' '
+XLAYER_RPC=' '
+MANTA_PACIFIC_RPC=' '
+POLTER_TESTNET_RPC=' '
+POLYGON_AMOY_RPC=' '
+OPBNB_RPC=' '
+GEIST_RPC=' '
+
+ZERO_SEPOLIA_RPC=' '
+
+ZERO_RPC=' '
+
+ZKSYNC_RPC=' '
+
+ARENA_Z_RPC=' '
+
+INK_RPC=' '
+
+SONIC_RPC=' '

.github/workflows/push.yaml

@@ -23,10 +23,10 @@ jobs:
       - name: Install forge dependencies
         run: forge install
 
-      - name: Set Node.js 16.x
+      - name: Set Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Run yarn install
         uses: borales/actions-yarn@v4

.gitignore

@@ -30,4 +30,8 @@ switchboards.json
 devRpcConfig.ts
 devRpcConfig.json
 prodRpcConfig.ts
-prodRpcConfig.json
+prodRpcConfig.json
+
+artifacts-zk/
+cache_hardhat-zk/
+deployments-zk/

.prettierignore

@@ -24,4 +24,8 @@ yarn.lock
 .github/*
 .prettierrc
 scratchpad
-lcov.info
+lcov.info
+
+artifacts-zk/
+cache_hardhat-zk/
+deployments-zk/

chainConfig.json

@@ -1,18 +1,13 @@
 {
   "8453": {
     "roleOwners": {
-      "ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34",
+      "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
       "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
       "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
       "feeUpdaterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5"
     },
-    "siblings": [1, 137, 42161, 10, 56, 34443],
-    "overrides": {
-      "type": 1,
-      "gasLimit": 3000000,
-      "gasPrice": 10000000
-    }
+    "siblings": [1, 137, 42161, 10, 56, 34443]
   },
   "31337": {
     "siblings": [],
@@ -26,7 +21,7 @@
   },
   "34443": {
     "roleOwners": {
-      "ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34",
+      "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
       "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
       "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
@@ -41,7 +36,7 @@
   },
   "60808": {
     "roleOwners": {
-      "ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34",
+      "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
       "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
       "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
@@ -52,7 +47,7 @@
   },
   "444444": {
     "roleOwners": {
-      "ownerAddress": "0x78Deb9225c3F28D12922913Fec978e4dC90E1aa4",
+      "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
       "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
       "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
@@ -63,7 +58,7 @@
   },
   "2863311531": {
     "roleOwners": {
-      "ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34",
+      "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
       "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
       "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
       "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",

contracts/examples/Messenger.sol

@@ -33,7 +33,8 @@ contract Messenger is IPlug, Ownable(msg.sender) {
     }
 
     function removeGas(address payable receiver_) external onlyOwner {
-        receiver_.transfer(address(this).balance);
+        // receiver_.transfer(address(this).balance);
+        payable(receiver_).call{value: address(this).balance}("");
     }
 
     function sendLocalMessage(bytes32 message_) external {

contracts/socket/SocketBatcher.sol

@@ -270,11 +270,11 @@ contract SocketBatcher is AccessControl {
                 IExecutionManager.setRelativeNativeTokenPrice.selector
             ) {
                 IExecutionManager(contractAddress_).setRelativeNativeTokenPrice(
-                        setFeesRequests_[index].nonce,
-                        setFeesRequests_[index].dstChainSlug,
-                        setFeesRequests_[index].fees,
-                        setFeesRequests_[index].signature
-                    );
+                    setFeesRequests_[index].nonce,
+                    setFeesRequests_[index].dstChainSlug,
+                    setFeesRequests_[index].fees,
+                    setFeesRequests_[index].signature
+                );
             } else if (
                 setFeesRequests_[index].functionSelector ==
                 IExecutionManager.setMsgValueMaxThreshold.selector
@@ -640,7 +640,8 @@ contract SocketBatcher is AccessControl {
         uint256 totalAmount;
         for (uint i; i < addresses.length; i++) {
             totalAmount += amounts[i];
-            addresses[i].transfer(amounts[i]);
+            // addresses[i].transfer(amounts[i]);
+            payable(addresses[i]).call{value: amounts[i]}("");
         }
 
         require(totalAmount == msg.value, "LOW_MSG_VALUE");