remove duplicate zetatoken

zeta-chain · Feb 8, 2024 · 9bf2fea · 9bf2fea
1 parent dc0cb11
commit 9bf2fea
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 62 deletions.
diff --git a/data/addresses.mainnet.json b/data/addresses.mainnet.json
@@ -223,13 +223,6 @@
     "chain_name": "eth_mainnet",
     "type": "erc20Custody"
   },
-  {
-    "address": "0xaf28a257D292e7f0E531073f70a175b57E0261a8",
-    "category": "omnichain",
-    "chain_id": 56,
-    "chain_name": "bsc_mainnet",
-    "type": "tssUpdater"
-  },
   {
     "address": "0xaeB6dDB7708467814D557e340283248be8E43124",
     "category": "omnichain",
@@ -239,10 +232,10 @@
   },
   {
     "address": "0xaf28a257D292e7f0E531073f70a175b57E0261a8",
-    "category": "messaging",
+    "category": "omnichain",
     "chain_id": 56,
     "chain_name": "bsc_mainnet",
-    "type": "pauser"
+    "type": "tssUpdater"
   },
   {
     "address": "0xaeB6dDB7708467814D557e340283248be8E43124",
@@ -251,6 +244,13 @@
     "chain_name": "eth_mainnet",
     "type": "pauser"
   },
+  {
+    "address": "0xaf28a257D292e7f0E531073f70a175b57E0261a8",
+    "category": "messaging",
+    "chain_id": 56,
+    "chain_name": "bsc_mainnet",
+    "type": "pauser"
+  },
   {
     "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
     "category": "messaging",
@@ -265,13 +265,6 @@
     "chain_name": "eth_mainnet",
     "type": "uniswapV2Factory"
   },
-  {
-    "address": "0x5F0b1a82749cb4E2278EC87F8BF6B618dC71a8bf",
-    "category": "messaging",
-    "chain_id": 7000,
-    "chain_name": "zeta_mainnet",
-    "type": "weth9"
-  },
   {
     "address": "0x9fd96203f7b22bCF72d9DCb40ff98302376cE09c",
     "category": "messaging",

diff --git a/data/addresses.testnet.json b/data/addresses.testnet.json
@@ -223,27 +223,6 @@
     "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",
@@ -287,32 +266,46 @@
     "type": "erc20Custody"
   },
   {
-    "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
+    "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": 5,
-    "chain_name": "goerli_testnet",
-    "type": "tssUpdater"
+    "chain_id": 97,
+    "chain_name": "bsc_testnet",
+    "type": "erc20Custody"
   },
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "category": "omnichain",
-    "chain_id": 80001,
-    "chain_name": "mumbai_testnet",
+    "chain_id": 97,
+    "chain_name": "bsc_testnet",
     "type": "tssUpdater"
   },
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "category": "omnichain",
-    "chain_id": 97,
-    "chain_name": "bsc_testnet",
+    "chain_id": 5,
+    "chain_name": "goerli_testnet",
     "type": "tssUpdater"
   },
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
-    "category": "messaging",
+    "category": "omnichain",
     "chain_id": 80001,
     "chain_name": "mumbai_testnet",
-    "type": "pauser"
+    "type": "tssUpdater"
   },
   {
     "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
@@ -328,6 +321,13 @@
     "chain_name": "bsc_testnet",
     "type": "pauser"
   },
+  {
+    "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
+    "category": "messaging",
+    "chain_id": 80001,
+    "chain_name": "mumbai_testnet",
+    "type": "pauser"
+  },
   {
     "address": "0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889",
     "category": "messaging",
@@ -370,13 +370,6 @@
     "chain_name": "goerli_testnet",
     "type": "uniswapV2Factory"
   },
-  {
-    "address": "0x5F0b1a82749cb4E2278EC87F8BF6B618dC71a8bf",
-    "category": "messaging",
-    "chain_id": 7001,
-    "chain_name": "zeta_testnet",
-    "type": "weth9"
-  },
   {
     "address": "0x9fd96203f7b22bCF72d9DCb40ff98302376cE09c",
     "category": "messaging",

diff --git a/tasks/addresses.ts b/tasks/addresses.ts
@@ -249,14 +249,16 @@ const fetchFactoryV2 = async (addresses: any, hre: HardhatRuntimeEnvironment, ne
       const wethAddress = await routerContract.WETH();
       const factoryAddress = await routerContract.factory();
 
-      // Adding WETH and Factory addresses to the addresses array
-      addresses.push({
-        address: wethAddress,
-        category: "messaging",
-        chain_id: router.chain_id,
-        chain_name: router.chain_name,
-        type: "weth9",
-      });
+      // Skip ZetaChain as we've already added ZETA token
+      if (router.chain_id !== 7000 && router.chain_id !== 7001) {
+        addresses.push({
+          address: wethAddress,
+          category: "messaging",
+          chain_id: router.chain_id,
+          chain_name: router.chain_name,
+          type: "weth9",
+        });
+      }
 
       addresses.push({
         address: factoryAddress,