merge conflicts

zeta-chain · Feb 7, 2024 · bb9c5d8 · bb9c5d8
2 parents e345858 + 5b7c26d
commit bb9c5d8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 34 deletions.
diff --git a/contracts/evm/tools/ZetaInteractor.sol b/contracts/evm/tools/ZetaInteractor.sol
@@ -30,7 +30,6 @@ abstract contract ZetaInteractor is Ownable2Step, ZetaInteractorErrors {
     modifier isValidRevertCall(ZetaInterfaces.ZetaRevert calldata zetaRevert) {
         _isValidCaller();
         if (zetaRevert.zetaTxSenderAddress != address(this)) revert InvalidZetaRevertCall();
-        if (zetaRevert.sourceChainId != currentChainId) revert InvalidZetaRevertCall();
         _;
     }
 

diff --git a/data/addresses.json b/data/addresses.json
@@ -1,17 +1,10 @@
 {
   "ccm": {
     "bsc_mainnet": {
-<<<<<<< HEAD
       "connector": "0x000063A6e758D9e2f438d430108377564cf4077D",
       "erc20Custody": "0x00000fF8fA992424957F97688015814e707A0115",
       "immutableCreate2Factory": "",
       "tss": "0x70e967acFcC17c3941E87562161406d41676FD83",
-=======
-      "connector": "",
-      "erc20Custody": "",
-      "immutableCreate2Factory": "",
-      "tss": "",
->>>>>>> main
       "tssUpdater": "",
       "zetaToken": "0x0000028a2eB8346cd5c0267856aB7594B7a55308"
     },
@@ -25,31 +18,31 @@
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": "0xFB2fCE3CCca19F0f764Ed8aa26C62181E3dA04C5"
     },
-    "btc_mainnet": {
+    "btc_testnet": {
       "connector": "",
       "immutableCreate2Factory": "",
-      "tss": "bc1qm24wp577nk8aacckv8np465z3dvmu7ry45el6y",
+      "tss": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur",
       "tssUpdater": "",
       "zetaToken": "",
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": ""
     },
-    "btc_testnet": {
+    "btc_mainnet": {
       "connector": "",
       "immutableCreate2Factory": "",
-      "tss": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur",
+      "tss": "bc1qm24wp577nk8aacckv8np465z3dvmu7ry45el6y",
       "tssUpdater": "",
       "zetaToken": "",
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": ""
     },
     "eth_mainnet": {
-      "connector": "",
-      "erc20Custody": "",
+      "connector": "0x000007Cf399229b2f5A4D043F20E90C9C98B7C6a",
+      "erc20Custody": "0x0000030Ec64DF25301d8414eE5a29588C4B0dE10",
       "immutableCreate2Factory": "",
-      "tss": "",
+      "tss": "0x70e967acFcC17c3941E87562161406d41676FD83",
       "tssUpdater": "",
-      "zetaToken": ""
+      "zetaToken": "0xf091867EC603A6628eD83D274E835539D82e9cc8"
     },
     "goerli_testnet": {
       "connector": "0x00005e3125aba53c5652f9f0ce1a4cf91d8b15ea",
@@ -71,20 +64,20 @@
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": "0x7e792f3736751e168864106AdbAC50152641A927"
     },
-    "zeta_mainnet": {
+    "zeta_testnet": {
       "connector": "0x239e96c8f17C85c30100AC26F635Ea15f23E9c67",
       "immutableCreate2Factory": "",
-      "tss": "",
-      "tssUpdater": "",
+      "tss": "0x7c125C1d515b8945841b3d5144a060115C58725F",
+      "tssUpdater": "0x7274d1d5dddef36aac53dd45b93487ce01ef0a55",
       "zetaToken": "0x5F0b1a82749cb4E2278EC87F8BF6B618dC71a8bf",
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": ""
     },
-    "zeta_testnet": {
+    "zeta_mainnet": {
       "connector": "0x239e96c8f17C85c30100AC26F635Ea15f23E9c67",
       "immutableCreate2Factory": "",
-      "tss": "0x7c125C1d515b8945841b3d5144a060115C58725F",
-      "tssUpdater": "0x7274d1d5dddef36aac53dd45b93487ce01ef0a55",
+      "tss": "",
+      "tssUpdater": "",
       "zetaToken": "0x5F0b1a82749cb4E2278EC87F8BF6B618dC71a8bf",
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": ""
@@ -138,26 +131,26 @@
     "bsc_testnet": {
       "zrc20": "0xd97B1de3619ed2c6BEb3860147E30cA8A7dC9891"
     },
-    "btc_testnet": {
-      "zrc20": "0x65a45c57636f9BcCeD4fe193A602008578BcA90b"
-    },
     "goerli_testnet": {
       "zrc20": "0x13A0c5930C028511Dc02665E7285134B6d11A5f4"
     },
     "mumbai_testnet": {
       "zrc20": "0x48f80608B672DC30DC7e3dbBd0343c5F02C738Eb"
     },
-    "zeta_mainnet": {
-      "fungibleModule": "",
-      "systemContract": "0x91d18e54DAf4F677cB28167158d6dd21F6aB3921",
-      "uniswapv2Factory": "",
-      "uniswapv2Router02": ""
+    "btc_testnet": {
+      "zrc20": "0x65a45c57636f9BcCeD4fe193A602008578BcA90b"
     },
     "zeta_testnet": {
       "fungibleModule": "0x735b14BB79463307AAcBED86DAf3322B1e6226aB",
       "systemContract": "0xEdf1c3275d13489aCdC6cD6eD246E72458B8795B",
       "uniswapv2Factory": "0x9fd96203f7b22bCF72d9DCb40ff98302376cE09c",
       "uniswapv2Router02": "0x2ca7d64A7EFE2D62A725E2B35Cf7230D6677FfEe"
+    },
+    "zeta_mainnet": {
+      "fungibleModule": "",
+      "systemContract": "0x91d18e54DAf4F677cB28167158d6dd21F6aB3921",
+      "uniswapv2Factory": "",
+      "uniswapv2Router02": ""
     }
   }
 }
diff --git a/lib/address.tools.ts b/lib/address.tools.ts
@@ -62,8 +62,8 @@ export const nonZetaAddress: NonZetaAddress[] = [
   "weth9",
 ];
 
-export declare type ZetaProtocolMainNetwork = "bsc_mainnet" | "eth_mainnet";
-export const zetaProtocolMainNetworks: ZetaProtocolMainNetwork[] = ["eth_mainnet", "bsc_mainnet"];
+export declare type ZetaProtocolMainNetwork = "bsc_mainnet" | "eth_mainnet" | "zeta_mainnet";
+export const zetaProtocolMainNetworks: ZetaProtocolMainNetwork[] = ["eth_mainnet", "bsc_mainnet", "zeta_mainnet"];
 
 export declare type ZetaProtocolNetwork = ZetaProtocolMainNetwork | ZetaProtocolTestNetwork;
 export const zetaProtocolNetworks: ZetaProtocolNetwork[] = [...zetaProtocolTestNetworks, ...zetaProtocolMainNetworks];