@sidhujag/sysweb3-keyring 1.0.578 → 1.0.580

package/cjs/transactions/ethereum.js

@@ -358,6 +358,29 @@ class EthereumTransactions {
             }
         };
         this.toBigNumber = (aBigNumberish) => bignumber_1.BigNumber.from(String(aBigNumberish));
+        this.toHex0x = (value, fieldName) => {
+            if (value === undefined || value === null)
+                return '0x0';
+            if (typeof value === 'string') {
+                const v = value.trim();
+                if (v === '')
+                    return '0x0';
+                if (v.startsWith('0x'))
+                    return v;
+                return bignumber_1.BigNumber.from(v).toHexString();
+            }
+            if (typeof value === 'number')
+                return bignumber_1.BigNumber.from(value).toHexString();
+            if (bignumber_1.BigNumber.isBigNumber(value))
+                return value.toHexString();
+            const maybeHex = value?._hex ?? value?.hex ?? value;
+            try {
+                return bignumber_1.BigNumber.from(maybeHex).toHexString();
+            }
+            catch (_e) {
+                throw new Error(`Invalid numeric field "${fieldName}" for EVM tx: ${String(value)}`);
+            }
+        };
         this.getData = ({ contractAddress, receivingAddress, value, }) => {
             const abi = (0, sysweb3_utils_1.getErc20Abi)();
             try {
@@ -385,7 +408,7 @@ class EthereumTransactions {
                     maxFeePerGas = gasPrice.mul(120).div(100); // 20% buffer on gas price
                     console.log('[zkSync] Fee data:', {
                         maxFeePerGas: maxFeePerGas.toString(),
-                        maxPriorityFeePerGas: maxPriorityFeePerGas.toString()
+                        maxPriorityFeePerGas: maxPriorityFeePerGas.toString(),
                     });
                     return { maxFeePerGas, maxPriorityFeePerGas };
                 }
@@ -394,7 +417,7 @@ class EthereumTransactions {
                     // Fallback for zkSync
                     return {
                         maxFeePerGas: bignumber_1.BigNumber.from('250000000'), // 0.25 gwei
-                        maxPriorityFeePerGas: bignumber_1.BigNumber.from('2500000') // 0.0025 gwei
+                        maxPriorityFeePerGas: bignumber_1.BigNumber.from('2500000'), // 0.0025 gwei
                     };
                 }
             }
@@ -408,7 +431,8 @@ class EthereumTransactions {
                         const ethMaxPriorityFee = await this.web3Provider.send('eth_maxPriorityFeePerGas', []);
                         maxPriorityFeePerGas = bignumber_1.BigNumber.from(ethMaxPriorityFee);
                         // Apply minimum priority fee override if set
-                        if (this.gasOverrides.minPriorityFee && maxPriorityFeePerGas.lt(this.gasOverrides.minPriorityFee)) {
+                        if (this.gasOverrides.minPriorityFee &&
+                            maxPriorityFeePerGas.lt(this.gasOverrides.minPriorityFee)) {
                             maxPriorityFeePerGas = this.gasOverrides.minPriorityFee;
                         }
                         if (maxPriorityFeePerGas.isZero()) {
@@ -419,9 +443,14 @@ class EthereumTransactions {
                         const baselineMaxFee = currentGasPrice.mul(120).div(100); // 20% above current gas price
                         // Calculate standard maxFeePerGas
                         const multiplier = this.gasOverrides.feeMultiplier || 250;
-                        const calculatedMaxFee = block.baseFeePerGas.mul(multiplier).div(100).add(maxPriorityFeePerGas);
+                        const calculatedMaxFee = block.baseFeePerGas
+                            .mul(multiplier)
+                            .div(100)
+                            .add(maxPriorityFeePerGas);
                         // Use the higher of the two to ensure transaction goes through
-                        maxFeePerGas = calculatedMaxFee.gt(baselineMaxFee) ? calculatedMaxFee : baselineMaxFee;
+                        maxFeePerGas = calculatedMaxFee.gt(baselineMaxFee)
+                            ? calculatedMaxFee
+                            : baselineMaxFee;
                     }
                     catch (e) {
                         // Use a more aggressive fallback strategy with higher priority fees
@@ -430,9 +459,11 @@ class EthereumTransactions {
                             const feeHistory = await this.web3Provider.send('eth_feeHistory', [
                                 '0x5', // Last 5 blocks
                                 'latest',
-                                [25, 50, 75] // Percentiles for priority fees
+                                [25, 50, 75], // Percentiles for priority fees
                             ]);
-                            if (feeHistory && feeHistory.reward && feeHistory.reward.length > 0) {
+                            if (feeHistory &&
+                                feeHistory.reward &&
+                                feeHistory.reward.length > 0) {
                                 // Use median of the 50th percentile from recent blocks
                                 const recentFees = feeHistory.reward
                                     .map((r) => r[1]) // Get 50th percentile
@@ -469,8 +500,13 @@ class EthereumTransactions {
                         // Calculate maxFeePerGas based on current network conditions
                         const currentGasPrice = await this.web3Provider.getGasPrice();
                         const baselineMaxFee = currentGasPrice.mul(120).div(100);
-                        const calculatedMaxFee = block.baseFeePerGas.mul(250).div(100).add(maxPriorityFeePerGas);
-                        maxFeePerGas = calculatedMaxFee.gt(baselineMaxFee) ? calculatedMaxFee : baselineMaxFee;
+                        const calculatedMaxFee = block.baseFeePerGas
+                            .mul(250)
+                            .div(100)
+                            .add(maxPriorityFeePerGas);
+                        maxFeePerGas = calculatedMaxFee.gt(baselineMaxFee)
+                            ? calculatedMaxFee
+                            : baselineMaxFee;
                     }
                     // Ensure maxFeePerGas is at least 20% higher than maxPriorityFeePerGas
                     const minMaxFee = maxPriorityFeePerGas.mul(120).div(100);
@@ -482,7 +518,10 @@ class EthereumTransactions {
                 else if (block && !block.baseFeePerGas) {
                     // For non-EIP1559 chains, return zeros to indicate legacy transaction should be used
                     console.log('Chain does not support EIP1559, use legacy transactions');
-                    return { maxFeePerGas: bignumber_1.BigNumber.from(0), maxPriorityFeePerGas: bignumber_1.BigNumber.from(0) };
+                    return {
+                        maxFeePerGas: bignumber_1.BigNumber.from(0),
+                        maxPriorityFeePerGas: bignumber_1.BigNumber.from(0),
+                    };
                 }
                 else if (!block)
                     throw new Error('Block not found');
@@ -681,9 +720,9 @@ class EthereumTransactions {
                         ...formattedTx,
                         gasLimit: typeof formattedTx.gasLimit === 'string'
                             ? formattedTx.gasLimit
-                            : this.toBigNumber(String(formattedTx.gasLimit || 0))._hex,
+                            : this.toHex0x(formattedTx.gasLimit, 'gasLimit'),
                         value: '0x0',
-                        nonce: this.toBigNumber(String(formattedTx.nonce || 0))._hex,
+                        nonce: this.toHex0x(formattedTx.nonce, 'nonce'),
                         chainId: activeNetwork.chainId,
                         type: isLegacy ? 0 : 2, // Need explicit type for hardware wallet serialization
                     };
@@ -691,19 +730,17 @@ class EthereumTransactions {
                         txFormattedForTrezor.gasPrice =
                             typeof formattedTx.gasPrice === 'string'
                                 ? formattedTx.gasPrice
-                                : this.toBigNumber(String(formattedTx.gasPrice || 0))._hex;
+                                : this.toHex0x(formattedTx.gasPrice, 'gasPrice');
                     }
                     else {
                         txFormattedForTrezor.maxFeePerGas =
                             typeof formattedTx.maxFeePerGas === 'string'
                                 ? formattedTx.maxFeePerGas
-                                : `${formattedTx.maxFeePerGas?._hex ||
-                                    formattedTx.maxFeePerGas}`;
+                                : this.toHex0x(formattedTx.maxFeePerGas, 'maxFeePerGas');
                         txFormattedForTrezor.maxPriorityFeePerGas =
                             typeof formattedTx.maxPriorityFeePerGas === 'string'
                                 ? formattedTx.maxPriorityFeePerGas
-                                : `${formattedTx.maxPriorityFeePerGas?._hex ||
-                                    formattedTx.maxPriorityFeePerGas}`;
+                                : this.toHex0x(formattedTx.maxPriorityFeePerGas, 'maxPriorityFeePerGas');
                     }
                     const signature = await this.trezorSigner.signEthTransaction({
                         coin: trezorCoin,
@@ -776,7 +813,8 @@ class EthereumTransactions {
             if (this.isZkSyncNetwork) {
                 // zkSync uses EIP-712 transactions but we can still use EIP-1559 format
                 // Ensure proper gas configuration for zkSync
-                if (!params.gasLimit || bignumber_1.BigNumber.from(params.gasLimit).lt(bignumber_1.BigNumber.from('500000'))) {
+                if (!params.gasLimit ||
+                    bignumber_1.BigNumber.from(params.gasLimit).lt(bignumber_1.BigNumber.from('500000'))) {
                     // zkSync typically needs higher gas limits
                     params.gasLimit = bignumber_1.BigNumber.from('1000000'); // 1M gas default for zkSync
                     console.log('[zkSync] Setting gas limit to 1M');
@@ -786,7 +824,9 @@ class EthereumTransactions {
                     console.log('[zkSync] Converting to EIP-1559 format');
                     isLegacy = false;
                     // Convert legacy to EIP-1559 for zkSync
-                    const gasPrice = params.gasPrice ? bignumber_1.BigNumber.from(params.gasPrice) : await this.web3Provider.getGasPrice();
+                    const gasPrice = params.gasPrice
+                        ? bignumber_1.BigNumber.from(params.gasPrice)
+                        : await this.web3Provider.getGasPrice();
                     params.maxFeePerGas = gasPrice.mul(120).div(100); // 20% buffer
                     params.maxPriorityFeePerGas = gasPrice.div(100); // 1% operator tip for zkSync
                     delete params.gasPrice;
@@ -805,7 +845,10 @@ class EthereumTransactions {
             }
             // Check if we should force legacy transactions for non-zkSync networks
             // Some networks have issues with EIP-1559 validation
-            if (!this.isZkSyncNetwork && !isLegacy && params.maxFeePerGas && params.maxPriorityFeePerGas) {
+            if (!this.isZkSyncNetwork &&
+                !isLegacy &&
+                params.maxFeePerGas &&
+                params.maxPriorityFeePerGas) {
                 const maxFee = bignumber_1.BigNumber.from(params.maxFeePerGas);
                 const priorityFee = bignumber_1.BigNumber.from(params.maxPriorityFeePerGas);
                 // If fees are zero or network doesn't support EIP-1559, use legacy
@@ -829,6 +872,30 @@ class EthereumTransactions {
                     params.gasLimit = minGasLimit;
                 }
             }
+            // MAX-send handling (native transfers only): recompute value at send-time
+            // using live balance and the final gas parameters we will actually submit.
+            // This avoids caller-side rounding/estimation mismatches (e.g. 42k vs 65k min gasLimit,
+            // EIP-1559->legacy switching, or fee changes) which otherwise surface as
+            // "insufficient funds for gas * price + value".
+            if (params.isMaxSend) {
+                const data = params.data;
+                const isSimpleTransfer = data === undefined ||
+                    data === null ||
+                    data === '0x' ||
+                    (typeof data === 'string' && data.toLowerCase() === '0x');
+                if (isSimpleTransfer && params.gasLimit) {
+                    const liveBalanceWei = await this.web3Provider.getBalance(activeAccount.address);
+                    const gasLimit = bignumber_1.BigNumber.from(params.gasLimit);
+                    // Use maxFeePerGas as worst-case for EIP-1559; gasPrice for legacy.
+                    const feePerGas = isLegacy || params.gasPrice
+                        ? bignumber_1.BigNumber.from(params.gasPrice || 0)
+                        : bignumber_1.BigNumber.from(params.maxFeePerGas || 0);
+                    const gasCostWei = gasLimit.mul(feePerGas);
+                    params.value = liveBalanceWei.gt(gasCostWei)
+                        ? liveBalanceWei.sub(gasCostWei)
+                        : constants_1.Zero;
+                }
+            }
             const sendEVMLedgerTransaction = async () => {
                 const transactionNonce = await this.getRecommendedNonce(activeAccount.address);
                 const formatParams = isLegacy
@@ -881,65 +948,39 @@ class EthereumTransactions {
                     case true:
                         txFormattedForTrezor = {
                             ...formatParams,
-                            gasLimit: typeof formatParams.gasLimit === 'string'
-                                ? formatParams.gasLimit
-                                : // @ts-ignore
-                                    `${params.gasLimit.hex}`,
-                            value: typeof formatParams.value === 'string' ||
-                                typeof formatParams.value === 'number'
-                                ? `${formatParams.value}`
-                                : // @ts-ignore
-                                    `${params.value.hex}`,
+                            gasLimit: this.toHex0x(formatParams.gasLimit ?? params.gasLimit, 'gasLimit'),
+                            value: this.toHex0x(formatParams.value ?? params.value, 'value'),
                             nonce: this.toBigNumber(transactionNonce)._hex,
                             chainId: activeNetwork.chainId,
+                            data: formatParams.data ?? '0x',
                         };
                         break;
                     case false:
                         txFormattedForTrezor = {
                             ...formatParams,
-                            gasLimit: typeof formatParams.gasLimit === 'string'
-                                ? formatParams.gasLimit
-                                : // @ts-ignore
-                                    `${params.gasLimit.hex}`,
-                            maxFeePerGas: typeof formatParams.maxFeePerGas === 'string'
-                                ? formatParams.maxFeePerGas
-                                : // @ts-ignore
-                                    `${params.maxFeePerGas.hex}`,
-                            maxPriorityFeePerGas: typeof formatParams.maxPriorityFeePerGas === 'string'
-                                ? formatParams.maxPriorityFeePerGas
-                                : // @ts-ignore
-                                    `${params.maxPriorityFeePerGas.hex}`,
-                            value: typeof formatParams.value === 'string' ||
-                                typeof formatParams.value === 'number'
-                                ? `${formatParams.value}`
-                                : // @ts-ignore
-                                    `${params.value.hex}`,
+                            gasLimit: this.toHex0x(formatParams.gasLimit ?? params.gasLimit, 'gasLimit'),
+                            maxFeePerGas: this.toHex0x(formatParams.maxFeePerGas ??
+                                params.maxFeePerGas, 'maxFeePerGas'),
+                            maxPriorityFeePerGas: this.toHex0x(formatParams.maxPriorityFeePerGas ??
+                                params.maxPriorityFeePerGas, 'maxPriorityFeePerGas'),
+                            value: this.toHex0x(formatParams.value ?? params.value, 'value'),
                             nonce: this.toBigNumber(transactionNonce)._hex,
                             chainId: activeNetwork.chainId,
+                            data: formatParams.data ?? '0x',
                         };
                         break;
                     default:
                         txFormattedForTrezor = {
                             ...formatParams,
-                            gasLimit: typeof formatParams.gasLimit === 'string'
-                                ? formatParams.gasLimit
-                                : // @ts-ignore
-                                    `${params.gasLimit.hex}`,
-                            maxFeePerGas: typeof formatParams.maxFeePerGas === 'string'
-                                ? formatParams.maxFeePerGas
-                                : // @ts-ignore
-                                    `${params.maxFeePerGas.hex}`,
-                            maxPriorityFeePerGas: typeof formatParams.maxPriorityFeePerGas === 'string'
-                                ? formatParams.maxPriorityFeePerGas
-                                : // @ts-ignore
-                                    `${params.maxPriorityFeePerGas.hex}`,
-                            value: typeof formatParams.value === 'string' ||
-                                typeof formatParams.value === 'number'
-                                ? `${formatParams.value}`
-                                : // @ts-ignore
-                                    `${params.value.hex}`,
+                            gasLimit: this.toHex0x(formatParams.gasLimit ?? params.gasLimit, 'gasLimit'),
+                            maxFeePerGas: this.toHex0x(formatParams.maxFeePerGas ??
+                                params.maxFeePerGas, 'maxFeePerGas'),
+                            maxPriorityFeePerGas: this.toHex0x(formatParams.maxPriorityFeePerGas ??
+                                params.maxPriorityFeePerGas, 'maxPriorityFeePerGas'),
+                            value: this.toHex0x(formatParams.value ?? params.value, 'value'),
                             nonce: this.toBigNumber(transactionNonce)._hex,
                             chainId: activeNetwork.chainId,
+                            data: formatParams.data ?? '0x',
                         };
                         break;
                 }
@@ -1224,11 +1265,11 @@ class EthereumTransactions {
                         ...formattedTx,
                         gasLimit: typeof formattedTx.gasLimit === 'string'
                             ? formattedTx.gasLimit
-                            : this.toBigNumber(String(formattedTx.gasLimit || 0))._hex,
+                            : this.toHex0x(formattedTx.gasLimit, 'gasLimit'),
                         value: typeof formattedTx.value === 'string'
                             ? formattedTx.value
-                            : this.toBigNumber(String(formattedTx.value || 0))._hex,
-                        nonce: this.toBigNumber(String(formattedTx.nonce || 0))._hex,
+                            : this.toHex0x(formattedTx.value, 'value'),
+                        nonce: this.toHex0x(formattedTx.nonce, 'nonce'),
                         chainId: activeNetwork.chainId,
                         type: isLegacy ? 0 : 2, // Need explicit type for hardware wallet serialization
                     };
@@ -1239,19 +1280,17 @@ class EthereumTransactions {
                         txFormattedForTrezor.gasPrice =
                             typeof formattedTx.gasPrice === 'string'
                                 ? formattedTx.gasPrice
-                                : this.toBigNumber(String(formattedTx.gasPrice || 0))._hex;
+                                : this.toHex0x(formattedTx.gasPrice, 'gasPrice');
                     }
                     else {
                         txFormattedForTrezor.maxFeePerGas =
                             typeof formattedTx.maxFeePerGas === 'string'
                                 ? formattedTx.maxFeePerGas
-                                : `${formattedTx.maxFeePerGas?._hex ||
-                                    formattedTx.maxFeePerGas}`;
+                                : this.toHex0x(formattedTx.maxFeePerGas, 'maxFeePerGas');
                         txFormattedForTrezor.maxPriorityFeePerGas =
                             typeof formattedTx.maxPriorityFeePerGas === 'string'
                                 ? formattedTx.maxPriorityFeePerGas
-                                : `${formattedTx.maxPriorityFeePerGas?._hex ||
-                                    formattedTx.maxPriorityFeePerGas}`;
+                                : this.toHex0x(formattedTx.maxPriorityFeePerGas, 'maxPriorityFeePerGas');
                     }
                     const signature = await this.trezorSigner.signEthTransaction({
                         coin: trezorCoin,
@@ -1996,12 +2035,16 @@ class EthereumTransactions {
                     // zkSync requires special gas estimation
                     // Use zks_estimateFee for more accurate estimation
                     try {
-                        const zkEstimate = await this.web3Provider.send('zks_estimateFee', [{
+                        const zkEstimate = await this.web3Provider.send('zks_estimateFee', [
+                            {
                                 from: tx.from,
                                 to: tx.to,
                                 data: tx.data || '0x',
-                                value: tx.value ? `0x${bignumber_1.BigNumber.from(tx.value).toHexString().slice(2)}` : '0x0'
-                            }]);
+                                value: tx.value
+                                    ? `0x${bignumber_1.BigNumber.from(tx.value).toHexString().slice(2)}`
+                                    : '0x0',
+                            },
+                        ]);
                         if (zkEstimate && zkEstimate.gas_limit) {
                             const gasLimit = bignumber_1.BigNumber.from(zkEstimate.gas_limit);
                             // Add 50% buffer for zkSync validation
@@ -2030,7 +2073,8 @@ class EthereumTransactions {
                 // First attempt: standard estimation
                 const estimated = await this.web3Provider.estimateGas(tx);
                 // Apply override if set
-                if (this.gasOverrides.minGasLimit && estimated.lt(this.gasOverrides.minGasLimit)) {
+                if (this.gasOverrides.minGasLimit &&
+                    estimated.lt(this.gasOverrides.minGasLimit)) {
                     return this.gasOverrides.minGasLimit;
                 }
                 // Add 20% buffer to the estimated gas
@@ -2046,7 +2090,7 @@ class EthereumTransactions {
                     const simpleEstimate = await this.web3Provider.estimateGas({
                         to: tx.to,
                         from: tx.from,
-                        value: tx.value || '0x0'
+                        value: tx.value || '0x0',
                     });
                     const withBuffer = simpleEstimate.mul(150).div(100); // 50% buffer for failed estimations
                     const minGas = this.gasOverrides.minGasLimit || bignumber_1.BigNumber.from('100000');
@@ -2108,28 +2152,30 @@ class EthereumTransactions {
                 return {
                     gasPrice: bufferedGasPrice,
                     maxFeePerGas: undefined,
-                    maxPriorityFeePerGas: undefined
+                    maxPriorityFeePerGas: undefined,
                 };
             }
             try {
                 // Try EIP-1559 fees first
                 const feeData = await this.getFeeDataWithDynamicMaxPriorityFeePerGas();
                 // If fees are zero or too low, fallback to legacy
-                if (!feeData.maxFeePerGas || feeData.maxFeePerGas.isZero() ||
-                    !feeData.maxPriorityFeePerGas || feeData.maxPriorityFeePerGas.isZero()) {
+                if (!feeData.maxFeePerGas ||
+                    feeData.maxFeePerGas.isZero() ||
+                    !feeData.maxPriorityFeePerGas ||
+                    feeData.maxPriorityFeePerGas.isZero()) {
                     console.log('EIP-1559 fees invalid, falling back to legacy gas price');
                     const gasPrice = await this.web3Provider.getGasPrice();
                     const bufferedGasPrice = gasPrice.mul(110).div(100);
                     return {
                         gasPrice: bufferedGasPrice,
                         maxFeePerGas: undefined,
-                        maxPriorityFeePerGas: undefined
+                        maxPriorityFeePerGas: undefined,
                     };
                 }
                 return {
                     gasPrice: undefined,
                     maxFeePerGas: feeData.maxFeePerGas,
-                    maxPriorityFeePerGas: feeData.maxPriorityFeePerGas
+                    maxPriorityFeePerGas: feeData.maxPriorityFeePerGas,
                 };
             }
             catch (error) {
@@ -2139,7 +2185,7 @@ class EthereumTransactions {
                 return {
                     gasPrice: bufferedGasPrice,
                     maxFeePerGas: undefined,
-                    maxPriorityFeePerGas: undefined
+                    maxPriorityFeePerGas: undefined,
                 };
             }
         };
@@ -2159,17 +2205,24 @@ class EthereumTransactions {
     }
     // Helper method to ensure providers are initialized when first needed
     ensureProvidersInitialized() {
-        if (!this._web3Provider) {
-            // Providers not initialized yet, initialize them now
-            try {
-                const currentNetwork = this.getNetwork();
+        // Keep provider in sync with current network selection.
+        // Hardware-wallet signing (e.g., Trezor) commits to a chainId; if the provider points at a different
+        // RPC/network than `activeNetwork`, nodes will reject broadcasts with chain-id mismatch errors.
+        try {
+            const currentNetwork = this.getNetwork();
+            const currentUrl = currentNetwork?.url;
+            const currentKey = `${currentNetwork?.chainId ?? 'unknown'}|${currentUrl ?? ''}`;
+            const needsInit = !this._web3Provider ||
+                !this._web3ProviderKey ||
+                (currentUrl && this._web3ProviderKey !== currentKey);
+            if (needsInit) {
                 this.setWeb3Provider(currentNetwork);
             }
-            catch (error) {
-                // If vault state not available yet, providers will be initialized later
-                // when setWeb3Provider is called explicitly
-                console.log('[EthereumTransactions] Deferring provider initialization:', error.message);
-            }
+        }
+        catch (error) {
+            // If vault state not available yet, providers will be initialized later
+            // when setWeb3Provider is called explicitly
+            console.log('[EthereumTransactions] Deferring provider initialization:', error?.message || error);
         }
     }
     // Helper method to detect UTXO networks
@@ -2208,17 +2261,23 @@ class EthereumTransactions {
             console.log('[EthereumTransactions] setWeb3Provider: Skipping web3Provider creation for UTXO network:', network.url);
             // Clear any existing providers for UTXO networks
             this._web3Provider = undefined;
+            this._web3ProviderKey = undefined;
         }
         else {
             this._web3Provider = new providers_1.CustomJsonRpcProvider(this.abortController.signal, network.url);
+            this._web3ProviderKey = `${network.chainId}|${network.url ?? ''}`;
         }
     }
     // Method to configure gas overrides for networks with validation issues
     setGasOverrides(overrides) {
         this.gasOverrides = {
-            minGasLimit: overrides.minGasLimit ? bignumber_1.BigNumber.from(overrides.minGasLimit) : undefined,
-            minPriorityFee: overrides.minPriorityFee ? bignumber_1.BigNumber.from(overrides.minPriorityFee) : undefined,
-            feeMultiplier: overrides.feeMultiplier
+            minGasLimit: overrides.minGasLimit
+                ? bignumber_1.BigNumber.from(overrides.minGasLimit)
+                : undefined,
+            minPriorityFee: overrides.minPriorityFee
+                ? bignumber_1.BigNumber.from(overrides.minPriorityFee)
+                : undefined,
+            feeMultiplier: overrides.feeMultiplier,
         };
     }
     // Get the current gas overrides