npm - @cityofzion/bs-ethereum - Versions diffs - 2.12.8 → 2.13.1 - Mend

@cityofzion/bs-ethereum 2.12.8 → 2.13.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

package/dist/BSEthereum.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import { Account, BSCalculableFee, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, BlockchainDataService, BlockchainService, ExchangeDataService, ExplorerService, Network, NftDataService, Token, TransferParam, GetLedgerTransport } from '@cityofzion/blockchain-service';
+import { Account, BSCalculableFee, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, BlockchainDataService, BlockchainService, ExchangeDataService, ExplorerService, Network, NftDataService, Token, TransferParam, GetLedgerTransport, BSWithEncryption, ITokenService } from '@cityofzion/blockchain-service';
 import { ethers } from 'ethers';
 import { BSEthereumNetworkId } from './constants/BSEthereumConstants';
 import { EthersLedgerServiceEthereum } from './services/ledger/EthersLedgerServiceEthereum';
-export declare class BSEthereum<BSName extends string = string, NetworkId extends string = BSEthereumNetworkId> implements BlockchainService<BSName, NetworkId>, BSWithNft, BSWithNameService, BSCalculableFee<BSName>, BSWithLedger<BSName>, BSWithExplorerService {
+export declare class BSEthereum<BSName extends string = string, NetworkId extends string = BSEthereumNetworkId> implements BlockchainService<BSName, NetworkId>, BSWithNft, BSWithNameService, BSCalculableFee<BSName>, BSWithLedger<BSName>, BSWithExplorerService, BSWithEncryption<BSName> {
     #private;
     readonly name: BSName;
     readonly bip44DerivationPath: string;
@@ -15,6 +15,7 @@ export declare class BSEthereum<BSName extends string = string, NetworkId extend
     nftDataService: NftDataService;
     network: Network<NetworkId>;
     explorerService: ExplorerService;
+    tokenService: ITokenService;
     constructor(name: BSName, network?: Network<NetworkId>, getLedgerTransport?: GetLedgerTransport<BSName>);
     generateSigner(account: Account<BSName>): Promise<ethers.Signer>;
     testNetwork(network: Network<NetworkId>): Promise<void>;

package/dist/BSEthereum.js CHANGED Viewed

@@ -51,7 +51,7 @@ const MoralisEDSEthereum_1 = require("./services/exchange-data/MoralisEDSEthereu
 const GhostMarketNDSEthereum_1 = require("./services/nft-data/GhostMarketNDSEthereum");
 const BlockscoutESEthereum_1 = require("./services/explorer/BlockscoutESEthereum");
 const RpcBDSEthereum_1 = require("./services/blockchain-data/RpcBDSEthereum");
-const BSEthereumTokenHelper_1 = require("./helpers/BSEthereumTokenHelper");
+const TokenServiceEthereum_1 = require("./services/token/TokenServiceEthereum");
 class BSEthereum {
     constructor(name, network, getLedgerTransport) {
         _BSEthereum_instances.add(this);
@@ -77,7 +77,8 @@ class BSEthereum {
     }
     testNetwork(network) {
         return __awaiter(this, void 0, void 0, function* () {
-            const blockchainDataServiceClone = new RpcBDSEthereum_1.RpcBDSEthereum(network);
+            this.tokenService = new TokenServiceEthereum_1.TokenServiceEthereum();
+            const blockchainDataServiceClone = new RpcBDSEthereum_1.RpcBDSEthereum(network, this.tokenService);
             yield blockchainDataServiceClone.getBlockHeight();
         });
     }
@@ -85,9 +86,10 @@ class BSEthereum {
         __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_setTokens).call(this, network);
         this.network = network;
         this.nftDataService = new GhostMarketNDSEthereum_1.GhostMarketNDSEthereum(network);
-        this.explorerService = new BlockscoutESEthereum_1.BlockscoutESEthereum(network);
-        this.exchangeDataService = new MoralisEDSEthereum_1.MoralisEDSEthereum(network, this.blockchainDataService);
-        this.blockchainDataService = new MoralisBDSEthereum_1.MoralisBDSEthereum(network, this.nftDataService, this.explorerService);
+        this.explorerService = new BlockscoutESEthereum_1.BlockscoutESEthereum(network, this.tokenService);
+        this.exchangeDataService = new MoralisEDSEthereum_1.MoralisEDSEthereum(network, this.blockchainDataService, this.tokenService);
+        this.tokenService = new TokenServiceEthereum_1.TokenServiceEthereum();
+        this.blockchainDataService = new MoralisBDSEthereum_1.MoralisBDSEthereum(network, this.nftDataService, this.explorerService, this.tokenService);
     }
     validateAddress(address) {
         return ethers_1.ethers.utils.isAddress(address);
@@ -227,7 +229,7 @@ _BSEthereum_instances = new WeakSet(), _BSEthereum_buildTransferParams = functio
         let transactionParams = {
             type: 2,
         };
-        const isNative = BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(this.feeToken)(intent.tokenHash);
+        const isNative = this.tokenService.predicateByHash(this.feeToken)(intent.tokenHash);
         if (isNative) {
             transactionParams.to = intent.receiverAddress;
             transactionParams.value = amount;

package/dist/helpers/BSEthereumHelper.d.ts CHANGED Viewed

@@ -1,13 +1,14 @@
 import { Network } from '@cityofzion/blockchain-service';
 import { BSEthereumNetworkId } from '../constants/BSEthereumConstants';
+import { TokenServiceEthereum } from '../services/token/TokenServiceEthereum';
 export declare class BSEthereumHelper {
+    static tokenService: TokenServiceEthereum;
     static getNativeAsset(network: Network<BSEthereumNetworkId>): {
         symbol: string;
         name: string;
         decimals: number;
         hash: string;
     };
-    static getNativeSymbol(network: Network<BSEthereumNetworkId>): string;
     static getRpcList(network: Network<BSEthereumNetworkId>): string[];
     static isMainnet(network: Network<BSEthereumNetworkId>): boolean;
 }

package/dist/helpers/BSEthereumHelper.js CHANGED Viewed

@@ -2,15 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereumHelper = void 0;
 const BSEthereumConstants_1 = require("../constants/BSEthereumConstants");
-const BSEthereumTokenHelper_1 = require("./BSEthereumTokenHelper");
+const TokenServiceEthereum_1 = require("../services/token/TokenServiceEthereum");
 class BSEthereumHelper {
     static getNativeAsset(network) {
-        const symbol = this.getNativeSymbol(network);
-        return BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({ symbol, name: symbol, decimals: 18, hash: '0x' });
-    }
-    static getNativeSymbol(network) {
         var _a;
-        return (_a = BSEthereumConstants_1.BSEthereumConstants.NATIVE_SYMBOL_BY_NETWORK_ID[network.id]) !== null && _a !== void 0 ? _a : 'ETH';
+        const symbol = (_a = BSEthereumConstants_1.BSEthereumConstants.NATIVE_SYMBOL_BY_NETWORK_ID[network.id]) !== null && _a !== void 0 ? _a : 'ETH';
+        return { symbol, name: symbol, decimals: 18, hash: this.tokenService.normalizeHash('0x') };
     }
     static getRpcList(network) {
         var _a;
@@ -21,3 +18,4 @@ class BSEthereumHelper {
     }
 }
 exports.BSEthereumHelper = BSEthereumHelper;
+BSEthereumHelper.tokenService = new TokenServiceEthereum_1.TokenServiceEthereum();

package/dist/index.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 export * from './BSEthereum';
 export * from './helpers/BSEthereumHelper';
-export * from './helpers/BSEthereumTokenHelper';
 export * from './constants/BSEthereumConstants';
 export * from './services/blockchain-data/MoralisBDSEthereum';
 export * from './services/blockchain-data/DoraBDSEthereum';
@@ -10,5 +9,6 @@ export * from './services/explorer/BlockscoutESEthereum';
 export * from './services/ledger/EthersLedgerServiceEthereum';
 export * from './services/nft-data/GhostMarketNDSEthereum';
 export * from './services/nft-data/RpcNDSEthereum';
+export * from './services/token/TokenServiceEthereum';
 export * from './assets/abis/ERC20';
 export * from './assets/abis/ERC721';

package/dist/index.js CHANGED Viewed

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BSEthereum"), exports);
 __exportStar(require("./helpers/BSEthereumHelper"), exports);
-__exportStar(require("./helpers/BSEthereumTokenHelper"), exports);
 __exportStar(require("./constants/BSEthereumConstants"), exports);
 __exportStar(require("./services/blockchain-data/MoralisBDSEthereum"), exports);
 __exportStar(require("./services/blockchain-data/DoraBDSEthereum"), exports);
@@ -26,5 +25,6 @@ __exportStar(require("./services/explorer/BlockscoutESEthereum"), exports);
 __exportStar(require("./services/ledger/EthersLedgerServiceEthereum"), exports);
 __exportStar(require("./services/nft-data/GhostMarketNDSEthereum"), exports);
 __exportStar(require("./services/nft-data/RpcNDSEthereum"), exports);
+__exportStar(require("./services/token/TokenServiceEthereum"), exports);
 __exportStar(require("./assets/abis/ERC20"), exports);
 __exportStar(require("./assets/abis/ERC721"), exports);

package/dist/services/blockchain-data/DoraBDSEthereum.d.ts CHANGED Viewed

@@ -1,11 +1,12 @@
 import { RpcBDSEthereum } from './RpcBDSEthereum';
-import { ExplorerService, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, NetworkId, NftDataService } from '@cityofzion/blockchain-service';
-import { GetFullTransactionsByAddressResponse } from '@cityofzion/dora-ts/dist/interfaces/api/common';
+import { FullTransactionsByAddressParams, Network, NetworkId, TokenService } from '@cityofzion/blockchain-service';
 import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 export declare class DoraBDSEthereum<BSNetworkId extends NetworkId = BSEthereumNetworkId> extends RpcBDSEthereum {
-    #private;
-    constructor(network: Network<BSNetworkId>, supportedFullTransactionsByAddressNetworks: BSNetworkId[], nftDataService: NftDataService, explorerService: ExplorerService);
-    _transformFullTransactionsByAddressResponse({ nextCursor, ...response }: GetFullTransactionsByAddressResponse): Promise<FullTransactionsByAddressResponse>;
+    readonly _supportedErc721Standards: string[];
+    readonly _supportedErc1155Standards: string[];
+    readonly _supportedErc20Standards: string[];
+    readonly _supportedFullTransactionsByAddressNetworks: BSNetworkId[];
+    constructor(network: Network<BSNetworkId>, supportedFullTransactionsByAddressNetworks: BSNetworkId[], tokenService: TokenService);
     _validateFullTransactionsByAddressParams(params: Pick<FullTransactionsByAddressParams, 'address' | 'dateFrom' | 'dateTo'>): void;
     _validateGetFullTransactionsByAddressParams({ pageSize, ...params }: Pick<FullTransactionsByAddressParams, 'address' | 'dateFrom' | 'dateTo' | 'pageSize'>): void;
 }

package/dist/services/blockchain-data/DoraBDSEthereum.js CHANGED Viewed

@@ -1,24 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-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 __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -30,120 +10,21 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _DoraBDSEthereum_supportedErc721Standards, _DoraBDSEthereum_supportedErc1155Standards, _DoraBDSEthereum_supportedErc20Standards, _DoraBDSEthereum_supportedFullTransactionsByAddressNetworks, _DoraBDSEthereum_nftDataService, _DoraBDSEthereum_explorerService;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoraBDSEthereum = void 0;
 const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const ethers_1 = require("ethers");
-const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 class DoraBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
-    constructor(network, supportedFullTransactionsByAddressNetworks, nftDataService, explorerService) {
-        super(network);
-        _DoraBDSEthereum_supportedErc721Standards.set(this, ['erc721', 'erc-721']);
-        _DoraBDSEthereum_supportedErc1155Standards.set(this, ['erc1155', 'erc-1155']);
-        _DoraBDSEthereum_supportedErc20Standards.set(this, ['erc20', 'erc-20']);
-        _DoraBDSEthereum_supportedFullTransactionsByAddressNetworks.set(this, void 0);
-        _DoraBDSEthereum_nftDataService.set(this, void 0);
-        _DoraBDSEthereum_explorerService.set(this, void 0);
-        __classPrivateFieldSet(this, _DoraBDSEthereum_supportedFullTransactionsByAddressNetworks, supportedFullTransactionsByAddressNetworks, "f");
-        __classPrivateFieldSet(this, _DoraBDSEthereum_nftDataService, nftDataService, "f");
-        __classPrivateFieldSet(this, _DoraBDSEthereum_explorerService, explorerService, "f");
-    }
-    _transformFullTransactionsByAddressResponse(_a) {
-        var _b;
-        var { nextCursor } = _a, response = __rest(_a, ["nextCursor"]);
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = [];
-            const items = (_b = response.data) !== null && _b !== void 0 ? _b : [];
-            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
-            const addressTemplateUrl = __classPrivateFieldGet(this, _DoraBDSEthereum_explorerService, "f").getAddressTemplateUrl();
-            const txTemplateUrl = __classPrivateFieldGet(this, _DoraBDSEthereum_explorerService, "f").getTxTemplateUrl();
-            const nftTemplateUrl = __classPrivateFieldGet(this, _DoraBDSEthereum_explorerService, "f").getNftTemplateUrl();
-            const contractTemplateUrl = __classPrivateFieldGet(this, _DoraBDSEthereum_explorerService, "f").getContractTemplateUrl();
-            const itemPromises = items.map((_c) => __awaiter(this, void 0, void 0, function* () {
-                var { networkFeeAmount, systemFeeAmount } = _c, item = __rest(_c, ["networkFeeAmount", "systemFeeAmount"]);
-                const txId = item.transactionID;
-                const newItem = {
-                    txId,
-                    txIdUrl: txId ? txTemplateUrl === null || txTemplateUrl === void 0 ? void 0 : txTemplateUrl.replace('{txId}', txId) : undefined,
-                    block: item.block,
-                    date: item.date,
-                    invocationCount: item.invocationCount,
-                    notificationCount: item.notificationCount,
-                    networkFeeAmount: networkFeeAmount
-                        ? blockchain_service_1.BSBigNumberHelper.format(networkFeeAmount, { decimals: nativeToken.decimals })
-                        : undefined,
-                    systemFeeAmount: systemFeeAmount
-                        ? blockchain_service_1.BSBigNumberHelper.format(systemFeeAmount, { decimals: nativeToken.decimals })
-                        : undefined,
-                    events: [],
-                };
-                const eventPromises = item.events.map((event) => __awaiter(this, void 0, void 0, function* () {
-                    var _d, _e, _f, _g, _h, _j;
-                    let nftEvent;
-                    let assetEvent;
-                    const { methodName, tokenID: tokenId, contractHash: hash } = event;
-                    const from = (_d = event.from) !== null && _d !== void 0 ? _d : undefined;
-                    const to = (_e = event.to) !== null && _e !== void 0 ? _e : undefined;
-                    const standard = (_h = (_g = (_f = event.supportedStandards) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.toLowerCase()) !== null && _h !== void 0 ? _h : '';
-                    const isErc1155 = __classPrivateFieldGet(this, _DoraBDSEthereum_supportedErc1155Standards, "f").includes(standard);
-                    const isErc721 = __classPrivateFieldGet(this, _DoraBDSEthereum_supportedErc721Standards, "f").includes(standard);
-                    const isErc20 = __classPrivateFieldGet(this, _DoraBDSEthereum_supportedErc20Standards, "f").includes(standard);
-                    const isNft = (isErc1155 || isErc721) && !!tokenId;
-                    const fromUrl = from ? addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', from) : undefined;
-                    const toUrl = to ? addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', to) : undefined;
-                    const hashUrl = hash ? contractTemplateUrl === null || contractTemplateUrl === void 0 ? void 0 : contractTemplateUrl.replace('{hash}', hash) : undefined;
-                    if (isNft) {
-                        const [nft] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __classPrivateFieldGet(this, _DoraBDSEthereum_nftDataService, "f").getNft({ contractHash: hash, tokenId }));
-                        const nftUrl = hash ? nftTemplateUrl === null || nftTemplateUrl === void 0 ? void 0 : nftTemplateUrl.replace('{hash}', hash).replace('{tokenId}', tokenId) : undefined;
-                        nftEvent = {
-                            eventType: 'nft',
-                            amount: undefined,
-                            methodName,
-                            from,
-                            fromUrl,
-                            to,
-                            toUrl,
-                            hash,
-                            hashUrl,
-                            tokenId,
-                            tokenType: isErc1155 ? 'erc-1155' : 'erc-721',
-                            nftImageUrl: nft === null || nft === void 0 ? void 0 : nft.image,
-                            nftUrl,
-                            name: nft === null || nft === void 0 ? void 0 : nft.name,
-                            collectionName: nft === null || nft === void 0 ? void 0 : nft.collectionName,
-                        };
-                    }
-                    else {
-                        const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(hash));
-                        assetEvent = {
-                            eventType: 'token',
-                            amount: event.amount
-                                ? blockchain_service_1.BSBigNumberHelper.format(event.amount, { decimals: (_j = token === null || token === void 0 ? void 0 : token.decimals) !== null && _j !== void 0 ? _j : event.tokenDecimals })
-                                : undefined,
-                            methodName,
-                            from,
-                            fromUrl,
-                            to,
-                            toUrl,
-                            hash,
-                            hashUrl,
-                            token: token !== null && token !== void 0 ? token : undefined,
-                            tokenType: isErc20 ? 'erc-20' : 'generic',
-                        };
-                    }
-                    newItem.events.push(isNft ? nftEvent : assetEvent);
-                }));
-                yield Promise.allSettled(eventPromises);
-                data.push(newItem);
-            }));
-            yield Promise.allSettled(itemPromises);
-            return { nextCursor, data };
-        });
+    constructor(network, supportedFullTransactionsByAddressNetworks, tokenService) {
+        super(network, tokenService);
+        this._supportedErc721Standards = ['erc721', 'erc-721'];
+        this._supportedErc1155Standards = ['erc1155', 'erc-1155'];
+        this._supportedErc20Standards = ['erc20', 'erc-20'];
+        this._supportedFullTransactionsByAddressNetworks = supportedFullTransactionsByAddressNetworks;
     }
     _validateFullTransactionsByAddressParams(params) {
-        if (!__classPrivateFieldGet(this, _DoraBDSEthereum_supportedFullTransactionsByAddressNetworks, "f").includes(this._network.id))
+        if (!this._supportedFullTransactionsByAddressNetworks.includes(this._network.id))
             throw new Error('This network is not supported');
         blockchain_service_1.BSFullTransactionsByAddressHelper.validateFullTransactionsByAddressParams(params);
         if (!ethers_1.ethers.utils.isAddress(params.address))
@@ -157,4 +38,3 @@ class DoraBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     }
 }
 exports.DoraBDSEthereum = DoraBDSEthereum;
-_DoraBDSEthereum_supportedErc721Standards = new WeakMap(), _DoraBDSEthereum_supportedErc1155Standards = new WeakMap(), _DoraBDSEthereum_supportedErc20Standards = new WeakMap(), _DoraBDSEthereum_supportedFullTransactionsByAddressNetworks = new WeakMap(), _DoraBDSEthereum_nftDataService = new WeakMap(), _DoraBDSEthereum_explorerService = new WeakMap();

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

@@ -1,12 +1,13 @@
-import { BalanceResponse, ContractResponse, Network, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, NftDataService, ExplorerService, ExportTransactionsByAddressParams } from '@cityofzion/blockchain-service';
+import { BalanceResponse, ContractResponse, Network, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, NftDataService, ExplorerService, ExportTransactionsByAddressParams, TokenService } from '@cityofzion/blockchain-service';
 import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 import { DoraBDSEthereum } from './DoraBDSEthereum';
 export declare class MoralisBDSEthereum extends DoraBDSEthereum {
+    #private;
     static BASE_URL: string;
     static SUPPORTED_CHAINS: string[];
     static getClient(network: Network<BSEthereumNetworkId>): import("axios").AxiosInstance;
     static isSupported(network: Network<BSEthereumNetworkId>): boolean;
-    constructor(network: Network<BSEthereumNetworkId>, nftDataService: NftDataService, explorerService: ExplorerService);
+    constructor(network: Network<BSEthereumNetworkId>, nftDataService: NftDataService, explorerService: ExplorerService, tokenService: TokenService);
     getBalance(address: string): Promise<BalanceResponse[]>;
     getTokenInfo(hash: string): Promise<Token>;
     getTransaction(hash: string): Promise<TransactionResponse>;

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

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+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 __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -22,6 +33,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _MoralisBDSEthereum_nftDataService, _MoralisBDSEthereum_explorerService;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MoralisBDSEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -32,7 +44,6 @@ const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 const ERC20_1 = require("../../assets/abis/ERC20");
 const dora_ts_1 = require("@cityofzion/dora-ts");
 const DoraBDSEthereum_1 = require("./DoraBDSEthereum");
-const BSEthereumTokenHelper_1 = require("../../helpers/BSEthereumTokenHelper");
 class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
     static getClient(network) {
         return axios_1.default.create({
@@ -45,13 +56,17 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
     static isSupported(network) {
         return MoralisBDSEthereum.SUPPORTED_CHAINS.includes(network.id);
     }
-    constructor(network, nftDataService, explorerService) {
+    constructor(network, nftDataService, explorerService, tokenService) {
         super(network, [
             BSEthereumConstants_1.BSEthereumConstants.ETHEREUM_MAINNET_NETWORK_ID,
             BSEthereumConstants_1.BSEthereumConstants.POLYGON_MAINNET_NETWORK_ID,
             BSEthereumConstants_1.BSEthereumConstants.BASE_MAINNET_NETWORK_ID,
             BSEthereumConstants_1.BSEthereumConstants.ARBITRUM_MAINNET_NETWORK_ID,
-        ], nftDataService, explorerService);
+        ], tokenService);
+        _MoralisBDSEthereum_nftDataService.set(this, void 0);
+        _MoralisBDSEthereum_explorerService.set(this, void 0);
+        __classPrivateFieldSet(this, _MoralisBDSEthereum_nftDataService, nftDataService, "f");
+        __classPrivateFieldSet(this, _MoralisBDSEthereum_explorerService, explorerService, "f");
     }
     getBalance(address) {
         const _super = Object.create(null, {
@@ -77,7 +92,7 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                     return;
                 balances.push({
                     amount: ethers_1.ethers.utils.formatUnits(balance.balance, balance.decimals),
-                    token: BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({
+                    token: this._tokenService.normalizeToken({
                         decimals: balance.decimals,
                         hash: balance.token_address,
                         name: (_a = balance.name) !== null && _a !== void 0 ? _a : '',
@@ -97,7 +112,7 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                 return _super.getTokenInfo.call(this, hash);
             }
             const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
-            if (BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(nativeAsset)({ hash }))
+            if (this._tokenService.predicateByHash(nativeAsset)({ hash }))
                 return nativeAsset;
             if (this._tokenCache.has(hash)) {
                 return this._tokenCache.get(hash);
@@ -109,7 +124,7 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                 },
             });
             const data = response.data[0];
-            const token = BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({
+            const token = this._tokenService.normalizeToken({
                 decimals: Number(data.decimals),
                 symbol: data.symbol,
                 hash,
@@ -164,12 +179,12 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                             type: 'token',
                         });
                     }
-                    const tokenId = (_d = log.decoded_event.params.find((param) => param.name === 'tokenId')) === null || _d === void 0 ? void 0 : _d.value;
-                    if (!tokenId)
+                    const tokenHash = (_d = log.decoded_event.params.find((param) => param.name === 'tokenId')) === null || _d === void 0 ? void 0 : _d.value;
+                    if (!tokenHash)
                         return;
                     transfers.push({
-                        contractHash,
-                        tokenId,
+                        collectionHash: contractHash,
+                        tokenHash,
                         from,
                         to,
                         type: 'nft',
@@ -184,6 +199,7 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                 time: new Date(data.block_timestamp).getTime() / 1000,
                 transfers,
                 fee: data.transaction_fee,
+                type: 'default',
             };
         });
     }
@@ -224,7 +240,7 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                         from: transfer.from_address,
                         to: transfer.to_address,
                         type: 'token',
-                        token: BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({
+                        token: this._tokenService.normalizeToken({
                             decimals: Number(transfer.token_decimals),
                             hash: transfer.address,
                             name: transfer.token_name,
@@ -235,8 +251,8 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                 });
                 item.nft_transfers.forEach(transfer => {
                     transfers.push({
-                        contractHash: transfer.token_address,
-                        tokenId: transfer.token_id,
+                        collectionHash: transfer.token_address,
+                        tokenHash: transfer.token_id,
                         from: transfer.from_address,
                         to: transfer.to_address,
                         type: 'nft',
@@ -249,6 +265,7 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                     time: new Date(item.block_timestamp).getTime() / 1000,
                     transfers,
                     fee: item.transaction_fee,
+                    type: 'default',
                 });
             }));
             yield Promise.allSettled(promises);
@@ -259,10 +276,11 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
         });
     }
     getFullTransactionsByAddress(_a) {
-        var _b;
+        var _b, _c;
         var { nextCursor } = _a, params = __rest(_a, ["nextCursor"]);
         return __awaiter(this, void 0, void 0, function* () {
             this._validateGetFullTransactionsByAddressParams(params);
+            const data = [];
             const response = yield dora_ts_1.api.EthereumREST.getFullTransactionsByAddress({
                 address: params.address,
                 timestampFrom: params.dateFrom,
@@ -271,7 +289,94 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                 cursor: nextCursor,
                 pageLimit: (_b = params.pageSize) !== null && _b !== void 0 ? _b : 50,
             });
-            return yield this._transformFullTransactionsByAddressResponse(response);
+            const items = (_c = response.data) !== null && _c !== void 0 ? _c : [];
+            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
+            const addressTemplateUrl = __classPrivateFieldGet(this, _MoralisBDSEthereum_explorerService, "f").getAddressTemplateUrl();
+            const txTemplateUrl = __classPrivateFieldGet(this, _MoralisBDSEthereum_explorerService, "f").getTxTemplateUrl();
+            const nftTemplateUrl = __classPrivateFieldGet(this, _MoralisBDSEthereum_explorerService, "f").getNftTemplateUrl();
+            const contractTemplateUrl = __classPrivateFieldGet(this, _MoralisBDSEthereum_explorerService, "f").getContractTemplateUrl();
+            const itemPromises = items.map((_d, index) => __awaiter(this, void 0, void 0, function* () {
+                var { networkFeeAmount, systemFeeAmount } = _d, item = __rest(_d, ["networkFeeAmount", "systemFeeAmount"]);
+                const txId = item.transactionID;
+                const newItem = {
+                    txId,
+                    txIdUrl: txId ? txTemplateUrl === null || txTemplateUrl === void 0 ? void 0 : txTemplateUrl.replace('{txId}', txId) : undefined,
+                    block: item.block,
+                    date: item.date,
+                    invocationCount: item.invocationCount,
+                    notificationCount: item.notificationCount,
+                    networkFeeAmount: networkFeeAmount
+                        ? blockchain_service_1.BSBigNumberHelper.format(networkFeeAmount, { decimals: nativeToken.decimals })
+                        : undefined,
+                    systemFeeAmount: systemFeeAmount
+                        ? blockchain_service_1.BSBigNumberHelper.format(systemFeeAmount, { decimals: nativeToken.decimals })
+                        : undefined,
+                    events: [],
+                    type: 'default',
+                };
+                const eventPromises = item.events.map((event, eventIndex) => __awaiter(this, void 0, void 0, function* () {
+                    var _e, _f, _g, _h, _j, _k, _l;
+                    let nftEvent;
+                    let assetEvent;
+                    const { methodName, tokenID: tokenHash, contractHash } = event;
+                    const from = (_e = event.from) !== null && _e !== void 0 ? _e : undefined;
+                    const to = (_f = event.to) !== null && _f !== void 0 ? _f : undefined;
+                    const standard = (_j = (_h = (_g = event.supportedStandards) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.toLowerCase()) !== null && _j !== void 0 ? _j : '';
+                    const isErc1155 = this._supportedErc1155Standards.includes(standard);
+                    const isErc721 = this._supportedErc721Standards.includes(standard);
+                    const isErc20 = this._supportedErc20Standards.includes(standard);
+                    const isNft = (isErc1155 || isErc721) && !!tokenHash;
+                    const fromUrl = from ? addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', from) : undefined;
+                    const toUrl = to ? addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', to) : undefined;
+                    const contractHashUrl = contractHash ? contractTemplateUrl === null || contractTemplateUrl === void 0 ? void 0 : contractTemplateUrl.replace('{hash}', contractHash) : undefined;
+                    if (isNft) {
+                        const [nft] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __classPrivateFieldGet(this, _MoralisBDSEthereum_nftDataService, "f").getNft({ collectionHash: contractHash, tokenHash }));
+                        const nftUrl = contractHash
+                            ? nftTemplateUrl === null || nftTemplateUrl === void 0 ? void 0 : nftTemplateUrl.replace('{collectionHash}', contractHash).replace('{tokenHash}', tokenHash)
+                            : undefined;
+                        nftEvent = {
+                            eventType: 'nft',
+                            amount: undefined,
+                            methodName,
+                            from,
+                            fromUrl,
+                            to,
+                            toUrl,
+                            collectionHash: contractHash,
+                            collectionHashUrl: contractHashUrl,
+                            tokenHash,
+                            tokenType: isErc1155 ? 'erc-1155' : 'erc-721',
+                            nftImageUrl: nft === null || nft === void 0 ? void 0 : nft.image,
+                            nftUrl,
+                            name: nft === null || nft === void 0 ? void 0 : nft.name,
+                            collectionName: (_k = nft === null || nft === void 0 ? void 0 : nft.collection) === null || _k === void 0 ? void 0 : _k.name,
+                        };
+                    }
+                    else {
+                        const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(contractHash));
+                        assetEvent = {
+                            eventType: 'token',
+                            amount: event.amount
+                                ? blockchain_service_1.BSBigNumberHelper.format(event.amount, { decimals: (_l = token === null || token === void 0 ? void 0 : token.decimals) !== null && _l !== void 0 ? _l : event.tokenDecimals })
+                                : undefined,
+                            methodName,
+                            from,
+                            fromUrl,
+                            to,
+                            toUrl,
+                            contractHash,
+                            contractHashUrl,
+                            token: token !== null && token !== void 0 ? token : undefined,
+                            tokenType: isErc20 ? 'erc-20' : 'generic',
+                        };
+                    }
+                    newItem.events.splice(eventIndex, 0, isNft ? nftEvent : assetEvent);
+                }));
+                yield Promise.allSettled(eventPromises);
+                data.splice(index, 0, newItem);
+            }));
+            yield Promise.allSettled(itemPromises);
+            return { nextCursor: response.nextCursor, data };
         });
     }
     exportFullTransactionsByAddress(params) {
@@ -327,6 +432,7 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
     }
 }
 exports.MoralisBDSEthereum = MoralisBDSEthereum;
+_MoralisBDSEthereum_nftDataService = new WeakMap(), _MoralisBDSEthereum_explorerService = new WeakMap();
 MoralisBDSEthereum.BASE_URL = `${blockchain_service_1.BSCommonConstants.DORA_URL}/api/v2/meta`;
 MoralisBDSEthereum.SUPPORTED_CHAINS = [
     BSEthereumConstants_1.BSEthereumConstants.ETHEREUM_MAINNET_NETWORK_ID,

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

@@ -1,10 +1,11 @@
-import { BalanceResponse, BlockchainDataService, ContractResponse, ExportTransactionsByAddressParams, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, NetworkId, RpcResponse, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
+import { BalanceResponse, BlockchainDataService, ContractResponse, ExportTransactionsByAddressParams, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, NetworkId, RpcResponse, Token, TokenService, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 export declare class RpcBDSEthereum<BSNetworkId extends NetworkId = BSEthereumNetworkId> implements BlockchainDataService {
-    _network: Network<BSNetworkId>;
+    readonly _network: Network<BSNetworkId>;
+    readonly _tokenService: TokenService;
     _tokenCache: Map<string, Token>;
     maxTimeToConfirmTransactionInMs: number;
-    constructor(network: Network<BSNetworkId>);
+    constructor(network: Network<BSNetworkId>, tokenService: TokenService);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress(_params: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;
     getFullTransactionsByAddress(_params: FullTransactionsByAddressParams): Promise<FullTransactionsByAddressResponse>;

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

@@ -13,12 +13,12 @@ exports.RpcBDSEthereum = void 0;
 const ethers_1 = require("ethers");
 const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 const ERC20_1 = require("../../assets/abis/ERC20");
-const BSEthereumTokenHelper_1 = require("../../helpers/BSEthereumTokenHelper");
 class RpcBDSEthereum {
-    constructor(network) {
+    constructor(network, tokenService) {
         this._tokenCache = new Map();
         this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 5;
         this._network = network;
+        this._tokenService = tokenService;
     }
     getTransaction(hash) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -45,6 +45,7 @@ class RpcBDSEthereum {
                     },
                 ],
                 notifications: [],
+                type: 'default',
             };
         });
     }
@@ -71,7 +72,7 @@ class RpcBDSEthereum {
     getTokenInfo(hash) {
         return __awaiter(this, void 0, void 0, function* () {
             const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
-            if (BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(nativeAsset)({ hash }))
+            if (this._tokenService.predicateByHash(nativeAsset)({ hash }))
                 return nativeAsset;
             if (this._tokenCache.has(hash)) {
                 return this._tokenCache.get(hash);
@@ -80,7 +81,7 @@ class RpcBDSEthereum {
             const contract = new ethers_1.ethers.Contract(hash, ERC20_1.ERC20_ABI, provider);
             const decimals = yield contract.decimals();
             const symbol = yield contract.symbol();
-            const token = BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({
+            const token = this._tokenService.normalizeToken({
                 decimals,
                 symbol,
                 hash,

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

@@ -1,8 +1,8 @@
-import { BlockchainDataService, CryptoCompareEDS, ExchangeDataService, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
+import { BlockchainDataService, CryptoCompareEDS, ExchangeDataService, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse, TokenService } from '@cityofzion/blockchain-service';
 import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 export declare class MoralisEDSEthereum extends CryptoCompareEDS implements ExchangeDataService {
     #private;
-    constructor(network: Network<BSEthereumNetworkId>, blockchainDataService: BlockchainDataService);
+    constructor(network: Network<BSEthereumNetworkId>, blockchainDataService: BlockchainDataService, tokenService: TokenService);
     getTokenPrices(params: GetTokenPricesParams): Promise<TokenPricesResponse[]>;
     getTokenPriceHistory(params: GetTokenPriceHistoryParams): Promise<TokenPricesHistoryResponse[]>;
 }

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

@@ -19,16 +19,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _MoralisEDSEthereum_instances, _MoralisEDSEthereum_network, _MoralisEDSEthereum_blockchainDataService, _MoralisEDSEthereum_numberOfBlockByHour, _MoralisEDSEthereum_numberOfBlockByDay, _MoralisEDSEthereum_maxTokenPricesPerCall, _MoralisEDSEthereum_getWrappedNativeToken;
+var _MoralisEDSEthereum_instances, _MoralisEDSEthereum_network, _MoralisEDSEthereum_blockchainDataService, _MoralisEDSEthereum_numberOfBlockByHour, _MoralisEDSEthereum_numberOfBlockByDay, _MoralisEDSEthereum_maxTokenPricesPerCall, _MoralisEDSEthereum_tokenService, _MoralisEDSEthereum_getWrappedNativeToken;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MoralisEDSEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSEthereumConstants_1 = require("../../constants/BSEthereumConstants");
 const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 const MoralisBDSEthereum_1 = require("../blockchain-data/MoralisBDSEthereum");
-const BSEthereumTokenHelper_1 = require("../../helpers/BSEthereumTokenHelper");
 class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
-    constructor(network, blockchainDataService) {
+    constructor(network, blockchainDataService, tokenService) {
         super();
         _MoralisEDSEthereum_instances.add(this);
         _MoralisEDSEthereum_network.set(this, void 0);
@@ -36,8 +35,10 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
         _MoralisEDSEthereum_numberOfBlockByHour.set(this, (15 / 60) * 60);
         _MoralisEDSEthereum_numberOfBlockByDay.set(this, __classPrivateFieldGet(this, _MoralisEDSEthereum_numberOfBlockByHour, "f") * 24);
         _MoralisEDSEthereum_maxTokenPricesPerCall.set(this, 24);
+        _MoralisEDSEthereum_tokenService.set(this, void 0);
         __classPrivateFieldSet(this, _MoralisEDSEthereum_network, network, "f");
         __classPrivateFieldSet(this, _MoralisEDSEthereum_blockchainDataService, blockchainDataService, "f");
+        __classPrivateFieldSet(this, _MoralisEDSEthereum_tokenService, tokenService, "f");
     }
     getTokenPrices(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -78,7 +79,7 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
                 });
                 data.forEach(item => {
                     let token;
-                    if (wrappedNativeToken && BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(wrappedNativeToken)(item.tokenAddress)) {
+                    if (wrappedNativeToken && __classPrivateFieldGet(this, _MoralisEDSEthereum_tokenService, "f").predicateByHash(wrappedNativeToken)(item.tokenAddress)) {
                         token = nativeToken;
                     }
                     else {
@@ -106,7 +107,7 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
                 throw new Error('Exchange is not supported on this network');
             const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
             let token;
-            if (BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(nativeToken)(params.token)) {
+            if (__classPrivateFieldGet(this, _MoralisEDSEthereum_tokenService, "f").predicateByHash(nativeToken)(params.token)) {
                 token = yield __classPrivateFieldGet(this, _MoralisEDSEthereum_instances, "m", _MoralisEDSEthereum_getWrappedNativeToken).call(this);
             }
             else {
@@ -138,13 +139,13 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
     }
 }
 exports.MoralisEDSEthereum = MoralisEDSEthereum;
-_MoralisEDSEthereum_network = new WeakMap(), _MoralisEDSEthereum_blockchainDataService = new WeakMap(), _MoralisEDSEthereum_numberOfBlockByHour = new WeakMap(), _MoralisEDSEthereum_numberOfBlockByDay = new WeakMap(), _MoralisEDSEthereum_maxTokenPricesPerCall = new WeakMap(), _MoralisEDSEthereum_instances = new WeakSet(), _MoralisEDSEthereum_getWrappedNativeToken = function _MoralisEDSEthereum_getWrappedNativeToken() {
+_MoralisEDSEthereum_network = new WeakMap(), _MoralisEDSEthereum_blockchainDataService = new WeakMap(), _MoralisEDSEthereum_numberOfBlockByHour = new WeakMap(), _MoralisEDSEthereum_numberOfBlockByDay = new WeakMap(), _MoralisEDSEthereum_maxTokenPricesPerCall = new WeakMap(), _MoralisEDSEthereum_tokenService = new WeakMap(), _MoralisEDSEthereum_instances = new WeakSet(), _MoralisEDSEthereum_getWrappedNativeToken = function _MoralisEDSEthereum_getWrappedNativeToken() {
     return __awaiter(this, void 0, void 0, function* () {
         const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
         const wrappedSymbol = `W${nativeToken.symbol}`;
         const localWrappedHash = BSEthereumConstants_1.BSEthereumConstants.NATIVE_WRAPPED_HASH_BY_NETWORK_ID[__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f").id];
         if (!localWrappedHash)
             throw new Error('Wrapper token not found');
-        return BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken(Object.assign(Object.assign({}, nativeToken), { symbol: wrappedSymbol, hash: localWrappedHash }));
+        return __classPrivateFieldGet(this, _MoralisEDSEthereum_tokenService, "f").normalizeToken(Object.assign(Object.assign({}, nativeToken), { symbol: wrappedSymbol, hash: localWrappedHash }));
     });
 };

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

@@ -1,8 +1,8 @@
-import { BuildNftUrlParams, ExplorerService, Network, NetworkId } from '@cityofzion/blockchain-service';
+import { BuildNftUrlParams, ExplorerService, Network, NetworkId, TokenService } from '@cityofzion/blockchain-service';
 import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 export declare class BlockscoutESEthereum<BSNetworkId extends NetworkId = BSEthereumNetworkId> implements ExplorerService {
     #private;
-    constructor(network: Network<BSEthereumNetworkId>, baseUrlByNetworkId?: Partial<Record<BSNetworkId, string>>);
+    constructor(network: Network<BSEthereumNetworkId>, tokenService: TokenService, baseUrlByNetworkId?: Partial<Record<BSNetworkId, string>>);
     buildTransactionUrl(hash: string): string;
     buildContractUrl(contractHash: string): string;
     buildNftUrl(params: BuildNftUrlParams): string;

package/dist/services/explorer/BlockscoutESEthereum.js CHANGED Viewed

@@ -10,11 +10,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _BlockscoutESEthereum_instances, _BlockscoutESEthereum_network, _BlockscoutESEthereum_baseUrlByNetworkId, _BlockscoutESEthereum_getBaseUrl;
+var _BlockscoutESEthereum_instances, _BlockscoutESEthereum_network, _BlockscoutESEthereum_baseUrlByNetworkId, _BlockscoutESEthereum_tokenService, _BlockscoutESEthereum_getBaseUrl;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockscoutESEthereum = void 0;
 const BSEthereumConstants_1 = require("../../constants/BSEthereumConstants");
-const BSEthereumTokenHelper_1 = require("../../helpers/BSEthereumTokenHelper");
 const DEFAULT_BASE_URL_BY_NETWORK_ID = {
     [BSEthereumConstants_1.BSEthereumConstants.ETHEREUM_MAINNET_NETWORK_ID]: 'https://eth.blockscout.com',
     '10': 'https://optimism.blockscout.com',
@@ -27,24 +26,26 @@ const DEFAULT_BASE_URL_BY_NETWORK_ID = {
     '11155111': 'https://eth-sepolia.blockscout.com',
 };
 class BlockscoutESEthereum {
-    constructor(network, baseUrlByNetworkId) {
+    constructor(network, tokenService, baseUrlByNetworkId) {
         _BlockscoutESEthereum_instances.add(this);
         _BlockscoutESEthereum_network.set(this, void 0);
         _BlockscoutESEthereum_baseUrlByNetworkId.set(this, void 0);
+        _BlockscoutESEthereum_tokenService.set(this, void 0);
         __classPrivateFieldSet(this, _BlockscoutESEthereum_network, network, "f");
         __classPrivateFieldSet(this, _BlockscoutESEthereum_baseUrlByNetworkId, baseUrlByNetworkId !== null && baseUrlByNetworkId !== void 0 ? baseUrlByNetworkId : DEFAULT_BASE_URL_BY_NETWORK_ID, "f");
+        __classPrivateFieldSet(this, _BlockscoutESEthereum_tokenService, tokenService, "f");
     }
     buildTransactionUrl(hash) {
         const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/tx/${BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeHash(hash)}`;
+        return `${baseURL}/tx/${__classPrivateFieldGet(this, _BlockscoutESEthereum_tokenService, "f").normalizeHash(hash)}`;
     }
     buildContractUrl(contractHash) {
         const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/address/${BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeHash(contractHash)}`;
+        return `${baseURL}/address/${__classPrivateFieldGet(this, _BlockscoutESEthereum_tokenService, "f").normalizeHash(contractHash)}`;
     }
     buildNftUrl(params) {
         const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/token/${BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeHash(params.contractHash)}/instance/${params.tokenId}`;
+        return `${baseURL}/token/${__classPrivateFieldGet(this, _BlockscoutESEthereum_tokenService, "f").normalizeHash(params.collectionHash)}/instance/${params.tokenHash}`;
     }
     getAddressTemplateUrl() {
         try {
@@ -67,7 +68,7 @@ class BlockscoutESEthereum {
     getNftTemplateUrl() {
         try {
             const baseUrl = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-            return `${baseUrl}/token/{hash}/instance/{tokenId}`;
+            return `${baseUrl}/token/{collectionHash}/instance/{tokenHash}`;
         }
         catch (_a) {
             return undefined;
@@ -84,7 +85,7 @@ class BlockscoutESEthereum {
     }
 }
 exports.BlockscoutESEthereum = BlockscoutESEthereum;
-_BlockscoutESEthereum_network = new WeakMap(), _BlockscoutESEthereum_baseUrlByNetworkId = new WeakMap(), _BlockscoutESEthereum_instances = new WeakSet(), _BlockscoutESEthereum_getBaseUrl = function _BlockscoutESEthereum_getBaseUrl(network) {
+_BlockscoutESEthereum_network = new WeakMap(), _BlockscoutESEthereum_baseUrlByNetworkId = new WeakMap(), _BlockscoutESEthereum_tokenService = new WeakMap(), _BlockscoutESEthereum_instances = new WeakSet(), _BlockscoutESEthereum_getBaseUrl = function _BlockscoutESEthereum_getBaseUrl(network) {
     const baseUrl = __classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrlByNetworkId, "f")[network.id];
     if (!baseUrl) {
         throw new Error('Network not supported');

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

@@ -5,7 +5,7 @@ export declare class GhostMarketNDSEthereum<BSNetworkId extends NetworkId = BSEt
     #private;
     constructor(network: Network<BSNetworkId>, ghostMarketChainByNetworkId?: Partial<Record<BSNetworkId, string>>);
     getNftsByAddress({ address, size, cursor }: GetNftsByAddressParams): Promise<NftsResponse>;
-    getNft({ contractHash, tokenId }: GetNftParam): Promise<NftResponse>;
+    getNft({ collectionHash, tokenHash }: GetNftParam): Promise<NftResponse>;
     private treatGhostMarketImage;
     private getUrlWithParams;
     private parse;

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

@@ -58,11 +58,11 @@ class GhostMarketNDSEthereum extends RpcNDSEthereum_1.RpcNDSEthereum {
             return { nextCursor: request.data.next, items: nfts.map(this.parse.bind(this)) };
         });
     }
-    getNft({ contractHash, tokenId }) {
+    getNft({ collectionHash, tokenHash }) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = this.getUrlWithParams({
-                contract: contractHash,
-                tokenIds: [tokenId],
+                contract: collectionHash,
+                tokenIds: [tokenHash],
             });
             const request = yield axios_1.default.get(url);
             return this.parse(request.data.assets[0]);
@@ -89,11 +89,13 @@ class GhostMarketNDSEthereum extends RpcNDSEthereum_1.RpcNDSEthereum {
     parse(data) {
         var _a, _b;
         const nftResponse = {
-            collectionImage: this.treatGhostMarketImage((_a = data.collection) === null || _a === void 0 ? void 0 : _a.logoUrl),
-            id: data.tokenId,
-            contractHash: data.contract.hash,
+            hash: data.tokenId,
+            collection: {
+                hash: data.contract.hash,
+                name: (_a = data.collection) === null || _a === void 0 ? void 0 : _a.name,
+                image: this.treatGhostMarketImage((_b = data.collection) === null || _b === void 0 ? void 0 : _b.logoUrl),
+            },
             symbol: data.contract.symbol,
-            collectionName: (_b = data.collection) === null || _b === void 0 ? void 0 : _b.name,
             image: this.treatGhostMarketImage(data.metadata.mediaUri),
             isSVG: String(data.metadata.mediaType).includes('svg+xml'),
             name: data.metadata.name,

package/dist/services/nft-data/RpcNDSEthereum.d.ts CHANGED Viewed

@@ -4,5 +4,5 @@ export declare abstract class RpcNDSEthereum implements NftDataService {
     protected constructor(network: Network);
     abstract getNftsByAddress(params: GetNftsByAddressParams): Promise<NftsResponse>;
     abstract getNft(params: GetNftParam): Promise<NftResponse>;
-    hasToken({ contractHash, address }: HasTokenParam): Promise<boolean>;
+    hasToken({ collectionHash, address }: HasTokenParam): Promise<boolean>;
 }

package/dist/services/nft-data/RpcNDSEthereum.js CHANGED Viewed

@@ -29,11 +29,11 @@ class RpcNDSEthereum {
         _RpcNDSEthereum_network.set(this, void 0);
         __classPrivateFieldSet(this, _RpcNDSEthereum_network, network, "f");
     }
-    hasToken({ contractHash, address }) {
+    hasToken({ collectionHash, address }) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _RpcNDSEthereum_network, "f").url);
-                const contract = new ethers_1.ethers.Contract(contractHash, ERC20_1.ERC20_ABI, provider);
+                const contract = new ethers_1.ethers.Contract(collectionHash, ERC20_1.ERC20_ABI, provider);
                 const response = yield contract.balanceOf(address);
                 if (!response)
                     throw new Error();
@@ -41,7 +41,7 @@ class RpcNDSEthereum {
                 return parsedResponse.gt(0);
             }
             catch (_a) {
-                throw new Error(`Token not found: ${contractHash}`);
+                throw new Error(`Token not found: ${collectionHash}`);
             }
         });
     }

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

@@ -0,0 +1,4 @@
+import { TokenService } from '@cityofzion/blockchain-service';
+export declare class TokenServiceEthereum extends TokenService {
+    normalizeHash(hash: string): string;
+}

package/dist/{helpers/BSEthereumTokenHelper.js → services/token/TokenServiceEthereum.js} RENAMED Viewed

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BSEthereumTokenHelper = void 0;
+exports.TokenServiceEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const ethers_1 = require("ethers");
-class BSEthereumTokenHelper extends blockchain_service_1.BSTokenHelper {
-    static normalizeHash(hash) {
-        let fixedHash = blockchain_service_1.BSTokenHelper.normalizeHash(hash);
+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
         }
@@ -15,4 +15,4 @@ class BSEthereumTokenHelper extends blockchain_service_1.BSTokenHelper {
         return fixedHash;
     }
 }
-exports.BSEthereumTokenHelper = BSEthereumTokenHelper;
+exports.TokenServiceEthereum = TokenServiceEthereum;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "2.12.8",
+  "version": "2.13.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -22,7 +22,7 @@
     "@ethersproject/properties": "~5.7.0",
     "@cityofzion/dora-ts": "0.5.1",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.19.3"
+    "@cityofzion/blockchain-service": "1.21.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.28.5",

package/dist/helpers/BSEthereumTokenHelper.d.ts DELETED Viewed

@@ -1,4 +0,0 @@
-import { BSTokenHelper } from '@cityofzion/blockchain-service';
-export declare class BSEthereumTokenHelper extends BSTokenHelper {
-    static normalizeHash(hash: string): string;
-}