@cityofzion/bs-neo3 1.16.0 → 1.16.1

package/dist/BSNeo3.d.ts

@@ -1,8 +1,8 @@
-import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSCalculableFee, BSClaimable, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, ExchangeDataService, ExplorerService, GetLedgerTransport, IBSWithNeo3NeoXBridge, INeo3NeoXBridgeService, Network, NftDataService, Token, TransferParam } from '@cityofzion/blockchain-service';
+import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSCalculableFee, BSClaimable, BSWithEncryption, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, ExchangeDataService, ExplorerService, GetLedgerTransport, IBSWithNeo3NeoXBridge, INeo3NeoXBridgeService, ITokenService, Network, NftDataService, Token, TransferParam } from '@cityofzion/blockchain-service';
 import { NeonDappKitLedgerServiceNeo3 } from './services/ledger/NeonDappKitLedgerServiceNeo3';
 import { BSNeo3NetworkId } from './constants/BSNeo3Constants';
 import { GenerateSigningCallbackResponse, VoteService } from './interfaces';
-export declare class BSNeo3<BSName extends string = string> implements BlockchainService<BSName, BSNeo3NetworkId>, BSClaimable<BSName>, BSWithNameService, BSCalculableFee<BSName>, BSWithNft, BSWithExplorerService, BSWithLedger<BSName>, IBSWithNeo3NeoXBridge<BSName> {
+export declare class BSNeo3<BSName extends string = string> implements BlockchainService<BSName, BSNeo3NetworkId>, BSClaimable<BSName>, BSWithNameService, BSCalculableFee<BSName>, BSWithNft, BSWithExplorerService, BSWithLedger<BSName>, IBSWithNeo3NeoXBridge<BSName>, BSWithEncryption<BSName> {
     #private;
     name: BSName;
     bip44DerivationPath: string;
@@ -18,11 +18,12 @@ export declare class BSNeo3<BSName extends string = string> implements Blockchai
     explorerService: ExplorerService;
     voteService: VoteService<BSName>;
     neo3NeoXBridgeService: INeo3NeoXBridgeService<BSName>;
+    tokenService: ITokenService;
     network: Network<BSNeo3NetworkId>;
     constructor(name: BSName, network?: Network<BSNeo3NetworkId>, getLedgerTransport?: GetLedgerTransport<BSName>);
     generateSigningCallback(account: Account<BSName>): Promise<GenerateSigningCallbackResponse>;
-    testNetwork(network: Network<BSNeo3NetworkId>): Promise<void>;
     setNetwork(network: Network<BSNeo3NetworkId>): void;
+    testNetwork(network: Network<BSNeo3NetworkId>): Promise<void>;
     validateAddress(address: string): boolean;
     validateEncrypted(encryptedKey: string): boolean;
     validateKey(key: string): boolean;

package/dist/BSNeo3.js

@@ -30,6 +30,7 @@ const BSNeo3Constants_1 = require("./constants/BSNeo3Constants");
 const RpcBDSNeo3_1 = require("./services/blockchain-data/RpcBDSNeo3");
 const Neo3NeoXBridgeService_1 = require("./services/neo3neoXBridge/Neo3NeoXBridgeService");
 const DoraVoteServiceNeo3_1 = require("./services/vote/DoraVoteServiceNeo3");
+const TokenServiceNeo3_1 = require("./services/token/TokenServiceNeo3");
 class BSNeo3 {
     constructor(name, network, getLedgerTransport) {
         _BSNeo3_instances.add(this);
@@ -59,21 +60,22 @@ class BSNeo3 {
             };
         });
     }
-    testNetwork(network) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const blockchainDataServiceClone = new RpcBDSNeo3_1.RpcBDSNeo3(network, this.feeToken, this.claimToken, this.tokens);
-            yield blockchainDataServiceClone.getBlockHeight();
-        });
-    }
     setNetwork(network) {
         __classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_setTokens).call(this, network);
         this.network = network;
+        this.tokenService = new TokenServiceNeo3_1.TokenServiceNeo3();
         this.nftDataService = new GhostMarketNDSNeo3_1.GhostMarketNDSNeo3(network);
-        this.explorerService = new DoraESNeo3_1.DoraESNeo3(network);
+        this.explorerService = new DoraESNeo3_1.DoraESNeo3(network, this.tokenService);
         this.voteService = new DoraVoteServiceNeo3_1.DoraVoteServiceNeo3(this);
         this.neo3NeoXBridgeService = new Neo3NeoXBridgeService_1.Neo3NeoXBridgeService(this);
-        this.blockchainDataService = new DoraBDSNeo3_1.DoraBDSNeo3(network, this.feeToken, this.claimToken, this.tokens, this.nftDataService, this.explorerService);
-        this.exchangeDataService = new FlamingoForthewinEDSNeo3_1.FlamingoForthewinEDSNeo3(network);
+        this.blockchainDataService = new DoraBDSNeo3_1.DoraBDSNeo3(network, this.feeToken, this.claimToken, this.tokens, this.nftDataService, this.explorerService, this.tokenService, this.neo3NeoXBridgeService);
+        this.exchangeDataService = new FlamingoForthewinEDSNeo3_1.FlamingoForthewinEDSNeo3(network, this.tokenService);
+    }
+    testNetwork(network) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const blockchainDataServiceClone = new RpcBDSNeo3_1.RpcBDSNeo3(network, this.feeToken, this.claimToken, this.tokens, this.tokenService);
+            yield blockchainDataServiceClone.getBlockHeight();
+        });
     }
     validateAddress(address) {
         return neon_js_1.wallet.isAddress(address, 53);

package/dist/constants/BSNeo3Constants.d.ts

@@ -1,6 +1,7 @@
 import { Network, NetworkId, Token } from '@cityofzion/blockchain-service';
 export type BSNeo3NetworkId = NetworkId<'mainnet' | 'testnet'>;
 export declare class BSNeo3Constants {
+    #private;
     static EXTRA_TOKENS_BY_NETWORK_ID: Partial<Record<BSNeo3NetworkId, Token[]>>;
     static NATIVE_ASSETS: Token[];
     static GAS_TOKEN: Token;

package/dist/constants/BSNeo3Constants.js

@@ -1,21 +1,27 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
+var _a, _BSNeo3Constants_tokenService;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeo3Constants = void 0;
-const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const mainnet_json_1 = __importDefault(require("../assets/tokens/mainnet.json"));
 const native_json_1 = __importDefault(require("../assets/tokens/native.json"));
+const TokenServiceNeo3_1 = require("../services/token/TokenServiceNeo3");
 class BSNeo3Constants {
 }
 exports.BSNeo3Constants = BSNeo3Constants;
 _a = BSNeo3Constants;
+_BSNeo3Constants_tokenService = { value: new TokenServiceNeo3_1.TokenServiceNeo3() };
 BSNeo3Constants.EXTRA_TOKENS_BY_NETWORK_ID = {
-    mainnet: blockchain_service_1.BSTokenHelper.normalizeToken(mainnet_json_1.default),
+    mainnet: __classPrivateFieldGet(_a, _a, "f", _BSNeo3Constants_tokenService).normalizeToken(mainnet_json_1.default),
 };
-BSNeo3Constants.NATIVE_ASSETS = blockchain_service_1.BSTokenHelper.normalizeToken(native_json_1.default);
+BSNeo3Constants.NATIVE_ASSETS = __classPrivateFieldGet(_a, _a, "f", _BSNeo3Constants_tokenService).normalizeToken(native_json_1.default);
 BSNeo3Constants.GAS_TOKEN = _a.NATIVE_ASSETS.find(token => token.name === 'GAS');
 BSNeo3Constants.NEO_TOKEN = _a.NATIVE_ASSETS.find(token => token.name === 'NEO');
 BSNeo3Constants.RPC_LIST_BY_NETWORK_ID = {

package/dist/index.d.ts

@@ -8,4 +8,7 @@ export * from './services/explorer/DoraESNeo3';
 export * from './services/ledger/NeonDappKitLedgerServiceNeo3';
 export * from './services/nft-data/GhostMarketNDSNeo3';
 export * from './services/nft-data/RpcNDSNeo3';
+export * from './services/vote/DoraVoteServiceNeo3';
+export * from './services/neo3neoXBridge/Neo3NeoXBridgeService';
+export * from './services/token/TokenServiceNeo3';
 export * from './interfaces';

package/dist/index.js

@@ -24,4 +24,7 @@ __exportStar(require("./services/explorer/DoraESNeo3"), exports);
 __exportStar(require("./services/ledger/NeonDappKitLedgerServiceNeo3"), exports);
 __exportStar(require("./services/nft-data/GhostMarketNDSNeo3"), exports);
 __exportStar(require("./services/nft-data/RpcNDSNeo3"), exports);
+__exportStar(require("./services/vote/DoraVoteServiceNeo3"), exports);
+__exportStar(require("./services/neo3neoXBridge/Neo3NeoXBridgeService"), exports);
+__exportStar(require("./services/token/TokenServiceNeo3"), exports);
 __exportStar(require("./interfaces"), exports);

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

@@ -1,11 +1,11 @@
-import { BalanceResponse, ContractResponse, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, NftDataService, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse, ExplorerService, ExportTransactionsByAddressParams } from '@cityofzion/blockchain-service';
+import { BalanceResponse, ContractResponse, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, NftDataService, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse, ExplorerService, ExportTransactionsByAddressParams, TokenService, INeo3NeoXBridgeService } from '@cityofzion/blockchain-service';
 import { api } from '@cityofzion/dora-ts';
 import { BSNeo3NetworkId } from '../../constants/BSNeo3Constants';
 import { RpcBDSNeo3 } from './RpcBDSNeo3';
 export declare const DoraNeoRest: api.NeoRESTApi;
 export declare class DoraBDSNeo3 extends RpcBDSNeo3 {
     #private;
-    constructor(network: Network<BSNeo3NetworkId>, feeToken: Token, claimToken: Token, tokens: Token[], nftDataService: NftDataService, explorerService: ExplorerService);
+    constructor(network: Network<BSNeo3NetworkId>, feeToken: Token, claimToken: Token, tokens: Token[], nftDataService: NftDataService, explorerService: ExplorerService, tokenService: TokenService, neo3NeoXBridgeService: INeo3NeoXBridgeService);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress({ address, nextPageParams, }: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;
     getFullTransactionsByAddress({ nextCursor, ...params }: FullTransactionsByAddressParams): Promise<FullTransactionsByAddressResponse>;

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

@@ -30,7 +30,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _DoraBDSNeo3_instances, _DoraBDSNeo3_supportedNep11Standards, _DoraBDSNeo3_nftDataService, _DoraBDSNeo3_explorerService, _DoraBDSNeo3_validateAddress, _DoraBDSNeo3_validateFullTransactionsByAddressParams, _DoraBDSNeo3_validateGetFullTransactionsByAddressParams, _DoraBDSNeo3_getBridgeNeo3NeoXDataByNotifications;
+var _DoraBDSNeo3_instances, _DoraBDSNeo3_supportedNep11Standards, _DoraBDSNeo3_nftDataService, _DoraBDSNeo3_explorerService, _DoraBDSNeo3_neo3NeoXBridgeService, _DoraBDSNeo3_validateAddress, _DoraBDSNeo3_validateFullTransactionsByAddressParams, _DoraBDSNeo3_validateGetFullTransactionsByAddressParams, _DoraBDSNeo3_getBridgeNeo3NeoXDataByNotifications;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoraBDSNeo3 = exports.DoraNeoRest = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -44,14 +44,16 @@ exports.DoraNeoRest = new dora_ts_1.api.NeoRESTApi({
     endpoint: '/api/v2/neo3',
 });
 class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
-    constructor(network, feeToken, claimToken, tokens, nftDataService, explorerService) {
-        super(network, feeToken, claimToken, tokens);
+    constructor(network, feeToken, claimToken, tokens, nftDataService, explorerService, tokenService, neo3NeoXBridgeService) {
+        super(network, feeToken, claimToken, tokens, tokenService);
         _DoraBDSNeo3_instances.add(this);
         _DoraBDSNeo3_supportedNep11Standards.set(this, ['nep11', 'nep-11']);
         _DoraBDSNeo3_nftDataService.set(this, void 0);
         _DoraBDSNeo3_explorerService.set(this, void 0);
+        _DoraBDSNeo3_neo3NeoXBridgeService.set(this, void 0);
         __classPrivateFieldSet(this, _DoraBDSNeo3_nftDataService, nftDataService, "f");
         __classPrivateFieldSet(this, _DoraBDSNeo3_explorerService, explorerService, "f");
+        __classPrivateFieldSet(this, _DoraBDSNeo3_neo3NeoXBridgeService, neo3NeoXBridgeService, "f");
     }
     getTransaction(hash) {
         const _super = Object.create(null, {
@@ -95,9 +97,9 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                 var _a, _b, _c;
                 const transferPromises = [];
                 const notifications = (_a = item.notifications) !== null && _a !== void 0 ? _a : [];
-                notifications.forEach(({ contract: contractHash, state, event_name: eventName }) => {
+                item.notifications.forEach(({ contract: contractHash, state, event_name: eventName }) => {
                     var _a;
-                    const properties = Array.isArray(state) ? state : (_a = state === null || state === void 0 ? void 0 : state.value) !== null && _a !== void 0 ? _a : [];
+                    const properties = (Array.isArray(state) ? state : (_a = state === null || state === void 0 ? void 0 : state.value) !== null && _a !== void 0 ? _a : []);
                     if (eventName !== 'Transfer' || (properties.length !== 3 && properties.length !== 4))
                         return;
                     const promise = () => __awaiter(this, void 0, void 0, function* () {
@@ -122,8 +124,8 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                         return {
                             from: convertedFrom,
                             to: convertedTo,
-                            tokenId: properties[3].value,
-                            contractHash,
+                            tokenHash: properties[3].value,
+                            collectionHash: contractHash,
                             type: 'nft',
                         };
                     });
@@ -198,21 +200,21 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                     type: 'default',
                 };
                 const eventPromises = item.events.map((event, eventIndex) => __awaiter(this, void 0, void 0, function* () {
-                    var _e, _f, _g, _h, _j, _k;
-                    let nftEvent;
-                    let assetEvent;
-                    const { methodName, tokenID: tokenId, contractHash: hash, contractName } = event;
+                    var _e, _f, _g, _h, _j, _k, _l;
+                    const { methodName, tokenID: tokenHash, contractHash, contractName } = event;
                     const from = (_e = event.from) !== null && _e !== void 0 ? _e : undefined;
                     const to = (_f = event.to) !== null && _f !== void 0 ? _f : undefined;
                     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;
+                    const contractHashUrl = contractHash ? contractTemplateUrl === null || contractTemplateUrl === void 0 ? void 0 : contractTemplateUrl.replace('{hash}', contractHash) : 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 isNft = __classPrivateFieldGet(this, _DoraBDSNeo3_supportedNep11Standards, "f").includes(standard) && !!tokenId;
+                    const isNft = __classPrivateFieldGet(this, _DoraBDSNeo3_supportedNep11Standards, "f").includes(standard) && !!tokenHash;
                     if (isNft) {
-                        const [nft] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __classPrivateFieldGet(this, _DoraBDSNeo3_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 = {
+                        const [nft] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __classPrivateFieldGet(this, _DoraBDSNeo3_nftDataService, "f").getNft({ collectionHash: contractHash, tokenHash }));
+                        const nftUrl = contractHash
+                            ? nftTemplateUrl === null || nftTemplateUrl === void 0 ? void 0 : nftTemplateUrl.replace('{collectionHash}', contractHash).replace('{tokenHash}', tokenHash)
+                            : undefined;
+                        const nftEvent = {
                             eventType: 'nft',
                             amount: undefined,
                             methodName,
@@ -220,33 +222,36 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                             fromUrl,
                             to,
                             toUrl,
-                            hash,
-                            hashUrl,
-                            tokenId,
+                            collectionHash: contractHash,
+                            collectionHashUrl: contractHashUrl,
+                            tokenHash,
                             tokenType: 'nep-11',
                             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,
+                            collectionName: (_k = nft === null || nft === void 0 ? void 0 : nft.collection) === null || _k === void 0 ? void 0 : _k.name,
                         };
+                        newItem.events.splice(eventIndex, 0, nftEvent);
+                        return;
                     }
                     else {
-                        const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(hash));
-                        assetEvent = {
+                        const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(contractHash));
+                        const assetEvent = {
                             eventType: 'token',
                             amount: event.amount
-                                ? blockchain_service_1.BSBigNumberHelper.format(event.amount, { decimals: (_k = token === null || token === void 0 ? void 0 : token.decimals) !== null && _k !== void 0 ? _k : event.tokenDecimals })
+                                ? 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,
-                            hash,
-                            hashUrl,
+                            contractHash,
+                            contractHashUrl,
                             token: token !== null && token !== void 0 ? token : undefined,
                             tokenType: 'nep-17',
                         };
+                        newItem.events.splice(eventIndex, 0, assetEvent);
                     }
                     if (newItem.type === 'default' && contractName === 'NeoXBridge') {
                         const [log] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => exports.DoraNeoRest.log(txId, this._network.id));
@@ -256,7 +261,6 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                                 newItem = Object.assign(Object.assign({}, newItem), { type: 'bridgeNeo3NeoX', data });
                         }
                     }
-                    newItem.events.splice(eventIndex, 0, isNft ? nftEvent : assetEvent);
                 }));
                 yield Promise.allSettled(eventPromises);
                 data.splice(index, 0, newItem);
@@ -311,10 +315,10 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                 if (cachedToken) {
                     return cachedToken;
                 }
-                let token = this._tokens.find(blockchain_service_1.BSTokenHelper.predicateByHash(tokenHash));
+                let token = this._tokens.find(this._tokenService.predicateByHash(tokenHash));
                 if (!token) {
                     const { decimals, symbol, name, scripthash } = yield exports.DoraNeoRest.asset(tokenHash, this._network.id);
-                    token = blockchain_service_1.BSTokenHelper.normalizeToken({
+                    token = this._tokenService.normalizeToken({
                         decimals: Number(decimals),
                         symbol,
                         name,
@@ -360,7 +364,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
     }
 }
 exports.DoraBDSNeo3 = DoraBDSNeo3;
-_DoraBDSNeo3_supportedNep11Standards = new WeakMap(), _DoraBDSNeo3_nftDataService = new WeakMap(), _DoraBDSNeo3_explorerService = new WeakMap(), _DoraBDSNeo3_instances = new WeakSet(), _DoraBDSNeo3_validateAddress = function _DoraBDSNeo3_validateAddress(address) {
+_DoraBDSNeo3_supportedNep11Standards = new WeakMap(), _DoraBDSNeo3_nftDataService = new WeakMap(), _DoraBDSNeo3_explorerService = new WeakMap(), _DoraBDSNeo3_neo3NeoXBridgeService = new WeakMap(), _DoraBDSNeo3_instances = new WeakSet(), _DoraBDSNeo3_validateAddress = function _DoraBDSNeo3_validateAddress(address) {
     return neon_js_1.wallet.isAddress(address, 53);
 }, _DoraBDSNeo3_validateFullTransactionsByAddressParams = function _DoraBDSNeo3_validateFullTransactionsByAddressParams(params) {
     if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network))
@@ -395,6 +399,8 @@ _DoraBDSNeo3_supportedNep11Standards = new WeakMap(), _DoraBDSNeo3_nftDataServic
     if (!byteStringReceiverAddress)
         return undefined;
     const receiverAddress = `0x${neon_js_1.u.HexString.fromBase64(byteStringReceiverAddress).toLittleEndian()}`;
-    const token = isNativeToken ? BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN : BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN;
+    const token = __classPrivateFieldGet(this, _DoraBDSNeo3_neo3NeoXBridgeService, "f").tokens.find(this._tokenService.predicateByHash(isNativeToken ? BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN : BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN));
+    if (!token)
+        return undefined;
     return { amount, token, receiverAddress };
 };

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

@@ -1,4 +1,4 @@
-import { BalanceResponse, BDSClaimable, BlockchainDataService, ContractResponse, ExportTransactionsByAddressParams, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, RpcResponse, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
+import { BalanceResponse, BDSClaimable, BlockchainDataService, ContractResponse, ExportTransactionsByAddressParams, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, RpcResponse, Token, TokenService, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 import { BSNeo3NetworkId } from '../../constants/BSNeo3Constants';
 export declare class RpcBDSNeo3 implements BlockchainDataService, BDSClaimable {
     readonly _tokenCache: Map<string, Token>;
@@ -6,8 +6,9 @@ export declare class RpcBDSNeo3 implements BlockchainDataService, BDSClaimable {
     readonly _claimToken: Token;
     readonly _network: Network<BSNeo3NetworkId>;
     readonly _tokens: Token[];
+    readonly _tokenService: TokenService;
     maxTimeToConfirmTransactionInMs: number;
-    constructor(network: Network<BSNeo3NetworkId>, feeToken: Token, claimToken: Token, tokens: Token[]);
+    constructor(network: Network<BSNeo3NetworkId>, feeToken: Token, claimToken: Token, tokens: Token[], tokenService: TokenService);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress(_params: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;
     getFullTransactionsByAddress(_params: FullTransactionsByAddressParams): Promise<FullTransactionsByAddressResponse>;

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

@@ -10,12 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcBDSNeo3 = void 0;
-const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const neon_core_1 = require("@cityofzion/neon-core");
 const neon_dappkit_1 = require("@cityofzion/neon-dappkit");
 const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
 class RpcBDSNeo3 {
-    constructor(network, feeToken, claimToken, tokens) {
+    constructor(network, feeToken, claimToken, tokens, tokenService) {
         this._tokenCache = new Map();
         this._tokens = [];
         this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 2;
@@ -23,6 +22,7 @@ class RpcBDSNeo3 {
         this._feeToken = feeToken;
         this._claimToken = claimToken;
         this._tokens = tokens;
+        this._tokenService = tokenService;
     }
     getTransaction(hash) {
         var _a, _b;
@@ -92,7 +92,7 @@ class RpcBDSNeo3 {
                 if (cachedToken) {
                     return cachedToken;
                 }
-                let token = this._tokens.find(blockchain_service_1.BSTokenHelper.predicateByHash(tokenHash));
+                let token = this._tokens.find(this._tokenService.predicateByHash(tokenHash));
                 if (!token) {
                     const rpcClient = new neon_core_1.rpc.RPCClient(this._network.url);
                     const contractState = yield rpcClient.getContractState(tokenHash);
@@ -115,7 +115,7 @@ class RpcBDSNeo3 {
                         throw new Error('Invalid symbol');
                     const decimals = Number(response.stack[0].value);
                     const symbol = neon_core_1.u.base642utf8(response.stack[1].value);
-                    token = blockchain_service_1.BSTokenHelper.normalizeToken({
+                    token = this._tokenService.normalizeToken({
                         name: contractState.manifest.name,
                         symbol,
                         hash: contractState.hash,

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

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

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

@@ -25,8 +25,8 @@ exports.FlamingoForthewinEDSNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
 class FlamingoForthewinEDSNeo3 extends blockchain_service_1.FlamingoForthewinEDS {
-    constructor(network) {
-        super();
+    constructor(network, tokenService) {
+        super(tokenService);
         _FlamingoForthewinEDSNeo3_network.set(this, void 0);
         __classPrivateFieldSet(this, _FlamingoForthewinEDSNeo3_network, network, "f");
     }

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

@@ -1,11 +1,11 @@
-import { BuildNftUrlParams, ExplorerService, Network } from '@cityofzion/blockchain-service';
+import { BuildNftUrlParams, ExplorerService, Network, TokenService } from '@cityofzion/blockchain-service';
 import { BSNeo3NetworkId } from '../../constants/BSNeo3Constants';
 export declare class DoraESNeo3 implements ExplorerService {
     #private;
-    constructor(network: Network<BSNeo3NetworkId>);
+    constructor(network: Network<BSNeo3NetworkId>, tokenService: TokenService);
     buildTransactionUrl(hash: string): string;
     buildContractUrl(contractHash: string): string;
-    buildNftUrl({ contractHash, tokenId }: BuildNftUrlParams): string;
+    buildNftUrl({ collectionHash, tokenHash }: BuildNftUrlParams): string;
     getAddressTemplateUrl(): string | undefined;
     getTxTemplateUrl(): string | undefined;
     getNftTemplateUrl(): string | undefined;

package/dist/services/explorer/DoraESNeo3.js

@@ -10,31 +10,33 @@ 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 _DoraESNeo3_BASE_URL, _DoraESNeo3_network;
+var _DoraESNeo3_BASE_URL, _DoraESNeo3_network, _DoraESNeo3_tokenService;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoraESNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
 class DoraESNeo3 {
-    constructor(network) {
+    constructor(network, tokenService) {
         _DoraESNeo3_BASE_URL.set(this, blockchain_service_1.BSCommonConstants.DORA_URL);
         _DoraESNeo3_network.set(this, void 0);
+        _DoraESNeo3_tokenService.set(this, void 0);
         __classPrivateFieldSet(this, _DoraESNeo3_network, network, "f");
+        __classPrivateFieldSet(this, _DoraESNeo3_tokenService, tokenService, "f");
     }
     buildTransactionUrl(hash) {
         if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
             throw new Error('DoraESNeo3 is only available on mainnet and testnet');
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${blockchain_service_1.BSTokenHelper.normalizeHash(hash)}`;
+        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${__classPrivateFieldGet(this, _DoraESNeo3_tokenService, "f").normalizeHash(hash)}`;
     }
     buildContractUrl(contractHash) {
         if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
             throw new Error('DoraESNeo3 is only available on mainnet and testnet');
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/contract/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${blockchain_service_1.BSTokenHelper.normalizeHash(contractHash)}`;
+        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/contract/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${__classPrivateFieldGet(this, _DoraESNeo3_tokenService, "f").normalizeHash(contractHash)}`;
     }
-    buildNftUrl({ contractHash, tokenId }) {
+    buildNftUrl({ collectionHash, tokenHash }) {
         if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
             throw new Error('DoraESNeo3 is only available on mainnet and testnet');
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${blockchain_service_1.BSTokenHelper.normalizeHash(contractHash)}/${tokenId}`;
+        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${collectionHash}/${tokenHash}`;
     }
     getAddressTemplateUrl() {
         if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
@@ -49,7 +51,7 @@ class DoraESNeo3 {
     getNftTemplateUrl() {
         if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
             return undefined;
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/{hash}/{tokenId}`;
+        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/{collectionHash}/{tokenHash}`;
     }
     getContractTemplateUrl() {
         if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
@@ -58,4 +60,4 @@ class DoraESNeo3 {
     }
 }
 exports.DoraESNeo3 = DoraESNeo3;
-_DoraESNeo3_BASE_URL = new WeakMap(), _DoraESNeo3_network = new WeakMap();
+_DoraESNeo3_BASE_URL = new WeakMap(), _DoraESNeo3_network = new WeakMap(), _DoraESNeo3_tokenService = new WeakMap();

package/dist/services/neo3neoXBridge/Neo3NeoXBridgeService.js

@@ -51,7 +51,7 @@ class Neo3NeoXBridgeService {
             const invoker = yield neon_dappkit_1.NeonInvoker.init({
                 rpcAddress: __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.url,
             });
-            const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
+            const isNativeToken = __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").tokenService.predicateByHash(token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
             let invocations;
             if (isNativeToken) {
                 invocations = [
@@ -132,7 +132,7 @@ class Neo3NeoXBridgeService {
                 scopes: 16,
                 allowedContracts: [this.BRIDGE_SCRIPT_HASH, BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN.hash],
             };
-            const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
+            const isNativeToken = __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").tokenService.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
             if (!isNativeToken) {
                 (_a = contractInvocation.args) === null || _a === void 0 ? void 0 : _a.unshift({ type: 'Hash160', value: BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN.hash });
                 (_b = signer.allowedContracts) === null || _b === void 0 ? void 0 : _b.push(BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN.hash);
@@ -157,7 +157,7 @@ class Neo3NeoXBridgeService {
             if ((log === null || log === void 0 ? void 0 : log.vmstate) !== 'HALT') {
                 throw new blockchain_service_1.BSError('Transaction invalid', 'INVALID_TRANSACTION');
             }
-            const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
+            const isNativeToken = __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").tokenService.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
             let nonce = null;
             if (isNativeToken) {
                 const notification = log.notifications.find(item => item.event_name === 'NativeDeposit');
@@ -177,7 +177,7 @@ class Neo3NeoXBridgeService {
         return __awaiter(this, void 0, void 0, function* () {
             let data;
             try {
-                const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
+                const isNativeToken = __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").tokenService.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
                 const response = yield axios_1.default.post('https://neofura.ngd.network', {
                     jsonrpc: '2.0',
                     method: 'GetBridgeTxByNonce',

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

@@ -9,5 +9,5 @@ export declare class GhostMarketNDSNeo3 extends RpcNDSNeo3 {
     }>>;
     constructor(network: Network<BSNeo3NetworkId>);
     getNftsByAddress({ address, size, cursor }: GetNftsByAddressParams): Promise<NftsResponse>;
-    getNft({ contractHash, tokenId }: GetNftParam): Promise<NftResponse>;
+    getNft({ collectionHash, tokenHash }: GetNftParam): Promise<NftResponse>;
 }

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

@@ -25,7 +25,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _GhostMarketNDSNeo3_instances, _GhostMarketNDSNeo3_network, _GhostMarketNDSNeo3_treatGhostMarketImage, _GhostMarketNDSNeo3_getUrlWithParams, _GhostMarketNDSNeo3_parse;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GhostMarketNDSNeo3 = void 0;
-const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const axios_1 = __importDefault(require("axios"));
 const query_string_1 = __importDefault(require("query-string"));
 const RpcNDSNeo3_1 = require("./RpcNDSNeo3");
@@ -49,11 +48,11 @@ class GhostMarketNDSNeo3 extends RpcNDSNeo3_1.RpcNDSNeo3 {
             return { nextCursor: data.next, items: nfts.map(__classPrivateFieldGet(this, _GhostMarketNDSNeo3_instances, "m", _GhostMarketNDSNeo3_parse).bind(this)) };
         });
     }
-    getNft({ contractHash, tokenId }) {
+    getNft({ collectionHash, tokenHash }) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = __classPrivateFieldGet(this, _GhostMarketNDSNeo3_instances, "m", _GhostMarketNDSNeo3_getUrlWithParams).call(this, {
-                contract: blockchain_service_1.BSTokenHelper.normalizeHash(contractHash),
-                tokenIds: [tokenId],
+                contract: collectionHash,
+                tokenIds: [tokenHash],
             });
             const { data } = yield axios_1.default.get(url);
             return __classPrivateFieldGet(this, _GhostMarketNDSNeo3_instances, "m", _GhostMarketNDSNeo3_parse).call(this, data.assets[0]);
@@ -81,11 +80,13 @@ _GhostMarketNDSNeo3_network = new WeakMap(), _GhostMarketNDSNeo3_instances = new
 }, _GhostMarketNDSNeo3_parse = function _GhostMarketNDSNeo3_parse(data) {
     var _a, _b;
     const nftResponse = {
-        collectionImage: __classPrivateFieldGet(this, _GhostMarketNDSNeo3_instances, "m", _GhostMarketNDSNeo3_treatGhostMarketImage).call(this, (_a = data.collection) === null || _a === void 0 ? void 0 : _a.logoUrl),
-        id: data.tokenId,
-        contractHash: blockchain_service_1.BSTokenHelper.normalizeHash(data.contract.hash),
+        hash: data.tokenId,
+        collection: {
+            hash: data.contract.hash,
+            name: (_a = data.collection) === null || _a === void 0 ? void 0 : _a.name,
+            image: __classPrivateFieldGet(this, _GhostMarketNDSNeo3_instances, "m", _GhostMarketNDSNeo3_treatGhostMarketImage).call(this, (_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: __classPrivateFieldGet(this, _GhostMarketNDSNeo3_instances, "m", _GhostMarketNDSNeo3_treatGhostMarketImage).call(this, data.metadata.mediaUri),
         isSVG: String(data.metadata.mediaType).includes('svg+xml'),
         name: data.metadata.name,

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

@@ -5,5 +5,5 @@ export declare abstract class RpcNDSNeo3 implements NftDataService {
     protected constructor(network: Network<BSNeo3NetworkId>);
     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/RpcNDSNeo3.js

@@ -28,7 +28,7 @@ class RpcNDSNeo3 {
         _RpcNDSNeo3_network.set(this, void 0);
         __classPrivateFieldSet(this, _RpcNDSNeo3_network, network, "f");
     }
-    hasToken({ contractHash, address }) {
+    hasToken({ collectionHash, address }) {
         return __awaiter(this, void 0, void 0, function* () {
             const parser = neon_dappkit_1.NeonParser;
             const invoker = yield neon_dappkit_1.NeonInvoker.init({ rpcAddress: __classPrivateFieldGet(this, _RpcNDSNeo3_network, "f").url });
@@ -36,7 +36,7 @@ class RpcNDSNeo3 {
                 const result = yield invoker.testInvoke({
                     invocations: [
                         {
-                            scriptHash: contractHash,
+                            scriptHash: collectionHash,
                             operation: 'balanceOf',
                             args: [
                                 {
@@ -50,7 +50,7 @@ class RpcNDSNeo3 {
                 return parser.parseRpcResponse(result.stack[0], { type: 'Integer' }) > 0;
             }
             catch (_a) {
-                throw new Error(`Token not found: ${contractHash}`);
+                throw new Error(`Token not found: ${collectionHash}`);
             }
         });
     }

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

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

package/dist/services/token/TokenServiceNeo3.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenServiceNeo3 = void 0;
+const blockchain_service_1 = require("@cityofzion/blockchain-service");
+class TokenServiceNeo3 extends blockchain_service_1.TokenService {
+    normalizeHash(hash) {
+        const fixed = hash.startsWith('0x') ? hash : `0x${hash}`;
+        return fixed.toLowerCase();
+    }
+}
+exports.TokenServiceNeo3 = TokenServiceNeo3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -21,7 +21,7 @@
     "isomorphic-ws": "^5.0.0",
     "lodash.clonedeep": "^4.5.0",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.20.0",
+    "@cityofzion/blockchain-service": "1.21.0",
     "@cityofzion/bs-asteroid-sdk": "0.9.1"
   },
   "devDependencies": {