rubic-sdk 6.0.0-alpha.ton.43 → 6.0.0-alpha.ton.44

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

@@ -1,13 +1,66 @@
 "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 core_1 = require("@ton/core");
+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 tonkeeper_on_chain_provider_1 = require("../common/tonkeeper/tonkeeper-on-chain-provider");
-class DedustOnChainProvider extends tonkeeper_on_chain_provider_1.TonkeeperOnChainProvider {
+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.tonkeeperDexType = 'dedust';
         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 fromAsset = this.dedustSwapService.getTokenAsset(fromWithoutFee);
+            const toAsset = this.dedustSwapService.getTokenAsset(toToken);
+            const pool = await this.dedustSwapService.getPool(fromAsset, toAsset);
+            const { amountOut } = await pool.getEstimatedSwapOut({
+                assetIn: fromAsset,
+                amountIn: (0, core_1.toNano)(fromWithoutFee.tokenAmount.toFixed())
+            });
+            const to = new tokens_1.PriceTokenAmount({
+                ...toToken.asStruct,
+                weiAmount: new bignumber_js_1.default(amountOut.toString())
+            });
+            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;

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

@@ -1 +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"}
+{"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,oCAAmC;AACnC,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;IAwDjE,CAAC;IAtDU,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,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YACvE,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAE9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACtE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBACjD,OAAO,EAAE,SAAS;gBAClB,QAAQ,EAAE,IAAA,aAAM,EAAC,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;aACzD,CAAC,CAAC;YAEH,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;aACjD,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;AA3DD,sDA2DC"}

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 {
+    type: OnChainTradeType;
+    private readonly dedustSwapService;
+    constructor(tradeStruct: DedustOnChainTradeStruct, providerAddress: string);
+    protected calculateOutputAmount(_options: EncodeTransactionOptions): Promise<string>;
+    swap(options?: SwapTransactionOptions): Promise<string | never>;
+}

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

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DedustOnChainTrade = void 0;
+const core_1 = require("@ton/core");
+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 calculateOutputAmount(_options) {
+        const fromAsset = this.dedustSwapService.getTokenAsset(this.from);
+        const toAsset = this.dedustSwapService.getTokenAsset(this.to);
+        const pool = await this.dedustSwapService.getPool(fromAsset, toAsset);
+        const { amountOut } = await pool.getEstimatedSwapOut({
+            assetIn: fromAsset,
+            amountIn: (0, core_1.toNano)(this.fromWithoutFee.tokenAmount.toFixed())
+        });
+        return amountOut.toString();
+    }
+    async swap(options = {}) {
+        await this.checkWalletState(options?.testMode);
+        let transactionHash;
+        const onTransactionHash = (hash) => {
+            if (options.onConfirm) {
+                options.onConfirm(hash);
+            }
+            transactionHash = 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, onTransactionHash);
+            return transactionHash;
+        }
+        catch (err) {
+            throw (0, errors_1.parseError)(err);
+        }
+    }
+}
+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,oCAAmC;AACnC,oDAAqD;AAIrD,iFAAgG;AAChG,0GAAoG;AAEpG,wEAAmE;AAEnE,MAAa,kBAAmB,SAAQ,oCAAe;IAKnD,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;IAES,KAAK,CAAC,qBAAqB,CAAC,QAAkC;QACpE,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACtE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;YACjD,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,IAAA,aAAM,EAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;SAC9D,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,UAAkC,EAAE;QAClD,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE/C,IAAI,eAAuB,CAAC;QAC5B,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;YACvC,IAAI,OAAO,CAAC,SAAS,EAAE;gBACnB,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aAC3B;YACD,eAAe,GAAG,IAAI,CAAC;QAC3B,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,iBAAiB,CACpB,CAAC;YACF,OAAO,eAAgB,CAAC;SAC3B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAA,mBAAU,EAAC,GAAG,CAAC,CAAC;SACzB;IACL,CAAC;CACJ;AAnDD,gDAmDC"}

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-swap-service.d.ts

@@ -0,0 +1,15 @@
+import { Asset, Factory, Pool } from '@dedust/sdk';
+import { OpenedContract } from '@ton/core';
+import { TonClient4 } from '@ton/ton';
+import { PriceToken, PriceTokenAmount } from '../../../../../../../common/tokens';
+export declare class DedustSwapService {
+    private readonly factory;
+    private readonly tonClient;
+    constructor();
+    getFactory(): OpenedContract<Factory>;
+    getTonClient(): TonClient4;
+    getPool(fromAsset: Asset, toAsset: Asset): Promise<OpenedContract<Pool>>;
+    getTokenAsset(token: PriceToken): Asset;
+    private getVault;
+    sendTransaction(from: PriceTokenAmount, to: PriceTokenAmount, walletAddress: string, onHash: (hash: string) => void): Promise<void>;
+}

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

@@ -0,0 +1,100 @@
+"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 errors_1 = require("../../../../../../../common/errors");
+const chain_type_1 = require("../../../../../../../core/blockchain/models/chain-type");
+const injector_1 = require("../../../../../../../core/injector/injector");
+const dedust_gas_1 = require("../constants/dedust-gas");
+class DedustSwapService {
+    constructor() {
+        this.tonClient = injector_1.Injector.web3PrivateService.getWeb3Private(chain_type_1.CHAIN_TYPE.TON).tonClient;
+        this.factory = this.tonClient.open(sdk_1.Factory.createFromAddress(sdk_1.MAINNET_FACTORY_ADDR));
+    }
+    getFactory() {
+        return this.factory;
+    }
+    getTonClient() {
+        return this.tonClient;
+    }
+    async getPool(fromAsset, toAsset) {
+        const pool = this.tonClient.open(sdk_1.Pool.createFromAddress(await this.factory.getPoolAddress({
+            poolType: sdk_1.PoolType.VOLATILE,
+            assets: [fromAsset, toAsset]
+        })));
+        if ((await pool.getReadinessStatus()) !== sdk_1.ReadinessStatus.READY) {
+            throw new Error(`[DedustSwapService_getPool] Pool does not exist.`);
+        }
+        return pool;
+    }
+    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 sendTransaction(from, to, walletAddress, onHash) {
+        const fromAsset = this.getTokenAsset(from);
+        const toAsset = this.getTokenAsset(to);
+        const pool = await this.getPool(fromAsset, toAsset);
+        const fromAmount = (0, core_1.toNano)(from.tokenAmount.toFixed());
+        const sender = {
+            address: core_1.Address.parse(walletAddress),
+            send: async () => { }
+        };
+        const { amountOut: expectedAmountOut } = await pool.getEstimatedSwapOut({
+            assetIn: sdk_1.Asset.native(),
+            amountIn: fromAmount
+        });
+        const minAmountOut = (expectedAmountOut * 99n) / 100n;
+        if (from.isNative) {
+            const nativeVault = await this.getVault(from);
+            // const nativeVault = this.tonClient.open(await this.factory.getNativeVault());
+            await nativeVault.sendSwap(sender, {
+                poolAddress: pool.address,
+                amount: fromAmount,
+                limit: minAmountOut,
+                gasAmount: (0, core_1.toNano)(dedust_gas_1.DEDUST_GAS)
+            });
+            // @TODO set correct Hash;
+            onHash('');
+        }
+        else {
+            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: fromAmount,
+                destination: jettonVault.address,
+                responseAddress: sender.address,
+                forwardAmount: (0, core_1.toNano)(0.25),
+                forwardPayload: sdk_1.VaultJetton.createSwapPayload({
+                    poolAddress: pool.address,
+                    limit: minAmountOut
+                })
+            });
+            // @TODO set correct Hash;
+            onHash('');
+        }
+    }
+}
+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/common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade.d.ts

@@ -62,6 +62,7 @@ export declare abstract class EvmOnChainTrade extends OnChainTrade {
      */
     protected getSwapValue(providerValue?: BigNumber | string | number | null): string;
     swap(options?: SwapTransactionOptions): Promise<string | never>;
+    getData(fromAddress: string, options?: SwapTransactionOptions): Promise<EvmTransactionOptions | never>;
     encode(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
     /**
      * Encodes trade to swap it through on-chain proxy.

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

@@ -9,6 +9,7 @@ const errors_1 = require("../../../../../../../common/errors");
 const native_tokens_1 = require("../../../../../../../common/tokens/constants/native-tokens");
 const errors_2 = require("../../../../../../../common/utils/errors");
 const blockchain_name_1 = require("../../../../../../../core/blockchain/models/blockchain-name");
+const blockchains_info_1 = require("../../../../../../../core/blockchain/utils/blockchains-info/blockchains-info");
 const blockchain_id_1 = require("../../../../../../../core/blockchain/utils/blockchains-info/constants/blockchain-id");
 const evm_web3_pure_1 = require("../../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
 const web3_pure_1 = require("../../../../../../../core/blockchain/web3-pure/web3-pure");
@@ -161,6 +162,27 @@ class EvmOnChainTrade extends on_chain_trade_1.OnChainTrade {
             throw (0, errors_2.parseError)(err);
         }
     }
+    async getData(fromAddress, options = {}) {
+        this.apiFromAddress = fromAddress;
+        if (!options?.testMode) {
+            await this.checkWalletState(options.testMode);
+        }
+        await this.checkReceiverAddress(options.receiverAddress, !blockchains_info_1.BlockchainsInfo.isEvmBlockchainName(this.to.blockchain));
+        const { data, value, to } = await this.encode({ ...options, fromAddress });
+        try {
+            if (!options?.testMode) {
+                const gasfullOptions = await this.web3Private.simulateTransaction(to, {
+                    data,
+                    value
+                }, this.from.blockchain);
+                return gasfullOptions;
+            }
+            return { data, value, to };
+        }
+        catch (err) {
+            throw err;
+        }
+    }
     async encode(options) {
         await this.checkFromAddress(options.fromAddress, true);
         await this.checkReceiverAddress(options.receiverAddress);

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

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

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

@@ -27,6 +27,8 @@ export declare abstract class OnChainTrade {
     protected abstract readonly spenderAddress: string;
     abstract readonly path: ReadonlyArray<Token>;
     abstract readonly feeInfo: FeeInfo;
+    private _apiFromAddress;
+    set apiFromAddress(value: string | null);
     /**
      * Type of instant trade provider.
      */

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

@@ -22,6 +22,9 @@ const check_address_1 = require("../../../../../common/utils/check-address");
  * Abstract class for all instant trade providers' trades.
  */
 class OnChainTrade {
+    set apiFromAddress(value) {
+        this._apiFromAddress = value;
+    }
     /**
      * Minimum amount of output token user can get.
      */
@@ -36,7 +39,7 @@ class OnChainTrade {
         return injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(this.from.blockchain);
     }
     get walletAddress() {
-        return this.web3Private.address;
+        return this._apiFromAddress ?? this.web3Private.address;
     }
     get httpClient() {
         return injector_1.Injector.httpClient;
@@ -49,6 +52,7 @@ class OnChainTrade {
     }
     constructor(providerAddress) {
         this.providerAddress = providerAddress;
+        this._apiFromAddress = null;
     }
     /**
      * Returns true, if allowance is not enough.

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

@@ -1,8 +1,7 @@
 import { TonBlockchainName } from '../../../../../../../../core/blockchain/models/blockchain-name';
-import { TonEncodedConfig } from '../../../../../../../../core/blockchain/web3-private-service/web3-private/ton-web3-private/models/ton-types';
 import { OnChainTradeStruct } from '../../evm-on-chain-trade/models/evm-on-chain-trade-struct';
-export interface TonEncodedConfigAndToAmount {
-    tx: TonEncodedConfig;
+export interface TonEncodedConfigAndToAmount<T> {
+    tx: T;
     toAmount: string;
 }
 export interface TonOnChainTradeStruct extends OnChainTradeStruct<TonBlockchainName> {

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

@@ -1,16 +1,14 @@
 import { PriceTokenAmount, Token } from '../../../../../../../common/tokens';
 import { TonBlockchainName } from '../../../../../../../core/blockchain/models/blockchain-name';
-import { TonEncodedConfig } from '../../../../../../../core/blockchain/web3-private-service/web3-private/ton-web3-private/models/ton-types';
 import { TonWeb3Private } from '../../../../../../../core/blockchain/web3-private-service/web3-private/ton-web3-private/ton-web3-private';
 import { TonWeb3Public } from '../../../../../../../core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public';
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
-import { SwapTransactionOptions } from '../../../../../../common/models/swap-transaction-options';
 import { FeeInfo } from '../../../../../../cross-chain/calculation-manager/providers/common/models/fee-info';
 import { TransactionConfig } from 'web3-core';
 import { GasFeeInfo } from '../evm-on-chain-trade/models/gas-fee-info';
 import { OnChainTrade } from '../on-chain-trade';
-import { TonEncodedConfigAndToAmount, TonOnChainTradeStruct } from './models/ton-on-chian-trade-types';
-export declare abstract class TonOnChainTrade extends OnChainTrade {
+import { TonOnChainTradeStruct } from './models/ton-on-chian-trade-types';
+export declare abstract class TonOnChainTrade<T = undefined> extends OnChainTrade {
     readonly from: PriceTokenAmount;
     readonly to: PriceTokenAmount;
     readonly slippageTolerance: number;
@@ -18,7 +16,7 @@ export declare abstract class TonOnChainTrade extends OnChainTrade {
     readonly feeInfo: FeeInfo;
     readonly gasFeeInfo: GasFeeInfo | null;
     protected readonly fromWithoutFee: PriceTokenAmount<TonBlockchainName>;
-    private skipAmountCheck;
+    protected skipAmountCheck: boolean;
     protected get spenderAddress(): string;
     protected get web3Public(): TonWeb3Public;
     protected get web3Private(): TonWeb3Private;
@@ -26,9 +24,10 @@ export declare abstract class TonOnChainTrade extends OnChainTrade {
     needApprove(): Promise<boolean>;
     approve(): Promise<void>;
     encodeApprove(): Promise<TransactionConfig>;
-    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>;
+    encode(): Promise<T>;
+    protected makePreSwapChecks(options: EncodeTransactionOptions): Promise<void>;
+    /**
+     * recalculates and returns output stringWeiAmount
+     */
+    protected abstract calculateOutputAmount(options: EncodeTransactionOptions): Promise<string>;
 }

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonOnChainTrade = void 0;
 const errors_1 = require("../../../../../../../common/errors");
-const errors_2 = require("../../../../../../../common/utils/errors");
 const blockchain_name_1 = require("../../../../../../../core/blockchain/models/blockchain-name");
 const injector_1 = require("../../../../../../../core/injector/injector");
+const check_unsupported_receiver_address_1 = require("../../../../../../common/utils/check-unsupported-receiver-address");
 const on_chain_trade_1 = require("../on-chain-trade");
 class TonOnChainTrade extends on_chain_trade_1.OnChainTrade {
     get spenderAddress() {
@@ -36,47 +36,18 @@ class TonOnChainTrade extends on_chain_trade_1.OnChainTrade {
     async encodeApprove() {
         throw new Error('Method is not supported');
     }
-    async swap(options = {}) {
-        await this.checkWalletState(options?.testMode);
-        const { onConfirm } = options;
-        let transactionHash;
-        const onTransactionHash = (hash) => {
-            if (onConfirm) {
-                onConfirm(hash);
-            }
-            transactionHash = hash;
-        };
-        const fromAddress = this.walletAddress;
-        const receiverAddress = options.receiverAddress || this.walletAddress;
-        const tonEncodedConfig = await this.encode({
-            fromAddress,
-            receiverAddress,
-            skipAmountCheck: this.skipAmountCheck,
-            ...(options?.referrer && { referrer: options?.referrer })
-        });
-        try {
-            await this.web3Private.sendTransaction({
-                onTransactionHash,
-                messages: [tonEncodedConfig]
-            });
-            return transactionHash;
-        }
-        catch (err) {
-            throw (0, errors_2.parseError)(err);
-        }
+    async encode() {
+        throw new errors_1.RubicSdkError('Method not implemented! Use custom swap methods on each child class!');
     }
-    async encode(options) {
+    async makePreSwapChecks(options) {
+        (0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(options.receiverAddress, this.walletAddress);
         await this.checkFromAddress(options.fromAddress);
         await this.checkReceiverAddress(options.receiverAddress);
         if (!options.skipAmountCheck) {
             this.skipAmountCheck = true;
-            await this.handleAmountCheckBeforeSwap(options);
+            const toWeiAmount = await this.calculateOutputAmount(options);
+            this.checkAmountChange(toWeiAmount, this.to.stringWeiAmount);
         }
-        return this.encodeDirect(options);
-    }
-    async handleAmountCheckBeforeSwap(options) {
-        const { toAmount } = await this.getTransactionConfigAndAmount(options);
-        this.checkAmountChange(toAmount, this.to.stringWeiAmount);
     }
 }
 exports.TonOnChainTrade = TonOnChainTrade;

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":"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"}
+{"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,gFAAgG;AAGhG,yDAAsD;AAEtD,qHAA+G;AAK/G,sDAAiD;AAGjD,MAAsB,eAA+B,SAAQ,6BAAY;IAiBrE,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,WAAkC,EAAE,eAAuB;QACnE,KAAK,CAAC,eAAe,CAAC,CAAC;QArBX,YAAO,GAAY,EAAE,CAAC;QAM5B,oBAAe,GAAY,KAAK,CAAC;QAgBvC,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;QAC7B,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC;IACrD,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,MAAM;QACf,MAAM,IAAI,sBAAa,CACnB,sEAAsE,CACzE,CAAC;IACN,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,OAAiC;QAC/D,IAAA,oEAA+B,EAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7E,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAEzD,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC1B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;SAChE;IACL,CAAC;CAMJ;AAzED,0CAyEC"}