rubic-sdk 6.0.0-alpha.ton.3 → 6.0.0-alpha.ton.30

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/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;
 }

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

@@ -11,7 +11,7 @@ import { SwapTransactionOptions } from '../../../../../../common/models/swap-tra
 import { FeeInfo } from '../../../../../../cross-chain/calculation-manager/providers/common/models/fee-info';
 import { GetContractParamsOptions } from '../../../../../../cross-chain/calculation-manager/providers/common/models/get-contract-params-options';
 import { IsDeflationToken } from '../../../../../../deflation-token-manager/models/is-deflation-token';
-import { GetToAmountAndTxDataResponse } from '../../on-chain-aggregator/models/aggregator-on-chain-types';
+import { EvmEncodedConfigAndToAmount } from '../../on-chain-aggregator/models/aggregator-on-chain-types';
 import { EvmOnChainTradeStruct } from './models/evm-on-chain-trade-struct';
 import { GasFeeInfo } from './models/gas-fee-info';
 import { OptionsGasParams, TransactionGasParams } from './models/gas-params';
@@ -77,7 +77,7 @@ export declare abstract class EvmOnChainTrade extends OnChainTrade {
     protected isDeflationError(): boolean;
     protected getGasParams(options: OptionsGasParams, calculatedGasFee?: OptionsGasParams): TransactionGasParams;
     protected getSwapData(options: GetContractParamsOptions): Promise<unknown[]>;
-    protected abstract getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected abstract getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     protected setTransactionConfig(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
     protected getSwapError(err: Error & {
         code: number;

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

@@ -131,7 +131,7 @@ class OnChainTrade {
     checkAmountChange(newWeiAmount, oldWeiAmount) {
         const oldAmount = new bignumber_js_1.default(oldWeiAmount);
         const newAmount = new bignumber_js_1.default(newWeiAmount);
-        const changePercent = 0.5;
+        const changePercent = 0.01;
         const acceptablePercentPriceChange = new bignumber_js_1.default(changePercent).dividedBy(100);
         const amountPlusPercent = oldAmount.multipliedBy(acceptablePercentPriceChange.plus(1));
         const amountMinusPercent = oldAmount.multipliedBy(new bignumber_js_1.default(1).minus(acceptablePercentPriceChange));

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

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

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

@@ -0,0 +1,5 @@
+import { TonEncodedConfig } from '../../../../../../../../core/blockchain/web3-private-service/web3-private/ton-web3-private/models/ton-types';
+export interface TonEncodedConfigAndToAmount {
+    tx: TonEncodedConfig;
+    toAmount: string;
+}

package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/models/ton--on-chian-trade-types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ton--on-chian-trade-types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ton--on-chian-trade-types.js","sourceRoot":"","sources":["../../../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/models/ton--on-chian-trade-types.ts"],"names":[],"mappings":""}

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

@@ -10,6 +10,7 @@ import { TransactionConfig } from 'web3-core';
 import { OnChainTradeStruct } from '../evm-on-chain-trade/models/evm-on-chain-trade-struct';
 import { GasFeeInfo } from '../evm-on-chain-trade/models/gas-fee-info';
 import { OnChainTrade } from '../on-chain-trade';
+import { TonEncodedConfigAndToAmount } from './models/ton--on-chian-trade-types';
 export declare abstract class TonOnChainTrade extends OnChainTrade {
     readonly from: PriceTokenAmount;
     readonly to: PriceTokenAmount;
@@ -17,6 +18,8 @@ export declare abstract class TonOnChainTrade extends OnChainTrade {
     readonly path: ReadonlyArray<Token>;
     readonly feeInfo: FeeInfo;
     readonly gasFeeInfo: GasFeeInfo | null;
+    protected readonly fromWithoutFee: PriceTokenAmount<TonBlockchainName>;
+    private skipAmountCheck;
     protected get spenderAddress(): string;
     protected get web3Public(): TonWeb3Public;
     protected get web3Private(): TonWeb3Private;
@@ -27,4 +30,6 @@ export declare abstract class TonOnChainTrade extends OnChainTrade {
     swap(options?: SwapTransactionOptions): Promise<string>;
     encode(options: EncodeTransactionOptions): Promise<TonEncodedConfig>;
     abstract encodeDirect(options: EncodeTransactionOptions): Promise<TonEncodedConfig>;
+    private handleAmountCheckBeforeSwap;
+    protected abstract getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<TonEncodedConfigAndToAmount>;
 }

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

@@ -19,11 +19,13 @@ class TonOnChainTrade extends on_chain_trade_1.OnChainTrade {
     constructor(tradeStruct, providerAddress) {
         super(providerAddress);
         this.feeInfo = {};
+        this.skipAmountCheck = false;
         this.from = tradeStruct.from;
         this.to = tradeStruct.to;
         this.slippageTolerance = tradeStruct.slippageTolerance;
         this.gasFeeInfo = tradeStruct.gasFeeInfo;
         this.path = tradeStruct.path;
+        this.fromWithoutFee = tradeStruct.fromWithoutFee;
     }
     async needApprove() {
         return false;
@@ -49,6 +51,7 @@ class TonOnChainTrade extends on_chain_trade_1.OnChainTrade {
         const tonEncodedConfig = await this.encode({
             fromAddress,
             receiverAddress,
+            skipAmountCheck: this.skipAmountCheck,
             ...(options?.referrer && { referrer: options?.referrer })
         });
         try {
@@ -65,8 +68,16 @@ class TonOnChainTrade extends on_chain_trade_1.OnChainTrade {
     async encode(options) {
         await this.checkFromAddress(options.fromAddress);
         await this.checkReceiverAddress(options.receiverAddress);
+        if (!options.skipAmountCheck) {
+            this.skipAmountCheck = true;
+            await this.handleAmountCheckBeforeSwap(options);
+        }
         return this.encodeDirect(options);
     }
+    async handleAmountCheckBeforeSwap(options) {
+        const { toAmount } = await this.getTransactionConfigAndAmount(options);
+        this.checkAmountChange(toAmount, this.to.stringWeiAmount);
+    }
 }
 exports.TonOnChainTrade = TonOnChainTrade;
 //# sourceMappingURL=ton-on-chain-trade.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ton-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,oDAAqD;AACrD,gFAAgG;AAIhG,yDAAsD;AAQtD,sDAAiD;AAEjD,MAAsB,eAAgB,SAAQ,6BAAY;IAatD,IAAc,cAAc;QACxB,MAAM,IAAI,sBAAa,CAAC,qBAAqB,CAAC,CAAC;IACnD,CAAC;IAED,IAAc,UAAU;QACpB,OAAO,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC;IAED,IAAc,WAAW;QACrB,OAAO,mBAAQ,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,iCAAe,CAAC,GAAG,CAAC,CAAC;IACvF,CAAC;IAED,YAAY,WAAkD,EAAE,eAAuB;QACnF,KAAK,CAAC,eAAe,CAAC,CAAC;QAjBX,YAAO,GAAY,EAAE,CAAC;QAkBlC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;QAC7B,IAAI,CAAC,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;QACvD,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IACjC,CAAC;IAEe,KAAK,CAAC,WAAW;QAC7B,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,MAAM,IAAI,sBAAa,CAAC,yBAAyB,CAAC,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,aAAa;QACtB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,UAAkC,EAAE;QAClD,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE/C,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAC9B,IAAI,eAAuB,CAAC;QAC5B,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;YACvC,IAAI,SAAS,EAAE;gBACX,SAAS,CAAC,IAAI,CAAC,CAAC;aACnB;YACD,eAAe,GAAG,IAAI,CAAC;QAC3B,CAAC,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC;QACvC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa,CAAC;QAEtE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;YACvC,WAAW;YACX,eAAe;YACf,GAAG,CAAC,OAAO,EAAE,QAAQ,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;SAC5D,CAAC,CAAC;QAEH,IAAI;YACA,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;gBACnC,iBAAiB;gBACjB,QAAQ,EAAE,CAAC,gBAAgB,CAAC;aAC/B,CAAC,CAAC;YACH,OAAO,eAAgB,CAAC;SAC3B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAA,mBAAU,EAAC,GAAG,CAAC,CAAC;SACzB;IACL,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAiC;QACjD,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAEzD,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;CAGJ;AAtFD,0CAsFC"}
+{"version":3,"file":"ton-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.ts"],"names":[],"mappings":"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"}

package/lib/features/on-chain/calculation-manager/providers/dexes/common/curve-provider/curve-abstract-trade.d.ts

@@ -1,6 +1,6 @@
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { EvmOnChainTrade } from '../../../common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade';
 import { CurveOnChainTradeStruct } from './models/curve-on-chain-trade-struct';
 export declare abstract class CurveAbstractTrade extends EvmOnChainTrade {
@@ -9,5 +9,5 @@ export declare abstract class CurveAbstractTrade extends EvmOnChainTrade {
     readonly dexContractAddress: string;
     private readonly poolAddress;
     constructor(tradeStruct: CurveOnChainTradeStruct, providerAddress: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

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

@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { EvmOnChainTrade } from '../../../common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade';
 import { IzumiTradeStruct } from './models/izumi-trade-struct';
 export declare class IzumiTrade extends EvmOnChainTrade {
@@ -10,6 +10,6 @@ export declare class IzumiTrade extends EvmOnChainTrade {
     readonly dexContractAddress: string;
     private readonly swapConfig;
     private readonly strictERC20Token;
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     constructor(tradeStruct: IzumiTradeStruct, providerAddress: string);
 }

package/lib/features/on-chain/calculation-manager/providers/dexes/common/pancake-router/pancake-router-trade.d.ts

@@ -1,14 +1,14 @@
 import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { EvmOnChainTrade } from '../../../common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade';
 import { PancakeRouterTradeStruct } from './models/pancake-router-trade-struct';
 export declare class PancakeRouterTrade extends EvmOnChainTrade {
     static getGasLimit(tradeStruct: PancakeRouterTradeStruct, providerAddress: string): Promise<BigNumber | null>;
     get type(): OnChainTradeType;
     readonly dexContractAddress: string;
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     private readonly trade;
     constructor(tradeStruct: PancakeRouterTradeStruct, providerAddress: string);
 }

package/lib/features/on-chain/calculation-manager/providers/dexes/common/sync-swap-abstract/sync-swap-abstract-trade.d.ts

@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { EvmOnChainTrade } from '../../../common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade';
 import { EvmOnChainTradeStruct } from '../../../common/on-chain-trade/evm-on-chain-trade/models/evm-on-chain-trade-struct';
 import { BestPathsWithAmounts } from './utils/typings';
@@ -18,6 +18,6 @@ export declare class SyncSwapAbstractTrade extends EvmOnChainTrade {
     constructor(tradeStruct: EvmOnChainTradeStruct & {
         bestPathWithAmounts: BestPathsWithAmounts;
     }, providerAddress: string, dexContractAddress: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     getCallParameters(receiverAddress?: string): unknown[];
 }

package/lib/features/on-chain/calculation-manager/providers/dexes/common/uniswap-v2-abstract/uniswap-v2-abstract-trade.d.ts

@@ -7,7 +7,7 @@ import { ContractMulticallResponse } from '../../../../../../../core/blockchain/
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { SwapTransactionOptions } from '../../../../../../common/models/swap-transaction-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { EvmOnChainTrade } from '../../../common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade';
 import { Exact } from '../../../common/on-chain-trade/evm-on-chain-trade/models/exact';
 import { ExactInputOutputSwapMethodsList } from './constants/SWAP_METHOD';
@@ -52,7 +52,7 @@ export declare abstract class UniswapV2AbstractTrade extends EvmOnChainTrade {
         amountIn: string;
         amountOut: string;
     };
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     protected getSwapError(err: Error & {
         code: number;
     }): Error;

package/lib/features/on-chain/calculation-manager/providers/dexes/common/uniswap-v3-algebra-abstract/uniswap-v3-algebra-abstract-trade.d.ts

@@ -4,7 +4,7 @@ import { EvmBlockchainName } from '../../../../../../../core/blockchain/models/b
 import { MethodData } from '../../../../../../../core/blockchain/web3-public-service/web3-public/models/method-data';
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { EvmOnChainTrade } from '../../../common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade';
 import { Exact } from '../../../common/on-chain-trade/evm-on-chain-trade/models/exact';
 import { CreateTradeInstance } from './models/create-trade-instance';
@@ -34,7 +34,7 @@ export declare abstract class UniswapV3AlgebraAbstractTrade extends EvmOnChainTr
      * Returns swap `exactInput` method's name and arguments to use in `swap contract`.
      */
     protected abstract getSwapRouterExactInputMethodData(walletAddress: string): MethodData;
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     private getSwapRouterMethodData;
     /**
      * Returns encoded data of estimated gas function and default estimated gas.

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

@@ -1,6 +1,6 @@
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { EvmOnChainTrade } from '../../../common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade';
 import { VooiTradeStruct } from './models/vooi-trade-struct';
 export declare abstract class VooiAbstractTrade extends EvmOnChainTrade {
@@ -11,5 +11,5 @@ export declare abstract class VooiAbstractTrade extends EvmOnChainTrade {
     readonly type: "VOOI";
     abstract readonly dexContractAddress: string;
     constructor(tradeStruct: VooiTradeStruct, providerAddress: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

package/lib/features/on-chain/calculation-manager/providers/dexes/mode/eddy-finance-mode/eddy-finance-mode-trade.d.ts

@@ -2,7 +2,7 @@ import { EvmWeb3Private } from '../../../../../../../core/blockchain/web3-privat
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { GetContractParamsOptions } from '../../../../../../cross-chain/calculation-manager/providers/common/models/get-contract-params-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { ExactInputOutputSwapMethodsList } from '../../common/uniswap-v2-abstract/constants/SWAP_METHOD';
 import { UniswapV2AbstractTrade } from '../../common/uniswap-v2-abstract/uniswap-v2-abstract-trade';
 export declare class EddyFinanceModeTrade extends UniswapV2AbstractTrade {
@@ -10,7 +10,7 @@ export declare class EddyFinanceModeTrade extends UniswapV2AbstractTrade {
     readonly dexContractAddress = "0xc1e624C810D297FD70eF53B0E08F44FABE468591";
     static readonly swapMethods: ExactInputOutputSwapMethodsList;
     protected get spenderAddress(): string;
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     protected getCallParameters(receiverAddress?: string): unknown[];
     protected getSwapParametersByMethod(method: string): Parameters<InstanceType<typeof EvmWeb3Private>['executeContractMethod']>;
     protected getSwapData(options: GetContractParamsOptions): Promise<unknown[]>;

package/lib/features/on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-trade.d.ts

@@ -2,7 +2,7 @@ import { EvmWeb3Private } from '../../../../../../../core/blockchain/web3-privat
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { GetContractParamsOptions } from '../../../../../../cross-chain/calculation-manager/providers/common/models/get-contract-params-options';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
-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 { ExactInputOutputSwapMethodsList } from '../../common/uniswap-v2-abstract/constants/SWAP_METHOD';
 import { UniswapV2AbstractTrade } from '../../common/uniswap-v2-abstract/uniswap-v2-abstract-trade';
 export declare class EddyFinanceTrade extends UniswapV2AbstractTrade {
@@ -10,7 +10,7 @@ export declare class EddyFinanceTrade extends UniswapV2AbstractTrade {
     readonly dexContractAddress = "0x2ca7d64A7EFE2D62A725E2B35Cf7230D6677FfEe";
     static readonly swapMethods: ExactInputOutputSwapMethodsList;
     protected get spenderAddress(): string;
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     protected getCallParameters(): unknown[];
     protected getSwapParametersByMethod(method: string): Parameters<InstanceType<typeof EvmWeb3Private>['executeContractMethod']>;
     protected getSwapData(options: GetContractParamsOptions): Promise<unknown[]>;

package/lib/index.d.ts

@@ -75,7 +75,6 @@ export * from './core/blockchain/models/ton/ton-center-types';
 export * from './core/blockchain/models/ton/tonapi-types';
 export * from './core/blockchain/models/web3-primitive-type';
 export * from './core/blockchain/services/constants/ton-constants';
-export * from './core/blockchain/services/ton/ton-utils';
 export * from './core/blockchain/services/ton/tonapi-service';
 export * from './core/blockchain/utils/blockchains-info/blockchains-info';
 export * from './core/blockchain/utils/blockchains-info/constants/blockchain-id';
@@ -641,6 +640,7 @@ export * from './features/on-chain/calculation-manager/providers/common/on-chain
 export * from './features/on-chain/calculation-manager/providers/common/on-chain-trade/evm-on-chain-trade/models/permit2-approve-config';
 export * from './features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade';
 export * from './features/on-chain/calculation-manager/providers/common/on-chain-trade/solana-on-chain-trade/solana-on-chain-trade';
+export * from './features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/models/ton--on-chian-trade-types';
 export * from './features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade';
 export * from './features/on-chain/calculation-manager/providers/common/on-chain-trade/tron-on-chain-trade/tron-on-chain-trade';
 export * from './features/on-chain/calculation-manager/providers/common/utils/get-gas-fee-info';

package/lib/index.js

@@ -92,7 +92,6 @@ __exportStar(require("./core/blockchain/models/ton/ton-center-types"), exports);
 __exportStar(require("./core/blockchain/models/ton/tonapi-types"), exports);
 __exportStar(require("./core/blockchain/models/web3-primitive-type"), exports);
 __exportStar(require("./core/blockchain/services/constants/ton-constants"), exports);
-__exportStar(require("./core/blockchain/services/ton/ton-utils"), exports);
 __exportStar(require("./core/blockchain/services/ton/tonapi-service"), exports);
 __exportStar(require("./core/blockchain/utils/blockchains-info/blockchains-info"), exports);
 __exportStar(require("./core/blockchain/utils/blockchains-info/constants/blockchain-id"), exports);
@@ -658,6 +657,7 @@ __exportStar(require("./features/on-chain/calculation-manager/providers/common/o
 __exportStar(require("./features/on-chain/calculation-manager/providers/common/on-chain-trade/evm-on-chain-trade/models/permit2-approve-config"), exports);
 __exportStar(require("./features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade"), exports);
 __exportStar(require("./features/on-chain/calculation-manager/providers/common/on-chain-trade/solana-on-chain-trade/solana-on-chain-trade"), exports);
+__exportStar(require("./features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/models/ton--on-chian-trade-types"), exports);
 __exportStar(require("./features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade"), exports);
 __exportStar(require("./features/on-chain/calculation-manager/providers/common/on-chain-trade/tron-on-chain-trade/tron-on-chain-trade"), exports);
 __exportStar(require("./features/on-chain/calculation-manager/providers/common/utils/get-gas-fee-info"), exports);