fix build

zeta-chain · Feb 7, 2024 · ef14114 · ef14114
1 parent bb9c5d8
commit ef14114
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 59 deletions.
diff --git a/data/addresses.json b/data/addresses.json
@@ -18,19 +18,19 @@
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": "0xFB2fCE3CCca19F0f764Ed8aa26C62181E3dA04C5"
     },
-    "btc_testnet": {
+    "btc_mainnet": {
       "connector": "",
       "immutableCreate2Factory": "",
-      "tss": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur",
+      "tss": "bc1qm24wp577nk8aacckv8np465z3dvmu7ry45el6y",
       "tssUpdater": "",
       "zetaToken": "",
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": ""
     },
-    "btc_mainnet": {
+    "btc_testnet": {
       "connector": "",
       "immutableCreate2Factory": "",
-      "tss": "bc1qm24wp577nk8aacckv8np465z3dvmu7ry45el6y",
+      "tss": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur",
       "tssUpdater": "",
       "zetaToken": "",
       "zetaTokenConsumerUniV2": "",
@@ -64,20 +64,20 @@
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": "0x7e792f3736751e168864106AdbAC50152641A927"
     },
-    "zeta_testnet": {
+    "zeta_mainnet": {
       "connector": "0x239e96c8f17C85c30100AC26F635Ea15f23E9c67",
       "immutableCreate2Factory": "",
-      "tss": "0x7c125C1d515b8945841b3d5144a060115C58725F",
-      "tssUpdater": "0x7274d1d5dddef36aac53dd45b93487ce01ef0a55",
+      "tss": "",
+      "tssUpdater": "",
       "zetaToken": "0x5F0b1a82749cb4E2278EC87F8BF6B618dC71a8bf",
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": ""
     },
-    "zeta_mainnet": {
+    "zeta_testnet": {
       "connector": "0x239e96c8f17C85c30100AC26F635Ea15f23E9c67",
       "immutableCreate2Factory": "",
-      "tss": "",
-      "tssUpdater": "",
+      "tss": "0x7c125C1d515b8945841b3d5144a060115C58725F",
+      "tssUpdater": "0x7274d1d5dddef36aac53dd45b93487ce01ef0a55",
       "zetaToken": "0x5F0b1a82749cb4E2278EC87F8BF6B618dC71a8bf",
       "zetaTokenConsumerUniV2": "",
       "zetaTokenConsumerUniV3": ""
@@ -131,26 +131,26 @@
     "bsc_testnet": {
       "zrc20": "0xd97B1de3619ed2c6BEb3860147E30cA8A7dC9891"
     },
+    "btc_testnet": {
+      "zrc20": "0x65a45c57636f9BcCeD4fe193A602008578BcA90b"
+    },
     "goerli_testnet": {
       "zrc20": "0x13A0c5930C028511Dc02665E7285134B6d11A5f4"
     },
     "mumbai_testnet": {
       "zrc20": "0x48f80608B672DC30DC7e3dbBd0343c5F02C738Eb"
     },
-    "btc_testnet": {
-      "zrc20": "0x65a45c57636f9BcCeD4fe193A602008578BcA90b"
+    "zeta_mainnet": {
+      "fungibleModule": "",
+      "systemContract": "0x91d18e54DAf4F677cB28167158d6dd21F6aB3921",
+      "uniswapv2Factory": "",
+      "uniswapv2Router02": ""
     },
     "zeta_testnet": {
       "fungibleModule": "0x735b14BB79463307AAcBED86DAf3322B1e6226aB",
       "systemContract": "0xEdf1c3275d13489aCdC6cD6eD246E72458B8795B",
       "uniswapv2Factory": "0x9fd96203f7b22bCF72d9DCb40ff98302376cE09c",
       "uniswapv2Router02": "0x2ca7d64A7EFE2D62A725E2B35Cf7230D6677FfEe"
-    },
-    "zeta_mainnet": {
-      "fungibleModule": "",
-      "systemContract": "0x91d18e54DAf4F677cB28167158d6dd21F6aB3921",
-      "uniswapv2Factory": "",
-      "uniswapv2Router02": ""
     }
   }
-}
+}
diff --git a/data/addresses.mainnet.json b/data/addresses.mainnet.json
@@ -238,17 +238,17 @@
     "type": "tssUpdater"
   },
   {
-    "address": "0xaf28a257D292e7f0E531073f70a175b57E0261a8",
+    "address": "0xaeB6dDB7708467814D557e340283248be8E43124",
     "category": "messaging",
-    "chain_id": 56,
-    "chain_name": "bsc_mainnet",
+    "chain_id": 1,
+    "chain_name": "eth_mainnet",
     "type": "pauser"
   },
   {
-    "address": "0xaeB6dDB7708467814D557e340283248be8E43124",
+    "address": "0xaf28a257D292e7f0E531073f70a175b57E0261a8",
     "category": "messaging",
-    "chain_id": 1,
-    "chain_name": "eth_mainnet",
+    "chain_id": 56,
+    "chain_name": "bsc_mainnet",
     "type": "pauser"
   },
   {

diff --git a/data/addresses.testnet.json b/data/addresses.testnet.json
@@ -223,6 +223,27 @@
     "chain_name": "zeta_testnet",
     "type": "fungibleModule"
   },
+  {
+    "address": "0x0000c9ec4042283e8139c74f4c64bcd1e0b9b54f",
+    "category": "messaging",
+    "chain_id": 97,
+    "chain_name": "bsc_testnet",
+    "type": "zetaToken"
+  },
+  {
+    "address": "0x0000ecb8cdd25a18f12daa23f6422e07fbf8b9e1",
+    "category": "messaging",
+    "chain_id": 97,
+    "chain_name": "bsc_testnet",
+    "type": "connector"
+  },
+  {
+    "address": "0x0000a7db254145767262c6a81a7ee1650684258e",
+    "category": "omnichain",
+    "chain_id": 97,
+    "chain_name": "bsc_testnet",
+    "type": "erc20Custody"
+  },
   {
     "address": "0x0000c304d2934c00db1d51995b9f6996affd17c0",
     "category": "messaging",
@@ -265,53 +286,32 @@
     "chain_name": "mumbai_testnet",
     "type": "erc20Custody"
   },
-  {
-    "address": "0x0000c9ec4042283e8139c74f4c64bcd1e0b9b54f",
-    "category": "messaging",
-    "chain_id": 97,
-    "chain_name": "bsc_testnet",
-    "type": "zetaToken"
-  },
-  {
-    "address": "0x0000ecb8cdd25a18f12daa23f6422e07fbf8b9e1",
-    "category": "messaging",
-    "chain_id": 97,
-    "chain_name": "bsc_testnet",
-    "type": "connector"
-  },
-  {
-    "address": "0x0000a7db254145767262c6a81a7ee1650684258e",
-    "category": "omnichain",
-    "chain_id": 97,
-    "chain_name": "bsc_testnet",
-    "type": "erc20Custody"
-  },
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "category": "omnichain",
-    "chain_id": 97,
-    "chain_name": "bsc_testnet",
+    "chain_id": 80001,
+    "chain_name": "mumbai_testnet",
     "type": "tssUpdater"
   },
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "category": "omnichain",
-    "chain_id": 80001,
-    "chain_name": "mumbai_testnet",
+    "chain_id": 5,
+    "chain_name": "goerli_testnet",
     "type": "tssUpdater"
   },
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "category": "omnichain",
-    "chain_id": 5,
-    "chain_name": "goerli_testnet",
+    "chain_id": 97,
+    "chain_name": "bsc_testnet",
     "type": "tssUpdater"
   },
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "category": "messaging",
-    "chain_id": 5,
-    "chain_name": "goerli_testnet",
+    "chain_id": 97,
+    "chain_name": "bsc_testnet",
     "type": "pauser"
   },
   {
@@ -324,8 +324,8 @@
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "category": "messaging",
-    "chain_id": 97,
-    "chain_name": "bsc_testnet",
+    "chain_id": 5,
+    "chain_name": "goerli_testnet",
     "type": "pauser"
   },
   {

diff --git a/package.json b/package.json
@@ -7,8 +7,8 @@
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
     "@nomicfoundation/hardhat-toolbox": "^2.0.0",
-    "@nomiclabs/hardhat-ethers": "^2.0.5",
     "@nomicfoundation/hardhat-verify": "2.0.3",
+    "@nomiclabs/hardhat-ethers": "^2.0.5",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
     "@openzeppelin/contracts": "^4.8.3",
     "@typechain/ethers-v5": "^10.1.0",
@@ -68,9 +68,9 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "yarn compile && npx del-cli dist abi && tsc || exit 0 && npx del-cli './dist/typechain-types/**/*.js' && npx cpx './data/**/*' dist/data && npx cpx './artifacts/contracts/**/*' ./abi && npx del-cli './abi/**/*.dbg.json'",
+    "build": "yarn compile && npx del-cli dist abi && npx tsc || true && npx del-cli './dist/typechain-types/**/*.js' && npx cpx './data/**/*' dist/data && npx cpx './artifacts/contracts/**/*' ./abi && npx del-cli './abi/**/*.dbg.json'",
     "compile": "npx hardhat compile --force",
-    "generate": "yarn compile && ./scripts/generate_go.sh || exit 0 && ./scripts/generate_addresses.sh && yarn lint:fix",
+    "generate": "yarn compile && ./scripts/generate_go.sh || true && ./scripts/generate_addresses.sh && yarn lint:fix",
     "lint": "npx eslint . --ext .js,.ts",
     "lint:fix": "npx eslint . --ext .js,.ts,.json --fix",
     "prepublishOnly": "yarn build",