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/providers/aggregators/lifi/lifi-provider.js CHANGED Viewed

@@ -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 lifi_evm_on_chain_trade_1 = require("./chains/lifi-evm-on-chain-trade");
+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_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,21 +78,19 @@ 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);
-            let lifiTradeStruct = {
+            const lifiTradeStruct = {
                 from,
                 to,
-                gasFeeInfo: null,
+                gasFeeInfo: await this.getGasFeeInfo(from, step),
                 slippageTolerance: fullOptions.slippageTolerance,
-                type,
+                type: this.tradeType,
                 path,
                 route,
                 toTokenWeiAmountMin: new bignumber_js_1.default(route.toAmountMin),
@@ -101,16 +99,6 @@ 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);
@@ -122,13 +110,23 @@ class LifiProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnC
      * @returns best trade
      */
     getBestTrade(trades) {
-        const best = trades.sort((prev, next) => next.to.tokenAmount.comparedTo(prev.to.tokenAmount))[0];
+        const best = trades.sort((curr, prev) => prev.to.tokenAmount.comparedTo(curr.to.tokenAmount))[0];
         return best;
     }
-    async getGasFeeInfo(lifiTradeStruct) {
+    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.amount);
+        }
         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/lifi/lifi-provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"lifi-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/lifi/lifi-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAkD;AAClD,8CAAiE;AACjE,oDAAkD;AAClD,sDAA0D;AAC1D,gFAA6F;AAC7F,8FAAyF;AACzF,yFAAmF;AACnF,6EAAwE;~~AAKxE~~,kIAGuG;AACvG,0JAGmH;AAWnH,~~wHAAkH;AAClH,4HAAsH;AACtH,~~kMAA4L;AAG5L,iFAAgG;AAChG,kIAAmH;AACnH,~~8EAAuE~~;~~AACvE~~,mEAA6D;AAC7D,oFAA6E;AAC7E,MAAa,YAAa,SAAQ,iEAAyB;IAA3D;;QACoB,cAAS,GAAG,yCAAmB,CAAC,IAAI,CAAC;QAEpC,mBAAc,GAA8D;YACzF,GAAG,wDAAyB;YAC5B,cAAc,EAAE,WAAW;SAC9B,CAAC;~~IAsJN~~,CAAC;~~IApJU~~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~~,EAAE,CAAC~~;~~gBACR~~,OAAO,IAAI,CAAC;~~YAChB~~,~~CAAC;YACD,~~MAAM,~~IAAI,GAAG,yCAAmB,CAAC,IAAI,CAAC;YAEtC,MAAM,~~EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,KAAK,CAAC,QAAQ,CAAC;aAC3C,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAEzC,~~IAAI~~,eAAe,GAAG;~~gBAClB~~,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE,~~IAAyB~~;~~gBACrC~~,iBAAiB,EAAE,WAAW,CAAC,iBAAkB;gBACjD,IAAI;~~gBACJ~~,IAAI;gBACJ,KAAK;gBACL,mBAAmB,EAAE,IAAI,sBAAS,CAAC,KAAK,CAAC,WAAW,CAAC;gBACrD,QAAQ,EAAE,WAAW,CAAC,QAAS;gBAC/B,YAAY;gBACZ,cAAc;gBACd,aAAa,EAAE,WAAW,CAAC,aAAc;aAC5C,CAAC;YAEF,~~qBAAqB;YACrB,gDAAgD;YAChD,iBAAiB;YACjB,sCAAsC;YACtC,6DAA6D;YAC7D,eAAe;YACf,eAAe,GAAG;gBACd,GAAG,eAAe;gBAClB,UAAU,EAAE,IAAI;aACnB,CAAC;YAEF,~~OAAO,0CAAkB,CAAC,WAAW,CACjC,cAAc,EACd,eAA2E,EAC3E,WAAW,CAAC,eAAe,CAC9B,CAAC;QACN,CAAC,CAAC,CACL,CACJ,CAAC,MAAM,CAAC,gBAAO,CAAC,CAAC;QAClB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;~~QAC~~/C,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;;OAIG;IACK,YAAY,CAAC,MAAsB;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CACpC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CACtD,CAAC,CAAC,CAAwB,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,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;CACJ;~~AA5JD~~,~~oCA4JC~~"}
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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"}

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

@@ -5,10 +5,9 @@ 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(tradeStruct: OdosOnChainTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, gasLimit: number): Promise<GasFeeInfo | null>;
 }

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

@@ -52,22 +52,14 @@ class OdosOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggreg
                 to,
                 fromWithoutFee,
                 proxyFeeInfo,
-                gasFeeInfo: {
-                    gasLimit: new bignumber_js_1.default(gasEstimate)
-                },
+                gasFeeInfo: await this.getGasFeeInfo(from, gasEstimate),
                 slippageTolerance: options.slippageTolerance,
                 useProxy: options.useProxy,
                 withDeflation: options.withDeflation,
                 path,
                 bestRouteRequestBody
             };
-            const gasFeeInfo = options.gasCalculation === 'calculate'
-                ? await this.getGasFeeInfo(tradeStruct, providerGateway)
-                : null;
-            return new odos_on_chain_trade_1.OdosOnChainTrade({
-                ...tradeStruct,
-                gasFeeInfo
-            }, options.providerAddress, providerGateway);
+            return new odos_on_chain_trade_1.OdosOnChainTrade(tradeStruct, options.providerAddress, providerGateway);
         }
         catch (err) {
             return {
@@ -76,12 +68,9 @@ class OdosOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggreg
             };
         }
     }
-    async getGasFeeInfo(tradeStruct, providerGateway) {
+    async getGasFeeInfo(from, gasLimit) {
         try {
-            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);
+            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/odos/odos-on-chain-provider.js.map CHANGED Viewed

	@@ -1 +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+~~FzD~~,CAAC;~~IA7FU~~,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~~;oBACR~~,~~QAAQ~~,~~EAAE,~~IAAI,~~sBAAS~~,CAAC,WAAW,CAAC;~~iBACvC;gBACD~~,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,IAAI;gBACJ,oBAAoB;aACvB,CAAC;YAEF,~~MAAM,UAAU,GACZ,~~OAAO,~~CAAC,cAAc,KAAK,WAAW;gBAClC,CAAC,CAAC,MAAM,~~IAAI,~~CAAC~~,~~aAAa,~~CAAC,WAAW,EAAE,~~eAAe,CAAC;gBACxD,CAAC,CAAC,IAAI,CAAC;YAEf,~~OAAO,~~IAAI,sCAAgB,CACvB;gBACI,GAAG,WAAW;gBACd,UAAU;aACb,EACD,OAAO,~~CAAC,eAAe,~~EACvB~~,eAAgB,~~CACnB~~,CAAC;~~QACN~~,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,~~WAAmC~~,~~EACnC~~,~~eAAuB~~;~~QAEvB~~,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EAAC,~~WAAW,CAAC,~~IAAI,CAAC,UAAU,CAAC,CAAC;~~YACxE~~,~~MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,EAAE,QAAQ;gBAC7C,CAAC,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ;gBAClC,CAAC,CAAC,MAAM,sCAAgB,CAAC,WAAW,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YACvE,~~OAAO,IAAA,gCAAa,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;~~AAhGD~~,~~kDAgGC~~"}
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":"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"}

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

@@ -1,10 +1,8 @@
-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 CHANGED Viewed

@@ -2,18 +2,11 @@
 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 CHANGED Viewed

	@@ -1 +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":";;;~~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~~"}
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"}

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

@@ -5,11 +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 { 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(tradeStruct: OkuSwapOnChainTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, gasLimit: string): Promise<GasFeeInfo | null>;
 }

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

@@ -57,9 +57,7 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
                 to,
                 fromWithoutFee,
                 proxyFeeInfo,
-                gasFeeInfo: {
-                    gasLimit: new bignumber_js_1.default(gas)
-                },
+                gasFeeInfo: await this.getGasFeeInfo(from, gas),
                 slippageTolerance: fullOptions.slippageTolerance,
                 useProxy: fullOptions.useProxy,
                 withDeflation: fullOptions.withDeflation,
@@ -69,13 +67,7 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
                 subProvider,
                 ...(permit2Address && { permit2ApproveAddress: permit2Address })
             };
-            const gasFeeInfo = fullOptions.gasCalculation === 'calculate'
-                ? await this.getGasFeeInfo(tradeStruct, providerGateway)
-                : null;
-            return new okuswap_on_chain_trade_1.OkuSwapOnChainTrade({
-                ...tradeStruct,
-                gasFeeInfo
-            }, fullOptions.providerAddress, providerGateway);
+            return new okuswap_on_chain_trade_1.OkuSwapOnChainTrade(tradeStruct, fullOptions.providerAddress, providerGateway);
         }
         catch (err) {
             return {
@@ -101,10 +93,9 @@ class OkuSwapOnChainProvider extends aggregator_on_chain_provider_abstract_1.Agg
             gas: bestRoute.estimatedGas
         };
     }
-    async getGasFeeInfo(tradeStruct, providerGateway) {
+    async getGasFeeInfo(from, gasLimit) {
         try {
-            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);
+            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/okuswap/okuswap-on-chain-provider.js.map CHANGED Viewed

	@@ -1 +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":";;;;;;AAAA,gEAAqC;AACrC,8CAAkD;AAClD,8CAAiE;AAEjE,uEAAmE;AACnE,2FAAwF;AAIxF,iFAA8E;AAC9E,kIAAmH;AAGnH,0EAAoE;AACpE,8EAAwE;AAMxE,sEAAmE;AACnE,kGAGoD;AAEpD,qEAA+D;AAC/D,wEAAmE;AAEnE,MAAa,sBAAuB,SAAQ,iEAAyB;IAArE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,QAAQ,CAAC;~~IAkI7D~~,CAAC;~~IAhIU~~,qBAAqB,CAAC,UAA0B;QACnD,OAAO,0EAAsC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;IACtF,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,MAAM,WAAW,GAAG,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,sBAAa,CAAC,2BAA2B,IAAI,CAAC,UAAU,SAAS,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,UAAwC,CAAC;QACrE,MAAM,aAAa,GACf,WAAW,CAAC,WAAW,IAAI,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,yCAAmB,CAAC;QAE5F,IAAI,CAAC;YACD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CACnE,IAAI,EACJ,WAAW,CACd,CAAC;YACF,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE9C,MAAM,YAAY,GAAG,MAAM,uCAAiB,CAAC,0BAA0B,CACnE,IAAI,CAAC,UAAU,CAClB,CAAC;YACF,MAAM,YAAY,GAAG;gBACjB,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,yCAAmB,CAAC,cAAc,CAAC;gBAC1C,cAAc,EAAE,IAAI,CAAC,OAAO;gBAC5B,eAAe,EAAE,OAAO,CAAC,OAAO;gBAChC,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE,WAAW,CAAC,iBAAiB,GAAG,KAAM;gBAChD,aAAa,EAAE,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE;aAC/B,CAAC;YAEzB,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CACvE,YAAY,EACZ,YAAY,CACf,CAAC;YAEF,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;YAC/D,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,EAAE,cAAc,CAAC;YAElE,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,oBAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;aACvE,CAAC,CAAC;YAEH,MAAM,WAAW,GAA8B;gBAC3C,IAAI;gBACJ,EAAE;gBACF,cAAc;gBACd,YAAY;gBACZ,UAAU,EAAE~~;oBACR~~,~~QAAQ~~,~~EAAE,~~IAAI,~~sBAAS~~,CAAC,GAAG,CAAC;~~iBAC~~/~~B;gBACD~~,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;gBAChD,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,aAAa,EAAE,WAAW,CAAC,aAAa;gBACxC,IAAI;gBACJ,YAAY;gBACZ,WAAW;gBACX,WAAW;gBACX,GAAG,CAAC,cAAc,IAAI,EAAE,qBAAqB,EAAE,cAAc,EAAE,CAAC;aACnE,CAAC;YAEF,~~MAAM,UAAU,GACZ,WAAW,CAAC,cAAc,KAAK,WAAW;gBACtC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,eAAe,CAAC;gBACxD,CAAC,CAAC,IAAI,CAAC;YAEf,~~OAAO,IAAI,4CAAmB,CAC1B~~;gBACI~~,~~GAAG,~~WAAW~~;gBACd~~,~~UAAU;aACb~~,~~EACD,~~WAAW,CAAC,eAAe,EAC3B,eAAe,CAClB,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,yCAAmB,CAAC,QAAQ;gBAClC,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,YAAY,CACtB,YAAsB,EACtB,IAAyB;QAEzB,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,uCAAiB,CAAC,gBAAgB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QACpF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrC,IAAI,sBAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CACrC,CAAC;QAExB,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,IAAI,sBAAa,CAAC,yCAAyC,CAAC,CAAC;QACvE,CAAC;QAED,OAAO;YACH,WAAW,EAAE,SAAS,CAAC,MAAM;YAC7B,WAAW,EAAE;gBACT,MAAM,EAAE,SAAS,CAAC,MAAM;gBACxB,cAAc,EAAE,SAAS,EAAE,cAAc;aAC5C;YACD,QAAQ,EAAE,SAAS,CAAC,SAAS;YAC7B,GAAG,EAAE,SAAS,CAAC,YAAY;SAC9B,CAAC;IACN,CAAC;IAES,KAAK,CAAC,aAAa,CACzB,~~WAAsC~~,~~EACtC~~,~~eAAuB~~;~~QAEvB~~,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EAAC,~~WAAW,CAAC,~~IAAI,CAAC,UAAU,CAAC,CAAC;~~YACxE~~,~~MAAM,QAAQ,GAAG,MAAM,4CAAmB,CAAC,WAAW,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YACrF,~~OAAO,IAAA,gCAAa,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;~~AAnID~~,~~wDAmIC~~"}
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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"}

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

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

@@ -6,20 +6,13 @@ 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

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

	@@ -1 +1 @@
1	- {"version":3,"file":"okuswap-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-trade.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA2E;~~AAE3E~~,~~6GAAwG;AAExG,~~uEAAmE;AAEnE,qHAA+G;AAC/G,uJAAiJ;~~AACjJ~~,~~iHAA0G;AAG1G,~~iFAAgG;AAChG,oIAAoH;AAKpH,wEAAmE;AAEnE,MAAa,mBAAoB,SAAQ,kEAAyB;~~IAC9D~~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~~AAzJD~~,~~kDAyJC~~"}
1	+ {"version":3,"file":"okuswap-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-trade.ts"],"names":[],"mappings":"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"}

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

@@ -1,16 +1,16 @@
 import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { BlockchainName, EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
 import { OnChainTradeError } from '../../../models/on-chain-trade-error';
-import { OpenOceanTradeStruct } from './models/open-ocean-trade-struct';
 import { RequiredOnChainCalculationOptions } from '../../common/models/on-chain-calculation-options';
 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 { OpenOceanQuoteResponse } from './models/open-ocean-quote-response';
 export declare class OpenOceanProvider extends AggregatorOnChainProvider {
     readonly tradeType: "OPEN_OCEAN";
     static readonly nativeAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
-    protected getGasFeeInfo(tradeStruct: OpenOceanTradeStruct): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, quote: OpenOceanQuoteResponse): Promise<GasFeeInfo | null>;
     private checkIsSupportedTokens;
 }

package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-provider.js CHANGED Viewed

@@ -11,9 +11,9 @@ const p_timeout_1 = __importDefault(require("../../../../../../common/utils/p-ti
 const open_ocean_on_chain_supported_blockchain_1 = require("./constants/open-ocean-on-chain-supported-blockchain");
 const open_ocean_trade_1 = require("./open-ocean-trade");
 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 aggregator_on_chain_provider_abstract_1 = require("../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract");
 const open_ocean_api_service_1 = require("./services/open-ocean-api-service");
 class OpenOceanProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
     constructor() {
@@ -38,12 +38,10 @@ class OpenOceanProvider extends aggregator_on_chain_provider_abstract_1.Aggregat
                 ...toToken.asStruct,
                 weiAmount: new bignumber_js_1.default(quoteResponse.data.outAmount)
             });
-            const openOceanTradeStruct = {
+            const tradeStruct = {
                 from,
                 to,
-                gasFeeInfo: {
-                    gasLimit: new bignumber_js_1.default(quoteResponse.data.estimatedGas)
-                },
+                gasFeeInfo: await this.getGasFeeInfo(from, quoteResponse),
                 slippageTolerance: options.slippageTolerance,
                 path: [from, to],
                 useProxy: options.useProxy,
@@ -51,13 +49,7 @@ class OpenOceanProvider extends aggregator_on_chain_provider_abstract_1.Aggregat
                 fromWithoutFee,
                 withDeflation: options.withDeflation
             };
-            const gasFeeInfo = options.gasCalculation === 'calculate'
-                ? await this.getGasFeeInfo(openOceanTradeStruct)
-                : null;
-            return new open_ocean_trade_1.OpenOceanTrade({
-                ...openOceanTradeStruct,
-                gasFeeInfo
-            }, options.providerAddress);
+            return new open_ocean_trade_1.OpenOceanTrade(tradeStruct, options.providerAddress);
         }
         catch (error) {
             return {
@@ -66,12 +58,10 @@ class OpenOceanProvider extends aggregator_on_chain_provider_abstract_1.Aggregat
             };
         }
     }
-    async getGasFeeInfo(tradeStruct) {
+    async getGasFeeInfo(from, quote) {
         try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(tradeStruct.from.blockchain);
-            const gasLimit = tradeStruct?.gasFeeInfo?.gasLimit ||
-                (await open_ocean_trade_1.OpenOceanTrade.getGasLimit(tradeStruct));
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
+            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(from.blockchain);
+            return (0, get_gas_fee_info_1.getGasFeeInfo)(quote.data.estimatedGas, gasPriceInfo);
         }
         catch {
             return null;

package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"open-ocean-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAkD;AAClD,8CAAiE;AACjE,2EAAkD;AAGlD,4LAGuI;AAEvI,kIAA6H;AAE7H,+HAA4H;~~AAG5H~~,~~wHAAkH~~;~~AAClH~~,~~4HAAsH~~;~~AAEtH~~,~~kIAAmH~~;~~AACnH~~,8EAAwE;AAExE,MAAa,iBAAkB,SAAQ,iEAAyB;IAAhE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,UAAU,CAAC;~~IAiG~~/D,CAAC;~~IA7FU~~,qBAAqB,CAAC,UAA0B;QACnD,OAAO,+EAAoC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IAClF,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEvF,MAAM,aAAa,GAAG,MAAM,IAAA,mBAAQ,EAChC,4CAAmB,CAAC,cAAc,CAC9B,cAAuE,EACvE,OAAO,EACP,OAAO,CAAC,iBAAiB,CAC5B,EACD,IAAK,CACR,CAAC;YAEF,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1C,OAAO;oBACH,IAAI,EAAE,yCAAmB,CAAC,UAAU;oBACpC,KAAK,EAAE,IAAI,sBAAa,CAAC,aAAa,CAAC,KAAK,CAAC;iBAChD,CAAC;YACN,CAAC;YAED,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;aACzD,CAAC,CAAC;YAEH,MAAM,~~oBAAoB~~,GAAyB;~~gBAC/C~~,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE~~;oBACR~~,~~QAAQ~~,~~EAAE,~~IAAI,~~sBAAS,~~CAAC,aAAa,CAAC,IAAI,~~CAAC~~,~~YAAY~~,CAAC;~~iBAC3D;gBACD~~,iBAAiB,EAAE,OAAO,CAAC,iBAAkB;gBAC7C,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;gBAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,YAAY;gBACZ,cAAc;gBACd,aAAa,EAAE,OAAO,CAAC,aAAa;aACvC,CAAC;~~YACF~~,~~MAAM,UAAU,GACZ,~~OAAO,~~CAAC,cAAc,KAAK,WAAW;gBAClC,CAAC,CAAC,MAAM,~~IAAI,~~CAAC~~,~~aAAa,~~CAAC,~~oBAAoB~~,~~CAAC;gBAChD~~,~~CAAC,CAAC,IAAI,CAAC;YAEf,~~OAAO,~~IAAI,iCAAc,CACrB;gBACI,GAAG,oBAAoB;gBACvB,UAAU;aACb,EACD,OAAO,~~CAAC,eAAe,~~CAC1B~~,CAAC;~~QACN~~,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO;gBACH,IAAI,EAAE,yCAAmB,CAAC,UAAU;gBACpC,KAAK;aACR,CAAC;QACN,CAAC;IACL,CAAC;~~IAES~~,KAAK,CAAC,aAAa,~~CAAC~~,~~WAAiC~~;~~QAC3D~~,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EAAC,~~WAAW,CAAC,~~IAAI,CAAC,UAAU,CAAC,CAAC;~~YACxE~~,~~MAAM~~,~~QAAQ~~,~~GACV~~,~~WAAW~~,~~EAAE~~,~~UAAU,EAAE,QAAQ;gBACjC,~~CAAC,~~MAAM~~,~~iCAAc,~~CAAC,~~WAAW~~,~~CAAC,WAAW,CAAC,CAAC,CAAC;YACpD,OAAO,IAAA,gCAAa,EAAC,QAAQ,~~EAAE,YAAY,CAAC,CAAC;~~QACjD~~,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,IAAsB,EAAE,EAAc;QACvE,MAAM,iBAAiB,GAAG,MAAM,4CAAmB,CAAC,eAAe,CAC/D,IAAI,CAAC,UAAiD,CACzD,CAAC;QACF,MAAM,MAAM,GAAG,iBAAiB,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACxF,MAAM,iBAAiB,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YACtB,CAAC,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;YACpE,CAAC,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAErE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,MAAM,IAAI,sBAAa,CAAC,wBAAwB,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;;~~AAjGL~~,~~8CAkGC~~;~~AA/F0B~~,+BAAa,GAAG,4CAA4C,AAA/C,CAAgD"}
1	+ {"version":3,"file":"open-ocean-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-provider.ts"],"names":[],"mappings":"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"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.d.ts CHANGED Viewed

@@ -1,12 +1,9 @@
-import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { GetContractParamsOptions } from '../../../../../cross-chain/calculation-manager/providers/common/models/get-contract-params-options';
 import { OpenOceanTradeStruct } from './models/open-ocean-trade-struct';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
 import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 export declare class OpenOceanTrade extends AggregatorEvmOnChainTrade {
-    /** @internal */
-    static getGasLimit(openOceanTradeStruct: OpenOceanTradeStruct): Promise<BigNumber | null>;
     readonly type: "OPEN_OCEAN";
     protected get spenderAddress(): string;
     get dexContractAddress(): string;

package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.js CHANGED Viewed

@@ -3,19 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenOceanTrade = void 0;
 const errors_1 = require("../../../../../../common/errors");
 const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
-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 proxy_cross_chain_evm_trade_1 = require("../../../../../cross-chain/calculation-manager/providers/common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade");
 const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
-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 open_ocean_api_service_1 = require("./services/open-ocean-api-service");
 class OpenOceanTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
-    /** @internal */
-    static async getGasLimit(openOceanTradeStruct) {
-        const openOceanTrade = new OpenOceanTrade(openOceanTradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS);
-        return (0, get_on_chain_gas_data_1.getOnChainGasData)(openOceanTrade);
-    }
     get spenderAddress() {
         const openOceanContractAddress = this.from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.OKE_X_CHAIN
             ? '0xc0006Be82337585481044a7d11941c0828FFD2D4'

package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"open-ocean-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.ts"],"names":[],"mappings":";;;~~AACA~~,8CAA+E;AAE/E,gFAA6E;~~AAC7E~~,~~6GAAwG;AAExG,~~uJAAiJ;AAEjJ,wKAAiK;AAGjK,+HAA4H;~~AAC5H~~,~~iHAA0G;AAE1G,~~oIAAoH;AAEpH,8EAAwE;AAExE,MAAa,cAAe,SAAQ,kEAAyB;~~IACzD~~,~~gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,oBAA0C;QAE1C,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,oBAAoB,EAAE,2BAAW,CAAC,aAAa,CAAC,CAAC;QAC3F,OAAO,IAAA,yCAAiB,EAAC,cAAc,CAAC,CAAC;IAC7C,CAAC;IAID,~~IAAc,cAAc;QACxB,MAAM,wBAAwB,GAC1B,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,WAAW;YAChD,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,4CAA4C,CAAC;QAEvD,OAAO,IAAI,CAAC,QAAQ;YAChB,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACzD,CAAC,CAAC,wBAAwB,CAAC;IACnC,CAAC;IAED,IAAW,kBAAkB;QACzB,MAAM,IAAI,sBAAa,CAAC,+CAA+C,CAAC,CAAC;IAC7E,CAAC;IAED,YAAY,WAAiC,EAAE,eAAuB;QAClE,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAlBxB,SAAI,GAAG,yCAAmB,CAAC,UAAU,CAAC;IAmBtD,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,iBAAiB,GAAG,MAAM,4CAAmB,CAAC,aAAa,CAC7D,IAAI,CAAC,cAAuE,EAC5E,IAAI,CAAC,EAAE,EACP,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,WAAW,EAC9C,IAAI,CAAC,iBAAiB,CACzB,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC;QAExE,OAAO;YACH,EAAE,EAAE;gBACA,IAAI;gBACJ,EAAE;gBACF,KAAK;aACR;YACD,QAAQ;SACX,CAAC;IACN,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,OAAiC;QACzD,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACpD,GAAG,OAAO;YACV,WAAW,EAAE,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM;YACnE,UAAU,EAAE,KAAK;YACjB,eAAe,EAAE,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM;SAC1E,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,CAClB,MAAM,qDAAuB,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAC1E,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAExC,MAAM,aAAa,GAAG,uBAAuB,CAAC,EAAE,CAAC;QACjD,MAAM,MAAM,GAAG,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,oCAA2B,CAAC,aAAa,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,qDAAuB,CAAC,iBAAiB,CAC3C,IAAI,CAAC,IAAI,CAAC,UAAU,EACpB,aAAa,EACb,MAAM,CACT,CAAC;QAEF,OAAO;YACH;gBACI,aAAa;gBACb,aAAa;gBACb,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,KAAK;oBAChE,CAAC,CAAC,4CAA4C;oBAC9C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO;gBACvB,IAAI,CAAC,EAAE,CAAC,OAAO;gBACf,IAAI,CAAC,IAAI,CAAC,eAAe;gBACzB,uBAAuB,CAAC,IAAI;gBAC5B,IAAI;aACP;SACJ,CAAC;IACN,CAAC;CACJ;~~AAxFD~~,~~wCAwFC~~"}
1	+ {"version":3,"file":"open-ocean-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.ts"],"names":[],"mappings":"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"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.js CHANGED Viewed

@@ -36,7 +36,6 @@ class OpenOceanApiService {
                 gasPrice: gasPriceNonWei,
                 slippage: slippageTolerance * 100,
                 account: walletAddress,
-                // @TODO check if need to pass referrer in quote
                 referrer: '0x429A3A1a2623DFb520f1D93F64F38c0738418F1f'
             }
         });

package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"open-ocean-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.ts"],"names":[],"mappings":";;;AACA,6EAA6E;AAC7E,gFAAgG;AAChG,uEAAmE;AACnE,yDAAsD;AAEtD,wEAAqE;AACrE,8EAA6E;AAM7E,MAAa,mBAAmB;IAOrB,MAAM,CAAC,KAAK,CAAC,cAAc,CAC9B,cAAqE,EACrE,OAAsC,EACtC,iBAAyB;QAEzB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAEpE,MAAM,aAAa,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC/C,GAAG,IAAI,CAAC,OAAO,OAAO,+CAAuB,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,EAChF;YACI,OAAO,EAAE,EAAE,MAAM,EAAE,8CAA8C,EAAE;YACnE,MAAM,EAAE;gBACJ,KAAK,EAAE,+CAAuB,CAAC,cAAc,CAAC,UAAU,CAAC;gBACzD,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;gBACpD,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC9C,MAAM,EAAE,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE;gBAC7C,iDAAiD;gBACjD,QAAQ,EAAE,iBAAkB,GAAG,GAAG;gBAClC,QAAQ,EAAE,cAAc;aAC3B;SACJ,CACJ,CAAC;QAEF,OAAO,aAAa,CAAC;IACzB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAC7B,cAAqE,EACrE,EAAoB,EACpB,aAAqB,EACrB,iBAAyB;QAEzB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAEpE,MAAM,YAAY,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC9C,GAAG,IAAI,CAAC,OAAO,OAAO,+CAAuB,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,EAC/E;YACI,OAAO,EAAE,EAAE,MAAM,EAAE,8CAA8C,EAAE;YACnE,MAAM,EAAE;gBACJ,KAAK,EAAE,+CAAuB,CAAC,cAAc,CAAC,UAAU,CAAC;gBACzD,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;gBACpD,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;gBACzC,MAAM,EAAE,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE;gBAC7C,QAAQ,EAAE,cAAc;gBACxB,QAAQ,EAAE,iBAAiB,GAAG,GAAG;gBACjC,OAAO,EAAE,aAAa;gBACtB,~~gDAAgD;gBAChD,~~QAAQ,EAAE,4CAA4C;aACzD;SACJ,CACJ,CAAC;QAEF,OAAO,YAAY,CAAC;IACxB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,eAAe,CAC/B,UAA+C;QAE/C,MAAM,iBAAiB,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACnD,GAAG,IAAI,CAAC,OAAO,eAAe,+CAAuB,CAAC,UAAU,CAAC,EAAE,EACnE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,8CAA8C,EAAE,EAAE,CAC1E,CAAC;QAEF,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAClC,cAAqE;QAErE,IAAI,cAAc,CAAC,UAAU,KAAK,iCAAe,CAAC,QAAQ,EAAE,CAAC;YACzD,OAAO,uCAAkB,CAAC;QAC9B,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,mBAAQ,CAAC,iBAAiB;aAC/C,aAAa,CAAC,cAAc,CAAC,UAAU,CAAC;aACxC,WAAW,EAAE,CAAC;QACnB,MAAM,cAAc,GAAG,oBAAQ,CAAC,OAAO,CACnC,WAAW,EACX,gCAAgB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,QAAQ,CACvD;aACI,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;aACrB,QAAQ,EAAE,CAAC;QAEhB,OAAO,cAAc,CAAC;IAC1B,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,KAAiB;QAC5C,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,IAAI,CAAC,sBAAsB,CAAC;QACvC,CAAC;QACD,OAAO,KAAK,CAAC,OAAO,CAAC;IACzB,CAAC;;~~AAtGL~~,~~kDAuGC~~;~~AAtGkB~~,4BAAQ,GAAG,uCAAuC,CAAC;AAEnD,2BAAO,GAAG,qCAAqC,CAAC;AAExC,0CAAsB,GAAG,4CAA4C,CAAC"}
1	+ {"version":3,"file":"open-ocean-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.ts"],"names":[],"mappings":"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"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/piteas/models/piteas-trade-struct.d.ts CHANGED Viewed

@@ -2,5 +2,4 @@ import { PiteasMethodParameters } from './piteas-quote';
 import { EvmOnChainTradeStruct } from '../../../common/on-chain-trade/evm-on-chain-trade/models/evm-on-chain-trade-struct';
 export interface PiteasTradeStruct extends EvmOnChainTradeStruct {
     methodParameters: PiteasMethodParameters;
-    gasUseEstimate: number;
 }

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

@@ -1,7 +1,6 @@
 import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { BlockchainName, EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
 import { OnChainTradeError } from '../../../models/on-chain-trade-error';
-import { PiteasTradeStruct } from './models/piteas-trade-struct';
 import { RequiredOnChainCalculationOptions } from '../../common/models/on-chain-calculation-options';
 import { AggregatorOnChainProvider } from '../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract';
 import { OnChainTrade } from '../../common/on-chain-trade/on-chain-trade';
@@ -11,5 +10,5 @@ export declare class PiteasProvider extends AggregatorOnChainProvider {
     readonly tradeType: "PITEAS";
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options?: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
-    protected getGasFeeInfo(tradeStruct: PiteasTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, gasLimit: number): Promise<GasFeeInfo | null>;
 }