Merge branch 'master' into feature/zklink-network

# Conflicts: # package.json
Cryptorubic · Apr 17, 2024 · 3e903c7 · 3e903c7
2 parents 06f388f + fa5c3d0
commit 3e903c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/features/common/constants/proxy-supported-blockchain.ts b/src/features/common/constants/proxy-supported-blockchain.ts
@@ -27,7 +27,8 @@ export const proxySupportedBlockchains = [
     BLOCKCHAIN_NAME.MERLIN,
     BLOCKCHAIN_NAME.ROOTSTOCK,
     BLOCKCHAIN_NAME.MODE,
-    BLOCKCHAIN_NAME.ZK_FAIR
+    BLOCKCHAIN_NAME.ZK_FAIR,
+    BLOCKCHAIN_NAME.ZETACHAIN
     // BLOCKCHAIN_NAME.OKE_X_CHAIN,
     // BLOCKCHAIN_NAME.GNOSIS,
     // BLOCKCHAIN_NAME.FUSE,

diff --git a/...ross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address.ts b/...ross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address.ts
@@ -13,7 +13,8 @@ const ALTERNATIVE_ROUTER1_NETWORKS = [
     BLOCKCHAIN_NAME.HORIZEN_EON,
     BLOCKCHAIN_NAME.MERLIN,
     BLOCKCHAIN_NAME.MODE,
-    BLOCKCHAIN_NAME.ZK_FAIR
+    BLOCKCHAIN_NAME.ZK_FAIR,
+    BLOCKCHAIN_NAME.ZETACHAIN
 ] as const;
 
 function isAlternativeRouter1Network(blockchain: BlockchainName): boolean {