rubic-sdk 4.30.0-alpha-design.17-fix-gas.3 → 4.30.0-alpha-design.17-fix-gas.5

package/dist/rubic-sdk.min.js

@@ -184854,7 +184854,7 @@ class DebridgeCrossChainProvider extends cross_chain_provider_1.CrossChainProvid
                 }
             };
             const gasData = options.gasCalculation === 'enabled'
-                ? await debridge_cross_chain_trade_1.DebridgeCrossChainTrade.getGasData(from, to, requestParams)
+                ? await debridge_cross_chain_trade_1.DebridgeCrossChainTrade.getGasData(from, to, requestParams, options.receiverAddress)
                 : null;
             return {
                 trade: new debridge_cross_chain_trade_1.DebridgeCrossChainTrade({
@@ -184982,25 +184982,25 @@ const bridge_type_1 = __webpack_require__(/*! ../common/models/bridge-type */ ".
 const portal_address_1 = __webpack_require__(/*! ./constants/portal-address */ "./src/features/cross-chain/calculation-manager/providers/debridge-provider/constants/portal-address.ts");
 const debridge_cross_chain_provider_1 = __webpack_require__(/*! ./debridge-cross-chain-provider */ "./src/features/cross-chain/calculation-manager/providers/debridge-provider/debridge-cross-chain-provider.ts");
 const mete_router_abi_1 = __webpack_require__(/*! ../symbiosis-provider/constants/mete-router-abi */ "./src/features/cross-chain/calculation-manager/providers/symbiosis-provider/constants/mete-router-abi.ts");
+const convert_gas_price_1 = __webpack_require__(/*! ../../utils/convert-gas-price */ "./src/features/cross-chain/calculation-manager/utils/convert-gas-price.ts");
 const decode_method_1 = __webpack_require__(/*! ../../utils/decode-method */ "./src/features/cross-chain/calculation-manager/utils/decode-method.ts");
 const on_chain_trade_type_1 = __webpack_require__(/*! ../../../../on-chain/calculation-manager/providers/common/models/on-chain-trade-type */ "./src/features/on-chain/calculation-manager/providers/common/models/on-chain-trade-type.ts");
 const constants_1 = __webpack_require__(/*! ../../../../on-chain/calculation-manager/providers/dexes/common/oneinch-abstract/constants */ "./src/features/on-chain/calculation-manager/providers/dexes/common/oneinch-abstract/constants.ts");
-const convert_gas_price_1 = __webpack_require__(/*! ../../utils/convert-gas-price */ "./src/features/cross-chain/calculation-manager/utils/convert-gas-price.ts");
 /**
  * Calculated DeBridge cross-chain trade.
  */
 class DebridgeCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
     /** @internal */
-    static async getGasData(from, to, transactionRequest) {
+    static async getGasData(from, toToken, transactionRequest, receiverAddress) {
         const fromBlockchain = from.blockchain;
         const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
         if (!walletAddress) {
             return null;
         }
         try {
-            const { contractAddress, contractAbi, methodName, methodArguments, value } = await new DebridgeCrossChainTrade({
+            const { data, value, to } = await new DebridgeCrossChainTrade({
                 from,
-                to,
+                to: toToken,
                 transactionRequest,
                 gasData: null,
                 priceImpact: 0,
@@ -185010,12 +185010,13 @@ class DebridgeCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade
                 transitAmount: new bignumber_js_1.default(NaN),
                 cryptoFeeToken: from,
                 onChainTrade: null
-            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({}, true);
+            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getTransactionRequest(receiverAddress);
             const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
-            const [gasLimit, gasDetails] = await Promise.all([
-                web3Public.getEstimatedGas(contractAbi, contractAddress, methodName, methodArguments, walletAddress, value),
-                (0, convert_gas_price_1.convertGasDataToBN)(await injector_1.Injector.gasPriceApi.getGasPrice(from.blockchain))
-            ]);
+            const gasLimit = await web3Public.getEstimatedGasByData(walletAddress, to, {
+                data,
+                value
+            });
+            const gasDetails = (0, convert_gas_price_1.convertGasDataToBN)(await injector_1.Injector.gasPriceApi.getGasPrice(from.blockchain));
             if (!gasLimit?.isFinite()) {
                 return null;
             }
@@ -198745,6 +198746,7 @@ const evm_web3_pure_1 = __webpack_require__(/*! ../../../../../../../core/blockc
 const token_native_address_proxy_1 = __webpack_require__(/*! ../../../../../../common/utils/token-native-address-proxy */ "./src/features/common/utils/token-native-address-proxy.ts");
 const rubic_proxy_contract_address_1 = __webpack_require__(/*! ../../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address */ "./src/features/cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address.ts");
 const on_chain_trade_type_1 = __webpack_require__(/*! ../../../common/models/on-chain-trade-type */ "./src/features/on-chain/calculation-manager/providers/common/models/on-chain-trade-type.ts");
+const get_gas_fee_info_1 = __webpack_require__(/*! ../../../common/utils/get-gas-fee-info */ "./src/features/on-chain/calculation-manager/providers/common/utils/get-gas-fee-info.ts");
 const evm_provider_default_options_1 = __webpack_require__(/*! ../on-chain-provider/evm-on-chain-provider/constants/evm-provider-default-options */ "./src/features/on-chain/calculation-manager/providers/dexes/common/on-chain-provider/evm-on-chain-provider/constants/evm-provider-default-options.ts");
 const evm_on_chain_provider_1 = __webpack_require__(/*! ../on-chain-provider/evm-on-chain-provider/evm-on-chain-provider */ "./src/features/on-chain/calculation-manager/providers/dexes/common/on-chain-provider/evm-on-chain-provider/evm-on-chain-provider.ts");
 const sync_swap_abstract_trade_1 = __webpack_require__(/*! ./sync-swap-abstract-trade */ "./src/features/on-chain/calculation-manager/providers/dexes/common/sync-swap-abstract/sync-swap-abstract-trade.ts");
@@ -198797,7 +198799,15 @@ class SyncSwapAbstractProvider extends evm_on_chain_provider_1.EvmOnChainProvide
             path: [from, ...transitTokens, toToken],
             bestPathWithAmounts: bestRoute
         };
-        return new sync_swap_abstract_trade_1.SyncSwapAbstractTrade(tradeStruct, fullOptions.providerAddress, this.dexContractAddress);
+        try {
+            const gasPriceInfo = await this.getGasPriceInfo();
+            const gasLimit = await sync_swap_abstract_trade_1.SyncSwapAbstractTrade.getGasLimit(tradeStruct, this.dexContractAddress);
+            const gasFeeInfo = (0, get_gas_fee_info_1.getGasFeeInfo)(gasLimit, gasPriceInfo);
+            return new sync_swap_abstract_trade_1.SyncSwapAbstractTrade({ ...tradeStruct, gasFeeInfo }, fullOptions.providerAddress, this.dexContractAddress);
+        }
+        catch {
+            return new sync_swap_abstract_trade_1.SyncSwapAbstractTrade(tradeStruct, fullOptions.providerAddress, this.dexContractAddress);
+        }
     }
     async getAvailablePools(from, toToken) {
         return sync_swap_factory_1.SyncSwapFactory.fetchRoutePools(from.address, toToken.address, this.walletAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, this.vault, this.factories.map(address => address.toLowerCase()), this.routeTokens.map(address => address.toLowerCase()), this.masterAddress, this.routerHelperContract, this.blockchain);
@@ -198829,7 +198839,6 @@ const evm_on_chain_trade_1 = __webpack_require__(/*! ../../../common/on-chain-tr
 const constants_1 = __webpack_require__(/*! ../oneinch-abstract/constants */ "./src/features/on-chain/calculation-manager/providers/dexes/common/oneinch-abstract/constants.ts");
 const sync_swap_abi_1 = __webpack_require__(/*! ./sync-swap-abi */ "./src/features/on-chain/calculation-manager/providers/dexes/common/sync-swap-abstract/sync-swap-abi.ts");
 class SyncSwapAbstractTrade extends evm_on_chain_trade_1.EvmOnChainTrade {
-    // @TODO need to start using this method.
     /** @internal */
     static async getGasLimit(tradeStruct, dexContractAddress) {
         const fromBlockchain = tradeStruct.from.blockchain;