npm - rubic-sdk - Versions diffs - 5.45.5-alpha.unizen.1 → 5.46.0-alpha.gas.1 - Mend

rubic-sdk 5.45.5-alpha.unizen.1 → 5.46.0-alpha.gas.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (85) hide show

package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.d.ts CHANGED Viewed

@@ -2,7 +2,6 @@ import { OneInchProvider } from '../providers/aggregators/1inch/one-inch-provide
 import { DlnOnChainProvider } from '../providers/aggregators/dln/dln-on-chain-provider';
 import { PiteasProvider } from '../providers/aggregators/piteas/piteas-provider';
 import { XyDexProvider } from '../providers/aggregators/xy-dex/xy-dex-provider';
-import { ZrxProvider } from '../providers/aggregators/zrx/zrx-provider';
 import { CoffeeSwapProvider } from '../providers/aggregators/coffee-swap/coffee-swap-on-chain-provider';
 import { DedustOnChainProvider } from '../providers/aggregators/dedust/dedust-on-chain-provider';
 import { LifiProvider } from '../providers/aggregators/lifi/lifi-provider';
@@ -24,7 +23,6 @@ export declare const AGGREGATORS_ON_CHAIN: {
     readonly OKU_SWAP: typeof OkuSwapOnChainProvider;
     readonly PITEAS: typeof PiteasProvider;
     readonly XY: typeof XyDexProvider;
-    readonly ZRX: typeof ZrxProvider;
     readonly ONE_INCH: typeof OneInchProvider;
     readonly ZETA_SWAP: typeof ZetaSwapProvider;
     readonly NATIVE_ROUTER: typeof NativeRouterProvider;

package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.js CHANGED Viewed

@@ -5,7 +5,6 @@ const one_inch_provider_1 = require("../providers/aggregators/1inch/one-inch-pro
 const dln_on_chain_provider_1 = require("../providers/aggregators/dln/dln-on-chain-provider");
 const piteas_provider_1 = require("../providers/aggregators/piteas/piteas-provider");
 const xy_dex_provider_1 = require("../providers/aggregators/xy-dex/xy-dex-provider");
-const zrx_provider_1 = require("../providers/aggregators/zrx/zrx-provider");
 const coffee_swap_on_chain_provider_1 = require("../providers/aggregators/coffee-swap/coffee-swap-on-chain-provider");
 const dedust_on_chain_provider_1 = require("../providers/aggregators/dedust/dedust-on-chain-provider");
 const lifi_provider_1 = require("../providers/aggregators/lifi/lifi-provider");
@@ -27,7 +26,7 @@ exports.AGGREGATORS_ON_CHAIN = {
     OKU_SWAP: okuswap_on_chain_provider_1.OkuSwapOnChainProvider,
     PITEAS: piteas_provider_1.PiteasProvider,
     XY: xy_dex_provider_1.XyDexProvider,
-    ZRX: zrx_provider_1.ZrxProvider,
+    // ZRX: ZrxProvider, not free api
     ONE_INCH: one_inch_provider_1.OneInchProvider,
     ZETA_SWAP: zetaswap_provider_1.ZetaSwapProvider,
     NATIVE_ROUTER: native_router_provider_1.NativeRouterProvider,

package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"on-chain-manager-aggregators-types.js","sourceRoot":"","sources":["../../../../../src/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.ts"],"names":[],"mappings":";;;AAAA,+HAA0H;AAC1H,qIAA+H;AAC/H,4HAAwH;AACxH,4HAAuH;~~AACvH~~,~~mHAA+G;AAE/G,~~sHAAwG;AACxG,uGAAiG;AACjG,+EAA2E;AAC3E,0GAAqG;AACrG,iGAA2F;AAC3F,0GAAoG;AACpG,iGAA4F;AAC5F,oGAA8F;AAC9F,sHAAgH;AAChH,uGAAiG;AACjG,uGAAiG;AACjG,2FAAuF;AAE1E,QAAA,oBAAoB,GAAG;IAChC,IAAI,EAAE,4BAAY;IAClB,UAAU,EAAE,uCAAiB;IAC7B,KAAK,EAAE,8CAAoB;IAC3B,IAAI,EAAE,4CAAmB;IACzB,GAAG,EAAE,0CAAkB;IACvB,QAAQ,EAAE,kDAAsB;IAChC,MAAM,EAAE,gCAAc;IACtB,EAAE,EAAE,+BAAa;IACjB,~~GAAG,EAAE,0BAAW~~;~~IAChB~~,QAAQ,EAAE,mCAAe;IACzB,SAAS,EAAE,oCAAgB;IAC3B,aAAa,EAAE,6CAAoB;IACnC,MAAM,EAAE,gDAAqB;IAC7B,MAAM,EAAE,gDAAqB;IAC7B,WAAW,EAAE,kDAAkB;IAC/B,WAAW,EAAE,0DAA0B;IACvC,MAAM,EAAE,gDAAqB;IAC7B,sCAAsC;CAChC,CAAC"}
1	+ {"version":3,"file":"on-chain-manager-aggregators-types.js","sourceRoot":"","sources":["../../../../../src/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.ts"],"names":[],"mappings":";;;AAAA,+HAA0H;AAC1H,qIAA+H;AAC/H,4HAAwH;AACxH,4HAAuH;AAEvH,sHAAwG;AACxG,uGAAiG;AACjG,+EAA2E;AAC3E,0GAAqG;AACrG,iGAA2F;AAC3F,0GAAoG;AACpG,iGAA4F;AAC5F,oGAA8F;AAC9F,sHAAgH;AAChH,uGAAiG;AACjG,uGAAiG;AACjG,2FAAuF;AAE1E,QAAA,oBAAoB,GAAG;IAChC,IAAI,EAAE,4BAAY;IAClB,UAAU,EAAE,uCAAiB;IAC7B,KAAK,EAAE,8CAAoB;IAC3B,IAAI,EAAE,4CAAmB;IACzB,GAAG,EAAE,0CAAkB;IACvB,QAAQ,EAAE,kDAAsB;IAChC,MAAM,EAAE,gCAAc;IACtB,EAAE,EAAE,+BAAa;IACjB,iCAAiC;IACjC,QAAQ,EAAE,mCAAe;IACzB,SAAS,EAAE,oCAAgB;IAC3B,aAAa,EAAE,6CAAoB;IACnC,MAAM,EAAE,gDAAqB;IAC7B,MAAM,EAAE,gDAAqB;IAC7B,WAAW,EAAE,kDAAkB;IAC/B,WAAW,EAAE,0DAA0B;IACvC,MAAM,EAAE,gDAAqB;IAC7B,sCAAsC;CAChC,CAAC"}

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

@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { BlockchainName, EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
 import { OnChainTradeError } from '../../../models/on-chain-trade-error';
@@ -5,15 +6,13 @@ import { RequiredOnChainCalculationOptions } from '../../common/models/on-chain-
 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 { AggregatorOnChainProvider } from '../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract';
-import { LifiEvmOnChainTradeStruct } from '../lifi/models/lifi-trade-struct';
 export declare class OneInchProvider extends AggregatorOnChainProvider {
     private readonly defaultOptions;
     readonly tradeType: "ONE_INCH";
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
     private getTradeInfo;
-    private getTokenAddress;
-    protected getGasFeeInfo(lifiTradeStruct: LifiEvmOnChainTradeStruct): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, gasLimit: BigNumber): Promise<GasFeeInfo | null>;
     private getAvailableProtocols;
     /**
      * Extracts tokens path from oneInch api response.

package/lib/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-provider.js CHANGED Viewed

@@ -22,7 +22,6 @@ 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 aggregator_on_chain_provider_abstract_1 = require("../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract");
-const lifi_evm_on_chain_trade_1 = require("../lifi/chains/lifi-evm-on-chain-trade");
 class OneInchProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
     constructor() {
         super(...arguments);
@@ -48,7 +47,7 @@ class OneInchProvider extends aggregator_on_chain_provider_abstract_1.Aggregator
         const { fromWithoutFee, proxyFeeInfo } = await this.handleProxyContract(from, fullOptions);
         const fromTokenClone = (0, token_native_address_proxy_1.createTokenNativeAddressProxy)(fromWithoutFee, constants_1.oneinchApiParams.nativeAddress);
         const toTokenClone = (0, token_native_address_proxy_1.createTokenNativeAddressProxy)(toToken, constants_1.oneinchApiParams.nativeAddress);
-        const [dexContractAddress, { toTokenAmountInWei, path, data }] = await Promise.all([
+        const [dexContractAddress, { toTokenAmountInWei, path, data, estimatedGas }] = await Promise.all([
             this.loadContractAddress(fromBlockchain),
             this.getTradeInfo(fromTokenClone, toTokenClone, fromWithoutFee, fullOptions)
         ]);
@@ -66,7 +65,7 @@ class OneInchProvider extends aggregator_on_chain_provider_abstract_1.Aggregator
             slippageTolerance: fullOptions.slippageTolerance,
             disableMultihops: fullOptions.disableMultihops,
             path,
-            gasFeeInfo: null,
+            gasFeeInfo: await this.getGasFeeInfo(from, estimatedGas),
             data,
             useProxy: fullOptions.useProxy,
             proxyFeeInfo,
@@ -101,9 +100,8 @@ class OneInchProvider extends aggregator_on_chain_provider_abstract_1.Aggregator
         let data = null;
         let path = [];
         try {
-            if (!options.fromAddress) {
+            if (!options.fromAddress)
                 throw new Error('Address is not set');
-            }
             if (options.gasCalculation !== 'disabled') {
                 await one_inch_trade_1.OneInchTrade.checkIfNeedApproveAndThrowError(from, toToken, fromWithoutFee, options.fromAddress, options.useProxy);
             }
@@ -134,19 +132,9 @@ class OneInchProvider extends aggregator_on_chain_provider_abstract_1.Aggregator
         }
         return { toTokenAmountInWei: new bignumber_js_1.default(toTokenAmount), estimatedGas, path, data };
     }
-    getTokenAddress(token) {
-        if (token.isNative) {
-            if (token.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.METIS) {
-                return '0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000';
-            }
-            return constants_1.oneinchApiParams.nativeAddress;
-        }
-        return token.address;
-    }
-    async getGasFeeInfo(lifiTradeStruct) {
+    async getGasFeeInfo(from, gasLimit) {
         try {
-            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);
+            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(from.blockchain);
             return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
         }
         catch {

package/lib/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"one-inch-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAkD;AAClD,8CAAwE;AACxE,6EAA6E;AAC7E,sDAA0D;AAC1D,gFAIoD;AAEpD,qGAAqG;AACrG,uJAAiJ;AAEjJ,2IAA8I;AAC9I,yHAA6H;AAC7H,mKAGwH;AAOxH,qIAA+H;AAC/H,yHAAoH;AAEpH,+HAA4H;AAG5H,wHAAkH;AAClH,4HAAsH;AACtH,kMAA4L;AAE5L,kIAAmH;~~AACnH~~,~~oFAA6E;AAG7E,~~MAAa,eAAgB,SAAQ,iEAAyB;IAA9D;;QACqB,mBAAc,GAAmD;YAC9E,GAAG,wDAAyB;YAC5B,gBAAgB,EAAE,KAAK;YACvB,cAAc,EAAE,4BAAgB,CAAC,aAAa;SACjD,CAAC;QAEc,cAAS,GAAG,yCAAmB,CAAC,QAAQ,CAAC;~~IA6O7D~~,CAAC;~~IA3OU~~,qBAAqB,CAAC,UAA0B;QACnD,OAAO,4DAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IACzE,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,MAAM,cAAc,GAAG,IAAI,CAAC,UAAyC,CAAC;QAEtE,MAAM,WAAW,GACb,OAAO,EAAE,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ;YAC7C,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACpD,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAA4C,CAAC,CAAC;QACnF,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE;YACxC,GAAG,IAAI,CAAC,cAAc;YACtB,WAAW;SACd,CAAC,CAAC;QAEH,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE3F,MAAM,cAAc,GAAG,IAAA,0DAA6B,EAChD,cAAc,EACd,4BAAgB,CAAC,aAAa,CACjC,CAAC;QACF,MAAM,YAAY,GAAG,IAAA,0DAA6B,EAAC,OAAO,EAAE,4BAAgB,CAAC,aAAa,CAAC,CAAC;QAE5F,MAAM,CAAC,kBAAkB,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,~~GAAG~~,MAAM,OAAO,CAAC,GAAG,CAAC;~~YAC/E~~,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC;YACxC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,CAAC;SAC/E,CAAC,CAAC;~~QACH~~,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QACf,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;QAEhC,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;YAC5B,GAAG,OAAO,CAAC,QAAQ;YACnB,SAAS,EAAE,kBAAkB;SAChC,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;QAEtE,MAAM,kBAAkB,GAAuB;YAC3C,kBAAkB;YAClB,IAAI;YACJ,EAAE;YACF,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;YAC9C,IAAI;YACJ,UAAU,EAAE,IAAI;~~YAChB~~,IAAI;YACJ,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,YAAY;YACZ,cAAc;YACd,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,kBAAkB;SACrB,CAAC;QAEF,OAAO,IAAI,6BAAY,CAAC,kBAAkB,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC7E,CAAC;IAEO,KAAK,CAAC,YAAY,CACtB,IAAsB,EACtB,OAAc,EACd,cAAgC,EAChC,OAAkC;QAOlC,MAAM,WAAW,GAAG,4CAA4C,CAAC;QACjE,MAAM,uBAAuB,GAAG,OAAO,CAAC,cAAc,KAAK,4BAAgB,CAAC,aAAa,CAAC;QAC1F,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,KAAK,4BAAgB,CAAC,aAAa,CAAC;QAClF,MAAM,gBAAgB,GAClB,QAAQ,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACjF,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;QACvC,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CACjD,IAAI,CAAC,UAAyC,CACjD,CAAC;QACF,MAAM,gBAAgB,GAAwB;YAC1C,MAAM,EAAE;gBACJ,GAAG,EAAE,gBAAgB;gBACrB,GAAG,EAAE,cAAc;gBACnB,MAAM,EAAE,IAAI,CAAC,eAAe;gBAC5B,GAAG,CAAC,OAAO,CAAC,gBAAgB,IAAI;oBAC5B,eAAe,EAAE,GAAG,gBAAgB,IAAI,cAAc,EAAE;iBAC3D,CAAC;gBACF,GAAG,CAAC,kBAAkB,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;aAC/D;SACJ,CAAC;QAEF,IAAI,YAAwD,CAAC;QAC7D,IAAI,YAAuB,CAAC;QAC5B,IAAI,aAAqB,CAAC;QAC1B,IAAI,IAAI,GAAkB,IAAI,CAAC;QAC/B,IAAI,IAAI,GAAG,EAAa,CAAC;QAEzB,IAAI,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,WAAW~~,EAAE,CAAC~~;~~gBACvB~~,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;~~YAC1C~~,~~CAAC;YAED,~~IAAI,OAAO,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;gBACxC,MAAM,6BAAY,CAAC,+BAA+B,CAC9C,IAAI,EACJ,OAAO,EACP,cAAc,EACd,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,QAAQ,CACnB,CAAC;YACN,CAAC;YAED,MAAM,eAAe,GAAuB;gBACxC,MAAM,EAAE;oBACJ,GAAG,gBAAgB,CAAC,MAAM;oBAC1B,QAAQ,EAAE,CAAC,OAAO,CAAC,iBAAiB,GAAG,GAAG,CAAC,CAAC,QAAQ,EAAE;oBACtD,IAAI,EACA,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAA4C,CAAC;wBACxE,WAAW;oBACf,eAAe,EAAE,OAAO,CAAC,cAAc,KAAK,UAAU;iBACzD;aACJ,CAAC;YACF,YAAY,GAAG,MAAM,wCAAiB,CAAC,qBAAqB,CACxD,MAAM,EACN,IAAI,CAAC,UAAU,EACf,eAAe,CAClB,CAAC;YAEF,YAAY,GAAG,IAAI,sBAAS,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;YAClD,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC;YACvC,IAAI,GAAG,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC;QAChC,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACZ,YAAY,GAAG,MAAM,wCAAiB,CAAC,qBAAqB,CACxD,OAAO,EACP,IAAI,CAAC,UAAU,EACf,gBAAgB,CACnB,CAAC;YACF,IAAI,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC;gBACnE,MAAM,IAAI,sBAAa,CAAC,mBAAmB,CAAC,CAAC;YACjD,CAAC;YAED,YAAY,GAAG,IAAI,sBAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC/C,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC;QAC3C,CAAC;QAED,IAAI,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YAClC,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,EAAE,kBAAkB,EAAE,IAAI,sBAAS,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC1F,CAAC;~~IAEO~~,~~eAAe,CAAC,KAAiB;QACrC,IAAI,~~KAAK,CAAC,~~QAAQ,EAAE,CAAC;YACjB,IAAI,KAAK,CAAC,UAAU,KAAK,iCAAe,CAAC,KAAK,EAAE,CAAC;gBAC7C,OAAO,4CAA4C,CAAC;YACxD,CAAC;YAED,OAAO,4BAAgB,CAAC,~~aAAa,~~CAAC;QAC1C~~,~~CAAC;QACD~~,~~OAAO~~,~~KAAK,CAAC,OAAO,CAAC~~;~~IACzB~~,~~CAAC;IAES,KAAK,CAAC,aAAa,CACzB,eAA0C;QAE1C,~~IAAI,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EAAC,~~eAAe,CAAC,~~IAAI,CAAC,UAAU,CAAC,CAAC;~~YAC5E~~,~~MAAM,QAAQ,GAAG,MAAM,6CAAmB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YACxE,~~OAAO,IAAA,gCAAa,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAEO,qBAAqB,CAAC,cAA2C;QACrE,IAAI,cAAc,KAAK,iCAAe,CAAC,QAAQ,EAAE,CAAC;YAC9C,OAAO,6CAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,cAAc,KAAK,iCAAe,CAAC,OAAO,EAAE,CAAC;YAC7C,OAAO,sFAAsF,CAAC;QAClG,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,WAAW,CACrB,SAAgB,EAChB,OAAc,EACd,YAAwD;QAExD,MAAM,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC3D,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjB,MAAM,IAAI,sBAAa,CAAC,kCAAkC,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,aAAa,CAAC,GAAG,EAAE,CAAC;QAEpB,MAAM,uBAAuB,GAAG,MAAM,cAAK,CAAC,YAAY,CACpD,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,KAAK,4BAAgB,CAAC,aAAa,CAAC,EACrF,SAAS,CAAC,UAAU,CACvB,CAAC;QACF,IAAI,4BAA4B,GAAG,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YAChD,IAAI,YAAY,KAAK,4BAAgB,CAAC,aAAa,EAAE,CAAC;gBAClD,OAAO,gCAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,KAAK,GAAG,uBAAuB,CAAC,4BAA4B,CAAC,CAAC;YACpE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,MAAM,IAAI,sBAAa,CAAC,yBAAyB,CAAC,CAAC;YACvD,CAAC;YAED,4BAA4B,EAAE,CAAC;YAE/B,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,SAAS,EAAE,GAAG,UAAU,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC7B,cAA2C;QAE3C,MAAM,QAAQ,GAAG,MAAM,wCAAiB,CAAC,4BAA4B,CAElE,iBAAiB,EAAE,cAAc,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC5B,CAAC;CACJ;~~AApPD~~,~~0CAoPC~~"}
1	+ {"version":3,"file":"one-inch-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-provider.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,3 @@
-import BigNumber from 'bignumber.js';
 import { PriceTokenAmount, Token } from '../../../../../../common/tokens';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { OneinchTradeStruct } from './models/oneinch-trade-struct';
@@ -6,8 +5,6 @@ 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 OneInchTrade extends AggregatorEvmOnChainTrade {
-    /** @internal */
-    static getGasLimit(tradeStruct: OneinchTradeStruct): Promise<BigNumber | null>;
     /** @internal */
     static checkIfNeedApproveAndThrowError(from: PriceTokenAmount, toToken: Token, fromWithoutFee: PriceTokenAmount, fromAddress: string, useProxy: boolean): Promise<void | never>;
     readonly dexContractAddress: string;

package/lib/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-trade.js CHANGED Viewed

@@ -11,33 +11,12 @@ const errors_1 = require("../../../../../../common/errors");
 const native_tokens_1 = require("../../../../../../common/tokens/constants/native-tokens");
 const decorators_1 = require("../../../../../../common/utils/decorators");
 const evm_web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
-const injector_1 = require("../../../../../../core/injector/injector");
 const token_native_address_proxy_1 = require("../../../../../common/utils/token-native-address-proxy");
 const constants_1 = require("./constants/constants");
 const one_inch_api_service_1 = require("./one-inch-api-service");
 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");
 class OneInchTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
-    /** @internal */
-    static async getGasLimit(tradeStruct) {
-        const fromBlockchain = tradeStruct.from.blockchain;
-        const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
-        if (!walletAddress) {
-            return null;
-        }
-        try {
-            const transactionConfig = await new OneInchTrade(tradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS).encode({ fromAddress: walletAddress });
-            const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
-            const gasLimit = (await web3Public.batchEstimatedGas(walletAddress, [transactionConfig]))[0];
-            if (!gasLimit?.isFinite()) {
-                return null;
-            }
-            return gasLimit;
-        }
-        catch (_err) {
-            return null;
-        }
-    }
     /** @internal */
     static async checkIfNeedApproveAndThrowError(from, toToken, fromWithoutFee, fromAddress, useProxy) {
         const needApprove = await new OneInchTrade({

package/lib/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-trade.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"one-inch-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-trade.ts"],"names":[],"mappings":";;;;;;;;;~~AACA~~,8CAAmG;AAEnG,6EAA6E;AAC7E,4DAAoD;AACpD,6GAAwG;~~AACxG~~,~~yDAAsD;AAEtD,~~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~~AA3KD~~,~~oCA2KC~~;AAtCiB;IAHb,IAAA,kBAAK,EAAC;QACH,MAAM,EAAE,KAAM;KACjB,CAAC;0EASD"}
1	+ {"version":3,"file":"one-inch-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-trade.ts"],"names":[],"mappings":"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"}

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

@@ -3,13 +3,11 @@ import { EvmBlockchainName } from '../../../../../../../core/blockchain/models/b
 import { OnChainTradeError } from '../../../../models/on-chain-trade-error';
 import { RequiredOnChainCalculationOptions } from '../../../common/models/on-chain-calculation-options';
 import { AggregatorOnChainProvider } from '../../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract';
-import { GasFeeInfo } from '../../../common/on-chain-trade/evm-on-chain-trade/models/gas-fee-info';
-import { NativeRouterTradeInstance, NativeRouterTradeStruct } from './models/native-router-trade-struct';
+import { NativeRouterTradeInstance } from './models/native-router-trade-struct';
 import { NativeRouterAbstractTrade } from './native-router-abstract-trade';
 export declare abstract class NativeRouterAbstractProvider<T extends NativeRouterAbstractTrade = NativeRouterAbstractTrade> extends AggregatorOnChainProvider {
     private readonly nativeTokenAddress;
     protected abstract createNativeRouterTradeInstance(tradeInstance: NativeRouterTradeInstance): T;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredOnChainCalculationOptions): Promise<T | OnChainTradeError>;
-    protected getGasFeeInfo(tradeStruct: NativeRouterTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
     getBlockchainById(blockchain: string): string;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-provider.js CHANGED Viewed

@@ -4,10 +4,7 @@ exports.NativeRouterAbstractProvider = void 0;
 const tokens_1 = require("../../../../../../../common/tokens");
 const web3_pure_1 = require("../../../../../../../core/blockchain/web3-pure/web3-pure");
 const aggregator_on_chain_provider_abstract_1 = require("../../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract");
-const 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 native_router_abstract_supported_blockchains_1 = require("./constants/native-router-abstract-supported-blockchains");
-const native_router_abstract_trade_1 = require("./native-router-abstract-trade");
 const native_router_api_service_1 = require("./services/native-router-api-service");
 class NativeRouterAbstractProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
     constructor() {
@@ -39,12 +36,12 @@ class NativeRouterAbstractProvider extends aggregator_on_chain_provider_abstract
                 ...toToken.asStruct,
                 tokenAmount: web3_pure_1.Web3Pure.fromWei(amountOut, toToken.decimals)
             });
-            const nativeRouterTradeStruct = {
+            const tradeStruct = {
                 from,
                 to,
                 slippageTolerance: options.slippageTolerance,
                 path,
-                gasFeeInfo: null,
+                gasFeeInfo: await this.getGasFeeInfo(),
                 useProxy: options.useProxy,
                 proxyFeeInfo,
                 fromWithoutFee,
@@ -52,14 +49,8 @@ class NativeRouterAbstractProvider extends aggregator_on_chain_provider_abstract
                 usedForCrossChain: options.usedForCrossChain,
                 txRequest
             };
-            const gasFeeInfo = options.gasCalculation === 'calculate'
-                ? await this.getGasFeeInfo(nativeRouterTradeStruct, providerGateway)
-                : null;
             const tradeInstance = {
-                tradeStruct: {
-                    ...nativeRouterTradeStruct,
-                    gasFeeInfo
-                },
+                tradeStruct,
                 providerAddress: options.providerAddress,
                 nativeRouterQuoteParams,
                 providerGateway
@@ -73,16 +64,6 @@ class NativeRouterAbstractProvider extends aggregator_on_chain_provider_abstract
             };
         }
     }
-    async getGasFeeInfo(tradeStruct, providerGateway) {
-        try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(tradeStruct.from.blockchain);
-            const gasLimit = await native_router_abstract_trade_1.NativeRouterAbstractTrade.getGasLimit(tradeStruct, providerGateway);
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
-        }
-        catch {
-            return null;
-        }
-    }
     getBlockchainById(blockchain) {
         return native_router_abstract_supported_blockchains_1.blockchainNameMapping[blockchain];
     }

package/lib/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"native-router-abstract-provider.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-provider.ts"],"names":[],"mappings":";;;AAAA,8CAAiE;AAEjE,uEAAmE;AAInE,qIAAsH;~~AAEtH~~,~~6EAAuE;AACvE,iFAA2E;AAC3E,~~2HAGkE;~~AAMlE~~,~~iFAA2E;AAC3E,~~oFAA8E;AAE9E,MAAsB,4BAEpB,SAAQ,iEAAyB;IAFnC;;QAGqB,uBAAkB,GAAG,4CAA4C,CAAC;~~IA0FvF~~,CAAC;~~IAtFU~~,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,4CAA4C,CAAC;YACjE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACvF,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC;YAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YAChF,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YAEpF,MAAM,uBAAuB,GAAmC;gBAC5D,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,OAAO;gBAClB,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,gBAAgB;gBAC1B,MAAM,EAAE,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE;gBAC7C,YAAY,EAAE,WAAW;gBACzB,QAAQ,EAAE,OAAO,CAAC,iBAAiB,GAAG,GAAG;aAC5C,CAAC;YACF,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,kDAAsB,CAAC,YAAY,CACtE,uBAAuB,CAC1B,CAAC;YACF,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC;YACzC,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,WAAW,EAAE,oBAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC;aAC7D,CAAC,CAAC;YACH,MAAM,~~uBAAuB~~,GAA4B;~~gBACrD~~,IAAI;gBACJ,EAAE;gBACF,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,IAAI;gBACJ,UAAU,EAAE,IAAI;~~gBAChB~~,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,YAAY;gBACZ,cAAc;gBACd,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,SAAS;aACZ,CAAC;~~YACF~~,MAAM,~~UAAU,GACZ,OAAO,CAAC,cAAc,KAAK,WAAW;gBAClC,CAAC,CAAC,MAAM,IAAI,CAAC,~~aAAa,~~CAAC,uBAAuB,EAAE,eAAe,CAAC;gBACpE,CAAC,CAAC,IAAI,CAAC;YACf,MAAM,aAAa,~~GAA8B;gBAC7C,WAAW~~,EAAE~~;~~oBACT~~,~~GAAG,uBAAuB;oBAC1B,UAAU;iBACb;gBACD,~~eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,uBAAuB;gBACvB,eAAe;aAClB,CAAC;YACF,OAAO,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAES,KAAK,CAAC,aAAa,CACzB,WAAoC,EACpC,eAAuB;QAEvB,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,MAAM,wDAAyB,CAAC,WAAW,CACxD,WAAW,EACX,eAAe,CAClB,CAAC;YACF,OAAO,IAAA,gCAAa,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAEM,iBAAiB,CAAC,UAAkB;QACvC,OAAO,oEAAqB,CAAC,UAAkC,CAAC,CAAC;IACrE,CAAC;CACJ;~~AA7FD~~,~~oEA6FC~~"}
1	+ {"version":3,"file":"native-router-abstract-provider.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-provider.ts"],"names":[],"mappings":";;;AAAA,8CAAiE;AAEjE,uEAAmE;AAInE,qIAAsH;AACtH,2HAGkE;AAOlE,oFAA8E;AAE9E,MAAsB,4BAEpB,SAAQ,iEAAyB;IAFnC;;QAGqB,uBAAkB,GAAG,4CAA4C,CAAC;IAoEvF,CAAC;IAhEU,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,4CAA4C,CAAC;YACjE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACvF,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC;YAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YAChF,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YAEpF,MAAM,uBAAuB,GAAmC;gBAC5D,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,OAAO;gBAClB,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,gBAAgB;gBAC1B,MAAM,EAAE,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE;gBAC7C,YAAY,EAAE,WAAW;gBACzB,QAAQ,EAAE,OAAO,CAAC,iBAAiB,GAAG,GAAG;aAC5C,CAAC;YACF,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,kDAAsB,CAAC,YAAY,CACtE,uBAAuB,CAC1B,CAAC;YACF,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC;YACzC,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,WAAW,EAAE,oBAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC;aAC7D,CAAC,CAAC;YACH,MAAM,WAAW,GAA4B;gBACzC,IAAI;gBACJ,EAAE;gBACF,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,IAAI;gBACJ,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;gBACtC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,YAAY;gBACZ,cAAc;gBACd,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,SAAS;aACZ,CAAC;YAEF,MAAM,aAAa,GAA8B;gBAC7C,WAAW;gBACX,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,uBAAuB;gBACvB,eAAe;aAClB,CAAC;YACF,OAAO,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAEM,iBAAiB,CAAC,UAAkB;QACvC,OAAO,oEAAqB,CAAC,UAAkC,CAAC,CAAC;IACrE,CAAC;CACJ;AAvED,oEAuEC"}

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

@@ -1,11 +1,9 @@
-import BigNumber from 'bignumber.js';
 import { EvmEncodeConfig } from '../../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/models/evm-encode-config';
 import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
 import { AggregatorEvmOnChainTrade } from '../../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
 import { EvmEncodedConfigAndToAmount } from '../../../common/on-chain-aggregator/models/aggregator-on-chain-types';
-import { NativeRouterTradeInstance, NativeRouterTradeStruct } from './models/native-router-trade-struct';
+import { NativeRouterTradeInstance } from './models/native-router-trade-struct';
 export declare abstract class NativeRouterAbstractTrade extends AggregatorEvmOnChainTrade {
-    static getGasLimit(tradeStruct: NativeRouterTradeStruct, providerGateway: string): Promise<BigNumber | null>;
     readonly providerGateway: string;
     private readonly nativeRouterQuoteParams;
     protected get spenderAddress(): string;

package/lib/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-trade.js CHANGED Viewed

@@ -2,33 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeRouterAbstractTrade = void 0;
 const errors_1 = require("../../../../../../../common/errors");
-const injector_1 = require("../../../../../../../core/injector/injector");
 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 aggregator_evm_on_chain_trade_abstract_1 = require("../../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract");
 const native_router_api_service_1 = require("./services/native-router-api-service");
 class NativeRouterAbstractTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
-    static async getGasLimit(tradeStruct, providerGateway) {
-        const fromBlockchain = tradeStruct.from.blockchain;
-        const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
-        if (!walletAddress)
-            return null;
-        try {
-            const web3public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
-            const gasLimit = await web3public.getEstimatedGasByData(walletAddress, providerGateway, {
-                data: tradeStruct.txRequest.calldata,
-                value: tradeStruct.txRequest.value
-            });
-            if (!gasLimit?.isFinite()) {
-                return null;
-            }
-            return gasLimit;
-        }
-        catch (err) {
-            console.debug(err);
-            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/common/native-router-abstract/native-router-abstract-trade.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"native-router-abstract-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-trade.ts"],"names":[],"mappings":";;;~~AACA~~,8CAAkD;~~AAElD~~,~~yDAAsD;AAEtD,~~qHAA+G;AAC/G,uJAAiJ;AAEjJ,uIAAuH;~~AAOvH~~,oFAA8E;AAE9E,MAAsB,yBAA0B,SAAQ,kEAAyB;~~IACtE~~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~~AAzFD~~,~~8DAyFC~~"}
1	+ {"version":3,"file":"native-router-abstract-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-trade.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAGlD,qHAA+G;AAC/G,uJAAiJ;AAEjJ,uIAAuH;AAIvH,oFAA8E;AAE9E,MAAsB,yBAA0B,SAAQ,kEAAyB;IAK7E,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,IAAW,kBAAkB;QACzB,MAAM,IAAI,sBAAa,CAAC,+CAA+C,CAAC,CAAC;IAC7E,CAAC;IAED,YAAY,aAAwC;QAChD,KAAK,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;QAChE,IAAI,CAAC,eAAe,GAAG,aAAa,CAAC,eAAe,CAAC;QACrD,IAAI,CAAC,uBAAuB,GAAG,aAAa,CAAC,uBAAuB,CAAC;IACzE,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAiC;QACjD,MAAM,IAAA,oEAA+B,EAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACnF,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAEzD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,WAAW,CAAC;QAC/D,IAAI,CAAC;YACD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,kDAAsB,CAAC,YAAY,CAAC;gBACvE,GAAG,IAAI,CAAC,uBAAuB;gBAC/B,YAAY,EAAE,OAAO;aACxB,CAAC,CAAC;YAEH,MAAM,EAAE,GAAoB;gBACxB,EAAE,EAAE,SAAS,CAAC,MAAM;gBACpB,IAAI,EAAE,SAAS,CAAC,QAAQ;gBACxB,KAAK,EAAE,SAAS,CAAC,KAAK;aACzB,CAAC;YAEF,OAAO;gBACH,EAAE;gBACF,QAAQ,EAAE,SAAS;aACtB,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,YAAY,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;gBAC1C,MAAM,IAAI,sBAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;YACD,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;CACJ;AA3DD,8DA2DC"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/dln-on-chain-provider.d.ts CHANGED Viewed

@@ -2,8 +2,6 @@ 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';
@@ -12,6 +10,5 @@ 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 CHANGED Viewed

@@ -64,7 +64,7 @@ class DlnOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggrega
         const tradeStruct = {
             from,
             to,
-            gasFeeInfo: null,
+            gasFeeInfo: await this.getGasFeeInfo(),
             slippageTolerance: fullOptions.slippageTolerance,
             type: this.tradeType,
             path,
@@ -76,14 +76,8 @@ 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 CHANGED Viewed

	@@ -1 +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":";;;;;;AAAA,gEAAqC;AACrC,8CAAkD;AAClD,8CAAiE;AACjE,sDAA0D;AAC1D,gFAA6F;AAC7F,sGAAkG;AAClG,uEAAmE;AACnE,uFAAkF;AAClF,2EAAuE;AACvE,6EAAwE;AACxE,oIAAwI;AACxI,yKAG0H;AAC1H,mIAA6H;AAK7H,+HAA4H;~~AAI5H~~,kMAA4L;AAG5L,kIAAmH;AAEnH,MAAa,kBAAmB,SAAQ,iEAAyB;IAAjE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,GAAG,CAAC;QAEnC,mBAAc,GAA8D;YACzF,GAAG,wDAAyB;YAC5B,cAAc,EAAE,WAAW;SAC9B,CAAC;~~IAmGN~~,CAAC;~~IAjGU~~,qBAAqB,CAAC,UAA0B;QACnD,OAAO,mEAA8B,CAAC,IAAI,CACtC,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,KAAK,UAAU,CACtD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAqD,EACrD,OAAkD,EAClD,OAAqC;QAErC,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;YACjF,MAAM,IAAI,sBAAa,CAAC,6DAA6D,CAAC,CAAC;QAC3F,CAAC;QAED,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE;YACxC,GAAG,IAAI,CAAC,cAAc;YACtB,iBAAiB,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,EAAE,yCAAmB,CAAC,IAAI,CAAC;SAC9E,CAAC,CAAC;QAEH,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE3F,MAAM,WAAW,GAAG,4BAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,oBAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAElE,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvF,MAAM,aAAa,GAA0B;YACzC,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC7B,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,oBAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAC3C,aAAa,EAAE,cAAc,CAAC,eAAe;YAC7C,QAAQ;YACR,QAAQ,EAAE,oBAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC;YAC/C,iBAAiB,EAAE,YAAY;YAC/B,YAAY,EAAE,oCAAoB;SACrC,CAAC;QAEF,MAAM,gBAAgB,GAAG,MAAM,+BAAa,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;QAEjF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;YAC5B,GAAG,OAAO,CAAC,QAAQ;YACnB,WAAW,EAAE,oBAAQ,CAAC,OAAO,CACzB,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAChC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CACrC;SACJ,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,oBAAQ,CAAC,OAAO,CACrC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,EACnC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CACrC,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEzC,MAAM,WAAW,GAAkD;YAC/D,IAAI;YACJ,EAAE;YACF,UAAU,EAAE,IAAI;~~YAChB~~,iBAAiB,EAAE,WAAW,CAAC,iBAAkB;YACjD,IAAI,EAAE,IAAI,CAAC,SAAS;YACpB,IAAI;YACJ,mBAAmB,EAAE,gBAAgB;YACrC,QAAQ,EAAE,WAAW,CAAC,QAAS;YAC/B,YAAY;YACZ,cAAc;YACd,aAAa,EAAE,WAAW,CAAC,aAAc;YACzC,kBAAkB,EAAE,aAAa;YACjC,eAAe,EAAE,gBAAgB,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE;SAChD,CAAC;~~QACF~~,~~IAAI,WAAW,CAAC,cAAc,KAAK,WAAW,EAAE,CAAC;YAC7C,WAAW,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QACnE,CAAC;QAED,~~OAAO,wCAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAChG,CAAC;~~IAES,KAAK,CAAC,aAAa,CACzB,YAAgD,EAChD,gBAAyB;QAEzB,OAAO,IAAI,CAAC;IAChB,CAAC;~~IAEO,eAAe,CACnB,IAAsB;QAEtB,IAAI,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,MAAM,EAAE,CAAC;YAC7C,MAAM,UAAU,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,CAAC;YACtC,IAAI,UAAU,EAAE,CAAC;gBACb,OAAO;oBACH,qBAAqB,EAAE,8CAA8C;oBACrE,mBAAmB,EAAE,UAAU,GAAG,GAAG;iBACxC,CAAC;YACN,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;~~AAzGD~~,~~gDAyGC~~"}
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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"}

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

@@ -1,4 +1,3 @@
-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';
@@ -6,8 +5,6 @@ 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 CHANGED Viewed

@@ -4,17 +4,10 @@ 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 CHANGED Viewed

	@@ -1 +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":";;;~~AACA~~,8CAK2B;AAC3B,2FAAsF;AACtF,6EAAwE;~~AACxE~~,~~6GAAwG;AAExG,~~uJAAiJ;~~AAIjJ~~,~~iHAA0G;AAE1G,~~uIAAuH;AAGvH,qFAA8E;AAE9E,MAAa,mBAAoB,SAAQ,kEAAyB;~~IAC9D~~,~~gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,eAA0C;QAE1C,MAAM,SAAS,GAAG,IAAI,mBAAmB,CAAC,eAAe,EAAE,2BAAW,CAAC,aAAa,CAAC,CAAC;QACtF,OAAO,IAAA,yCAAiB,EAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAUD,~~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~~AApHD~~,~~kDAoHC~~"}
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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"}

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

@@ -1,4 +1,3 @@
-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';
@@ -7,7 +6,6 @@ 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 CHANGED Viewed

@@ -9,9 +9,6 @@ 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 CHANGED Viewed

	@@ -1 +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":";;;~~AACA~~,8CAAoE;AACpE,2FAAsF;AACtF,8CAAqD;AAGrD,6EAAwE;AACxE,uJAAiJ;AAIjJ,6IAA6H;AAI7H,qFAA8E;AAE9E,MAAa,sBAAuB,SAAQ,wEAA4B;~~IAC7D~~,~~MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,gBAA8C;QAE9C,OAAO,IAAI,CAAC;IAChB,CAAC;IAUD,~~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~~AAlID~~,~~wDAkIC~~"}
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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"}

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

@@ -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(lifiTradeStruct: LifiEvmOnChainTradeStruct): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount, step: LifiStep): Promise<GasFeeInfo | null>;
 }