@cityofzion/bs-ethereum 3.1.7 → 3.1.8

package/dist/BSEthereum.d.ts

@@ -16,14 +16,14 @@ export declare class BSEthereum<N extends string = TBSEthereumName, A extends TB
     networkUrls: string[];
     readonly defaultNetwork: TBSNetwork<A>;
     readonly availableNetworks: TBSNetwork<A>[];
-    blockchainDataService: IBlockchainDataService;
+    blockchainDataService: IBlockchainDataService<N>;
     exchangeDataService: IExchangeDataService;
     ledgerService: EthersLedgerServiceEthereum<N>;
     nftDataService: INftDataService;
     explorerService: IExplorerService;
     tokenService: ITokenService;
     walletConnectService: IWalletConnectService<N>;
-    fullTransactionsDataService: IFullTransactionsDataService;
+    fullTransactionsDataService: IFullTransactionsDataService<N>;
     constructor(name: N, network?: TBSNetwork<A>, getLedgerTransport?: TGetLedgerTransport<N>);
     _generateSigner(account: TBSAccount<N>): Promise<ethers.Signer & TypedDataSigner>;
     _buildTransferParams(intent: TTransferIntent): Promise<{
@@ -41,7 +41,7 @@ export declare class BSEthereum<N extends string = TBSEthereumName, A extends 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[]>;
+    transfer({ senderAccount, intents }: TTransferParams<N>): Promise<TTransactionDefault<N>[]>;
     calculateTransferFee(params: TTransferParams<N>): Promise<string>;
     resolveNameServiceDomain(domainName: string): Promise<string>;
 }

package/dist/BSEthereum.js

@@ -241,6 +241,8 @@ class BSEthereum {
                     const { receiverAddress, token } = intent;
                     const tokenHash = token.hash;
                     transactions.push({
+                        blockchain: this.name,
+                        isPending: true,
                         txId,
                         txIdUrl: this.explorerService.buildTransactionUrl(txId),
                         date: new Date().toJSON(),

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>;
-    getTransactionsByAddress(params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
+    getTransaction(hash: string): Promise<TTransactionDefault<N>>;
+    getTransactionsByAddress(params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
     getContract(hash: string): Promise<TContractResponse>;
 }

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

@@ -167,6 +167,8 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             await Promise.allSettled(promises);
         }
         return {
+            blockchain: this._service.name,
+            isPending: false,
             txId: hash,
             txIdUrl: this._service.explorerService.buildTransactionUrl(hash),
             block: Number(data.block_number),
@@ -253,6 +255,8 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             });
             await Promise.allSettled(nftPromises);
             transactions.splice(index, 0, {
+                blockchain: this._service.name,
+                isPending: false,
                 txId: item.hash,
                 txIdUrl: this._service.explorerService.buildTransactionUrl(item.hash),
                 block: Number(item.block_number),

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 {
+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;
     readonly _tokenCache: Map<string, TBSToken>;
     readonly _service: S;
     constructor(service: S);
-    getTransaction(hash: string): Promise<TTransactionDefault>;
-    getTransactionsByAddress(_params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
+    getTransaction(hash: string): Promise<TTransactionDefault<N>>;
+    getTransactionsByAddress(_params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
     getContract(_hash: string): Promise<TContractResponse>;
     getTokenInfo(hash: string): Promise<TBSToken>;
     getBalance(address: string): Promise<TBalanceResponse[]>;

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

@@ -39,6 +39,8 @@ class RpcBDSEthereum {
         const toUrl = this._service.explorerService.buildAddressUrl(transaction.to);
         const timestamp = transaction.timestamp ?? 0;
         return {
+            blockchain: this._service.name,
+            isPending: false,
             txId: hash,
             txIdUrl: this._service.explorerService.buildTransactionUrl(hash),
             block: receipt.blockNumber,

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

@@ -1,11 +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 {
+export declare class MoralisFullTransactionsDataServiceEthereum<N extends string, A extends TBSNetworkId> implements IFullTransactionsDataService<N> {
     #private;
     static readonly SUPPORTED_NETWORKS_IDS: TBSEthereumNetworkId[];
     static readonly ERC721_STANDARDS: string[];
     static readonly ERC1155_STANDARDS: string[];
     constructor(service: IBSEthereum<N, A>);
-    getFullTransactionsByAddress({ nextPageParams, ...params }: TGetFullTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
+    getFullTransactionsByAddress({ nextPageParams, ...params }: TGetFullTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
     exportFullTransactionsByAddress(params: TExportFullTransactionsByAddressParams): Promise<string>;
 }

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

@@ -41,6 +41,8 @@ class MoralisFullTransactionsDataServiceEthereum {
         const itemPromises = items.map(async ({ networkFeeAmount, ...item }, index) => {
             const txId = item.transactionID;
             const newItem = {
+                blockchain: __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").name,
+                isPending: false,
                 txId,
                 txIdUrl: __classPrivateFieldGet(this, _MoralisFullTransactionsDataServiceEthereum_service, "f").explorerService.buildTransactionUrl(txId),
                 block: item.block,

package/dist/types.d.ts

@@ -3,7 +3,7 @@ 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 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 {
+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>;
 }
 export type TMoralisBDSEthereumNativeBalanceApiResponse = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "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.7"
+    "@cityofzion/blockchain-service": "3.1.8"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport": "~6.32.0",