@cityofzion/blockchain-service 0.9.0 → 0.10.0

package/dist/BSAggregator.js

@@ -55,7 +55,8 @@ class BSAggregator {
             const promises = this.blockchainServices.map((service) => __awaiter(this, void 0, void 0, function* () {
                 let index = 0;
                 const accounts = [];
-                while (true) {
+                let hasError = false;
+                while (!hasError) {
                     const generatedAccount = service.generateAccountFromMnemonic(mnemonic, index);
                     if (skippedAddresses && skippedAddresses.find(address => address === generatedAccount.address)) {
                         index++;
@@ -67,10 +68,10 @@ class BSAggregator {
                                 address: generatedAccount.address,
                             });
                             if (!totalCount || totalCount <= 0)
-                                break;
+                                hasError = true;
                         }
                         catch (_a) {
-                            break;
+                            hasError = true;
                         }
                     }
                     accounts.push(generatedAccount);

package/dist/functions.d.ts

@@ -1,7 +1,8 @@
-import { BlockchainService, BSCalculableFee, BSClaimable, BSWithExplorerService, BSWithNameService, BSWithNft } from './interfaces';
+import { BlockchainService, BSCalculableFee, BSClaimable, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft } from './interfaces';
 export declare function hasNameService(service: BlockchainService): service is BlockchainService & BSWithNameService;
 export declare function isClaimable(service: BlockchainService): service is BlockchainService & BSClaimable;
 export declare function isCalculableFee(service: BlockchainService): service is BlockchainService & BSCalculableFee;
 export declare function hasNft(service: BlockchainService): service is BlockchainService & BSWithNft;
 export declare function hasExplorerService(service: BlockchainService): service is BlockchainService & BSWithExplorerService;
+export declare function hasLedger(service: BlockchainService): service is BlockchainService & BSWithLedger;
 export declare function waitForTransaction(service: BlockchainService, txId: string): Promise<boolean>;

package/dist/functions.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForTransaction = exports.hasExplorerService = exports.hasNft = exports.isCalculableFee = exports.isClaimable = exports.hasNameService = void 0;
+exports.waitForTransaction = exports.hasLedger = exports.hasExplorerService = exports.hasNft = exports.isCalculableFee = exports.isClaimable = exports.hasNameService = void 0;
 function hasNameService(service) {
     return 'resolveNameServiceDomain' in service && 'validateNameServiceDomainFormat' in service;
 }
@@ -30,6 +30,10 @@ function hasExplorerService(service) {
     return 'explorerService' in service;
 }
 exports.hasExplorerService = hasExplorerService;
+function hasLedger(service) {
+    return 'ledgerService' in service;
+}
+exports.hasLedger = hasLedger;
 function wait(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -43,7 +47,9 @@ function waitForTransaction(service, txId) {
                 yield service.blockchainDataService.getTransaction(txId);
                 return true;
             }
-            catch (_a) { }
+            catch (_a) {
+                // Empty block
+            }
             attempts++;
             yield wait(waitMs);
         } while (attempts < maxAttempts);

package/dist/interfaces.d.ts

@@ -1,7 +1,8 @@
+import Transport from '@ledgerhq/hw-transport';
 export type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 export type Account = {
     key: string;
-    type: 'wif' | 'privateKey';
+    type: 'wif' | 'privateKey' | 'publicKey';
     address: string;
 };
 export type AccountWithDerivationPath = Account & {
@@ -24,12 +25,19 @@ export type IntentTransferParam = {
     amount: string;
     tokenDecimals?: number;
 };
+export type TransferParamWithLedger = {
+    isLedger: true;
+    ledgerTransport: Transport;
+};
+export type TransferParamWithoutLedger = {
+    isLedger?: false;
+};
 export type TransferParam = {
     senderAccount: Account;
     intent: IntentTransferParam;
     tipIntent?: IntentTransferParam;
     priorityFee?: string;
-};
+} & (TransferParamWithLedger | TransferParamWithoutLedger);
 export type TokenPricesResponse = {
     price: number;
     symbol: string;
@@ -76,6 +84,10 @@ export interface BSWithExplorerService {
 export interface BSWithNft {
     nftDataService: NftDataService;
 }
+export interface BSWithLedger {
+    ledgerService: LedgerService;
+    generateAccountFromPublicKey(publicKey: string): Account;
+}
 export type TransactionNotifications = {
     eventName: string;
     state: {
@@ -148,6 +160,10 @@ export interface NftResponse {
     id: string;
     contractHash: string;
     collectionName?: string;
+    creator: {
+        address: string;
+        name?: string;
+    };
     collectionImage?: string;
     symbol: string;
     image?: string;
@@ -181,3 +197,7 @@ export interface ExplorerService {
     buildTransactionUrl(hash: string): string;
     buildNftUrl(params: BuildNftUrlParams): string;
 }
+export interface LedgerService {
+    getAddress(transport: Transport): Promise<string>;
+    getPublicKey(transport: Transport): Promise<string>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/blockchain-service",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -11,10 +11,18 @@
   ],
   "devDependencies": {
     "@types/node": "~20.2.5",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
+    "eslint": "^8.48.0",
     "ts-node": "10.9.1",
     "typescript": "4.9.5"
   },
+  "dependencies": {
+    "@ledgerhq/hw-transport": "~6.30.5"
+  },
   "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "lint": "eslint .",
+    "format": "eslint --fix"
   }
 }