Feature/add polygon zkevm network

package.json

@@ -1,6 +1,6 @@
 {
     "name": "rubic-sdk",
-    "version": "4.7.3",
+    "version": "4.8.0",
     "description": "Simplify dApp creation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -86,7 +86,7 @@
         "lodash.clonedeep": "^4.5.0",
         "rango-sdk-basic": "^0.0.7",
         "rxjs": "7.8.1",
-        "symbiosis-js-sdk": "^2.9.52",
+        "symbiosis-js-sdk": "2.10.5",
         "tronweb": "^4.3.0",
         "web3": "^1.8.1"
     },

src/common/tokens/constants/native-tokens.ts

@@ -32,6 +32,13 @@ export const nativeTokensList: Record<BlockchainName, Token> = {
         symbol: 'MATIC',
         decimals: 18
     }),
+    [BLOCKCHAIN_NAME.POLYGON_ZKEVM]: new Token({
+        blockchain: BLOCKCHAIN_NAME.POLYGON_ZKEVM,
+        address: EvmWeb3Pure.nativeTokenAddress,
+        name: 'ETH',
+        symbol: 'ETH',
+        decimals: 18
+    }),
     [BLOCKCHAIN_NAME.AVALANCHE]: new Token({
         blockchain: BLOCKCHAIN_NAME.AVALANCHE,
         address: EvmWeb3Pure.nativeTokenAddress,

src/common/tokens/constants/wrapped-native-tokens.ts

@@ -23,6 +23,13 @@ export const wrappedNativeTokensList: Partial<Record<EvmBlockchainName, Token>>
         symbol: 'WMATIC',
         decimals: 18
     }),
+    [BLOCKCHAIN_NAME.POLYGON_ZKEVM]: new Token({
+        blockchain: BLOCKCHAIN_NAME.POLYGON_ZKEVM,
+        address: '0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9',
+        name: 'Wrapped Ether',
+        symbol: 'Weth',
+        decimals: 18
+    }),
     [BLOCKCHAIN_NAME.AVALANCHE]: new Token({
         blockchain: BLOCKCHAIN_NAME.AVALANCHE,
         address: '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7',

src/core/blockchain/models/blockchain-name.ts

@@ -2,6 +2,7 @@ export const EVM_BLOCKCHAIN_NAME = {
     ETHEREUM: 'ETH',
     BINANCE_SMART_CHAIN: 'BSC',
     POLYGON: 'POLYGON',
+    POLYGON_ZKEVM: 'POLYGON_ZKEVM',
     AVALANCHE: 'AVALANCHE',
     MOONRIVER: 'MOONRIVER',
     FANTOM: 'FANTOM',

src/core/blockchain/utils/blockchains-info/constants/blockchain-id.ts

@@ -11,6 +11,7 @@ export const blockchainId: Record<BlockchainName, number> = {
     [BLOCKCHAIN_NAME.ETHEREUM]: 1,
     [BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN]: 56,
     [BLOCKCHAIN_NAME.POLYGON]: 137,
+    [BLOCKCHAIN_NAME.POLYGON_ZKEVM]: 1101,
     [BLOCKCHAIN_NAME.AVALANCHE]: 43114,
     [BLOCKCHAIN_NAME.MOONRIVER]: 1285,
     [BLOCKCHAIN_NAME.FANTOM]: 250,

src/core/blockchain/web3-public-service/web3-public/constants/multicall-addresses.ts

@@ -41,5 +41,6 @@ export const MULTICALL_ADDRESSES: Record<Web3PublicSupportedBlockchain, string>
     [BLOCKCHAIN_NAME.VELAS]: '0x0747CFe82D3Bee998f634569FE2B0005dF9d8EDE',
     [BLOCKCHAIN_NAME.SYSCOIN]: '0x0c50a45401fA051F5F38e98d0E323f08eFa3bb0b',
     [BLOCKCHAIN_NAME.ZK_SYNC]: '0xDBA7ab3Ed22044417380E9358aAabCF85683f3c8',
-    [BLOCKCHAIN_NAME.PULSECHAIN]: '0x5ba1e12693dc8f9c48aad8770482f4739beed696'
+    [BLOCKCHAIN_NAME.PULSECHAIN]: '0x5ba1e12693dc8f9c48aad8770482f4739beed696',
+    [BLOCKCHAIN_NAME.POLYGON_ZKEVM]: '0xca11bde05977b3631167028862be2a173976ca11'
 };

src/features/common/constants/proxy-supported-blockchain.ts

@@ -4,6 +4,7 @@ export const proxySupportedBlockchains = [
     BLOCKCHAIN_NAME.ETHEREUM,
     BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN,
     BLOCKCHAIN_NAME.POLYGON,
+    BLOCKCHAIN_NAME.POLYGON_ZKEVM,
     BLOCKCHAIN_NAME.AVALANCHE,
     BLOCKCHAIN_NAME.MOONRIVER,
     BLOCKCHAIN_NAME.FANTOM,

src/features/cross-chain/calculation-manager/constants/cross-chain-providers.ts

@@ -4,6 +4,7 @@ import { CbridgeCrossChainProvider } from 'src/features/cross-chain/calculation-
 import { ChangenowCrossChainProvider } from 'src/features/cross-chain/calculation-manager/providers/changenow-provider/changenow-cross-chain-provider';
 import { DebridgeCrossChainProvider } from 'src/features/cross-chain/calculation-manager/providers/debridge-provider/debridge-cross-chain-provider';
 import { LifiCrossChainProvider } from 'src/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-provider';
+import { SquidrouterCrossChainProvider } from 'src/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-provider';
 import { SymbiosisCrossChainProvider } from 'src/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-cross-chain-provider';
 import { XyCrossChainProvider } from 'src/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-provider';
 
@@ -14,7 +15,8 @@ const proxyProviders = [
     StargateCrossChainProvider,
     XyCrossChainProvider,
     CbridgeCrossChainProvider,
-    LifiCrossChainProvider
+    LifiCrossChainProvider,
+    SquidrouterCrossChainProvider
 ] as const;
 
 const nonProxyProviders = [
@@ -24,11 +26,4 @@ const nonProxyProviders = [
     ArbitrumRbcBridgeProvider
 ] as const;
 
-export const CrossChainProviders = [
-    ...proxyProviders,
-    ...nonProxyProviders
-    // MultichainCrossChainProvider,
-    // CelerCrossChainProvider,
-    // RangoCrossChainProvider,
-    // ViaCrossChainProvider,
-] as const;
+export const CrossChainProviders = [...proxyProviders, ...nonProxyProviders] as const;

src/features/cross-chain/calculation-manager/models/cross-chain-manager-options.ts

@@ -4,7 +4,6 @@ import {
 } from 'src/features/cross-chain/calculation-manager/models/cross-chain-options';
 import { CrossChainTradeType } from 'src/features/cross-chain/calculation-manager/models/cross-chain-trade-type';
 import { LifiBridgeTypes } from 'src/features/cross-chain/calculation-manager/providers/lifi-provider/models/lifi-bridge-types';
-import { RangoBridgeTypes } from 'src/features/cross-chain/calculation-manager/providers/rango-provider/models/rango-bridge-types';
 import { MarkRequired } from 'ts-essentials';
 
 export type CrossChainManagerCalculationOptions = Omit<CrossChainOptions, 'providerAddress'> & {
@@ -14,8 +13,6 @@ export type CrossChainManagerCalculationOptions = Omit<CrossChainOptions, 'provi
     readonly disabledProviders?: CrossChainTradeType[];
 
     readonly lifiDisabledBridgeTypes?: LifiBridgeTypes[];
-
-    readonly rangoDisabledBridgeTypes?: RangoBridgeTypes[];
 };
 
 export type RequiredCrossChainManagerCalculationOptions = MarkRequired<

src/features/cross-chain/calculation-manager/models/cross-chain-options.ts

@@ -1,6 +1,5 @@
 import { CrossChainTradeType } from 'src/features/cross-chain/calculation-manager/models/cross-chain-trade-type';
 import { LifiBridgeTypes } from 'src/features/cross-chain/calculation-manager/providers/lifi-provider/models/lifi-bridge-types';
-import { RangoBridgeTypes } from 'src/features/cross-chain/calculation-manager/providers/rango-provider/models/rango-bridge-types';
 import { MarkRequired } from 'ts-essentials';
 
 export interface CrossChainOptions {
@@ -53,8 +52,6 @@ export interface CrossChainOptions {
      */
     timeout?: number;
 
-    rangoDisabledBridgeTypes?: RangoBridgeTypes[];
-
     lifiDisabledBridgeTypes?: LifiBridgeTypes[];
 
     /**

src/features/cross-chain/calculation-manager/models/cross-chain-trade-type.ts

@@ -2,15 +2,14 @@ export const CROSS_CHAIN_TRADE_TYPE = {
     SYMBIOSIS: 'symbiosis',
     LIFI: 'lifi',
     DEBRIDGE: 'dln',
-    VIA: 'via',
-    RANGO: 'rango',
     BRIDGERS: 'bridgers',
     MULTICHAIN: 'multichain',
     XY: 'xy',
     CELER_BRIDGE: 'celer_bridge',
     CHANGENOW: 'changenow',
     STARGATE: 'stargate',
-    ARBITRUM: 'arbitrum'
+    ARBITRUM: 'arbitrum',
+    SQUIDROUTER: 'squidrouter'
 } as const;
 
 export type CrossChainTradeType =

src/features/cross-chain/calculation-manager/providers/cbridge/cbridge-cross-chain-trade.ts

@@ -234,7 +234,9 @@ export class CbridgeCrossChainTrade extends EvmCrossChainTrade {
         const providerData = await ProxyCrossChainEvmTrade.getGenericProviderData(
             to,
             data!,
-            this.fromBlockchain
+            this.fromBlockchain,
+            to,
+            '0'
         );
 
         const methodArguments = swapData

src/features/cross-chain/calculation-manager/providers/common/emv-cross-chain-trade/constants/evm-common-cross-chain-abi.ts

@@ -833,6 +833,16 @@ export const evmCommonCrossChainAbi: AbiItem[] = [
                         name: 'router',
                         type: 'address'
                     },
+                    {
+                        internalType: 'address',
+                        name: 'approveTo',
+                        type: 'address'
+                    },
+                    {
+                        internalType: 'uint256',
+                        name: 'extraNative',
+                        type: 'uint256'
+                    },
                     {
                         internalType: 'bytes',
                         name: 'callData',
@@ -967,6 +977,16 @@ export const evmCommonCrossChainAbi: AbiItem[] = [
                         name: 'router',
                         type: 'address'
                     },
+                    {
+                        internalType: 'address',
+                        name: 'approveTo',
+                        type: 'address'
+                    },
+                    {
+                        internalType: 'uint256',
+                        name: 'extraNative',
+                        type: 'uint256'
+                    },
                     {
                         internalType: 'bytes',
                         name: 'callData',

src/features/cross-chain/calculation-manager/providers/common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade.ts

@@ -267,15 +267,17 @@ export class ProxyCrossChainEvmTrade {
     public static async getGenericProviderData(
         providerAddress: string,
         providerData: string,
-        fromBlockchain: EvmBlockchainName
-    ): Promise<[string, string]> {
+        fromBlockchain: EvmBlockchainName,
+        gatewayAddress: string,
+        extraNative: string
+    ): Promise<[string, string, string, string]> {
         await ProxyCrossChainEvmTrade.checkCrossChainWhiteList(
             fromBlockchain,
             providerAddress,
             providerData.slice(0, 10)
         );
 
-        return [providerAddress, providerData];
+        return [providerAddress, gatewayAddress, extraNative, providerData];
     }
 
     public static async checkCrossChainWhiteList(

src/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-provider.ts

@@ -64,11 +64,7 @@ export class LifiCrossChainProvider extends CrossChainProvider {
             throw new RubicSdkError('Incorrect bridges filter param');
         }
 
-        const defaultDisabled = options.lifiDisabledBridgeTypes || [];
-        const denyBridges = from.isNative
-            ? options.lifiDisabledBridgeTypes
-            : Array.from(new Set([...defaultDisabled, LifiBridgeTypes.STARGATE]));
-
+        const denyBridges = options.lifiDisabledBridgeTypes || [];
         const routeOptions: RouteOptions = {
             slippage: options.slippageTolerance,
             order: 'RECOMMENDED',

src/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-trade.ts

@@ -223,10 +223,15 @@ export class LifiCrossChainTrade extends EvmCrossChainTrade {
             type: `lifi:${this.bridgeType}`,
             fromAddress: this.walletAddress
         });
+        const extraNativeFee = this.from.isNative
+            ? new BigNumber(providerValue).minus(this.from.stringWeiAmount).toFixed()
+            : new BigNumber(providerValue).toFixed();
         const providerData = await ProxyCrossChainEvmTrade.getGenericProviderData(
             providerRouter,
             data!,
-            this.fromBlockchain
+            this.fromBlockchain,
+            providerRouter,
+            extraNativeFee
         );
 
         const methodArguments = [bridgeData, providerData];

src/features/cross-chain/calculation-manager/providers/multichain-provider/multichain-cross-chain-trade.ts

@@ -256,7 +256,9 @@ export class MultichainCrossChainTrade extends EvmCrossChainTrade {
             providerData = await ProxyCrossChainEvmTrade.getGenericProviderData(
                 providerRouter!,
                 data!,
-                this.from.blockchain
+                this.from.blockchain,
+                providerRouter!,
+                '0'
             );
         }