@cityofzion/bs-ethereum 3.1.17 → 3.1.18

package/dist/BSEthereum.d.ts

@@ -1,11 +1,9 @@
 import { type TBSAccount, type TTransferIntent, type TBSToken, type TTransferParams, type TGetLedgerTransport, type ITokenService, type TBSNetwork, type IBlockchainDataService, type IExchangeDataService, type INftDataService, type IExplorerService, type TPingNetworkResponse, type IFullTransactionsDataService, type TTransactionDefault, type TBSNetworkId, BSBigUnitAmount } from '@cityofzion/blockchain-service';
-import { ethers } from 'ethers';
+import { ethers, type Signer } from 'ethers';
 import { EthersLedgerServiceEthereum } from './services/ledger/EthersLedgerServiceEthereum';
 import type { IBSEthereum, TBSEthereumName, TBSEthereumNetworkId } from './types';
-import { TypedDataSigner } from '@ethersproject/abstract-signer';
 import { WalletConnectServiceEthereum } from './services/wallet-connect/WalletConnectServiceEthereum';
 export declare class BSEthereum<N extends string = TBSEthereumName, A extends TBSNetworkId = TBSEthereumNetworkId> implements IBSEthereum<N, A> {
-    #private;
     readonly name: N;
     readonly bipDerivationPath: string;
     readonly isMultiTransferSupported = false;
@@ -26,11 +24,12 @@ export declare class BSEthereum<N extends string = TBSEthereumName, A extends TB
     walletConnectService: WalletConnectServiceEthereum<N, A>;
     fullTransactionsDataService: IFullTransactionsDataService<N>;
     constructor(name: N, network?: TBSNetwork<A>, getLedgerTransport?: TGetLedgerTransport<N>);
-    _generateSigner(account: TBSAccount<N>): Promise<ethers.Signer & TypedDataSigner>;
+    _getSigner(account: TBSAccount<N>): Promise<Signer>;
     _buildTransferParams(intent: TTransferIntent): Promise<{
-        transactionParams: ethers.utils.Deferrable<ethers.providers.TransactionRequest>;
+        transactionParams: ethers.TransactionRequest;
         gasPriceBn: BSBigUnitAmount;
     }>;
+    _setTokens(network: TBSNetwork<A>): void;
     setNetwork(network: TBSNetwork<A>): void;
     pingNetwork(url: string): Promise<TPingNetworkResponse>;
     validateAddress(address: string): boolean;

package/dist/BSEthereum.js

@@ -32,15 +32,9 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _BSEthereum_instances, _BSEthereum_setTokens;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -60,7 +54,6 @@ const axios_1 = __importDefault(require("axios"));
 const MoralisFullTransactionsDataServiceEthereum_1 = require("./services/full-transactions-data/MoralisFullTransactionsDataServiceEthereum");
 class BSEthereum {
     constructor(name, network, getLedgerTransport) {
-        _BSEthereum_instances.add(this);
         this.isMultiTransferSupported = false;
         this.isCustomNetworkSupported = false;
         this.name = name;
@@ -75,8 +68,8 @@ class BSEthereum {
         this.defaultNetwork = this.availableNetworks.find(network => network.type === 'mainnet');
         this.setNetwork(network ?? this.defaultNetwork);
     }
-    async _generateSigner(account) {
-        const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
+    async _getSigner(account) {
+        const provider = new ethers_1.JsonRpcProvider(this.network.url);
         if (account.isHardware) {
             if (!this.ledgerService.getLedgerTransport)
                 throw new Error('You must provide getLedgerTransport function to use Ledger');
@@ -89,12 +82,13 @@ class BSEthereum {
         return new ethers_1.ethers.Wallet(account.key, provider);
     }
     async _buildTransferParams(intent) {
-        const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
+        const provider = new ethers_1.JsonRpcProvider(this.network.url);
         const amount = new blockchain_service_1.BSBigHumanAmount(intent.amount, intent.token.decimals).toUnit().toString();
-        const gasPrice = await provider.getGasPrice();
-        const gasPriceBn = new blockchain_service_1.BSBigUnitAmount(gasPrice.toString(), BSEthereumConstants_1.BSEthereumConstants.DEFAULT_DECIMALS);
+        const { gasPrice } = await provider.getFeeData();
+        const gasPriceBn = new blockchain_service_1.BSBigUnitAmount(gasPrice?.toString() || '0', BSEthereumConstants_1.BSEthereumConstants.DEFAULT_DECIMALS);
         let transactionParams = {
             type: 2,
+            chainId: parseInt(this.network.id),
         };
         const isNative = this.tokenService.predicateByHash(this.feeToken, intent.token.hash);
         if (isNative) {
@@ -105,7 +99,7 @@ class BSEthereum {
             const contract = new ethers_1.ethers.Contract(intent.token.hash, [
                 'function transfer(address to, uint amount) returns (bool)',
             ]);
-            const populatedTransaction = await contract.populateTransaction.transfer(intent.receiverAddress, amount);
+            const populatedTransaction = await contract.transfer.populateTransaction(intent.receiverAddress, amount);
             transactionParams = {
                 ...populatedTransaction,
                 ...transactionParams,
@@ -116,13 +110,19 @@ class BSEthereum {
             gasPriceBn,
         };
     }
+    _setTokens(network) {
+        const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(network);
+        this.tokens = [nativeAsset];
+        this.nativeTokens = [nativeAsset];
+        this.feeToken = nativeAsset;
+    }
     setNetwork(network) {
         const networkUrls = BSEthereumConstants_1.BSEthereumConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
         const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, networkUrls);
         if (!isValidNetwork) {
             throw new Error(`Network with id ${network.id} is not available for ${this.name}`);
         }
-        __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_setTokens).call(this, network);
+        this._setTokens(network);
         this.network = network;
         this.networkUrls = networkUrls;
         this.nftDataService = new MoralisNDSEthereum_1.MoralisNDSEthereum(this);
@@ -150,7 +150,7 @@ class BSEthereum {
         };
     }
     validateAddress(address) {
-        return ethers_1.ethers.utils.isAddress(address);
+        return (0, ethers_1.isAddress)(address);
     }
     validateEncrypted(json) {
         return ethersJsonWallets.isCrowdsaleWallet(json) || ethersJsonWallets.isKeystoreWallet(json);
@@ -171,7 +171,8 @@ class BSEthereum {
     }
     async generateAccountFromMnemonic(mnemonic, index) {
         const bipPath = blockchain_service_1.BSKeychainHelper.getBipPath(this.bipDerivationPath, index);
-        const hd = ethers_1.ethers.utils.HDNode.fromMnemonic(Array.isArray(mnemonic) ? mnemonic.join(' ') : mnemonic).derivePath(bipPath);
+        const ethersMnemonic = ethers_1.ethers.Mnemonic.fromPhrase(Array.isArray(mnemonic) ? mnemonic.join(' ') : mnemonic);
+        const hd = ethers_1.ethers.HDNodeWallet.fromMnemonic(ethersMnemonic, bipPath);
         return {
             address: hd.address,
             key: hd.privateKey,
@@ -190,7 +191,7 @@ class BSEthereum {
         };
     }
     async generateAccountFromPublicKey(publicKey) {
-        const address = ethers_1.ethers.utils.computeAddress(publicKey);
+        const address = (0, ethers_1.computeAddress)(publicKey);
         return {
             address,
             key: publicKey,
@@ -212,12 +213,12 @@ class BSEthereum {
         return wallet.encrypt(password);
     }
     async transfer({ senderAccount, intents }) {
-        const signer = await this._generateSigner(senderAccount);
+        const signer = await this._getSigner(senderAccount);
         const { address } = senderAccount;
         const addressUrl = this.explorerService.buildAddressUrl(address);
         const transactions = [];
         let error;
-        let nonce = await signer.getTransactionCount('pending');
+        let nonce = await signer.getNonce('pending');
         for (const intent of intents) {
             try {
                 const { transactionParams, gasPriceBn } = await this._buildTransferParams(intent);
@@ -277,7 +278,7 @@ class BSEthereum {
         return transactions;
     }
     async calculateTransferFee(params) {
-        const signer = await this._generateSigner(params.senderAccount);
+        const signer = await this._getSigner(params.senderAccount);
         let feeBn = new blockchain_service_1.BSBigUnitAmount(0, BSEthereumConstants_1.BSEthereumConstants.DEFAULT_DECIMALS);
         for (const intent of params.intents) {
             const { gasPriceBn, transactionParams } = await this._buildTransferParams(intent);
@@ -288,7 +289,7 @@ class BSEthereum {
         return feeBn.toHuman().toFormatted();
     }
     async resolveNameServiceDomain(domainName) {
-        const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
+        const provider = new ethers_1.JsonRpcProvider(this.network.url);
         const address = await provider.resolveName(domainName);
         if (!address)
             throw new Error('No address found for domain name');
@@ -296,9 +297,3 @@ class BSEthereum {
     }
 }
 exports.BSEthereum = BSEthereum;
-_BSEthereum_instances = new WeakSet(), _BSEthereum_setTokens = function _BSEthereum_setTokens(network) {
-    const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(network);
-    this.tokens = [nativeAsset];
-    this.nativeTokens = [nativeAsset];
-    this.feeToken = nativeAsset;
-};

package/dist/constants/BSEthereumConstants.js

@@ -63,11 +63,11 @@ BSEthereumConstants.RPC_LIST_BY_NETWORK_ID = {
         'https://endpoints.omniatech.io/v1/bsc/mainnet/public',
     ],
     '137': [
-        'https://polygon.meowrpc.com',
+        'https://poly.api.pocket.network',
         'https://polygon-rpc.com',
         'https://polygon.llamarpc.com',
         'https://polygon.drpc.org',
-        'https://endpoints.omniatech.io/v1/matic/mainnet/public',
+        'https://1rpc.io/matic',
     ],
     '250': [
         'https://rpcapi.fantom.network',
@@ -82,9 +82,10 @@ BSEthereumConstants.RPC_LIST_BY_NETWORK_ID = {
         'https://polygon-zkevm.blockpi.network/v1/rpc/public',
     ],
     '80002': [
-        'https://polygon-amoy.drpc.org',
         'https://polygon-amoy-bor-rpc.publicnode.com',
         'https://rpc.ankr.com/polygon_amoy',
+        'https://rpc-amoy.polygon.technology',
+        'https://polygon-amoy.drpc.org',
     ],
     '8453': [
         'https://base.llamarpc.com',

package/dist/services/blockchain-data/RpcBDSEthereum.js

@@ -32,12 +32,13 @@ class RpcBDSEthereum {
         const receipt = await __classPrivateFieldGet(this, _RpcBDSEthereum_instances, "a", _RpcBDSEthereum_provider_get).getTransactionReceipt(hash);
         if (!receipt)
             throw new Error('Receipt not found');
-        const effectiveGasPrice = receipt.effectiveGasPrice ?? transaction.gasPrice;
-        const fee = effectiveGasPrice.mul(receipt.gasUsed);
+        const effectiveGasPrice = receipt.gasPrice ?? transaction.gasPrice;
+        const fee = (effectiveGasPrice || BigInt(0)) * receipt.gasUsed;
         const token = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._service.network);
         const fromUrl = this._service.explorerService.buildAddressUrl(transaction.from);
         const toUrl = this._service.explorerService.buildAddressUrl(transaction.to);
-        const timestamp = transaction.timestamp ?? 0;
+        const block = await __classPrivateFieldGet(this, _RpcBDSEthereum_instances, "a", _RpcBDSEthereum_provider_get).getBlock(receipt.blockNumber);
+        const timestamp = block?.timestamp || 0;
         return {
             blockchain: this._service.name,
             isPending: false,
@@ -104,7 +105,7 @@ class RpcBDSEthereum {
 exports.RpcBDSEthereum = RpcBDSEthereum;
 _RpcBDSEthereum_providerInstance = new WeakMap(), _RpcBDSEthereum_instances = new WeakSet(), _RpcBDSEthereum_provider_get = function _RpcBDSEthereum_provider_get() {
     if (!__classPrivateFieldGet(this, _RpcBDSEthereum_providerInstance, "f")) {
-        __classPrivateFieldSet(this, _RpcBDSEthereum_providerInstance, new ethers_1.ethers.providers.JsonRpcProvider(this._service.network.url), "f");
+        __classPrivateFieldSet(this, _RpcBDSEthereum_providerInstance, new ethers_1.JsonRpcProvider(this._service.network.url), "f");
     }
     return __classPrivateFieldGet(this, _RpcBDSEthereum_providerInstance, "f");
 };

package/dist/services/ledger/EthersLedgerServiceEthereum.d.ts

@@ -1,17 +1,16 @@
 import { type TBSAccount, type TLedgerServiceEmitter, type TGetLedgerTransport, type TUntilIndexRecord, type ILedgerService } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
-import { ethers, Signer } from 'ethers';
-import { TypedDataSigner } from '@ethersproject/abstract-signer';
+import { ethers, AbstractSigner, type Provider, Transaction, TransactionLike } from 'ethers';
 import { BSEthereum } from '../../BSEthereum';
-export declare class EthersLedgerSigner extends Signer implements TypedDataSigner {
+export declare class EthersLedgerSigner extends AbstractSigner {
     #private;
-    static shouldRetry: (error: any) => boolean;
-    constructor(transport: Transport, bipPath: string, provider?: ethers.providers.Provider, emitter?: TLedgerServiceEmitter);
-    connect(provider: ethers.providers.Provider): EthersLedgerSigner;
+    constructor(transport: Transport, bipPath: string, provider?: Provider, emitter?: TLedgerServiceEmitter);
+    static shouldRetry(error: any): boolean;
+    connect(provider: Provider): EthersLedgerSigner;
     getAddress(): Promise<string>;
-    signMessage(message: string | ethers.utils.Bytes): Promise<string>;
-    signTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): Promise<string>;
-    _signTypedData(domain: ethers.TypedDataDomain, types: Record<string, ethers.TypedDataField[]>, value: Record<string, any>): Promise<string>;
+    signMessage(message: string | Uint8Array): Promise<string>;
+    signTransaction(transaction: Transaction | TransactionLike): Promise<string>;
+    signTypedData(domain: ethers.TypedDataDomain, types: Record<string, ethers.TypedDataField[]>, value: Record<string, any>): Promise<string>;
 }
 export declare class EthersLedgerServiceEthereum<N extends string> implements ILedgerService<N> {
     #private;
@@ -20,5 +19,5 @@ export declare class EthersLedgerServiceEthereum<N extends string> implements IL
     constructor(blockchainService: BSEthereum<N>, getLedgerTransport?: TGetLedgerTransport<N>);
     getAccounts(transport: Transport, untilIndexByBlockchainService?: TUntilIndexRecord<N>): Promise<TBSAccount<N>[]>;
     getAccount(transport: Transport, index: number): Promise<TBSAccount<N>>;
-    getSigner(transport: Transport, path: string, provider?: ethers.providers.Provider): EthersLedgerSigner;
+    getSigner(transport: Transport, path: string, provider?: Provider): EthersLedgerSigner;
 }

package/dist/services/ledger/EthersLedgerServiceEthereum.js

@@ -54,9 +54,12 @@ const hw_app_eth_1 = __importStar(require("@ledgerhq/hw-app-eth"));
 const ethers_1 = require("ethers");
 const properties_1 = require("@ethersproject/properties");
 const events_1 = __importDefault(require("events"));
-class EthersLedgerSigner extends ethers_1.Signer {
+const ensure0x = (value) => {
+    return value.startsWith('0x') ? value : `0x${value}`;
+};
+class EthersLedgerSigner extends ethers_1.AbstractSigner {
     constructor(transport, bipPath, provider, emitter) {
-        super();
+        super(provider);
         _EthersLedgerSigner_transport.set(this, void 0);
         _EthersLedgerSigner_emitter.set(this, void 0);
         _EthersLedgerSigner_bipPath.set(this, void 0);
@@ -65,7 +68,11 @@ class EthersLedgerSigner extends ethers_1.Signer {
         __classPrivateFieldSet(this, _EthersLedgerSigner_transport, transport, "f");
         __classPrivateFieldSet(this, _EthersLedgerSigner_emitter, emitter, "f");
         __classPrivateFieldSet(this, _EthersLedgerSigner_ledgerApp, new hw_app_eth_1.default(transport), "f");
-        (0, properties_1.defineReadOnly)(this, 'provider', provider);
+        if (provider)
+            (0, properties_1.defineReadOnly)(this, 'provider', provider);
+    }
+    static shouldRetry(error) {
+        return error?.id === 'TransportLocked';
     }
     connect(provider) {
         return new EthersLedgerSigner(__classPrivateFieldGet(this, _EthersLedgerSigner_transport, "f"), __classPrivateFieldGet(this, _EthersLedgerSigner_bipPath, "f"), provider, __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f"));
@@ -79,15 +86,14 @@ class EthersLedgerSigner extends ethers_1.Signer {
     async signMessage(message) {
         try {
             if (typeof message === 'string') {
-                message = ethers_1.ethers.utils.toUtf8Bytes(message);
+                message = (0, ethers_1.toUtf8Bytes)(message);
             }
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureStart');
-            const obj = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signPersonalMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bipPath, "f"), ethers_1.ethers.utils.hexlify(message).substring(2));
+            const signature = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signPersonalMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bipPath, "f"), (0, ethers_1.hexlify)(message).substring(2));
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
-            // Normalize the signature for Ethers
-            obj.r = '0x' + obj.r;
-            obj.s = '0x' + obj.s;
-            return ethers_1.ethers.utils.joinSignature(obj);
+            signature.r = ensure0x(signature.r);
+            signature.s = ensure0x(signature.s);
+            return ethers_1.Signature.from(signature).serialized;
         }
         catch (error) {
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
@@ -96,28 +102,29 @@ class EthersLedgerSigner extends ethers_1.Signer {
     }
     async signTransaction(transaction) {
         try {
-            const tx = await ethers_1.ethers.utils.resolveProperties(transaction);
-            const serializedUnsignedTransaction = ethers_1.ethers.utils
-                .serializeTransaction(tx)
-                .substring(2);
+            const { from: _from, ...transactionRecord } = transaction instanceof ethers_1.Transaction ? transaction.toJSON() : transaction;
+            const serializedUnsignedTransaction = ethers_1.Transaction.from(transactionRecord).unsignedSerialized.substring(2);
             const resolution = await hw_app_eth_1.ledgerService.resolveTransaction(serializedUnsignedTransaction, {}, {});
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureStart');
             const signature = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signTransaction(__classPrivateFieldGet(this, _EthersLedgerSigner_bipPath, "f"), serializedUnsignedTransaction, resolution);
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
-            return ethers_1.ethers.utils.serializeTransaction(tx, {
-                v: blockchain_service_1.BSBigNumber.ensureNumber('0x' + signature.v),
-                r: '0x' + signature.r,
-                s: '0x' + signature.s,
-            });
+            return ethers_1.Transaction.from({
+                ...transactionRecord,
+                signature: {
+                    v: blockchain_service_1.BSBigNumber.ensureNumber(ensure0x(signature.v)),
+                    r: ensure0x(signature.r),
+                    s: ensure0x(signature.s),
+                },
+            }).serialized;
         }
         catch (error) {
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
             throw error;
         }
     }
-    async _signTypedData(domain, types, value) {
+    async signTypedData(domain, types, value) {
         try {
-            const populated = await ethers_1.ethers.utils._TypedDataEncoder.resolveNames(domain, types, value, async (name) => {
+            const populated = await ethers_1.TypedDataEncoder.resolveNames(domain, types, value, async (name) => {
                 if (!this.provider)
                     throw new Error('Cannot resolve ENS names without a provider');
                 const resolved = await this.provider.resolveName(name);
@@ -125,22 +132,21 @@ class EthersLedgerSigner extends ethers_1.Signer {
                     throw new Error('No address found for domain name');
                 return resolved;
             });
-            const payload = ethers_1.ethers.utils._TypedDataEncoder.getPayload(populated.domain, types, populated.value);
+            const payload = ethers_1.TypedDataEncoder.getPayload(populated.domain, types, populated.value);
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureStart');
-            let obj;
+            let signature;
             try {
-                obj = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712Message(__classPrivateFieldGet(this, _EthersLedgerSigner_bipPath, "f"), payload);
+                signature = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712Message(__classPrivateFieldGet(this, _EthersLedgerSigner_bipPath, "f"), payload);
             }
             catch {
-                const domainSeparatorHex = ethers_1.ethers.utils._TypedDataEncoder.hashDomain(payload.domain);
-                const hashStructMessageHex = ethers_1.ethers.utils._TypedDataEncoder.hashStruct(payload.primaryType, types, payload.message);
-                obj = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712HashedMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bipPath, "f"), domainSeparatorHex, hashStructMessageHex);
+                const domainSeparatorHex = ethers_1.TypedDataEncoder.hashDomain(payload.domain);
+                const hashStructMessageHex = ethers_1.TypedDataEncoder.hashStruct(payload.primaryType, types, payload.message);
+                signature = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712HashedMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bipPath, "f"), domainSeparatorHex, hashStructMessageHex);
             }
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
-            // Normalize the signature for Ethers
-            obj.r = '0x' + obj.r;
-            obj.s = '0x' + obj.s;
-            return ethers_1.ethers.utils.joinSignature(obj);
+            signature.r = ensure0x(signature.r);
+            signature.s = ensure0x(signature.s);
+            return ethers_1.Signature.from(signature).serialized;
         }
         catch (error) {
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
@@ -150,9 +156,6 @@ class EthersLedgerSigner extends ethers_1.Signer {
 }
 exports.EthersLedgerSigner = EthersLedgerSigner;
 _EthersLedgerSigner_transport = new WeakMap(), _EthersLedgerSigner_emitter = new WeakMap(), _EthersLedgerSigner_bipPath = new WeakMap(), _EthersLedgerSigner_ledgerApp = new WeakMap();
-EthersLedgerSigner.shouldRetry = (error) => {
-    return error?.id === 'TransportLocked';
-};
 class EthersLedgerServiceEthereum {
     constructor(blockchainService, getLedgerTransport) {
         _EthersLedgerServiceEthereum_blockchainService.set(this, void 0);
@@ -173,7 +176,7 @@ class EthersLedgerServiceEthereum {
         const { publicKey, address } = await blockchain_service_1.BSUtilsHelper.retry(() => ledgerApp.getAddress(bipPath), {
             shouldRetry: EthersLedgerSigner.shouldRetry,
         });
-        const publicKeyWithPrefix = '0x' + publicKey;
+        const publicKeyWithPrefix = ensure0x(publicKey);
         return {
             address,
             key: publicKeyWithPrefix,

package/dist/services/nft-data/GhostMarketNDSEthereum.js

@@ -12,7 +12,7 @@ class GhostMarketNDSEthereum extends blockchain_service_1.GhostMarketNDS {
         try {
             if (!collectionHash)
                 return false;
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._service.network.url);
+            const provider = new ethers_1.JsonRpcProvider(this._service.network.url);
             const contract = new ethers_1.ethers.Contract(collectionHash, ERC20_1.ERC20_ABI, provider);
             const response = await contract.balanceOf(address);
             if (!response)

package/dist/services/token/TokenServiceEthereum.js

@@ -7,7 +7,7 @@ class TokenServiceEthereum extends blockchain_service_1.TokenService {
     normalizeHash(hash) {
         let fixedHash = hash.startsWith('0x') ? hash : `0x${hash}`;
         try {
-            fixedHash = ethers_1.ethers.utils.getAddress(fixedHash); // Normalize to checksum address
+            fixedHash = (0, ethers_1.getAddress)(fixedHash); // Normalize to checksum address
         }
         catch {
             /* empty */

package/dist/services/wallet-connect/WalletConnectServiceEthereum.d.ts

@@ -1,7 +1,7 @@
 import { type IWalletConnectService, type TBSNetworkId, type TWalletConnectServiceHandlers, type TWalletConnectServiceMethodHandler, type TWalletConnectServiceRequestMethodParams } from '@cityofzion/blockchain-service';
 import type { IBSEthereum, TWalletConnectServiceEthereumMethod } from '../../types';
 import { z } from 'zod';
-import { ethers } from 'ethers';
+import { type TransactionRequest } from 'ethers';
 declare const personalSignParamsSchema: z.ZodTuple<[z.ZodString, z.ZodString], null>;
 declare const signTypedDataParamsSchema: z.ZodTuple<[z.ZodString, z.ZodUnion<readonly [z.ZodPipe<z.ZodPipe<z.ZodString, z.ZodTransform<any, string>>, z.ZodObject<{
     primaryType: z.ZodString;
@@ -35,7 +35,7 @@ declare const signTransactionParamsSchema: z.ZodTuple<[z.ZodObject<{
     gas: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
     maxPriorityFeePerGas: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
     maxFeePerGas: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
-    nonce: z.ZodOptional<z.ZodNumber>;
+    nonce: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
     chainId: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
     gasLimit: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
     type: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
@@ -61,7 +61,6 @@ export type TWalletConnectEthereumHandlers = {
     wallet_requestPermissions: unknown;
 };
 export declare class WalletConnectServiceEthereum<N extends string, A extends TBSNetworkId, M extends string = TWalletConnectServiceEthereumMethod, H extends Record<string, any> = TWalletConnectEthereumHandlers> implements IWalletConnectService<N, M> {
-    #private;
     readonly namespace: string;
     readonly chain: string;
     supportedMethods: M[];
@@ -80,9 +79,10 @@ export declare class WalletConnectServiceEthereum<N extends string, A extends TB
     _requestAccount: TWalletConnectServiceMethodHandler<N>;
     _nullHandlers: TWalletConnectServiceMethodHandler<N>;
     _emptyHandlers: TWalletConnectServiceMethodHandler<N>;
+    _convertHexToUtf8(value: string): string;
     _resolveTransactionParams(args: TWalletConnectServiceRequestMethodParams<N, z.infer<typeof signTransactionParamsSchema>>): Promise<{
-        connectedWallet: ethers.Signer;
-        transaction: ethers.providers.TransactionRequest;
+        connectedWallet: import("ethers").Signer;
+        transaction: TransactionRequest;
     }>;
     calculateRequestFee(args: TWalletConnectServiceRequestMethodParams<N>): Promise<string>;
 }

package/dist/services/wallet-connect/WalletConnectServiceEthereum.js

@@ -1,17 +1,10 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _WalletConnectServiceEthereum_instances, _WalletConnectServiceEthereum_convertHexToUtf8;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WalletConnectServiceEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const zod_1 = require("zod");
 const ethers_1 = require("ethers");
 const BSEthereumConstants_1 = require("../../constants/BSEthereumConstants");
-const utils_1 = require("ethers/lib/utils");
 const personalSignParamsSchema = zod_1.z.tuple([zod_1.z.string(), zod_1.z.string()]);
 const typedDataParamSchema = zod_1.z.object({
     primaryType: zod_1.z.string(),
@@ -50,7 +43,7 @@ const signTransactionParamsSchema = zod_1.z.tuple([
         gas: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
         maxPriorityFeePerGas: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
         maxFeePerGas: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
-        nonce: zod_1.z.number().optional(),
+        nonce: zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).optional(),
         chainId: zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).optional(),
         gasLimit: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
         type: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
@@ -60,7 +53,6 @@ const signTransactionParamsSchema = zod_1.z.tuple([
 const sendRawTransactionParamsSchema = zod_1.z.tuple([zod_1.z.string()]);
 class WalletConnectServiceEthereum {
     constructor(service) {
-        _WalletConnectServiceEthereum_instances.add(this);
         this.namespace = 'eip155';
         // prettier-ignore
         this.supportedMethods = [
@@ -79,19 +71,19 @@ class WalletConnectServiceEthereum {
         this._personalSignHandler = {
             validate: async (params) => await personalSignParamsSchema.parseAsync(params),
             process: async (args) => {
-                const wallet = await this._service._generateSigner(args.account);
-                const convertedMessage = __classPrivateFieldGet(this, _WalletConnectServiceEthereum_instances, "m", _WalletConnectServiceEthereum_convertHexToUtf8).call(this, args.params[0]);
+                const wallet = await this._service._getSigner(args.account);
+                const convertedMessage = this._convertHexToUtf8(args.params[0]);
                 return await wallet.signMessage(convertedMessage);
             },
         };
         this._signTypedDataHandlers = {
             validate: async (params) => await signTypedDataParamsSchema.parseAsync(params),
             process: async (args) => {
-                const wallet = await this._service._generateSigner(args.account);
+                const wallet = await this._service._getSigner(args.account);
                 const { domain, types, message } = args.params[1];
                 // https://github.com/ethers-io/ethers.js/issues/687#issuecomment-714069471
                 delete types?.EIP712Domain;
-                return await wallet._signTypedData(domain, types, message);
+                return await wallet.signTypedData(domain, types, message);
             },
         };
         this._signTransactionHandler = {
@@ -112,8 +104,8 @@ class WalletConnectServiceEthereum {
         this._sendRawTransactionHandler = {
             validate: async (params) => await sendRawTransactionParamsSchema.parseAsync(params),
             process: async (args) => {
-                const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._service.network.url);
-                const { hash } = await provider.sendTransaction(args.params[0]);
+                const provider = new ethers_1.JsonRpcProvider(this._service.network.url);
+                const { hash } = await provider.broadcastTransaction(args.params[0]);
                 return hash;
             },
         };
@@ -127,7 +119,7 @@ class WalletConnectServiceEthereum {
         this._requestAccount = {
             validate: async () => { },
             process: async (args) => {
-                const wallet = await this._service._generateSigner(args.account);
+                const wallet = await this._service._getSigner(args.account);
                 return [await wallet.getAddress()];
             },
         };
@@ -164,20 +156,31 @@ class WalletConnectServiceEthereum {
             wallet_requestPermissions: this._emptyHandlers,
         };
     }
+    _convertHexToUtf8(value) {
+        if ((0, ethers_1.isHexString)(value)) {
+            return (0, ethers_1.toUtf8String)(value);
+        }
+        return value;
+    }
     async _resolveTransactionParams(args) {
         const params = args.params[0];
-        const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._service.network.url);
-        const wallet = await this._service._generateSigner(args.account);
+        const provider = new ethers_1.JsonRpcProvider(this._service.network.url);
+        const wallet = await this._service._getSigner(args.account);
         const connectedWallet = wallet.connect(provider);
         const transaction = {
             to: params.to,
             value: params.value,
             data: params.data,
         };
-        transaction.chainId = parseInt(params.chainId?.toString() ?? this._service.network.id);
-        transaction.nonce = params.nonce;
-        if (!transaction.nonce) {
-            transaction.nonce = await connectedWallet.getTransactionCount('pending');
+        transaction.chainId = parseInt(params.chainId?.toString() || this._service.network.id);
+        if (typeof params.nonce === 'string') {
+            const nonce = parseInt(params.nonce);
+            if (!isNaN(nonce)) {
+                transaction.nonce = nonce;
+            }
+        }
+        if (typeof transaction.nonce !== 'number' || isNaN(transaction.nonce)) {
+            transaction.nonce = await connectedWallet.getNonce('pending');
         }
         if (params.type) {
             const typeAsNumber = parseInt(params.type.toString());
@@ -189,7 +192,7 @@ class WalletConnectServiceEthereum {
             transaction.maxFeePerGas = params.maxFeePerGas;
             transaction.maxPriorityFeePerGas = params.maxPriorityFeePerGas;
             if (!transaction.maxFeePerGas || !transaction.maxPriorityFeePerGas) {
-                const feeData = await connectedWallet.getFeeData();
+                const feeData = await provider.getFeeData();
                 transaction.maxFeePerGas = transaction.maxFeePerGas ?? feeData.maxFeePerGas ?? undefined;
                 transaction.maxPriorityFeePerGas = transaction.maxPriorityFeePerGas ?? feeData.maxPriorityFeePerGas ?? undefined;
             }
@@ -197,20 +200,19 @@ class WalletConnectServiceEthereum {
         else {
             transaction.gasPrice = params.gasPrice?.toString();
             if (!transaction.gasPrice) {
-                const gasPrice = await provider.getGasPrice();
-                transaction.gasPrice = gasPrice;
+                const { gasPrice } = await provider.getFeeData();
+                transaction.gasPrice = gasPrice?.toString();
             }
         }
         transaction.gasLimit = params.gasLimit ?? params.gas;
         if (!transaction.gasLimit) {
             try {
-                const estimatedGas = await connectedWallet.estimateGas({
+                transaction.gasLimit = await connectedWallet.estimateGas({
                     ...transaction,
                     gasPrice: undefined,
                     maxFeePerGas: undefined,
                     maxPriorityFeePerGas: undefined,
                 });
-                transaction.gasLimit = estimatedGas;
             }
             catch {
                 transaction.gasLimit = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_GAS_LIMIT_BN.toString();
@@ -231,26 +233,19 @@ class WalletConnectServiceEthereum {
             const params = await this._sendRawTransactionHandler.validate(args.params).catch(error => {
                 throw new blockchain_service_1.BSError('Params validation failed: ' + error.message, 'INVALID_PARAMS');
             });
-            transactionToEstimate = (0, utils_1.parseTransaction)(params[0]);
+            transactionToEstimate = ethers_1.Transaction.from(params[0]);
         }
         else {
             throw new blockchain_service_1.BSError(`Method ${args.method} is not supported for fee calculation`, 'UNSUPPORTED_METHOD');
         }
-        const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._service.network.url);
-        const wallet = await this._service._generateSigner(args.account);
+        const provider = new ethers_1.JsonRpcProvider(this._service.network.url);
+        const wallet = await this._service._getSigner(args.account);
         const connectedWallet = wallet.connect(provider);
-        const gasPrice = await connectedWallet.getGasPrice();
-        const gasPriceBn = new blockchain_service_1.BSBigUnitAmount(gasPrice.toString(), this._service.feeToken.decimals);
+        const { gasPrice } = await provider.getFeeData();
+        const gasPriceBn = new blockchain_service_1.BSBigUnitAmount(gasPrice?.toString() || '0', this._service.feeToken.decimals);
         const estimatedGas = await connectedWallet.estimateGas(transactionToEstimate);
         const estimatedGasBn = new blockchain_service_1.BSBigUnitAmount(estimatedGas.toString(), this._service.feeToken.decimals);
-        const feeFormatted = gasPriceBn.multipliedBy(estimatedGasBn).toHuman().toFormatted();
-        return feeFormatted;
+        return gasPriceBn.multipliedBy(estimatedGasBn).toHuman().toFormatted();
     }
 }
 exports.WalletConnectServiceEthereum = WalletConnectServiceEthereum;
-_WalletConnectServiceEthereum_instances = new WeakSet(), _WalletConnectServiceEthereum_convertHexToUtf8 = function _WalletConnectServiceEthereum_convertHexToUtf8(value) {
-    if (ethers_1.ethers.utils.isHexString(value)) {
-        return ethers_1.ethers.utils.toUtf8String(value);
-    }
-    return value;
-};

package/dist/types.d.ts

@@ -1,10 +1,9 @@
 import type { IBlockchainService, IBSWithEncryption, IBSWithExplorer, IBSWithFee, IBSWithLedger, IBSWithNameService, IBSWithNft, IBSWithWalletConnect, TBSAccount, TBSNetworkId, IBSWithFullTransactions } from '@cityofzion/blockchain-service';
-import { TypedDataSigner } from '@ethersproject/abstract-signer';
-import { ethers } from 'ethers';
+import { type Signer } from 'ethers';
 export type TBSEthereumNetworkId = TBSNetworkId<'1' | '10' | '25' | '56' | '137' | '250' | '1101' | '8453' | '80002' | '42161' | '42220' | '43114' | '59144' | '11155111'>;
 export type TBSEthereumName = 'ethereum' | 'polygon' | 'base' | 'arbitrum';
 export interface IBSEthereum<N extends string = TBSEthereumName, A extends TBSNetworkId = TBSEthereumNetworkId> extends IBlockchainService<N, A>, IBSWithNameService, IBSWithNft, IBSWithFee<N>, IBSWithLedger<N>, IBSWithExplorer, IBSWithEncryption<N>, IBSWithWalletConnect<N>, IBSWithFullTransactions<N> {
-    _generateSigner(account: TBSAccount<N>): Promise<ethers.Signer & TypedDataSigner>;
+    _getSigner(account: TBSAccount<N>): Promise<Signer>;
 }
 export type TMoralisBDSEthereumNativeBalanceApiResponse = {
     balance: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "3.1.17",
+  "version": "3.1.18",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "license": "GPL-3.0-only",
   "author": "Coz",
@@ -16,20 +16,21 @@
     "@ethersproject/bytes": "5.8.0",
     "@ethersproject/json-wallets": "5.8.0",
     "@ethersproject/properties": "5.8.0",
-    "@ledgerhq/hw-app-eth": "~7.3.0",
-    "axios": "~1.15.0",
-    "ethers": "5.8.0",
-    "zod": "~4.3.6",
-    "@cityofzion/blockchain-service": "3.1.17"
+    "@ledgerhq/hw-app-eth": "~7.8.1",
+    "axios": "1.16.0",
+    "ethers": "6.16.0",
+    "zod": "~4.4.3",
+    "@cityofzion/blockchain-service": "3.1.18"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport": "~6.32.0",
-    "@ledgerhq/hw-transport-node-hid": "~6.30.0",
+    "@ledgerhq/hw-transport": "6.35.1",
+    "@ledgerhq/hw-transport-node-hid": "~6.33.1",
+    "@types/node": "~25.6.0",
     "date-fns": "~4.1.0",
-    "dotenv": "~17.3.1",
-    "eslint": "~9.37.0",
-    "typescript": "~5.9.2",
-    "vitest": "~4.0.18"
+    "dotenv": "~17.4.2",
+    "eslint": "~10.3.0",
+    "typescript": "~6.0.3",
+    "vitest": "~4.1.5"
   },
   "scripts": {
     "build": "rm -rf ./dist && rm -f *.tgz && npm run typecheck && tsc --project tsconfig.build.json",