From 075949a69f0c8149ef2c0d11138d0dc99b5ba277 Mon Sep 17 00:00:00 2001 From: pseudoelement Date: Mon, 1 Jul 2024 12:48:19 +0300 Subject: [PATCH 1/8] 2476, update supported chains --- package.json | 2 +- .../rango/constants/rango-contract-address.ts | 27 +++++++++++-------- .../models/rango-api-blockchain-names.ts | 7 ++--- .../rango/models/rango-api-symbol-names.ts | 7 ++--- .../models/rango-supported-blockchains.ts | 7 ++--- .../lifi-cross-chain-supported-blockchain.ts | 6 ++++- .../constants/meson-contract-addresses.ts | 4 ++- .../meson-cross-chain-supported-chains.ts | 3 ++- .../models/orbiter-contract-addresses.ts | 7 ++--- .../models/orbiter-supported-blockchains.ts | 7 ++--- .../constants/xy-dex-supported-blockchains.ts | 3 ++- 11 files changed, 49 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index c6e9861e3d6..3670ab4ac02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubic-sdk", - "version": "5.29.1", + "version": "5.30.0-alpha.new-chains.1", "description": "Simplify dApp creation", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/src/features/common/providers/rango/constants/rango-contract-address.ts b/src/features/common/providers/rango/constants/rango-contract-address.ts index 9a3704b190a..408ee94a040 100644 --- a/src/features/common/providers/rango/constants/rango-contract-address.ts +++ b/src/features/common/providers/rango/constants/rango-contract-address.ts @@ -61,23 +61,28 @@ export const rangoContractAddresses: Record = [BLOCKCHAIN_NAME.BASE]: 'BASE', [BLOCKCHAIN_NAME.METIS]: 'METIS', [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', - [BLOCKCHAIN_NAME.LINEA]: 'LINEA' - // [BLOCKCHAIN_NAME.BLAST]: 'BLAST', - // [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' + [BLOCKCHAIN_NAME.LINEA]: 'LINEA', + [BLOCKCHAIN_NAME.FANTOM]: 'FANTOM', + [BLOCKCHAIN_NAME.BLAST]: 'BLAST', + [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' }; export type RangoBlockchainName = keyof typeof rangoApiBlockchainNames; diff --git a/src/features/common/providers/rango/models/rango-api-symbol-names.ts b/src/features/common/providers/rango/models/rango-api-symbol-names.ts index bf07ef574c2..50e1118ce81 100644 --- a/src/features/common/providers/rango/models/rango-api-symbol-names.ts +++ b/src/features/common/providers/rango/models/rango-api-symbol-names.ts @@ -15,9 +15,10 @@ export const rangoApiSymbols: Record = { [BLOCKCHAIN_NAME.BASE]: 'ETH', [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', [BLOCKCHAIN_NAME.LINEA]: 'ETH', - [BLOCKCHAIN_NAME.METIS]: 'METIS' - // [BLOCKCHAIN_NAME.BLAST]: 'ETH', - // [BLOCKCHAIN_NAME.SCROLL]: 'ETH' + [BLOCKCHAIN_NAME.METIS]: 'METIS', + [BLOCKCHAIN_NAME.FANTOM]: 'FTM', + [BLOCKCHAIN_NAME.BLAST]: 'ETH', + [BLOCKCHAIN_NAME.SCROLL]: 'ETH' }; export type RangoSymbols = keyof typeof rangoApiSymbols; diff --git a/src/features/common/providers/rango/models/rango-supported-blockchains.ts b/src/features/common/providers/rango/models/rango-supported-blockchains.ts index 862d6206a3e..7bfc82a37c3 100644 --- a/src/features/common/providers/rango/models/rango-supported-blockchains.ts +++ b/src/features/common/providers/rango/models/rango-supported-blockchains.ts @@ -13,9 +13,10 @@ export const rangoSupportedBlockchains = [ BLOCKCHAIN_NAME.METIS, BLOCKCHAIN_NAME.ZK_SYNC, BLOCKCHAIN_NAME.BASE, - BLOCKCHAIN_NAME.LINEA - // BLOCKCHAIN_NAME.BLAST - // BLOCKCHAIN_NAME.SCROLL + BLOCKCHAIN_NAME.LINEA, + BLOCKCHAIN_NAME.BLAST, + BLOCKCHAIN_NAME.SCROLL, + BLOCKCHAIN_NAME.FANTOM ] as const; export type RangoSupportedBlockchain = (typeof rangoSupportedBlockchains)[number]; diff --git a/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts b/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts index 13db6cbd109..3427107077f 100644 --- a/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts +++ b/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts @@ -18,7 +18,11 @@ export const lifiCrossChainSupportedBlockchains = [ BLOCKCHAIN_NAME.LINEA, BLOCKCHAIN_NAME.MODE, BLOCKCHAIN_NAME.SCROLL, - BLOCKCHAIN_NAME.MANTLE + BLOCKCHAIN_NAME.MANTLE, + BLOCKCHAIN_NAME.ROOTSTOCK, + BLOCKCHAIN_NAME.CELO, + BLOCKCHAIN_NAME.BLAST, + BLOCKCHAIN_NAME.AURORA ] as const; export type LifiCrossChainSupportedBlockchain = (typeof lifiCrossChainSupportedBlockchains)[number]; diff --git a/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-contract-addresses.ts b/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-contract-addresses.ts index 68e59eddcae..1242f875c58 100644 --- a/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-contract-addresses.ts +++ b/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-contract-addresses.ts @@ -34,6 +34,8 @@ export const mesonContractAddresses: Record = [BLOCKCHAIN_NAME.ZK_LINK]: '0x2DcC88Fa6b6950EE28245C3238B8993BE5feeA42', [BLOCKCHAIN_NAME.ZK_SYNC]: '0x2DcC88Fa6b6950EE28245C3238B8993BE5feeA42', [BLOCKCHAIN_NAME.ZETACHAIN]: '0x25aB3Efd52e6470681CE037cD546Dc60726948D3', - [BLOCKCHAIN_NAME.CORE]: '0x25aB3Efd52e6470681CE037cD546Dc60726948D3' + [BLOCKCHAIN_NAME.CORE]: '0x25aB3Efd52e6470681CE037cD546Dc60726948D3', + // @TODO add kroma contract + [BLOCKCHAIN_NAME.KROMA]: '' // [BLOCKCHAIN_NAME.TAIKO]: '0x25aB3Efd52e6470681CE037cD546Dc60726948D3' }; diff --git a/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-cross-chain-supported-chains.ts b/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-cross-chain-supported-chains.ts index f00455f9588..1a196375cdf 100644 --- a/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-cross-chain-supported-chains.ts +++ b/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-cross-chain-supported-chains.ts @@ -32,7 +32,8 @@ export const mesonCrossChainSupportedChains = [ BLOCKCHAIN_NAME.ZK_FAIR, BLOCKCHAIN_NAME.ZK_LINK, BLOCKCHAIN_NAME.ZK_SYNC, - BLOCKCHAIN_NAME.CORE + BLOCKCHAIN_NAME.CORE, + BLOCKCHAIN_NAME.KROMA // BLOCKCHAIN_NAME.TAIKO ] as const; diff --git a/src/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-contract-addresses.ts b/src/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-contract-addresses.ts index 26140dc3f11..50ce3355241 100644 --- a/src/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-contract-addresses.ts +++ b/src/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-contract-addresses.ts @@ -24,7 +24,8 @@ export const orbiterContractAddresses: Record Date: Tue, 2 Jul 2024 13:48:23 +0300 Subject: [PATCH 2/8] 2476, add kroma contract address to meson --- package.json | 2 +- .../meson-provider/constants/meson-contract-addresses.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 3670ab4ac02..5efa29e75da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubic-sdk", - "version": "5.30.0-alpha.new-chains.1", + "version": "5.30.0-alpha.new-chains.2", "description": "Simplify dApp creation", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-contract-addresses.ts b/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-contract-addresses.ts index 1242f875c58..16a756038e7 100644 --- a/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-contract-addresses.ts +++ b/src/features/cross-chain/calculation-manager/providers/meson-provider/constants/meson-contract-addresses.ts @@ -35,7 +35,6 @@ export const mesonContractAddresses: Record = [BLOCKCHAIN_NAME.ZK_SYNC]: '0x2DcC88Fa6b6950EE28245C3238B8993BE5feeA42', [BLOCKCHAIN_NAME.ZETACHAIN]: '0x25aB3Efd52e6470681CE037cD546Dc60726948D3', [BLOCKCHAIN_NAME.CORE]: '0x25aB3Efd52e6470681CE037cD546Dc60726948D3', - // @TODO add kroma contract - [BLOCKCHAIN_NAME.KROMA]: '' + [BLOCKCHAIN_NAME.KROMA]: '0x25aB3Efd52e6470681CE037cD546Dc60726948D3' // [BLOCKCHAIN_NAME.TAIKO]: '0x25aB3Efd52e6470681CE037cD546Dc60726948D3' }; From 4e296b1f4ace655ae8de082a42f3adca29283c68 Mon Sep 17 00:00:00 2001 From: PseudoElement Date: Fri, 26 Jul 2024 17:03:05 +0300 Subject: [PATCH 3/8] 2476, fix by google-doc --- package.json | 4 ++-- .../rango/constants/rango-contract-address.ts | 10 +++++----- .../rango/models/rango-api-blockchain-names.ts | 2 +- .../rango/models/rango-api-symbol-names.ts | 2 +- .../rango/models/rango-supported-blockchains.ts | 4 ++-- .../lifi-cross-chain-supported-blockchain.ts | 6 +++--- .../models/orbiter-contract-addresses.ts | 2 +- .../models/orbiter-supported-blockchains.ts | 2 +- .../constants/owl-to-supported-chains.ts | 2 +- .../providers/owl-to-bridge/owl-to-bridge-trade.ts | 1 - yarn.lock | 14 ++++++++++++++ 11 files changed, 31 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 386ff21a366..9a29be3ba1a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubic-sdk", - "version": "5.33.0-alpha.aggregation.1", + "version": "5.33.0-alpha.aggregation.4", "description": "Simplify dApp creation", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -83,7 +83,7 @@ "@solflare-wallet/utl-sdk": "^1.4.0", "@viaprotocol/router-sdk": "^1.0.7", "assert": "^2.0.0", - "axios": "^0.26.1", + "axios": "^1.7.2", "bignumber.js": "9.1.0", "bitcoin-address-validation": "2.2.1", "browserify-zlib": "^0.2.0", diff --git a/src/features/common/providers/rango/constants/rango-contract-address.ts b/src/features/common/providers/rango/constants/rango-contract-address.ts index 408ee94a040..50054c73bc6 100644 --- a/src/features/common/providers/rango/constants/rango-contract-address.ts +++ b/src/features/common/providers/rango/constants/rango-contract-address.ts @@ -79,10 +79,10 @@ export const rangoContractAddresses: Record = [BLOCKCHAIN_NAME.METIS]: 'METIS', [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', [BLOCKCHAIN_NAME.LINEA]: 'LINEA', - [BLOCKCHAIN_NAME.FANTOM]: 'FANTOM', + // [BLOCKCHAIN_NAME.FANTOM]: 'FANTOM', [BLOCKCHAIN_NAME.BLAST]: 'BLAST', [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' }; diff --git a/src/features/common/providers/rango/models/rango-api-symbol-names.ts b/src/features/common/providers/rango/models/rango-api-symbol-names.ts index 50e1118ce81..b007e7880c9 100644 --- a/src/features/common/providers/rango/models/rango-api-symbol-names.ts +++ b/src/features/common/providers/rango/models/rango-api-symbol-names.ts @@ -16,7 +16,7 @@ export const rangoApiSymbols: Record = { [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', [BLOCKCHAIN_NAME.LINEA]: 'ETH', [BLOCKCHAIN_NAME.METIS]: 'METIS', - [BLOCKCHAIN_NAME.FANTOM]: 'FTM', + // [BLOCKCHAIN_NAME.FANTOM]: 'FTM', [BLOCKCHAIN_NAME.BLAST]: 'ETH', [BLOCKCHAIN_NAME.SCROLL]: 'ETH' }; diff --git a/src/features/common/providers/rango/models/rango-supported-blockchains.ts b/src/features/common/providers/rango/models/rango-supported-blockchains.ts index 7bfc82a37c3..ad6af5b5f2d 100644 --- a/src/features/common/providers/rango/models/rango-supported-blockchains.ts +++ b/src/features/common/providers/rango/models/rango-supported-blockchains.ts @@ -15,8 +15,8 @@ export const rangoSupportedBlockchains = [ BLOCKCHAIN_NAME.BASE, BLOCKCHAIN_NAME.LINEA, BLOCKCHAIN_NAME.BLAST, - BLOCKCHAIN_NAME.SCROLL, - BLOCKCHAIN_NAME.FANTOM + BLOCKCHAIN_NAME.SCROLL + // BLOCKCHAIN_NAME.FANTOM ] as const; export type RangoSupportedBlockchain = (typeof rangoSupportedBlockchains)[number]; diff --git a/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts b/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts index 3427107077f..d7ed06a51ae 100644 --- a/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts +++ b/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts @@ -20,9 +20,9 @@ export const lifiCrossChainSupportedBlockchains = [ BLOCKCHAIN_NAME.SCROLL, BLOCKCHAIN_NAME.MANTLE, BLOCKCHAIN_NAME.ROOTSTOCK, - BLOCKCHAIN_NAME.CELO, - BLOCKCHAIN_NAME.BLAST, - BLOCKCHAIN_NAME.AURORA + // BLOCKCHAIN_NAME.CELO, + BLOCKCHAIN_NAME.BLAST + // BLOCKCHAIN_NAME.AURORA ] as const; export type LifiCrossChainSupportedBlockchain = (typeof lifiCrossChainSupportedBlockchains)[number]; diff --git a/src/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-contract-addresses.ts b/src/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-contract-addresses.ts index 50ce3355241..7bab56b3dbb 100644 --- a/src/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-contract-addresses.ts +++ b/src/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-contract-addresses.ts @@ -25,7 +25,7 @@ export const orbiterContractAddresses: Record Date: Tue, 30 Jul 2024 13:40:47 +0300 Subject: [PATCH 4/8] 2476, disable breoken chains in rango and lifi --- package.json | 2 +- .../rango/constants/rango-contract-address.ts | 30 +++++++++---------- .../models/rango-api-blockchain-names.ts | 8 ++--- .../rango/models/rango-api-symbol-names.ts | 8 ++--- .../models/rango-supported-blockchains.ts | 9 +++--- .../lifi-cross-chain-supported-blockchain.ts | 4 +-- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 9a29be3ba1a..067e8785834 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubic-sdk", - "version": "5.33.0-alpha.aggregation.4", + "version": "5.33.0-alpha.aggregation.5", "description": "Simplify dApp creation", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/src/features/common/providers/rango/constants/rango-contract-address.ts b/src/features/common/providers/rango/constants/rango-contract-address.ts index 50054c73bc6..036caf18efc 100644 --- a/src/features/common/providers/rango/constants/rango-contract-address.ts +++ b/src/features/common/providers/rango/constants/rango-contract-address.ts @@ -60,26 +60,26 @@ export const rangoContractAddresses: Record = [BLOCKCHAIN_NAME.AURORA]: 'AURORA', [BLOCKCHAIN_NAME.BASE]: 'BASE', [BLOCKCHAIN_NAME.METIS]: 'METIS', - [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', - [BLOCKCHAIN_NAME.LINEA]: 'LINEA', + // [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', + [BLOCKCHAIN_NAME.LINEA]: 'LINEA' // [BLOCKCHAIN_NAME.FANTOM]: 'FANTOM', - [BLOCKCHAIN_NAME.BLAST]: 'BLAST', - [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' + // [BLOCKCHAIN_NAME.BLAST]: 'BLAST', + // [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' }; export type RangoBlockchainName = keyof typeof rangoApiBlockchainNames; diff --git a/src/features/common/providers/rango/models/rango-api-symbol-names.ts b/src/features/common/providers/rango/models/rango-api-symbol-names.ts index b007e7880c9..6cdbda2d963 100644 --- a/src/features/common/providers/rango/models/rango-api-symbol-names.ts +++ b/src/features/common/providers/rango/models/rango-api-symbol-names.ts @@ -13,12 +13,12 @@ export const rangoApiSymbols: Record = { [BLOCKCHAIN_NAME.POLYGON_ZKEVM]: 'ETH', [BLOCKCHAIN_NAME.AURORA]: 'ETH', [BLOCKCHAIN_NAME.BASE]: 'ETH', - [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', + // [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', [BLOCKCHAIN_NAME.LINEA]: 'ETH', - [BLOCKCHAIN_NAME.METIS]: 'METIS', + [BLOCKCHAIN_NAME.METIS]: 'METIS' // [BLOCKCHAIN_NAME.FANTOM]: 'FTM', - [BLOCKCHAIN_NAME.BLAST]: 'ETH', - [BLOCKCHAIN_NAME.SCROLL]: 'ETH' + // [BLOCKCHAIN_NAME.BLAST]: 'ETH', + // [BLOCKCHAIN_NAME.SCROLL]: 'ETH' }; export type RangoSymbols = keyof typeof rangoApiSymbols; diff --git a/src/features/common/providers/rango/models/rango-supported-blockchains.ts b/src/features/common/providers/rango/models/rango-supported-blockchains.ts index ad6af5b5f2d..58744233e2c 100644 --- a/src/features/common/providers/rango/models/rango-supported-blockchains.ts +++ b/src/features/common/providers/rango/models/rango-supported-blockchains.ts @@ -11,12 +11,11 @@ export const rangoSupportedBlockchains = [ BLOCKCHAIN_NAME.POLYGON_ZKEVM, BLOCKCHAIN_NAME.AURORA, BLOCKCHAIN_NAME.METIS, - BLOCKCHAIN_NAME.ZK_SYNC, + // BLOCKCHAIN_NAME.ZK_SYNC, BLOCKCHAIN_NAME.BASE, - BLOCKCHAIN_NAME.LINEA, - BLOCKCHAIN_NAME.BLAST, - BLOCKCHAIN_NAME.SCROLL - // BLOCKCHAIN_NAME.FANTOM + BLOCKCHAIN_NAME.LINEA + // BLOCKCHAIN_NAME.BLAST, + // BLOCKCHAIN_NAME.SCROLL ] as const; export type RangoSupportedBlockchain = (typeof rangoSupportedBlockchains)[number]; diff --git a/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts b/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts index d7ed06a51ae..ba25dbecc75 100644 --- a/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts +++ b/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts @@ -17,9 +17,9 @@ export const lifiCrossChainSupportedBlockchains = [ BLOCKCHAIN_NAME.ZK_SYNC, BLOCKCHAIN_NAME.LINEA, BLOCKCHAIN_NAME.MODE, - BLOCKCHAIN_NAME.SCROLL, + // BLOCKCHAIN_NAME.SCROLL, BLOCKCHAIN_NAME.MANTLE, - BLOCKCHAIN_NAME.ROOTSTOCK, + // BLOCKCHAIN_NAME.ROOTSTOCK, // BLOCKCHAIN_NAME.CELO, BLOCKCHAIN_NAME.BLAST // BLOCKCHAIN_NAME.AURORA From 5dc526bde851c539516e4b33b579a3b072b7bb71 Mon Sep 17 00:00:00 2001 From: PseudoElement Date: Mon, 5 Aug 2024 14:58:08 +0300 Subject: [PATCH 5/8] 2476, fix commented blockchains after harmful merge --- .../rango/constants/rango-contract-address.ts | 30 +++++++++---------- .../models/rango-api-blockchain-names.ts | 8 ++--- .../rango/models/rango-api-symbol-names.ts | 8 ++--- .../models/rango-supported-blockchains.ts | 8 ++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/features/common/providers/rango/constants/rango-contract-address.ts b/src/features/common/providers/rango/constants/rango-contract-address.ts index 036caf18efc..4ab420b1b85 100644 --- a/src/features/common/providers/rango/constants/rango-contract-address.ts +++ b/src/features/common/providers/rango/constants/rango-contract-address.ts @@ -60,26 +60,26 @@ export const rangoContractAddresses: Record = [BLOCKCHAIN_NAME.AURORA]: 'AURORA', [BLOCKCHAIN_NAME.BASE]: 'BASE', [BLOCKCHAIN_NAME.METIS]: 'METIS', - // [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', - [BLOCKCHAIN_NAME.LINEA]: 'LINEA' + [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', + [BLOCKCHAIN_NAME.LINEA]: 'LINEA', + [BLOCKCHAIN_NAME.BLAST]: 'BLAST', + [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' // [BLOCKCHAIN_NAME.FANTOM]: 'FANTOM', - // [BLOCKCHAIN_NAME.BLAST]: 'BLAST', - // [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' }; export type RangoBlockchainName = keyof typeof rangoApiBlockchainNames; diff --git a/src/features/common/providers/rango/models/rango-api-symbol-names.ts b/src/features/common/providers/rango/models/rango-api-symbol-names.ts index 6cdbda2d963..b007e7880c9 100644 --- a/src/features/common/providers/rango/models/rango-api-symbol-names.ts +++ b/src/features/common/providers/rango/models/rango-api-symbol-names.ts @@ -13,12 +13,12 @@ export const rangoApiSymbols: Record = { [BLOCKCHAIN_NAME.POLYGON_ZKEVM]: 'ETH', [BLOCKCHAIN_NAME.AURORA]: 'ETH', [BLOCKCHAIN_NAME.BASE]: 'ETH', - // [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', + [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', [BLOCKCHAIN_NAME.LINEA]: 'ETH', - [BLOCKCHAIN_NAME.METIS]: 'METIS' + [BLOCKCHAIN_NAME.METIS]: 'METIS', // [BLOCKCHAIN_NAME.FANTOM]: 'FTM', - // [BLOCKCHAIN_NAME.BLAST]: 'ETH', - // [BLOCKCHAIN_NAME.SCROLL]: 'ETH' + [BLOCKCHAIN_NAME.BLAST]: 'ETH', + [BLOCKCHAIN_NAME.SCROLL]: 'ETH' }; export type RangoSymbols = keyof typeof rangoApiSymbols; diff --git a/src/features/common/providers/rango/models/rango-supported-blockchains.ts b/src/features/common/providers/rango/models/rango-supported-blockchains.ts index 58744233e2c..9e9d508aed3 100644 --- a/src/features/common/providers/rango/models/rango-supported-blockchains.ts +++ b/src/features/common/providers/rango/models/rango-supported-blockchains.ts @@ -11,11 +11,11 @@ export const rangoSupportedBlockchains = [ BLOCKCHAIN_NAME.POLYGON_ZKEVM, BLOCKCHAIN_NAME.AURORA, BLOCKCHAIN_NAME.METIS, - // BLOCKCHAIN_NAME.ZK_SYNC, + BLOCKCHAIN_NAME.ZK_SYNC, BLOCKCHAIN_NAME.BASE, - BLOCKCHAIN_NAME.LINEA - // BLOCKCHAIN_NAME.BLAST, - // BLOCKCHAIN_NAME.SCROLL + BLOCKCHAIN_NAME.LINEA, + BLOCKCHAIN_NAME.BLAST, + BLOCKCHAIN_NAME.SCROLL ] as const; export type RangoSupportedBlockchain = (typeof rangoSupportedBlockchains)[number]; From 27c1fedc0ee8bda9a9cc0f9acecce67122d31426 Mon Sep 17 00:00:00 2001 From: PseudoElement Date: Mon, 5 Aug 2024 15:02:54 +0300 Subject: [PATCH 6/8] Revert "2476, fix commented blockchains after harmful merge" This reverts commit 5dc526bde851c539516e4b33b579a3b072b7bb71. --- .../rango/constants/rango-contract-address.ts | 30 +++++++++---------- .../models/rango-api-blockchain-names.ts | 8 ++--- .../rango/models/rango-api-symbol-names.ts | 8 ++--- .../models/rango-supported-blockchains.ts | 8 ++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/features/common/providers/rango/constants/rango-contract-address.ts b/src/features/common/providers/rango/constants/rango-contract-address.ts index 4ab420b1b85..036caf18efc 100644 --- a/src/features/common/providers/rango/constants/rango-contract-address.ts +++ b/src/features/common/providers/rango/constants/rango-contract-address.ts @@ -60,26 +60,26 @@ export const rangoContractAddresses: Record = [BLOCKCHAIN_NAME.AURORA]: 'AURORA', [BLOCKCHAIN_NAME.BASE]: 'BASE', [BLOCKCHAIN_NAME.METIS]: 'METIS', - [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', - [BLOCKCHAIN_NAME.LINEA]: 'LINEA', - [BLOCKCHAIN_NAME.BLAST]: 'BLAST', - [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' + // [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', + [BLOCKCHAIN_NAME.LINEA]: 'LINEA' // [BLOCKCHAIN_NAME.FANTOM]: 'FANTOM', + // [BLOCKCHAIN_NAME.BLAST]: 'BLAST', + // [BLOCKCHAIN_NAME.SCROLL]: 'SCROLL' }; export type RangoBlockchainName = keyof typeof rangoApiBlockchainNames; diff --git a/src/features/common/providers/rango/models/rango-api-symbol-names.ts b/src/features/common/providers/rango/models/rango-api-symbol-names.ts index b007e7880c9..6cdbda2d963 100644 --- a/src/features/common/providers/rango/models/rango-api-symbol-names.ts +++ b/src/features/common/providers/rango/models/rango-api-symbol-names.ts @@ -13,12 +13,12 @@ export const rangoApiSymbols: Record = { [BLOCKCHAIN_NAME.POLYGON_ZKEVM]: 'ETH', [BLOCKCHAIN_NAME.AURORA]: 'ETH', [BLOCKCHAIN_NAME.BASE]: 'ETH', - [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', + // [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', [BLOCKCHAIN_NAME.LINEA]: 'ETH', - [BLOCKCHAIN_NAME.METIS]: 'METIS', + [BLOCKCHAIN_NAME.METIS]: 'METIS' // [BLOCKCHAIN_NAME.FANTOM]: 'FTM', - [BLOCKCHAIN_NAME.BLAST]: 'ETH', - [BLOCKCHAIN_NAME.SCROLL]: 'ETH' + // [BLOCKCHAIN_NAME.BLAST]: 'ETH', + // [BLOCKCHAIN_NAME.SCROLL]: 'ETH' }; export type RangoSymbols = keyof typeof rangoApiSymbols; diff --git a/src/features/common/providers/rango/models/rango-supported-blockchains.ts b/src/features/common/providers/rango/models/rango-supported-blockchains.ts index 9e9d508aed3..58744233e2c 100644 --- a/src/features/common/providers/rango/models/rango-supported-blockchains.ts +++ b/src/features/common/providers/rango/models/rango-supported-blockchains.ts @@ -11,11 +11,11 @@ export const rangoSupportedBlockchains = [ BLOCKCHAIN_NAME.POLYGON_ZKEVM, BLOCKCHAIN_NAME.AURORA, BLOCKCHAIN_NAME.METIS, - BLOCKCHAIN_NAME.ZK_SYNC, + // BLOCKCHAIN_NAME.ZK_SYNC, BLOCKCHAIN_NAME.BASE, - BLOCKCHAIN_NAME.LINEA, - BLOCKCHAIN_NAME.BLAST, - BLOCKCHAIN_NAME.SCROLL + BLOCKCHAIN_NAME.LINEA + // BLOCKCHAIN_NAME.BLAST, + // BLOCKCHAIN_NAME.SCROLL ] as const; export type RangoSupportedBlockchain = (typeof rangoSupportedBlockchains)[number]; From 2db0c7a2becaf1635ea161cb4f08baddb3f2730b Mon Sep 17 00:00:00 2001 From: PseudoElement Date: Mon, 5 Aug 2024 15:11:32 +0300 Subject: [PATCH 7/8] 2476, fix rango zkSync --- .../rango/constants/rango-contract-address.ts | 10 +++++----- .../rango/models/rango-api-blockchain-names.ts | 2 +- .../providers/rango/models/rango-api-symbol-names.ts | 2 +- .../rango/models/rango-supported-blockchains.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/features/common/providers/rango/constants/rango-contract-address.ts b/src/features/common/providers/rango/constants/rango-contract-address.ts index 036caf18efc..d08c6e886f7 100644 --- a/src/features/common/providers/rango/constants/rango-contract-address.ts +++ b/src/features/common/providers/rango/constants/rango-contract-address.ts @@ -60,11 +60,11 @@ export const rangoContractAddresses: Record = [BLOCKCHAIN_NAME.AURORA]: 'AURORA', [BLOCKCHAIN_NAME.BASE]: 'BASE', [BLOCKCHAIN_NAME.METIS]: 'METIS', - // [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', + [BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC', [BLOCKCHAIN_NAME.LINEA]: 'LINEA' // [BLOCKCHAIN_NAME.FANTOM]: 'FANTOM', // [BLOCKCHAIN_NAME.BLAST]: 'BLAST', diff --git a/src/features/common/providers/rango/models/rango-api-symbol-names.ts b/src/features/common/providers/rango/models/rango-api-symbol-names.ts index 6cdbda2d963..92f02398827 100644 --- a/src/features/common/providers/rango/models/rango-api-symbol-names.ts +++ b/src/features/common/providers/rango/models/rango-api-symbol-names.ts @@ -13,7 +13,7 @@ export const rangoApiSymbols: Record = { [BLOCKCHAIN_NAME.POLYGON_ZKEVM]: 'ETH', [BLOCKCHAIN_NAME.AURORA]: 'ETH', [BLOCKCHAIN_NAME.BASE]: 'ETH', - // [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', + [BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH', [BLOCKCHAIN_NAME.LINEA]: 'ETH', [BLOCKCHAIN_NAME.METIS]: 'METIS' // [BLOCKCHAIN_NAME.FANTOM]: 'FTM', diff --git a/src/features/common/providers/rango/models/rango-supported-blockchains.ts b/src/features/common/providers/rango/models/rango-supported-blockchains.ts index 58744233e2c..1419aeea960 100644 --- a/src/features/common/providers/rango/models/rango-supported-blockchains.ts +++ b/src/features/common/providers/rango/models/rango-supported-blockchains.ts @@ -11,7 +11,7 @@ export const rangoSupportedBlockchains = [ BLOCKCHAIN_NAME.POLYGON_ZKEVM, BLOCKCHAIN_NAME.AURORA, BLOCKCHAIN_NAME.METIS, - // BLOCKCHAIN_NAME.ZK_SYNC, + BLOCKCHAIN_NAME.ZK_SYNC, BLOCKCHAIN_NAME.BASE, BLOCKCHAIN_NAME.LINEA // BLOCKCHAIN_NAME.BLAST, From 693cdc28798eb8c89255bd3594b3f5fa0caae29b Mon Sep 17 00:00:00 2001 From: PseudoElement Date: Mon, 5 Aug 2024 15:21:08 +0300 Subject: [PATCH 8/8] 2476, fix lifi chains --- .../constants/lifi-cross-chain-supported-blockchain.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts b/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts index ba25dbecc75..5c49825c7e6 100644 --- a/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts +++ b/src/features/cross-chain/calculation-manager/providers/lifi-provider/constants/lifi-cross-chain-supported-blockchain.ts @@ -17,11 +17,11 @@ export const lifiCrossChainSupportedBlockchains = [ BLOCKCHAIN_NAME.ZK_SYNC, BLOCKCHAIN_NAME.LINEA, BLOCKCHAIN_NAME.MODE, - // BLOCKCHAIN_NAME.SCROLL, - BLOCKCHAIN_NAME.MANTLE, + BLOCKCHAIN_NAME.SCROLL, + BLOCKCHAIN_NAME.MANTLE // BLOCKCHAIN_NAME.ROOTSTOCK, // BLOCKCHAIN_NAME.CELO, - BLOCKCHAIN_NAME.BLAST + // BLOCKCHAIN_NAME.BLAST // BLOCKCHAIN_NAME.AURORA ] as const;