@cityofzion/bs-neo-legacy 1.5.0 → 1.6.0

package/dist/services/BSNeoLegacy.d.ts

@@ -1,8 +1,8 @@
 import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSClaimable, ExchangeDataService, Token, Network, TransferParam, BSWithExplorerService, ExplorerService } from '@cityofzion/blockchain-service';
 import { BSNeoLegacyNetworkId } from '../constants/BSNeoLegacyConstants';
-export declare class BSNeoLegacy<BSCustomName extends string = string> implements BlockchainService<BSCustomName, BSNeoLegacyNetworkId>, BSClaimable, BSWithExplorerService {
+export declare class BSNeoLegacy<BSName extends string = string> implements BlockchainService<BSName, BSNeoLegacyNetworkId>, BSClaimable<BSName>, BSWithExplorerService {
     #private;
-    readonly blockchainName: BSCustomName;
+    readonly name: BSName;
     readonly bip44DerivationPath: string;
     feeToken: Token;
     claimToken: Token;
@@ -13,15 +13,15 @@ export declare class BSNeoLegacy<BSCustomName extends string = string> implement
     tokens: Token[];
     network: Network<BSNeoLegacyNetworkId>;
     legacyNetwork: string;
-    constructor(blockchainName: BSCustomName, network?: Network<BSNeoLegacyNetworkId>);
+    constructor(name: BSName, network?: Network<BSNeoLegacyNetworkId>);
     testNetwork(network: Network<BSNeoLegacyNetworkId>): Promise<void>;
     setNetwork(network: Network<BSNeoLegacyNetworkId>): void;
     validateAddress(address: string): boolean;
     validateEncrypted(key: string): boolean;
     validateKey(key: string): boolean;
-    generateAccountFromMnemonic(mnemonic: string[] | string, index: number): Account;
-    generateAccountFromKey(key: string): Account;
-    decrypt(encryptedKey: string, password: string): Promise<Account>;
+    generateAccountFromMnemonic(mnemonic: string[] | string, index: number): Account<BSName>;
+    generateAccountFromKey(key: string): Account<BSName>;
+    decrypt(encryptedKey: string, password: string): Promise<Account<BSName>>;
     encrypt(key: string, password: string): Promise<string>;
     transfer({ intents, senderAccount, tipIntent, ...params }: TransferParam): Promise<string[]>;
     claim(account: Account): Promise<string>;

package/dist/services/BSNeoLegacy.js

@@ -35,10 +35,10 @@ const CryptoCompareEDSNeoLegacy_1 = require("./exchange-data/CryptoCompareEDSNeo
 const DoraBDSNeoLegacy_1 = require("./blockchain-data/DoraBDSNeoLegacy");
 const NeoTubeESNeoLegacy_1 = require("./explorer/NeoTubeESNeoLegacy");
 class BSNeoLegacy {
-    constructor(blockchainName, network) {
+    constructor(name, network) {
         _BSNeoLegacy_instances.add(this);
         network = network !== null && network !== void 0 ? network : BSNeoLegacyConstants_1.BSNeoLegacyConstants.DEFAULT_NETWORK;
-        this.blockchainName = blockchainName;
+        this.name = name;
         this.legacyNetwork = BSNeoLegacyConstants_1.BSNeoLegacyConstants.LEGACY_NETWORK_BY_NETWORK_ID[network.id];
         this.bip44DerivationPath = BSNeoLegacyConstants_1.BSNeoLegacyConstants.DEFAULT_BIP44_DERIVATION_PATH;
         this.setNetwork(network);
@@ -73,14 +73,14 @@ class BSNeoLegacy {
         const childKey = bs_asteroid_sdk_1.keychain.generateChildKey('neo', bip44Path);
         const key = childKey.getWIF();
         const { address } = new neon_js_1.wallet.Account(key);
-        return { address, key, type: 'wif', bip44Path };
+        return { address, key, type: 'wif', bip44Path, blockchain: this.name };
     }
     generateAccountFromKey(key) {
         const type = neon_js_1.wallet.isWIF(key) ? 'wif' : neon_js_1.wallet.isPrivateKey(key) ? 'privateKey' : undefined;
         if (!type)
             throw new Error('Invalid key');
         const { address } = new neon_js_1.wallet.Account(key);
-        return { address, key, type };
+        return { address, key, type, blockchain: this.name };
     }
     decrypt(encryptedKey, password) {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo-legacy",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Coz",
@@ -11,8 +11,8 @@
   "dependencies": {
     "@cityofzion/dora-ts": "0.0.11",
     "@cityofzion/neon-js": "4.8.3",
-    "@cityofzion/blockchain-service": "1.6.0",
-    "@cityofzion/bs-asteroid-sdk": "0.9.0"
+    "@cityofzion/bs-asteroid-sdk": "0.9.0",
+    "@cityofzion/blockchain-service": "1.8.0"
   },
   "devDependencies": {
     "@types/jest": "29.5.3",