@cityofzion/bs-ethereum 3.1.2 → 3.1.4

package/dist/BSEthereum.d.ts

@@ -1,9 +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 IWalletConnectService, type IFullTransactionsDataService, type TTransactionDefault } 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, type TTransactionDefault, type TBSNetworkId } from '@cityofzion/blockchain-service';
 import { ethers } from 'ethers';
 import { EthersLedgerServiceEthereum } from './services/ledger/EthersLedgerServiceEthereum';
-import type { IBSEthereum, TBSEthereumNetworkId, TSupportedEVM } from './types';
+import type { IBSEthereum, TBSEthereumName, TBSEthereumNetworkId } from './types';
 import { TypedDataSigner } from '@ethersproject/abstract-signer';
-export declare class BSEthereum<N extends string = string, A extends string = TBSEthereumNetworkId> implements IBSEthereum<N, A> {
+export declare class BSEthereum<N extends string = TBSEthereumName, A extends TBSNetworkId = TBSEthereumNetworkId> implements IBSEthereum<N, A> {
     #private;
     readonly name: N;
     readonly bipDerivationPath: string;
@@ -16,20 +16,20 @@ export declare class BSEthereum<N extends string = string, A extends string = TB
     networkUrls: string[];
     readonly defaultNetwork: TBSNetwork<A>;
     readonly availableNetworks: TBSNetwork<A>[];
-    blockchainDataService: IBlockchainDataService<N>;
+    blockchainDataService: IBlockchainDataService;
     exchangeDataService: IExchangeDataService;
     ledgerService: EthersLedgerServiceEthereum<N>;
     nftDataService: INftDataService;
     explorerService: IExplorerService;
     tokenService: ITokenService;
     walletConnectService: IWalletConnectService<N>;
-    fullTransactionsDataService: IFullTransactionsDataService<N>;
-    constructor(name: N, evm?: TSupportedEVM, network?: TBSNetwork<A>, getLedgerTransport?: TGetLedgerTransport<N>);
-    protected _buildTransferParams(intent: TTransferIntent): Promise<{
+    fullTransactionsDataService: IFullTransactionsDataService;
+    constructor(name: N, network?: TBSNetwork<A>, getLedgerTransport?: TGetLedgerTransport<N>);
+    _generateSigner(account: TBSAccount<N>): Promise<ethers.Signer & TypedDataSigner>;
+    _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;
     pingNetwork(url: string): Promise<TPingNetworkResponse>;
     validateAddress(address: 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({ senderAccount, intents }: TTransferParams<N>): Promise<TTransactionDefault<N>[]>;
+    transfer({ senderAccount, intents }: TTransferParams<N>): Promise<TTransactionDefault[]>;
     calculateTransferFee(params: TTransferParams<N>): Promise<string>;
     resolveNameServiceDomain(domainName: string): Promise<string>;
 }

package/dist/BSEthereum.js

@@ -60,19 +60,35 @@ const WalletConnectServiceEthereum_1 = require("./services/wallet-connect/Wallet
 const axios_1 = __importDefault(require("axios"));
 const MoralisFullTransactionsDataServiceEthereum_1 = require("./services/full-transactions-data/MoralisFullTransactionsDataServiceEthereum");
 class BSEthereum {
-    constructor(name, evm, network, getLedgerTransport) {
+    constructor(name, network, getLedgerTransport) {
         _BSEthereum_instances.add(this);
         this.isMultiTransferSupported = false;
         this.isCustomNetworkSupported = false;
         this.name = name;
         this.ledgerService = new EthersLedgerServiceEthereum_1.EthersLedgerServiceEthereum(this, getLedgerTransport);
         this.bipDerivationPath = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_BIP_DERIVATION_PATH;
-        if (!evm)
+        const networks = BSEthereumConstants_1.BSEthereumConstants.NETWORKS_BY_EVM[name];
+        // This case is hit when the user tries to initialize the service with a custom network that is not in our predefined list. We want to allow that, but in that case we won't have the default network and available networks list.
+        if (!networks || !networks.length) {
             return;
-        this.availableNetworks = BSEthereumConstants_1.BSEthereumConstants.NETWORKS_BY_EVM[evm];
+        }
+        this.availableNetworks = networks;
         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);
+        if (account.isHardware) {
+            if (!this.ledgerService.getLedgerTransport)
+                throw new Error('You must provide getLedgerTransport function to use Ledger');
+            if (!account.bipPath) {
+                throw new Error('Account must have BIP path to use Ledger');
+            }
+            const ledgerTransport = await this.ledgerService.getLedgerTransport(account);
+            return this.ledgerService.getSigner(ledgerTransport, account.bipPath, provider);
+        }
+        return new ethers_1.ethers.Wallet(account.key, provider);
+    }
     async _buildTransferParams(intent) {
         const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
         const amount = ethersBigNumber.parseFixed(intent.amount, intent.token.decimals);
@@ -100,19 +116,6 @@ class BSEthereum {
             gasPrice,
         };
     }
-    async generateSigner(account) {
-        const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-        if (account.isHardware) {
-            if (!this.ledgerService.getLedgerTransport)
-                throw new Error('You must provide getLedgerTransport function to use Ledger');
-            if (!account.bipPath) {
-                throw new Error('Account must have BIP path to use Ledger');
-            }
-            const ledgerTransport = await this.ledgerService.getLedgerTransport(account);
-            return this.ledgerService.getSigner(ledgerTransport, account.bipPath, provider);
-        }
-        return new ethers_1.ethers.Wallet(account.key, provider);
-    }
     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);
@@ -126,7 +129,7 @@ class BSEthereum {
         this.explorerService = new BlockscoutESEthereum_1.BlockscoutESEthereum(this);
         this.exchangeDataService = new MoralisEDSEthereum_1.MoralisEDSEthereum(this);
         this.blockchainDataService = new MoralisBDSEthereum_1.MoralisBDSEthereum(this);
-        this.tokenService = new TokenServiceEthereum_1.TokenServiceEthereum();
+        this.tokenService = new TokenServiceEthereum_1.TokenServiceEthereum(this);
         this.walletConnectService = new WalletConnectServiceEthereum_1.WalletConnectServiceEthereum(this);
         this.fullTransactionsDataService = new MoralisFullTransactionsDataServiceEthereum_1.MoralisFullTransactionsDataServiceEthereum(this);
     }
@@ -209,10 +212,9 @@ class BSEthereum {
         return wallet.encrypt(password);
     }
     async transfer({ senderAccount, intents }) {
-        const signer = await this.generateSigner(senderAccount);
+        const signer = await this._generateSigner(senderAccount);
         const { address } = senderAccount;
         const addressUrl = this.explorerService.buildAddressUrl(address);
-        const nativeTokenHash = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this.network).hash;
         const transactions = [];
         let error;
         for (const intent of intents) {
@@ -236,13 +238,11 @@ class BSEthereum {
                 if (txId) {
                     const { receiverAddress, token } = intent;
                     const tokenHash = token.hash;
-                    const isNativeToken = this.tokenService.predicateByHash(nativeTokenHash, tokenHash);
                     transactions.push({
                         txId,
                         txIdUrl: this.explorerService.buildTransactionUrl(txId),
                         date: new Date().toJSON(),
                         networkFeeAmount: fee,
-                        type: 'default',
                         view: 'default',
                         events: [
                             {
@@ -253,7 +253,6 @@ class BSEthereum {
                                 fromUrl: addressUrl,
                                 to: receiverAddress,
                                 toUrl: this.explorerService.buildAddressUrl(receiverAddress),
-                                tokenType: isNativeToken ? 'native' : 'erc-20',
                                 tokenUrl: this.explorerService.buildContractUrl(tokenHash),
                                 token,
                             },
@@ -272,7 +271,7 @@ class BSEthereum {
         return transactions;
     }
     async calculateTransferFee(params) {
-        const signer = await this.generateSigner(params.senderAccount);
+        const signer = await this._generateSigner(params.senderAccount);
         let fee = ethers_1.ethers.utils.parseEther('0');
         for (const intent of params.intents) {
             const { gasPrice, transactionParams } = await this._buildTransferParams(intent);

package/dist/constants/BSEthereumConstants.d.ts

@@ -1,5 +1,5 @@
 import type { TBSNetwork } from '@cityofzion/blockchain-service';
-import type { TBSEthereumNetworkId, TSupportedEVM } from '../types';
+import type { TBSEthereumNetworkId, TBSEthereumName } from '../types';
 export declare class BSEthereumConstants {
     static readonly DEFAULT_DECIMALS = 18;
     static readonly DEFAULT_GAS_LIMIT = 21000;
@@ -7,5 +7,5 @@ export declare class BSEthereumConstants {
     static readonly NATIVE_SYMBOL_BY_NETWORK_ID: Record<TBSEthereumNetworkId, string>;
     static readonly NATIVE_WRAPPED_HASH_BY_NETWORK_ID: Partial<Record<TBSEthereumNetworkId, string>>;
     static readonly RPC_LIST_BY_NETWORK_ID: Record<TBSEthereumNetworkId, string[]>;
-    static readonly NETWORKS_BY_EVM: Record<TSupportedEVM, TBSNetwork<TBSEthereumNetworkId>[]>;
+    static readonly NETWORKS_BY_EVM: Record<TBSEthereumName, TBSNetwork<TBSEthereumNetworkId>[]>;
 }

package/dist/helpers/BSEthereumHelper.d.ts

@@ -1,5 +1,5 @@
-import type { TBSNetwork, TBSNetworkId } from '@cityofzion/blockchain-service';
-import type { IBSEthereum, TBSEthereumNetworkId } from '../types';
+import type { TBSNetwork } from '@cityofzion/blockchain-service';
+import type { TBSEthereumNetworkId } from '../types';
 export declare class BSEthereumHelper {
     static getNativeAsset(network: TBSNetwork<TBSEthereumNetworkId>): {
         symbol: string;
@@ -7,5 +7,4 @@ export declare class BSEthereumHelper {
         decimals: number;
         hash: string;
     };
-    static isMainnetNetwork<N extends string, A extends TBSNetworkId>(service: IBSEthereum<N, A>): boolean;
 }

package/dist/helpers/BSEthereumHelper.js

@@ -5,10 +5,7 @@ const BSEthereumConstants_1 = require("../constants/BSEthereumConstants");
 class BSEthereumHelper {
     static getNativeAsset(network) {
         const symbol = BSEthereumConstants_1.BSEthereumConstants.NATIVE_SYMBOL_BY_NETWORK_ID[network.id] ?? 'ETH';
-        return { symbol, name: symbol, decimals: 18, hash: '0x' };
-    }
-    static isMainnetNetwork(service) {
-        return (service.network.type === 'mainnet' && service.availableNetworks.some(network => network.id === service.network.id));
+        return { symbol, name: symbol, decimals: 18, hash: '-' };
     }
 }
 exports.BSEthereumHelper = BSEthereumHelper;

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

@@ -11,7 +11,7 @@ export declare class MoralisBDSEthereum<N extends string, A extends TBSNetworkId
     constructor(service: IBSEthereum<N, A>);
     getBalance(address: string): Promise<TBalanceResponse[]>;
     getTokenInfo(hash: string): Promise<TBSToken>;
-    getTransaction(hash: string): Promise<TTransactionDefault<N>>;
-    getTransactionsByAddress(params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
+    getTransaction(hash: string): Promise<TTransactionDefault>;
+    getTransactionsByAddress(params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
     getContract(hash: string): Promise<TContractResponse>;
 }

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

@@ -115,7 +115,6 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 fromUrl,
                 to: data.to_address,
                 toUrl,
-                tokenType: 'native',
                 tokenUrl: this._service.explorerService.buildContractUrl(nativeToken.hash),
                 token: nativeToken,
             });
@@ -146,7 +145,6 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                         fromUrl,
                         to,
                         toUrl,
-                        tokenType: 'erc-20',
                         tokenUrl: this._service.explorerService.buildContractUrl(token.hash),
                         token,
                     });
@@ -163,7 +161,6 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     fromUrl,
                     to,
                     toUrl,
-                    tokenType: 'erc-721',
                     nft,
                 });
             });
@@ -177,7 +174,6 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromNumber(data.transaction_fee), {
                 decimals: this._service.feeToken.decimals,
             }),
-            type: 'default',
             view: 'default',
             events,
         };
@@ -209,7 +205,6 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     fromUrl,
                     to: transfer.to_address,
                     toUrl,
-                    tokenType: 'native',
                     tokenUrl: this._service.explorerService.buildContractUrl(nativeAsset.hash),
                     token: nativeAsset,
                 });
@@ -236,7 +231,6 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     fromUrl,
                     to: transfer.to_address,
                     toUrl,
-                    tokenType: 'erc-20',
                     tokenUrl: this._service.explorerService.buildContractUrl(token.hash),
                     token,
                 });
@@ -254,7 +248,6 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     fromUrl,
                     to: transfer.to_address,
                     toUrl,
-                    tokenType: 'erc-721',
                     nft,
                 });
             });
@@ -267,7 +260,6 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromNumber(item.transaction_fee), {
                     decimals: this._service.feeToken.decimals,
                 }),
-                type: 'default',
                 view: 'default',
                 events,
             });

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

@@ -1,13 +1,13 @@
 import { type TBalanceResponse, type IBlockchainDataService, type TBSNetworkId, type TBSToken, type TContractResponse, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TTransactionDefault } 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> {
+export declare class RpcBDSEthereum<N extends string, A extends TBSNetworkId, S extends IBSEthereum<N, A> = IBSEthereum<N, A>> implements IBlockchainDataService {
     #private;
     readonly maxTimeToConfirmTransactionInMs: number;
     readonly _tokenCache: Map<string, TBSToken>;
     readonly _service: S;
     constructor(service: S);
-    getTransaction(hash: string): Promise<TTransactionDefault<N>>;
-    getTransactionsByAddress(_params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
+    getTransaction(hash: string): Promise<TTransactionDefault>;
+    getTransactionsByAddress(_params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
     getContract(_hash: string): Promise<TContractResponse>;
     getTokenInfo(hash: string): Promise<TBSToken>;
     getBalance(address: string): Promise<TBalanceResponse[]>;

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

@@ -46,7 +46,6 @@ class RpcBDSEthereum {
             networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(fee.toString(), this._service.feeToken.decimals), {
                 decimals: this._service.feeToken.decimals,
             }),
-            type: 'default',
             view: 'default',
             events: [
                 {
@@ -59,7 +58,6 @@ class RpcBDSEthereum {
                     fromUrl,
                     to: transaction.to,
                     toUrl,
-                    tokenType: 'native',
                     tokenUrl: this._service.explorerService.buildContractUrl(token.hash),
                     token,
                 },

package/dist/services/exchange-data/MoralisEDSEthereum.js

@@ -26,7 +26,7 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
         __classPrivateFieldSet(this, _MoralisEDSEthereum_service, service, "f");
     }
     async getTokenPrices({ tokens }) {
-        if (!BSEthereumHelper_1.BSEthereumHelper.isMainnetNetwork(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f")))
+        if (__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network.type !== 'mainnet')
             throw new Error('Exchange is only available on mainnet');
         if (!MoralisBDSEthereum_1.MoralisBDSEthereum.isSupported(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network))
             throw new Error('Exchange is not supported on this network');
@@ -82,7 +82,7 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
         return response;
     }
     async getTokenPriceHistory(params) {
-        if (!BSEthereumHelper_1.BSEthereumHelper.isMainnetNetwork(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f")))
+        if (__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network.type !== 'mainnet')
             throw new Error('Exchange is only available on mainnet');
         if (!MoralisBDSEthereum_1.MoralisBDSEthereum.isSupported(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network))
             throw new Error('Exchange is not supported on this network');

package/dist/services/full-transactions-data/MoralisFullTransactionsDataServiceEthereum.d.ts

@@ -1,12 +1,11 @@
 import { type IFullTransactionsDataService, type TBSNetworkId, type TExportFullTransactionsByAddressParams, type TGetFullTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TTransactionDefault } from '@cityofzion/blockchain-service';
 import type { IBSEthereum, TBSEthereumNetworkId } from '../../types';
-export declare class MoralisFullTransactionsDataServiceEthereum<N extends string, A extends TBSNetworkId> implements IFullTransactionsDataService<N> {
+export declare class MoralisFullTransactionsDataServiceEthereum<N extends string, A extends TBSNetworkId> implements IFullTransactionsDataService {
     #private;
     static readonly SUPPORTED_NETWORKS_IDS: TBSEthereumNetworkId[];
     static readonly ERC721_STANDARDS: string[];
     static readonly ERC1155_STANDARDS: string[];
-    static readonly ERC20_STANDARDS: string[];
     constructor(service: IBSEthereum<N, A>);
-    getFullTransactionsByAddress({ nextPageParams, ...params }: TGetFullTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
+    getFullTransactionsByAddress({ nextPageParams, ...params }: TGetFullTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
     exportFullTransactionsByAddress(params: TExportFullTransactionsByAddressParams): Promise<string>;
 }

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

@@ -48,7 +48,6 @@ class MoralisFullTransactionsDataServiceEthereum {
                 networkFeeAmount: networkFeeAmount
                     ? blockchain_service_1.BSBigNumberHelper.format(networkFeeAmount, { decimals: nativeToken.decimals })
                     : undefined,
-                type: 'default',
                 view: 'default',
                 events: [],
             };
@@ -59,7 +58,6 @@ class MoralisFullTransactionsDataServiceEthereum {
                 const standard = event.supportedStandards?.[0]?.toLowerCase() ?? '';
                 const isErc1155 = MoralisFullTransactionsDataServiceEthereum.ERC1155_STANDARDS.includes(standard);
                 const isErc721 = MoralisFullTransactionsDataServiceEthereum.ERC721_STANDARDS.includes(standard);
-                const isErc20 = MoralisFullTransactionsDataServiceEthereum.ERC20_STANDARDS.includes(standard);
                 const isNft = (isErc1155 || isErc721) && !!tokenHash;
                 const fromUrl = from ? __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.buildAddressUrl(from) : undefined;
                 const toUrl = to ? __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.buildAddressUrl(to) : undefined;
@@ -73,7 +71,6 @@ class MoralisFullTransactionsDataServiceEthereum {
                         fromUrl,
                         to,
                         toUrl,
-                        tokenType: isErc1155 ? 'erc-1155' : 'erc-721',
                         nft,
                     });
                     return;
@@ -89,7 +86,6 @@ class MoralisFullTransactionsDataServiceEthereum {
                     fromUrl,
                     to,
                     toUrl,
-                    tokenType: isErc20 ? 'erc-20' : 'generic',
                     tokenUrl: token ? __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.buildContractUrl(token.hash) : undefined,
                     token,
                 });
@@ -119,4 +115,3 @@ _MoralisFullTransactionsDataServiceEthereum_service = new WeakMap();
 MoralisFullTransactionsDataServiceEthereum.SUPPORTED_NETWORKS_IDS = ['1', '42161', '8453', '137'];
 MoralisFullTransactionsDataServiceEthereum.ERC721_STANDARDS = ['erc721', 'erc-721'];
 MoralisFullTransactionsDataServiceEthereum.ERC1155_STANDARDS = ['erc1155', 'erc-1155'];
-MoralisFullTransactionsDataServiceEthereum.ERC20_STANDARDS = ['erc20', 'erc-20'];

package/dist/services/token/TokenServiceEthereum.d.ts

@@ -1,4 +1,5 @@
 import { TokenService } from '@cityofzion/blockchain-service';
-export declare class TokenServiceEthereum extends TokenService {
+import type { TBSEthereumNetworkId } from '../../types';
+export declare class TokenServiceEthereum<N extends string, A extends TBSEthereumNetworkId> extends TokenService<N, A> {
     normalizeHash(hash: string): string;
 }

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

@@ -71,7 +71,7 @@ class WalletConnectServiceEthereum {
         else {
             param.gasPrice = param.gasPrice ?? gasPrice;
         }
-        const wallet = await this._service.generateSigner(args.account);
+        const wallet = await this._service._generateSigner(args.account);
         const connectedWallet = wallet.connect(provider);
         if (!param.gasLimit) {
             try {
@@ -92,7 +92,7 @@ class WalletConnectServiceEthereum {
         return { wallet, provider, param };
     }
     async personal_sign(args) {
-        const wallet = await this._service.generateSigner(args.account);
+        const wallet = await this._service._generateSigner(args.account);
         const message = args.params.filter((param) => !ethers_1.ethers.utils.isAddress(param))[0];
         const convertedMessage = __classPrivateFieldGet(this, _WalletConnectServiceEthereum_instances, "m", _WalletConnectServiceEthereum_convertHexToUtf8).call(this, message);
         return await wallet.signMessage(convertedMessage);
@@ -105,7 +105,7 @@ class WalletConnectServiceEthereum {
         return await wallet.signTransaction(param);
     }
     async eth_signTypedData(args) {
-        const wallet = await this._service.generateSigner(args.account);
+        const wallet = await this._service._generateSigner(args.account);
         const data = args.params.filter((param) => !ethers_1.ethers.utils.isAddress(param))[0];
         const parsedData = typeof data === 'string' ? JSON.parse(data) : data;
         const { domain, types, message } = parsedData;
@@ -131,7 +131,7 @@ class WalletConnectServiceEthereum {
         return await connectedWallet.call(param);
     }
     async eth_requestAccounts(args) {
-        const wallet = await this._service.generateSigner(args.account);
+        const wallet = await this._service._generateSigner(args.account);
         return [await wallet.getAddress()];
     }
     async eth_sendRawTransaction(args) {

package/dist/types.d.ts

@@ -2,9 +2,9 @@ import type { IBlockchainService, IBSWithEncryption, IBSWithExplorer, IBSWithFee
 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>, IBSWithNameService, IBSWithNft, IBSWithFee<N>, IBSWithLedger<N>, IBSWithExplorer, IBSWithEncryption<N>, IBSWithWalletConnect<N>, IBSWithFullTransactions<N> {
-    generateSigner(account: TBSAccount<N>): Promise<ethers.Signer & TypedDataSigner>;
+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 {
+    _generateSigner(account: TBSAccount<N>): Promise<ethers.Signer & TypedDataSigner>;
 }
 export type TMoralisBDSEthereumNativeBalanceApiResponse = {
     balance: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "license": "GPL-3.0-only",
   "author": "Coz",
@@ -19,7 +19,7 @@
     "@ledgerhq/hw-app-eth": "~7.3.0",
     "axios": "~1.13.5",
     "ethers": "5.8.0",
-    "@cityofzion/blockchain-service": "3.1.2"
+    "@cityofzion/blockchain-service": "3.1.4"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport": "~6.32.0",
@@ -31,7 +31,7 @@
     "vitest": "~4.0.18"
   },
   "scripts": {
-    "build": "rm -rf ./dist && npm run typecheck && tsc --project tsconfig.build.json",
+    "build": "rm -rf ./dist && rm -f *.tgz && npm run typecheck && tsc --project tsconfig.build.json",
     "format": "eslint --fix",
     "lint": "eslint .",
     "package": "npm run build && npm pack",