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

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

@@ -1,23 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PiteasProvider = void 0;
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const tokens_1 = require("../../../../../../common/tokens");
 const options_1 = require("../../../../../../common/utils/options");
 const blockchain_id_1 = require("../../../../../../core/blockchain/utils/blockchains-info/constants/blockchain-id");
 const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
 const rubic_proxy_contract_address_1 = require("../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address");
 const piteas_on_chain_supported_blockchains_1 = require("./constants/piteas-on-chain-supported-blockchains");
-const piteas_router_address_1 = require("./constants/piteas-router-address");
 const piteas_api_service_1 = require("./piteas-api-service");
 const piteas_trade_1 = require("./piteas-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 evm_provider_default_options_1 = require("../../dexes/common/on-chain-provider/evm-on-chain-provider/constants/evm-provider-default-options");
+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");
 class PiteasProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
     constructor() {
@@ -63,22 +58,15 @@ class PiteasProvider extends aggregator_on_chain_provider_abstract_1.AggregatorO
                 to,
                 slippageTolerance: fullOptions.slippageTolerance,
                 path: [from, to],
-                gasFeeInfo: null,
+                gasFeeInfo: await this.getGasFeeInfo(from, gasUseEstimate),
                 useProxy: fullOptions.useProxy,
                 proxyFeeInfo,
                 fromWithoutFee,
                 withDeflation: fullOptions.withDeflation,
                 usedForCrossChain: fullOptions.usedForCrossChain,
-                methodParameters,
-                gasUseEstimate
+                methodParameters
             };
-            const gasFeeInfo = options?.gasCalculation === 'calculate'
-                ? await this.getGasFeeInfo(tradeStruct, piteas_router_address_1.piteasRouterAddress)
-                : null;
-            return new piteas_trade_1.PiteasTrade({
-                ...tradeStruct,
-                gasFeeInfo
-            }, fullOptions.providerAddress, quoteRequestParams);
+            return new piteas_trade_1.PiteasTrade(tradeStruct, fullOptions.providerAddress, quoteRequestParams);
         }
         catch (err) {
             return {
@@ -87,10 +75,9 @@ class PiteasProvider extends aggregator_on_chain_provider_abstract_1.AggregatorO
             };
         }
     }
-    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 piteas_trade_1.PiteasTrade.getGasLimit(tradeStruct, providerGateway, tradeStruct.methodParameters)) || new bignumber_js_1.default(tradeStruct.gasUseEstimate);
+            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/piteas/piteas-provider.js.map

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

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

@@ -1,13 +1,10 @@
-import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
-import { PiteasMethodParameters, PiteasQuoteRequestParams } from './models/piteas-quote';
+import { PiteasQuoteRequestParams } from './models/piteas-quote';
 import { PiteasTradeStruct } from './models/piteas-trade-struct';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
 import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
-import { EvmOnChainTradeStruct } from '../../common/on-chain-trade/evm-on-chain-trade/models/evm-on-chain-trade-struct';
 export declare class PiteasTrade extends AggregatorEvmOnChainTrade {
-    static getGasLimit(tradeStruct: EvmOnChainTradeStruct, providerGateway: string, methodParameters: PiteasMethodParameters): Promise<BigNumber | null>;
     readonly type: OnChainTradeType;
     readonly providerGateway = "0x6BF228eb7F8ad948d37deD07E595EfddfaAF88A6";
     private readonly quoteRequestParams;

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

@@ -2,35 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PiteasTrade = void 0;
 const errors_1 = require("../../../../../../common/errors");
-const injector_1 = require("../../../../../../core/injector/injector");
 const rubic_proxy_contract_address_1 = require("../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address");
 const piteas_router_address_1 = require("./constants/piteas-router-address");
 const piteas_api_service_1 = require("./piteas-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 PiteasTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
-    static async getGasLimit(tradeStruct, providerGateway, methodParameters) {
-        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: methodParameters.calldata,
-                value: methodParameters.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/piteas/piteas-trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"piteas-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/piteas/piteas-trade.ts"],"names":[],"mappings":";;;AACA,8CAAkD;AAElD,yDAAsD;AAEtD,uJAAiJ;AACjJ,kJAA6I;AAM7I,kIAA6H;AAC7H,+HAG+F;AAC/F,kLAAkK;AAIlK,MAAa,WAAY,SAAQ,kEAAyB;IAC/C,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,WAAkC,EAClC,eAAuB,EACvB,gBAAwC;QAExC,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC;QACnD,MAAM,aAAa,GACf,mBAAQ,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC;QACnF,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YAC5E,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,qBAAqB,CACnD,aAAa,EACb,eAAe,EACf;gBACI,IAAI,EAAE,gBAAgB,CAAC,QAAQ;gBAC/B,KAAK,EAAE,gBAAgB,CAAC,KAAK;aAChC,CACJ,CAAC;YAEF,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAQD,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,OAAO,2CAAmB,CAAC;IAC/B,CAAC;IAED,YACI,WAA8B,EAC9B,eAAuB,EACvB,kBAA4C;QAE5C,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QArBxB,SAAI,GAAqB,yCAAmB,CAAC,MAAM,CAAC;QAEpD,oBAAe,GAAG,2CAAmB,CAAC;QAqBlD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IACjD,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,UAAU,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAClD,MAAM,qCAAgB,CAAC,UAAU,CAAC;gBAC9B,GAAG,IAAI,CAAC,kBAAkB;gBAC1B,OAAO;aACV,CAAC,CAAC;YAEP,MAAM,EAAE,GAAoB;gBACxB,EAAE,EAAE,2CAAmB;gBACvB,IAAI,EAAE,gBAAgB,CAAC,QAAQ;gBAC/B,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,GAAG,EAAE,cAAc,CAAC,QAAQ,EAAE;aACjC,CAAC;YAEF,OAAO;gBACH,EAAE;gBACF,QAAQ,EAAE,UAAU;aACvB,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,YAAY,IAAI,KAAK,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;gBAC9C,MAAM,IAAI,sBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;YACD,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;AAzFD,kCAyFC"}
+{"version":3,"file":"piteas-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/piteas/piteas-trade.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAGlD,uJAAiJ;AACjJ,kJAA6I;AAG7I,kIAA6H;AAC7H,+HAG+F;AAC/F,kLAAkK;AAGlK,MAAa,WAAY,SAAQ,kEAAyB;IAOtD,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,OAAO,2CAAmB,CAAC;IAC/B,CAAC;IAED,YACI,WAA8B,EAC9B,eAAuB,EACvB,kBAA4C;QAE5C,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QArBxB,SAAI,GAAqB,yCAAmB,CAAC,MAAM,CAAC;QAEpD,oBAAe,GAAG,2CAAmB,CAAC;QAqBlD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IACjD,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,UAAU,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAClD,MAAM,qCAAgB,CAAC,UAAU,CAAC;gBAC9B,GAAG,IAAI,CAAC,kBAAkB;gBAC1B,OAAO;aACV,CAAC,CAAC;YAEP,MAAM,EAAE,GAAoB;gBACxB,EAAE,EAAE,2CAAmB;gBACvB,IAAI,EAAE,gBAAgB,CAAC,QAAQ;gBAC/B,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,GAAG,EAAE,cAAc,CAAC,QAAQ,EAAE;aACjC,CAAC;YAEF,OAAO;gBACH,EAAE;gBACF,QAAQ,EAAE,UAAU;aACvB,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,YAAY,IAAI,KAAK,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;gBAC9C,MAAM,IAAI,sBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;YACD,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;AAxDD,kCAwDC"}

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

@@ -3,12 +3,9 @@ import { BlockchainName, EvmBlockchainName } from '../../../../../../core/blockc
 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 { OnChainTrade } from '../../common/on-chain-trade/on-chain-trade';
-import { RangoOnChainTradeStruct } from './models/rango-on-chain-trade-types';
 export declare class RangoOnChainProvider extends AggregatorOnChainProvider {
     readonly tradeType: "RANGO";
     isSupportedBlockchain(blockchainName: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
-    protected getGasFeeInfo(tradeStruct: RangoOnChainTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
 }

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

@@ -11,8 +11,6 @@ const rango_supported_blockchains_1 = require("../../../../../common/providers/r
 const rango_parser_1 = require("../../../../../common/providers/rango/services/rango-parser");
 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 rango_on_chain_disabled_providers_1 = require("./models/rango-on-chain-disabled-providers");
 const rango_on_chain_trade_1 = require("./rango-on-chain-trade");
 const rango_on_chain_api_service_1 = require("./services/rango-on-chain-api-service");
@@ -47,21 +45,13 @@ class RangoOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggre
                 fromWithoutFee,
                 proxyFeeInfo,
                 toTokenWeiAmountMin,
-                gasFeeInfo: {
-                    gasLimit: undefined
-                },
+                gasFeeInfo: await this.getGasFeeInfo(),
                 slippageTolerance: options.slippageTolerance,
                 useProxy: options.useProxy,
                 withDeflation: options.withDeflation,
                 path
             };
-            const gasFeeInfo = options.gasCalculation === 'calculate'
-                ? await this.getGasFeeInfo(tradeStruct, providerGateway)
-                : null;
-            return new rango_on_chain_trade_1.RangoOnChainTrade({
-                ...tradeStruct,
-                gasFeeInfo
-            }, options.providerAddress, providerGateway);
+            return new rango_on_chain_trade_1.RangoOnChainTrade(tradeStruct, options.providerAddress, providerGateway);
         }
         catch (err) {
             return {
@@ -70,16 +60,6 @@ class RangoOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggre
             };
         }
     }
-    async getGasFeeInfo(tradeStruct, providerGateway) {
-        try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(tradeStruct.from.blockchain);
-            const gasLimit = await rango_on_chain_trade_1.RangoOnChainTrade.getGasLimit(tradeStruct, providerGateway);
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
-        }
-        catch {
-            return null;
-        }
-    }
 }
 exports.RangoOnChainProvider = RangoOnChainProvider;
 //# sourceMappingURL=rango-on-chain-provider.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"rango-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rango-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAEjE,iHAA8G;AAE9G,wHAGgF;AAChF,4FAA8F;AAI9F,iFAA8E;AAC9E,kIAAmH;AAEnH,kGAA+F;AAE/F,iEAA2D;AAC3D,sFAA+E;AAE/E,MAAa,oBAAqB,SAAQ,iEAAyB;IAAnE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,KAAK,CAAC;IA2D1D,CAAC;IAzDU,qBAAqB,CAAC,cAA8B;QACvD,OAAO,uDAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,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,UAAU,GAAG,MAAM,gCAAiB,CAAC,kBAAkB,CAAC,cAAc,EAAE,OAAO,EAAE;gBACnF,GAAG,OAAO;gBACV,aAAa,EAAE,qEAAiC;aACnD,CAAC,CAAC;YAEH,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,MAAM,mDAAsB,CAAC,kBAAkB,CACjE,UAAU,EACV,KAAK,CACR,CAAC;YACF,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,KAAuC,CAAC;YAElF,MAAM,eAAe,GACjB,EAAE,EAAE,IAAI;gBACR,+CAAsB,CAAC,IAAI,CAAC,UAAsC,CAAC,CAAC,eAAe,CAAC;YAExF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,YAAY,CAAC;aACzC,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,IAAI,sBAAS,CAAC,eAAe,CAAC,CAAC;YAE3D,MAAM,WAAW,GAA4B;gBACzC,IAAI;gBACJ,EAAE;gBACF,cAAc;gBACd,YAAY;gBACZ,mBAAmB;gBACnB,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;gBACtC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,IAAI;aACP,CAAC;YAEF,OAAO,IAAI,wCAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,EAAE,eAAgB,CAAC,CAAC;QACzF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,yCAAmB,CAAC,KAAK;gBAC/B,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;CACJ;AA5DD,oDA4DC"}

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

@@ -1,4 +1,3 @@
-import BigNumber from 'bignumber.js';
 import { PriceTokenAmount } from '../../../../../../common/tokens';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
@@ -6,7 +5,6 @@ import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggr
 import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 import { RangoOnChainTradeStruct } from './models/rango-on-chain-trade-types';
 export declare class RangoOnChainTrade extends AggregatorEvmOnChainTrade {
-    static getGasLimit(tradeStruct: RangoOnChainTradeStruct, providerGateway: string): Promise<BigNumber | null>;
     /**
      * approveTo address - used in this.web3Public.getAllowance() method
      */

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

@@ -3,20 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RangoOnChainTrade = void 0;
 const errors_1 = require("../../../../../../common/errors");
 const tokens_1 = require("../../../../../../common/tokens");
-const evm_web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
 const rango_parser_1 = require("../../../../../common/providers/rango/services/rango-parser");
 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 rango_on_chain_disabled_providers_1 = require("./models/rango-on-chain-disabled-providers");
 const rango_on_chain_api_service_1 = require("./services/rango-on-chain-api-service");
 class RangoOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
-    /* @internal */
-    static async getGasLimit(tradeStruct, providerGateway) {
-        const rangoTrade = new RangoOnChainTrade(tradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, providerGateway);
-        return (0, get_on_chain_gas_data_1.getOnChainGasData)(rangoTrade);
-    }
     get toTokenAmountMin() {
         return this._toTokenAmountMin;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"rango-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-trade.ts"],"names":[],"mappings":";;;AACA,8CAAkD;AAClD,8CAAqD;AACrD,6GAAwG;AAGxG,4FAA8F;AAC9F,uJAAiJ;AACjJ,iHAA0G;AAE1G,iFAAgG;AAChG,oIAAoH;AAEpH,kGAA+F;AAE/F,sFAA+E;AAE/E,MAAa,iBAAkB,SAAQ,kEAAyB;IAC5D,eAAe;IACR,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,WAAoC,EACpC,eAAuB;QAEvB,MAAM,UAAU,GAAG,IAAI,iBAAiB,CACpC,WAAW,EACX,2BAAW,CAAC,aAAa,EACzB,eAAe,CAClB,CAAC;QAEF,OAAO,IAAA,yCAAiB,EAAC,UAAU,CAAC,CAAC;IACzC,CAAC;IAWD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,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,IAAW,kBAAkB;QACzB,MAAM,IAAI,sBAAa,CAAC,+CAA+C,CAAC,CAAC;IAC7E,CAAC;IAED,YACI,WAAoC,EACpC,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAvBxB,SAAI,GAAqB,yCAAmB,CAAC,KAAK,CAAC;QAyB/D,IAAI,CAAC,iBAAiB,GAAG,IAAI,yBAAgB,CAAC;YAC1C,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ;YACnB,SAAS,EAAE,WAAW,CAAC,mBAAmB;SAC7C,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,MAAM,GAAG,MAAM,gCAAiB,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;YACpF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa;YAC9D,aAAa,EAAE,qEAAiC;YAChD,WAAW,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,MAAM,mDAAsB,CAAC,kBAAkB,CAC9E,MAAM,EACN,IAAI,CACP,CAAC;QAEF,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,KAAuC,CAAC;QAE3E,OAAO;YACH,EAAE,EAAE;gBACA,IAAI,EAAE,WAAY,CAAC,MAAO;gBAC1B,EAAE,EAAE,WAAY,CAAC,IAAK;gBACtB,KAAK,EAAE,WAAY,CAAC,KAAK,IAAI,GAAG;gBAChC,GAAG,EAAE,WAAY,CAAC,QAAQ,IAAI,SAAS;gBACvC,QAAQ,EAAE,WAAY,CAAC,QAAQ,IAAI,SAAS;aAC/C;YACD,QAAQ;SACX,CAAC;IACN,CAAC;CACJ;AAjFD,8CAiFC"}
+{"version":3,"file":"rango-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-trade.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAClD,8CAAqD;AAGrD,4FAA8F;AAC9F,uJAAiJ;AAEjJ,iFAAgG;AAChG,oIAAoH;AAEpH,kGAA+F;AAE/F,sFAA+E;AAE/E,MAAa,iBAAkB,SAAQ,kEAAyB;IAU5D,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,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,IAAW,kBAAkB;QACzB,MAAM,IAAI,sBAAa,CAAC,+CAA+C,CAAC,CAAC;IAC7E,CAAC;IAED,YACI,WAAoC,EACpC,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAvBxB,SAAI,GAAqB,yCAAmB,CAAC,KAAK,CAAC;QAyB/D,IAAI,CAAC,iBAAiB,GAAG,IAAI,yBAAgB,CAAC;YAC1C,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ;YACnB,SAAS,EAAE,WAAW,CAAC,mBAAmB;SAC7C,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,MAAM,GAAG,MAAM,gCAAiB,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;YACpF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa;YAC9D,aAAa,EAAE,qEAAiC;YAChD,WAAW,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,MAAM,mDAAsB,CAAC,kBAAkB,CAC9E,MAAM,EACN,IAAI,CACP,CAAC;QAEF,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,KAAuC,CAAC;QAE3E,OAAO;YACH,EAAE,EAAE;gBACA,IAAI,EAAE,WAAY,CAAC,MAAO;gBAC1B,EAAE,EAAE,WAAY,CAAC,IAAK;gBACtB,KAAK,EAAE,WAAY,CAAC,KAAK,IAAI,GAAG;gBAChC,GAAG,EAAE,WAAY,CAAC,QAAQ,IAAI,SAAS;gBACvC,QAAQ,EAAE,WAAY,CAAC,QAAQ,IAAI,SAAS;aAC/C;YACD,QAAQ;SACX,CAAC;IACN,CAAC;CACJ;AAnED,8CAmEC"}

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

@@ -1,15 +1,15 @@
 import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { BlockchainName, EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
+import { SquidrouterTransactionResponse } from '../../../../../common/providers/squidrouter/models/transaction-response';
 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 { OnChainTrade } from '../../common/on-chain-trade/on-chain-trade';
-import { SquidRouterOnChainTradeStruct } from './models/squidrouter-on-chain-trade-struct';
 export declare class SquidRouterOnChainProvider extends AggregatorOnChainProvider {
     readonly tradeType: "SQUIDROUTER";
     private readonly nativeAddress;
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
-    protected getGasFeeInfo(tradeStruct: SquidRouterOnChainTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, route: SquidrouterTransactionResponse['route']): Promise<GasFeeInfo | null>;
 }

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

@@ -56,15 +56,9 @@ class SquidRouterOnChainProvider extends aggregator_on_chain_provider_abstract_1
                 usedForCrossChain: options.usedForCrossChain,
                 withDeflation: options.withDeflation,
                 fromWithoutFee,
-                gasFeeInfo: null
+                gasFeeInfo: await this.getGasFeeInfo(from, route)
             };
-            const gasFeeInfo = options.gasCalculation === 'calculate'
-                ? await this.getGasFeeInfo(tradeStruct, providerGateway)
-                : null;
-            return new squidrouter_on_chain_trade_1.SquidRouterOnChainTrade({
-                ...tradeStruct,
-                gasFeeInfo
-            }, options.providerAddress, providerGateway);
+            return new squidrouter_on_chain_trade_1.SquidRouterOnChainTrade(tradeStruct, options.providerAddress, providerGateway);
         }
         catch (err) {
             return {
@@ -73,10 +67,10 @@ class SquidRouterOnChainProvider extends aggregator_on_chain_provider_abstract_1
             };
         }
     }
-    async getGasFeeInfo(tradeStruct, providerGateway) {
+    async getGasFeeInfo(from, route) {
         try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(tradeStruct.from.blockchain);
-            const gasLimit = await squidrouter_on_chain_trade_1.SquidRouterOnChainTrade.getGasLimit(tradeStruct, providerGateway);
+            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(from.blockchain);
+            const gasLimit = route.transactionRequest.gasLimit;
             return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
         }
         catch {

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

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

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

@@ -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 { SquidRouterOnChainTradeStruct } from './models/squidrouter-on-chain-trade-struct';
 export declare class SquidRouterOnChainTrade extends AggregatorEvmOnChainTrade {
-    static getGasLimit(tradeStruct: SquidRouterOnChainTradeStruct, providerGateway: string): Promise<BigNumber | null>;
     readonly type: "SQUIDROUTER";
     private readonly requestParams;
     readonly providerGateway: string;

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

@@ -1,17 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SquidRouterOnChainTrade = void 0;
-const evm_web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
 const squidrouter_api_service_1 = require("../../../../../common/providers/squidrouter/services/squidrouter-api-service");
 const squidrouter_contract_address_1 = require("../../../../../cross-chain/calculation-manager/providers/squidrouter-provider/constants/squidrouter-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");
 class SquidRouterOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
-    static async getGasLimit(tradeStruct, providerGateway) {
-        const trade = new SquidRouterOnChainTrade(tradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, providerGateway);
-        return (0, get_on_chain_gas_data_1.getOnChainGasData)(trade);
-    }
     get dexContractAddress() {
         const fromBlockchain = this.from.blockchain;
         return squidrouter_contract_address_1.SquidrouterContractAddress[fromBlockchain].providerRouter;

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

@@ -1 +1 @@
-{"version":3,"file":"squidrouter-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/squidrouter/squidrouter-on-chain-trade.ts"],"names":[],"mappings":";;;AACA,6GAAwG;AAGxG,wHAAmH;AACnH,qKAAgK;AAGhK,gFAAyE;AACzE,iFAA8E;AAC9E,oIAAoH;AAIpH,MAAa,uBAAwB,SAAQ,kEAAyB;IAC3D,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,WAA0C,EAC1C,eAAuB;QAEvB,MAAM,KAAK,GAAG,IAAI,uBAAuB,CACrC,WAAW,EACX,2BAAW,CAAC,aAAa,EACzB,eAAe,CAClB,CAAC;QAEF,OAAO,IAAA,yCAAiB,EAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAUD,IAAW,kBAAkB;QACzB,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAsD,CAAC;QACxF,OAAO,yDAA0B,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC;IACrE,CAAC;IAED,YACI,WAA0C,EAC1C,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAlBxB,SAAI,GAAG,yCAAmB,CAAC,WAAW,CAAC;QAmBnD,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,kBAAkB,CAAC;QAEpD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,aAAa,GAAkC;YACjD,GAAG,IAAI,CAAC,aAAa;YACrB,SAAS,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa;SAC3D,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,+CAAqB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAChE,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;QAExB,OAAO;YACH,EAAE,EAAE;gBACA,IAAI,EAAE,KAAK,CAAC,kBAAkB,CAAC,IAAI;gBACnC,KAAK,EAAE,KAAK,CAAC,kBAAkB,CAAC,KAAK;gBACrC,EAAE,EAAE,KAAK,CAAC,kBAAkB,CAAC,MAAM;aACtC;YACD,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ;SACpC,CAAC;IACN,CAAC;CACJ;AA3DD,0DA2DC"}
+{"version":3,"file":"squidrouter-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/squidrouter/squidrouter-on-chain-trade.ts"],"names":[],"mappings":";;;AAEA,wHAAmH;AACnH,qKAAgK;AAGhK,iFAA8E;AAC9E,oIAAoH;AAIpH,MAAa,uBAAwB,SAAQ,kEAAyB;IASlE,IAAW,kBAAkB;QACzB,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAsD,CAAC;QACxF,OAAO,yDAA0B,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC;IACrE,CAAC;IAED,YACI,WAA0C,EAC1C,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAlBxB,SAAI,GAAG,yCAAmB,CAAC,WAAW,CAAC;QAmBnD,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,kBAAkB,CAAC;QAEpD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,aAAa,GAAkC;YACjD,GAAG,IAAI,CAAC,aAAa;YACrB,SAAS,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa;SAC3D,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,+CAAqB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAChE,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;QAExB,OAAO;YACH,EAAE,EAAE;gBACA,IAAI,EAAE,KAAK,CAAC,kBAAkB,CAAC,IAAI;gBACnC,KAAK,EAAE,KAAK,CAAC,kBAAkB,CAAC,KAAK;gBACrC,EAAE,EAAE,KAAK,CAAC,kBAAkB,CAAC,MAAM;aACtC;YACD,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ;SACpC,CAAC;IACN,CAAC;CACJ;AA9CD,0DA8CC"}

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

@@ -3,12 +3,9 @@ import { BlockchainName } from '../../../../../../core/blockchain/models/blockch
 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 { OnChainTrade } from '../../common/on-chain-trade/on-chain-trade';
-import { SymbiosisTradeStruct } from './models/symbiosis-on-chain-trade-types';
 export declare class SymbiosisOnChainProvider extends AggregatorOnChainProvider {
     readonly tradeType: "SYMBIOSIS_SWAP";
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<BlockchainName>, toToken: PriceToken<BlockchainName>, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
-    protected getGasFeeInfo(tradeStruct: SymbiosisTradeStruct, providerGateway: string): Promise<GasFeeInfo | null>;
 }

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

@@ -10,8 +10,6 @@ const symbiosis_api_service_1 = require("../../../../../common/providers/symbios
 const symbiosis_parser_1 = require("../../../../../common/providers/symbiosis/services/symbiosis-parser");
 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 symbiosis_on_chain_supported_blockchains_1 = require("./models/symbiosis-on-chain-supported-blockchains");
 const symbiosis_on_chain_trade_1 = require("./symbiosis-on-chain-trade");
 class SymbiosisOnChainProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
@@ -62,16 +60,6 @@ class SymbiosisOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
             };
         }
     }
-    async getGasFeeInfo(tradeStruct, providerGateway) {
-        try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(tradeStruct.from.blockchain);
-            const gasLimit = await symbiosis_on_chain_trade_1.SymbiosisOnChainTrade.getGasLimit(tradeStruct, providerGateway);
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
-        }
-        catch {
-            return null;
-        }
-    }
 }
 exports.SymbiosisOnChainProvider = SymbiosisOnChainProvider;
 //# sourceMappingURL=symbiosis-on-chain-provider.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"symbiosis-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/symbiosis/symbiosis-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAEjE,kHAA6G;AAC7G,wGAAoG;AAIpG,iFAA8E;AAC9E,kIAAmH;AAGnH,0EAAoE;AACpE,8EAAwE;AACxE,gHAAyG;AAEzG,yEAAmE;AAEnE,MAAa,wBAAyB,SAAQ,iEAAyB;IAAvE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,cAAc,CAAC;IA2EnE,CAAC;IAzEU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,+EAAoC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;IACpF,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAsC,EACtC,OAAmC,EACnC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACvF,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE9C,MAAM,QAAQ,GAAG,MAAM,kCAAe,CAAC,kBAAkB,CAAC,cAAc,EAAE,OAAO,EAAE;gBAC/E,QAAQ,EAAE,OAAO,CAAC,iBAAiB;aACtC,CAAC,CAAC;YACH,MAAM,EACF,SAAS,EAAE,eAAe,EAC1B,cAAc,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAC5C,GAAG,MAAM,2CAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAEzD,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,aAAa,CAAC;aAC1C,CAAC,CAAC;YAEH,MAAM,WAAW,GAAyB;gBACtC,IAAI,EAAE,IAA2C;gBACjD,EAAE,EAAE,EAAyC;gBAC7C,cAAc,EAAE,cAAqD;gBACrE,YAAY;gBACZ,UAAU,EAAE;oBACR,QAAQ,EAAE,SAAS;iBACtB;gBACD,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,IAAI;aACP,CAAC;YAEF,MAAM,UAAU,GACZ,OAAO,CAAC,cAAc,KAAK,WAAW;gBAClC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,eAAe,CAAC;gBACxD,CAAC,CAAC,IAAI,CAAC;YAEf,OAAO,IAAI,gDAAqB,CAC5B;gBACI,GAAG,WAAW;gBACd,UAAU;aACb,EACD,OAAO,CAAC,eAAe,EACvB,eAAe,CAClB,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,yCAAmB,CAAC,cAAc;gBACxC,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAES,KAAK,CAAC,aAAa,CACzB,WAAiC,EACjC,eAAuB;QAEvB,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,MAAM,gDAAqB,CAAC,WAAW,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YACvF,OAAO,IAAA,gCAAa,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;AA5ED,4DA4EC"}
+{"version":3,"file":"symbiosis-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/symbiosis/symbiosis-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAEjE,kHAA6G;AAC7G,wGAAoG;AAIpG,iFAA8E;AAC9E,kIAAmH;AAEnH,gHAAyG;AAEzG,yEAAmE;AAEnE,MAAa,wBAAyB,SAAQ,iEAAyB;IAAvE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,cAAc,CAAC;IA8DnE,CAAC;IA5DU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,+EAAoC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;IACpF,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAsC,EACtC,OAAmC,EACnC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACvF,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE9C,MAAM,QAAQ,GAAG,MAAM,kCAAe,CAAC,kBAAkB,CAAC,cAAc,EAAE,OAAO,EAAE;gBAC/E,QAAQ,EAAE,OAAO,CAAC,iBAAiB;aACtC,CAAC,CAAC;YACH,MAAM,EACF,SAAS,EAAE,eAAe,EAC1B,cAAc,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAC5C,GAAG,MAAM,2CAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAEzD,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,aAAa,CAAC;aAC1C,CAAC,CAAC;YAEH,MAAM,WAAW,GAAyB;gBACtC,IAAI,EAAE,IAA2C;gBACjD,EAAE,EAAE,EAAyC;gBAC7C,cAAc,EAAE,cAAqD;gBACrE,YAAY;gBACZ,UAAU,EAAE;oBACR,QAAQ,EAAE,SAAS;iBACtB;gBACD,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,IAAI;aACP,CAAC;YAEF,MAAM,UAAU,GACZ,OAAO,CAAC,cAAc,KAAK,WAAW;gBAClC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,eAAe,CAAC;gBACxD,CAAC,CAAC,IAAI,CAAC;YAEf,OAAO,IAAI,gDAAqB,CAC5B;gBACI,GAAG,WAAW;gBACd,UAAU;aACb,EACD,OAAO,CAAC,eAAe,EACvB,eAAe,CAClB,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,yCAAmB,CAAC,cAAc;gBACxC,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;CACJ;AA/DD,4DA+DC"}

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

@@ -1,11 +1,9 @@
-import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 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';
 import { SymbiosisTradeStruct } from './models/symbiosis-on-chain-trade-types';
 export declare class SymbiosisOnChainTrade extends AggregatorEvmOnChainTrade {
-    static getGasLimit(tradeStruct: SymbiosisTradeStruct, providerGateway: string): Promise<BigNumber | null>;
     readonly type: OnChainTradeType;
     readonly providerGateway: string;
     protected get spenderAddress(): string;

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

@@ -2,19 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SymbiosisOnChainTrade = 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 symbiosis_api_service_1 = require("../../../../../common/providers/symbiosis/services/symbiosis-api-service");
 const symbiosis_parser_1 = require("../../../../../common/providers/symbiosis/services/symbiosis-parser");
 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");
 class SymbiosisOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
-    /* @internal */
-    static async getGasLimit(tradeStruct, providerGateway) {
-        const symbiosisTrade = new SymbiosisOnChainTrade(tradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, providerGateway);
-        return (0, get_on_chain_gas_data_1.getOnChainGasData)(symbiosisTrade);
-    }
     get spenderAddress() {
         return this.useProxy
             ? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway

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

@@ -1 +1 @@
-{"version":3,"file":"symbiosis-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/symbiosis/symbiosis-on-chain-trade.ts"],"names":[],"mappings":";;;AACA,8CAAkD;AAClD,6GAAwG;AAExG,kHAA6G;AAC7G,wGAAoG;AACpG,uJAAiJ;AACjJ,iHAA0G;AAE1G,iFAAgG;AAChG,oIAAoH;AAIpH,MAAa,qBAAsB,SAAQ,kEAAyB;IAChE,eAAe;IACR,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,WAAiC,EACjC,eAAuB;QAEvB,MAAM,cAAc,GAAG,IAAI,qBAAqB,CAC5C,WAAW,EACX,2BAAW,CAAC,aAAa,EACzB,eAAe,CAClB,CAAC;QAEF,OAAO,IAAA,yCAAiB,EAAC,cAAc,CAAC,CAAC;IAC7C,CAAC;IAMD,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,YACI,WAAiC,EACjC,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAnBxB,SAAI,GAAqB,yCAAmB,CAAC,cAAc,CAAC;QAqBxE,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAED,oFAAoF;IAC1E,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,WAAW,GAAG,MAAM,kCAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YAC7E,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,WAAW,EAAE,IAAI,CAAC,aAAa;YAC/B,QAAQ,EAAE,IAAI,CAAC,iBAAiB;SACnC,CAAC,CAAC;QAEH,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,MAAM,2CAAmB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAEvF,OAAO;YACH,EAAE;YACF,QAAQ,EAAE,cAAc,CAAC,MAAM;SAClC,CAAC;IACN,CAAC;CACJ;AAxDD,sDAwDC"}
+{"version":3,"file":"symbiosis-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/symbiosis/symbiosis-on-chain-trade.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,kHAA6G;AAC7G,wGAAoG;AACpG,uJAAiJ;AAEjJ,iFAAgG;AAChG,oIAAoH;AAIpH,MAAa,qBAAsB,SAAQ,kEAAyB;IAKhE,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,YACI,WAAiC,EACjC,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAnBxB,SAAI,GAAqB,yCAAmB,CAAC,cAAc,CAAC;QAqBxE,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAED,oFAAoF;IAC1E,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,WAAW,GAAG,MAAM,kCAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YAC7E,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,WAAW,EAAE,IAAI,CAAC,aAAa;YAC/B,QAAQ,EAAE,IAAI,CAAC,iBAAiB;SACnC,CAAC,CAAC;QAEH,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,MAAM,2CAAmB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAEvF,OAAO;YACH,EAAE;YACF,QAAQ,EAAE,cAAc,CAAC,MAAM;SAClC,CAAC;IACN,CAAC;CACJ;AA1CD,sDA0CC"}

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

@@ -1,16 +1,16 @@
 import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { BlockchainName, EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
-import { LifiEvmOnChainTradeStruct } from '../lifi/models/lifi-trade-struct';
+import { XyRoute } from '../../../../../common/providers/xy/models/xy-quote-success-response';
 import { XyDexTrade } from './xy-dex-trade';
 import { OnChainCalculationOptions } 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 { OnChainTradeError } from '../../../models/on-chain-trade-error';
+import { GasFeeInfo } from '../../common/on-chain-trade/evm-on-chain-trade/models/gas-fee-info';
 export declare class XyDexProvider extends AggregatorOnChainProvider {
     private readonly defaultOptions;
     readonly tradeType: "XY_DEX";
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options?: OnChainCalculationOptions): Promise<XyDexTrade | OnChainTradeError>;
     private getTradeInfo;
-    protected getGasFeeInfo(lifiTradeStruct: LifiEvmOnChainTradeStruct): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, route: XyRoute): Promise<GasFeeInfo | null>;
 }

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

@@ -17,10 +17,9 @@ const xy_supported_blockchains_1 = require("../../../../../cross-chain/calculati
 const xy_dex_trade_1 = require("./xy-dex-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 evm_provider_default_options_1 = require("../../dexes/common/on-chain-provider/evm-on-chain-provider/constants/evm-provider-default-options");
 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 lifi_evm_on_chain_trade_1 = require("../lifi/chains/lifi-evm-on-chain-trade");
 class XyDexProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
     constructor() {
         super(...arguments);
@@ -96,16 +95,16 @@ class XyDexProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOn
             throw new errors_1.NotSupportedTokensError();
         }
         return {
+            gasInfo: await this.getGasFeeInfo(from, bestRoute),
             toTokenAmountInWei: new bignumber_js_1.default(bestRoute.dstQuoteTokenAmount),
-            estimatedGas: bestRoute.estimatedGas,
             contractAddress: bestRoute.contractAddress,
             provider: bestRoute.srcSwapDescription.provider
         };
     }
-    async getGasFeeInfo(lifiTradeStruct) {
+    async getGasFeeInfo(from, route) {
         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);
+            const gasLimit = route.estimatedGas;
             return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
         }
         catch {

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

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

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

@@ -1,10 +1,10 @@
 import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { BlockchainName, EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
-import { LifiEvmOnChainTradeStruct } from '../lifi/models/lifi-trade-struct';
 import { ZrxTrade } from './zrx-trade';
 import { OnChainCalculationOptions } 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 { ZrxQuoteResponse } from './models/zrx-types';
 export declare class ZrxProvider extends AggregatorOnChainProvider {
     private readonly defaultOptions;
     isSupportedBlockchain(blockchain: BlockchainName): boolean;
@@ -13,5 +13,5 @@ export declare class ZrxProvider extends AggregatorOnChainProvider {
     /**
      * Fetches zrx data from api.
      */
-    protected getGasFeeInfo(lifiTradeStruct: LifiEvmOnChainTradeStruct): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(from: PriceTokenAmount<EvmBlockchainName>, quote: ZrxQuoteResponse): Promise<GasFeeInfo | null>;
 }