add stargate/owlto/orbiter/cbridge/izumi providers for gravity

package.json

@@ -1,6 +1,6 @@
 {
     "name": "rubic-sdk",
-    "version": "5.37.0",
+    "version": "5.37.1",
     "description": "Simplify dApp creation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -93,7 +93,7 @@
         "ethers": "^5.6.8",
         "graphql-request": "^6.1.0",
         "grpc-web": "^1.4.2",
-        "iziswap-sdk": "1.4.12",
+        "iziswap-sdk": "1.5.1",
         "lodash.clonedeep": "^4.5.0",
         "rxjs": "7.8.1",
         "tronweb": "^5.3.2",

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

@@ -35,7 +35,8 @@ export const proxySupportedBlockchains = [
     BLOCKCHAIN_NAME.SEI,
     BLOCKCHAIN_NAME.CORE,
     BLOCKCHAIN_NAME.BAHAMUT,
-    BLOCKCHAIN_NAME.BITLAYER
+    BLOCKCHAIN_NAME.BITLAYER,
+    BLOCKCHAIN_NAME.GRAVITY
     // BLOCKCHAIN_NAME.OKE_X_CHAIN,
     // BLOCKCHAIN_NAME.GNOSIS,
     // BLOCKCHAIN_NAME.FUSE,

src/features/cross-chain/calculation-manager/providers/owl-to-bridge/constants/owl-to-supported-chains.ts

@@ -24,7 +24,8 @@ export const owlToSupportedBlockchains = [
     BLOCKCHAIN_NAME.MODE,
     BLOCKCHAIN_NAME.TAIKO,
     BLOCKCHAIN_NAME.CORE,
-    BLOCKCHAIN_NAME.BITLAYER
+    BLOCKCHAIN_NAME.BITLAYER,
+    BLOCKCHAIN_NAME.GRAVITY
 ] as const;
 
 export type OwlToSupportedBlockchain = (typeof owlToSupportedBlockchains)[number];

src/features/cross-chain/calculation-manager/providers/stargate-v2-provider/constants/stargate-v2-blockchain-supported-pools.ts

@@ -73,10 +73,10 @@ export const stargateV2BlockchainSupportedPools: Record<StargateV2SupportedBlock
             stargateV2PoolId[stargateV2BridgeToken.USDC],
             stargateV2PoolId[stargateV2BridgeToken.USDT],
             stargateV2PoolId[stargateV2BridgeToken.WETH]
+        ],
+        [BLOCKCHAIN_NAME.GRAVITY]: [
+            stargateV2PoolId[stargateV2BridgeToken.USDC],
+            stargateV2PoolId[stargateV2BridgeToken.USDT],
+            stargateV2PoolId[stargateV2BridgeToken.WETH]
         ]
-        // [BLOCKCHAIN_NAME.GRAVITY]: [
-        //     stargateV2PoolId[stargateV2BridgeToken.USDC],
-        //     stargateV2PoolId[stargateV2BridgeToken.USDT],
-        //     stargateV2PoolId[stargateV2BridgeToken.WETH]
-        // ]
     };

src/features/cross-chain/calculation-manager/providers/stargate-v2-provider/constants/stargate-v2-chain-id.ts

@@ -19,7 +19,7 @@ export const stargateV2ChainIds: Record<StargateV2SupportedBlockchains, number>
     // [BLOCKCHAIN_NAME.KLAYTN]: 30150,
     [BLOCKCHAIN_NAME.TAIKO]: 30290,
     [BLOCKCHAIN_NAME.SEI]: 30280,
-    [BLOCKCHAIN_NAME.FLARE]: 30295
-    // [BLOCKCHAIN_NAME.GRAVITY]: 30294
+    [BLOCKCHAIN_NAME.FLARE]: 30295,
+    [BLOCKCHAIN_NAME.GRAVITY]: 30294
     // [BLOCKCHAIN_NAME.IOTA]: 30284,
 };

src/features/cross-chain/calculation-manager/providers/stargate-v2-provider/constants/stargate-v2-contract-address.ts

@@ -96,10 +96,10 @@ export const stargateV2ContractAddress: StargateV2ContractAddress = {
         [stargateV2BridgeToken.USDC]: '0x77C71633C34C3784ede189d74223122422492a0f',
         [stargateV2BridgeToken.USDT]: '0x1C10CC06DC6D35970d1D53B2A23c76ef370d4135',
         [stargateV2BridgeToken.WETH]: '0x8e8539e4CcD69123c623a106773F2b0cbbc58746'
+    },
+    [BLOCKCHAIN_NAME.GRAVITY]: {
+        [stargateV2BridgeToken.USDC]: '0xC1B8045A6ef2934Cf0f78B0dbD489969Fa9Be7E4',
+        [stargateV2BridgeToken.USDT]: '0x0B38e83B86d491735fEaa0a791F65c2B99535396',
+        [stargateV2BridgeToken.WETH]: '0x17d65bF79E77B6Ab21d8a0afed3bC8657d8Ee0B2'
     }
-    // [BLOCKCHAIN_NAME.GRAVITY]: {
-    //     [stargateV2BridgeToken.USDC]: '0xC1B8045A6ef2934Cf0f78B0dbD489969Fa9Be7E4',
-    //     [stargateV2BridgeToken.USDT]: '0x0B38e83B86d491735fEaa0a791F65c2B99535396',
-    //     [stargateV2BridgeToken.WETH]: '0x17d65bF79E77B6Ab21d8a0afed3bC8657d8Ee0B2'
-    // }
 };

src/features/cross-chain/calculation-manager/providers/stargate-v2-provider/constants/stargate-v2-cross-chain-supported-blockchains.ts

@@ -17,8 +17,8 @@ export const stargateV2SupportedBlockchains = [
     // BLOCKCHAIN_NAME.KLAYTN,
     BLOCKCHAIN_NAME.TAIKO,
     BLOCKCHAIN_NAME.SEI,
-    BLOCKCHAIN_NAME.FLARE
-    // BLOCKCHAIN_NAME.GRAVITY
+    BLOCKCHAIN_NAME.FLARE,
+    BLOCKCHAIN_NAME.GRAVITY
     // BLOCKCHAIN_NAME.IOTA,
 ];
 

src/features/cross-chain/calculation-manager/providers/stargate-v2-provider/constants/stargate-v2-token-address.ts

@@ -81,12 +81,12 @@ const addresses: StargateV2TokenAddress = {
         '0xFbDa5F676cB37624f28265A144A48B0d6e87d3b6': stargateV2BridgeToken.USDC,
         '0x0B38e83B86d491735fEaa0a791F65c2B99535396': stargateV2BridgeToken.USDT,
         '0x1502FA4be69d526124D453619276FacCab275d3D': stargateV2BridgeToken.WETH
+    },
+    [BLOCKCHAIN_NAME.GRAVITY]: {
+        '0xf6f832466Cd6C21967E0D954109403f36Bc8ceaA': stargateV2BridgeToken.WETH,
+        '0xFbDa5F676cB37624f28265A144A48B0d6e87d3b6': stargateV2BridgeToken.USDC,
+        '0x816E810f9F787d669FB71932DeabF6c83781Cd48': stargateV2BridgeToken.USDT
     }
-    // [BLOCKCHAIN_NAME.GRAVITY]: {
-    //     '0xf6f832466Cd6C21967E0D954109403f36Bc8ceaA': stargateV2BridgeToken.WETH,
-    //     '0xFbDa5F676cB37624f28265A144A48B0d6e87d3b6': stargateV2BridgeToken.USDC,
-    //     '0x816E810f9F787d669FB71932DeabF6c83781Cd48': stargateV2BridgeToken.USDT
-    // }
 };
 
 export const stargateV2TokenAddress = Object.entries(addresses).reduce(

src/features/on-chain/calculation-manager/constants/trade-providers/izumi-trade-providers.ts

@@ -15,6 +15,7 @@ import { IzumiZkLinkProvider } from 'src/features/on-chain/calculation-manager/p
 import { IzumiZksyncProvider } from 'src/features/on-chain/calculation-manager/providers/dexes/zksync/izumi-zksync/izumi-zksync-provider';
 
 import { IzumiArbitrumProvider } from '../../providers/dexes/arbitrum/izumi-arbitrum/izumi-arbitrum-provider';
+import { IzumiGravityProvider } from '../../providers/dexes/gravity/izumi-gravity/izumi-gravity-provider';
 import { IzumiKromaProvider } from '../../providers/dexes/kroma/izumi-kroma/izumi-kroma-provider';
 
 export const izumiTradeProviders = [
@@ -36,5 +37,6 @@ export const izumiTradeProviders = [
     IzumiBlastProvider,
     // IzumiMerlinProvider,
     IzumiScrollProvider,
-    IzumiXlayerProvider
+    IzumiXlayerProvider,
+    IzumiGravityProvider
 ];

src/features/on-chain/calculation-manager/providers/dexes/common/izumi-abstract/izumi-provider.ts

@@ -1,7 +1,7 @@
 import { getMulticallContracts } from 'iziswap-sdk/lib/base';
 import { searchPathQuery } from 'iziswap-sdk/lib/search/func';
 import { SearchPathQueryParams, SwapDirection } from 'iziswap-sdk/lib/search/types';
-import { RubicSdkError } from 'src/common/errors';
+import { NotSupportedTokensError, RubicSdkError } from 'src/common/errors';
 import { PriceToken, PriceTokenAmount, Token } from 'src/common/tokens';
 import { wrappedAddress } from 'src/common/tokens/constants/wrapped-addresses';
 import { wrappedNativeTokensList } from 'src/common/tokens/constants/wrapped-native-tokens';
@@ -47,13 +47,32 @@ export abstract class IzumiProvider extends EvmOnChainProvider {
         readonly quoterAddress: string;
         readonly multicallAddress: string;
         readonly supportedFees: number[];
+        readonly tokenBlackList?: {
+            direction: string;
+            tokenAddress: string;
+        }[];
     };
 
     public async calculate(
         from: PriceTokenAmount<EvmBlockchainName>,
         to: PriceToken<EvmBlockchainName>,
         options?: OnChainCalculationOptions
     ): Promise<EvmOnChainTrade> {
+        if (this.config?.tokenBlackList) {
+            const isDisabledToken = this.config.tokenBlackList?.some(disabledToken => {
+                const tokenAddress = disabledToken.direction === 'from' ? from.address : to.address;
+
+                if (compareAddresses(tokenAddress, disabledToken.tokenAddress)) {
+                    return true;
+                }
+
+                return false;
+            });
+
+            if (isDisabledToken) {
+                throw new NotSupportedTokensError();
+            }
+        }
         const fullOptions = combineOptions(options, this.defaultOptions);
 
         let proxyFeeInfo: OnChainProxyFeeInfo | undefined;

src/features/on-chain/calculation-manager/providers/dexes/common/izumi-abstract/izumi-trade.ts

@@ -93,7 +93,7 @@ export class IzumiTrade extends EvmOnChainTrade {
         const { swapCalling, options: data } = getSwapChainWithExactInputCall(
             swapContract,
             this.walletAddress,
-            chain,
+            chain ?? chainId,
             swapParams,
             gasPriceInfo.gasPrice.toFixed()
         );

src/features/on-chain/calculation-manager/providers/dexes/gravity/camelot-gravity/camelot-gravity-provider.ts

@@ -8,7 +8,7 @@ import { UniswapV3AlgebraTradeStructOmitPath } from '../../common/uniswap-v3-alg
 import { UniswapV3AlgebraAbstractProvider } from '../../common/uniswap-v3-algebra-abstract/uniswap-v3-algebra-abstract-provider';
 import { QUICK_SWAP_V3_ROUTER_CONTRACT_ABI } from '../../polygon/quick-swap-v3/constants/swap-router-contract-data';
 import { QuickSwapV3Route } from '../../polygon/quick-swap-v3/models/quick-swap-v3-route';
-import { defaultzGravityProviderConfiguration } from '../default-constants';
+import { defaultGravityProviderConfiguration } from '../default-constants';
 import { CamelotGravityTrade } from './camelot-gravity-trade';
 import { CAMELOT_GRAVITY_ROUTER_CONTRACT_ADDRESS } from './constants/gravity-swap-router-contract-address';
 import { CAMELOT_GRAVITY_PROVIDER_CONFIGURATION } from './constants/provider-configuration';
@@ -28,7 +28,7 @@ export class CamelotGravityProvider extends UniswapV3AlgebraAbstractProvider<Cam
 
     protected readonly quoterController = new AlgebraQuoterController(
         this.blockchain,
-        defaultzGravityProviderConfiguration.routingProvidersAddresses,
+        defaultGravityProviderConfiguration.routingProvidersAddresses,
         CAMELOT_GRAVITY_QUOTER_CONTRACT_ADDRESS,
         CAMELOT_GRAVITY_QUOTER_CONTRACT_ABI
     );

src/features/on-chain/calculation-manager/providers/dexes/gravity/default-constants.ts

@@ -13,7 +13,7 @@ const defaultGravityRoutingProvidersAddresses = [
 
 const defaultGravityWethAddress = wrappedNativeTokensList[BLOCKCHAIN_NAME.GRAVITY]!.address;
 
-export const defaultzGravityProviderConfiguration: UniswapV2ProviderConfiguration = {
+export const defaultGravityProviderConfiguration: UniswapV2ProviderConfiguration = {
     maxTransitTokens: 1,
     routingProvidersAddresses: defaultGravityRoutingProvidersAddresses,
     wethAddress: defaultGravityWethAddress

src/features/on-chain/calculation-manager/providers/dexes/gravity/izumi-gravity/izumi-gravity-provider.ts

@@ -0,0 +1,29 @@
+import { wrappedNativeTokensList } from 'src/common/tokens/constants/wrapped-native-tokens';
+import { BLOCKCHAIN_NAME } from 'src/core/blockchain/models/blockchain-name';
+
+import { IzumiProvider } from '../../common/izumi-abstract/izumi-provider';
+
+export class IzumiGravityProvider extends IzumiProvider {
+    public readonly blockchain = BLOCKCHAIN_NAME.GRAVITY;
+
+    protected readonly dexAddress = '0x3EF68D3f7664b2805D4E88381b64868a56f88bC4';
+
+    protected readonly config = {
+        maxTransitTokens: 2,
+        quoterAddress: '0x33531bDBFE34fa6Fd5963D0423f7699775AacaaF',
+        liquidityManagerAddress: '0x19b683A2F45012318d9B2aE1280d68d3eC54D663',
+        routingTokenAddresses: [
+            wrappedNativeTokensList[BLOCKCHAIN_NAME.GRAVITY]!.address, // WG
+            '0xf6f832466Cd6C21967E0D954109403f36Bc8ceaA', // WETH
+            '0xFbDa5F676cB37624f28265A144A48B0d6e87d3b6' // USDC
+        ],
+        multicallAddress: '0x7a524c7e82874226F0b51aade60A1BE4D430Cf0F',
+        supportedFees: [10000, 3000, 500],
+        tokenBlackList: [
+            {
+                direction: 'from',
+                tokenAddress: '0xFbDa5F676cB37624f28265A144A48B0d6e87d3b6'
+            }
+        ]
+    };
+}

yarn.lock

@@ -7239,10 +7239,10 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-iziswap-sdk@1.4.12:
-  version "1.4.12"
-  resolved "https://registry.yarnpkg.com/iziswap-sdk/-/iziswap-sdk-1.4.12.tgz#658425fd588f019d8e5a6f0f4fe466439116299b"
-  integrity sha512-CkWI5QJstjqSemoShpCTjgi+aaL0SZ6asLnVNPmVy6wuL4HAlaDef3CmZKcj/yP6b8QeaqrltE29C//uUT/8tA==
+iziswap-sdk@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/iziswap-sdk/-/iziswap-sdk-1.5.1.tgz#2d05e0f564500651258dc2a35dd38606864e61d1"
+  integrity sha512-79a3u3f7aDedAGXIv2qNfL7vLS6TBtJjl94N/vQZL2TCXtiK4o9NvMhhd4gGscwjSyUVZwhlx26/M8G/kERf3Q==
   dependencies:
     bignumber.js "^9.0.2"
     http "^0.0.1-security"