@sidhujag/sysweb3-keyring 1.0.509 → 1.0.511

package/cjs/transactions/ethereum.js

@@ -4,11 +4,17 @@ 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 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 eth_sig_util_1 = require("eth-sig-util");
 const ethereumjs_util_1 = require("ethereumjs-util");
-const ethers_1 = require("ethers");
 const omit_1 = __importDefault(require("lodash/omit"));
 const providers_1 = require("../providers");
 const types_1 = require("../types");
@@ -34,13 +40,17 @@ class EthereumTransactions {
                     message: `Account state mismatch detected. Expected ${activeAccount.address} but got ${address}. Please try again after account switching completes.`,
                 };
             }
-            const signTypedData = () => {
+            const signTypedDataLocal = () => {
                 if (addr.toLowerCase() !== address.toLowerCase())
                     throw {
                         message: 'Decrypting for wrong address, change activeAccount maybe',
                     };
                 const privKey = Buffer.from((0, ethereumjs_util_1.stripHexPrefix)(decryptedPrivateKey), 'hex');
-                return (0, eth_sig_util_1.signTypedMessage)(privKey, { data: typedData }, version);
+                return (0, eth_sig_util_1.signTypedData)({
+                    privateKey: privKey,
+                    data: typedData,
+                    version,
+                });
             };
             const signTypedDataWithLedger = async () => {
                 if (addr.toLowerCase() !== activeAccount.address.toLowerCase())
@@ -71,16 +81,12 @@ class EthereumTransactions {
                 case types_1.KeyringAccountType.Ledger:
                     return await signTypedDataWithLedger();
                 default:
-                    return signTypedData();
+                    return signTypedDataLocal();
             }
         };
         this.verifyTypedSignature = (data, signature, version) => {
             try {
-                const msgParams = {
-                    data,
-                    sig: signature,
-                };
-                return (0, eth_sig_util_1.recoverTypedMessage)(msgParams, version);
+                return (0, eth_sig_util_1.recoverTypedSignature)({ data: data, signature, version });
             }
             catch (error) {
                 throw error;
@@ -287,7 +293,7 @@ class EthereumTransactions {
             try {
                 const msgParams = {
                     data: message,
-                    sig: sign,
+                    signature: sign,
                 };
                 return (0, eth_sig_util_1.recoverPersonalSignature)(msgParams);
             }
@@ -321,14 +327,17 @@ class EthereumTransactions {
             try {
                 const buff = Buffer.from(encryptedData, 'hex');
                 const cleanData = JSON.parse(buff.toString('utf8'));
-                const sig = (0, eth_sig_util_1.decrypt)(cleanData, (0, ethereumjs_util_1.stripHexPrefix)(decryptedPrivateKey));
+                const sig = (0, eth_sig_util_1.decrypt)({
+                    encryptedData: cleanData,
+                    privateKey: (0, ethereumjs_util_1.stripHexPrefix)(decryptedPrivateKey),
+                });
                 return sig;
             }
             catch (error) {
                 throw error;
             }
         };
-        this.toBigNumber = (aBigNumberish) => ethers_1.ethers.BigNumber.from(String(aBigNumberish));
+        this.toBigNumber = (aBigNumberish) => bignumber_1.BigNumber.from(String(aBigNumberish));
         this.getData = ({ contractAddress, receivingAddress, value, }) => {
             const abi = (0, sysweb3_utils_1.getErc20Abi)();
             try {
@@ -350,11 +359,11 @@ class EthereumTransactions {
                 if (block && block.baseFeePerGas) {
                     try {
                         const ethMaxPriorityFee = await this.web3Provider.send('eth_maxPriorityFeePerGas', []);
-                        maxPriorityFeePerGas = ethers_1.ethers.BigNumber.from(ethMaxPriorityFee);
+                        maxPriorityFeePerGas = bignumber_1.BigNumber.from(ethMaxPriorityFee);
                         maxFeePerGas = block.baseFeePerGas.mul(2).add(maxPriorityFeePerGas);
                     }
                     catch (e) {
-                        maxPriorityFeePerGas = ethers_1.ethers.BigNumber.from('1500000000');
+                        maxPriorityFeePerGas = bignumber_1.BigNumber.from('1500000000');
                         maxFeePerGas = block.baseFeePerGas.mul(2).add(maxPriorityFeePerGas);
                     }
                     return { maxFeePerGas, maxPriorityFeePerGas };
@@ -383,7 +392,7 @@ class EthereumTransactions {
             const calculateAndConvertNewValue = (feeValue) => {
                 const calculateValue = String(feeValue * multiplierToUse);
                 const convertValueToHex = '0x' + parseInt(calculateValue, 10).toString(16);
-                return ethers_1.ethers.BigNumber.from(convertValueToHex);
+                return bignumber_1.BigNumber.from(convertValueToHex);
             };
             const maxFeePerGasToNumber = maxFeePerGas?.toNumber();
             const maxPriorityFeePerGasToNumber = maxPriorityFeePerGas?.toNumber();
@@ -400,7 +409,7 @@ class EthereumTransactions {
             if (isForCancel) {
                 const DEFAULT_GAS_LIMIT_VALUE = '21000';
                 const convertToHex = '0x' + parseInt(DEFAULT_GAS_LIMIT_VALUE, 10).toString(16);
-                newGasValues.gasLimit = ethers_1.ethers.BigNumber.from(convertToHex);
+                newGasValues.gasLimit = bignumber_1.BigNumber.from(convertToHex);
             }
             if (!isForCancel) {
                 newGasValues.gasLimit = calculateAndConvertNewValue(gasLimitToNumber);
@@ -418,7 +427,7 @@ class EthereumTransactions {
                 };
             }
             const { decryptedPrivateKey } = this.getDecryptedPrivateKey();
-            const wallet = new ethers_1.ethers.Wallet(decryptedPrivateKey, this.web3Provider);
+            const wallet = new wallet_1.Wallet(decryptedPrivateKey, this.web3Provider);
             let changedTxToCancel;
             const oldTxsGasValues = {
                 maxFeePerGas: tx.maxFeePerGas,
@@ -434,7 +443,7 @@ class EthereumTransactions {
                     nonce: tx.nonce,
                     from: wallet.address,
                     to: wallet.address,
-                    value: ethers_1.ethers.constants.Zero,
+                    value: constants_1.Zero,
                     maxFeePerGas: newGasValues.maxFeePerGas,
                     maxPriorityFeePerGas: newGasValues.maxPriorityFeePerGas,
                     gasLimit: newGasValues.gasLimit,
@@ -448,7 +457,7 @@ class EthereumTransactions {
                     nonce: tx.nonce,
                     from: wallet.address,
                     to: wallet.address,
-                    value: ethers_1.ethers.constants.Zero,
+                    value: constants_1.Zero,
                     gasLimit: newGasValues.gasLimit,
                     gasPrice: newGasValues.gasPrice,
                 };
@@ -498,7 +507,7 @@ class EthereumTransactions {
                         chainId: activeNetwork.chainId,
                         type: 2,
                     };
-                const rawTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers);
+                const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
                 const signature = await this.ledgerSigner.evm.signEVMTransaction({
                     rawTx: rawTx.replace('0x', ''),
                     accountIndex: activeAccountId,
@@ -510,7 +519,7 @@ class EthereumTransactions {
                 };
                 if (signature) {
                     try {
-                        const signedTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers, formattedSignature);
+                        const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
                         const finalTx = await this.web3Provider.sendTransaction(signedTx);
                         return finalTx;
                     }
@@ -613,7 +622,7 @@ class EthereumTransactions {
                                 type: 2,
                             };
                         signature.payload.v = parseInt(signature.payload.v, 16); //v parameter must be a number by ethers standards
-                        const signedTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers, signature.payload);
+                        const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, signature.payload);
                         const finalTx = await this.web3Provider.sendTransaction(signedTx);
                         return finalTx;
                     }
@@ -633,7 +642,7 @@ class EthereumTransactions {
                     throw new Error(`Account state mismatch detected during transaction. Expected ${activeAccount.address} but got ${address}. Please wait for account switching to complete and try again.`);
                 }
                 const tx = params;
-                const wallet = new ethers_1.ethers.Wallet(decryptedPrivateKey, this.web3Provider);
+                const wallet = new wallet_1.Wallet(decryptedPrivateKey, this.web3Provider);
                 try {
                     const transaction = await wallet.sendTransaction(tx);
                     const response = await this.web3Provider.getTransaction(transaction.hash);
@@ -667,7 +676,7 @@ class EthereumTransactions {
                 };
             }
             const { decryptedPrivateKey, address } = this.getDecryptedPrivateKey();
-            const wallet = new ethers_1.ethers.Wallet(decryptedPrivateKey, this.web3Provider);
+            const wallet = new wallet_1.Wallet(decryptedPrivateKey, this.web3Provider);
             // Check if this might be a max send transaction by comparing total cost to balance
             const currentBalance = await this.web3Provider.getBalance(address);
             // Ensure all transaction values are resolved from promises
@@ -714,7 +723,7 @@ class EthereumTransactions {
                         // For non-contract calls, reduce value to fit within balance
                         adjustedValue = currentBalance.sub(newGasCost);
                         // Ensure we don't go below a minimum threshold (0.0001 ETH)
-                        const minValue = ethers_1.ethers.utils.parseEther('0.0001');
+                        const minValue = (0, units_1.parseEther)('0.0001');
                         if (adjustedValue.lt(minValue)) {
                             console.warn('[SpeedUp] Adjusted value too low, keeping original');
                             adjustedValue = txValue;
@@ -751,7 +760,7 @@ class EthereumTransactions {
                         // For non-contract calls, reduce value to fit within balance
                         adjustedValue = currentBalance.sub(newGasCost);
                         // Ensure we don't go below a minimum threshold (0.0001 ETH)
-                        const minValue = ethers_1.ethers.utils.parseEther('0.0001');
+                        const minValue = (0, units_1.parseEther)('0.0001');
                         if (adjustedValue.lt(minValue)) {
                             console.warn('[SpeedUp] Adjusted value too low, keeping original');
                             adjustedValue = txValue;
@@ -799,9 +808,9 @@ class EthereumTransactions {
         this.sendTransaction = async ({ sender, receivingAddress, amount, gasLimit, token, }) => {
             const tokenDecimals = token && token.decimals ? token.decimals : 18;
             const decimals = this.toBigNumber(tokenDecimals);
-            const parsedAmount = ethers_1.ethers.utils.parseEther(String(amount));
+            const parsedAmount = (0, units_1.parseEther)(String(amount));
             const { decryptedPrivateKey } = this.getDecryptedPrivateKey();
-            const wallet = new ethers_1.ethers.Wallet(decryptedPrivateKey, this.web3Provider);
+            const wallet = new wallet_1.Wallet(decryptedPrivateKey, this.web3Provider);
             const value = token && token.contract_address
                 ? parsedAmount.mul(this.toBigNumber('10').pow(decimals))
                 : parsedAmount;
@@ -845,13 +854,13 @@ class EthereumTransactions {
             const { accounts, activeAccountType, activeAccountId, activeNetwork } = this.getState();
             const { address: activeAccountAddress } = accounts[activeAccountType][activeAccountId];
             const sendERC20Token = async () => {
-                const currentWallet = new ethers_1.ethers.Wallet(decryptedPrivateKey);
+                const currentWallet = new wallet_1.Wallet(decryptedPrivateKey);
                 const walletSigned = currentWallet.connect(this.web3Provider);
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), walletSigned);
-                    const calculatedTokenAmount = ethers_1.ethers.BigNumber.from(decimals
-                        ? ethers_1.ethers.utils.parseUnits(tokenAmount, this.toBigNumber(decimals))
-                        : ethers_1.ethers.utils.parseEther(tokenAmount));
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), walletSigned);
+                    const calculatedTokenAmount = bignumber_1.BigNumber.from(decimals
+                        ? (0, units_1.parseUnits)(tokenAmount, this.toBigNumber(decimals))
+                        : (0, units_1.parseEther)(tokenAmount));
                     let transferMethod;
                     if (isLegacy) {
                         const overrides = {
@@ -880,8 +889,8 @@ class EthereumTransactions {
                 const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), signer);
-                    const calculatedTokenAmount = ethers_1.ethers.BigNumber.from(ethers_1.ethers.utils.parseEther(tokenAmount));
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), signer);
+                    const calculatedTokenAmount = bignumber_1.BigNumber.from((0, units_1.parseEther)(tokenAmount));
                     const txData = _contract.interface.encodeFunctionData('transfer', [
                         receiver,
                         calculatedTokenAmount,
@@ -914,7 +923,7 @@ class EthereumTransactions {
                             type: 2,
                         };
                     }
-                    const rawTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers);
+                    const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
                     const signature = await this.ledgerSigner.evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
@@ -926,7 +935,7 @@ class EthereumTransactions {
                     };
                     if (signature) {
                         try {
-                            const signedTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers, formattedSignature);
+                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             saveTrezorTx && saveTrezorTx(finalTx);
                             return finalTx;
@@ -947,8 +956,8 @@ class EthereumTransactions {
                 const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), signer);
-                    const calculatedTokenAmount = ethers_1.ethers.BigNumber.from(ethers_1.ethers.utils.parseEther(tokenAmount));
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc20Abi)(), signer);
+                    const calculatedTokenAmount = bignumber_1.BigNumber.from((0, units_1.parseEther)(tokenAmount));
                     const txData = _contract.interface.encodeFunctionData('transfer', [
                         receiver,
                         calculatedTokenAmount,
@@ -1019,7 +1028,7 @@ class EthereumTransactions {
                                 };
                             }
                             signature.payload.v = parseInt(signature.payload.v, 16); //v parameter must be a number by ethers standards
-                            const signedTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers, signature.payload);
+                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, signature.payload);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             saveTrezorTx && saveTrezorTx(finalTx);
                             return finalTx;
@@ -1050,11 +1059,11 @@ class EthereumTransactions {
             const { accounts, activeAccountType, activeAccountId, activeNetwork } = this.getState();
             const { address: activeAccountAddress } = accounts[activeAccountType][activeAccountId];
             const sendERC721Token = async () => {
-                const currentWallet = new ethers_1.ethers.Wallet(decryptedPrivateKey);
+                const currentWallet = new wallet_1.Wallet(decryptedPrivateKey);
                 const walletSigned = currentWallet.connect(this.web3Provider);
                 let transferMethod;
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), walletSigned);
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), walletSigned);
                     if (isLegacy) {
                         const overrides = {
                             nonce: await this.web3Provider.getTransactionCount(walletSigned.address, 'pending'),
@@ -1079,7 +1088,7 @@ class EthereumTransactions {
                 const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), signer);
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), signer);
                     const txData = _contract.interface.encodeFunctionData('transferFrom', [
                         activeAccountAddress,
                         receiver,
@@ -1113,7 +1122,7 @@ class EthereumTransactions {
                             type: 2,
                         };
                     }
-                    const rawTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers);
+                    const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
                     const signature = await this.ledgerSigner.evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
@@ -1125,7 +1134,7 @@ class EthereumTransactions {
                     };
                     if (signature) {
                         try {
-                            const signedTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers, formattedSignature);
+                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             return finalTx;
                         }
@@ -1145,7 +1154,7 @@ class EthereumTransactions {
                 const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), signer);
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc21Abi)(), signer);
                     const txData = _contract.interface.encodeFunctionData('transferFrom', [
                         activeAccountAddress,
                         receiver,
@@ -1220,7 +1229,7 @@ class EthereumTransactions {
                                 };
                             }
                             signature.payload.v = parseInt(signature.payload.v, 16); //v parameter must be a number by ethers standards
-                            const signedTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers, signature.payload);
+                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, signature.payload);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             return finalTx;
                         }
@@ -1252,11 +1261,11 @@ class EthereumTransactions {
             const { accounts, activeAccountType, activeAccountId, activeNetwork } = this.getState();
             const { address: activeAccountAddress } = accounts[activeAccountType][activeAccountId];
             const sendERC1155Token = async () => {
-                const currentWallet = new ethers_1.ethers.Wallet(decryptedPrivateKey);
+                const currentWallet = new wallet_1.Wallet(decryptedPrivateKey);
                 const walletSigned = currentWallet.connect(this.web3Provider);
                 let transferMethod;
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), walletSigned);
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), walletSigned);
                     const amount = tokenAmount ? parseInt(tokenAmount) : 1;
                     const overrides = {};
                     transferMethod = await _contract.safeTransferFrom(walletSigned.address, receiver, tokenId, amount, [], overrides);
@@ -1270,7 +1279,7 @@ class EthereumTransactions {
                 const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), signer);
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), signer);
                     const amount = tokenAmount ? parseInt(tokenAmount) : 1;
                     const txData = _contract.interface.encodeFunctionData('safeTransferFrom', [activeAccountAddress, receiver, tokenId, amount, []]);
                     // Use fallback gas limit if not provided (for auto-estimation)
@@ -1301,7 +1310,7 @@ class EthereumTransactions {
                             type: 2,
                         };
                     }
-                    const rawTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers);
+                    const rawTx = (0, transactions_1.serialize)(txFormattedForEthers);
                     const signature = await this.ledgerSigner.evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
@@ -1313,7 +1322,7 @@ class EthereumTransactions {
                     };
                     if (signature) {
                         try {
-                            const signedTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers, formattedSignature);
+                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, formattedSignature);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             return finalTx;
                         }
@@ -1333,7 +1342,7 @@ class EthereumTransactions {
                 const signer = this.web3Provider.getSigner(activeAccountAddress);
                 const transactionNonce = await this.getRecommendedNonce(activeAccountAddress);
                 try {
-                    const _contract = new ethers_1.ethers.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), signer);
+                    const _contract = new contracts_1.Contract(tokenAddress, (0, sysweb3_utils_1.getErc55Abi)(), signer);
                     const amount = tokenAmount ? parseInt(tokenAmount) : 1;
                     const txData = _contract.interface.encodeFunctionData('safeTransferFrom', [activeAccountAddress, receiver, tokenId, amount, []]);
                     // Use fallback gas limit if not provided (for auto-estimation)
@@ -1402,7 +1411,7 @@ class EthereumTransactions {
                                 };
                             }
                             signature.payload.v = parseInt(signature.payload.v, 16); //v parameter must be a number by ethers standards
-                            const signedTx = ethers_1.ethers.utils.serializeTransaction(txFormattedForEthers, signature.payload);
+                            const signedTx = (0, transactions_1.serialize)(txFormattedForEthers, signature.payload);
                             const finalTx = await this.web3Provider.sendTransaction(signedTx);
                             return finalTx;
                         }
@@ -1440,12 +1449,12 @@ class EthereumTransactions {
         this.getFeeByType = async (type) => {
             const gasPrice = (await this.getRecommendedGasPrice(false));
             const low = this.toBigNumber(gasPrice)
-                .mul(ethers_1.ethers.BigNumber.from('8'))
-                .div(ethers_1.ethers.BigNumber.from('10'))
+                .mul(bignumber_1.BigNumber.from('8'))
+                .div(bignumber_1.BigNumber.from('10'))
                 .toString();
             const high = this.toBigNumber(gasPrice)
-                .mul(ethers_1.ethers.BigNumber.from('11'))
-                .div(ethers_1.ethers.BigNumber.from('10'))
+                .mul(bignumber_1.BigNumber.from('11'))
+                .div(bignumber_1.BigNumber.from('10'))
                 .toString();
             if (type === 'low')
                 return low;
@@ -1458,7 +1467,7 @@ class EthereumTransactions {
                 const estimated = await this.web3Provider.estimateGas({
                     to: toAddress,
                 });
-                return Number(ethers_1.ethers.utils.formatUnits(estimated, 'gwei'));
+                return Number((0, units_1.formatUnits)(estimated, 'gwei'));
             }
             catch (error) {
                 throw error;
@@ -1477,8 +1486,8 @@ class EthereumTransactions {
                 const gasPriceBN = await this.web3Provider.getGasPrice();
                 if (formatted) {
                     return {
-                        gwei: Number(ethers_1.ethers.utils.formatUnits(gasPriceBN, 'gwei')).toFixed(2),
-                        ethers: ethers_1.ethers.utils.formatEther(gasPriceBN),
+                        gwei: Number((0, units_1.formatUnits)(gasPriceBN, 'gwei')).toFixed(2),
+                        ethers: (0, units_1.formatEther)(gasPriceBN),
                     };
                 }
                 return gasPriceBN.toString();
@@ -1490,7 +1499,7 @@ class EthereumTransactions {
         this.getBalance = async (address) => {
             try {
                 const balance = await this.web3Provider.getBalance(address);
-                const formattedBalance = ethers_1.ethers.utils.formatEther(balance);
+                const formattedBalance = (0, units_1.formatEther)(balance);
                 return parseFloat(formattedBalance); // Return full precision
             }
             catch (error) {
@@ -1505,11 +1514,11 @@ class EthereumTransactions {
             };
         };
         this.importAccount = (mnemonicOrPrivKey) => {
-            if (ethers_1.ethers.utils.isHexString(mnemonicOrPrivKey)) {
-                return new ethers_1.ethers.Wallet(mnemonicOrPrivKey);
+            if ((0, bytes_1.isHexString)(mnemonicOrPrivKey)) {
+                return new wallet_1.Wallet(mnemonicOrPrivKey);
             }
-            const { privateKey } = ethers_1.ethers.Wallet.fromMnemonic(mnemonicOrPrivKey);
-            const account = new ethers_1.ethers.Wallet(privateKey);
+            const { privateKey } = wallet_1.Wallet.fromMnemonic(mnemonicOrPrivKey);
+            const account = new wallet_1.Wallet(privateKey);
             return account;
         };
         this.getNetwork = getNetwork;