rubic-sdk 4.30.0-alpha-design.17-fix-gas.2 → 4.30.0-alpha-design.17-fix-gas.4

package/dist/rubic-sdk.min.js

@@ -185204,10 +185204,8 @@ class DebridgeCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade
     }
     decodeCallData(data) {
         if (typeof data === 'string') {
-            const abi = mete_router_abi_1.meteRouterAbi.find(method => method.name === 'metaRoute');
-            const decodeData = decode_method_1.MethodDecoder.decodeMethod(abi, data);
-            const xxx = decodeData.params[0].value;
-            return xxx.otherSideCalldata;
+            const decodeData = decode_method_1.MethodDecoder.decodeMethod(mete_router_abi_1.meteRouterAbi.find(method => method.name === 'metaRoute'), data).params[0].value;
+            return decodeData.otherSideCalldata;
         }
         throw new errors_1.RubicSdkError('Wrong call data');
     }
@@ -186528,8 +186526,8 @@ class SquidrouterCrossChainProvider extends cross_chain_provider_1.CrossChainPro
                 }
             });
             const squidGasData = {
-                gasLimit: new bignumber_js_1.default(transactionRequest.gasLimit).plus(200000),
-                gasPrice: new bignumber_js_1.default(transactionRequest.gasPrice),
+                gasLimit: new bignumber_js_1.default(transactionRequest.gasLimit).plus(120000),
+                gasPrice: web3_pure_1.Web3Pure.fromWei(transactionRequest.gasPrice),
                 maxFeePerGas: new bignumber_js_1.default(transactionRequest.maxFeePerGas),
                 maxPriorityFeePerGas: new bignumber_js_1.default(transactionRequest.maxPriorityFeePerGas)
             };
@@ -186540,10 +186538,6 @@ class SquidrouterCrossChainProvider extends cross_chain_provider_1.CrossChainPro
             const gasData = options.gasCalculation === 'enabled'
                 ? await squidrouter_cross_chain_trade_1.SquidrouterCrossChainTrade.getGasData(from, to, requestParams, feeInfo)
                 : null;
-            if (gasData && squidGasData) {
-                console.log('Our GasData: ', Object.values(gasData).map(item => item.toFixed()));
-                console.log('Squid GasData GasData: ', Object.values(squidGasData).map(item => item.toFixed()));
-            }
             const feeAmount = estimate.feeCosts
                 .filter(fee => (0, blockchain_1.compareAddresses)(this.nativeAddress, fee.token.address))
                 .reduce((acc, fee) => acc.plus(fee.amount), new bignumber_js_1.default(0));
@@ -198751,6 +198745,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");
@@ -198803,7 +198798,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);
@@ -198835,7 +198838,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;