rubic-sdk 4.30.0-alpha-design.17-fix-gas.0 → 4.30.0-alpha-design.17-fix-gas.1

package/dist/rubic-sdk.min.js

@@ -184839,9 +184839,6 @@ class DebridgeCrossChainProvider extends cross_chain_provider_1.CrossChainProvid
                 ...toToken.asStruct,
                 tokenAmount: web3_pure_1.Web3Pure.fromWei(estimation.dstChainTokenOut.amount, estimation.dstChainTokenOut.decimals)
             });
-            const gasData = options.gasCalculation === 'enabled'
-                ? await debridge_cross_chain_trade_1.DebridgeCrossChainTrade.getGasData(from, to, requestParams)
-                : null;
             const transitToken = estimation.srcChainTokenOut || estimation.srcChainTokenIn;
             const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
             const cryptoFeeAmount = await DebridgeCrossChainProvider.getCryptoFeeAmount(web3Public, fromBlockchain);
@@ -184850,6 +184847,17 @@ class DebridgeCrossChainProvider extends cross_chain_provider_1.CrossChainProvid
                 ...nativeToken,
                 weiAmount: new bignumber_js_1.default(cryptoFeeAmount)
             });
+            const feeInfo = {
+                provider: {
+                    cryptoFee: {
+                        amount: web3_pure_1.Web3Pure.fromWei(new bignumber_js_1.default(cryptoFeeAmount)),
+                        token: cryptoFeeToken
+                    }
+                }
+            };
+            const gasData = options.gasCalculation === 'enabled'
+                ? await debridge_cross_chain_trade_1.DebridgeCrossChainTrade.getGasData(from, to, requestParams)
+                : null;
             return {
                 trade: new debridge_cross_chain_trade_1.DebridgeCrossChainTrade({
                     from,
@@ -184859,14 +184867,7 @@ class DebridgeCrossChainProvider extends cross_chain_provider_1.CrossChainProvid
                     priceImpact: from.calculatePriceImpactPercent(to),
                     allowanceTarget: tx.allowanceTarget,
                     slippage: 0,
-                    feeInfo: {
-                        provider: {
-                            cryptoFee: {
-                                amount: web3_pure_1.Web3Pure.fromWei(new bignumber_js_1.default(cryptoFeeAmount)),
-                                token: cryptoFeeToken
-                            }
-                        }
-                    },
+                    feeInfo,
                     transitAmount: web3_pure_1.Web3Pure.fromWei(transitToken.amount, transitToken.decimals),
                     cryptoFeeToken,
                     onChainTrade: null
@@ -185011,7 +185012,7 @@ 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({});
+            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({}, true);
             const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
             const [gasLimit, gasDetails] = await Promise.all([
                 web3Public.getEstimatedGas(contractAbi, contractAddress, methodName, methodArguments, walletAddress, value),
@@ -185027,8 +185028,6 @@ class DebridgeCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade
             };
         }
         catch (_err) {
-            console.log('Provider: DLN');
-            console.log('Provider Error: ', _err);
             return null;
         }
     }
@@ -185097,8 +185096,8 @@ class DebridgeCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade
             throw (0, errors_2.parseError)(err);
         }
     }
-    async getContractParams(options) {
-        const { data, value: providerValue } = await this.getTransactionRequest(options?.receiverAddress);
+    async getContractParams(options, skipAmountChangeCheck = false) {
+        const { data, value: providerValue } = await this.getTransactionRequest(options?.receiverAddress, null, skipAmountChangeCheck);
         const bridgeData = this.getBridgeData(options);
         const swapData = this.onChainTrade && (await this.getSwapData(options));
         const providerData = this.getProviderData(data);
@@ -185121,7 +185120,7 @@ class DebridgeCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade
         const usdCryptoFee = this.cryptoFeeToken.price.multipliedBy(this.cryptoFeeToken.tokenAmount);
         return fromUsd.plus(usdCryptoFee.isNaN() ? 0 : usdCryptoFee).dividedBy(this.to.tokenAmount);
     }
-    async getTransactionRequest(receiverAddress, transactionConfig) {
+    async getTransactionRequest(receiverAddress, transactionConfig, skipAmountChangeCheck = false) {
         if (transactionConfig) {
             return {
                 data: transactionConfig.data,
@@ -185141,7 +185140,9 @@ class DebridgeCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade
             referralCode: '4350'
         };
         const { tx, estimation } = await injector_1.Injector.httpClient.get(`${debridge_cross_chain_provider_1.DebridgeCrossChainProvider.apiEndpoint}/order/create-tx`, { params });
-        evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange(tx, estimation.dstChainTokenOut.amount, this.to.stringWeiAmount);
+        if (!skipAmountChangeCheck) {
+            evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange(tx, estimation.dstChainTokenOut.amount, this.to.stringWeiAmount);
+        }
         return tx;
     }
     getTradeInfo() {
@@ -185405,7 +185406,7 @@ class LifiCrossChainProvider extends cross_chain_provider_1.CrossChainProvider {
         });
         const priceImpact = from.calculatePriceImpactPercent(to);
         const gasData = options.gasCalculation === 'enabled'
-            ? await lifi_cross_chain_trade_1.LifiCrossChainTrade.getGasData(from, to, bestRoute)
+            ? await lifi_cross_chain_trade_1.LifiCrossChainTrade.getGasData(from, to, bestRoute, feeInfo)
             : null;
         const { onChainType, bridgeType } = this.parseTradeTypes(bestRoute.steps);
         const trade = new lifi_cross_chain_trade_1.LifiCrossChainTrade({
@@ -185562,7 +185563,7 @@ const convert_gas_price_1 = __webpack_require__(/*! ../../utils/convert-gas-pric
  */
 class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
     /** @internal */
-    static async getGasData(from, to, route) {
+    static async getGasData(from, to, route, feeInfo) {
         const fromBlockchain = from.blockchain;
         const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
         if (!walletAddress) {
@@ -185575,7 +185576,7 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
                 route,
                 gasData: null,
                 toTokenAmountMin: new bignumber_js_1.default(0),
-                feeInfo: {},
+                feeInfo,
                 priceImpact: from.calculatePriceImpactPercent(to) || 0,
                 onChainSubtype: {
                     from: undefined,
@@ -185583,7 +185584,7 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
                 },
                 bridgeType: bridge_type_1.BRIDGE_TYPE.LIFI,
                 slippage: 0
-            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({});
+            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({}, true);
             const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
             const [gasLimit, gasDetails] = await Promise.all([
                 web3Public.getEstimatedGas(contractAbi, contractAddress, methodName, methodArguments, walletAddress, value),
@@ -185599,8 +185600,6 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
             };
         }
         catch (_err) {
-            console.log('Provider: LiFi');
-            console.log('Provider Error: ', _err);
             return null;
         }
     }
@@ -185670,8 +185669,8 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
             throw err;
         }
     }
-    async getContractParams(options) {
-        const { data, value: providerValue, to: providerRouter } = await this.fetchSwapData(options?.receiverAddress);
+    async getContractParams(options, skipAmountChangeCheck = false) {
+        const { data, value: providerValue, to: providerRouter } = await this.fetchSwapData(options?.receiverAddress, skipAmountChangeCheck);
         const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
             walletAddress: this.walletAddress,
             fromTokenAmount: this.from,
@@ -185698,7 +185697,7 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
             value
         };
     }
-    async fetchSwapData(receiverAddress) {
+    async fetchSwapData(receiverAddress, skipAmountChangeCheck = false) {
         const firstStep = this.route.steps[0];
         const step = {
             ...firstStep,
@@ -185722,7 +185721,9 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
         const swapResponse = await this.httpClient.post('https://li.quest/v1/advanced/stepTransaction', {
             ...step
         });
-        evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange(swapResponse.transactionRequest, swapResponse.estimate.toAmount, this.to.stringWeiAmount);
+        if (!skipAmountChangeCheck) {
+            evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange(swapResponse.transactionRequest, swapResponse.estimate.toAmount, this.to.stringWeiAmount);
+        }
         return swapResponse.transactionRequest;
     }
     getTradeAmountRatio(fromUsd) {
@@ -186531,7 +186532,7 @@ class SquidrouterCrossChainProvider extends cross_chain_provider_1.CrossChainPro
                 tokenAmount: web3_pure_1.Web3Pure.fromWei(estimate.toAmount, toToken.decimals)
             });
             const gasData = options.gasCalculation === 'enabled'
-                ? await squidrouter_cross_chain_trade_1.SquidrouterCrossChainTrade.getGasData(from, to, requestParams)
+                ? await squidrouter_cross_chain_trade_1.SquidrouterCrossChainTrade.getGasData(from, to, requestParams, feeInfo)
                 : null;
             const feeAmount = estimate.feeCosts
                 .filter(fee => (0, blockchain_1.compareAddresses)(this.nativeAddress, fee.token.address))
@@ -186668,7 +186669,7 @@ const convert_gas_price_1 = __webpack_require__(/*! ../../utils/convert-gas-pric
  */
 class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
     /** @internal */
-    static async getGasData(from, to, transactionRequest) {
+    static async getGasData(from, to, transactionRequest, feeInfo) {
         const fromBlockchain = from.blockchain;
         const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
         if (!walletAddress) {
@@ -186682,13 +186683,13 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
                 priceImpact: 0,
                 allowanceTarget: '',
                 slippage: 0,
-                feeInfo: {},
+                feeInfo,
                 transitUSDAmount: new bignumber_js_1.default(NaN),
                 cryptoFeeToken: from,
                 onChainTrade: null,
                 onChainSubtype: { from: undefined, to: undefined },
                 transactionRequest
-            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({});
+            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({}, true);
             const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
             const [gasLimit, gasDetails] = await Promise.all([
                 web3Public.getEstimatedGas(contractAbi, contractAddress, methodName, methodArguments, walletAddress, value),
@@ -186704,8 +186705,6 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
             };
         }
         catch (_err) {
-            console.log('Provider: Squid');
-            console.log('Provider Error: ', _err);
             return null;
         }
     }
@@ -186773,8 +186772,8 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
             throw (0, errors_2.parseError)(err);
         }
     }
-    async getContractParams(options) {
-        const { data, value: providerValue, to } = await this.getTransactionRequest(options?.receiverAddress || this.walletAddress);
+    async getContractParams(options, skipAmountChangeCheck = false) {
+        const { data, value: providerValue, to } = await this.getTransactionRequest(options?.receiverAddress || this.walletAddress, null, skipAmountChangeCheck);
         const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
             walletAddress: this.walletAddress,
             fromTokenAmount: this.from,
@@ -186814,7 +186813,7 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
             routePath: this.routePath
         };
     }
-    async getTransactionRequest(receiverAddress, transactionConfig) {
+    async getTransactionRequest(receiverAddress, transactionConfig, skipAmountChangeCheck = false) {
         if (transactionConfig) {
             return {
                 data: transactionConfig.data,
@@ -186832,11 +186831,13 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
                 'x-integrator-id': 'rubic-api'
             }
         });
-        evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange({
-            data: transactionRequest.data,
-            value: transactionRequest.value,
-            to: transactionRequest.targetAddress
-        }, routeEstimate.toAmount, this.to.stringWeiAmount);
+        if (!skipAmountChangeCheck) {
+            evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange({
+                data: transactionRequest.data,
+                value: transactionRequest.value,
+                to: transactionRequest.targetAddress
+            }, routeEstimate.toAmount, this.to.stringWeiAmount);
+        }
         return {
             data: transactionRequest.data,
             value: transactionRequest.value,
@@ -188559,7 +188560,7 @@ class SymbiosisCrossChainProvider extends cross_chain_provider_1.CrossChainProvi
                 tokenAmount: new bignumber_js_1.default(web3_pure_1.Web3Pure.fromWei(tokenAmountOut.amount, tokenAmountOut.decimals))
             });
             const gasData = options.gasCalculation === 'enabled'
-                ? await symbiosis_cross_chain_trade_1.SymbiosisCrossChainTrade.getGasData(from, to, swapParams)
+                ? await symbiosis_cross_chain_trade_1.SymbiosisCrossChainTrade.getGasData(from, to, swapParams, feeInfo, approveTo)
                 : null;
             return {
                 trade: new symbiosis_cross_chain_trade_1.SymbiosisCrossChainTrade({
@@ -188712,7 +188713,7 @@ const convert_gas_price_1 = __webpack_require__(/*! ../../utils/convert-gas-pric
  */
 class SymbiosisCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
     /** @internal */
-    static async getGasData(from, to, swapParams) {
+    static async getGasData(from, to, swapParams, feeInfo, providerGateway) {
         const fromBlockchain = from.blockchain;
         const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
         if (!walletAddress) {
@@ -188725,12 +188726,15 @@ class SymbiosisCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrad
                 gasData: null,
                 priceImpact: 0,
                 slippage: 0,
-                feeInfo: {},
+                feeInfo,
                 transitAmount: new bignumber_js_1.default(NaN),
                 tradeType: { in: undefined, out: undefined },
-                contractAddresses: { providerRouter: '', providerGateway: '' },
+                contractAddresses: {
+                    providerRouter: '',
+                    providerGateway: providerGateway
+                },
                 swapParams
-            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({});
+            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({}, true);
             const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
             const [gasLimit, gasDetails] = await Promise.all([
                 web3Public.getEstimatedGas(contractAbi, contractAddress, methodName, methodArguments, walletAddress, value),
@@ -188746,8 +188750,6 @@ class SymbiosisCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrad
             };
         }
         catch (_err) {
-            console.log('Provider: Symbiosis');
-            console.log('Provider Error: ', _err);
             return null;
         }
     }
@@ -188785,8 +188787,8 @@ class SymbiosisCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrad
         this.onChainSubtype = SymbiosisCrossChainTrade.getSubtype(crossChainTrade.tradeType, crossChainTrade.to.blockchain);
         this.contractAddresses = crossChainTrade.contractAddresses;
     }
-    async getContractParams(options) {
-        const { data, value: providerValue, to } = await this.getTransactionRequest(this.walletAddress, options?.receiverAddress);
+    async getContractParams(options, skipAmountChangeCheck = false) {
+        const { data, value: providerValue, to } = await this.getTransactionRequest(this.walletAddress, options?.receiverAddress, null, skipAmountChangeCheck);
         let receiverAddress = options.receiverAddress;
         let toAddress = '';
         if (this.to.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.TRON) {
@@ -188882,7 +188884,7 @@ class SymbiosisCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrad
                 : mapping?.[tradeType?.out || 'default']
         };
     }
-    async getTransactionRequest(walletAddress, receiverAddress, transactionConfig) {
+    async getTransactionRequest(walletAddress, receiverAddress, transactionConfig, skipAmountChangeCheck = false) {
         if (transactionConfig) {
             return {
                 data: transactionConfig.data,
@@ -188901,7 +188903,9 @@ class SymbiosisCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrad
             value: tradeData.tx.value?.toString() || '0',
             to: tradeData.tx.to
         };
-        evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange(config, tradeData.tokenAmountOut.amount, this.to.stringWeiAmount);
+        if (!skipAmountChangeCheck) {
+            evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange(config, tradeData.tokenAmountOut.amount, this.to.stringWeiAmount);
+        }
         return config;
     }
 }
@@ -189590,7 +189594,7 @@ class XyCrossChainProvider extends cross_chain_provider_1.CrossChainProvider {
                 tokenAmount: web3_pure_1.Web3Pure.fromWei(toTokenAmount, toToken.decimals)
             });
             const gasData = options.gasCalculation === 'enabled'
-                ? await xy_cross_chain_trade_1.XyCrossChainTrade.getGasData(fromToken, to, requestParams)
+                ? await xy_cross_chain_trade_1.XyCrossChainTrade.getGasData(fromToken, to, requestParams, feeInfo)
                 : null;
             return {
                 trade: new xy_cross_chain_trade_1.XyCrossChainTrade({
@@ -189715,7 +189719,7 @@ const convert_gas_price_1 = __webpack_require__(/*! ../../utils/convert-gas-pric
  */
 class XyCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
     /** @internal */
-    static async getGasData(from, to, transactionRequest) {
+    static async getGasData(from, to, transactionRequest, feeInfo) {
         const fromBlockchain = from.blockchain;
         const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
         if (!walletAddress) {
@@ -189729,9 +189733,9 @@ class XyCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
                 gasData: null,
                 priceImpact: 0,
                 slippage: 0,
-                feeInfo: {},
+                feeInfo,
                 onChainTrade: null
-            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({});
+            }, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []).getContractParams({}, true);
             const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(fromBlockchain);
             const [gasLimit, gasDetails] = await Promise.all([
                 web3Public.getEstimatedGas(contractAbi, contractAddress, methodName, methodArguments, walletAddress, value),
@@ -189808,9 +189812,9 @@ class XyCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
             throw err;
         }
     }
-    async getContractParams(options) {
+    async getContractParams(options, skipAmountChangeCheck = false) {
         const receiverAddress = options?.receiverAddress || this.walletAddress;
-        const { data, value: providerValue, to: providerRouter } = await this.getTransactionRequest(receiverAddress);
+        const { data, value: providerValue, to: providerRouter } = await this.getTransactionRequest(receiverAddress, skipAmountChangeCheck);
         const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
             walletAddress: receiverAddress,
             fromTokenAmount: this.from,
@@ -189837,13 +189841,15 @@ class XyCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
     getTradeAmountRatio(fromUsd) {
         return fromUsd.dividedBy(this.to.tokenAmount);
     }
-    async getTransactionRequest(receiverAddress) {
+    async getTransactionRequest(receiverAddress, skipAmountChangeCheck = false) {
         const params = {
             ...this.transactionRequest,
             ...(receiverAddress && { receiveAddress: receiverAddress })
         };
         const { tx, toTokenAmount } = await injector_1.Injector.httpClient.get(`${xy_cross_chain_provider_1.XyCrossChainProvider.apiEndpoint}/swap`, { params: { ...params } });
-        await evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange(tx, toTokenAmount, this.to.stringWeiAmount);
+        if (!skipAmountChangeCheck) {
+            await evm_cross_chain_trade_1.EvmCrossChainTrade.checkAmountChange(tx, toTokenAmount, this.to.stringWeiAmount);
+        }
         return tx;
     }
     getTradeInfo() {