rubic-sdk 6.0.0-alpha.ton.6 → 6.0.0-alpha.ton.60

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

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DedustOnChainProvider = void 0;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const tokens_1 = require("../../../../../../common/tokens");
+const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
+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 dedust_gas_1 = require("./constants/dedust-gas");
+const dedust_on_chain_trade_1 = require("./dedust-on-chain-trade");
+const dedust_swap_service_1 = require("./services/dedust-swap-service");
+class DedustOnChainProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
+    constructor() {
+        super(...arguments);
+        this.tradeType = on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.DEDUST;
+        this.dedustSwapService = new dedust_swap_service_1.DedustSwapService();
+    }
+    isSupportedBlockchain(blockchain) {
+        return blockchain === blockchain_name_1.BLOCKCHAIN_NAME.TON;
+    }
+    async calculate(from, toToken, options) {
+        try {
+            const { fromWithoutFee, proxyFeeInfo } = await this.handleProxyContract(from, options);
+            const toStringWeiAmount = await this.dedustSwapService.calcOutputAmount(from, toToken);
+            const to = new tokens_1.PriceTokenAmount({
+                ...toToken.asStruct,
+                weiAmount: new bignumber_js_1.default(toStringWeiAmount)
+            });
+            return new dedust_on_chain_trade_1.DedustOnChainTrade({
+                from,
+                to,
+                gasFeeInfo: await this.getGasFeeInfo(),
+                fromWithoutFee,
+                proxyFeeInfo,
+                slippageTolerance: options.slippageTolerance,
+                useProxy: false,
+                withDeflation: options.withDeflation,
+                path: this.getRoutePath(from, toToken),
+                usedForCrossChain: false
+            }, options.providerAddress);
+        }
+        catch (err) {
+            return {
+                type: this.tradeType,
+                error: err
+            };
+        }
+    }
+    async getGasFeeInfo() {
+        return {
+            gasPrice: new bignumber_js_1.default(1),
+            gasLimit: new bignumber_js_1.default(dedust_gas_1.DEDUST_GAS)
+        };
+    }
+}
+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,gEAAqC;AACrC,8CAAiE;AACjE,gFAIoD;AAIpD,iFAA8E;AAC9E,kIAAmH;AAGnH,uDAAoD;AACpD,mEAA6D;AAC7D,wEAAmE;AAEnE,MAAa,qBAAsB,SAAQ,iEAAyB;IAApE;;QACW,cAAS,GAAG,yCAAmB,CAAC,MAAM,CAAC;QAE7B,sBAAiB,GAAG,IAAI,uCAAiB,EAAE,CAAC;IAiDjE,CAAC;IA/CU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,UAAU,KAAK,iCAAe,CAAC,GAAG,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI;YACA,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACvF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEvF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,iBAAiB,CAAC;aAC9C,CAAC,CAAC;YAEH,OAAO,IAAI,0CAAkB,CACzB;gBACI,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;gBACtC,cAAc;gBACd,YAAY;gBACZ,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC;gBACtC,iBAAiB,EAAE,KAAK;aAC3B,EACD,OAAO,CAAC,eAAe,CAC1B,CAAC;SACL;QAAC,OAAO,GAAG,EAAE;YACV,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,GAAG;aACb,CAAC;SACL;IACL,CAAC;IAES,KAAK,CAAC,aAAa;QACzB,OAAO;YACH,QAAQ,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;YAC1B,QAAQ,EAAE,IAAI,sBAAS,CAAC,uBAAU,CAAC;SACtC,CAAC;IACN,CAAC;CACJ;AApDD,sDAoDC"}

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

@@ -0,0 +1,12 @@
+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 { TonOnChainTrade } from '../../common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade';
+import { DedustOnChainTradeStruct } from './models/dedust-trade-types';
+export declare class DedustOnChainTrade extends TonOnChainTrade<undefined> {
+    type: OnChainTradeType;
+    private readonly dedustSwapService;
+    constructor(tradeStruct: DedustOnChainTradeStruct, providerAddress: string);
+    swap(options?: SwapTransactionOptions): Promise<string | never>;
+    protected calculateOutputAmount(_options: EncodeTransactionOptions): Promise<string>;
+}

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

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DedustOnChainTrade = void 0;
+const errors_1 = require("../../../../../../common/utils/errors");
+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 dedust_swap_service_1 = require("./services/dedust-swap-service");
+class DedustOnChainTrade extends ton_on_chain_trade_1.TonOnChainTrade {
+    constructor(tradeStruct, providerAddress) {
+        super(tradeStruct, providerAddress);
+        this.type = on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.DEDUST;
+        this.dedustSwapService = new dedust_swap_service_1.DedustSwapService();
+    }
+    async swap(options = {}) {
+        await this.checkWalletState(options?.testMode);
+        let txHash;
+        const onTransactionHash = (hash) => {
+            if (options.onConfirm) {
+                options.onConfirm(hash);
+            }
+            txHash = hash;
+        };
+        await this.makePreSwapChecks({
+            fromAddress: this.walletAddress,
+            receiverAddress: this.walletAddress,
+            skipAmountCheck: this.skipAmountCheck,
+            ...(options?.referrer && { referrer: options?.referrer })
+        });
+        try {
+            await this.dedustSwapService.sendTransaction(this.from, this.to, this.walletAddress, this.slippageTolerance, onTransactionHash);
+            return txHash;
+        }
+        catch (err) {
+            throw (0, errors_1.parseError)(err);
+        }
+    }
+    calculateOutputAmount(_options) {
+        return this.dedustSwapService.calcOutputAmount(this.from, this.to);
+    }
+}
+exports.DedustOnChainTrade = DedustOnChainTrade;
+//# sourceMappingURL=dedust-on-chain-trade.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dedust-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/dedust-on-chain-trade.ts"],"names":[],"mappings":";;;AAAA,oDAAqD;AAIrD,iFAAgG;AAChG,0GAAoG;AAEpG,wEAAmE;AAEnE,MAAa,kBAAmB,SAAQ,oCAA0B;IAK9D,YAAY,WAAqC,EAAE,eAAuB;QACtE,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QALjC,SAAI,GAAqB,yCAAmB,CAAC,MAAM,CAAC;QAE1C,sBAAiB,GAAG,IAAI,uCAAiB,EAAE,CAAC;IAI7D,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,UAAkC,EAAE;QAClD,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE/C,IAAI,MAAc,CAAC;QACnB,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;YACvC,IAAI,OAAO,CAAC,SAAS,EAAE;gBACnB,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aAC3B;YACD,MAAM,GAAG,IAAI,CAAC;QAClB,CAAC,CAAC;QAEF,MAAM,IAAI,CAAC,iBAAiB,CAAC;YACzB,WAAW,EAAE,IAAI,CAAC,aAAa;YAC/B,eAAe,EAAE,IAAI,CAAC,aAAa;YACnC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,GAAG,CAAC,OAAO,EAAE,QAAQ,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;SAC5D,CAAC,CAAC;QAEH,IAAI;YACA,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CACxC,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,iBAAiB,EACtB,iBAAiB,CACpB,CAAC;YACF,OAAO,MAAO,CAAC;SAClB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAA,mBAAU,EAAC,GAAG,CAAC,CAAC;SACzB;IACL,CAAC;IAES,qBAAqB,CAAC,QAAkC;QAC9D,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;CACJ;AA5CD,gDA4CC"}

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

@@ -0,0 +1,3 @@
+import { TonOnChainTradeStruct } from '../../../common/on-chain-trade/ton-on-chain-trade/models/ton-on-chian-trade-types';
+export interface DedustOnChainTradeStruct extends TonOnChainTradeStruct {
+}

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/models/dedust-trade-types.js

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

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/models/dedust-trade-types.js.map

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

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-sender-class.d.ts

@@ -0,0 +1,8 @@
+import { Address, Sender, SenderArguments } from '@ton/core';
+export declare class DedustTxSender implements Sender {
+    private readonly onHash;
+    readonly address: Address;
+    private get web3Private();
+    constructor(walletAddress: string, onHash: (hash: string) => void);
+    send(args: SenderArguments): Promise<void>;
+}

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-sender-class.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DedustTxSender = void 0;
+const core_1 = require("@ton/core");
+const blockchain_name_1 = require("../../../../../../../core/blockchain/models/blockchain-name");
+const injector_1 = require("../../../../../../../core/injector/injector");
+class DedustTxSender {
+    get web3Private() {
+        return injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(blockchain_name_1.BLOCKCHAIN_NAME.TON);
+    }
+    constructor(walletAddress, onHash) {
+        this.onHash = onHash;
+        this.address = core_1.Address.parse(walletAddress);
+    }
+    async send(args) {
+        const { to, value, body, init } = args;
+        const stateInit = init
+            ? (0, core_1.beginCell)().storeWritable((0, core_1.storeStateInit)(init)).endCell().toBoc().toString('base64')
+            : undefined;
+        const message = {
+            address: to.toString(),
+            amount: value.toString(),
+            payload: body?.toBoc().toString('base64'),
+            stateInit
+        };
+        try {
+            await this.web3Private.sendTransaction({
+                messages: [message],
+                onTransactionHash: this.onHash
+            });
+        }
+        catch (_) { }
+    }
+}
+exports.DedustTxSender = DedustTxSender;
+//# sourceMappingURL=dedust-sender-class.js.map

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-sender-class.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dedust-sender-class.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-sender-class.ts"],"names":[],"mappings":";;;AAAA,oCAAwF;AACxF,gFAA6E;AAE7E,yDAAsD;AAEtD,MAAa,cAAc;IAGvB,IAAY,WAAW;QACnB,OAAO,mBAAQ,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,iCAAe,CAAC,GAAG,CAAC,CAAC;IACvF,CAAC;IAED,YAAY,aAAqB,EAAmB,MAA8B;QAA9B,WAAM,GAAN,MAAM,CAAwB;QAC9E,IAAI,CAAC,OAAO,GAAG,cAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,IAAqB;QACnC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAEvC,MAAM,SAAS,GAAG,IAAI;YAClB,CAAC,CAAC,IAAA,gBAAS,GAAE,CAAC,aAAa,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACtF,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,OAAO,GAAG;YACZ,OAAO,EAAE,EAAE,CAAC,QAAQ,EAAE;YACtB,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE;YACxB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACzC,SAAS;SACZ,CAAC;QAEF,IAAI;YACA,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;gBACnC,QAAQ,EAAE,CAAC,OAAO,CAAC;gBACnB,iBAAiB,EAAE,IAAI,CAAC,MAAM;aACjC,CAAC,CAAC;SACN;QAAC,OAAO,CAAC,EAAE,GAAE;IAClB,CAAC;CACJ;AAhCD,wCAgCC"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-swap-service.d.ts

@@ -0,0 +1,22 @@
+import { PriceToken, PriceTokenAmount } from '../../../../../../../common/tokens';
+export declare class DedustSwapService {
+    private readonly factory;
+    private readonly tonClient;
+    private get mainnetFactoryAddress();
+    constructor();
+    /**
+     * @returns weiAmount in BigNumber format
+     */
+    calcOutputAmount(from: PriceTokenAmount, to: PriceToken): Promise<string>;
+    sendTransaction(from: PriceTokenAmount, to: PriceTokenAmount, walletAddress: string, slippage: number, onHash: (hash: string) => void): Promise<void>;
+    /**
+     * uses more than 1 pool
+     */
+    private isMultihopSwap;
+    private getPool;
+    private getTokenAsset;
+    private getVault;
+    private swapTonToJetton;
+    private swapJettonToTon;
+    private swapJettonsWithMultihop;
+}

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-swap-service.js

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DedustSwapService = void 0;
+const sdk_1 = require("@dedust/sdk");
+const core_1 = require("@ton/core");
+const ton_1 = require("@ton/ton");
+const errors_1 = require("../../../../../../../common/errors");
+const native_tokens_1 = require("../../../../../../../common/tokens/constants/native-tokens");
+const blockchain_name_1 = require("../../../../../../../core/blockchain/models/blockchain-name");
+const dedust_gas_1 = require("../constants/dedust-gas");
+const dedust_sender_class_1 = require("./dedust-sender-class");
+class DedustSwapService {
+    get mainnetFactoryAddress() {
+        return core_1.Address.parse('EQBfBWT7X2BHg9tXAxzhz2aKiNTU1tpt5NsiK0uSDW_YAJ67');
+    }
+    constructor() {
+        this.tonClient = new ton_1.TonClient({
+            endpoint: 'https://toncenter.com/api/v2/jsonRPC',
+            apiKey: '44176ed3735504c6fb1ed3b91715ba5272cdd2bbb304f78d1ae6de6aed47d284'
+        });
+        this.factory = this.tonClient.open(sdk_1.Factory.createFromAddress(this.mainnetFactoryAddress));
+    }
+    /**
+     * @returns weiAmount in BigNumber format
+     */
+    async calcOutputAmount(from, to) {
+        if (this.isMultihopSwap(from, to)) {
+            const ton = native_tokens_1.nativeTokensList[blockchain_name_1.BLOCKCHAIN_NAME.TON];
+            const firstPoolSrcAsset = this.getTokenAsset(from);
+            const secondPoolSrcAsset = this.getTokenAsset(ton);
+            const firstPool = await this.getPool(from, ton);
+            const secondPool = await this.getPool(ton, to);
+            const { amountOut: firstPoolAmountOut } = await firstPool.getEstimatedSwapOut({
+                assetIn: firstPoolSrcAsset,
+                amountIn: (0, core_1.toNano)(from.tokenAmount.toFixed())
+            });
+            const { amountOut } = await secondPool.getEstimatedSwapOut({
+                assetIn: secondPoolSrcAsset,
+                amountIn: firstPoolAmountOut
+            });
+            return amountOut.toString();
+        }
+        const fromAsset = this.getTokenAsset(from);
+        const pool = await this.getPool(from, to);
+        const { amountOut } = await pool.getEstimatedSwapOut({
+            assetIn: fromAsset,
+            amountIn: (0, core_1.toNano)(from.tokenAmount.toFixed())
+        });
+        return amountOut.toString();
+    }
+    async sendTransaction(from, to, walletAddress, slippage, onHash) {
+        const sender = new dedust_sender_class_1.DedustTxSender(walletAddress, onHash);
+        const minAmountOut = BigInt(to.tokenAmount.multipliedBy(1 - slippage).toFixed());
+        if (from.isNative) {
+            await this.swapTonToJetton(from, to, sender, minAmountOut);
+        }
+        else if (to.isNative) {
+            await this.swapJettonToTon(from, to, sender, minAmountOut);
+        }
+        else {
+            await this.swapJettonsWithMultihop(from, to, sender, minAmountOut);
+        }
+    }
+    /**
+     * uses more than 1 pool
+     */
+    isMultihopSwap(from, to) {
+        return !from.isNative && !to.isNative;
+    }
+    async getPool(from, to) {
+        try {
+            const fromAsset = this.getTokenAsset(from);
+            const toAsset = this.getTokenAsset(to);
+            const poolAddress = await this.factory.getPoolAddress({
+                poolType: sdk_1.PoolType.VOLATILE,
+                assets: [fromAsset, toAsset]
+            });
+            const pool = this.tonClient.open(sdk_1.Pool.createFromAddress(poolAddress));
+            if ((await pool.getReadinessStatus()) !== sdk_1.ReadinessStatus.READY) {
+                throw new Error(`[DedustSwapService_getPool] Pool does not exist.`);
+            }
+            return pool;
+        }
+        catch (err) {
+            throw err;
+        }
+    }
+    getTokenAsset(token) {
+        if (token.isNative)
+            return sdk_1.Asset.native();
+        const parsedAddress = core_1.Address.parse(token.address);
+        const openedTokenContract = this.tonClient.open(sdk_1.JettonRoot.createFromAddress(parsedAddress));
+        return sdk_1.Asset.jetton(openedTokenContract.address);
+    }
+    async getVault(token) {
+        if (token.isNative) {
+            const nativeVault = this.tonClient.open(await this.factory.getNativeVault());
+            if ((await nativeVault.getReadinessStatus()) !== sdk_1.ReadinessStatus.READY) {
+                throw new errors_1.RubicSdkError('Vault (TON) does not exist.');
+            }
+            return nativeVault;
+        }
+        const parsedAddress = core_1.Address.parse(token.address);
+        const jettonVault = this.tonClient.open(await this.factory.getJettonVault(parsedAddress));
+        if ((await jettonVault.getReadinessStatus()) !== sdk_1.ReadinessStatus.READY) {
+            throw new Error(`Vault (${token.symbol}) does not exist.`);
+        }
+        return jettonVault;
+    }
+    async swapTonToJetton(from, to, sender, minAmountOut) {
+        const pool = await this.getPool(from, to);
+        const nativeVault = await this.getVault(from);
+        const fromAmount = (0, core_1.toNano)(from.tokenAmount.toFixed());
+        await nativeVault.sendSwap(sender, {
+            poolAddress: pool.address,
+            amount: fromAmount,
+            limit: minAmountOut,
+            gasAmount: (0, core_1.toNano)(dedust_gas_1.DEDUST_GAS)
+        });
+    }
+    async swapJettonToTon(from, to, sender, minAmountOut) {
+        const pool = await this.getPool(from, to);
+        const jettonVault = await this.getVault(from);
+        const parsedAddress = core_1.Address.parse(from.address);
+        const jettonRoot = this.tonClient.open(sdk_1.JettonRoot.createFromAddress(parsedAddress));
+        const jettonWallet = this.tonClient.open(await jettonRoot.getWallet(sender.address));
+        await jettonWallet.sendTransfer(sender, (0, core_1.toNano)(0.3), {
+            amount: (0, core_1.toNano)(from.tokenAmount.toFixed()),
+            destination: jettonVault.address,
+            responseAddress: sender.address,
+            forwardAmount: (0, core_1.toNano)(0.25),
+            forwardPayload: sdk_1.VaultJetton.createSwapPayload({
+                poolAddress: pool.address,
+                limit: minAmountOut
+            })
+        });
+    }
+    async swapJettonsWithMultihop(from, to, sender, minAmountOut) {
+        const ton = native_tokens_1.nativeTokensList[blockchain_name_1.BLOCKCHAIN_NAME.TON];
+        const firstPool = await this.getPool(from, ton);
+        const secondPool = await this.getPool(ton, to);
+        const jettonVault = await this.getVault(from);
+        const parsedAddress = core_1.Address.parse(from.address);
+        const jettonRoot = this.tonClient.open(sdk_1.JettonRoot.createFromAddress(parsedAddress));
+        const jettonWallet = this.tonClient.open(await jettonRoot.getWallet(sender.address));
+        await jettonWallet.sendTransfer(sender, (0, core_1.toNano)('0.3'), {
+            amount: (0, core_1.toNano)(from.tokenAmount.toFixed()),
+            destination: jettonVault.address,
+            responseAddress: sender.address,
+            forwardAmount: (0, core_1.toNano)('0.25'),
+            forwardPayload: sdk_1.VaultJetton.createSwapPayload({
+                poolAddress: firstPool.address,
+                limit: minAmountOut,
+                next: {
+                    poolAddress: secondPool.address
+                }
+            })
+        });
+    }
+}
+exports.DedustSwapService = DedustSwapService;
+//# sourceMappingURL=dedust-swap-service.js.map

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

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

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/tonkeeper-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 TonkeeperDedustOnChainProvider extends TonkeeperOnChainProvider<TonkeeperDedustQuoteInfo> {
+    protected tonkeeperDexType: TonkeeperDexType;
+    tradeType: "DEDUST";
+}

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TonkeeperDedustOnChainProvider = 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 TonkeeperDedustOnChainProvider 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.TonkeeperDedustOnChainProvider = TonkeeperDedustOnChainProvider;
+//# sourceMappingURL=tonkeeper-dedust-on-chain-provider.js.map

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

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

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/models/odos-supported-blockchains.d.ts

@@ -1,2 +1,2 @@
-export declare const odosSupportedBlockchains: readonly ["ETH", "ZK_SYNC", "BASE", "POLYGON", "OPTIMISM", "AVALANCHE", "ARBITRUM", "BSC", "FANTOM", "LINEA", "MANTLE", "MODE"];
+export declare const odosSupportedBlockchains: readonly ["ETH", "ZK_SYNC", "BASE", "POLYGON", "OPTIMISM", "AVALANCHE", "ARBITRUM", "BSC", "FANTOM", "LINEA", "MANTLE", "MODE", "SCROLL"];
 export type OdosSupportedBlockchain = (typeof odosSupportedBlockchains)[number];

package/lib/features/on-chain/calculation-manager/providers/aggregators/odos/models/odos-supported-blockchains.js

@@ -14,6 +14,7 @@ exports.odosSupportedBlockchains = [
     blockchain_name_1.BLOCKCHAIN_NAME.FANTOM,
     blockchain_name_1.BLOCKCHAIN_NAME.LINEA,
     blockchain_name_1.BLOCKCHAIN_NAME.MANTLE,
-    blockchain_name_1.BLOCKCHAIN_NAME.MODE
+    blockchain_name_1.BLOCKCHAIN_NAME.MODE,
+    blockchain_name_1.BLOCKCHAIN_NAME.SCROLL
 ];
 //# sourceMappingURL=odos-supported-blockchains.js.map

package/lib/features/on-chain/calculation-manager/providers/aggregators/odos/models/odos-supported-blockchains.js.map

@@ -1 +1 @@
-{"version":3,"file":"odos-supported-blockchains.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/odos/models/odos-supported-blockchains.ts"],"names":[],"mappings":";;;AAAA,gFAA6E;AAEhE,QAAA,wBAAwB,GAAG;IACpC,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,IAAI;IACpB,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,SAAS;IACzB,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,mBAAmB;IACnC,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,KAAK;IACrB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,IAAI;CACd,CAAC"}
+{"version":3,"file":"odos-supported-blockchains.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/odos/models/odos-supported-blockchains.ts"],"names":[],"mappings":";;;AAAA,gFAA6E;AAEhE,QAAA,wBAAwB,GAAG;IACpC,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,IAAI;IACpB,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,SAAS;IACzB,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,mBAAmB;IACnC,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,KAAK;IACrB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,IAAI;IACpB,iCAAe,CAAC,MAAM;CAChB,CAAC"}

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)

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

@@ -1 +1 @@
-{"version":3,"file":"rango-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAGjE,wHAAmH;AACnH,4FAA8F;AAI9F,iFAA8E;AAC9E,kIAAmH;AAGnH,0EAAoE;AACpE,8EAAwE;AACxE,kGAA+F;AAE/F,iEAA2D;AAC3D,sFAA+E;AAE/E,MAAa,oBAAqB,SAAQ,iEAAyB;IAAnE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,KAAK,CAAC;IAiF1D,CAAC;IA/EU,qBAAqB,CAAC,cAA8B;QACvD,OAAO,uDAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI;YACA,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEvF,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE9C,MAAM,UAAU,GAAG,MAAM,gCAAiB,CAAC,kBAAkB,CAAC,cAAc,EAAE,OAAO,EAAE;gBACnF,GAAG,OAAO;gBACV,aAAa,EAAE,qEAAiC;aACnD,CAAC,CAAC;YAEH,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,MAAM,mDAAsB,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAClF,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,KAAuC,CAAC;YAElF,MAAM,eAAe,GAAG,EAAG,CAAC,IAAI,CAAC;YAEjC,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,YAAY,CAAC;aACzC,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,IAAI,sBAAS,CAAC,eAAe,CAAC,CAAC;YAE3D,MAAM,WAAW,GAA4B;gBACzC,IAAI;gBACJ,EAAE;gBACF,cAAc;gBACd,YAAY;gBACZ,mBAAmB;gBACnB,UAAU,EAAE;oBACR,QAAQ,EAAE,SAAS;iBACtB;gBACD,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,IAAI;aACP,CAAC;YAEF,MAAM,UAAU,GACZ,OAAO,CAAC,cAAc,KAAK,WAAW;gBAClC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,eAAgB,CAAC;gBACzD,CAAC,CAAC,IAAI,CAAC;YAEf,OAAO,IAAI,wCAAiB,CACxB;gBACI,GAAG,WAAW;gBACd,UAAU;aACb,EACD,OAAO,CAAC,eAAe,EACvB,eAAgB,CACnB,CAAC;SACL;QAAC,OAAO,GAAG,EAAE;YACV,OAAO;gBACH,IAAI,EAAE,yCAAmB,CAAC,KAAK;gBAC/B,KAAK,EAAE,GAAG;aACb,CAAC;SACL;IACL,CAAC;IAES,KAAK,CAAC,aAAa,CACzB,WAAoC,EACpC,eAAuB;QAEvB,IAAI;YACA,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,MAAM,wCAAiB,CAAC,WAAW,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YACnF,OAAO,IAAA,gCAAa,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;SAChD;QAAC,MAAM;YACJ,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ;AAlFD,oDAkFC"}
+{"version":3,"file":"rango-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-provider.ts"],"names":[],"mappings":"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"}