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

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

@@ -1,8 +1,10 @@
+import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
 import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 import { 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,11 +1,17 @@
 "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":";;;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"}
+{"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"}

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

@@ -56,9 +56,9 @@ class StonfiOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggr
         }
     }
     getGasFeeInfo(tradeStruct) {
-        const totalGas = (0, get_stonfi_gas_1.getStonfiTotalGas)(tradeStruct.from, tradeStruct.to);
         return Promise.resolve({
-            totalGas: new bignumber_js_1.default(totalGas)
+            gasPrice: new bignumber_js_1.default(1),
+            gasLimit: (0, get_stonfi_gas_1.getStonfiGasLimit)(tradeStruct.from, tradeStruct.to)
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"stonfi-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/stonfi/stonfi-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,gFAIoD;AAKpD,iFAA8E;AAC9E,kIAAmH;AAInH,sEAAiE;AACjE,mEAA6D;AAC7D,2DAA2D;AAE3D,MAAa,qBAAsB,SAAQ,iEAAyB;IAApE;;QACW,cAAS,GAAG,yCAAmB,CAAC,MAAM,CAAC;IA0DlD,CAAC;IAxDU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,UAAU,KAAK,iCAAe,CAAC,GAAG,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,qCAAgB,CAAC,gBAAgB,CAC5D,IAAI,EACJ,OAAO,EACP,OAAO,CAAC,iBAAiB,CAC5B,CAAC;YACF,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,GAAG;gBAChB;oBACI,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,IAAI,CAAC,SAAS;oBACxB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;iBACnB;aACW,CAAC;YAEjB,MAAM,WAAW,GAAG;gBAChB,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE,IAAI;gBAChB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,iBAAiB,EAAE,KAAK;gBACxB,WAAW;gBACX,iBAAiB,EAAE,KAAK;aACF,CAAC;YAC3B,WAAW,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAE/D,OAAO,IAAI,0CAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QACxE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAES,aAAa,CAAC,WAAkC;QACtD,MAAM,QAAQ,GAAG,IAAA,kCAAiB,EAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACrE,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,QAAQ,EAAE,IAAI,sBAAS,CAAC,QAAQ,CAAC;SACpC,CAAC,CAAC;IACP,CAAC;CACJ;AA3DD,sDA2DC"}
+{"version":3,"file":"stonfi-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/stonfi/stonfi-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,gFAIoD;AAKpD,iFAA8E;AAC9E,kIAAmH;AAInH,sEAAiE;AACjE,mEAA6D;AAC7D,2DAA2D;AAE3D,MAAa,qBAAsB,SAAQ,iEAAyB;IAApE;;QACW,cAAS,GAAG,yCAAmB,CAAC,MAAM,CAAC;IA0DlD,CAAC;IAxDU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,UAAU,KAAK,iCAAe,CAAC,GAAG,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,qCAAgB,CAAC,gBAAgB,CAC5D,IAAI,EACJ,OAAO,EACP,OAAO,CAAC,iBAAiB,CAC5B,CAAC;YACF,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,GAAG;gBAChB;oBACI,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,IAAI,CAAC,SAAS;oBACxB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;iBACnB;aACW,CAAC;YAEjB,MAAM,WAAW,GAAG;gBAChB,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE,IAAI;gBAChB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,iBAAiB,EAAE,KAAK;gBACxB,WAAW;gBACX,iBAAiB,EAAE,KAAK;aACF,CAAC;YAC3B,WAAW,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAE/D,OAAO,IAAI,0CAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QACxE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAES,aAAa,CAAC,WAAkC;QACtD,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,QAAQ,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;YAC1B,QAAQ,EAAE,IAAA,kCAAiB,EAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;SAChE,CAAC,CAAC;IACP,CAAC;CACJ;AA3DD,sDA2DC"}

package/lib/features/on-chain/calculation-manager/providers/aggregators/stonfi/utils/get-stonfi-gas.d.ts

@@ -1,5 +1,3 @@
+import BigNumber from 'bignumber.js';
 import { Token } from '../../../../../../../common/tokens';
-/**
- * @returns wei total gas
- */
-export declare function getStonfiTotalGas(from: Token, to: Token): string;
+export declare function getStonfiGasLimit(from: Token, to: Token): BigNumber;

package/lib/features/on-chain/calculation-manager/providers/aggregators/stonfi/utils/get-stonfi-gas.js

@@ -1,16 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStonfiTotalGas = getStonfiTotalGas;
-const native_tokens_1 = require("../../../../../../../common/tokens/constants/native-tokens");
-const web3_pure_1 = require("../../../../../../../core/blockchain/web3-pure/web3-pure");
-/**
- * @returns wei total gas
- */
-function getStonfiTotalGas(from, to) {
+exports.getStonfiGasLimit = getStonfiGasLimit;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+function getStonfiGasLimit(from, to) {
     if (from.isNative)
-        return web3_pure_1.Web3Pure.toWei(0.185, native_tokens_1.nativeTokensList.TON.decimals);
+        return new bignumber_js_1.default(0.185);
     if (to.isNative)
-        return web3_pure_1.Web3Pure.toWei(0.17, native_tokens_1.nativeTokensList.TON.decimals);
-    return web3_pure_1.Web3Pure.toWei(0.22, native_tokens_1.nativeTokensList.TON.decimals);
+        return new bignumber_js_1.default(0.17);
+    return new bignumber_js_1.default(0.22);
 }
 //# sourceMappingURL=get-stonfi-gas.js.map

package/lib/features/on-chain/calculation-manager/providers/aggregators/stonfi/utils/get-stonfi-gas.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-stonfi-gas.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/stonfi/utils/get-stonfi-gas.ts"],"names":[],"mappings":";;AAOA,8CAIC;AAVD,6EAA6E;AAC7E,uEAAmE;AAEnE;;GAEG;AACH,SAAgB,iBAAiB,CAAC,IAAW,EAAE,EAAS;IACpD,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,oBAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,gCAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/E,IAAI,EAAE,CAAC,QAAQ;QAAE,OAAO,oBAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,gCAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5E,OAAO,oBAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,gCAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"get-stonfi-gas.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/stonfi/utils/get-stonfi-gas.ts"],"names":[],"mappings":";;;;;AAGA,8CAIC;AAPD,gEAAqC;AAGrC,SAAgB,iBAAiB,CAAC,IAAW,EAAE,EAAS;IACpD,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,sBAAS,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,EAAE,CAAC,QAAQ;QAAE,OAAO,IAAI,sBAAS,CAAC,IAAI,CAAC,CAAC;IAC5C,OAAO,IAAI,sBAAS,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC"}

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

@@ -3,9 +3,12 @@ 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,6 +10,8 @@ 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 {
@@ -45,9 +47,12 @@ class SymbiosisOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
                 withDeflation: options.withDeflation,
                 path
             };
+            const gasFeeInfo = options.gasCalculation === 'calculate'
+                ? await this.getGasFeeInfo(tradeStruct, providerGateway)
+                : null;
             return new symbiosis_on_chain_trade_1.SymbiosisOnChainTrade({
                 ...tradeStruct,
-                gasFeeInfo: await this.getGasFeeInfo()
+                gasFeeInfo
             }, options.providerAddress, providerGateway);
         }
         catch (err) {
@@ -57,6 +62,16 @@ 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;AAEnH,gHAAyG;AAEzG,yEAAmE;AAEnE,MAAa,wBAAyB,SAAQ,iEAAyB;IAAvE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,cAAc,CAAC;IAyDnE,CAAC;IAvDU,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,OAAO,IAAI,gDAAqB,CAC5B;gBACI,GAAG,WAAW;gBACd,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;aACzC,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;AA1DD,4DA0DC"}
+{"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"}

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

@@ -1,9 +1,11 @@
+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,12 +2,19 @@
 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":";;;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"}
+{"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"}

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

@@ -3,9 +3,11 @@ import { BlockchainName, TonBlockchainName } 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';
 export declare class ToncoOnChainProvider extends AggregatorOnChainProvider {
     readonly tradeType: "TONCO_DEX";
     isSupportedBlockchain(blockchain: BlockchainName): blockchain is TonBlockchainName;
     calculate(from: PriceTokenAmount<TonBlockchainName>, toToken: PriceToken<TonBlockchainName>, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
+    protected getGasFeeInfo(): Promise<GasFeeInfo | null>;
 }

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

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToncoOnChainProvider = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const tokens_1 = require("../../../../../../common/tokens");
-const native_tokens_1 = require("../../../../../../common/tokens/constants/native-tokens");
 const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
-const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
 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 tonco_sdk_facade_1 = require("./services/tonco-sdk-facade");
@@ -29,8 +27,7 @@ class ToncoOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggre
                 ...toToken.asStruct,
                 weiAmount: amountOutWei
             });
-            const totalGasNonWei = await tonco_sdk_facade_1.ToncoSdkFacade.estimateGas(params, from.weiAmount, to.weiAmountMinusSlippage(options.slippageTolerance));
-            const totalGas = new bignumber_js_1.default(web3_pure_1.Web3Pure.toWei(totalGasNonWei, native_tokens_1.nativeTokensList.TON.decimals));
+            const gasLimit = await tonco_sdk_facade_1.ToncoSdkFacade.estimateGas(params, from.weiAmount, to.weiAmountMinusSlippage(options.slippageTolerance));
             const routingPath = [
                 {
                     type: 'on-chain',
@@ -41,7 +38,10 @@ class ToncoOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggre
             const tradeStruct = {
                 from,
                 to,
-                gasFeeInfo: { totalGas },
+                gasFeeInfo: {
+                    gasPrice: new bignumber_js_1.default(1),
+                    gasLimit
+                },
                 slippageTolerance: options.slippageTolerance,
                 useProxy: false,
                 withDeflation: options.withDeflation,
@@ -59,6 +59,9 @@ class ToncoOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggre
             };
         }
     }
+    getGasFeeInfo() {
+        return Promise.resolve(null);
+    }
 }
 exports.ToncoOnChainProvider = ToncoOnChainProvider;
 //# sourceMappingURL=tonco-on-chain-provider.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tonco-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonco/tonco-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,6EAA6E;AAC7E,gFAIoD;AACpD,uEAAmE;AAKnE,iFAA8E;AAC9E,kIAAmH;AAGnH,kEAA6D;AAC7D,iEAA2D;AAE3D,MAAa,oBAAqB,SAAQ,iEAAyB;IAAnE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,SAAS,CAAC;IA0D9D,CAAC;IAxDU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,UAAU,KAAK,iCAAe,CAAC,GAAG,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,iCAAc,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACrE,MAAM,YAAY,GAAG,MAAM,iCAAc,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAE3E,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,YAAY;aAC1B,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,MAAM,iCAAc,CAAC,WAAW,CACnD,MAAM,EACN,IAAI,CAAC,SAAS,EACd,EAAE,CAAC,sBAAsB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CACvD,CAAC;YACF,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAC1B,oBAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,gCAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAChE,CAAC;YAEF,MAAM,WAAW,GAAG;gBAChB;oBACI,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,IAAI,CAAC,SAAS;oBACxB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;iBACnB;aACW,CAAC;YAEjB,MAAM,WAAW,GAAG;gBAChB,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE,EAAE,QAAQ,EAAE;gBACxB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,iBAAiB,EAAE,KAAK;gBACxB,WAAW;gBACX,iBAAiB,EAAE,KAAK;gBACxB,MAAM;aACkB,CAAC;YAE7B,OAAO,IAAI,wCAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;CACJ;AA3DD,oDA2DC"}
+{"version":3,"file":"tonco-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonco/tonco-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,gFAIoD;AAKpD,iFAA8E;AAC9E,kIAAmH;AAInH,kEAA6D;AAC7D,iEAA2D;AAE3D,MAAa,oBAAqB,SAAQ,iEAAyB;IAAnE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,SAAS,CAAC;IA8D9D,CAAC;IA5DU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,UAAU,KAAK,iCAAe,CAAC,GAAG,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,iCAAc,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACrE,MAAM,YAAY,GAAG,MAAM,iCAAc,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAE3E,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,YAAY;aAC1B,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,iCAAc,CAAC,WAAW,CAC7C,MAAM,EACN,IAAI,CAAC,SAAS,EACd,EAAE,CAAC,sBAAsB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CACvD,CAAC;YAEF,MAAM,WAAW,GAAG;gBAChB;oBACI,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,IAAI,CAAC,SAAS;oBACxB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;iBACnB;aACW,CAAC;YAEjB,MAAM,WAAW,GAAG;gBAChB,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE;oBACR,QAAQ,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;oBAC1B,QAAQ;iBACX;gBACD,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,iBAAiB,EAAE,KAAK;gBACxB,WAAW;gBACX,iBAAiB,EAAE,KAAK;gBACxB,MAAM;aACkB,CAAC;YAE7B,OAAO,IAAI,wCAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAES,aAAa;QACnB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACJ;AA/DD,oDA+DC"}

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

@@ -58,7 +58,7 @@ class UniZenOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggr
             };
             const trade = new unizen_on_chain_trade_1.UniZenOnChainTrade({
                 ...onChainTradeStruct,
-                gasFeeInfo: await this.getGasFeeInfo()
+                gasFeeInfo: await this.getGasFeeInfo(onChainTradeStruct)
             }, options.providerAddress);
             return trade;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"unizen-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/unizen/unizen-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAEjE,sGAAkG;AAClG,2FAAwF;AAExF,0JAGoH;AAIpH,iFAA8E;AAC9E,kIAAmH;AAEnH,mGAGsD;AAEtD,mEAA6D;AAC7D,yFAAkF;AAElF,MAAa,qBAAsB,SAAQ,iEAAyB;IAApE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,MAAM,CAAC;IA0E3D,CAAC;IAxEU,qBAAqB,CAAC,cAA8B;QACvD,OAAO,+DAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,IAAI,CAAC,UAA0C,CAAC;YACvE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEvF,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,IAAI,yCAAmB,CAAC;YAEjE,MAAM,eAAe,GAA6B;gBAC9C,gBAAgB,EAAE,IAAI,CAAC,OAAO;gBAC9B,cAAc,EAAE,OAAO,CAAC,OAAO;gBAC/B,MAAM,EAAE,cAAc,CAAC,eAAe;gBACtC,MAAM,EAAE,aAAa;gBACrB,QAAQ,EAAE,OAAO,CAAC,iBAAiB;aACtC,CAAC;YAEF,MAAM,OAAO,GAAG,4BAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE9C,MAAM,SAAS,GAAG,MAAM,yDAAyB,CAAC,YAAY,CAC1D,eAAe,EACf,OAAO,CACV,CAAC;YAEF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,SAAS,CAAC,aAAa,CAAC;aACpD,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAE9C,MAAM,eAAe,GACjB,SAAS,CAAC,eAAe,CAAC,WAAW,EAA2B,CAAC;YAErE,MAAM,qBAAqB,GAAG,mDAAuB,CAAC,eAAe,CAAC,CAAC,cAAc,CAAE,CAAC;YAExF,MAAM,kBAAkB,GAA6B;gBACjD,IAAI;gBACJ,EAAE;gBACF,cAAc;gBACd,YAAY;gBACZ,qBAAqB;gBACrB,IAAI,EAAE,SAAS;gBACf,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY;aAC5D,CAAC;YAEF,MAAM,KAAK,GAAG,IAAI,0CAAkB,CAChC;gBACI,GAAG,kBAAkB;gBACrB,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;aACzC,EACD,OAAO,CAAC,eAAe,CAC1B,CAAC;YAEF,OAAO,KAAK,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK;aACR,CAAC;QACN,CAAC;IACL,CAAC;CACJ;AA3ED,sDA2EC"}
+{"version":3,"file":"unizen-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/unizen/unizen-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAEjE,sGAAkG;AAClG,2FAAwF;AAExF,0JAGoH;AAIpH,iFAA8E;AAC9E,kIAAmH;AAEnH,mGAGsD;AAEtD,mEAA6D;AAC7D,yFAAkF;AAElF,MAAa,qBAAsB,SAAQ,iEAAyB;IAApE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,MAAM,CAAC;IA0E3D,CAAC;IAxEU,qBAAqB,CAAC,cAA8B;QACvD,OAAO,+DAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,IAAI,CAAC,UAA0C,CAAC;YACvE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEvF,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,IAAI,yCAAmB,CAAC;YAEjE,MAAM,eAAe,GAA6B;gBAC9C,gBAAgB,EAAE,IAAI,CAAC,OAAO;gBAC9B,cAAc,EAAE,OAAO,CAAC,OAAO;gBAC/B,MAAM,EAAE,cAAc,CAAC,eAAe;gBACtC,MAAM,EAAE,aAAa;gBACrB,QAAQ,EAAE,OAAO,CAAC,iBAAiB;aACtC,CAAC;YAEF,MAAM,OAAO,GAAG,4BAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE9C,MAAM,SAAS,GAAG,MAAM,yDAAyB,CAAC,YAAY,CAC1D,eAAe,EACf,OAAO,CACV,CAAC;YAEF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,SAAS,CAAC,aAAa,CAAC;aACpD,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAE9C,MAAM,eAAe,GACjB,SAAS,CAAC,eAAe,CAAC,WAAW,EAA2B,CAAC;YAErE,MAAM,qBAAqB,GAAG,mDAAuB,CAAC,eAAe,CAAC,CAAC,cAAc,CAAE,CAAC;YAExF,MAAM,kBAAkB,GAA6B;gBACjD,IAAI;gBACJ,EAAE;gBACF,cAAc;gBACd,YAAY;gBACZ,qBAAqB;gBACrB,IAAI,EAAE,SAAS;gBACf,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY;aAC5D,CAAC;YAEF,MAAM,KAAK,GAAG,IAAI,0CAAkB,CAChC;gBACI,GAAG,kBAAkB;gBACrB,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC;aAC3D,EACD,OAAO,CAAC,eAAe,CAC1B,CAAC;YAEF,OAAO,KAAK,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK;aACR,CAAC;QACN,CAAC;IACL,CAAC;CACJ;AA3ED,sDA2EC"}

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 { XyRoute } from '../../../../../common/providers/xy/models/xy-quote-success-response';
+import { LifiEvmOnChainTradeStruct } from '../lifi/models/lifi-trade-struct';
 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 { OnChainTradeError } from '../../../models/on-chain-trade-error';
 import { GasFeeInfo } from '../../common/on-chain-trade/evm-on-chain-trade/models/gas-fee-info';
+import { OnChainTradeError } from '../../../models/on-chain-trade-error';
 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(from: PriceTokenAmount<EvmBlockchainName>, route: XyRoute): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(lifiTradeStruct: LifiEvmOnChainTradeStruct): Promise<GasFeeInfo | null>;
 }

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

@@ -17,9 +17,10 @@ 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);
@@ -95,17 +96,17 @@ 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(from, route) {
+    async getGasFeeInfo(lifiTradeStruct) {
         try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(from.blockchain);
-            const gasLimit = new bignumber_js_1.default(route.estimatedGas);
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasPriceInfo, { gasLimit });
+            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(lifiTradeStruct.from.blockchain);
+            const gasLimit = await lifi_evm_on_chain_trade_1.LifiEvmOnChainTrade.getGasLimit(lifiTradeStruct);
+            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
         }
         catch {
             return null;

package/lib/features/on-chain/calculation-manager/providers/aggregators/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(from: PriceTokenAmount<EvmBlockchainName>, quote: ZrxQuoteResponse): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(lifiTradeStruct: LifiEvmOnChainTradeStruct): Promise<GasFeeInfo | null>;
 }

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

@@ -14,9 +14,10 @@ const zrx_api_service_1 = require("./zrx-api-service");
 const zrx_trade_1 = require("./zrx-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 ZrxProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnChainProvider {
     constructor() {
         super(...arguments);
@@ -50,7 +51,7 @@ class ZrxProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnCh
             from,
             to,
             slippageTolerance: fullOptions.slippageTolerance,
-            gasFeeInfo: await this.getGasFeeInfo(from, apiTradeData),
+            gasFeeInfo: null,
             path: [from, to],
             useProxy: fullOptions.useProxy,
             proxyFeeInfo,
@@ -68,11 +69,11 @@ class ZrxProvider extends aggregator_on_chain_provider_abstract_1.AggregatorOnCh
     /**
      * Fetches zrx data from api.
      */
-    async getGasFeeInfo(from, quote) {
+    async getGasFeeInfo(lifiTradeStruct) {
         try {
-            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(from.blockchain);
-            const gasLimit = new bignumber_js_1.default(quote.gas);
-            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasPriceInfo, { gasLimit });
+            const gasPriceInfo = await (0, get_gas_price_info_1.getGasPriceInfo)(lifiTradeStruct.from.blockchain);
+            const gasLimit = await lifi_evm_on_chain_trade_1.LifiEvmOnChainTrade.getGasLimit(lifiTradeStruct);
+            return (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
         }
         catch {
             return null;

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

@@ -1 +1 @@
-{"version":3,"file":"zrx-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/zrx/zrx-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zrx-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/zrx/zrx-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,sDAA0D;AAE1D,qGAAqG;AAErG,6GAA6G;AAC7G,uJAGiH;AAGjH,yHAAoH;AACpH,6GAAyG;AAKzG,+HAA4H;AAC5H,gLAAiK;AAEjK,wHAAkH;AAClH,4HAAsH;AACtH,kMAA4L;AAE5L,oFAA6E;AAE7E,MAAa,WAAY,SAAQ,iEAAyB;IAA1D;;QACqB,mBAAc,GAAsC,wDAAyB,CAAC;QAMxF,cAAS,GAAG,yCAAmB,CAAC,GAAG,CAAC;IAyE/C,CAAC;IA7EU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,qDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IACvE,CAAC;IAIM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAAmC;QAEnC,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAEjE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE3F,MAAM,SAAS,GAAG,IAAA,0DAA6B,EAC3C,cAAc,EACd,wBAAY,CAAC,kBAAkB,CAClC,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,0DAA6B,EAAC,OAAO,EAAE,wBAAY,CAAC,kBAAkB,CAAC,CAAC;QAExF,MAAM,gBAAgB,GAAG,WAAW,CAAC,mBAAmB,CAAC;QACzD,MAAM,WAAW,GAAoB;YACjC,MAAM,EAAE;gBACJ,SAAS,EAAE,SAAS,CAAC,OAAO;gBAC5B,QAAQ,EAAE,OAAO,CAAC,OAAO;gBACzB,UAAU,EAAE,SAAS,CAAC,eAAe;gBACrC,kBAAkB,EAAE,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE;gBAC5D,GAAG,CAAC,gBAAgB,IAAI,EAAE,gBAAgB,EAAE,CAAC;aAChD;SACJ,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,+BAAa,CAAC,YAAY,CACjD,WAAW,EACX,IAAI,CAAC,UAAuC,CAC/C,CAAC;QAEF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;YAC5B,GAAG,OAAO,CAAC,QAAQ;YACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,YAAY,CAAC,SAAS,CAAC;SACnD,CAAC,CAAC;QAEH,MAAM,WAAW,GAAmB;YAChC,IAAI;YACJ,EAAE;YACF,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YAChB,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,YAAY;YACZ,cAAc;YACd,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,GAAG,CAAC,gBAAgB,IAAI,EAAE,gBAAgB,EAAE,CAAC;YAC7C,aAAa,EAAE,YAAY,CAAC,EAAE;SACjC,CAAC;QACF,IAAI,WAAW,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;YAC5C,OAAO,IAAI,oBAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;QAClE,CAAC;QAED,OAAO,IAAI,oBAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IAEO,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;AAhFD,kCAgFC"}

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

@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { ZrxTradeStruct } from './models/zrx-trade-struct';
 import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
@@ -5,6 +6,8 @@ import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggr
 import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 export declare class ZrxTrade extends AggregatorEvmOnChainTrade {
     private readonly affiliateAddress;
+    /** @internal */
+    static getGasLimit(zrxTradeStruct: ZrxTradeStruct): Promise<BigNumber | null>;
     readonly dexContractAddress: string;
     get type(): OnChainTradeType;
     constructor(tradeStruct: ZrxTradeStruct, providerAddress: string);

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

@@ -1,11 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxTrade = void 0;
+const evm_web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
+const injector_1 = require("../../../../../../core/injector/injector");
 const check_unsupported_receiver_address_1 = require("../../../../../common/utils/check-unsupported-receiver-address");
 const zrx_api_service_1 = require("./zrx-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 ZrxTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
+    /** @internal */
+    static async getGasLimit(zrxTradeStruct) {
+        const fromBlockchain = zrxTradeStruct.from.blockchain;
+        const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
+        if (!walletAddress) {
+            return null;
+        }
+        try {
+            const transactionConfig = await new ZrxTrade(zrxTradeStruct, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS).encode({ fromAddress: walletAddress });
+            const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
+            const gasLimit = (await web3Public.batchEstimatedGas(walletAddress, [transactionConfig]))[0];
+            if (!gasLimit?.isFinite()) {
+                return null;
+            }
+            return gasLimit;
+        }
+        catch (_err) {
+            return null;
+        }
+    }
     get type() {
         return on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.ZRX;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"zrx-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/zrx/zrx-trade.ts"],"names":[],"mappings":";;;AACA,qHAA+G;AAI/G,yHAAoH;AACpH,+HAG+F;AAC/F,kLAAkK;AAGlK,MAAa,QAAS,SAAQ,kEAAyB;IAKnD,IAAW,IAAI;QACX,OAAO,yCAAmB,CAAC,GAAG,CAAC;IACnC,CAAC;IAED,YAAY,WAA2B,EAAE,eAAuB;QAC5D,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QACpC,IAAI,CAAC,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC,aAAa,CAAC;IACxD,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,IAAA,oEAA+B,EAC3B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,WAAW,IAAI,IAAI,CAAC,aAAa,CAC7C,CAAC;QAEF,MAAM,WAAW,GAAoB;YACjC,MAAM,EAAE;gBACJ,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBAC5B,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO;gBACzB,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,eAAe;gBAC/C,kBAAkB,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE;gBACrD,GAAG,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;aAC5E;SACJ,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,+BAAa,CAAC,YAAY,CAC9C,WAAW,EACX,IAAI,CAAC,IAAI,CAAC,UAAuC,CACpD,CAAC;QAEF,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG;YACX,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,GAAG;YACH,QAAQ;SACX,CAAC;QAEF,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IACzD,CAAC;CACJ;AAhDD,4BAgDC"}
+{"version":3,"file":"zrx-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/zrx/zrx-trade.ts"],"names":[],"mappings":";;;AACA,6GAAwG;AACxG,yDAAsD;AAEtD,qHAA+G;AAI/G,yHAAoH;AACpH,+HAG+F;AAC/F,kLAAkK;AAGlK,MAAa,QAAS,SAAQ,kEAAyB;IAGnD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,cAA8B;QAC1D,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC;QACtD,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,iBAAiB,GAAG,MAAM,IAAI,QAAQ,CACxC,cAAc,EACd,2BAAW,CAAC,aAAa,CAC5B,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,CAAC;YAEzC,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YAC5E,MAAM,QAAQ,GAAG,CACb,MAAM,UAAU,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,iBAAiB,CAAC,CAAC,CACzE,CAAC,CAAC,CAAC,CAAC;YAEL,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAID,IAAW,IAAI;QACX,OAAO,yCAAmB,CAAC,GAAG,CAAC;IACnC,CAAC;IAED,YAAY,WAA2B,EAAE,eAAuB;QAC5D,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QACpC,IAAI,CAAC,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC,aAAa,CAAC;IACxD,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,IAAA,oEAA+B,EAC3B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,WAAW,IAAI,IAAI,CAAC,aAAa,CAC7C,CAAC;QAEF,MAAM,WAAW,GAAoB;YACjC,MAAM,EAAE;gBACJ,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBAC5B,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO;gBACzB,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,eAAe;gBAC/C,kBAAkB,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE;gBACrD,GAAG,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;aAC5E;SACJ,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,+BAAa,CAAC,YAAY,CAC9C,WAAW,EACX,IAAI,CAAC,IAAI,CAAC,UAAuC,CACpD,CAAC;QAEF,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG;YACX,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,GAAG;YACH,QAAQ;SACX,CAAC;QAEF,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IACzD,CAAC;CACJ;AA7ED,4BA6EC"}

package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-on-chain-provider-abstract.d.ts

@@ -5,6 +5,7 @@ import { OnChainTradeError } from '../../../models/on-chain-trade-error';
 import { RequiredOnChainCalculationOptions } from '../models/on-chain-calculation-options';
 import { OnChainProxyFeeInfo } from '../models/on-chain-proxy-fee-info';
 import { OnChainTradeType } from '../models/on-chain-trade-type';
+import { OnChainTradeStruct } from '../on-chain-trade/evm-on-chain-trade/models/evm-on-chain-trade-struct';
 import { GasFeeInfo } from '../on-chain-trade/evm-on-chain-trade/models/gas-fee-info';
 import { OnChainTrade } from '../on-chain-trade/on-chain-trade';
 export declare abstract class AggregatorOnChainProvider {
@@ -13,7 +14,7 @@ export declare abstract class AggregatorOnChainProvider {
     abstract calculate(from: PriceTokenAmount, toToken: PriceToken, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
     abstract isSupportedBlockchain(blockchain: BlockchainName): boolean;
     protected getWalletAddress(blockchain: Web3PrivateSupportedBlockchain): string;
-    protected getGasFeeInfo(..._args: unknown[]): Promise<GasFeeInfo | null>;
+    protected getGasFeeInfo(_tradeStruct: OnChainTradeStruct<BlockchainName>, _providerGateway?: string): Promise<GasFeeInfo | null>;
     protected handleProxyContract<T extends BlockchainName>(from: PriceTokenAmount<T>, fullOptions: RequiredOnChainCalculationOptions): Promise<{
         fromWithoutFee: PriceTokenAmount<T>;
         proxyFeeInfo: OnChainProxyFeeInfo | undefined;

package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-on-chain-provider-abstract.js

@@ -12,7 +12,7 @@ class AggregatorOnChainProvider {
     getWalletAddress(blockchain) {
         return injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(blockchain).address;
     }
-    getGasFeeInfo(..._args) {
+    getGasFeeInfo(_tradeStruct, _providerGateway) {
         return Promise.resolve(null);
     }
     async handleProxyContract(from, fullOptions) {

package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-on-chain-provider-abstract.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregator-on-chain-provider-abstract.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-on-chain-provider-abstract.ts"],"names":[],"mappings":";;;AAEA,kGAA8F;AAE9F,yDAAsD;AACtD,yFAAmF;AAMnF,6FAAuF;AAIvF,MAAsB,yBAAyB;IAA/C;QACqB,wBAAmB,GAAG,IAAI,4CAAmB,EAAE,CAAC;IAiDrE,CAAC;IArCa,gBAAgB,CAAC,UAA0C;QACjE,OAAO,mBAAQ,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;IACtF,CAAC;IAES,aAAa,CAAC,GAAG,KAAgB;QACvC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,mBAAmB,CAC/B,IAAyB,EACzB,WAA8C;QAK9C,IAAI,cAAmC,CAAC;QACxC,IAAI,YAA6C,CAAC;QAElD,IAAI,WAAW,CAAC,QAAQ,IAAI,kCAAe,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/E,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CACpD,IAA2C,EAC3C,WAAW,CAAC,eAAe,CAC9B,CAAC;YACF,cAAc,GAAG,IAAA,wCAAiB,EAAC,IAAI,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACJ,cAAc,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,OAAO;YACH,cAAc;YACd,YAAY;SACf,CAAC;IACN,CAAC;IAES,YAAY,CAAC,IAAW,EAAE,EAAS;QACzC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACtB,CAAC;CACJ;AAlDD,8DAkDC"}
+{"version":3,"file":"aggregator-on-chain-provider-abstract.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-on-chain-provider-abstract.ts"],"names":[],"mappings":";;;AAEA,kGAA8F;AAE9F,yDAAsD;AACtD,yFAAmF;AAMnF,6FAAuF;AAKvF,MAAsB,yBAAyB;IAA/C;QACqB,wBAAmB,GAAG,IAAI,4CAAmB,EAAE,CAAC;IAoDrE,CAAC;IAxCa,gBAAgB,CAAC,UAA0C;QACjE,OAAO,mBAAQ,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;IACtF,CAAC;IAES,aAAa,CACnB,YAAgD,EAChD,gBAAyB;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,mBAAmB,CAC/B,IAAyB,EACzB,WAA8C;QAK9C,IAAI,cAAmC,CAAC;QACxC,IAAI,YAA6C,CAAC;QAElD,IAAI,WAAW,CAAC,QAAQ,IAAI,kCAAe,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/E,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CACpD,IAA2C,EAC3C,WAAW,CAAC,eAAe,CAC9B,CAAC;YACF,cAAc,GAAG,IAAA,wCAAiB,EAAC,IAAI,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACJ,cAAc,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,OAAO;YACH,cAAc;YACd,YAAY;SACf,CAAC;IACN,CAAC;IAES,YAAY,CAAC,IAAW,EAAE,EAAS;QACzC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACtB,CAAC;CACJ;AArDD,8DAqDC"}

package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/evm-on-chain-trade/models/gas-fee-info.d.ts

@@ -1,9 +1,8 @@
 import BigNumber from 'bignumber.js';
 /**
- * Stores gas fee information in calculated trade (in wei).
+ * Stores gas fee information in calculated trade.
  */
 export interface GasFeeInfo {
-    readonly totalGas?: BigNumber;
     readonly gasLimit?: BigNumber;
     readonly gasPrice?: BigNumber;
     readonly gasFeeInEth?: BigNumber;