rubic-sdk 6.0.0-alpha.ton.2 → 6.0.0-alpha.ton.21

package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/lifi-trade.d.ts

@@ -4,7 +4,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
 import { LifiTradeStruct } from './models/lifi-trade-struct';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 export declare class LifiTrade extends AggregatorEvmOnChainTrade {
     /** @internal */
     static getGasLimit(lifiTradeStruct: LifiTradeStruct): Promise<BigNumber | null>;
@@ -19,5 +19,5 @@ export declare class LifiTrade extends AggregatorEvmOnChainTrade {
     protected getSwapError(err: unknown & {
         code: number;
     }): Error;
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/odos/odos-on-chain-trade.d.ts

@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 import { OdosOnChainTradeStruct } from './models/odos-on-chain-trade-types';
 export declare class OdosOnChainTrade extends AggregatorEvmOnChainTrade {
     static getGasLimit(tradeStruct: OdosOnChainTradeStruct, providerGateway: string): Promise<BigNumber | null>;
@@ -11,5 +11,5 @@ export declare class OdosOnChainTrade extends AggregatorEvmOnChainTrade {
     get dexContractAddress(): string;
     protected get spenderAddress(): string;
     constructor(tradeStruct: OdosOnChainTradeStruct, providerAddress: string, providerGateway: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/models/okuswap-api-types.d.ts

@@ -83,8 +83,11 @@ export interface GetBestRouteReturnType {
 }
 interface OkuCoupon {
     chainId: number;
-    swapConfig: object;
-    trade: object;
-    universalRouter: string;
+    account: string;
+    raw: {
+        swapConfig: object;
+        trade: object;
+        universalRouter: string;
+    };
 }
 export {};

package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-provider.js

@@ -26,10 +26,14 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
         return okuswap_on_chain_supported_chains_1.OKUSWAP_ON_CHAIN_SUPPORTED_BLOCKCHAINS.some(chain => chain === blockchain);
     }
     async calculate(from, toToken, options) {
+        const fullOptions = { ...options, useProxy: false };
+        if (!this.isSupportedBlockchain(from.blockchain)) {
+            throw new errors_1.RubicSdkError(`OkuSwap doesn't support ${from.blockchain} chain!`);
+        }
         const fromBlockchain = from.blockchain;
-        const walletAddress = options.fromAddress || this.getWalletAddress(fromBlockchain) || fake_wallet_address_1.FAKE_WALLET_ADDRESS;
+        const walletAddress = fullOptions.fromAddress || this.getWalletAddress(fromBlockchain) || fake_wallet_address_1.FAKE_WALLET_ADDRESS;
         try {
-            const { fromWithoutFee, proxyFeeInfo } = await this.handleProxyContract(from, options);
+            const { fromWithoutFee, proxyFeeInfo } = await this.handleProxyContract(from, fullOptions);
             const path = this.getRoutePath(from, toToken);
             const subProviders = await okuswap_api_service_1.OkuSwapApiService.getOkuSubProvidersForChain(from.blockchain);
             const quoteReqBody = {
@@ -38,11 +42,11 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
                 inTokenAddress: from.address,
                 outTokenAddress: toToken.address,
                 isExactIn: true,
-                slippage: options.slippageTolerance * 10000,
+                slippage: fullOptions.slippageTolerance * 10000,
                 inTokenAmount: from.tokenAmount.toString()
             };
             const { subProvider, swapReqBody, toAmount, gas } = await this.getBestRoute(subProviders, quoteReqBody);
-            const providerGateway = swapReqBody.coupon.universalRouter;
+            const providerGateway = swapReqBody.coupon.raw.universalRouter;
             const permit2Address = swapReqBody.signingRequest?.permit2Address;
             const to = new tokens_1.PriceTokenAmount({
                 ...toToken.asStruct,
@@ -56,22 +60,22 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
                 gasFeeInfo: {
                     gasLimit: new bignumber_js_1.default(gas)
                 },
-                slippageTolerance: options.slippageTolerance,
-                useProxy: options.useProxy,
-                withDeflation: options.withDeflation,
+                slippageTolerance: fullOptions.slippageTolerance,
+                useProxy: fullOptions.useProxy,
+                withDeflation: fullOptions.withDeflation,
                 path,
                 quoteReqBody,
                 swapReqBody,
                 subProvider,
                 ...(permit2Address && { permit2ApproveAddress: permit2Address })
             };
-            const gasFeeInfo = options.gasCalculation === 'calculate'
+            const gasFeeInfo = fullOptions.gasCalculation === 'calculate'
                 ? await this.getGasFeeInfo(tradeStruct, providerGateway)
                 : null;
             return new okuswap_on_chain_trade_1.OkuSwapOnChainTrade({
                 ...tradeStruct,
                 gasFeeInfo
-            }, options.providerAddress, providerGateway);
+            }, fullOptions.providerAddress, providerGateway);
         }
         catch (err) {
             return {

package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"okuswap-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"okuswap-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-provider.ts"],"names":[],"mappings":"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"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-trade.d.ts

@@ -1,10 +1,11 @@
 import BigNumber from 'bignumber.js';
 import { EvmBasicTransactionOptions } from '../../../../../../core/blockchain/web3-private-service/web3-private/evm-web3-private/models/evm-basic-transaction-options';
+import { EvmEncodeConfig } from '../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/models/evm-encode-config';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { TransactionReceipt } from 'web3-eth';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 import { OkuSwapSupportedBlockchain } from './models/okuswap-on-chain-supported-chains';
 import { OkuSwapOnChainTradeStruct } from './models/okuswap-trade-types';
 export declare class OkuSwapOnChainTrade extends AggregatorEvmOnChainTrade {
@@ -24,5 +25,6 @@ export declare class OkuSwapOnChainTrade extends AggregatorEvmOnChainTrade {
     approve(options: EvmBasicTransactionOptions, checkNeedApprove?: boolean, amount?: BigNumber | 'infinity'): Promise<TransactionReceipt>;
     needApprove(fromAddress?: string): Promise<boolean>;
     private needPermit2Approve;
-    protected getTransactionConfigAndAmount(_options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    encode(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
+    protected getTransactionConfigAndAmount(_options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-trade.js

@@ -8,6 +8,7 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const errors_1 = require("../../../../../../common/errors");
 const evm_web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
 const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
+const check_unsupported_receiver_address_1 = require("../../../../../common/utils/check-unsupported-receiver-address");
 const rubic_proxy_contract_address_1 = require("../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address");
 const get_on_chain_gas_data_1 = require("../../../utils/get-on-chain-gas-data");
 const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
@@ -61,6 +62,9 @@ class OkuSwapOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.Aggre
         return this.web3Private.approveTokens(this.from.address, permit2Address, amount, options);
     }
     async needApprove(fromAddress) {
+        if (this.from.isNative) {
+            return false;
+        }
         if (!fromAddress) {
             this.checkWalletConnected();
         }
@@ -76,6 +80,17 @@ class OkuSwapOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.Aggre
         const [allowance, expiration] = await this.web3Public.getAllowanceAndExpirationOnPermit2(this.from.address, this.walletAddress, this.spenderAddress, permit2Address);
         return this.from.weiAmount.gt(allowance) || new bignumber_js_1.default(Date.now()).gt(expiration);
     }
+    async encode(options) {
+        if (this.from.blockchain === 'ROOTSTOCK') {
+            await (0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(options.receiverAddress, this.walletAddress);
+        }
+        await this.checkFromAddress(options.fromAddress, true);
+        await this.checkReceiverAddress(options.receiverAddress);
+        if (this.useProxy) {
+            return this.encodeProxy(options);
+        }
+        return this.encodeDirect(options);
+    }
     async getTransactionConfigAndAmount(_options) {
         const [{ outAmount, estimatedGas }, evmConfig] = await Promise.all([
             okuswap_api_service_1.OkuSwapApiService.makeQuoteRequest(this.okuSubProvider, this.quoteReqBody),

package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"okuswap-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-trade.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"okuswap-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-trade.ts"],"names":[],"mappings":"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"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.d.ts

@@ -4,7 +4,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
 import { GetContractParamsOptions } from '../../../../../cross-chain/calculation-manager/providers/common/models/get-contract-params-options';
 import { OpenOceanTradeStruct } from './models/open-ocean-trade-struct';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 export declare class OpenOceanTrade extends AggregatorEvmOnChainTrade {
     /** @internal */
     static getGasLimit(openOceanTradeStruct: OpenOceanTradeStruct): Promise<BigNumber | null>;
@@ -15,7 +15,7 @@ export declare class OpenOceanTrade extends AggregatorEvmOnChainTrade {
     get dexContractAddress(): string;
     get toTokenAmountMin(): PriceTokenAmount;
     constructor(tradeStruct: OpenOceanTradeStruct, providerAddress: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     private getTokenAddress;
     protected getSwapData(options: GetContractParamsOptions): Promise<unknown[]>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/piteas/piteas-trade.d.ts

@@ -4,7 +4,7 @@ import { PiteasMethodParameters, PiteasQuoteRequestParams } from './models/pitea
 import { PiteasTradeStruct } from './models/piteas-trade-struct';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 import { EvmOnChainTradeStruct } from '../../common/on-chain-trade/evm-on-chain-trade/models/evm-on-chain-trade-struct';
 export declare class PiteasTrade extends AggregatorEvmOnChainTrade {
     static getGasLimit(tradeStruct: EvmOnChainTradeStruct, providerGateway: string, methodParameters: PiteasMethodParameters): Promise<BigNumber | null>;
@@ -14,5 +14,5 @@ export declare class PiteasTrade extends AggregatorEvmOnChainTrade {
     protected get spenderAddress(): string;
     get dexContractAddress(): string;
     constructor(tradeStruct: PiteasTradeStruct, providerAddress: string, quoteRequestParams: PiteasQuoteRequestParams);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-trade.d.ts

@@ -3,7 +3,7 @@ import { PriceTokenAmount } from '../../../../../../common/tokens';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 import { RangoOnChainTradeStruct } from './models/rango-on-chain-trade-types';
 export declare class RangoOnChainTrade extends AggregatorEvmOnChainTrade {
     static getGasLimit(tradeStruct: RangoOnChainTradeStruct, providerGateway: string): Promise<BigNumber | null>;
@@ -17,5 +17,5 @@ export declare class RangoOnChainTrade extends AggregatorEvmOnChainTrade {
     protected get spenderAddress(): string;
     get dexContractAddress(): string;
     constructor(tradeStruct: RangoOnChainTradeStruct, providerAddress: string, providerGateway: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/symbiosis/symbiosis-on-chain-trade.d.ts

@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 import { SymbiosisTradeStruct } from './models/symbiosis-on-chain-trade-types';
 export declare class SymbiosisOnChainTrade extends AggregatorEvmOnChainTrade {
     static getGasLimit(tradeStruct: SymbiosisTradeStruct, providerGateway: string): Promise<BigNumber | null>;
@@ -11,5 +11,5 @@ export declare class SymbiosisOnChainTrade extends AggregatorEvmOnChainTrade {
     protected get spenderAddress(): string;
     get dexContractAddress(): string;
     constructor(tradeStruct: SymbiosisTradeStruct, providerAddress: string, providerGateway: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/models/tonkeeper-api-types.d.ts

@@ -13,7 +13,9 @@ export interface TonkeeperStonfiQuoteInfo extends TonkeeperCommonQuoteInfo {
 interface TonkeeperCommonQuoteInfo {
     fromAsset: string;
     toAsset: string;
+    /** wei amount */
     fromAmount: string;
+    /** wei amount */
     toAmount: string;
     blockchainFee: string;
     path: string[];

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/models/tonkeeper-trade-struct.d.ts

@@ -3,4 +3,9 @@ import { OnChainTradeStruct } from '../../../common/on-chain-trade/evm-on-chain-
 import { TonkeeperQuoteResp } from './tonkeeper-api-types';
 export interface TonkeeperOnChainTradeStruct extends OnChainTradeStruct<TonBlockchainName> {
     bestRoute: TonkeeperQuoteResp;
+    rawAddresses: TxTokensRawAddresses;
+}
+export interface TxTokensRawAddresses {
+    fromRawAddress: string;
+    toRawAddress: string;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/services/tonkeeper-api-service.js

@@ -20,11 +20,11 @@ class TonkeeperApiService {
             });
             return req;
         });
-        const routes = (await Promise.all(promises)).filter(route => typeof route !== 'string');
+        const routes = (await Promise.all(promises)).filter(route => typeof route !== 'string' && route.trades.length);
         if (!routes.length) {
             throw new errors_1.NotSupportedTokensError();
         }
-        const bestRoute = routes.sort((routeA, routeB) => new bignumber_js_1.default(routeB.trades[0].toAmount).comparedTo(routeA.trades[0].toAmount))[0];
+        const bestRoute = routes.sort((routeA, routeB) => new bignumber_js_1.default(routeB.trades[0]?.toAmount).comparedTo(routeA.trades[0]?.toAmount))[0];
         return bestRoute;
     }
     /**

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/services/tonkeeper-api-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"tonkeeper-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/services/tonkeeper-api-service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA4D;AAC5D,yDAAsD;AAStD,MAAa,mBAAmB;IAKrB,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,cAAsB,EACtB,YAAoB,EACpB,UAAkB;QAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC/C,MAAM,GAAG,GAAG,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC/B,GAAG,IAAI,CAAC,MAAM,iBAAiB,EAC/B;gBACI,MAAM,EAAE;oBACJ,SAAS,EAAE,cAAc;oBACzB,OAAO,EAAE,YAAY;oBACrB,QAAQ,EAAE,OAAO;oBACjB,UAAU;iBACb;aACJ,CACJ,CAAC;YACF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAC/C,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CACb,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAChB,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAC7C,IAAI,sBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CACjF,CAAC,CAAC,CAAE,CAAC;QAEN,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,mBAAmB,CACnC,SAA6B,EAC7B,aAAqB,EACrB,QAAgB;QAEhB,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC,QAAQ,OAAO,CAAC;QACzC,8CAA8C;QAC9C,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,UAAU,CAAC,CAAC;QACvE,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,IAAI,CACtC,GAAG,IAAI,CAAC,MAAM,cAAc,EAC5B;YACI,IAAI,EAAE;gBACF,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,CAAC,GAAG,CAAC,EAAE,SAAS;aACnB;YACD,OAAO,EAAE;gBACL,aAAa,EAAE,aAAa;gBAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;aAChC;SACJ,CACJ,CAAC;QAEF,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;;AApEL,kDAqEC;AApEkB,0BAAM,GAAW,+BAA+B,CAAC;AAEjD,kCAAc,GAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"tonkeeper-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/services/tonkeeper-api-service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA4D;AAC5D,yDAAsD;AAStD,MAAa,mBAAmB;IAKrB,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,cAAsB,EACtB,YAAoB,EACpB,UAAkB;QAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC/C,MAAM,GAAG,GAAG,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC/B,GAAG,IAAI,CAAC,MAAM,iBAAiB,EAC/B;gBACI,MAAM,EAAE;oBACJ,SAAS,EAAE,cAAc;oBACzB,OAAO,EAAE,YAAY;oBACrB,QAAQ,EAAE,OAAO;oBACjB,UAAU;iBACb;aACJ,CACJ,CAAC;YACF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAC/C,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CACpC,CAAC;QAE1B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAChB,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAC7C,IAAI,sBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CACnF,CAAC,CAAC,CAAE,CAAC;QAEN,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,mBAAmB,CACnC,SAA6B,EAC7B,aAAqB,EACrB,QAAgB;QAEhB,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC,QAAQ,OAAO,CAAC;QACzC,8CAA8C;QAC9C,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,UAAU,CAAC,CAAC;QACvE,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,IAAI,CACtC,GAAG,IAAI,CAAC,MAAM,cAAc,EAC5B;YACI,IAAI,EAAE;gBACF,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,CAAC,GAAG,CAAC,EAAE,SAAS;aACnB;YACD,OAAO,EAAE;gBACL,aAAa,EAAE,aAAa;gBAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;aAChC;SACJ,CACJ,CAAC;QAEF,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;;AArEL,kDAsEC;AArEkB,0BAAM,GAAW,+BAA+B,CAAC;AAEjD,kCAAc,GAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.d.ts

@@ -10,5 +10,6 @@ export declare class TonkeeperOnChainProvider extends AggregatorOnChainProvider
     readonly tradeType: "TONKEEPER";
     isSupportedBlockchain(blockchain: BlockchainName): blockchain is TonBlockchainName;
     calculate(from: PriceTokenAmount, toToken: PriceToken, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
+    private getRawAddresses;
     protected getGasFeeInfo(tradeStruct: TonkeeperOnChainTradeStruct): Promise<GasFeeInfo | null>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonkeeperOnChainProvider = void 0;
+const core_1 = require("@ton/core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const tokens_1 = require("../../../../../../common/tokens");
 const native_tokens_1 = require("../../../../../../common/tokens/constants/native-tokens");
 const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
-const ton_utils_1 = require("../../../../../../core/blockchain/services/ton/ton-utils");
 const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
 const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
 const aggregator_on_chain_provider_abstract_1 = require("../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract");
@@ -24,11 +24,8 @@ class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
     }
     async calculate(from, toToken, options) {
         try {
-            const [fromRawAddress, toRawAddress, { fromWithoutFee, proxyFeeInfo }] = await Promise.all([
-                (await ton_utils_1.TonUtils.getAllFormatsOfAddress(from.address)).raw_form,
-                (await ton_utils_1.TonUtils.getAllFormatsOfAddress(toToken.address)).raw_form,
-                this.handleProxyContract(from, options)
-            ]);
+            const [fromRawAddress, toRawAddress] = this.getRawAddresses(from, toToken);
+            const { fromWithoutFee, proxyFeeInfo } = await this.handleProxyContract(from, options);
             const bestRoute = await tonkeeper_api_service_1.TonkeeperApiService.makeQuoteReq(fromRawAddress, toRawAddress, fromWithoutFee.stringWeiAmount);
             const to = new tokens_1.PriceTokenAmount({
                 ...toToken.asStruct,
@@ -44,7 +41,11 @@ class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
                 path: this.getRoutePath(from, toToken),
                 proxyFeeInfo,
                 fromWithoutFee,
-                bestRoute
+                bestRoute,
+                rawAddresses: {
+                    fromRawAddress,
+                    toRawAddress
+                }
             };
             tradeStruct.gasFeeInfo = await this.getGasFeeInfo(tradeStruct);
             return new tonkeeper_on_chain_trade_1.TonkeeperOnChainTrade(tradeStruct, options.providerAddress);
@@ -56,6 +57,18 @@ class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
             };
         }
     }
+    getRawAddresses(from, toToken) {
+        const rawAddresses = [from, toToken].map(token => {
+            if (token.address.startsWith('0:') || token.address.startsWith('-1:')) {
+                return token.address;
+            }
+            if (token.isNative) {
+                return 'ton';
+            }
+            return core_1.Address.parse(token.address).toRawString();
+        });
+        return rawAddresses;
+    }
     async getGasFeeInfo(tradeStruct) {
         const nativeTonCoin = native_tokens_1.nativeTokensList[blockchain_name_1.BLOCKCHAIN_NAME.TON];
         const gasLimitWei = tradeStruct.bestRoute.trades[0].blockchainFee;

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"tonkeeper-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,6EAA6E;AAC7E,gFAIoD;AACpD,0EAAsE;AACtE,uEAAmE;AAInE,iFAA8E;AAC9E,kIAAmH;AAInH,4EAAuE;AACvE,yEAAmE;AAEnE,MAAa,wBAAyB,SAAQ,iEAAyB;IAAvE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,SAAS,CAAC;IA+D9D,CAAC;IA7DU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,UAAU,KAAK,iCAAe,CAAC,GAAG,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAsB,EACtB,OAAmB,EACnB,OAA0C;QAE1C,IAAI;YACA,MAAM,CAAC,cAAc,EAAE,YAAY,EAAE,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,GAClE,MAAM,OAAO,CAAC,GAAG,CAAC;gBACd,CAAC,MAAM,oBAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBAC9D,CAAC,MAAM,oBAAQ,CAAC,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBACjE,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC;aAC1C,CAAC,CAAC;YAEP,MAAM,SAAS,GAAG,MAAM,2CAAmB,CAAC,YAAY,CACpD,cAAc,EACd,YAAY,EACZ,cAAc,CAAC,eAAe,CACjC,CAAC;YACF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;aACzD,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG;gBAChB,IAAI;gBACJ,EAAE;gBACF,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC;gBACtC,YAAY;gBACZ,cAAc;gBACd,SAAS;aACmB,CAAC;YACjC,WAAW,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAE/D,OAAO,IAAI,gDAAqB,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;SAC1E;QAAC,OAAO,GAAG,EAAE;YACV,OAAO;gBACH,IAAI,EAAE,yCAAmB,CAAC,SAAS;gBACnC,KAAK,EAAE,GAAG;aACb,CAAC;SACL;IACL,CAAC;IAES,KAAK,CAAC,aAAa,CACzB,WAAwC;QAExC,MAAM,aAAa,GAAG,gCAAgB,CAAC,iCAAe,CAAC,GAAG,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAClE,MAAM,cAAc,GAAG,oBAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC7E,OAAO;YACH,QAAQ,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;YAC1B,QAAQ,EAAE,cAAc;SAC3B,CAAC;IACN,CAAC;CACJ;AAhED,4DAgEC"}
+{"version":3,"file":"tonkeeper-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.ts"],"names":[],"mappings":"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"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-trade.d.ts

@@ -1,10 +1,13 @@
 import { TonEncodedConfig } from '../../../../../../core/blockchain/web3-private-service/web3-private/ton-web3-private/models/ton-types';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
+import { TonEncodedConfigAndToAmount } from '../../common/on-chain-trade/ton-on-chain-trade/models/ton--on-chian-trade-types';
 import { TonOnChainTrade } from '../../common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade';
 import { TonkeeperOnChainTradeStruct } from './models/tonkeeper-trade-struct';
 export declare class TonkeeperOnChainTrade extends TonOnChainTrade {
     type: "TONKEEPER";
     private readonly bestRoute;
+    private readonly rawAddresses;
     constructor(tradeStruct: TonkeeperOnChainTradeStruct, providerAddress: string);
     encodeDirect(options: EncodeTransactionOptions): Promise<TonEncodedConfig>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<TonEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-trade.js

@@ -1,6 +1,14 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonkeeperOnChainTrade = void 0;
+const decorators_1 = require("../../../../../../common/utils/decorators");
+const check_unsupported_receiver_address_1 = require("../../../../../common/utils/check-unsupported-receiver-address");
 const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
 const ton_on_chain_trade_1 = require("../../common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade");
 const tonkeeper_api_service_1 = require("./services/tonkeeper-api-service");
@@ -9,15 +17,30 @@ class TonkeeperOnChainTrade extends ton_on_chain_trade_1.TonOnChainTrade {
         super(tradeStruct, providerAddress);
         this.type = on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.TONKEEPER;
         this.bestRoute = tradeStruct.bestRoute;
+        this.rawAddresses = tradeStruct.rawAddresses;
     }
     async encodeDirect(options) {
-        const { body, to, value } = await tonkeeper_api_service_1.TonkeeperApiService.encodeParamsForSwap(this.bestRoute, options.receiverAddress || this.walletAddress, this.slippageTolerance);
+        (0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(options.receiverAddress, this.walletAddress);
+        const { tx } = await this.getTransactionConfigAndAmount(options);
+        return tx;
+    }
+    async getTransactionConfigAndAmount(options) {
+        const [newBestRoute, { body, to, value }] = await Promise.all([
+            tonkeeper_api_service_1.TonkeeperApiService.makeQuoteReq(this.rawAddresses.fromRawAddress, this.rawAddresses.toRawAddress, this.fromWithoutFee.stringWeiAmount),
+            tonkeeper_api_service_1.TonkeeperApiService.encodeParamsForSwap(this.bestRoute, options.receiverAddress || this.walletAddress, this.slippageTolerance)
+        ]);
         return {
-            address: to,
-            amount: value,
-            payload: body
+            tx: {
+                address: to,
+                amount: value,
+                payload: body
+            },
+            toAmount: newBestRoute.trades[0].toAmount
         };
     }
 }
 exports.TonkeeperOnChainTrade = TonkeeperOnChainTrade;
+__decorate([
+    (0, decorators_1.Cache)({ maxAge: 15000 })
+], TonkeeperOnChainTrade.prototype, "getTransactionConfigAndAmount", null);
 //# sourceMappingURL=tonkeeper-on-chain-trade.js.map

package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"tonkeeper-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-trade.ts"],"names":[],"mappings":";;;AAGA,iFAA8E;AAC9E,0GAAoG;AAGpG,4EAAuE;AAEvE,MAAa,qBAAsB,SAAQ,oCAAe;IAKtD,YAAY,WAAwC,EAAE,eAAuB;QACzE,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QALjC,SAAI,GAAG,yCAAmB,CAAC,SAAS,CAAC;QAMxC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,OAAiC;QACvD,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,2CAAmB,CAAC,mBAAmB,CACrE,IAAI,CAAC,SAAS,EACd,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa,EAC7C,IAAI,CAAC,iBAAiB,CACzB,CAAC;QAEF,OAAO;YACH,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,IAAI;SAChB,CAAC;IACN,CAAC;CACJ;AAvBD,sDAuBC"}
+{"version":3,"file":"tonkeeper-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-trade.ts"],"names":[],"mappings":";;;;;;;;;AAAA,4DAAoD;AAGpD,qHAA+G;AAE/G,iFAA8E;AAE9E,0GAAoG;AAGpG,4EAAuE;AAEvE,MAAa,qBAAsB,SAAQ,oCAAe;IAOtD,YAAY,WAAwC,EAAE,eAAuB;QACzE,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAPjC,SAAI,GAAG,yCAAmB,CAAC,SAAS,CAAC;QAQxC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,OAAiC;QACvD,IAAA,oEAA+B,EAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7E,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC;QACjE,OAAO,EAAE,CAAC;IACd,CAAC;IAGe,AAAN,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC1D,2CAAmB,CAAC,YAAY,CAC5B,IAAI,CAAC,YAAY,CAAC,cAAc,EAChC,IAAI,CAAC,YAAY,CAAC,YAAY,EAC9B,IAAI,CAAC,cAAc,CAAC,eAAe,CACtC;YACD,2CAAmB,CAAC,mBAAmB,CACnC,IAAI,CAAC,SAAS,EACd,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa,EAC7C,IAAI,CAAC,iBAAiB,CACzB;SACJ,CAAC,CAAC;QAEH,OAAO;YACH,EAAE,EAAE;gBACA,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,IAAI;aAChB;YACD,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ;SAC5C,CAAC;IACN,CAAC;CACJ;AA7CD,sDA6CC;AAzBmB;IADf,IAAA,kBAAK,EAAC,EAAE,MAAM,EAAE,KAAM,EAAE,CAAC;0EAyBzB"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/xy-dex/xy-dex-trade.d.ts

@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { XyDexTradeStruct } from './models/xy-dex-trade-struct';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 export declare class XyDexTrade extends AggregatorEvmOnChainTrade {
     /** @internal */
     static getGasLimit(tradeStruct: XyDexTradeStruct): Promise<BigNumber | null>;
@@ -10,6 +10,6 @@ export declare class XyDexTrade extends AggregatorEvmOnChainTrade {
     type: "XY_DEX";
     private readonly provider;
     constructor(tradeStruct: XyDexTradeStruct, providerAddress: string);
-    getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     private getResponseFromApiToTransactionRequest;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/zrx/zrx-trade.d.ts

@@ -3,7 +3,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
 import { ZrxTradeStruct } from './models/zrx-trade-struct';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
-import { GetToAmountAndTxDataResponse } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 export declare class ZrxTrade extends AggregatorEvmOnChainTrade {
     private readonly affiliateAddress;
     /** @internal */
@@ -11,5 +11,5 @@ export declare class ZrxTrade extends AggregatorEvmOnChainTrade {
     readonly dexContractAddress: string;
     get type(): OnChainTradeType;
     constructor(tradeStruct: ZrxTradeStruct, providerAddress: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/common/evm-wrap-trade/evm-wrap-trade.d.ts

@@ -1,12 +1,12 @@
 import { EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
-import { GetToAmountAndTxDataResponse } from '../on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../on-chain-aggregator/models/aggregator-on-chain-types';
 import { EvmOnChainTrade } from '../on-chain-trade/evm-on-chain-trade/evm-on-chain-trade';
 import { EvmOnChainTradeStruct } from '../on-chain-trade/evm-on-chain-trade/models/evm-on-chain-trade-struct';
 export declare class EvmWrapTrade extends EvmOnChainTrade {
     get dexContractAddress(): string;
     readonly type: "WRAPPED";
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     constructor(evmOnChainTradeStruct: EvmOnChainTradeStruct, providerAddress: string);
     static isSupportedBlockchain(blockchain: EvmBlockchainName): boolean;
     static isSupportedTrade(blockchain: EvmBlockchainName, fromAddress: string, toAddress: string): boolean;

package/lib/features/on-chain/calculation-manager/providers/common/models/on-chain-trade-type.d.ts

@@ -118,6 +118,7 @@ export declare const ON_CHAIN_TRADE_TYPE: {
     readonly UBE_SWAP: "UBE_SWAP";
     readonly UNISWAP_V2: "UNISWAP_V2";
     readonly UNI_SWAP_V3: "UNI_SWAP_V3";
+    readonly UNISWAP_BAHAMUT: "UNISWAP_BAHAMUT";
     readonly VERSE: "VERSE";
     readonly VIPER_SWAP: "VIPER_SWAP";
     readonly VOLTAGE_SWAP: "VOLTAGE_SWAP";

package/lib/features/on-chain/calculation-manager/providers/common/models/on-chain-trade-type.js

@@ -121,6 +121,7 @@ exports.ON_CHAIN_TRADE_TYPE = {
     UBE_SWAP: 'UBE_SWAP',
     UNISWAP_V2: 'UNISWAP_V2',
     UNI_SWAP_V3: 'UNI_SWAP_V3',
+    UNISWAP_BAHAMUT: 'UNISWAP_BAHAMUT',
     VERSE: 'VERSE',
     VIPER_SWAP: 'VIPER_SWAP',
     VOLTAGE_SWAP: 'VOLTAGE_SWAP',

package/lib/features/on-chain/calculation-manager/providers/common/models/on-chain-trade-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"on-chain-trade-type.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/common/models/on-chain-trade-type.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"on-chain-trade-type.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/common/models/on-chain-trade-type.ts"],"names":[],"mappings":"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"}

package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-solana-on-chain-trade-abstract.d.ts

@@ -1,10 +1,10 @@
 import { EvmEncodeConfig } from '../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/models/evm-encode-config';
 import { SolanaOnChainTrade } from '../on-chain-trade/solana-on-chain-trade/solana-on-chain-trade';
-import { GetToAmountAndTxDataResponse } from './models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from './models/aggregator-on-chain-types';
 export declare abstract class AggregatorSolanaOnChainTrade extends SolanaOnChainTrade {
     protected getTxConfigAndCheckAmount(receiverAddress?: string, fromAddress?: string, directTransaction?: EvmEncodeConfig): Promise<EvmEncodeConfig>;
     /**
      * @description Returns data for method OnChainTrade.checkAmountChange and EvmEncodeConfig value
      */
-    protected abstract getToAmountAndTxData(receiverAddress?: string, fromAddress?: string): Promise<GetToAmountAndTxDataResponse>;
+    protected abstract getToAmountAndTxData(receiverAddress?: string, fromAddress?: string): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/models/aggregator-on-chain-types.d.ts

@@ -1,5 +1,5 @@
 import { EvmEncodeConfig } from '../../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/models/evm-encode-config';
-export interface GetToAmountAndTxDataResponse {
+export interface EvmEncodedConfigAndToAmount {
     tx: EvmEncodeConfig;
     toAmount: string;
 }