add router cross chain provider

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

@@ -7,9 +7,7 @@ import {
     EvmBlockchainName
 } from 'src/core/blockchain/models/blockchain-name';
 import { blockchainId } from 'src/core/blockchain/utils/blockchains-info/constants/blockchain-id';
-import { TronWeb3Public } from 'src/core/blockchain/web3-public-service/web3-public/tron-web3-public/tron-web3-public';
 import { Web3Pure } from 'src/core/blockchain/web3-pure/web3-pure';
-import { Injector } from 'src/core/injector/injector';
 import { RouterQuoteResponseConfig } from 'src/features/common/providers/router/models/router-quote-response-config';
 import { RouterApiService } from 'src/features/common/providers/router/services/router-api-service';
 import { getFromWithoutFee } from 'src/features/common/utils/get-from-without-fee';
@@ -27,14 +25,11 @@ import {
     routerCrossChainSupportedChains
 } from './constants/router-cross-chain-supported-chains';
 import { RouterCrossChainTrade } from './router-cross-chain-trade';
+import { RouterCrossChainUtilService } from './utils/router-cross-chain-util-service.ts';
 
 export class RouterCrossChainProvider extends CrossChainProvider {
     public readonly type = CROSS_CHAIN_TRADE_TYPE.ROUTER;
 
-    private get tronWeb3Public(): TronWeb3Public {
-        return Injector.web3PublicService.getWeb3Public(BLOCKCHAIN_NAME.TRON);
-    }
-
     public isSupportedBlockchain(fromBlockchain: BlockchainName): boolean {
         return routerCrossChainSupportedChains.some(chain => chain === fromBlockchain);
     }
@@ -44,7 +39,13 @@ export class RouterCrossChainProvider extends CrossChainProvider {
         toToken: PriceToken<EvmBlockchainName>,
         options: RequiredCrossChainOptions
     ): Promise<CalculationResult> {
-        if (!this.areSupportedBlockchains(from.blockchain, toToken.blockchain)) {
+        const fromBlockchain = from.blockchain as RouterCrossChainSupportedBlockchains;
+        const toBlockchain = toToken.blockchain as RouterCrossChainSupportedBlockchains;
+        if (
+            !this.areSupportedBlockchains(from.blockchain, toToken.blockchain) ||
+            fromBlockchain === BLOCKCHAIN_NAME.TRON ||
+            fromBlockchain === BLOCKCHAIN_NAME.DOGECOIN
+        ) {
             return {
                 trade: null,
                 error: new NotSupportedTokensError(),
@@ -57,28 +58,14 @@ export class RouterCrossChainProvider extends CrossChainProvider {
         try {
             const srcChainId = blockchainId[from.blockchain];
             const dstChainId = blockchainId[toToken.blockchain];
-            const fromBlockchain = from.blockchain as RouterCrossChainSupportedBlockchains;
-            const toBlockchain = toToken.blockchain as RouterCrossChainSupportedBlockchains;
 
             const NATIVE_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
-            let srcTronAddress = '';
-            let dstTronAddress = '';
-
-            if (fromBlockchain === BLOCKCHAIN_NAME.TRON) {
-                const srcTronHexAddress = await this.tronWeb3Public.convertTronAddressToHex(
-                    from.address
-                );
-                srcTronAddress = `0x${srcTronHexAddress.slice(2)}`;
-            } else if (toBlockchain === BLOCKCHAIN_NAME.TRON) {
-                const dstTronHexAddress = await this.tronWeb3Public.convertTronAddressToHex(
-                    toToken.address
-                );
-                dstTronAddress = `0x${dstTronHexAddress.slice(2)}`;
-            }
-            const srcTokenAddress =
-                fromBlockchain === BLOCKCHAIN_NAME.TRON ? srcTronAddress : from.address;
-            const dstTokenAddress =
-                toBlockchain === BLOCKCHAIN_NAME.TRON ? dstTronAddress : toToken.address;
+
+            const srcTokenAddress = from.address;
+            const dstTokenAddress = await RouterCrossChainUtilService.checkAndConvertAddress(
+                toBlockchain,
+                toToken.address
+            );
 
             const feeInfo = await this.getFeeInfo(
                 from.blockchain,
@@ -112,10 +99,6 @@ export class RouterCrossChainProvider extends CrossChainProvider {
 
             const routePath = await this.getRoutePath(from, to, routerQuoteConfig);
 
-            const slippageAmount = dstTokenAmount.multipliedBy(options.slippageTolerance);
-
-            const toTokenAmountMin = dstTokenAmount.minus(slippageAmount);
-
             const gasData =
                 options.gasCalculation === 'enabled'
                     ? await RouterCrossChainTrade.getGasData(
@@ -136,11 +119,7 @@ export class RouterCrossChainProvider extends CrossChainProvider {
                         gasData,
                         priceImpact: from.calculatePriceImpactPercent(to),
                         routerQuoteConfig,
-                        slippage: options.slippageTolerance,
-                        toTokenAmountMin: Web3Pure.fromWei(
-                            toTokenAmountMin,
-                            routerQuoteConfig.destination.asset.decimals
-                        )
+                        slippage: options.slippageTolerance
                     },
                     options.providerAddress,
                     routePath

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

@@ -1,11 +1,9 @@
 import BigNumber from 'bignumber.js';
 import { RubicSdkError } from 'src/common/errors';
 import { PriceTokenAmount } from 'src/common/tokens';
-import { BLOCKCHAIN_NAME, EvmBlockchainName } from 'src/core/blockchain/models/blockchain-name';
-import { TronWeb3Public } from 'src/core/blockchain/web3-public-service/web3-public/tron-web3-public/tron-web3-public';
+import { EvmBlockchainName } from 'src/core/blockchain/models/blockchain-name';
 import { EvmWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure';
 import { EvmEncodeConfig } from 'src/core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/models/evm-encode-config';
-import { Injector } from 'src/core/injector/injector';
 import { ContractParams } from 'src/features/common/models/contract-params';
 import { RouterQuoteResponseConfig } from 'src/features/common/providers/router/models/router-quote-response-config';
 import { RouterApiService } from 'src/features/common/providers/router/services/router-api-service';
@@ -25,6 +23,7 @@ import { RubicStep } from '../common/models/rubicStep';
 import { TradeInfo } from '../common/models/trade-info';
 import { ProxyCrossChainEvmTrade } from '../common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade';
 import { RouterCrossChainSupportedBlockchains } from './constants/router-cross-chain-supported-chains';
+import { RouterCrossChainUtilService } from './utils/router-cross-chain-util-service.ts';
 
 export class RouterCrossChainTrade extends EvmCrossChainTrade {
     public static async getGasData(
@@ -43,19 +42,14 @@ export class RouterCrossChainTrade extends EvmCrossChainTrade {
                 gasData: null,
                 priceImpact: 0,
                 routerQuoteConfig,
-                slippage: 0,
-                toTokenAmountMin: new BigNumber(0)
+                slippage: 0
             },
             providerAddress || EvmWeb3Pure.EMPTY_ADDRESS,
             []
         );
         return getCrossChainGasData(trade, receiverAddress);
     }
 
-    private get tronWeb3Public(): TronWeb3Public {
-        return Injector.web3PublicService.getWeb3Public(BLOCKCHAIN_NAME.TRON);
-    }
-
     public readonly type: CrossChainTradeType = CROSS_CHAIN_TRADE_TYPE.ROUTER;
 
     public readonly to: PriceTokenAmount<EvmBlockchainName>;
@@ -103,7 +97,6 @@ export class RouterCrossChainTrade extends EvmCrossChainTrade {
             priceImpact: number | null;
             routerQuoteConfig: RouterQuoteResponseConfig;
             slippage: number;
-            toTokenAmountMin: BigNumber;
         },
         providerAddress: string,
         routePath: RubicStep[]
@@ -116,7 +109,7 @@ export class RouterCrossChainTrade extends EvmCrossChainTrade {
         this.priceImpact = crossChainTrade.priceImpact;
         this.routerQuoteConfig = crossChainTrade.routerQuoteConfig;
         this.slippage = crossChainTrade.slippage;
-        this.toTokenAmountMin = crossChainTrade.toTokenAmountMin;
+        this.toTokenAmountMin = this.to.tokenAmount.multipliedBy(1 - this.slippage);
     }
 
     protected async getContractParams(
@@ -187,28 +180,17 @@ export class RouterCrossChainTrade extends EvmCrossChainTrade {
     protected async getTransactionConfigAndAmount(
         receiverAddress?: string
     ): Promise<{ config: EvmEncodeConfig; amount: string }> {
-        let toAddress = receiverAddress;
-        let senderAddress = this.walletAddress;
-
         const toBlockchain = this.to.blockchain as RouterCrossChainSupportedBlockchains;
 
-        if (toBlockchain === BLOCKCHAIN_NAME.TRON && receiverAddress) {
-            const toTronHexAddress = await this.tronWeb3Public.convertTronAddressToHex(
-                receiverAddress
-            );
-            toAddress = `0x${toTronHexAddress.slice(2)}`;
-        }
-        if (this.fromBlockchain === BLOCKCHAIN_NAME.TRON) {
-            const senderTronHexAddress = await this.tronWeb3Public.convertTronAddressToHex(
-                this.walletAddress
-            );
-            senderAddress = `0x${senderTronHexAddress.slice(2)}`;
-        }
+        const toAddress = await RouterCrossChainUtilService.checkAndConvertAddress(
+            toBlockchain,
+            receiverAddress || this.walletAddress
+        );
         const { txn, destination } = await RouterApiService.getSwapTx({
             ...this.routerQuoteConfig,
-            senderAddress,
-            receiverAddress: toAddress || this.walletAddress,
-            refundAddress: senderAddress
+            senderAddress: this.walletAddress,
+            receiverAddress: toAddress,
+            refundAddress: this.walletAddress
         });
 
         if (!txn) {

src/features/cross-chain/calculation-manager/providers/router-provider/utils/router-cross-chain-util-service.ts.ts

@@ -0,0 +1,23 @@
+import { BLOCKCHAIN_NAME } from 'src/core/blockchain/models/blockchain-name';
+import { TronWeb3Public } from 'src/core/blockchain/web3-public-service/web3-public/tron-web3-public/tron-web3-public';
+import { Injector } from 'src/core/injector/injector';
+
+import { RouterCrossChainSupportedBlockchains } from '../constants/router-cross-chain-supported-chains';
+
+export class RouterCrossChainUtilService {
+    private static get tronWeb3Public(): TronWeb3Public {
+        return Injector.web3PublicService.getWeb3Public(BLOCKCHAIN_NAME.TRON);
+    }
+
+    public static async checkAndConvertAddress(
+        blockchain: RouterCrossChainSupportedBlockchains,
+        address: string
+    ): Promise<string> {
+        if (blockchain === BLOCKCHAIN_NAME.TRON) {
+            const tronHexAddress = await this.tronWeb3Public.convertTronAddressToHex(address);
+            return `0x${tronHexAddress.slice(2)}`;
+        }
+
+        return address;
+    }
+}