rubic-sdk 5.48.0-alpha.gas.9 → 5.49.0-alpha-btc.1

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

@@ -159,7 +159,7 @@ class DedustSwapService {
             poolAddress,
             amount: fromAmount,
             limit: minAmountOut,
-            gasAmount: (0, core_1.toNano)(dedust_consts_1.DEDUST_GAS_NON_WEI),
+            gasAmount: (0, core_1.toNano)(dedust_consts_1.DEDUST_GAS),
             queryId: dedust_consts_1.RUBIC_REF_NAME_FOR_DEDUST
         });
     }
@@ -172,7 +172,7 @@ class DedustSwapService {
         ]);
         const jettonWalletAddress = result.stack.readAddress();
         const jettonWallet = this.tonClient.open(sdk_1.JettonWallet.createFromAddress(jettonWalletAddress));
-        await jettonWallet.sendTransfer(sender, (0, core_1.toNano)(dedust_consts_1.DEDUST_GAS_NON_WEI), {
+        await jettonWallet.sendTransfer(sender, (0, core_1.toNano)(dedust_consts_1.DEDUST_GAS), {
             amount: BigInt(from.stringWeiAmount),
             destination: jettonVault.address,
             responseAddress: sender.address,
@@ -195,7 +195,7 @@ class DedustSwapService {
             next: {}
         };
         const swapPayloadParams = this.makeSwapPayloadParams(initParams, initParams.next, this.txSteps, slippage);
-        await jettonWallet.sendTransfer(sender, (0, core_1.toNano)(dedust_consts_1.DEDUST_GAS_NON_WEI), {
+        await jettonWallet.sendTransfer(sender, (0, core_1.toNano)(dedust_consts_1.DEDUST_GAS), {
             amount: BigInt(from.stringWeiAmount),
             destination: jettonVault.address,
             responseAddress: sender.address,

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

@@ -1 +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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"}
+{"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/dln/dln-on-chain-provider.d.ts

@@ -2,6 +2,8 @@ import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { BlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
 import { DlnOnChainSupportedBlockchain } from './constants/dln-on-chain-supported-blockchains';
 import { DlnOnChainCalculationOptions } from './models/dln-on-chain-calculation-options';
+import { OnChainTradeStruct } from '../../common/on-chain-trade/evm-on-chain-trade/models/evm-on-chain-trade-struct';
+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 { OnChainTradeError } from '../../../models/on-chain-trade-error';
 import { AggregatorOnChainProvider } from '../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract';
@@ -10,5 +12,6 @@ export declare class DlnOnChainProvider extends AggregatorOnChainProvider {
     private readonly defaultOptions;
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<DlnOnChainSupportedBlockchain>, toToken: PriceToken<DlnOnChainSupportedBlockchain>, options: DlnOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
+    protected getGasFeeInfo(_tradeStruct: OnChainTradeStruct<BlockchainName>, _providerGateway?: string): Promise<GasFeeInfo | null>;
     private getAffiliateFee;
 }

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

@@ -64,7 +64,7 @@ class DlnOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggrega
         const tradeStruct = {
             from,
             to,
-            gasFeeInfo: await this.getGasFeeInfo(),
+            gasFeeInfo: null,
             slippageTolerance: fullOptions.slippageTolerance,
             type: this.tradeType,
             path,
@@ -76,8 +76,14 @@ class DlnOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggrega
             transactionRequest: requestParams,
             providerGateway: debridgeResponse.tx.to || ''
         };
+        if (fullOptions.gasCalculation === 'calculate') {
+            tradeStruct.gasFeeInfo = await this.getGasFeeInfo(tradeStruct);
+        }
         return dln_on_chain_factory_1.DlnOnChainFactory.createTrade(from.blockchain, tradeStruct, options.providerAddress);
     }
+    async getGasFeeInfo(_tradeStruct, _providerGateway) {
+        return null;
+    }
     getAffiliateFee(from) {
         if (from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.SOLANA) {
             const feePercent = (0, get_solana_fee_1.getSolanaFee)(from);

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

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

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

@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import { PriceTokenAmount } from '../../../../../../../common/tokens/price-token-amount';
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { LifiEvmOnChainTradeStruct } from '../models/lifi-trade-struct';
@@ -5,6 +6,8 @@ import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
 import { EvmEncodedConfigAndToAmount } from '../../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 export declare class LifiEvmOnChainTrade extends AggregatorEvmOnChainTrade {
+    /** @internal */
+    static getGasLimit(lifiTradeStruct: LifiEvmOnChainTradeStruct): Promise<BigNumber | null>;
     readonly providerGateway: string;
     readonly type: OnChainTradeType;
     private readonly route;

package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/chains/lifi-evm-on-chain-trade.js

@@ -4,10 +4,17 @@ exports.LifiEvmOnChainTrade = void 0;
 const errors_1 = require("../../../../../../../common/errors");
 const updated_rates_error_1 = require("../../../../../../../common/errors/cross-chain/updated-rates-error");
 const price_token_amount_1 = require("../../../../../../../common/tokens/price-token-amount");
+const evm_web3_pure_1 = require("../../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
 const rubic_proxy_contract_address_1 = require("../../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address");
+const get_on_chain_gas_data_1 = require("../../../../utils/get-on-chain-gas-data");
 const aggregator_evm_on_chain_trade_abstract_1 = require("../../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract");
 const lifi_on_chain_api_service_1 = require("../services/lifi-on-chain-api-service");
 class LifiEvmOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
+    /** @internal */
+    static async getGasLimit(lifiTradeStruct) {
+        const lifiTrade = new LifiEvmOnChainTrade(lifiTradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS);
+        return (0, get_on_chain_gas_data_1.getOnChainGasData)(lifiTrade);
+    }
     get spenderAddress() {
         return this.useProxy
             ? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway

package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/chains/lifi-evm-on-chain-trade.js.map

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

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

@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import { PriceTokenAmount } from '../../../../../../../common/tokens';
 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';
@@ -6,6 +7,7 @@ import { AggregatorSolanaOnChainTrade } from '../../../common/on-chain-aggregato
 import { EvmEncodedConfigAndToAmount } from '../../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 import { LifiSolanaOnChainTradeStruct } from '../models/lifi-trade-struct';
 export declare class LifiSolanaOnChainTrade extends AggregatorSolanaOnChainTrade {
+    static getGasLimit(_lifiTradeStruct: LifiSolanaOnChainTradeStruct): Promise<BigNumber | null>;
     readonly providerGateway: string;
     readonly type: OnChainTradeType;
     private readonly route;

package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/chains/lifi-solana-on-chain-trade.js

@@ -9,6 +9,9 @@ const rubic_proxy_contract_address_1 = require("../../../../../../cross-chain/ca
 const aggregator_solana_on_chain_trade_abstract_1 = require("../../../common/on-chain-aggregator/aggregator-solana-on-chain-trade-abstract");
 const lifi_on_chain_api_service_1 = require("../services/lifi-on-chain-api-service");
 class LifiSolanaOnChainTrade extends aggregator_solana_on_chain_trade_abstract_1.AggregatorSolanaOnChainTrade {
+    static async getGasLimit(_lifiTradeStruct) {
+        return null;
+    }
     get spenderAddress() {
         return this.useProxy
             ? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway

package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/chains/lifi-solana-on-chain-trade.js.map

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

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

@@ -1,7 +1,7 @@
 import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { BlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
-import { LifiStep } from '../../../../../cross-chain/calculation-manager/providers/lifi-provider/models/lifi-fee-cost';
 import { LifiCalculationOptions } from './models/lifi-calculation-options';
+import { LifiEvmOnChainTradeStruct } from './models/lifi-trade-struct';
 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 { OnChainTradeError } from '../../../models/on-chain-trade-error';
@@ -17,5 +17,5 @@ export declare class LifiProvider extends AggregatorOnChainProvider {
      * @returns best trade
      */
     private getBestTrade;
-    protected getGasFeeInfo(from: PriceTokenAmount, step: LifiStep): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(lifiTradeStruct: LifiEvmOnChainTradeStruct): Promise<GasFeeInfo | null>;
 }

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

@@ -10,17 +10,17 @@ const tokens_1 = require("../../../../../../common/tokens");
 const object_1 = require("../../../../../../common/utils/object");
 const options_1 = require("../../../../../../common/utils/options");
 const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
-const blockchains_info_1 = require("../../../../../../core/blockchain/utils/blockchains-info/blockchains-info");
 const lifi_utils_service_1 = require("../../../../../common/providers/lifi/lifi-utils-service");
 const get_from_without_fee_1 = require("../../../../../common/utils/get-from-without-fee");
 const get_solana_fee_1 = require("../../../../../common/utils/get-solana-fee");
 const lifi_providers_1 = require("./constants/lifi-providers");
 const lifi_supported_blockchains_1 = require("./constants/lifi-supported-blockchains");
+const get_gas_fee_info_1 = require("../../common/utils/get-gas-fee-info");
+const get_gas_price_info_1 = require("../../common/utils/get-gas-price-info");
 const evm_provider_default_options_1 = require("../../dexes/common/on-chain-provider/evm-on-chain-provider/constants/evm-provider-default-options");
 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 get_gas_fee_info_1 = require("../../common/utils/get-gas-fee-info");
-const get_gas_price_info_1 = require("../../common/utils/get-gas-price-info");
+const lifi_evm_on_chain_trade_1 = require("./chains/lifi-evm-on-chain-trade");
 const lifi_on_chain_factory_1 = require("./lifi-on-chain-factory");
 const lifi_on_chain_api_service_1 = require("./services/lifi-on-chain-api-service");
 class LifiProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
@@ -78,19 +78,21 @@ class LifiProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnC
         const { routes } = result;
         const allTrades = (await Promise.all(routes.map(async (route) => {
             const step = route.steps[0];
-            if (!step)
+            if (!step) {
                 return null;
+            }
+            const type = on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.LIFI;
             const to = new tokens_1.PriceTokenAmount({
                 ...toToken.asStruct,
                 weiAmount: new bignumber_js_1.default(route.toAmount)
             });
             const path = this.getRoutePath(from, to);
-            const lifiTradeStruct = {
+            let lifiTradeStruct = {
                 from,
                 to,
-                gasFeeInfo: await this.getGasFeeInfo(from, step),
+                gasFeeInfo: null,
                 slippageTolerance: fullOptions.slippageTolerance,
-                type: this.tradeType,
+                type,
                 path,
                 route,
                 toTokenWeiAmountMin: new bignumber_js_1.default(route.toAmountMin),
@@ -99,6 +101,16 @@ class LifiProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnC
                 fromWithoutFee,
                 withDeflation: fullOptions.withDeflation
             };
+            // const gasFeeInfo =
+            //     fullOptions.gasCalculation === 'disabled'
+            //         ? null
+            //         : await this.getGasFeeInfo(
+            //               lifiTradeStruct as LifiEvmOnChainTradeStruct
+            //           );
+            lifiTradeStruct = {
+                ...lifiTradeStruct,
+                gasFeeInfo: null
+            };
             return lifi_on_chain_factory_1.LifiOnChainFactory.createTrade(fromBlockchain, lifiTradeStruct, fullOptions.providerAddress);
         }))).filter(object_1.notNull);
         const bestTrade = this.getBestTrade(allTrades);
@@ -110,24 +122,14 @@ class LifiProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnC
      * @returns best trade
      */
     getBestTrade(trades) {
-        const best = trades.sort((curr, prev) => prev.to.tokenAmount.comparedTo(curr.to.tokenAmount))[0];
+        const best = trades.sort((prev, next) => next.to.tokenAmount.comparedTo(prev.to.tokenAmount))[0];
         return best;
     }
-    async getGasFeeInfo(from, step) {
-        if (!blockchains_info_1.BlockchainsInfo.isEvmBlockchainName(from.blockchain)) {
-            return Promise.resolve(null);
-        }
-        const gasCosts = step.estimate.gasCosts;
-        if (!gasCosts || !gasCosts.length) {
-            return Promise.resolve(null);
-        }
-        let gasLimit = new bignumber_js_1.default(0);
-        for (const el of gasCosts) {
-            gasLimit = gasLimit.plus(el.limit);
-        }
+    async getGasFeeInfo(lifiTradeStruct) {
         try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(from.blockchain);
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasPriceInfo, { gasLimit });
+            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(lifiTradeStruct.from.blockchain);
+            const gasLimit = await lifi_evm_on_chain_trade_1.LifiEvmOnChainTrade.getGasLimit(lifiTradeStruct);
+            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
         }
         catch {
             return null;

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

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

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

@@ -5,9 +5,10 @@ import { RequiredOnChainCalculationOptions } from '../../common/models/on-chain-
 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 { OdosOnChainTradeStruct } from './models/odos-on-chain-trade-types';
 export declare class OdosOnChainProvider extends AggregatorOnChainProvider {
     readonly tradeType: "ODOS";
     isSupportedBlockchain(blockchainName: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
-    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, gasLimit: number): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(tradeStruct: OdosOnChainTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
 }

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

@@ -52,14 +52,22 @@ class OdosOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggreg
                 to,
                 fromWithoutFee,
                 proxyFeeInfo,
-                gasFeeInfo: await this.getGasFeeInfo(from, gasEstimate),
+                gasFeeInfo: {
+                    gasLimit: new bignumber_js_1.default(gasEstimate)
+                },
                 slippageTolerance: options.slippageTolerance,
                 useProxy: options.useProxy,
                 withDeflation: options.withDeflation,
                 path,
                 bestRouteRequestBody
             };
-            return new odos_on_chain_trade_1.OdosOnChainTrade(tradeStruct, options.providerAddress, providerGateway);
+            const gasFeeInfo = options.gasCalculation === 'calculate'
+                ? await this.getGasFeeInfo(tradeStruct, providerGateway)
+                : null;
+            return new odos_on_chain_trade_1.OdosOnChainTrade({
+                ...tradeStruct,
+                gasFeeInfo
+            }, options.providerAddress, providerGateway);
         }
         catch (err) {
             return {
@@ -68,10 +76,13 @@ class OdosOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggreg
             };
         }
     }
-    async getGasFeeInfo(from, gasLimit) {
+    async getGasFeeInfo(tradeStruct, providerGateway) {
         try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(from.blockchain);
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasPriceInfo, { gasLimit: new bignumber_js_1.default(gasLimit) });
+            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(tradeStruct.from.blockchain);
+            const gasLimit = tradeStruct.gasFeeInfo?.gasLimit
+                ? tradeStruct.gasFeeInfo?.gasLimit
+                : await odos_on_chain_trade_1.OdosOnChainTrade.getGasLimit(tradeStruct, providerGateway);
+            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
         }
         catch {
             return null;

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

@@ -1 +1 @@
-{"version":3,"file":"odos-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/odos/odos-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAEjE,yDAAsD;AACtD,2FAAwF;AAIxF,iFAA8E;AAC9E,kIAAmH;AAGnH,0EAAoE;AACpE,8EAAwE;AAExE,oFAA+E;AAC/E,+DAAyD;AACzD,oFAA6E;AAC7E,0EAAoE;AAEpE,MAAa,mBAAoB,SAAQ,iEAAyB;IAAlE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,IAAI,CAAC;IA+EzD,CAAC;IA7EU,qBAAqB,CAAC,cAA8B;QACvD,OAAO,qDAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,MAAM,aAAa,GAAG,mBAAQ,CAAC,kBAAkB,CAAC,0BAA0B,CACxE,IAAI,CAAC,UAAU,CAClB,CAAC,OAAO,CAAC;QAEV,IAAI,CAAC;YACD,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,oBAAoB,GAAG,wCAAiB,CAAC,gBAAgB,CAAC;gBAC5D,IAAI,EAAE,cAAc;gBACpB,OAAO;gBACP,OAAO;gBACP,iBAAiB,EAAE,EAAE;gBACrB,iBAAiB,EAAE,EAAE;aACxB,CAAC,CAAC;YAEH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,iDAAqB,CAAC,YAAY,CAChF,oBAAoB,CACvB,CAAC;YACF,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,GAAG,MAAM,iDAAqB,CAAC,SAAS,CAAC;gBAC9D,MAAM;gBACN,QAAQ,EAAE,OAAO,CAAC,WAAW,IAAI,aAAa,IAAI,yCAAmB;aACxE,CAAC,CAAC;YAEH,MAAM,eAAe,GAAG,EAAG,CAAC,EAAE,CAAC;YAE/B,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAW,CAAC;YAE7C,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,YAAY,CAAC;aACzC,CAAC,CAAC;YAEH,MAAM,WAAW,GAA2B;gBACxC,IAAI;gBACJ,EAAE;gBACF,cAAc;gBACd,YAAY;gBACZ,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC;gBACvD,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,IAAI;gBACJ,oBAAoB;aACvB,CAAC;YAEF,OAAO,IAAI,sCAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,EAAE,eAAgB,CAAC,CAAC;QACxF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,yCAAmB,CAAC,IAAI;gBAC9B,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAES,KAAK,CAAC,aAAa,CACzB,IAAyC,EACzC,QAAgB;QAEhB,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE5D,OAAO,IAAA,gCAAa,EAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,sBAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC9E,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;AAhFD,kDAgFC"}
+{"version":3,"file":"odos-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/odos/odos-on-chain-provider.ts"],"names":[],"mappings":"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"}

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

@@ -1,8 +1,10 @@
+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 { 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>;
     readonly type: "ODOS";
     readonly providerGateway: string;
     private bestRouteRequestBody;

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

@@ -2,11 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OdosOnChainTrade = void 0;
 const errors_1 = require("../../../../../../common/errors");
+const evm_web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
 const rubic_proxy_contract_address_1 = require("../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address");
 const aggregator_evm_on_chain_trade_abstract_1 = require("../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract");
+const get_on_chain_gas_data_1 = require("../../../utils/get-on-chain-gas-data");
 const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
 const odos_on_chain_api_service_1 = require("./services/odos-on-chain-api-service");
 class OdosOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
+    /* @internal */
+    static async getGasLimit(tradeStruct, providerGateway) {
+        const odosTrade = new OdosOnChainTrade(tradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, providerGateway);
+        return (0, get_on_chain_gas_data_1.getOnChainGasData)(odosTrade);
+    }
     get dexContractAddress() {
         throw new errors_1.RubicSdkError('Dex address is unknown before swap is started');
     }

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

@@ -1 +1 @@
-{"version":3,"file":"odos-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/odos/odos-on-chain-trade.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,uJAAiJ;AACjJ,kLAAkK;AAElK,iFAA8E;AAI9E,oFAA6E;AAE7E,MAAa,gBAAiB,SAAQ,kEAAyB;IAO3D,IAAW,kBAAkB;QACzB,MAAM,IAAI,sBAAa,CAAC,+CAA+C,CAAC,CAAC;IAC7E,CAAC;IAED,IAAc,cAAc;QACxB,OAAO,IAAI,CAAC,QAAQ;YAChB,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACzD,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IAC/B,CAAC;IAED,YACI,WAAmC,EACnC,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QArBxB,SAAI,GAAG,yCAAmB,CAAC,IAAI,CAAC;QAsB5C,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC,oBAAoB,CAAC;QAC7D,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,iDAAqB,CAAC,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEvF,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,iDAAqB,CAAC,SAAS,CAAC;YACxE,QAAQ,EAAE,IAAI,CAAC,aAAa;YAC5B,QAAQ,EAAE,OAAO,CAAC,eAAe;YACjC,MAAM;SACT,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC;QAEzC,OAAO;YACH,EAAE,EAAE;gBACA,IAAI,EAAE,WAAY,CAAC,IAAI;gBACvB,EAAE,EAAE,WAAY,CAAC,EAAE;gBACnB,KAAK,EAAE,WAAY,CAAC,KAAK;aAC5B;YACD,QAAQ;SACX,CAAC;IACN,CAAC;CACJ;AAjDD,4CAiDC"}
+{"version":3,"file":"odos-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/odos/odos-on-chain-trade.ts"],"names":[],"mappings":";;;AACA,8CAAkD;AAClD,6GAAwG;AAExG,uJAAiJ;AACjJ,kLAAkK;AAClK,iHAA0G;AAE1G,iFAA8E;AAI9E,oFAA6E;AAE7E,MAAa,gBAAiB,SAAQ,kEAAyB;IAC3D,eAAe;IACR,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,WAAmC,EACnC,eAAuB;QAEvB,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAClC,WAAW,EACX,2BAAW,CAAC,aAAa,EACzB,eAAe,CAClB,CAAC;QAEF,OAAO,IAAA,yCAAiB,EAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAQD,IAAW,kBAAkB;QACzB,MAAM,IAAI,sBAAa,CAAC,+CAA+C,CAAC,CAAC;IAC7E,CAAC;IAED,IAAc,cAAc;QACxB,OAAO,IAAI,CAAC,QAAQ;YAChB,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACzD,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IAC/B,CAAC;IAED,YACI,WAAmC,EACnC,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QArBxB,SAAI,GAAG,yCAAmB,CAAC,IAAI,CAAC;QAsB5C,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC,oBAAoB,CAAC;QAC7D,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,iDAAqB,CAAC,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEvF,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,iDAAqB,CAAC,SAAS,CAAC;YACxE,QAAQ,EAAE,IAAI,CAAC,aAAa;YAC5B,QAAQ,EAAE,OAAO,CAAC,eAAe;YACjC,MAAM;SACT,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC;QAEzC,OAAO;YACH,EAAE,EAAE;gBACA,IAAI,EAAE,WAAY,CAAC,IAAI;gBACvB,EAAE,EAAE,WAAY,CAAC,EAAE;gBACnB,KAAK,EAAE,WAAY,CAAC,KAAK;aAC5B;YACD,QAAQ;SACX,CAAC;IACN,CAAC;CACJ;AA/DD,4CA+DC"}

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

@@ -5,10 +5,11 @@ import { RequiredOnChainCalculationOptions } from '../../common/models/on-chain-
 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 { OkuSwapOnChainTradeStruct } from './models/okuswap-trade-types';
 export declare class OkuSwapOnChainProvider extends AggregatorOnChainProvider {
     readonly tradeType: "OKU_SWAP";
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
     private getBestRoute;
-    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, gasLimit: string): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(tradeStruct: OkuSwapOnChainTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
 }

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

@@ -57,7 +57,9 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
                 to,
                 fromWithoutFee,
                 proxyFeeInfo,
-                gasFeeInfo: await this.getGasFeeInfo(from, gas),
+                gasFeeInfo: {
+                    gasLimit: new bignumber_js_1.default(gas)
+                },
                 slippageTolerance: fullOptions.slippageTolerance,
                 useProxy: fullOptions.useProxy,
                 withDeflation: fullOptions.withDeflation,
@@ -67,7 +69,13 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
                 subProvider,
                 ...(permit2Address && { permit2ApproveAddress: permit2Address })
             };
-            return new okuswap_on_chain_trade_1.OkuSwapOnChainTrade(tradeStruct, fullOptions.providerAddress, providerGateway);
+            const gasFeeInfo = fullOptions.gasCalculation === 'calculate'
+                ? await this.getGasFeeInfo(tradeStruct, providerGateway)
+                : null;
+            return new okuswap_on_chain_trade_1.OkuSwapOnChainTrade({
+                ...tradeStruct,
+                gasFeeInfo
+            }, fullOptions.providerAddress, providerGateway);
         }
         catch (err) {
             return {
@@ -93,10 +101,11 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
             gas: bestRoute.estimatedGas
         };
     }
-    async getGasFeeInfo(from, gasLimit) {
+    async getGasFeeInfo(tradeStruct, providerGateway) {
         try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(from.blockchain);
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasPriceInfo, { gasLimit: new bignumber_js_1.default(gasLimit) });
+            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(tradeStruct.from.blockchain);
+            const gasLimit = await okuswap_on_chain_trade_1.OkuSwapOnChainTrade.getGasLimit(tradeStruct, providerGateway);
+            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
         }
         catch {
             return null;

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

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

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

@@ -9,6 +9,7 @@ import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/mo
 import { OkuSwapSupportedBlockchain } from './models/okuswap-on-chain-supported-chains';
 import { OkuSwapOnChainTradeStruct } from './models/okuswap-trade-types';
 export declare class OkuSwapOnChainTrade extends AggregatorEvmOnChainTrade {
+    static getGasLimit(tradeStruct: OkuSwapOnChainTradeStruct, providerGateway: string): Promise<BigNumber | null>;
     readonly type: OnChainTradeType;
     private readonly okuSubProvider;
     private readonly quoteReqBody;

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

@@ -6,13 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OkuSwapOnChainTrade = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const errors_1 = require("../../../../../../common/errors");
+const evm_web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
 const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
 const check_unsupported_receiver_address_1 = require("../../../../../common/utils/check-unsupported-receiver-address");
 const rubic_proxy_contract_address_1 = require("../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address");
+const get_on_chain_gas_data_1 = require("../../../utils/get-on-chain-gas-data");
 const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
 const aggregator_evm_on_chain_trade_abstract_1 = require("../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract");
 const okuswap_api_service_1 = require("./services/okuswap-api-service");
 class OkuSwapOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
+    /* @internal */
+    static async getGasLimit(tradeStruct, providerGateway) {
+        const okuswapTrade = new OkuSwapOnChainTrade(tradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, providerGateway);
+        return (0, get_on_chain_gas_data_1.getOnChainGasData)(okuswapTrade);
+    }
     get spenderAddress() {
         return this.useProxy
             ? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway