rubic-sdk 6.0.0-alpha.ton.4 → 6.0.0-alpha.ton.41

package/lib/features/on-chain/calculation-manager/on-chain-manager.js

@@ -165,21 +165,30 @@ class OnChainManager {
             return { tradeType: type, trade: null, error };
         })));
     }
-    async calculateLifiTrade(from, to, options) {
+    async calculateLifiTrade(_from, _to, _options) {
         try {
-            const disabledProviders = [
-                ...this.LIFI_DISABLED_PROVIDERS,
-                ...options.disabledProviders
-            ];
-            const calculationOptions = {
-                ...options,
-                slippageTolerance: options?.slippageTolerance,
-                gasCalculation: options.gasCalculation === 'disabled' ? 'disabled' : 'calculate',
-                disabledProviders
-            };
-            const lifiAggregator = new this.AGGREGATORS.LIFI();
-            const lifiCalculationCall = lifiAggregator.calculate(from, to, calculationOptions);
-            return (0, p_timeout_1.default)(lifiCalculationCall, options.timeout);
+            throw Error('Lifi has been compromised');
+            // const disabledProviders = [
+            //     ...this.LIFI_DISABLED_PROVIDERS,
+            //     ...options.disabledProviders
+            // ];
+            //
+            // const calculationOptions: LifiCalculationOptions = {
+            //     ...options,
+            //     slippageTolerance: options?.slippageTolerance!,
+            //     gasCalculation: options.gasCalculation === 'disabled' ? 'disabled' : 'calculate',
+            //     disabledProviders
+            // };
+            //
+            // const lifiAggregator = new this.AGGREGATORS.LIFI();
+            //
+            // const lifiCalculationCall = lifiAggregator.calculate(
+            //     from as PriceTokenAmount<EvmBlockchainName>,
+            //     to as PriceTokenAmount<EvmBlockchainName>,
+            //     calculationOptions
+            // );
+            //
+            // return pTimeout(lifiCalculationCall, options.timeout);
         }
         catch (err) {
             console.debug('[RUBIC_SDK] Trade calculation error occurred for lifi.', err);

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

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

package/lib/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-trade.d.ts

@@ -4,7 +4,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
 import { OneinchTradeStruct } from './models/oneinch-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 OneInchTrade extends AggregatorEvmOnChainTrade {
     /** @internal */
     static getGasLimit(tradeStruct: OneinchTradeStruct): Promise<BigNumber | null>;
@@ -24,7 +24,7 @@ export declare class OneInchTrade extends AggregatorEvmOnChainTrade {
     readonly transactionData: string | null;
     get type(): OnChainTradeType;
     constructor(tradeStruct: OneinchTradeStruct, providerAddress: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     private getResponseFromApiToTransactionRequest;
     private specifyError;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-trade.d.ts

@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
 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 { 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 { NativeRouterTradeInstance, NativeRouterTradeStruct } from './models/native-router-trade-struct';
 export declare abstract class NativeRouterAbstractTrade extends AggregatorEvmOnChainTrade {
     static getGasLimit(tradeStruct: NativeRouterTradeStruct, providerGateway: string): Promise<BigNumber | null>;
@@ -12,5 +12,5 @@ export declare abstract class NativeRouterAbstractTrade extends AggregatorEvmOnC
     get dexContractAddress(): string;
     constructor(tradeInstance: NativeRouterTradeInstance);
     encode(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

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

@@ -1,7 +1,7 @@
 export type TonkeeperResp<T> = T | string;
-export interface TonkeeperQuoteResp {
+export interface TonkeeperQuoteResp<T extends TonkeeperCommonQuoteInfo> {
     provider: TonkeeperDexType;
-    trades: [TonkeeperDedustQuoteInfo | TonkeeperStonfiQuoteInfo];
+    trades: [T];
 }
 export type TonkeeperDexType = 'stonfi' | 'dedust';
 export interface TonkeeperDedustQuoteInfo extends TonkeeperCommonQuoteInfo {
@@ -10,10 +10,12 @@ export interface TonkeeperDedustQuoteInfo extends TonkeeperCommonQuoteInfo {
 export interface TonkeeperStonfiQuoteInfo extends TonkeeperCommonQuoteInfo {
     stonfiRawTrade: TonkeeperRawTradeStep | TonkeeperRawTradeStep[];
 }
-interface TonkeeperCommonQuoteInfo {
+export interface TonkeeperCommonQuoteInfo {
     fromAsset: string;
     toAsset: string;
+    /** wei amount */
     fromAmount: string;
+    /** wei amount */
     toAmount: string;
     blockchainFee: string;
     path: string[];
@@ -32,4 +34,3 @@ export interface TonkeeperEncodeSwapParamsResp {
     to: string;
     body: string;
 }
-export {};

package/lib/features/on-chain/calculation-manager/providers/aggregators/common/tonkeeper/models/tonkeeper-api-types.js.map

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

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

@@ -0,0 +1,15 @@
+import { OnChainTradeType } from '../../../../common/models/on-chain-trade-type';
+import { TonOnChainTradeStruct } from '../../../../common/on-chain-trade/ton-on-chain-trade/models/ton-on-chian-trade-types';
+import { TonkeeperCommonQuoteInfo, TonkeeperDedustQuoteInfo, TonkeeperDexType, TonkeeperQuoteResp, TonkeeperStonfiQuoteInfo } from './tonkeeper-api-types';
+export type DedustOnChainTradeStruct = TonkeeperOnChainTradeStruct<TonkeeperDedustQuoteInfo>;
+export type StonfiOnChainTradeStruct = TonkeeperOnChainTradeStruct<TonkeeperStonfiQuoteInfo>;
+export interface TonkeeperOnChainTradeStruct<T extends TonkeeperCommonQuoteInfo> extends TonOnChainTradeStruct {
+    bestRoute: TonkeeperQuoteResp<T>;
+    rawAddresses: TxTokensRawAddresses;
+    tradeType: Extract<OnChainTradeType, 'DEDUST' | 'STONFI'>;
+    tonkeeperDexType: TonkeeperDexType;
+}
+export interface TxTokensRawAddresses {
+    fromRawAddress: string;
+    toRawAddress: string;
+}

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

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

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

@@ -0,0 +1,9 @@
+import { TonkeeperCommonQuoteInfo, TonkeeperDexType, TonkeeperEncodeSwapParamsResp, TonkeeperQuoteResp } from '../models/tonkeeper-api-types';
+export declare class TonkeeperApiService {
+    private static apiUrl;
+    static makeQuoteReq<T extends TonkeeperCommonQuoteInfo>(fromRawAddress: string, toRawAddress: string, fromAmount: string, dexType: TonkeeperDexType): Promise<TonkeeperQuoteResp<T>>;
+    /**
+     * @param slippage number from 0 to 1
+     */
+    static encodeParamsForSwap<T extends TonkeeperCommonQuoteInfo>(bestRoute: TonkeeperQuoteResp<T>, walletAddress: string, slippage: number): Promise<TonkeeperEncodeSwapParamsResp>;
+}

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

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TonkeeperApiService = void 0;
+const errors_1 = require("../../../../../../../../common/errors");
+const injector_1 = require("../../../../../../../../core/injector/injector");
+class TonkeeperApiService {
+    static async makeQuoteReq(fromRawAddress, toRawAddress, fromAmount, dexType) {
+        const res = await injector_1.Injector.httpClient.get(`${this.apiUrl}/swap/calculate`, {
+            params: {
+                fromAsset: fromRawAddress,
+                toAsset: toRawAddress,
+                provider: dexType,
+                fromAmount
+            }
+        });
+        if (typeof res === 'string' || !res.trades.length) {
+            throw new errors_1.NotSupportedTokensError();
+        }
+        return res;
+    }
+    /**
+     * @param slippage number from 0 to 1
+     */
+    static async encodeParamsForSwap(bestRoute, walletAddress, slippage) {
+        const key = `${bestRoute.provider}Trade`;
+        // @ts-ignore dedustRawTrade or stonfiRawTrade
+        const tradeBody = bestRoute.trades[0][`${bestRoute.provider}RawTrade`];
+        const res = await injector_1.Injector.httpClient.post(`${this.apiUrl}/swap/encode`, {
+            swap: {
+                provider: bestRoute.provider,
+                [key]: tradeBody
+            },
+            options: {
+                senderAddress: walletAddress,
+                slippage: slippage.toString()
+            }
+        });
+        if (typeof res === 'string') {
+            throw new errors_1.NotSupportedTokensError();
+        }
+        return res;
+    }
+}
+exports.TonkeeperApiService = TonkeeperApiService;
+TonkeeperApiService.apiUrl = 'https://rubic-swap.tonkeeper.com/v2';
+//# sourceMappingURL=tonkeeper-api-service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tonkeeper-api-service.js","sourceRoot":"","sources":["../../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/common/tonkeeper/services/tonkeeper-api-service.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAC5D,yDAAsD;AAUtD,MAAa,mBAAmB;IAGrB,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,cAAsB,EACtB,YAAoB,EACpB,UAAkB,EAClB,OAAyB;QAEzB,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACrC,GAAG,IAAI,CAAC,MAAM,iBAAiB,EAC/B;YACI,MAAM,EAAE;gBACJ,SAAS,EAAE,cAAc;gBACzB,OAAO,EAAE,YAAY;gBACrB,QAAQ,EAAE,OAAO;gBACjB,UAAU;aACb;SACJ,CACJ,CAAC;QAEF,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE;YAC/C,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,mBAAmB,CACnC,SAAgC,EAChC,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;;AA1DL,kDA2DC;AA1DkB,0BAAM,GAAW,qCAAqC,CAAC"}

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

@@ -0,0 +1,16 @@
+import { PriceToken, PriceTokenAmount } from '../../../../../../../common/tokens';
+import { BlockchainName, TonBlockchainName } from '../../../../../../../core/blockchain/models/blockchain-name';
+import { OnChainTradeError } from '../../../../models/on-chain-trade-error';
+import { RequiredOnChainCalculationOptions } from '../../../common/models/on-chain-calculation-options';
+import { AggregatorOnChainProvider } from '../../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract';
+import { GasFeeInfo } from '../../../common/on-chain-trade/evm-on-chain-trade/models/gas-fee-info';
+import { OnChainTrade } from '../../../common/on-chain-trade/on-chain-trade';
+import { TonkeeperCommonQuoteInfo, TonkeeperDexType } from './models/tonkeeper-api-types';
+import { TonkeeperOnChainTradeStruct } from './models/tonkeeper-trade-struct';
+export declare abstract class TonkeeperOnChainProvider<T extends TonkeeperCommonQuoteInfo> extends AggregatorOnChainProvider {
+    protected abstract tonkeeperDexType: TonkeeperDexType;
+    isSupportedBlockchain(blockchain: BlockchainName): blockchain is TonBlockchainName;
+    calculate(from: PriceTokenAmount, toToken: PriceToken, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
+    private getRawAddresses;
+    protected getGasFeeInfo(tradeStruct: TonkeeperOnChainTradeStruct<T>): Promise<GasFeeInfo | null>;
+}

package/lib/features/on-chain/calculation-manager/providers/aggregators/{tonkeeper → common/tonkeeper}/tonkeeper-on-chain-provider.js

@@ -4,32 +4,24 @@ 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");
+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 web3_pure_1 = require("../../../../../../../core/blockchain/web3-pure/web3-pure");
+const aggregator_on_chain_provider_abstract_1 = require("../../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract");
 const tonkeeper_api_service_1 = require("./services/tonkeeper-api-service");
 const tonkeeper_on_chain_trade_1 = require("./tonkeeper-on-chain-trade");
 class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
-    constructor() {
-        super(...arguments);
-        this.tradeType = on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.TONKEEPER;
-    }
     isSupportedBlockchain(blockchain) {
         return blockchain === blockchain_name_1.BLOCKCHAIN_NAME.TON;
     }
     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 bestRoute = await tonkeeper_api_service_1.TonkeeperApiService.makeQuoteReq(fromRawAddress, toRawAddress, fromWithoutFee.stringWeiAmount);
+            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, this.tonkeeperDexType);
             const to = new tokens_1.PriceTokenAmount({
                 ...toToken.asStruct,
                 weiAmount: new bignumber_js_1.default(bestRoute.trades[0].toAmount)
@@ -44,18 +36,36 @@ class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
                 path: this.getRoutePath(from, toToken),
                 proxyFeeInfo,
                 fromWithoutFee,
-                bestRoute
+                tradeType: this.tradeType,
+                tonkeeperDexType: this.tonkeeperDexType,
+                bestRoute,
+                rawAddresses: {
+                    fromRawAddress,
+                    toRawAddress
+                }
             };
             tradeStruct.gasFeeInfo = await this.getGasFeeInfo(tradeStruct);
             return new tonkeeper_on_chain_trade_1.TonkeeperOnChainTrade(tradeStruct, options.providerAddress);
         }
         catch (err) {
             return {
-                type: on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.TONKEEPER,
+                type: this.tradeType,
                 error: err
             };
         }
     }
+    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/common/tonkeeper/tonkeeper-on-chain-provider.js.map

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

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

@@ -0,0 +1,16 @@
+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 { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
+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 { TonkeeperCommonQuoteInfo } from './models/tonkeeper-api-types';
+import { TonkeeperOnChainTradeStruct } from './models/tonkeeper-trade-struct';
+export declare class TonkeeperOnChainTrade<T extends TonkeeperCommonQuoteInfo> extends TonOnChainTrade {
+    type: OnChainTradeType;
+    private readonly bestRoute;
+    private readonly rawAddresses;
+    private readonly tonkeeperDexType;
+    constructor(tradeStruct: TonkeeperOnChainTradeStruct<T>, providerAddress: string);
+    encodeDirect(options: EncodeTransactionOptions): Promise<TonEncodedConfig>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<TonEncodedConfigAndToAmount>;
+}

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

@@ -0,0 +1,46 @@
+"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 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");
+class TonkeeperOnChainTrade extends ton_on_chain_trade_1.TonOnChainTrade {
+    constructor(tradeStruct, providerAddress) {
+        super(tradeStruct, providerAddress);
+        this.bestRoute = tradeStruct.bestRoute;
+        this.rawAddresses = tradeStruct.rawAddresses;
+        this.type = tradeStruct.tradeType;
+        this.tonkeeperDexType = tradeStruct.tonkeeperDexType;
+    }
+    async encodeDirect(options) {
+        (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, this.tonkeeperDexType),
+            tonkeeper_api_service_1.TonkeeperApiService.encodeParamsForSwap(this.bestRoute, options.receiverAddress || this.walletAddress, this.slippageTolerance)
+        ]);
+        return {
+            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/common/tonkeeper/tonkeeper-on-chain-trade.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tonkeeper-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/common/tonkeeper/tonkeeper-on-chain-trade.ts"],"names":[],"mappings":";;;;;;;;;AAAA,4DAAoD;AAGpD,qHAA+G;AAI/G,6GAAuG;AAOvG,4EAAuE;AAEvE,MAAa,qBAA0D,SAAQ,oCAAe;IAS1F,YAAY,WAA2C,EAAE,eAAuB;QAC5E,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAEpC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;IACzD,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,EACnC,IAAI,CAAC,gBAAgB,CACxB;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;AAnDD,sDAmDC;AA1BmB;IADf,IAAA,kBAAK,EAAC,EAAE,MAAM,EAAE,KAAM,EAAE,CAAC;0EA0BzB"}

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

@@ -0,0 +1,6 @@
+import { TonkeeperDedustQuoteInfo, TonkeeperDexType } from '../common/tonkeeper/models/tonkeeper-api-types';
+import { TonkeeperOnChainProvider } from '../common/tonkeeper/tonkeeper-on-chain-provider';
+export declare class DedustOnChainProvider extends TonkeeperOnChainProvider<TonkeeperDedustQuoteInfo> {
+    protected tonkeeperDexType: TonkeeperDexType;
+    tradeType: "DEDUST";
+}

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DedustOnChainProvider = void 0;
+const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
+const tonkeeper_on_chain_provider_1 = require("../common/tonkeeper/tonkeeper-on-chain-provider");
+class DedustOnChainProvider extends tonkeeper_on_chain_provider_1.TonkeeperOnChainProvider {
+    constructor() {
+        super(...arguments);
+        this.tonkeeperDexType = 'dedust';
+        this.tradeType = on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.DEDUST;
+    }
+}
+exports.DedustOnChainProvider = DedustOnChainProvider;
+//# sourceMappingURL=dedust-on-chain-provider.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dedust-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/dedust-on-chain-provider.ts"],"names":[],"mappings":";;;AAAA,iFAA8E;AAK9E,iGAA2F;AAE3F,MAAa,qBAAsB,SAAQ,sDAAkD;IAA7F;;QACc,qBAAgB,GAAqB,QAAQ,CAAC;QAEjD,cAAS,GAAG,yCAAmB,CAAC,MAAM,CAAC;IAClD,CAAC;CAAA;AAJD,sDAIC"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/chains/dln-evm-on-chain-trade.d.ts

@@ -7,7 +7,7 @@ import { DlnEvmOnChainSupportedBlockchain, DlnOnChainSupportedBlockchain } from
 import { DlnTradeStruct } from '../models/dln-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 DlnEvmOnChainTrade extends AggregatorEvmOnChainTrade {
     private readonly transactionRequest;
     static getGasLimit(tradeStruct: DlnTradeStruct<DlnEvmOnChainSupportedBlockchain>): Promise<BigNumber | null>;
@@ -18,6 +18,6 @@ export declare class DlnEvmOnChainTrade extends AggregatorEvmOnChainTrade {
     get dexContractAddress(): string;
     get toTokenAmountMin(): PriceTokenAmount;
     constructor(tradeStruct: DlnTradeStruct<DlnOnChainSupportedBlockchain & EvmBlockchainName>, providerAddress: string);
-    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
     encode(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/chains/dln-solana-on-chain-trade.d.ts

@@ -7,7 +7,7 @@ import { DlnEvmOnChainSupportedBlockchain, DlnOnChainSupportedBlockchain } from
 import { DlnTradeStruct } from '../models/dln-trade-struct';
 import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
 import { AggregatorSolanaOnChainTrade } from '../../../common/on-chain-aggregator/aggregator-solana-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 DlnSolanaOnChainTrade extends AggregatorSolanaOnChainTrade {
     private readonly transactionRequest;
     static getGasLimit(_tradeStruct: DlnTradeStruct<DlnEvmOnChainSupportedBlockchain>): Promise<BigNumber | null>;
@@ -18,5 +18,5 @@ export declare class DlnSolanaOnChainTrade extends AggregatorSolanaOnChainTrade
     get toTokenAmountMin(): PriceTokenAmount;
     constructor(tradeStruct: DlnTradeStruct<DlnOnChainSupportedBlockchain & SolanaBlockchainName>, providerAddress: string);
     encodeDirect(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
-    protected getToAmountAndTxData(receiverAddress?: string, _fromAddress?: string): Promise<GetToAmountAndTxDataResponse>;
+    protected getToAmountAndTxData(receiverAddress?: string, _fromAddress?: string): Promise<EvmEncodedConfigAndToAmount>;
 }

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/okuswap-on-chain-trade.d.ts

@@ -5,7 +5,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
 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 {
@@ -26,5 +26,5 @@ export declare class OkuSwapOnChainTrade extends AggregatorEvmOnChainTrade {
     needApprove(fromAddress?: string): Promise<boolean>;
     private needPermit2Approve;
     encode(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
-    protected getTransactionConfigAndAmount(_options: EncodeTransactionOptions): Promise<GetToAmountAndTxDataResponse>;
+    protected getTransactionConfigAndAmount(_options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
 }

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-provider.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RangoOnChainProvider = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const tokens_1 = require("../../../../../../common/tokens");
+const rango_contract_address_1 = require("../../../../../common/providers/rango/constants/rango-contract-address");
 const rango_supported_blockchains_1 = require("../../../../../common/providers/rango/models/rango-supported-blockchains");
 const rango_parser_1 = require("../../../../../common/providers/rango/services/rango-parser");
 const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
@@ -31,9 +32,10 @@ class RangoOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggre
                 ...options,
                 swapperGroups: rango_on_chain_disabled_providers_1.RANGO_ON_CHAIN_DISABLED_PROVIDERS
             });
-            const { route, tx } = await rango_on_chain_api_service_1.RangoOnChainApiService.getSwapTransaction(swapParams);
+            const { route, tx } = await rango_on_chain_api_service_1.RangoOnChainApiService.getSwapTransaction(swapParams, false);
             const { outputAmountMin, outputAmount } = route;
-            const providerGateway = tx.txTo;
+            const providerGateway = tx?.txTo ||
+                rango_contract_address_1.rangoContractAddresses[from.blockchain].providerGateway;
             const to = new tokens_1.PriceTokenAmount({
                 ...toToken.asStruct,
                 weiAmount: new bignumber_js_1.default(outputAmount)