@cityofzion/bs-ethereum 3.0.5 → 3.0.6

package/dist/BSEthereum.d.ts

@@ -1,19 +1,19 @@
-import { TBSAccount, TIntentTransferParam, TBSToken, TTransferParam, TGetLedgerTransport, ITokenService, TBSNetwork, IBlockchainDataService, IExchangeDataService, INftDataService, IExplorerService, TPingNetworkResponse, IWalletConnectService, type IFullTransactionsDataService } from '@cityofzion/blockchain-service';
+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 IWalletConnectService, type IFullTransactionsDataService } from '@cityofzion/blockchain-service';
 import { ethers } from 'ethers';
 import { EthersLedgerServiceEthereum } from './services/ledger/EthersLedgerServiceEthereum';
-import { IBSEthereum, TBSEthereumNetworkId, TSupportedEVM } from './types';
+import type { IBSEthereum, TBSEthereumNetworkId, TSupportedEVM } from './types';
 import { TypedDataSigner } from '@ethersproject/abstract-signer';
 export declare class BSEthereum<N extends string = string, A extends string = TBSEthereumNetworkId> implements IBSEthereum<N, A> {
     #private;
     readonly name: N;
-    readonly bip44DerivationPath: string;
+    readonly bipDerivationPath: string;
     readonly isMultiTransferSupported = false;
     readonly isCustomNetworkSupported = false;
     tokens: TBSToken[];
     nativeTokens: TBSToken[];
     feeToken: TBSToken;
     network: TBSNetwork<A>;
-    rpcNetworkUrls: string[];
+    networkUrls: string[];
     readonly defaultNetwork: TBSNetwork<A>;
     readonly availableNetworks: TBSNetwork<A>[];
     blockchainDataService: IBlockchainDataService<N>;
@@ -25,13 +25,13 @@ export declare class BSEthereum<N extends string = string, A extends string = TB
     walletConnectService: IWalletConnectService<N>;
     fullTransactionsDataService: IFullTransactionsDataService<N>;
     constructor(name: N, evm?: TSupportedEVM, network?: TBSNetwork<A>, getLedgerTransport?: TGetLedgerTransport<N>);
-    protected _buildTransferParams(intent: TIntentTransferParam): Promise<{
+    protected _buildTransferParams(intent: TTransferIntent): Promise<{
         transactionParams: ethers.utils.Deferrable<ethers.providers.TransactionRequest>;
         gasPrice: ethers.BigNumber;
     }>;
     generateSigner(account: TBSAccount<N>): Promise<ethers.Signer & TypedDataSigner>;
     setNetwork(network: TBSNetwork<A>): void;
-    pingNode(url: string): Promise<TPingNetworkResponse>;
+    pingNetwork(url: string): Promise<TPingNetworkResponse>;
     validateAddress(address: string): boolean;
     validateEncrypted(json: string): boolean;
     validateKey(key: string): boolean;
@@ -41,7 +41,7 @@ export declare class BSEthereum<N extends string = string, A extends string = TB
     generateAccountFromPublicKey(publicKey: string): Promise<TBSAccount<N>>;
     decrypt(json: string, password: string): Promise<TBSAccount<N>>;
     encrypt(key: string, password: string): Promise<string>;
-    transfer(param: TTransferParam<N>): Promise<string[]>;
-    calculateTransferFee(param: TTransferParam<N>): Promise<string>;
+    transfer(param: TTransferParams<N>): Promise<string[]>;
+    calculateTransferFee(param: TTransferParams<N>): Promise<string>;
     resolveNameServiceDomain(domainName: string): Promise<string>;
 }

package/dist/BSEthereum.js

@@ -66,7 +66,7 @@ class BSEthereum {
         this.isCustomNetworkSupported = false;
         this.name = name;
         this.ledgerService = new EthersLedgerServiceEthereum_1.EthersLedgerServiceEthereum(this, getLedgerTransport);
-        this.bip44DerivationPath = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_BIP44_DERIVATION_PATH;
+        this.bipDerivationPath = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_BIP44_DERIVATION_PATH;
         if (!evm)
             return;
         this.availableNetworks = BSEthereumConstants_1.BSEthereumConstants.NETWORKS_BY_EVM[evm];
@@ -105,22 +105,22 @@ class BSEthereum {
         if (account.isHardware) {
             if (!this.ledgerService.getLedgerTransport)
                 throw new Error('You must provide getLedgerTransport function to use Ledger');
-            if (typeof account.bip44Path !== 'string')
+            if (typeof account.bipPath !== 'string')
                 throw new Error('Your account must have bip44 path to use Ledger');
             const ledgerTransport = await this.ledgerService.getLedgerTransport(account);
-            return this.ledgerService.getSigner(ledgerTransport, account.bip44Path, provider);
+            return this.ledgerService.getSigner(ledgerTransport, account.bipPath, provider);
         }
         return new ethers_1.ethers.Wallet(account.key, provider);
     }
     setNetwork(network) {
-        const rpcNetworkUrls = BSEthereumConstants_1.BSEthereumConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
-        const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, rpcNetworkUrls);
+        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.network = network;
-        this.rpcNetworkUrls = rpcNetworkUrls;
+        this.networkUrls = networkUrls;
         this.nftDataService = new GhostMarketNDSEthereum_1.GhostMarketNDSEthereum(this);
         this.explorerService = new BlockscoutESEthereum_1.BlockscoutESEthereum(this);
         this.exchangeDataService = new MoralisEDSEthereum_1.MoralisEDSEthereum(this);
@@ -130,7 +130,7 @@ class BSEthereum {
         this.fullTransactionsDataService = new MoralisFullTransactionsDataServiceEthereum_1.MoralisFullTransactionsDataServiceEthereum(this);
     }
     // This method is done manually because we need to ensure that the request is aborted after timeout
-    async pingNode(url) {
+    async pingNetwork(url) {
         const abortController = new AbortController();
         const timeout = setTimeout(() => {
             abortController.abort();
@@ -166,13 +166,13 @@ class BSEthereum {
         return domainName.endsWith('.eth');
     }
     async generateAccountFromMnemonic(mnemonic, index) {
-        const bip44Path = this.bip44DerivationPath.replace('?', index.toString());
-        const hd = ethers_1.ethers.utils.HDNode.fromMnemonic(Array.isArray(mnemonic) ? mnemonic.join(' ') : mnemonic).derivePath(bip44Path);
+        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);
         return {
             address: hd.address,
             key: hd.privateKey,
             type: 'privateKey',
-            bip44Path,
+            bipPath,
             blockchain: this.name,
         };
     }

package/dist/constants/BSEthereumConstants.d.ts

@@ -1,5 +1,5 @@
-import { TBSNetwork } from '@cityofzion/blockchain-service';
-import { TBSEthereumNetworkId, TSupportedEVM } from '../types';
+import type { TBSNetwork } from '@cityofzion/blockchain-service';
+import type { TBSEthereumNetworkId, TSupportedEVM } from '../types';
 export declare class BSEthereumConstants {
     static readonly DEFAULT_DECIMALS = 18;
     static readonly DEFAULT_GAS_LIMIT = 21000;

package/dist/helpers/BSEthereumHelper.d.ts

@@ -1,5 +1,5 @@
-import { TBSNetwork, TBSNetworkId } from '@cityofzion/blockchain-service';
-import { IBSEthereum, TBSEthereumNetworkId } from '../types';
+import type { TBSNetwork, TBSNetworkId } from '@cityofzion/blockchain-service';
+import type { IBSEthereum, TBSEthereumNetworkId } from '../types';
 export declare class BSEthereumHelper {
     static getNativeAsset(network: TBSNetwork<TBSEthereumNetworkId>): {
         symbol: string;

package/dist/services/blockchain-data/MoralisBDSEthereum.d.ts

@@ -1,6 +1,6 @@
-import { TBalanceResponse, TBSToken, TBSNetwork, TBSNetworkId, type TContractResponse, type TTransaction, type TGetTransactionsByAddressResponse, type TGetTransactionsByAddressParams } from '@cityofzion/blockchain-service';
+import { type TBalanceResponse, type TBSToken, type TBSNetwork, type TBSNetworkId, type TContractResponse, type TTransaction, type TGetTransactionsByAddressResponse, type TGetTransactionsByAddressParams } from '@cityofzion/blockchain-service';
 import axios from 'axios';
-import { IBSEthereum, TBSEthereumNetworkId } from '../../types';
+import type { IBSEthereum, TBSEthereumNetworkId } from '../../types';
 import { RpcBDSEthereum } from './RpcBDSEthereum';
 export declare class MoralisBDSEthereum<N extends string, A extends TBSNetworkId> extends RpcBDSEthereum<N, A> {
     #private;

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

@@ -101,15 +101,10 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
         }
         const { data } = await __classPrivateFieldGet(this, _MoralisBDSEthereum_instances, "a", _MoralisBDSEthereum_api_get).get(`/transaction/${hash}/verbose`);
         const events = [];
-        const txTemplateUrl = this._service.explorerService.getTxTemplateUrl();
-        const addressTemplateUrl = this._service.explorerService.getAddressTemplateUrl();
-        const contractTemplateUrl = this._service.explorerService.getContractTemplateUrl();
-        const nftTemplateUrl = this._service.explorerService.getNftTemplateUrl();
         if (data.value && Number(data.value) > 0) {
             const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._service.network);
-            const fromUrl = addressTemplateUrl?.replace('{address}', data.from_address);
-            const toUrl = addressTemplateUrl?.replace('{address}', data.to_address);
-            const contractHashUrl = contractTemplateUrl?.replace('{hash}', nativeToken.hash);
+            const fromUrl = this._service.explorerService.buildAddressUrl(data.from_address);
+            const toUrl = this._service.explorerService.buildAddressUrl(data.to_address);
             events.push({
                 eventType: 'token',
                 amount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(data.value, nativeToken.decimals), {
@@ -121,7 +116,7 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 contractHash: nativeToken.hash,
                 tokenType: 'native',
                 methodName: 'transfer',
-                contractHashUrl,
+                contractHashUrl: this._service.explorerService.buildContractUrl(nativeToken.hash),
                 fromUrl,
                 toUrl,
             });
@@ -138,9 +133,8 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 const to = log.decoded_event.params.find((param) => param.name === 'to')?.value;
                 if (!from || !to)
                     return;
-                const fromUrl = addressTemplateUrl?.replace('{address}', data.from_address);
-                const toUrl = addressTemplateUrl?.replace('{address}', data.to_address);
-                const contractHashUrl = contractTemplateUrl?.replace('{hash}', contractHash);
+                const fromUrl = this._service.explorerService.buildAddressUrl(data.from_address);
+                const toUrl = this._service.explorerService.buildAddressUrl(data.to_address);
                 if (amount) {
                     const token = await this.getTokenInfo(contractHash);
                     events.push({
@@ -155,16 +149,13 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                         eventType: 'token',
                         methodName: 'transfer',
                         tokenType: 'erc-20',
-                        contractHashUrl,
+                        contractHashUrl: this._service.explorerService.buildContractUrl(contractHash),
                     });
                 }
                 const tokenHash = log.decoded_event.params.find((param) => param.name === 'tokenId')?.value;
                 if (!tokenHash)
                     return;
                 const [nft] = await blockchain_service_1.BSUtilsHelper.tryCatch(() => this._service.nftDataService.getNft({ collectionHash: contractHash, tokenHash }));
-                const nftUrl = contractHash
-                    ? nftTemplateUrl?.replace('{collectionHash}', contractHash).replace('{tokenHash}', tokenHash)
-                    : undefined;
                 events.push({
                     collectionHash: contractHash,
                     tokenHash,
@@ -177,25 +168,24 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     tokenType: 'erc-721',
                     amount: '1',
                     nftImageUrl: nft?.image,
-                    nftUrl,
+                    nftUrl: nft?.explorerUri,
                     name: nft?.name,
                     collectionName: nft?.collection?.name,
-                    collectionHashUrl: contractHashUrl,
+                    collectionHashUrl: nft?.collection?.url,
                 });
             });
             await Promise.allSettled(promises);
         }
-        const txIdUrl = txTemplateUrl?.replace('{txId}', hash);
         return {
             txId: hash,
             block: Number(data.block_number),
-            date: new Date(data.block_timestamp).toISOString(),
+            date: new Date(data.block_timestamp).toJSON(),
             invocationCount: 0,
             notificationCount: 0,
             networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromNumber(data.transaction_fee), {
                 decimals: this._service.feeToken.decimals,
             }),
-            txIdUrl,
+            txIdUrl: this._service.explorerService.buildTransactionUrl(hash),
             events,
             type: 'default',
         };
@@ -212,16 +202,11 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
         });
         const transactions = [];
         const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._service.network);
-        const txTemplateUrl = this._service.explorerService.getTxTemplateUrl();
-        const addressTemplateUrl = this._service.explorerService.getAddressTemplateUrl();
-        const contractTemplateUrl = this._service.explorerService.getContractTemplateUrl();
-        const nftTemplateUrl = this._service.explorerService.getNftTemplateUrl();
-        const promises = data.result.map(async (item) => {
+        const promises = data.result.map(async (item, index) => {
             const events = [];
-            const nativeContractHashUrl = contractTemplateUrl?.replace('{hash}', nativeAsset.hash);
             item.native_transfers.forEach(transfer => {
-                const fromUrl = addressTemplateUrl?.replace('{address}', transfer.from_address);
-                const toUrl = addressTemplateUrl?.replace('{address}', transfer.to_address);
+                const fromUrl = this._service.explorerService.buildAddressUrl(transfer.from_address);
+                const toUrl = this._service.explorerService.buildAddressUrl(transfer.to_address);
                 events.push({
                     amount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(transfer.value, nativeAsset.decimals), {
                         decimals: nativeAsset.decimals,
@@ -235,15 +220,14 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     contractHash: nativeAsset.hash,
                     methodName: 'transfer',
                     tokenType: 'native',
-                    contractHashUrl: nativeContractHashUrl,
+                    contractHashUrl: this._service.explorerService.buildContractUrl(nativeAsset.hash),
                 });
             });
             item.erc20_transfers.forEach(transfer => {
                 if (transfer.possible_spam)
                     return;
-                const fromUrl = addressTemplateUrl?.replace('{address}', transfer.from_address);
-                const toUrl = addressTemplateUrl?.replace('{address}', transfer.to_address);
-                const contractHashUrl = contractTemplateUrl?.replace('{hash}', transfer.address);
+                const fromUrl = this._service.explorerService.buildAddressUrl(transfer.from_address);
+                const toUrl = this._service.explorerService.buildAddressUrl(transfer.to_address);
                 events.push({
                     amount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(transfer.value, transfer.token_decimals), {
                         decimals: transfer.token_decimals,
@@ -262,20 +246,16 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     contractHash: transfer.address,
                     methodName: 'transfer',
                     tokenType: 'erc-20',
-                    contractHashUrl,
+                    contractHashUrl: this._service.explorerService.buildContractUrl(transfer.address),
                 });
             });
             const nftPromises = item.nft_transfers.map(async (transfer) => {
-                const fromUrl = addressTemplateUrl?.replace('{address}', transfer.from_address);
-                const toUrl = addressTemplateUrl?.replace('{address}', transfer.to_address);
-                const collectionHashUrl = contractTemplateUrl?.replace('{contractHash}', transfer.token_address);
+                const fromUrl = this._service.explorerService.buildAddressUrl(transfer.from_address);
+                const toUrl = this._service.explorerService.buildAddressUrl(transfer.to_address);
                 const [nft] = await blockchain_service_1.BSUtilsHelper.tryCatch(() => this._service.nftDataService.getNft({ collectionHash: transfer.token_address, tokenHash: transfer.token_id }));
-                const nftUrl = nftTemplateUrl
-                    ?.replace('{collectionHash}', transfer.token_address)
-                    .replace('{tokenHash}', transfer.token_id);
                 events.push({
                     collectionHash: transfer.token_address,
-                    collectionHashUrl,
+                    collectionHashUrl: nft?.collection?.url,
                     tokenHash: transfer.token_id,
                     from: transfer.from_address,
                     fromUrl,
@@ -286,23 +266,22 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     tokenType: 'erc-721',
                     amount: '1',
                     nftImageUrl: nft?.image,
-                    nftUrl,
+                    nftUrl: nft?.explorerUri,
                     name: nft?.name,
                     collectionName: nft?.collection?.name,
                 });
             });
             await Promise.allSettled(nftPromises);
-            const txIdUrl = txTemplateUrl?.replace('{txId}', item.hash);
-            transactions.push({
+            transactions.splice(index, 0, {
                 block: Number(item.block_number),
                 txId: item.hash,
-                txIdUrl,
+                txIdUrl: this._service.explorerService.buildTransactionUrl(item.hash),
                 notificationCount: 0,
                 invocationCount: 0,
                 networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromNumber(item.transaction_fee), {
                     decimals: this._service.feeToken.decimals,
                 }),
-                date: new Date(item.block_timestamp).toISOString(),
+                date: new Date(item.block_timestamp).toJSON(),
                 events,
                 type: 'default',
             });

package/dist/services/blockchain-data/RpcBDSEthereum.d.ts

@@ -1,5 +1,5 @@
-import { TBalanceResponse, IBlockchainDataService, TBSNetworkId, TBSToken, type TContractResponse, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TTransaction } from '@cityofzion/blockchain-service';
-import { IBSEthereum } from '../../types';
+import { type TBalanceResponse, type IBlockchainDataService, type TBSNetworkId, type TBSToken, type TContractResponse, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TTransaction } from '@cityofzion/blockchain-service';
+import type { IBSEthereum } from '../../types';
 export declare class RpcBDSEthereum<N extends string, A extends TBSNetworkId, S extends IBSEthereum<N, A> = IBSEthereum<N, A>> implements IBlockchainDataService<N> {
     #private;
     readonly maxTimeToConfirmTransactionInMs: number;

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

@@ -35,19 +35,14 @@ class RpcBDSEthereum {
         const effectiveGasPrice = receipt.effectiveGasPrice ?? transaction.gasPrice;
         const fee = effectiveGasPrice.mul(receipt.gasUsed);
         const token = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._service.network);
-        const txTemplateUrl = this._service.explorerService.getTxTemplateUrl();
-        const addressTemplateUrl = this._service.explorerService.getAddressTemplateUrl();
-        const contractTemplateUrl = this._service.explorerService.getContractTemplateUrl();
-        const fromUrl = addressTemplateUrl?.replace('{address}', transaction.from);
-        const toUrl = addressTemplateUrl?.replace('{address}', transaction.to);
-        const contractHashUrl = contractTemplateUrl?.replace('{hash}', token.hash);
-        const txIdUrl = txTemplateUrl?.replace('{txId}', hash);
+        const fromUrl = this._service.explorerService.buildAddressUrl(transaction.from);
+        const toUrl = this._service.explorerService.buildAddressUrl(transaction.to);
         const timestamp = transaction.timestamp ?? 0;
         return {
             txId: hash,
-            txIdUrl,
+            txIdUrl: this._service.explorerService.buildTransactionUrl(hash),
             block: receipt.blockNumber,
-            date: new Date(timestamp).toISOString(),
+            date: new Date(timestamp).toJSON(),
             invocationCount: 0,
             notificationCount: 0,
             networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(fee.toString(), this._service.feeToken.decimals), {
@@ -65,7 +60,7 @@ class RpcBDSEthereum {
                     to: transaction.to,
                     toUrl,
                     contractHash: token.hash,
-                    contractHashUrl,
+                    contractHashUrl: this._service.explorerService.buildContractUrl(token.hash),
                     token: token ?? undefined,
                     tokenType: 'native',
                 },

package/dist/services/exchange-data/MoralisEDSEthereum.d.ts

@@ -1,5 +1,5 @@
-import { CryptoCompareEDS, TGetTokenPriceHistoryParams, TGetTokenPricesParams, TBSNetworkId, TTokenPricesHistoryResponse, TTokenPricesResponse } from '@cityofzion/blockchain-service';
-import { IBSEthereum } from '../../types';
+import { CryptoCompareEDS, type TGetTokenPriceHistoryParams, type TGetTokenPricesParams, type TBSNetworkId, type TTokenPricesHistoryResponse, type TTokenPricesResponse } from '@cityofzion/blockchain-service';
+import type { IBSEthereum } from '../../types';
 export declare class MoralisEDSEthereum<N extends string, A extends TBSNetworkId> extends CryptoCompareEDS {
     #private;
     static readonly NUMBERS_OF_BLOCK_BY_HOUR: number;

package/dist/services/explorer/BlockscoutESEthereum.d.ts

@@ -1,5 +1,5 @@
-import { TBuildNftUrlParams, IExplorerService, TBSNetworkId } from '@cityofzion/blockchain-service';
-import { IBSEthereum, TBSEthereumNetworkId } from '../../types';
+import type { TBuildNftUrlParams, IExplorerService, TBSNetworkId } from '@cityofzion/blockchain-service';
+import type { IBSEthereum, TBSEthereumNetworkId } from '../../types';
 export declare class BlockscoutESEthereum<N extends string, A extends TBSNetworkId> implements IExplorerService {
     #private;
     static readonly DEFAULT_BASE_URL_BY_NETWORK_ID: Partial<Record<TBSEthereumNetworkId, string>>;
@@ -7,7 +7,7 @@ export declare class BlockscoutESEthereum<N extends string, A extends TBSNetwork
     constructor(service: IBSEthereum<N, A>, baseUrl?: string);
     buildTransactionUrl(hash: string): string | undefined;
     buildContractUrl(contractHash: string): string | undefined;
-    buildNftUrl(params: TBuildNftUrlParams): string | undefined;
+    buildNftUrl({ tokenHash, collectionHash }: TBuildNftUrlParams): string | undefined;
     buildAddressUrl(address: string): string | undefined;
     getAddressTemplateUrl(): string | undefined;
     getTxTemplateUrl(): string | undefined;

package/dist/services/explorer/BlockscoutESEthereum.js

@@ -20,22 +20,22 @@ class BlockscoutESEthereum {
         __classPrivateFieldSet(this, _BlockscoutESEthereum_baseUrl, baseUrl ?? BlockscoutESEthereum.DEFAULT_BASE_URL_BY_NETWORK_ID[this._service.network.id], "f");
     }
     buildTransactionUrl(hash) {
-        if (!__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f"))
+        if (!__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f") || !hash?.length)
             return undefined;
         return `${__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f")}/tx/${this._service.tokenService.normalizeHash(hash)}`;
     }
     buildContractUrl(contractHash) {
-        if (!__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f"))
+        if (!__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f") || !contractHash?.length)
             return undefined;
         return `${__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f")}/address/${this._service.tokenService.normalizeHash(contractHash)}`;
     }
-    buildNftUrl(params) {
-        if (!__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f") || !params.collectionHash)
+    buildNftUrl({ tokenHash, collectionHash }) {
+        if (!__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f") || !tokenHash?.length || !collectionHash?.length)
             return undefined;
-        return `${__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f")}/token/${this._service.tokenService.normalizeHash(params.collectionHash)}/instance/${params.tokenHash}`;
+        return `${__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f")}/token/${this._service.tokenService.normalizeHash(collectionHash)}/instance/${tokenHash}`;
     }
     buildAddressUrl(address) {
-        if (!__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f"))
+        if (!__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f") || !address?.length)
             return undefined;
         return `${__classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrl, "f")}/address/${address}`;
     }

package/dist/services/full-transactions-data/MoralisFullTransactionsDataServiceEthereum.js

@@ -38,15 +38,11 @@ class MoralisFullTransactionsDataServiceEthereum {
         });
         const items = response.data ?? [];
         const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").network);
-        const addressTemplateUrl = __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.getAddressTemplateUrl();
-        const txTemplateUrl = __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.getTxTemplateUrl();
-        const nftTemplateUrl = __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.getNftTemplateUrl();
-        const contractTemplateUrl = __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.getContractTemplateUrl();
         const itemPromises = items.map(async ({ networkFeeAmount, systemFeeAmount, ...item }, index) => {
             const txId = item.transactionID;
             const newItem = {
                 txId,
-                txIdUrl: txId ? txTemplateUrl?.replace('{txId}', txId) : undefined,
+                txIdUrl: txId ? __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.buildTransactionUrl(txId) : undefined,
                 block: item.block,
                 date: item.date,
                 invocationCount: item.invocationCount,
@@ -69,14 +65,10 @@ class MoralisFullTransactionsDataServiceEthereum {
                 const isErc721 = MoralisFullTransactionsDataServiceEthereum.ERC721_STANDARDS.includes(standard);
                 const isErc20 = MoralisFullTransactionsDataServiceEthereum.ERC20_STANDARDS.includes(standard);
                 const isNft = (isErc1155 || isErc721) && !!tokenHash;
-                const fromUrl = from ? addressTemplateUrl?.replace('{address}', from) : undefined;
-                const toUrl = to ? addressTemplateUrl?.replace('{address}', to) : undefined;
-                const contractHashUrl = contractHash ? contractTemplateUrl?.replace('{hash}', contractHash) : undefined;
+                const fromUrl = from ? __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.buildAddressUrl(from) : undefined;
+                const toUrl = to ? __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.buildAddressUrl(to) : undefined;
                 if (isNft) {
                     const [nft] = await blockchain_service_1.BSUtilsHelper.tryCatch(() => __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").nftDataService.getNft({ collectionHash: contractHash, tokenHash }));
-                    const nftUrl = contractHash
-                        ? nftTemplateUrl?.replace('{collectionHash}', contractHash).replace('{tokenHash}', tokenHash)
-                        : undefined;
                     newItem.events.splice(eventIndex, 0, {
                         eventType: 'nft',
                         amount: undefined,
@@ -86,11 +78,11 @@ class MoralisFullTransactionsDataServiceEthereum {
                         to,
                         toUrl,
                         collectionHash: contractHash,
-                        collectionHashUrl: contractHashUrl,
+                        collectionHashUrl: nft?.collection?.url,
                         tokenHash,
                         tokenType: isErc1155 ? 'erc-1155' : 'erc-721',
                         nftImageUrl: nft?.image,
-                        nftUrl,
+                        nftUrl: nft?.explorerUri,
                         name: nft?.name,
                         collectionName: nft?.collection?.name,
                     });
@@ -108,7 +100,7 @@ class MoralisFullTransactionsDataServiceEthereum {
                     to,
                     toUrl,
                     contractHash,
-                    contractHashUrl,
+                    contractHashUrl: __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.buildContractUrl(contractHash),
                     token: token ?? undefined,
                     tokenType: isErc20 ? 'erc-20' : 'generic',
                 });

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

@@ -1,4 +1,4 @@
-import { TBSAccount, TLedgerServiceEmitter, TGetLedgerTransport, TUntilIndexRecord, ILedgerService } from '@cityofzion/blockchain-service';
+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';

package/dist/services/ledger/EthersLedgerServiceEthereum.js

@@ -82,7 +82,7 @@ class EthersLedgerSigner extends ethers_1.Signer {
                 message = ethers_1.ethers.utils.toUtf8Bytes(message);
             }
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureStart');
-            const obj = await blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signPersonalMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), ethers_1.ethers.utils.hexlify(message).substring(2)), { shouldRetry: EthersLedgerSigner.shouldRetry });
+            const obj = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signPersonalMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), ethers_1.ethers.utils.hexlify(message).substring(2));
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
             // Normalize the signature for Ethers
             obj.r = '0x' + obj.r;
@@ -102,7 +102,7 @@ class EthersLedgerSigner extends ethers_1.Signer {
                 .substring(2);
             const resolution = await hw_app_eth_1.ledgerService.resolveTransaction(serializedUnsignedTransaction, {}, {});
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureStart');
-            const signature = await blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signTransaction(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), serializedUnsignedTransaction, resolution), { shouldRetry: EthersLedgerSigner.shouldRetry });
+            const signature = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signTransaction(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), serializedUnsignedTransaction, resolution);
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
             return ethers_1.ethers.utils.serializeTransaction(tx, {
                 v: ethers_1.ethers.BigNumber.from('0x' + signature.v).toNumber(),
@@ -129,14 +129,12 @@ class EthersLedgerSigner extends ethers_1.Signer {
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureStart');
             let obj;
             try {
-                obj = await blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712Message(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), payload), {
-                    shouldRetry: EthersLedgerSigner.shouldRetry,
-                });
+                obj = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712Message(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "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 blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712HashedMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), domainSeparatorHex, hashStructMessageHex), { shouldRetry: EthersLedgerSigner.shouldRetry });
+                obj = await __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712HashedMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), domainSeparatorHex, hashStructMessageHex);
             }
             __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")?.emit('getSignatureEnd');
             // Normalize the signature for Ethers
@@ -171,8 +169,8 @@ class EthersLedgerServiceEthereum {
     }
     async getAccount(transport, index) {
         const ledgerApp = new hw_app_eth_1.default(transport);
-        const bip44Path = __classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").bip44DerivationPath.replace('?', index.toString());
-        const { publicKey, address } = await blockchain_service_1.BSUtilsHelper.retry(() => ledgerApp.getAddress(bip44Path), {
+        const bipPath = blockchain_service_1.BSKeychainHelper.getBipPath(__classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").bipDerivationPath, index);
+        const { publicKey, address } = await blockchain_service_1.BSUtilsHelper.retry(() => ledgerApp.getAddress(bipPath), {
             shouldRetry: EthersLedgerSigner.shouldRetry,
         });
         const publicKeyWithPrefix = '0x' + publicKey;
@@ -180,7 +178,7 @@ class EthersLedgerServiceEthereum {
             address,
             key: publicKeyWithPrefix,
             type: 'publicKey',
-            bip44Path,
+            bipPath,
             blockchain: __classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").name,
             isHardware: true,
         };

package/dist/services/nft-data/GhostMarketNDSEthereum.d.ts

@@ -1,8 +1,8 @@
-import { TBSNetworkId, GhostMarketNDS, THasTokenParam } from '@cityofzion/blockchain-service';
-import { IBSEthereum, TBSEthereumNetworkId } from '../../types';
+import { GhostMarketNDS, type TBSNetworkId, type THasTokenParams } from '@cityofzion/blockchain-service';
+import type { IBSEthereum, TBSEthereumNetworkId } from '../../types';
 export declare class GhostMarketNDSEthereum<N extends string, A extends TBSNetworkId> extends GhostMarketNDS<N, A, IBSEthereum<N, A>> {
     static readonly CHAIN_BY_NETWORK_ID: Partial<Record<TBSEthereumNetworkId, string>>;
     constructor(service: IBSEthereum<N, A>);
-    hasToken({ collectionHash, address }: THasTokenParam): Promise<boolean>;
+    hasToken({ address, collectionHash }: THasTokenParams): Promise<boolean>;
     getChain(): string;
 }

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

@@ -8,7 +8,7 @@ class GhostMarketNDSEthereum extends blockchain_service_1.GhostMarketNDS {
     constructor(service) {
         super(service);
     }
-    async hasToken({ collectionHash, address }) {
+    async hasToken({ address, collectionHash }) {
         try {
             if (!collectionHash)
                 return false;

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

@@ -1,5 +1,5 @@
-import { IWalletConnectService, TBSNetworkId, TWalletConnectServiceRequestMethodParams } from '@cityofzion/blockchain-service';
-import { IBSEthereum } from '../../types';
+import type { IWalletConnectService, TBSNetworkId, TWalletConnectServiceRequestMethodParams } from '@cityofzion/blockchain-service';
+import type { IBSEthereum } from '../../types';
 import { ethers } from 'ethers';
 export declare class WalletConnectServiceEthereum<N extends string, A extends TBSNetworkId> implements IWalletConnectService<N> {
     #private;

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

@@ -50,11 +50,9 @@ class WalletConnectServiceEthereum {
         if (typeof param !== 'object') {
             throw new Error('Invalid params');
         }
-        if (!param.chainId) {
-            const chainId = parseInt(this._service.network.id);
-            if (!isNaN(chainId))
-                param.chainId = chainId;
-        }
+        const chainId = parseInt(param.chainId ?? this._service.network.id);
+        if (!isNaN(chainId))
+            param.chainId = chainId;
         if (param.gas) {
             param.gasLimit = param.gas;
             delete param.gas;

package/dist/types.d.ts

@@ -1,9 +1,9 @@
-import { IBlockchainService, IBSWithEncryption, IBSWithExplorer, IBSWithFee, IBSWithLedger, IBSWithNameService, IBSWithNft, IBSWithWalletConnect, TBSAccount, TBSNetworkId, type IBSWithFullTransactions } from '@cityofzion/blockchain-service';
+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';
 export type TBSEthereumNetworkId = TBSNetworkId<'1' | '10' | '25' | '56' | '137' | '250' | '1101' | '8453' | '80002' | '42161' | '42220' | '43114' | '59144' | '11155111'>;
 export type TSupportedEVM = 'ethereum' | 'polygon' | 'base' | 'arbitrum';
-export interface IBSEthereum<N extends string = string, A extends string = TBSEthereumNetworkId> extends IBlockchainService<N, A>, IBSWithNft, IBSWithNameService, IBSWithFee<N>, IBSWithLedger<N>, IBSWithExplorer, IBSWithEncryption<N>, IBSWithWalletConnect<N>, IBSWithFullTransactions<N> {
+export interface IBSEthereum<N extends string = string, A extends string = 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>;
 }
 export type TMoralisBDSEthereumNativeBalanceApiResponse = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "license": "GPL-3.0-only",
   "author": "Coz",
@@ -17,9 +17,9 @@
     "@ethersproject/json-wallets": "5.8.0",
     "@ethersproject/properties": "5.8.0",
     "@ledgerhq/hw-app-eth": "~7.3.0",
-    "axios": "~1.13.2",
+    "axios": "~1.13.5",
     "ethers": "5.8.0",
-    "@cityofzion/blockchain-service": "3.0.5"
+    "@cityofzion/blockchain-service": "3.0.6"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport": "~6.32.0",