Merge branch 'init-prototypes' into prototype-localnet

zeta-chain · Jul 2, 2024 · 022fee2 · 022fee2
2 parents 7e3ad3e + 69d5763
commit 022fee2
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 14 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-*     @andresaiello @brewmaster012 @lumtis @charliemc0 @fadeev @skosito
+*     @andresaiello @brewmaster012 @lumtis @charliemc0 @fadeev @skosito @fbac
diff --git a/data/addresses.testnet.json b/data/addresses.testnet.json
@@ -269,6 +269,48 @@
     "chain_name": "btc_testnet",
     "type": "tss"
   },
+  {
+    "address": "0x60E6b70bC2761f878Ff992276612F67FbABC1761",
+    "category": "messaging",
+    "chain_id": 80002,
+    "chain_name": "amoy_testnet",
+    "type": "connector"
+  },
+  {
+    "address": "0xFDE448af6140a8702A1165c44A0895ebE24b0C02",
+    "category": "omnichain",
+    "chain_id": 80002,
+    "chain_name": "amoy_testnet",
+    "type": "erc20Custody"
+  },
+  {
+    "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
+    "category": "messaging",
+    "chain_id": 80002,
+    "chain_name": "amoy_testnet",
+    "type": "pauser"
+  },
+  {
+    "address": "0x8531a5aB847ff5B22D855633C25ED1DA3255247e",
+    "category": "omnichain",
+    "chain_id": 80002,
+    "chain_name": "amoy_testnet",
+    "type": "tss"
+  },
+  {
+    "address": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
+    "category": "omnichain",
+    "chain_id": 80002,
+    "chain_name": "amoy_testnet",
+    "type": "tssUpdater"
+  },
+  {
+    "address": "0x1432612E60cad487C857E7D38AFf57134916c902",
+    "category": "messaging",
+    "chain_id": 80002,
+    "chain_name": "amoy_testnet",
+    "type": "zetaToken"
+  },
   {
     "address": "0x3963341dad121c9CD33046089395D66eBF20Fb03",
     "category": "messaging",

diff --git a/lib/types.ts b/lib/types.ts
@@ -15,6 +15,7 @@ export type ParamSymbol =
   | "USDT.BSC"
   | "USDT.ETH";
 export type ParamChainName =
+  | "amoy_testnet"
   | "bsc_mainnet"
   | "bsc_testnet"
   | "btc_mainnet"

diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "@uniswap/v2-core": "^1.0.1",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "@uniswap/v3-periphery": "^1.4.3",
-    "@zetachain/networks": "8.0.0-rc1",
+    "@zetachain/networks": "8.0.0",
     "axios": "^1.6.5",
     "chai": "^4.3.6",
     "cpx": "^1.5.0",

diff --git a/pkg/contracts/prototypes/evm/erc20custodynew.sol/erc20custodynew.go b/pkg/contracts/prototypes/evm/erc20custodynew.sol/erc20custodynew.go
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @andresaiello @brewmaster012 @lumtis @charliemc0 @fadeev @skosito
		* @andresaiello @brewmaster012 @lumtis @charliemc0 @fadeev @skosito @fbac