@sidhujag/sysweb3-keyring 1.0.597 → 1.0.599

package/cjs/transactions/ethereum.js

@@ -4,21 +4,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumTransactions = void 0;
-const bignumber_1 = require("@ethersproject/bignumber");
-const bytes_1 = require("@ethersproject/bytes");
-const constants_1 = require("@ethersproject/constants");
-const contracts_1 = require("@ethersproject/contracts");
-const properties_1 = require("@ethersproject/properties");
-const transactions_1 = require("@ethersproject/transactions");
-const units_1 = require("@ethersproject/units");
-const wallet_1 = require("@ethersproject/wallet");
 const eth_sig_util_1 = require("@metamask/eth-sig-util");
 const sysweb3_network_1 = require("@sidhujag/sysweb3-network");
 const sysweb3_utils_1 = require("@sidhujag/sysweb3-utils");
-const ethereumjs_util_1 = require("ethereumjs-util");
 const omit_1 = __importDefault(require("lodash/omit"));
+const ethers_v6_1 = require("../ethers-v6");
 const providers_1 = require("../providers");
 const types_1 = require("../types");
+const evm_local_signer_1 = require("./evm-local-signer");
+const derivation_paths_1 = require("../utils/derivation-paths");
+const stripHexPrefix = (value) => value.startsWith('0x') || value.startsWith('0X') ? value.slice(2) : value;
+const normalizeEthersOverrideValue = (value) => ethers_v6_1.BigNumber.isBigNumber(value) ? ethers_v6_1.BigNumber.from(value).toBigInt() : value;
+const normalizeEthersOverrides = (overrides) => {
+    const normalized = { ...overrides };
+    for (const field of [
+        'gasLimit',
+        'gasPrice',
+        'maxFeePerGas',
+        'maxPriorityFeePerGas',
+    ]) {
+        if (normalized[field] != null) {
+            normalized[field] = normalizeEthersOverrideValue(normalized[field]);
+        }
+    }
+    return normalized;
+};
 class EthereumTransactions {
     constructor(getNetwork, getDecryptedPrivateKey, getState, ledgerSigner, trezorSigner) {
         // Allow manual override of gas parameters when automatic estimation fails
@@ -38,7 +48,7 @@ class EthereumTransactions {
                     throw {
                         message: 'Decrypting for wrong address, change activeAccount maybe',
                     };
-                const privKey = Buffer.from((0, ethereumjs_util_1.stripHexPrefix)(decryptedPrivateKey), 'hex');
+                const privKey = Buffer.from(stripHexPrefix(decryptedPrivateKey), 'hex');
                 return (0, eth_sig_util_1.signTypedData)({
                     privateKey: privKey,
                     data: typedData,
@@ -111,17 +121,16 @@ class EthereumTransactions {
             let msg = '';
             //Comparisions do not need to care for checksum address
             if (params[0].toLowerCase() === address.toLowerCase()) {
-                msg = (0, ethereumjs_util_1.stripHexPrefix)(params[1]);
+                msg = stripHexPrefix(params[1]);
             }
             else if (params[1].toLowerCase() === address.toLowerCase()) {
-                msg = (0, ethereumjs_util_1.stripHexPrefix)(params[0]);
+                msg = stripHexPrefix(params[0]);
             }
             else {
                 throw new Error('Signing for wrong address');
             }
             const sign = () => {
                 try {
-                    const bufPriv = (0, ethereumjs_util_1.toBuffer)(decryptedPrivateKey);
                     // Validate and prepare the message for eth_sign
                     let msgHash;
                     // Check if message is a valid 32-byte hex string
@@ -135,9 +144,7 @@ class EthereumTransactions {
                             `Got message of length ${msg.length}: "${msg.substring(0, 50)}${msg.length > 50 ? '...' : ''}". ` +
                             `For signing arbitrary text, use personal_sign instead of eth_sign.`);
                     }
-                    const sig = (0, ethereumjs_util_1.ecsign)(msgHash, bufPriv);
-                    const resp = (0, eth_sig_util_1.concatSig)((0, ethereumjs_util_1.toBuffer)(sig.v), sig.r, sig.s);
-                    return resp;
+                    return (0, evm_local_signer_1.signDigestHex)(msgHash, decryptedPrivateKey);
                 }
                 catch (error) {
                     throw error;
@@ -203,16 +210,16 @@ class EthereumTransactions {
             }
             const signPersonalMessageWithDefaultWallet = () => {
                 try {
-                    const privateKey = (0, ethereumjs_util_1.toBuffer)(decryptedPrivateKey);
                     // Handle both hex-encoded and plain text messages for personal_sign
                     let message;
                     if (msg.startsWith('0x')) {
-                        // Message is hex-encoded
-                        try {
-                            message = (0, ethereumjs_util_1.toBuffer)(msg);
+                        const rawHex = stripHexPrefix(msg);
+                        if (rawHex.length % 2 === 0 && (0, ethers_v6_1.isHexString)(msg)) {
+                            // Message is valid hex-encoded bytes.
+                            message = Buffer.from(rawHex, 'hex');
                         }
-                        catch (error) {
-                            // If hex parsing fails, treat as plain text
+                        else {
+                            // Malformed 0x-prefixed strings are literal text, not lossy hex.
                             message = Buffer.from(msg, 'utf8');
                         }
                     }
@@ -220,10 +227,7 @@ class EthereumTransactions {
                         // Message is plain text
                         message = Buffer.from(msg, 'utf8');
                     }
-                    const msgHash = (0, ethereumjs_util_1.hashPersonalMessage)(message);
-                    const sig = (0, ethereumjs_util_1.ecsign)(msgHash, privateKey);
-                    const serialized = (0, eth_sig_util_1.concatSig)((0, ethereumjs_util_1.toBuffer)(sig.v), sig.r, sig.s);
-                    return serialized;
+                    return (0, evm_local_signer_1.signPersonalMessage)(message, decryptedPrivateKey);
                 }
                 catch (error) {
                     throw error;
@@ -289,7 +293,7 @@ class EthereumTransactions {
         };
         this.parsePersonalMessage = (hexMsg) => {
             try {
-                return (0, ethereumjs_util_1.toAscii)(hexMsg);
+                return (0, evm_local_signer_1.parsePersonalMessage)(hexMsg);
             }
             catch (error) {
                 throw error;
@@ -316,7 +320,7 @@ class EthereumTransactions {
             }
             const { decryptedPrivateKey } = this.getDecryptedPrivateKey();
             try {
-                return (0, eth_sig_util_1.getEncryptionPublicKey)((0, ethereumjs_util_1.stripHexPrefix)(decryptedPrivateKey));
+                return (0, eth_sig_util_1.getEncryptionPublicKey)(stripHexPrefix(decryptedPrivateKey));
             }
             catch (error) {
                 throw error;
@@ -341,13 +345,13 @@ class EthereumTransactions {
             else {
                 throw new Error('Decrypting for wrong receiver');
             }
-            encryptedData = (0, ethereumjs_util_1.stripHexPrefix)(encryptedData);
+            encryptedData = stripHexPrefix(encryptedData);
             try {
                 const buff = Buffer.from(encryptedData, 'hex');
                 const cleanData = JSON.parse(buff.toString('utf8'));
                 const sig = (0, eth_sig_util_1.decrypt)({
                     encryptedData: cleanData,
-                    privateKey: (0, ethereumjs_util_1.stripHexPrefix)(decryptedPrivateKey),
+                    privateKey: stripHexPrefix(decryptedPrivateKey),
                 });
                 return sig;
             }
@@ -355,7 +359,7 @@ class EthereumTransactions {
                 throw error;
             }
         };
-        this.toBigNumber = (aBigNumberish) => bignumber_1.BigNumber.from(String(aBigNumberish));
+        this.toBigNumber = (aBigNumberish) => ethers_v6_1.BigNumber.from(String(aBigNumberish));
         this.toHex0x = (value, fieldName) => {
             if (value === undefined || value === null)
                 return '0x0';
@@ -365,15 +369,15 @@ class EthereumTransactions {
                     return '0x0';
                 if (v.startsWith('0x'))
                     return v;
-                return bignumber_1.BigNumber.from(v).toHexString();
+                return ethers_v6_1.BigNumber.from(v).toHexString();
             }
             if (typeof value === 'number')
-                return bignumber_1.BigNumber.from(value).toHexString();
-            if (bignumber_1.BigNumber.isBigNumber(value))
+                return ethers_v6_1.BigNumber.from(value).toHexString();
+            if (ethers_v6_1.BigNumber.isBigNumber(value))
                 return value.toHexString();
             const maybeHex = value?._hex ?? value?.hex ?? value;
             try {
-                return bignumber_1.BigNumber.from(maybeHex).toHexString();
+                return ethers_v6_1.BigNumber.from(maybeHex).toHexString();
             }
             catch (_e) {
                 throw new Error(`Invalid numeric field "${fieldName}" for EVM tx: ${String(value)}`);
@@ -383,9 +387,10 @@ class EthereumTransactions {
             const abi = (0, sysweb3_utils_1.getErc20Abi)();
             try {
                 const contract = (0, sysweb3_utils_1.createContractUsingAbi)(abi, contractAddress, this.web3Provider);
-                const data = contract.methods
-                    .transfer(receivingAddress, value)
-                    .encodeABI();
+                const data = contract.interface.encodeFunctionData('transfer', [
+                    receivingAddress,
+                    value,
+                ]);
                 return data;
             }
             catch (error) {
@@ -399,11 +404,12 @@ class EthereumTransactions {
                 // First, try to get the current gas price as a baseline
                 const currentGasPrice = await this.web3Provider.getGasPrice();
                 const block = await this.web3Provider.getBlock('latest');
-                if (block && block.baseFeePerGas) {
+                if (block && block.baseFeePerGas != null) {
+                    const baseFeePerGas = ethers_v6_1.BigNumber.from(block.baseFeePerGas);
                     try {
                         // Some networks don't support this RPC method
                         const ethMaxPriorityFee = await this.web3Provider.send('eth_maxPriorityFeePerGas', []);
-                        maxPriorityFeePerGas = bignumber_1.BigNumber.from(ethMaxPriorityFee);
+                        maxPriorityFeePerGas = ethers_v6_1.BigNumber.from(ethMaxPriorityFee);
                         // Apply minimum priority fee override if set
                         if (this.gasOverrides.minPriorityFee &&
                             maxPriorityFeePerGas.lt(this.gasOverrides.minPriorityFee)) {
@@ -417,7 +423,7 @@ 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
+                        const calculatedMaxFee = baseFeePerGas
                             .mul(multiplier)
                             .div(100)
                             .add(maxPriorityFeePerGas);
@@ -442,7 +448,7 @@ class EthereumTransactions {
                                 const recentFees = feeHistory.reward
                                     .map((r) => r[1]) // Get 50th percentile
                                     .filter((f) => f && f !== '0x0')
-                                    .map((f) => bignumber_1.BigNumber.from(f));
+                                    .map((f) => ethers_v6_1.BigNumber.from(f));
                                 if (recentFees.length > 0) {
                                     // Use the median value with a 50% buffer for better reliability
                                     const sortedFees = recentFees.sort((a, b) => a.sub(b).isNegative() ? -1 : 1);
@@ -451,12 +457,12 @@ class EthereumTransactions {
                                 }
                                 else {
                                     // Fallback with higher default (5 gwei for better validation)
-                                    maxPriorityFeePerGas = bignumber_1.BigNumber.from('5000000000');
+                                    maxPriorityFeePerGas = ethers_v6_1.BigNumber.from('5000000000');
                                 }
                             }
                             else {
                                 // Fallback with higher default (5 gwei for better validation)
-                                maxPriorityFeePerGas = bignumber_1.BigNumber.from('5000000000');
+                                maxPriorityFeePerGas = ethers_v6_1.BigNumber.from('5000000000');
                             }
                         }
                         catch (feeHistoryError) {
@@ -466,7 +472,7 @@ class EthereumTransactions {
                             const currentGasPrice = await this.web3Provider.getGasPrice();
                             maxPriorityFeePerGas = currentGasPrice.mul(10).div(100);
                             // Ensure minimum of 1 gwei
-                            const minPriority = bignumber_1.BigNumber.from('1000000000');
+                            const minPriority = ethers_v6_1.BigNumber.from('1000000000');
                             if (maxPriorityFeePerGas.lt(minPriority)) {
                                 maxPriorityFeePerGas = minPriority;
                             }
@@ -474,7 +480,7 @@ 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
+                        const calculatedMaxFee = baseFeePerGas
                             .mul(250)
                             .div(100)
                             .add(maxPriorityFeePerGas);
@@ -489,12 +495,12 @@ class EthereumTransactions {
                     }
                     return { maxFeePerGas, maxPriorityFeePerGas };
                 }
-                else if (block && !block.baseFeePerGas) {
+                else if (block && block.baseFeePerGas == null) {
                     // 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),
+                        maxFeePerGas: ethers_v6_1.BigNumber.from(0),
+                        maxPriorityFeePerGas: ethers_v6_1.BigNumber.from(0),
                     };
                 }
                 else if (!block)
@@ -519,7 +525,7 @@ class EthereumTransactions {
                 const newValue = feeValue * multiplierToUse;
                 const calculateValue = String(newValue);
                 const convertValueToHex = '0x' + parseInt(calculateValue, 10).toString(16);
-                return bignumber_1.BigNumber.from(convertValueToHex);
+                return ethers_v6_1.BigNumber.from(convertValueToHex);
             };
             const maxFeePerGasToNumber = maxFeePerGas?.toNumber();
             const maxPriorityFeePerGasToNumber = maxPriorityFeePerGas?.toNumber();
@@ -537,7 +543,7 @@ class EthereumTransactions {
             if (isForCancel) {
                 const DEFAULT_GAS_LIMIT_VALUE = '42000';
                 const convertToHex = '0x' + parseInt(DEFAULT_GAS_LIMIT_VALUE, 10).toString(16);
-                newGasValues.gasLimit = bignumber_1.BigNumber.from(convertToHex);
+                newGasValues.gasLimit = ethers_v6_1.BigNumber.from(convertToHex);
             }
             if (!isForCancel) {
                 newGasValues.gasLimit = calculateAndConvertNewValue(gasLimitToNumber);
@@ -557,10 +563,10 @@ class EthereumTransactions {
                     tx = {
                         from: activeAccount.address,
                         to: activeAccount.address,
-                        value: constants_1.Zero,
+                        value: ethers_v6_1.Zero,
                         nonce: fallbackNonce,
                         gasPrice: currentGasPrice,
-                        gasLimit: bignumber_1.BigNumber.from(42000),
+                        gasLimit: ethers_v6_1.BigNumber.from(42000),
                         data: '0x',
                     };
                 }
@@ -569,11 +575,11 @@ class EthereumTransactions {
                     tx = {
                         from: activeAccount.address,
                         to: activeAccount.address,
-                        value: constants_1.Zero,
+                        value: ethers_v6_1.Zero,
                         nonce: fallbackNonce,
-                        maxFeePerGas: bignumber_1.BigNumber.from(feeData.maxFeePerGas || 0),
-                        maxPriorityFeePerGas: bignumber_1.BigNumber.from(feeData.maxPriorityFeePerGas || 0),
-                        gasLimit: bignumber_1.BigNumber.from(42000),
+                        maxFeePerGas: ethers_v6_1.BigNumber.from(feeData.maxFeePerGas || 0),
+                        maxPriorityFeePerGas: ethers_v6_1.BigNumber.from(feeData.maxPriorityFeePerGas || 0),
+                        gasLimit: ethers_v6_1.BigNumber.from(42000),
                         data: '0x',
                     };
                 }
@@ -607,8 +613,8 @@ class EthereumTransactions {
                     oldTxsGasValues.maxFeePerGas.isZero()) {
                     // Fetch current network fee data for replacement
                     const feeData = await this.getFeeDataWithDynamicMaxPriorityFeePerGas();
-                    oldTxsGasValues.maxFeePerGas = bignumber_1.BigNumber.from(feeData.maxFeePerGas || 0);
-                    oldTxsGasValues.maxPriorityFeePerGas = bignumber_1.BigNumber.from(feeData.maxPriorityFeePerGas || 0);
+                    oldTxsGasValues.maxFeePerGas = ethers_v6_1.BigNumber.from(feeData.maxFeePerGas || 0);
+                    oldTxsGasValues.maxPriorityFeePerGas = ethers_v6_1.BigNumber.from(feeData.maxPriorityFeePerGas || 0);
                 }
             }
             const newGasValues = this.calculateNewGasValues(oldTxsGasValues, true, isLegacy || false);
@@ -617,7 +623,7 @@ class EthereumTransactions {
                 nonce: tx.nonce,
                 from: activeAccount.address,
                 to: activeAccount.address,
-                value: constants_1.Zero,
+                value: ethers_v6_1.Zero,
                 gasLimit: newGasValues.gasLimit,
             };
             const changedTxToCancel = isLegacy
@@ -635,7 +641,7 @@ class EthereumTransactions {
             // Ledger cancel handler
             const cancelWithLedger = async () => {
                 try {
-                    const resolvedParams = await (0, properties_1.resolveProperties)((0, omit_1.default)(changedTxToCancel, 'from'));
+                    const resolvedParams = await (0, ethers_v6_1.resolveProperties)((0, omit_1.default)(changedTxToCancel, 'from'));
                     const formatParams = {
                         ...resolvedParams,
                         nonce: resolvedParams.nonce
@@ -653,7 +659,7 @@ class EthereumTransactions {
                             chainId: activeNetwork.chainId,
                             type: 2, // Need explicit type for hardware wallet serialization
                         };
-                    const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
+                    const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
                     const signature = await this.ledgerSigner.evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
@@ -664,7 +670,7 @@ class EthereumTransactions {
                         v: parseInt(signature.v, 16),
                     };
                     if (signature) {
-                        const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
+                        const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, formattedSignature);
                         const transactionResponse = await this.web3Provider.sendTransaction(signedTx);
                         return {
                             isCanceled: true,
@@ -689,7 +695,7 @@ class EthereumTransactions {
             const cancelWithTrezor = async () => {
                 try {
                     const trezorCoin = activeNetwork.slip44 === 60 ? 'eth' : activeNetwork.currency;
-                    const formattedTx = await (0, properties_1.resolveProperties)((0, omit_1.default)(changedTxToCancel, 'from'));
+                    const formattedTx = await (0, ethers_v6_1.resolveProperties)((0, omit_1.default)(changedTxToCancel, 'from'));
                     const txFormattedForTrezor = {
                         ...formattedTx,
                         gasLimit: typeof formattedTx.gasLimit === 'string'
@@ -723,7 +729,7 @@ class EthereumTransactions {
                         slip44: activeNetwork.slip44,
                     });
                     if (signature.success) {
-                        const signedTx = (0, transactions_1.serialize)(txFormattedForTrezor, signature.payload);
+                        const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForTrezor, signature.payload);
                         const transactionResponse = await this.web3Provider.sendTransaction(signedTx);
                         return {
                             isCanceled: true,
@@ -748,8 +754,7 @@ class EthereumTransactions {
             const cancelWithPrivateKey = async () => {
                 try {
                     const { decryptedPrivateKey } = this.getDecryptedPrivateKey();
-                    const wallet = new wallet_1.Wallet(decryptedPrivateKey, this.web3Provider);
-                    const transactionResponse = await wallet.sendTransaction(changedTxToCancel);
+                    const transactionResponse = await (0, evm_local_signer_1.sendLocalEvmTransaction)(this.web3Provider, decryptedPrivateKey, changedTxToCancel);
                     if (transactionResponse) {
                         return {
                             isCanceled: true,
@@ -786,8 +791,8 @@ class EthereumTransactions {
             // Check if we should force legacy transactions for networks with EIP-1559 issues
             // Some networks have issues with EIP-1559 validation
             if (!isLegacy && params.maxFeePerGas && params.maxPriorityFeePerGas) {
-                const maxFee = bignumber_1.BigNumber.from(params.maxFeePerGas);
-                const priorityFee = bignumber_1.BigNumber.from(params.maxPriorityFeePerGas);
+                const maxFee = ethers_v6_1.BigNumber.from(params.maxFeePerGas);
+                const priorityFee = ethers_v6_1.BigNumber.from(params.maxPriorityFeePerGas);
                 // If fees are zero or network doesn't support EIP-1559, use legacy
                 if (maxFee.isZero() || priorityFee.isZero()) {
                     console.log('Switching to legacy transaction due to zero fees');
@@ -801,10 +806,11 @@ class EthereumTransactions {
                     delete params.maxPriorityFeePerGas;
                 }
             }
-            // Ensure minimum gas limit for validation
-            if (params.gasLimit) {
-                const minGasLimit = this.gasOverrides.minGasLimit || bignumber_1.BigNumber.from('65000');
-                const currentGasLimit = bignumber_1.BigNumber.from(params.gasLimit);
+            // Only apply a minimum gas limit when a network-specific override is set.
+            // Otherwise keep the user/dapp-approved gas limit unchanged.
+            if (params.gasLimit && this.gasOverrides.minGasLimit) {
+                const minGasLimit = this.gasOverrides.minGasLimit;
+                const currentGasLimit = ethers_v6_1.BigNumber.from(params.gasLimit);
                 if (currentGasLimit.lt(minGasLimit)) {
                     params.gasLimit = minGasLimit;
                 }
@@ -827,7 +833,7 @@ class EthereumTransactions {
                         chainId: activeNetwork.chainId,
                         type: 2, // Need explicit type for hardware wallet serialization
                     };
-                const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
+                const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
                 const signature = await this.ledgerSigner.evm.signEVMTransaction({
                     rawTx: rawTx.replace('0x', ''),
                     accountIndex: activeAccountId,
@@ -839,7 +845,7 @@ class EthereumTransactions {
                 };
                 if (signature) {
                     try {
-                        const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
+                        const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, formattedSignature);
                         const finalTx = await this.web3Provider.sendTransaction(signedTx);
                         return finalTx;
                     }
@@ -919,7 +925,7 @@ class EthereumTransactions {
                                 type: 2, // Need explicit type for hardware wallet serialization
                             };
                         signature.payload.v = parseInt(signature.payload.v, 16); //v parameter must be a number by ethers standards
-                        const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, signature.payload);
+                        const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, signature.payload);
                         const finalTx = await this.web3Provider.sendTransaction(signedTx);
                         return finalTx;
                     }
@@ -943,9 +949,8 @@ class EthereumTransactions {
                 const tx = isLegacy
                     ? { ...params, type: 0 } // Force Type 0 for legacy transactions
                     : (0, omit_1.default)(params, ['gasPrice']); // Strip gasPrice for EIP-1559
-                const wallet = new wallet_1.Wallet(decryptedPrivateKey, this.web3Provider);
                 try {
-                    const transaction = await wallet.sendTransaction(tx);
+                    const transaction = await (0, evm_local_signer_1.sendLocalEvmTransaction)(this.web3Provider, decryptedPrivateKey, tx);
                     const response = await this.web3Provider.getTransaction(transaction.hash);
                     //TODO: more precisely on this lines
                     if (!response) {
@@ -1028,8 +1033,8 @@ class EthereumTransactions {
                     oldTxsGasValues.maxFeePerGas.isZero()) {
                     // Fetch current network fee data for replacement
                     const feeData = await this.getFeeDataWithDynamicMaxPriorityFeePerGas();
-                    oldTxsGasValues.maxFeePerGas = bignumber_1.BigNumber.from(feeData.maxFeePerGas || 0);
-                    oldTxsGasValues.maxPriorityFeePerGas = bignumber_1.BigNumber.from(feeData.maxPriorityFeePerGas || 0);
+                    oldTxsGasValues.maxFeePerGas = ethers_v6_1.BigNumber.from(feeData.maxFeePerGas || 0);
+                    oldTxsGasValues.maxPriorityFeePerGas = ethers_v6_1.BigNumber.from(feeData.maxPriorityFeePerGas || 0);
                 }
             }
             if (!isLegacy) {
@@ -1055,7 +1060,7 @@ class EthereumTransactions {
                         // For non-contract calls, reduce value to fit within balance (clamp at zero)
                         adjustedValue = currentBalance.gt(newGasCost)
                             ? currentBalance.sub(newGasCost)
-                            : constants_1.Zero;
+                            : ethers_v6_1.Zero;
                     }
                 }
                 txWithEditedFee = {
@@ -1091,7 +1096,7 @@ class EthereumTransactions {
                         // For non-contract calls, reduce value to fit within balance (clamp at zero)
                         adjustedValue = currentBalance.gt(newGasCost)
                             ? currentBalance.sub(newGasCost)
-                            : constants_1.Zero;
+                            : ethers_v6_1.Zero;
                     }
                 }
                 txWithEditedFee = {
@@ -1108,7 +1113,7 @@ class EthereumTransactions {
             // Ledger speedup handler
             const speedUpWithLedger = async () => {
                 try {
-                    const resolvedParams = await (0, properties_1.resolveProperties)((0, omit_1.default)(txWithEditedFee, 'from'));
+                    const resolvedParams = await (0, ethers_v6_1.resolveProperties)((0, omit_1.default)(txWithEditedFee, 'from'));
                     const formatParams = {
                         ...resolvedParams,
                         nonce: resolvedParams.nonce
@@ -1126,7 +1131,7 @@ class EthereumTransactions {
                             chainId: activeNetwork.chainId,
                             type: 2, // Need explicit type for hardware wallet serialization
                         };
-                    const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
+                    const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
                     const signature = await this.ledgerSigner.evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
@@ -1137,7 +1142,7 @@ class EthereumTransactions {
                         v: parseInt(signature.v, 16),
                     };
                     if (signature) {
-                        const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
+                        const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, formattedSignature);
                         const transactionResponse = await this.web3Provider.sendTransaction(signedTx);
                         return {
                             isSpeedUp: true,
@@ -1173,7 +1178,7 @@ class EthereumTransactions {
             const speedUpWithTrezor = async () => {
                 try {
                     const trezorCoin = activeNetwork.slip44 === 60 ? 'eth' : activeNetwork.currency;
-                    const formattedTx = await (0, properties_1.resolveProperties)((0, omit_1.default)(txWithEditedFee, 'from'));
+                    const formattedTx = await (0, ethers_v6_1.resolveProperties)((0, omit_1.default)(txWithEditedFee, 'from'));
                     const txFormattedForTrezor = {
                         ...formattedTx,
                         gasLimit: typeof formattedTx.gasLimit === 'string'
@@ -1212,7 +1217,7 @@ class EthereumTransactions {
                         slip44: activeNetwork.slip44,
                     });
                     if (signature.success) {
-                        const signedTx = (0, transactions_1.serialize)(txFormattedForTrezor, signature.payload);
+                        const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForTrezor, signature.payload);
                         const transactionResponse = await this.web3Provider.sendTransaction(signedTx);
                         return {
                             isSpeedUp: true,
@@ -1248,9 +1253,7 @@ class EthereumTransactions {
             const speedUpWithPrivateKey = async () => {
                 try {
                     const { decryptedPrivateKey } = this.getDecryptedPrivateKey();
-                    const wallet = new wallet_1.Wallet(decryptedPrivateKey, this.web3Provider);
-                    // Type already set in txWithEditedFee
-                    const transactionResponse = await wallet.sendTransaction(txWithEditedFee);
+                    const transactionResponse = await (0, evm_local_signer_1.sendLocalEvmTransaction)(this.web3Provider, decryptedPrivateKey, txWithEditedFee);
                     if (transactionResponse) {
                         return {
                             isSpeedUp: true,
@@ -1298,45 +1301,47 @@ class EthereumTransactions {
             const { accounts, activeAccountType, activeAccountId, activeNetwork } = this.getState();
             const { address: activeAccountAddress } = accounts[activeAccountType][activeAccountId];
             const sendERC20Token = async () => {
-                const currentWallet = new wallet_1.Wallet(decryptedPrivateKey);
-                const walletSigned = currentWallet.connect(this.web3Provider);
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), walletSigned);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), this.web3Provider);
                     // Preserve zero-decimal tokens: use provided decimals when defined (including 0).
                     const resolvedDecimals = decimals === undefined || decimals === null ? 18 : Number(decimals);
-                    const calculatedTokenAmount = (0, units_1.parseUnits)(tokenAmount, resolvedDecimals);
+                    const calculatedTokenAmount = (0, ethers_v6_1.parseUnits)(tokenAmount, resolvedDecimals).toBigInt();
                     let transferMethod;
                     if (isLegacy) {
                         const overrides = {
-                            nonce: await this.web3Provider.getTransactionCount(walletSigned.address, 'pending'),
+                            nonce: await this.web3Provider.getTransactionCount(activeAccountAddress, 'pending'),
                             gasPrice,
                             ...(gasLimit && { gasLimit }),
                             type: 0, // Explicitly set Type 0 for legacy token transfers
                         };
-                        transferMethod = await _contract.transfer(receiver, calculatedTokenAmount, overrides);
+                        transferMethod = await _contract.transfer.populateTransaction(receiver, calculatedTokenAmount, normalizeEthersOverrides(overrides));
                     }
                     else {
                         const overrides = {
-                            nonce: await this.web3Provider.getTransactionCount(walletSigned.address, 'pending'),
+                            nonce: await this.web3Provider.getTransactionCount(activeAccountAddress, 'pending'),
                             maxPriorityFeePerGas,
                             maxFeePerGas,
                             ...(gasLimit && { gasLimit }),
                         };
-                        transferMethod = await _contract.transfer(receiver, calculatedTokenAmount, overrides);
+                        transferMethod = await _contract.transfer.populateTransaction(receiver, calculatedTokenAmount, normalizeEthersOverrides(overrides));
                     }
-                    return transferMethod;
+                    return await (0, evm_local_signer_1.sendLocalEvmTransaction)(this.web3Provider, decryptedPrivateKey, {
+                        ...transferMethod,
+                        chainId: activeNetwork.chainId,
+                        from: activeAccountAddress,
+                        value: '0x0',
+                    });
                 }
                 catch (error) {
                     throw error;
                 }
             };
             const sendERC20TokenOnLedger = async () => {
-                const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), signer);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), this.web3Provider);
                     const resolvedDecimals = decimals === undefined || decimals === null ? 18 : Number(decimals);
-                    const calculatedTokenAmount = (0, units_1.parseUnits)(tokenAmount, resolvedDecimals);
+                    const calculatedTokenAmount = (0, ethers_v6_1.parseUnits)(tokenAmount, resolvedDecimals).toBigInt();
                     const txData = _contract.interface.encodeFunctionData('transfer', [
                         receiver,
                         calculatedTokenAmount,
@@ -1369,7 +1374,7 @@ class EthereumTransactions {
                             type: 2, // Need explicit type for hardware wallet serialization
                         };
                     }
-                    const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
+                    const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
                     const signature = await this.ledgerSigner.evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
@@ -1381,7 +1386,7 @@ class EthereumTransactions {
                     };
                     if (signature) {
                         try {
-                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
+                            const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, formattedSignature);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             saveTrezorTx && saveTrezorTx(finalTx);
                             return finalTx;
@@ -1399,12 +1404,11 @@ class EthereumTransactions {
                 }
             };
             const sendERC20TokenOnTrezor = async () => {
-                const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), signer);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), this.web3Provider);
                     const resolvedDecimals = decimals === undefined || decimals === null ? 18 : Number(decimals);
-                    const calculatedTokenAmount = (0, units_1.parseUnits)(tokenAmount, resolvedDecimals);
+                    const calculatedTokenAmount = (0, ethers_v6_1.parseUnits)(tokenAmount, resolvedDecimals).toBigInt();
                     const txData = _contract.interface.encodeFunctionData('transfer', [
                         receiver,
                         calculatedTokenAmount,
@@ -1475,7 +1479,7 @@ class EthereumTransactions {
                                 };
                             }
                             signature.payload.v = parseInt(signature.payload.v, 16); //v parameter must be a number by ethers standards
-                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, signature.payload);
+                            const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, signature.payload);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             saveTrezorTx && saveTrezorTx(finalTx);
                             return finalTx;
@@ -1498,7 +1502,7 @@ class EthereumTransactions {
                 case types_1.KeyringAccountType.Ledger:
                     return await sendERC20TokenOnLedger();
                 default:
-                    return await sendERC20Token();
+                    return (await sendERC20Token());
             }
         };
         this.sendSignedErc721Transaction = async ({ receiver, tokenAddress, tokenId, isLegacy, maxPriorityFeePerGas, maxFeePerGas, gasPrice, gasLimit, }) => {
@@ -1506,40 +1510,42 @@ class EthereumTransactions {
             const { accounts, activeAccountType, activeAccountId, activeNetwork } = this.getState();
             const { address: activeAccountAddress } = accounts[activeAccountType][activeAccountId];
             const sendERC721Token = async () => {
-                const currentWallet = new wallet_1.Wallet(decryptedPrivateKey);
-                const walletSigned = currentWallet.connect(this.web3Provider);
                 let transferMethod;
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), walletSigned);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), this.web3Provider);
                     if (isLegacy) {
                         const overrides = {
-                            nonce: await this.web3Provider.getTransactionCount(walletSigned.address, 'pending'),
+                            nonce: await this.web3Provider.getTransactionCount(activeAccountAddress, 'pending'),
                             gasPrice,
                             ...(gasLimit && { gasLimit }),
                             type: 0, // Explicitly set Type 0 for legacy NFT transfers
                         };
-                        transferMethod = await _contract.transferFrom(walletSigned.address, receiver, tokenId, overrides);
+                        transferMethod = await _contract.transferFrom.populateTransaction(activeAccountAddress, receiver, tokenId, normalizeEthersOverrides(overrides));
                     }
                     else {
                         const overrides = {
-                            nonce: await this.web3Provider.getTransactionCount(walletSigned.address, 'pending'),
+                            nonce: await this.web3Provider.getTransactionCount(activeAccountAddress, 'pending'),
                             maxPriorityFeePerGas,
                             maxFeePerGas,
                             ...(gasLimit && { gasLimit }),
                         };
-                        transferMethod = await _contract.transferFrom(walletSigned.address, receiver, tokenId, overrides);
+                        transferMethod = await _contract.transferFrom.populateTransaction(activeAccountAddress, receiver, tokenId, normalizeEthersOverrides(overrides));
                     }
-                    return transferMethod;
+                    return await (0, evm_local_signer_1.sendLocalEvmTransaction)(this.web3Provider, decryptedPrivateKey, {
+                        ...transferMethod,
+                        chainId: activeNetwork.chainId,
+                        from: activeAccountAddress,
+                        value: '0x0',
+                    });
                 }
                 catch (error) {
                     throw error;
                 }
             };
             const sendERC721TokenOnLedger = async () => {
-                const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), signer);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), this.web3Provider);
                     const txData = _contract.interface.encodeFunctionData('transferFrom', [
                         activeAccountAddress,
                         receiver,
@@ -1573,7 +1579,7 @@ class EthereumTransactions {
                             type: 2, // Need explicit type for hardware wallet serialization
                         };
                     }
-                    const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
+                    const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
                     const signature = await this.ledgerSigner.evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
@@ -1585,7 +1591,7 @@ class EthereumTransactions {
                     };
                     if (signature) {
                         try {
-                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
+                            const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, formattedSignature);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             return finalTx;
                         }
@@ -1602,10 +1608,9 @@ class EthereumTransactions {
                 }
             };
             const sendERC721TokenOnTrezor = async () => {
-                const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), signer);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), this.web3Provider);
                     const txData = _contract.interface.encodeFunctionData('transferFrom', [
                         activeAccountAddress,
                         receiver,
@@ -1680,7 +1685,7 @@ class EthereumTransactions {
                                 };
                             }
                             signature.payload.v = parseInt(signature.payload.v, 16); //v parameter must be a number by ethers standards
-                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, signature.payload);
+                            const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, signature.payload);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             return finalTx;
                         }
@@ -1704,7 +1709,7 @@ class EthereumTransactions {
                 case types_1.KeyringAccountType.Ledger:
                     return await sendERC721TokenOnLedger();
                 default:
-                    return await sendERC721Token();
+                    return (await sendERC721Token());
             }
         };
         this.sendSignedErc1155Transaction = async ({ receiver, tokenAddress, tokenId, tokenAmount, isLegacy, maxPriorityFeePerGas, maxFeePerGas, gasPrice, gasLimit, }) => {
@@ -1712,17 +1717,15 @@ class EthereumTransactions {
             const { accounts, activeAccountType, activeAccountId, activeNetwork } = this.getState();
             const { address: activeAccountAddress } = accounts[activeAccountType][activeAccountId];
             const sendERC1155Token = async () => {
-                const currentWallet = new wallet_1.Wallet(decryptedPrivateKey);
-                const walletSigned = currentWallet.connect(this.web3Provider);
                 let transferMethod;
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), walletSigned);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), this.web3Provider);
                     // Use BigNumber to avoid JS number overflow/precision loss
-                    const amount = bignumber_1.BigNumber.from(tokenAmount ?? '1');
+                    const amount = ethers_v6_1.BigNumber.from(tokenAmount ?? '1');
                     let overrides;
                     if (isLegacy) {
                         overrides = {
-                            nonce: await this.web3Provider.getTransactionCount(walletSigned.address, 'pending'),
+                            nonce: await this.web3Provider.getTransactionCount(activeAccountAddress, 'pending'),
                             gasPrice,
                             ...(gasLimit && { gasLimit }),
                             type: 0, // Explicitly set Type 0 for legacy ERC1155 transfers
@@ -1730,26 +1733,30 @@ class EthereumTransactions {
                     }
                     else {
                         overrides = {
-                            nonce: await this.web3Provider.getTransactionCount(walletSigned.address, 'pending'),
+                            nonce: await this.web3Provider.getTransactionCount(activeAccountAddress, 'pending'),
                             maxPriorityFeePerGas,
                             maxFeePerGas,
                             ...(gasLimit && { gasLimit }),
                         };
                     }
-                    transferMethod = await _contract.safeTransferFrom(walletSigned.address, receiver, tokenId, amount, [], overrides);
-                    return transferMethod;
+                    transferMethod = await _contract.safeTransferFrom.populateTransaction(activeAccountAddress, receiver, tokenId, amount.toBigInt(), [], normalizeEthersOverrides(overrides));
+                    return await (0, evm_local_signer_1.sendLocalEvmTransaction)(this.web3Provider, decryptedPrivateKey, {
+                        ...transferMethod,
+                        chainId: activeNetwork.chainId,
+                        from: activeAccountAddress,
+                        value: '0x0',
+                    });
                 }
                 catch (error) {
                     throw error;
                 }
             };
             const sendERC1155TokenOnLedger = async () => {
-                const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), signer);
-                    const amount = bignumber_1.BigNumber.from(tokenAmount ?? '1');
-                    const txData = _contract.interface.encodeFunctionData('safeTransferFrom', [activeAccountAddress, receiver, tokenId, amount, []]);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), this.web3Provider);
+                    const amount = ethers_v6_1.BigNumber.from(tokenAmount ?? '1');
+                    const txData = _contract.interface.encodeFunctionData('safeTransferFrom', [activeAccountAddress, receiver, tokenId, amount.toBigInt(), []]);
                     // Use fallback gas limit if not provided (for auto-estimation)
                     const effectiveGasLimit = gasLimit || this.toBigNumber('200000'); // ERC1155 fallback
                     let txFormattedForEthers;
@@ -1778,7 +1785,7 @@ class EthereumTransactions {
                             type: 2, // Need explicit type for hardware wallet serialization
                         };
                     }
-                    const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
+                    const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
                     const signature = await this.ledgerSigner.evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
@@ -1790,7 +1797,7 @@ class EthereumTransactions {
                     };
                     if (signature) {
                         try {
-                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
+                            const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, formattedSignature);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             return finalTx;
                         }
@@ -1807,12 +1814,11 @@ class EthereumTransactions {
                 }
             };
             const sendERC1155TokenOnTrezor = async () => {
-                const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), signer);
-                    const amount = bignumber_1.BigNumber.from(tokenAmount ?? '1');
-                    const txData = _contract.interface.encodeFunctionData('safeTransferFrom', [activeAccountAddress, receiver, tokenId, amount, []]);
+                    const _contract = new ethers_v6_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), this.web3Provider);
+                    const amount = ethers_v6_1.BigNumber.from(tokenAmount ?? '1');
+                    const txData = _contract.interface.encodeFunctionData('safeTransferFrom', [activeAccountAddress, receiver, tokenId, amount.toBigInt(), []]);
                     // Use fallback gas limit if not provided (for auto-estimation)
                     const effectiveGasLimit = gasLimit || this.toBigNumber('200000'); // ERC1155 fallback
                     let txToBeSignedByTrezor;
@@ -1879,7 +1885,7 @@ class EthereumTransactions {
                                 };
                             }
                             signature.payload.v = parseInt(signature.payload.v, 16); //v parameter must be a number by ethers standards
-                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, signature.payload);
+                            const signedTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers, signature.payload);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             return finalTx;
                         }
@@ -1903,7 +1909,7 @@ class EthereumTransactions {
                 case types_1.KeyringAccountType.Ledger:
                     return await sendERC1155TokenOnLedger();
                 default:
-                    return await sendERC1155Token();
+                    return (await sendERC1155Token());
             }
         };
         this.getRecommendedNonce = async (address) => {
@@ -1917,12 +1923,12 @@ class EthereumTransactions {
         this.getFeeByType = async (type) => {
             const gasPrice = (await this.getRecommendedGasPrice(false));
             const low = this.toBigNumber(gasPrice)
-                .mul(bignumber_1.BigNumber.from('8'))
-                .div(bignumber_1.BigNumber.from('10'))
+                .mul(ethers_v6_1.BigNumber.from('8'))
+                .div(ethers_v6_1.BigNumber.from('10'))
                 .toString();
             const high = this.toBigNumber(gasPrice)
-                .mul(bignumber_1.BigNumber.from('11'))
-                .div(bignumber_1.BigNumber.from('10'))
+                .mul(ethers_v6_1.BigNumber.from('11'))
+                .div(ethers_v6_1.BigNumber.from('10'))
                 .toString();
             if (type === 'low')
                 return low;
@@ -1935,29 +1941,36 @@ class EthereumTransactions {
                 const estimated = await this.web3Provider.estimateGas({
                     to: toAddress,
                 });
-                return Number((0, units_1.formatUnits)(estimated, 'gwei'));
+                return Number((0, ethers_v6_1.formatUnits)(estimated, 'gwei'));
             }
             catch (error) {
                 throw error;
             }
         };
         this.getTxGasLimit = async (tx) => {
+            const hasCalldata = Boolean(tx.data && tx.data !== '0x' && tx.data !== '0x0');
             try {
                 // First attempt: standard estimation
                 const estimated = await this.web3Provider.estimateGas(tx);
-                // Apply override if set
+                // Add 20% buffer to the estimated gas
+                const withBuffer = estimated.mul(120).div(100);
+                // Apply an explicit per-network floor only when configured.
                 if (this.gasOverrides.minGasLimit &&
-                    estimated.lt(this.gasOverrides.minGasLimit)) {
+                    withBuffer.lt(this.gasOverrides.minGasLimit)) {
                     return this.gasOverrides.minGasLimit;
                 }
-                // Add 20% buffer to the estimated gas
-                const withBuffer = estimated.mul(120).div(100);
-                // Ensure minimum of 65k for validation
-                const minGas = bignumber_1.BigNumber.from('65000');
-                return withBuffer.gt(minGas) ? withBuffer : minGas;
+                return withBuffer;
             }
             catch (error) {
                 console.warn('Gas estimation failed:', error);
+                if (hasCalldata) {
+                    const calldataFallback = ethers_v6_1.BigNumber.from('100000');
+                    if (this.gasOverrides.minGasLimit &&
+                        calldataFallback.lt(this.gasOverrides.minGasLimit)) {
+                        return this.gasOverrides.minGasLimit;
+                    }
+                    return calldataFallback;
+                }
                 // Try a simpler estimation for basic transfers
                 try {
                     const simpleEstimate = await this.web3Provider.estimateGas({
@@ -1966,13 +1979,16 @@ class EthereumTransactions {
                         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');
-                    return withBuffer.gt(minGas) ? withBuffer : minGas;
+                    if (this.gasOverrides.minGasLimit &&
+                        withBuffer.lt(this.gasOverrides.minGasLimit)) {
+                        return this.gasOverrides.minGasLimit;
+                    }
+                    return withBuffer;
                 }
                 catch (secondError) {
                     // Ultimate fallback
                     console.warn('Simple estimation also failed, using default', secondError);
-                    return this.gasOverrides.minGasLimit || bignumber_1.BigNumber.from('100000');
+                    return this.gasOverrides.minGasLimit || ethers_v6_1.BigNumber.from('100000');
                 }
             }
         };
@@ -1981,8 +1997,8 @@ class EthereumTransactions {
                 const gasPriceBN = await this.web3Provider.getGasPrice();
                 if (formatted) {
                     return {
-                        gwei: Number((0, units_1.formatUnits)(gasPriceBN, 'gwei')).toFixed(2),
-                        ethers: (0, units_1.formatEther)(gasPriceBN),
+                        gwei: Number((0, ethers_v6_1.formatUnits)(gasPriceBN, 'gwei')).toFixed(2),
+                        ethers: (0, ethers_v6_1.formatEther)(gasPriceBN),
                     };
                 }
                 return gasPriceBN.toString();
@@ -1994,7 +2010,7 @@ class EthereumTransactions {
         this.getBalance = async (address) => {
             try {
                 const balance = await this.web3Provider.getBalance(address);
-                const formattedBalance = (0, units_1.formatEther)(balance);
+                const formattedBalance = (0, ethers_v6_1.formatEther)(balance);
                 return parseFloat(formattedBalance); // Return full precision
             }
             catch (error) {
@@ -2009,12 +2025,10 @@ class EthereumTransactions {
             };
         };
         this.importAccount = (mnemonicOrPrivKey) => {
-            if ((0, bytes_1.isHexString)(mnemonicOrPrivKey)) {
-                return new wallet_1.Wallet(mnemonicOrPrivKey);
+            if ((0, ethers_v6_1.isHexString)(mnemonicOrPrivKey)) {
+                return (0, evm_local_signer_1.privateKeyToAccount)(mnemonicOrPrivKey);
             }
-            const { privateKey } = wallet_1.Wallet.fromMnemonic(mnemonicOrPrivKey);
-            const account = new wallet_1.Wallet(privateKey);
-            return account;
+            return (0, evm_local_signer_1.deriveEvmAccountFromMnemonic)(mnemonicOrPrivKey, (0, derivation_paths_1.getAddressDerivationPath)('eth', 60, 0, false, 0));
         };
         // Method to get safe fee data that works around network-specific validation issues
         this.getSafeFeeData = async (forceLegacy = false) => {
@@ -2128,10 +2142,10 @@ class EthereumTransactions {
     setGasOverrides(overrides) {
         this.gasOverrides = {
             minGasLimit: overrides.minGasLimit
-                ? bignumber_1.BigNumber.from(overrides.minGasLimit)
+                ? ethers_v6_1.BigNumber.from(overrides.minGasLimit)
                 : undefined,
             minPriorityFee: overrides.minPriorityFee
-                ? bignumber_1.BigNumber.from(overrides.minPriorityFee)
+                ? ethers_v6_1.BigNumber.from(overrides.minPriorityFee)
                 : undefined,
             feeMultiplier: overrides.feeMultiplier,
         };