@cityofzion/bs-ethereum 1.3.0 → 1.4.0

package/dist/LedgerServiceEthereum.d.ts

@@ -1,16 +1,10 @@
-import { Account, LedgerService } from '@cityofzion/blockchain-service';
+import { Account, LedgerService, LedgerServiceEmitter } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
 import { ethers, Signer } from 'ethers';
 import { TypedDataSigner } from '@ethersproject/abstract-signer';
-export declare class LedgerServiceEthereum implements LedgerService {
-    getLedgerTransport?: ((account: Account) => Promise<Transport>) | undefined;
-    constructor(getLedgerTransport?: ((account: Account) => Promise<Transport>) | undefined);
-    getAddress(transport: Transport): Promise<string>;
-    getPublicKey(transport: Transport): Promise<string>;
-}
 export declare class LedgerSigner extends Signer implements TypedDataSigner {
     #private;
-    constructor(transport: Transport, provider?: ethers.providers.Provider);
+    constructor(transport: Transport, provider?: ethers.providers.Provider, emitter?: LedgerServiceEmitter);
     connect(provider: ethers.providers.Provider): LedgerSigner;
     getAddress(): Promise<string>;
     getPublicKey(): Promise<string>;
@@ -18,3 +12,11 @@ export declare class LedgerSigner extends Signer implements TypedDataSigner {
     signTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): Promise<string>;
     _signTypedData(domain: ethers.TypedDataDomain, types: Record<string, ethers.TypedDataField[]>, value: Record<string, any>): Promise<string>;
 }
+export declare class LedgerServiceEthereum implements LedgerService {
+    getLedgerTransport?: ((account: Account) => Promise<Transport>) | undefined;
+    emitter: LedgerServiceEmitter;
+    constructor(getLedgerTransport?: ((account: Account) => Promise<Transport>) | undefined);
+    getAddress(transport: Transport): Promise<string>;
+    getPublicKey(transport: Transport): Promise<string>;
+    getSigner(transport: Transport): LedgerSigner;
+}

package/dist/LedgerServiceEthereum.js

@@ -42,44 +42,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 _LedgerSigner_instances, _LedgerSigner_transport, _LedgerSigner_path, _LedgerSigner_retry;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _LedgerSigner_instances, _LedgerSigner_transport, _LedgerSigner_emitter, _LedgerSigner_path, _LedgerSigner_retry;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LedgerSigner = exports.LedgerServiceEthereum = void 0;
+exports.LedgerServiceEthereum = exports.LedgerSigner = void 0;
 const hw_app_eth_1 = __importStar(require("@ledgerhq/hw-app-eth"));
 const ethers_1 = require("ethers");
 const properties_1 = require("@ethersproject/properties");
 const constants_1 = require("./constants");
-class LedgerServiceEthereum {
-    constructor(getLedgerTransport) {
-        this.getLedgerTransport = getLedgerTransport;
-    }
-    getAddress(transport) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const signer = new LedgerSigner(transport);
-            return yield signer.getAddress();
-        });
-    }
-    getPublicKey(transport) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const signer = new LedgerSigner(transport);
-            return yield signer.getPublicKey();
-        });
-    }
-}
-exports.LedgerServiceEthereum = LedgerServiceEthereum;
-function wait(duration) {
-    return new Promise(resolve => {
-        setTimeout(resolve, duration);
-    });
-}
+const events_1 = __importDefault(require("events"));
 class LedgerSigner extends ethers_1.Signer {
-    constructor(transport, provider) {
+    constructor(transport, provider, emitter) {
         super();
         _LedgerSigner_instances.add(this);
         _LedgerSigner_transport.set(this, void 0);
+        _LedgerSigner_emitter.set(this, void 0);
         _LedgerSigner_path.set(this, void 0);
         __classPrivateFieldSet(this, _LedgerSigner_path, constants_1.DEFAULT_PATH, "f");
         __classPrivateFieldSet(this, _LedgerSigner_transport, transport, "f");
+        __classPrivateFieldSet(this, _LedgerSigner_emitter, emitter, "f");
         (0, properties_1.defineReadOnly)(this, 'provider', provider);
     }
     connect(provider) {
@@ -100,12 +83,15 @@ class LedgerSigner extends ethers_1.Signer {
         });
     }
     signMessage(message) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (typeof message === 'string') {
                 message = ethers_1.ethers.utils.toUtf8Bytes(message);
             }
             const ledgerApp = new hw_app_eth_1.default(__classPrivateFieldGet(this, _LedgerSigner_transport, "f"));
+            (_a = __classPrivateFieldGet(this, _LedgerSigner_emitter, "f")) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
             const obj = yield __classPrivateFieldGet(this, _LedgerSigner_instances, "m", _LedgerSigner_retry).call(this, () => ledgerApp.signPersonalMessage(__classPrivateFieldGet(this, _LedgerSigner_path, "f"), ethers_1.ethers.utils.hexlify(message).substring(2)));
+            (_b = __classPrivateFieldGet(this, _LedgerSigner_emitter, "f")) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
             // Normalize the signature for Ethers
             obj.r = '0x' + obj.r;
             obj.s = '0x' + obj.s;
@@ -113,13 +99,16 @@ class LedgerSigner extends ethers_1.Signer {
         });
     }
     signTransaction(transaction) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const ledgerApp = new hw_app_eth_1.default(__classPrivateFieldGet(this, _LedgerSigner_transport, "f"));
             const tx = yield ethers_1.ethers.utils.resolveProperties(transaction);
             const unsignedTransaction = Object.assign(Object.assign({}, tx), { nonce: tx.nonce ? ethers_1.ethers.BigNumber.from(transaction.nonce).toNumber() : undefined });
             const serializedUnsignedTransaction = ethers_1.ethers.utils.serializeTransaction(unsignedTransaction).substring(2);
             const resolution = yield hw_app_eth_1.ledgerService.resolveTransaction(serializedUnsignedTransaction, {}, {});
+            (_a = __classPrivateFieldGet(this, _LedgerSigner_emitter, "f")) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
             const signature = yield __classPrivateFieldGet(this, _LedgerSigner_instances, "m", _LedgerSigner_retry).call(this, () => ledgerApp.signTransaction(__classPrivateFieldGet(this, _LedgerSigner_path, "f"), serializedUnsignedTransaction, resolution));
+            (_b = __classPrivateFieldGet(this, _LedgerSigner_emitter, "f")) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
             return ethers_1.ethers.utils.serializeTransaction(unsignedTransaction, {
                 v: ethers_1.ethers.BigNumber.from('0x' + signature.v).toNumber(),
                 r: '0x' + signature.r,
@@ -128,6 +117,7 @@ class LedgerSigner extends ethers_1.Signer {
         });
     }
     _signTypedData(domain, types, value) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const populated = yield ethers_1.ethers.utils._TypedDataEncoder.resolveNames(domain, types, value, (name) => __awaiter(this, void 0, void 0, function* () {
                 if (!this.provider)
@@ -139,7 +129,9 @@ class LedgerSigner extends ethers_1.Signer {
             }));
             const payload = ethers_1.ethers.utils._TypedDataEncoder.getPayload(populated.domain, types, populated.value);
             const ledgerApp = new hw_app_eth_1.default(__classPrivateFieldGet(this, _LedgerSigner_transport, "f"));
+            (_a = __classPrivateFieldGet(this, _LedgerSigner_emitter, "f")) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
             const obj = yield __classPrivateFieldGet(this, _LedgerSigner_instances, "m", _LedgerSigner_retry).call(this, () => ledgerApp.signEIP712Message(__classPrivateFieldGet(this, _LedgerSigner_path, "f"), payload));
+            (_b = __classPrivateFieldGet(this, _LedgerSigner_emitter, "f")) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
             // Normalize the signature for Ethers
             obj.r = '0x' + obj.r;
             obj.s = '0x' + obj.s;
@@ -148,7 +140,7 @@ class LedgerSigner extends ethers_1.Signer {
     }
 }
 exports.LedgerSigner = LedgerSigner;
-_LedgerSigner_transport = new WeakMap(), _LedgerSigner_path = new WeakMap(), _LedgerSigner_instances = new WeakSet(), _LedgerSigner_retry = function _LedgerSigner_retry(callback) {
+_LedgerSigner_transport = new WeakMap(), _LedgerSigner_emitter = new WeakMap(), _LedgerSigner_path = new WeakMap(), _LedgerSigner_instances = new WeakSet(), _LedgerSigner_retry = function _LedgerSigner_retry(callback) {
     // eslint-disable-next-line no-async-promise-executor
     return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
         // Wait up to 5 seconds
@@ -167,3 +159,30 @@ _LedgerSigner_transport = new WeakMap(), _LedgerSigner_path = new WeakMap(), _Le
         return reject(new Error('timeout'));
     }));
 };
+class LedgerServiceEthereum {
+    constructor(getLedgerTransport) {
+        this.getLedgerTransport = getLedgerTransport;
+        this.emitter = new events_1.default();
+    }
+    getAddress(transport) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const signer = new LedgerSigner(transport);
+            return yield signer.getAddress();
+        });
+    }
+    getPublicKey(transport) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const signer = new LedgerSigner(transport);
+            return yield signer.getPublicKey();
+        });
+    }
+    getSigner(transport) {
+        return new LedgerSigner(transport, undefined, this.emitter);
+    }
+}
+exports.LedgerServiceEthereum = LedgerServiceEthereum;
+function wait(duration) {
+    return new Promise(resolve => {
+        setTimeout(resolve, duration);
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -23,7 +23,7 @@
     "@ledgerhq/hw-app-eth": "~6.35.7",
     "@ethersproject/abstract-signer": "~5.7.0",
     "@ethersproject/properties": "~5.7.0",
-    "@cityofzion/blockchain-service": "0.11.2"
+    "@cityofzion/blockchain-service": "0.12.0"
   },
   "devDependencies": {
     "@types/jest": "29.5.3",