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

package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.js

@@ -23,12 +23,34 @@ const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-
 const evm_common_cross_chain_abi_1 = require("../common/evm-cross-chain-trade/constants/evm-common-cross-chain-abi");
 const gateway_rubic_cross_chain_abi_1 = require("../common/evm-cross-chain-trade/constants/gateway-rubic-cross-chain-abi");
 const evm_cross_chain_trade_1 = require("../common/evm-cross-chain-trade/evm-cross-chain-trade");
+const bridge_type_1 = require("../common/models/bridge-type");
 const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade");
 const xy_contract_address_1 = require("./constants/xy-contract-address");
+const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
 /**
  * Calculated XY cross-chain trade.
  */
 class XyCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
+    /** @internal */
+    static async getGasData(from, toToken, transactionRequest, feeInfo, providerAddress) {
+        try {
+            const trade = new XyCrossChainTrade({
+                from,
+                to: toToken,
+                transactionRequest,
+                gasData: null,
+                priceImpact: 0,
+                slippage: 0,
+                feeInfo,
+                onChainTrade: null,
+                bridgeType: bridge_type_1.BRIDGE_TYPE.XY
+            }, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, [], false);
+            return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
+        }
+        catch (_err) {
+            return null;
+        }
+    }
     get fromBlockchain() {
         return this.from.blockchain;
     }

package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"xy-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAqC;AAGrC,4DAAoD;AAEpD,6GAAwG;AAExG,uEAAmE;AACnE,yDAAsD;AAEtD,4FAA2F;AAG3F,8EAAsF;AACtF,yFAAmF;AACnF,uHAAoH;AACpH,uJAAiJ;AACjJ,yKAAkK;AAClK,+KAAwK;AACxK,qJAA+I;AAO/I,wKAAiK;AACjK,0IAAqI;AAIrI;;GAEG;AACH,MAAa,iBAAkB,SAAQ,0CAAkB;IAwBrD,IAAY,cAAc;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,UAA6C,CAAC;IACnE,CAAC;IAED,IAAc,mBAAmB;QAC7B,OAAO,IAAI,CAAC,YAAY;YACpB,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO;YACxD,CAAC,CAAC,uCAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC;IACjE,CAAC;IAMD,IAAc,UAAU;QACpB,OAAO,uCAAuC,CAAC;IACnD,CAAC;IAID,YACI,eAUC,EACD,eAAuB,EACvB,SAAsB,EACtB,QAAiB;QAEjB,KAAK,CAAC,eAAe,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QA3DhC,SAAI,GAAG,+CAAsB,CAAC,EAAE,CAAC;QAEjC,iBAAY,GAAG,KAAK,CAAC;QAErB,mBAAc,GAAG;YAC7B,IAAI,EAAE,SAAS;YACf,EAAE,EAAE,SAAS;SAChB,CAAC;QAsDE,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;QAC7D,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;QAC/C,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACvF,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;QACjD,IAAI,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,OAAiC;QAC5D,MAAM,eAAe,GAAG,OAAO,EAAE,eAAe,IAAI,IAAI,CAAC,aAAa,CAAC;QACvE,MAAM,EACF,IAAI,EACJ,KAAK,EAAE,aAAa,EACpB,EAAE,EAAE,cAAc,EACrB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,IAAI,KAAK,EAAE,eAAe,CAAC,CAAC;QAE5F,MAAM,UAAU,GAAG,qDAAuB,CAAC,aAAa,CAAC,OAAO,EAAE;YAC9D,aAAa,EAAE,eAAe;YAC9B,eAAe,EAAE,IAAI,CAAC,IAAI;YAC1B,aAAa,EAAE,IAAI,CAAC,EAAE;YACtB,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,IAAI,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE;YAC3B,WAAW,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAA,wCAAiB,EACpC,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAChD,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ;YACrC,CAAC,CAAC,IAAI,sBAAS,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE;YAC9E,CAAC,CAAC,IAAI,sBAAS,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC;QAE7C,MAAM,YAAY,GAAG,MAAM,qDAAuB,CAAC,sBAAsB,CACrE,cAAc,EACd,IAAK,EACL,IAAI,CAAC,cAAc,EACnB,cAAc,EACd,cAAc,CACjB,CAAC;QAEF,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEnD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAE/C,MAAM,wBAAwB,GAAG,2BAAW,CAAC,gBAAgB,CACzD,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EACtD,mDAAsB,EACtB,IAAI,CAAC,UAAU,EACf,eAAe,EACf,KAAK,CACR,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE5E,OAAO;YACH,eAAe,EAAE,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACxE,WAAW,EAAE,yDAAyB;YACtC,UAAU,EAAE,eAAe;YAC3B,eAAe,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,wBAAwB,CAAC,IAAI,CAAC;YAC7E,KAAK;SACR,CAAC;IACN,CAAC;IAEM,mBAAmB,CAAC,OAAkB;QACzC,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,eAAwB;QAExB,MAAM,MAAM,GAAqB;YAC7B,GAAG,IAAI,CAAC,kBAAkB;YAC1B,GAAG,CAAC,eAAe,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;SACxD,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAC7C,MAAM,IAAI,CAAC,sCAAsC,CAAC,MAAM,CAAC,CAAC;QAE9D,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,IAAA,8BAAmB,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,EAAG,EAAE,MAAM,EAAE,KAAK,CAAC,mBAAmB,EAAE,CAAC;IAC9D,CAAC;IAKa,AAAN,KAAK,CAAC,sCAAsC,CAChD,MAAwB;QAExB,OAAO,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAAoB,GAAG,+BAAe,UAAU,EAAE;YAC5E,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE;SACxB,CAAC,CAAC;IACP,CAAC;IAEM,YAAY;QACf,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;YACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ,GAAG,GAAG;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAC;IACN,CAAC;IAES,eAAe,CAAC,WAAsB;QAC5C,OAAO;YACH,IAAI,CAAC,EAAE,CAAC,OAAO;YACf,oBAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC;YACvD,IAAI,CAAC,QAAQ,GAAG,KAAM;SACzB,CAAC;IACN,CAAC;CACJ;AArLD,8CAqLC;AAzBiB;IAHb,IAAA,kBAAK,EAAC;QACH,MAAM,EAAE,KAAM;KACjB,CAAC;+EAOD"}
+{"version":3,"file":"xy-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.ts"],"names":[],"mappings":"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"}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import { PriceTokenAmount, Token } from '../../../../../../common/tokens';
 import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
 import { OneinchTradeStruct } from './models/oneinch-trade-struct';
@@ -5,6 +6,8 @@ import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
 import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
 import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
 export declare class OneInchTrade extends AggregatorEvmOnChainTrade {
+    /** @internal */
+    static getGasLimit(tradeStruct: OneinchTradeStruct): Promise<BigNumber | null>;
     /** @internal */
     static checkIfNeedApproveAndThrowError(from: PriceTokenAmount, toToken: Token, fromWithoutFee: PriceTokenAmount, fromAddress: string, useProxy: boolean): Promise<void | never>;
     readonly dexContractAddress: string;

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

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

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

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

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

@@ -7,10 +7,8 @@ exports.CoffeeSwapProvider = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const errors_1 = require("../../../../../../common/errors");
 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 ton_web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/typed-web3-pure/ton-web3-pure/ton-web3-pure");
-const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
 const fake_wallet_address_1 = require("../../../../../common/constants/fake-wallet-address");
 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");
@@ -38,11 +36,13 @@ class CoffeeSwapProvider extends aggregator_on_chain_provider_abstract_1.Aggrega
             });
             const routingPath = await this.getRoutingPath(quote.paths);
             const { isChangedSlippage, slippage } = (0, get_ton_multistep_data_1.getMultistepData)(routingPath, options.slippageTolerance);
-            const totalGas = new bignumber_js_1.default(web3_pure_1.Web3Pure.toWei(quote.recommended_gas, native_tokens_1.nativeTokensList.TON.decimals));
             return new coffe_swap_on_chain_trade_1.CoffeSwapTrade({
                 from,
                 to,
-                gasFeeInfo: { totalGas },
+                gasFeeInfo: {
+                    gasPrice: new bignumber_js_1.default(1),
+                    gasLimit: new bignumber_js_1.default(quote.recommended_gas)
+                },
                 slippageTolerance: slippage,
                 useProxy: false,
                 withDeflation: options.withDeflation,
@@ -62,22 +62,25 @@ class CoffeeSwapProvider extends aggregator_on_chain_provider_abstract_1.Aggrega
     async getRoutingPath(txSteps) {
         const promises = [];
         const path = txSteps[0];
+        let next = undefined;
+        let isFirstStep = true;
         const getAddress = (addr) => addr === 'native' ? ton_web3_pure_1.TonWeb3Pure.nativeTokenAddress : addr;
-        let next = path;
-        while (!!next) {
+        while (isFirstStep || !!next) {
+            const source = isFirstStep ? path : next;
             const from = tokens_1.PriceTokenAmount.createToken({
-                address: getAddress(next.input_token.address.address),
+                address: getAddress(source.input_token.address.address),
                 blockchain: blockchain_name_1.BLOCKCHAIN_NAME.TON,
-                tokenAmount: new bignumber_js_1.default(next.swap.input_amount)
+                tokenAmount: new bignumber_js_1.default(source.swap.input_amount)
             });
             const to = tokens_1.PriceTokenAmount.createToken({
-                address: getAddress(next.output_token.address.address),
+                address: getAddress(source.output_token.address.address),
                 blockchain: blockchain_name_1.BLOCKCHAIN_NAME.TON,
-                tokenAmount: new bignumber_js_1.default(next.swap.output_amount)
+                tokenAmount: new bignumber_js_1.default(source.swap.output_amount)
             });
             const stepPromises = Promise.all([from, to]);
             promises.push(stepPromises);
-            next = next.next?.[0];
+            next = isFirstStep ? path.next?.[0] : next.next?.[0];
+            isFirstStep = false;
         }
         const resolved = await Promise.all(promises);
         const steps = resolved.map(step => ({

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"native-router-abstract-provider.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-provider.ts"],"names":[],"mappings":";;;AAAA,8CAAiE;AAEjE,uEAAmE;AAInE,qIAAsH;AACtH,2HAGkE;AAOlE,oFAA8E;AAE9E,MAAsB,4BAEpB,SAAQ,iEAAyB;IAFnC;;QAGqB,uBAAkB,GAAG,4CAA4C,CAAC;IAoEvF,CAAC;IAhEU,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAA0C;QAE1C,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,4CAA4C,CAAC;YACjE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACvF,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC;YAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YAChF,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YAEpF,MAAM,uBAAuB,GAAmC;gBAC5D,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,OAAO;gBAClB,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,gBAAgB;gBAC1B,MAAM,EAAE,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE;gBAC7C,YAAY,EAAE,WAAW;gBACzB,QAAQ,EAAE,OAAO,CAAC,iBAAiB,GAAG,GAAG;aAC5C,CAAC;YACF,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,kDAAsB,CAAC,YAAY,CACtE,uBAAuB,CAC1B,CAAC;YACF,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC;YACzC,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,WAAW,EAAE,oBAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC;aAC7D,CAAC,CAAC;YACH,MAAM,WAAW,GAA4B;gBACzC,IAAI;gBACJ,EAAE;gBACF,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,IAAI;gBACJ,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;gBACtC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,YAAY;gBACZ,cAAc;gBACd,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,SAAS;aACZ,CAAC;YAEF,MAAM,aAAa,GAA8B;gBAC7C,WAAW;gBACX,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,uBAAuB;gBACvB,eAAe;aAClB,CAAC;YACF,OAAO,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,GAAG;aACb,CAAC;QACN,CAAC;IACL,CAAC;IAEM,iBAAiB,CAAC,UAAkB;QACvC,OAAO,oEAAqB,CAAC,UAAkC,CAAC,CAAC;IACrE,CAAC;CACJ;AAvED,oEAuEC"}
+{"version":3,"file":"native-router-abstract-provider.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-provider.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -2,11 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeRouterAbstractTrade = void 0;
 const errors_1 = require("../../../../../../../common/errors");
+const injector_1 = require("../../../../../../../core/injector/injector");
 const check_unsupported_receiver_address_1 = require("../../../../../../common/utils/check-unsupported-receiver-address");
 const rubic_proxy_contract_address_1 = require("../../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address");
 const aggregator_evm_on_chain_trade_abstract_1 = require("../../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract");
 const native_router_api_service_1 = require("./services/native-router-api-service");
 class NativeRouterAbstractTrade extends aggregator_evm_on_chain_trade_abstract_1.AggregatorEvmOnChainTrade {
+    static async getGasLimit(tradeStruct, providerGateway) {
+        const fromBlockchain = tradeStruct.from.blockchain;
+        const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
+        if (!walletAddress)
+            return null;
+        try {
+            const web3public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
+            const gasLimit = await web3public.getEstimatedGasByData(walletAddress, providerGateway, {
+                data: tradeStruct.txRequest.calldata,
+                value: tradeStruct.txRequest.value
+            });
+            if (!gasLimit?.isFinite()) {
+                return null;
+            }
+            return gasLimit;
+        }
+        catch (err) {
+            console.debug(err);
+            return null;
+        }
+    }
     get spenderAddress() {
         return this.useProxy
             ? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway

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

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

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/constants/dedust-consts.d.ts

@@ -1,2 +1,2 @@
-export declare const DEDUST_GAS_NON_WEI = 0.2;
+export declare const DEDUST_GAS = 0.2;
 export declare const RUBIC_REF_NAME_FOR_DEDUST = 839314270;

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/constants/dedust-consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RUBIC_REF_NAME_FOR_DEDUST = exports.DEDUST_GAS_NON_WEI = void 0;
-exports.DEDUST_GAS_NON_WEI = 0.2;
+exports.RUBIC_REF_NAME_FOR_DEDUST = exports.DEDUST_GAS = void 0;
+exports.DEDUST_GAS = 0.2;
 exports.RUBIC_REF_NAME_FOR_DEDUST = 0x3206eb5e;
 //# sourceMappingURL=dedust-consts.js.map

package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/constants/dedust-consts.js.map

@@ -1 +1 @@
-{"version":3,"file":"dedust-consts.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/constants/dedust-consts.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG,GAAG,CAAC;AACzB,QAAA,yBAAyB,GAAG,UAAU,CAAC"}
+{"version":3,"file":"dedust-consts.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/constants/dedust-consts.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG,GAAG,CAAC;AACjB,QAAA,yBAAyB,GAAG,UAAU,CAAC"}

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

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DedustOnChainProvider = 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 get_ton_multistep_data_1 = require("../common/utils/get-ton-multistep-data");
@@ -53,9 +51,9 @@ class DedustOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggr
         }
     }
     getGasFeeInfo() {
-        const totalGas = new bignumber_js_1.default(web3_pure_1.Web3Pure.toWei(dedust_consts_1.DEDUST_GAS_NON_WEI, native_tokens_1.nativeTokensList.TON.decimals));
         return Promise.resolve({
-            totalGas
+            gasPrice: new bignumber_js_1.default(1),
+            gasLimit: new bignumber_js_1.default(dedust_consts_1.DEDUST_GAS)
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"dedust-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/dedust-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,6EAA6E;AAC7E,gFAIoD;AACpD,uEAAmE;AAInE,iFAA8E;AAC9E,kIAAmH;AAGnH,mFAA0E;AAC1E,6DAA+D;AAC/D,mEAA6D;AAC7D,wEAAmE;AAEnE,MAAa,qBAAsB,SAAQ,iEAAyB;IAApE;;QACW,cAAS,GAAG,yCAAmB,CAAC,MAAM,CAAC;IAwDlD,CAAC;IAtDU,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,iBAAiB,GAAG,IAAI,uCAAiB,EAAE,CAAC;YAClD,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAElF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,iBAAiB,CAAC;aAC9C,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,CAAC;YAC3D,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG,IAAA,yCAAgB,EACpD,WAAW,EACX,OAAO,CAAC,iBAAiB,CAC5B,CAAC;YAEF,OAAO,IAAI,0CAAkB,CACzB;gBACI,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;gBACtC,iBAAiB,EAAE,QAAQ;gBAC3B,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,WAAW;gBACX,iBAAiB,EAAE,KAAK;gBACxB,iBAAiB;aACpB,EACD,OAAO,CAAC,eAAe,CAC1B,CAAC;QACN,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,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAC1B,oBAAQ,CAAC,KAAK,CAAC,kCAAkB,EAAE,gCAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CACpE,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,QAAQ;SACX,CAAC,CAAC;IACP,CAAC;CACJ;AAzDD,sDAyDC"}
+{"version":3,"file":"dedust-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/dedust-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,gFAIoD;AAIpD,iFAA8E;AAC9E,kIAAmH;AAGnH,mFAA0E;AAC1E,6DAAuD;AACvD,mEAA6D;AAC7D,wEAAmE;AAEnE,MAAa,qBAAsB,SAAQ,iEAAyB;IAApE;;QACW,cAAS,GAAG,yCAAmB,CAAC,MAAM,CAAC;IAsDlD,CAAC;IApDU,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,iBAAiB,GAAG,IAAI,uCAAiB,EAAE,CAAC;YAClD,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAElF,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,iBAAiB,CAAC;aAC9C,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,CAAC;YAC3D,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG,IAAA,yCAAgB,EACpD,WAAW,EACX,OAAO,CAAC,iBAAiB,CAC5B,CAAC;YAEF,OAAO,IAAI,0CAAkB,CACzB;gBACI,IAAI;gBACJ,EAAE;gBACF,UAAU,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;gBACtC,iBAAiB,EAAE,QAAQ;gBAC3B,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,WAAW;gBACX,iBAAiB,EAAE,KAAK;gBACxB,iBAAiB;aACpB,EACD,OAAO,CAAC,eAAe,CAC1B,CAAC;QACN,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;YACnB,QAAQ,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;YAC1B,QAAQ,EAAE,IAAI,sBAAS,CAAC,0BAAU,CAAC;SACtC,CAAC,CAAC;IACP,CAAC;CACJ;AAvDD,sDAuDC"}