@cityofzion/bs-neo-legacy 1.12.8 → 1.13.1

package/dist/{services/BSNeoLegacy.d.ts → BSNeoLegacy.d.ts}

@@ -1,6 +1,6 @@
-import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSClaimable, ExchangeDataService, Token, Network, TransferParam, BSWithExplorerService, ExplorerService, BSWithLedger, GetLedgerTransport, BalanceResponse } from '@cityofzion/blockchain-service';
-import { BSNeoLegacyNetworkId } from '../constants/BSNeoLegacyConstants';
-import { NeonJsLedgerServiceNeoLegacy } from './ledger/NeonJsLedgerServiceNeoLegacy';
+import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSClaimable, ExchangeDataService, Token, Network, TransferParam, BSWithExplorerService, ExplorerService, BSWithLedger, GetLedgerTransport, BalanceResponse, BSWithEncryption, ITokenService } from '@cityofzion/blockchain-service';
+import { BSNeoLegacyNetworkId } from './constants/BSNeoLegacyConstants';
+import { NeonJsLedgerServiceNeoLegacy } from './services/ledger/NeonJsLedgerServiceNeoLegacy';
 export type MigrateParams<BSName extends string = string> = {
     account: Account<BSName>;
     neo3Address: string;
@@ -18,7 +18,7 @@ export type CalculateNeoLegacyMigrationAmountsResponse = {
     gasBalance?: BalanceResponse;
     neoBalance?: BalanceResponse;
 };
-export declare class BSNeoLegacy<BSName extends string = string> implements BlockchainService<BSName, BSNeoLegacyNetworkId>, BSClaimable<BSName>, BSWithExplorerService, BSWithLedger<BSName> {
+export declare class BSNeoLegacy<BSName extends string = string> implements BlockchainService<BSName, BSNeoLegacyNetworkId>, BSClaimable<BSName>, BSWithExplorerService, BSWithLedger<BSName>, BSWithEncryption<BSName> {
     #private;
     NATIVE_ASSETS: {
         symbol: string;
@@ -36,6 +36,7 @@ export declare class BSNeoLegacy<BSName extends string = string> implements Bloc
     exchangeDataService: ExchangeDataService;
     ledgerService: NeonJsLedgerServiceNeoLegacy<BSName>;
     explorerService: ExplorerService;
+    tokenService: ITokenService;
     tokens: Token[];
     network: Network<BSNeoLegacyNetworkId>;
     legacyNetwork: string;

package/dist/{services/BSNeoLegacy.js → BSNeoLegacy.js}

@@ -30,12 +30,13 @@ exports.BSNeoLegacy = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const neon_js_1 = require("@cityofzion/neon-js");
 const bs_asteroid_sdk_1 = require("@cityofzion/bs-asteroid-sdk");
-const BSNeoLegacyConstants_1 = require("../constants/BSNeoLegacyConstants");
-const BSNeoLegacyHelper_1 = require("../helpers/BSNeoLegacyHelper");
-const CryptoCompareEDSNeoLegacy_1 = require("./exchange-data/CryptoCompareEDSNeoLegacy");
-const DoraBDSNeoLegacy_1 = require("./blockchain-data/DoraBDSNeoLegacy");
-const NeoTubeESNeoLegacy_1 = require("./explorer/NeoTubeESNeoLegacy");
-const NeonJsLedgerServiceNeoLegacy_1 = require("./ledger/NeonJsLedgerServiceNeoLegacy");
+const BSNeoLegacyConstants_1 = require("./constants/BSNeoLegacyConstants");
+const BSNeoLegacyHelper_1 = require("./helpers/BSNeoLegacyHelper");
+const CryptoCompareEDSNeoLegacy_1 = require("./services/exchange-data/CryptoCompareEDSNeoLegacy");
+const DoraBDSNeoLegacy_1 = require("./services/blockchain-data/DoraBDSNeoLegacy");
+const NeoTubeESNeoLegacy_1 = require("./services/explorer/NeoTubeESNeoLegacy");
+const NeonJsLedgerServiceNeoLegacy_1 = require("./services/ledger/NeonJsLedgerServiceNeoLegacy");
+const TokenServiceNeoLegacy_1 = require("./services/token/TokenServiceNeoLegacy");
 class BSNeoLegacy {
     constructor(name, network, getLedgerTransport) {
         _BSNeoLegacy_instances.add(this);
@@ -49,7 +50,7 @@ class BSNeoLegacy {
     }
     testNetwork(network) {
         return __awaiter(this, void 0, void 0, function* () {
-            const blockchainDataServiceClone = new DoraBDSNeoLegacy_1.DoraBDSNeoLegacy(network, this.feeToken, this.claimToken, this.tokens, this.explorerService);
+            const blockchainDataServiceClone = new DoraBDSNeoLegacy_1.DoraBDSNeoLegacy(network, this.feeToken, this.claimToken, this.tokens, this.explorerService, this.tokenService);
             yield blockchainDataServiceClone.getBlockHeight();
         });
     }
@@ -58,8 +59,9 @@ class BSNeoLegacy {
             throw new Error('Custom network is not supported');
         __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_setTokens).call(this, network);
         this.network = network;
-        this.explorerService = new NeoTubeESNeoLegacy_1.NeoTubeESNeoLegacy(network);
-        this.blockchainDataService = new DoraBDSNeoLegacy_1.DoraBDSNeoLegacy(network, this.feeToken, this.claimToken, this.tokens, this.explorerService);
+        this.tokenService = new TokenServiceNeoLegacy_1.TokenServiceNeoLegacy();
+        this.explorerService = new NeoTubeESNeoLegacy_1.NeoTubeESNeoLegacy(network, this.tokenService);
+        this.blockchainDataService = new DoraBDSNeoLegacy_1.DoraBDSNeoLegacy(network, this.feeToken, this.claimToken, this.tokens, this.explorerService, this.tokenService);
         this.exchangeDataService = new CryptoCompareEDSNeoLegacy_1.CryptoCompareEDSNeoLegacy(network);
     }
     validateAddress(address) {
@@ -117,8 +119,8 @@ class BSNeoLegacy {
             const nep5ScriptBuilder = new neon_js_1.sc.ScriptBuilder();
             const concatIntents = [...intents, ...(tipIntent ? [tipIntent] : [])];
             for (const intent of concatIntents) {
-                const normalizeTokenHash = blockchain_service_1.BSTokenHelper.normalizeHash(intent.tokenHash);
-                const nativeAsset = this.NATIVE_ASSETS.find(blockchain_service_1.BSTokenHelper.predicateByHash(normalizeTokenHash));
+                const normalizeTokenHash = this.tokenService.normalizeHash(intent.tokenHash);
+                const nativeAsset = this.NATIVE_ASSETS.find(this.tokenService.predicateByHash(normalizeTokenHash));
                 if (nativeAsset) {
                     nativeIntents.push(...neon_js_1.api.makeIntent({ [nativeAsset.symbol]: Number(intent.amount) }, intent.receiverAddress));
                     continue;
@@ -229,8 +231,8 @@ class BSNeoLegacy {
         return response;
     }
     calculateNeoLegacyMigrationAmounts(balance) {
-        const gasBalance = balance.find(({ token }) => blockchain_service_1.BSTokenHelper.predicateByHash(BSNeoLegacyConstants_1.BSNeoLegacyConstants.GAS_ASSET)(token));
-        const neoBalance = balance.find(({ token }) => blockchain_service_1.BSTokenHelper.predicateByHash(BSNeoLegacyConstants_1.BSNeoLegacyConstants.NEO_ASSET)(token));
+        const gasBalance = balance.find(({ token }) => this.tokenService.predicateByHash(BSNeoLegacyConstants_1.BSNeoLegacyConstants.GAS_ASSET)(token));
+        const neoBalance = balance.find(({ token }) => this.tokenService.predicateByHash(BSNeoLegacyConstants_1.BSNeoLegacyConstants.NEO_ASSET)(token));
         let hasEnoughGasBalance = false;
         let hasEnoughNeoBalance = false;
         if (gasBalance) {
@@ -288,7 +290,7 @@ _BSNeoLegacy_instances = new WeakSet(), _BSNeoLegacy_generateSigningCallback = f
 }, _BSNeoLegacy_getRequiredTransactionFeeConfig = function _BSNeoLegacy_getRequiredTransactionFeeConfig(config) {
     var _a, _b, _c;
     config.fees = BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION;
-    const gasIntent = (_c = (_b = (_a = config.intents) === null || _a === void 0 ? void 0 : _a.filter((intent) => blockchain_service_1.BSTokenHelper.normalizeHash(intent.assetId) === BSNeoLegacyConstants_1.BSNeoLegacyConstants.GAS_ASSET.hash)) === null || _b === void 0 ? void 0 : _b.sort((a, b) => { var _a; return (_a = b.value.comparedTo(a.value)) !== null && _a !== void 0 ? _a : 0; })) === null || _c === void 0 ? void 0 : _c[0];
+    const gasIntent = (_c = (_b = (_a = config.intents) === null || _a === void 0 ? void 0 : _a.filter((intent) => this.tokenService.normalizeHash(intent.assetId) === BSNeoLegacyConstants_1.BSNeoLegacyConstants.GAS_ASSET.hash)) === null || _b === void 0 ? void 0 : _b.sort((a, b) => { var _a; return (_a = b.value.comparedTo(a.value)) !== null && _a !== void 0 ? _a : 0; })) === null || _c === void 0 ? void 0 : _c[0];
     if (gasIntent === null || gasIntent === void 0 ? void 0 : gasIntent.value) {
         gasIntent.value = gasIntent.value.sub(BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION);
     }

package/dist/constants/BSNeoLegacyConstants.d.ts

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

package/dist/constants/BSNeoLegacyConstants.js

@@ -1,23 +1,29 @@
 "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, _BSNeoLegacyConstants_tokenService;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeoLegacyConstants = void 0;
 const mainnet_json_1 = __importDefault(require("../assets/tokens/mainnet.json"));
 const native_json_1 = __importDefault(require("../assets/tokens/native.json"));
-const blockchain_service_1 = require("@cityofzion/blockchain-service");
+const TokenServiceNeoLegacy_1 = require("../services/token/TokenServiceNeoLegacy");
 class BSNeoLegacyConstants {
 }
 exports.BSNeoLegacyConstants = BSNeoLegacyConstants;
 _a = BSNeoLegacyConstants;
+_BSNeoLegacyConstants_tokenService = { value: new TokenServiceNeoLegacy_1.TokenServiceNeoLegacy() };
 BSNeoLegacyConstants.EXTRA_TOKENS_BY_NETWORK_ID = {
-    mainnet: mainnet_json_1.default,
+    mainnet: __classPrivateFieldGet(_a, _a, "f", _BSNeoLegacyConstants_tokenService).normalizeToken(mainnet_json_1.default),
 };
-BSNeoLegacyConstants.NATIVE_ASSETS = blockchain_service_1.BSTokenHelper.normalizeToken(native_json_1.default);
-BSNeoLegacyConstants.GAS_ASSET = _a.NATIVE_ASSETS.find(blockchain_service_1.BSTokenHelper.predicateBySymbol('GAS'));
-BSNeoLegacyConstants.NEO_ASSET = _a.NATIVE_ASSETS.find(blockchain_service_1.BSTokenHelper.predicateBySymbol('NEO'));
+BSNeoLegacyConstants.NATIVE_ASSETS = __classPrivateFieldGet(_a, _a, "f", _BSNeoLegacyConstants_tokenService).normalizeToken(native_json_1.default);
+BSNeoLegacyConstants.GAS_ASSET = _a.NATIVE_ASSETS.find(__classPrivateFieldGet(_a, _a, "f", _BSNeoLegacyConstants_tokenService).predicateBySymbol('GAS'));
+BSNeoLegacyConstants.NEO_ASSET = _a.NATIVE_ASSETS.find(__classPrivateFieldGet(_a, _a, "f", _BSNeoLegacyConstants_tokenService).predicateBySymbol('NEO'));
 BSNeoLegacyConstants.RPC_LIST_BY_NETWORK_ID = {
     mainnet: [
         'https://mainnet1.neo2.coz.io:443',

package/dist/helpers/BSNeoLegacyHelper.d.ts

@@ -7,6 +7,7 @@ export type WaitForMigrationParams = {
     neoLegacyService: BlockchainService;
 };
 export declare class BSNeoLegacyHelper {
+    #private;
     static getLegacyNetwork(network: Network<BSNeoLegacyNetworkId>): string;
     static getTokens(network: Network<BSNeoLegacyNetworkId>): {
         symbol: string;

package/dist/helpers/BSNeoLegacyHelper.js

@@ -8,14 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var _a, _BSNeoLegacyHelper_tokenService;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeoLegacyHelper = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
-const native_json_1 = __importDefault(require("../assets/tokens/native.json"));
 const BSNeoLegacyConstants_1 = require("../constants/BSNeoLegacyConstants");
+const TokenServiceNeoLegacy_1 = require("../services/token/TokenServiceNeoLegacy");
 class BSNeoLegacyHelper {
     static getLegacyNetwork(network) {
         const legacyNetwork = BSNeoLegacyConstants_1.BSNeoLegacyConstants.LEGACY_NETWORK_BY_NETWORK_ID[network.id];
@@ -24,13 +22,14 @@ class BSNeoLegacyHelper {
         return legacyNetwork;
     }
     static getTokens(network) {
-        var _a;
-        const extraTokens = (_a = BSNeoLegacyConstants_1.BSNeoLegacyConstants.EXTRA_TOKENS_BY_NETWORK_ID[network.id]) !== null && _a !== void 0 ? _a : [];
-        return blockchain_service_1.BSTokenHelper.normalizeToken([...extraTokens, ...native_json_1.default]);
+        var _b;
+        const extraTokens = (_b = BSNeoLegacyConstants_1.BSNeoLegacyConstants.EXTRA_TOKENS_BY_NETWORK_ID[network.id]) !== null && _b !== void 0 ? _b : [];
+        const nativeTokens = BSNeoLegacyConstants_1.BSNeoLegacyConstants.NATIVE_ASSETS;
+        return nativeTokens.concat(extraTokens);
     }
     static getRpcList(network) {
-        var _a;
-        return (_a = BSNeoLegacyConstants_1.BSNeoLegacyConstants.RPC_LIST_BY_NETWORK_ID[network.id]) !== null && _a !== void 0 ? _a : [];
+        var _b;
+        return (_b = BSNeoLegacyConstants_1.BSNeoLegacyConstants.RPC_LIST_BY_NETWORK_ID[network.id]) !== null && _b !== void 0 ? _b : [];
     }
     static isMainnet(network) {
         return BSNeoLegacyConstants_1.BSNeoLegacyConstants.MAINNET_NETWORK_IDS.includes(network.id);
@@ -52,7 +51,7 @@ class BSNeoLegacyHelper {
                     response.isTransactionConfirmed = true;
                     break;
                 }
-                catch (_a) {
+                catch (_b) {
                     // Empty block
                 }
             }
@@ -71,7 +70,7 @@ class BSNeoLegacyHelper {
                         break;
                     }
                 }
-                catch (_b) {
+                catch (_c) {
                     // Empty block
                 }
             }
@@ -80,3 +79,5 @@ class BSNeoLegacyHelper {
     }
 }
 exports.BSNeoLegacyHelper = BSNeoLegacyHelper;
+_a = BSNeoLegacyHelper;
+_BSNeoLegacyHelper_tokenService = { value: new TokenServiceNeoLegacy_1.TokenServiceNeoLegacy() };

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-export * from './services/BSNeoLegacy';
+export * from './BSNeoLegacy';
 export * from './constants/BSNeoLegacyConstants';
 export * from './helpers/BSNeoLegacyHelper';
 export * from './services/blockchain-data/DoraBDSNeoLegacy';
 export * from './services/exchange-data/CryptoCompareEDSNeoLegacy';
 export * from './services/explorer/NeoTubeESNeoLegacy';
 export * from './services/ledger/NeonJsLedgerServiceNeoLegacy';
+export * from './services/token/TokenServiceNeoLegacy';

package/dist/index.js

@@ -14,10 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./services/BSNeoLegacy"), exports);
+__exportStar(require("./BSNeoLegacy"), exports);
 __exportStar(require("./constants/BSNeoLegacyConstants"), exports);
 __exportStar(require("./helpers/BSNeoLegacyHelper"), exports);
 __exportStar(require("./services/blockchain-data/DoraBDSNeoLegacy"), exports);
 __exportStar(require("./services/exchange-data/CryptoCompareEDSNeoLegacy"), exports);
 __exportStar(require("./services/explorer/NeoTubeESNeoLegacy"), exports);
 __exportStar(require("./services/ledger/NeonJsLedgerServiceNeoLegacy"), exports);
+__exportStar(require("./services/token/TokenServiceNeoLegacy"), exports);

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

@@ -1,9 +1,9 @@
-import { BalanceResponse, BDSClaimable, BlockchainDataService, ContractResponse, ExplorerService, ExportTransactionsByAddressParams, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, RpcResponse, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
+import { BalanceResponse, BDSClaimable, BlockchainDataService, ContractResponse, ExplorerService, ExportTransactionsByAddressParams, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, RpcResponse, Token, TokenService, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 import { BSNeoLegacyNetworkId } from '../../constants/BSNeoLegacyConstants';
 export declare class DoraBDSNeoLegacy implements BlockchainDataService, BDSClaimable {
     #private;
     maxTimeToConfirmTransactionInMs: number;
-    constructor(network: Network<BSNeoLegacyNetworkId>, feeToken: Token, claimToken: Token, tokens: Token[], explorerService: ExplorerService);
+    constructor(network: Network<BSNeoLegacyNetworkId>, feeToken: Token, claimToken: Token, tokens: Token[], explorerService: ExplorerService, tokenService: TokenService);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress({ address, nextPageParams, }: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;
     getFullTransactionsByAddress({ nextCursor, ...params }: FullTransactionsByAddressParams): Promise<FullTransactionsByAddressResponse>;

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

@@ -30,7 +30,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _DoraBDSNeoLegacy_instances, _DoraBDSNeoLegacy_supportedNep5Standards, _DoraBDSNeoLegacy_network, _DoraBDSNeoLegacy_claimToken, _DoraBDSNeoLegacy_feeToken, _DoraBDSNeoLegacy_tokens, _DoraBDSNeoLegacy_tokenCache, _DoraBDSNeoLegacy_explorerService, _DoraBDSNeoLegacy_validateFullTransactionsByAddressParams, _DoraBDSNeoLegacy_validateGetFullTransactionsByAddressParams;
+var _DoraBDSNeoLegacy_instances, _DoraBDSNeoLegacy_supportedNep5Standards, _DoraBDSNeoLegacy_network, _DoraBDSNeoLegacy_claimToken, _DoraBDSNeoLegacy_feeToken, _DoraBDSNeoLegacy_tokens, _DoraBDSNeoLegacy_tokenCache, _DoraBDSNeoLegacy_explorerService, _DoraBDSNeoLegacy_tokenService, _DoraBDSNeoLegacy_validateFullTransactionsByAddressParams, _DoraBDSNeoLegacy_validateGetFullTransactionsByAddressParams;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoraBDSNeoLegacy = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -38,7 +38,7 @@ const dora_ts_1 = require("@cityofzion/dora-ts");
 const neon_js_1 = require("@cityofzion/neon-js");
 const BSNeoLegacyHelper_1 = require("../../helpers/BSNeoLegacyHelper");
 class DoraBDSNeoLegacy {
-    constructor(network, feeToken, claimToken, tokens, explorerService) {
+    constructor(network, feeToken, claimToken, tokens, explorerService, tokenService) {
         _DoraBDSNeoLegacy_instances.add(this);
         _DoraBDSNeoLegacy_supportedNep5Standards.set(this, ['nep5', 'nep-5']);
         _DoraBDSNeoLegacy_network.set(this, void 0);
@@ -47,12 +47,14 @@ class DoraBDSNeoLegacy {
         _DoraBDSNeoLegacy_tokens.set(this, void 0);
         _DoraBDSNeoLegacy_tokenCache.set(this, new Map());
         _DoraBDSNeoLegacy_explorerService.set(this, void 0);
+        _DoraBDSNeoLegacy_tokenService.set(this, void 0);
         this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 2;
         __classPrivateFieldSet(this, _DoraBDSNeoLegacy_network, network, "f");
         __classPrivateFieldSet(this, _DoraBDSNeoLegacy_claimToken, claimToken, "f");
         __classPrivateFieldSet(this, _DoraBDSNeoLegacy_feeToken, feeToken, "f");
         __classPrivateFieldSet(this, _DoraBDSNeoLegacy_tokens, tokens, "f");
         __classPrivateFieldSet(this, _DoraBDSNeoLegacy_explorerService, explorerService, "f");
+        __classPrivateFieldSet(this, _DoraBDSNeoLegacy_tokenService, tokenService, "f");
     }
     getTransaction(hash) {
         var _a, _b, _c;
@@ -81,6 +83,7 @@ class DoraBDSNeoLegacy {
                 time: Number(data.time),
                 notifications: [],
                 transfers,
+                type: 'default',
             };
         });
     }
@@ -112,6 +115,7 @@ class DoraBDSNeoLegacy {
                     time: entry.time,
                     transfers: [transfer],
                     notifications: [],
+                    type: 'default',
                 });
             }));
             yield Promise.all(promises);
@@ -140,7 +144,7 @@ class DoraBDSNeoLegacy {
             const addressTemplateUrl = __classPrivateFieldGet(this, _DoraBDSNeoLegacy_explorerService, "f").getAddressTemplateUrl();
             const txTemplateUrl = __classPrivateFieldGet(this, _DoraBDSNeoLegacy_explorerService, "f").getTxTemplateUrl();
             const contractTemplateUrl = __classPrivateFieldGet(this, _DoraBDSNeoLegacy_explorerService, "f").getContractTemplateUrl();
-            const itemPromises = items.map((_d) => __awaiter(this, void 0, void 0, function* () {
+            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 = {
@@ -157,16 +161,17 @@ class DoraBDSNeoLegacy {
                         ? blockchain_service_1.BSBigNumberHelper.format(systemFeeAmount, { decimals: __classPrivateFieldGet(this, _DoraBDSNeoLegacy_feeToken, "f").decimals })
                         : undefined,
                     events: [],
+                    type: 'default',
                 };
-                const eventPromises = item.events.map((event) => __awaiter(this, void 0, void 0, function* () {
+                const eventPromises = item.events.map((event, eventIndex) => __awaiter(this, void 0, void 0, function* () {
                     var _e, _f, _g, _h;
-                    const { contractHash: hash, amount, from, to } = event;
-                    const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(hash));
+                    const { contractHash, amount, from, to } = event;
+                    const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(contractHash));
                     const standard = (_g = (_f = (_e = event.supportedStandards) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.toLowerCase()) !== null && _g !== void 0 ? _g : '';
                     const isNep5 = __classPrivateFieldGet(this, _DoraBDSNeoLegacy_supportedNep5Standards, "f").includes(standard);
                     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 assetEvent = {
                         eventType: 'token',
                         amount: amount
@@ -177,15 +182,15 @@ class DoraBDSNeoLegacy {
                         fromUrl,
                         to: to !== null && to !== void 0 ? to : undefined,
                         toUrl,
-                        hash,
-                        hashUrl,
+                        contractHash,
+                        contractHashUrl,
                         token: token !== null && token !== void 0 ? token : undefined,
                         tokenType: isNep5 ? 'nep-5' : 'generic',
                     };
-                    newItem.events.push(assetEvent);
+                    newItem.events.splice(eventIndex, 0, assetEvent);
                 }));
                 yield Promise.allSettled(eventPromises);
-                data.push(newItem);
+                data.splice(index, 0, newItem);
             }));
             yield Promise.allSettled(itemPromises);
             return { nextCursor: response.nextCursor, data };
@@ -220,7 +225,7 @@ class DoraBDSNeoLegacy {
             if (cachedToken) {
                 return cachedToken;
             }
-            let token = __classPrivateFieldGet(this, _DoraBDSNeoLegacy_tokens, "f").find(blockchain_service_1.BSTokenHelper.predicateByHash(tokenHash));
+            let token = __classPrivateFieldGet(this, _DoraBDSNeoLegacy_tokens, "f").find(__classPrivateFieldGet(this, _DoraBDSNeoLegacy_tokenService, "f").predicateByHash(tokenHash));
             if (!token) {
                 const data = yield dora_ts_1.api.NeoLegacyREST.asset(tokenHash, __classPrivateFieldGet(this, _DoraBDSNeoLegacy_network, "f").id);
                 if (!data || 'error' in data)
@@ -232,7 +237,7 @@ class DoraBDSNeoLegacy {
                     name: data.name,
                 };
             }
-            __classPrivateFieldGet(this, _DoraBDSNeoLegacy_tokenCache, "f").set(tokenHash, blockchain_service_1.BSTokenHelper.normalizeToken(token));
+            __classPrivateFieldGet(this, _DoraBDSNeoLegacy_tokenCache, "f").set(tokenHash, __classPrivateFieldGet(this, _DoraBDSNeoLegacy_tokenService, "f").normalizeToken(token));
             return token;
         });
     }
@@ -240,7 +245,7 @@ class DoraBDSNeoLegacy {
         return __awaiter(this, void 0, void 0, function* () {
             const data = yield dora_ts_1.api.NeoLegacyREST.balance(address, __classPrivateFieldGet(this, _DoraBDSNeoLegacy_network, "f").id);
             const promises = data.map((balance) => __awaiter(this, void 0, void 0, function* () {
-                let token = blockchain_service_1.BSTokenHelper.normalizeToken({
+                let token = __classPrivateFieldGet(this, _DoraBDSNeoLegacy_tokenService, "f").normalizeToken({
                     hash: balance.asset,
                     name: balance.asset_name,
                     symbol: balance.symbol,
@@ -303,7 +308,7 @@ class DoraBDSNeoLegacy {
     }
 }
 exports.DoraBDSNeoLegacy = DoraBDSNeoLegacy;
-_DoraBDSNeoLegacy_supportedNep5Standards = new WeakMap(), _DoraBDSNeoLegacy_network = new WeakMap(), _DoraBDSNeoLegacy_claimToken = new WeakMap(), _DoraBDSNeoLegacy_feeToken = new WeakMap(), _DoraBDSNeoLegacy_tokens = new WeakMap(), _DoraBDSNeoLegacy_tokenCache = new WeakMap(), _DoraBDSNeoLegacy_explorerService = new WeakMap(), _DoraBDSNeoLegacy_instances = new WeakSet(), _DoraBDSNeoLegacy_validateFullTransactionsByAddressParams = function _DoraBDSNeoLegacy_validateFullTransactionsByAddressParams(params) {
+_DoraBDSNeoLegacy_supportedNep5Standards = new WeakMap(), _DoraBDSNeoLegacy_network = new WeakMap(), _DoraBDSNeoLegacy_claimToken = new WeakMap(), _DoraBDSNeoLegacy_feeToken = new WeakMap(), _DoraBDSNeoLegacy_tokens = new WeakMap(), _DoraBDSNeoLegacy_tokenCache = new WeakMap(), _DoraBDSNeoLegacy_explorerService = new WeakMap(), _DoraBDSNeoLegacy_tokenService = new WeakMap(), _DoraBDSNeoLegacy_instances = new WeakSet(), _DoraBDSNeoLegacy_validateFullTransactionsByAddressParams = function _DoraBDSNeoLegacy_validateFullTransactionsByAddressParams(params) {
     if (!BSNeoLegacyHelper_1.BSNeoLegacyHelper.isMainnet(__classPrivateFieldGet(this, _DoraBDSNeoLegacy_network, "f")))
         throw new Error('Only Mainnet is supported');
     blockchain_service_1.BSFullTransactionsByAddressHelper.validateFullTransactionsByAddressParams(params);

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

@@ -1,8 +1,8 @@
-import { BuildNftUrlParams, ExplorerService, Network } from '@cityofzion/blockchain-service';
+import { BuildNftUrlParams, ExplorerService, Network, TokenService } from '@cityofzion/blockchain-service';
 import { BSNeoLegacyNetworkId } from '../../constants/BSNeoLegacyConstants';
 export declare class NeoTubeESNeoLegacy implements ExplorerService {
     #private;
-    constructor(network: Network<BSNeoLegacyNetworkId>);
+    constructor(network: Network<BSNeoLegacyNetworkId>, tokenService: TokenService);
     buildTransactionUrl(hash: string): string;
     buildContractUrl(contractHash: string): string;
     buildNftUrl(_params: BuildNftUrlParams): string;

package/dist/services/explorer/NeoTubeESNeoLegacy.js

@@ -10,26 +10,27 @@ 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 _NeoTubeESNeoLegacy_BASE_URL, _NeoTubeESNeoLegacy_network;
+var _NeoTubeESNeoLegacy_BASE_URL, _NeoTubeESNeoLegacy_network, _NeoTubeESNeoLegacy_tokenService;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NeoTubeESNeoLegacy = void 0;
-const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSNeoLegacyHelper_1 = require("../../helpers/BSNeoLegacyHelper");
 class NeoTubeESNeoLegacy {
-    constructor(network) {
+    constructor(network, tokenService) {
         _NeoTubeESNeoLegacy_BASE_URL.set(this, 'https://neo2.neotube.io');
         _NeoTubeESNeoLegacy_network.set(this, void 0);
+        _NeoTubeESNeoLegacy_tokenService.set(this, void 0);
         __classPrivateFieldSet(this, _NeoTubeESNeoLegacy_network, network, "f");
+        __classPrivateFieldSet(this, _NeoTubeESNeoLegacy_tokenService, tokenService, "f");
     }
     buildTransactionUrl(hash) {
         if (!BSNeoLegacyHelper_1.BSNeoLegacyHelper.isMainnet(__classPrivateFieldGet(this, _NeoTubeESNeoLegacy_network, "f")))
             throw new Error('NeoTube is only available on mainnet');
-        return `${__classPrivateFieldGet(this, _NeoTubeESNeoLegacy_BASE_URL, "f")}/transaction/${blockchain_service_1.BSTokenHelper.normalizeHash(hash)}`;
+        return `${__classPrivateFieldGet(this, _NeoTubeESNeoLegacy_BASE_URL, "f")}/transaction/${__classPrivateFieldGet(this, _NeoTubeESNeoLegacy_tokenService, "f").normalizeHash(hash)}`;
     }
     buildContractUrl(contractHash) {
         if (!BSNeoLegacyHelper_1.BSNeoLegacyHelper.isMainnet(__classPrivateFieldGet(this, _NeoTubeESNeoLegacy_network, "f")))
             throw new Error('NeoTube is only available on mainnet');
-        return `${__classPrivateFieldGet(this, _NeoTubeESNeoLegacy_BASE_URL, "f")}/asset/${blockchain_service_1.BSTokenHelper.normalizeHash(contractHash)}/page/1`;
+        return `${__classPrivateFieldGet(this, _NeoTubeESNeoLegacy_BASE_URL, "f")}/asset/${__classPrivateFieldGet(this, _NeoTubeESNeoLegacy_tokenService, "f").normalizeHash(contractHash)}/page/1`;
     }
     buildNftUrl(_params) {
         throw new Error('NeoTube does not support nft');
@@ -54,4 +55,4 @@ class NeoTubeESNeoLegacy {
     }
 }
 exports.NeoTubeESNeoLegacy = NeoTubeESNeoLegacy;
-_NeoTubeESNeoLegacy_BASE_URL = new WeakMap(), _NeoTubeESNeoLegacy_network = new WeakMap();
+_NeoTubeESNeoLegacy_BASE_URL = new WeakMap(), _NeoTubeESNeoLegacy_network = new WeakMap(), _NeoTubeESNeoLegacy_tokenService = new WeakMap();

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

@@ -1,5 +1,5 @@
 import { Account, GetLedgerTransport, LedgerService, LedgerServiceEmitter, UntilIndexRecord } from '@cityofzion/blockchain-service';
-import { BSNeoLegacy } from '../BSNeoLegacy';
+import { BSNeoLegacy } from '../../BSNeoLegacy';
 import Transport from '@ledgerhq/hw-transport';
 export declare class NeonJsLedgerServiceNeoLegacy<BSName extends string = string> implements LedgerService<BSName> {
     #private;

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

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

package/dist/services/token/TokenServiceNeoLegacy.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo-legacy",
-  "version": "1.12.8",
+  "version": "1.13.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Coz",
@@ -14,7 +14,7 @@
     "@ledgerhq/hw-transport": "~6.31.8",
     "axios": "~1.8.2",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.19.3",
+    "@cityofzion/blockchain-service": "1.21.0",
     "@cityofzion/bs-asteroid-sdk": "0.9.1"
   },
   "devDependencies": {