@cityofzion/bs-neo3 1.10.9 → 1.10.10

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

@@ -7,6 +7,7 @@ export declare class NeonDappKitLedgerServiceNeo3<BSName extends string = string
     emitter: LedgerServiceEmitter;
     getLedgerTransport?: GetLedgerTransport<BSName>;
     constructor(blockchainService: BSNeo3<BSName>, getLedgerTransport?: GetLedgerTransport<BSName>);
+    verifyAppName(transport: Transport): Promise<boolean>;
     getAccount(transport: Transport, index: number): Promise<Account<BSName>>;
     getAccounts(transport: Transport, untilIndexByBlockchainService?: UntilIndexRecord<BSName>): Promise<Account<BSName>[]>;
     getSigningCallback(transport: Transport, account: Account): api.SigningFunction;

package/dist/services/ledger/NeonDappKitLedgerServiceNeo3.js

@@ -35,6 +35,7 @@ var LedgerStatus;
 })(LedgerStatus || (LedgerStatus = {}));
 var LedgerCommand;
 (function (LedgerCommand) {
+    LedgerCommand[LedgerCommand["GET_APP_NAME"] = 0] = "GET_APP_NAME";
     LedgerCommand[LedgerCommand["GET_PUBLIC_KEY"] = 4] = "GET_PUBLIC_KEY";
     LedgerCommand[LedgerCommand["SIGN"] = 2] = "SIGN";
 })(LedgerCommand || (LedgerCommand = {}));
@@ -51,10 +52,29 @@ class NeonDappKitLedgerServiceNeo3 {
         __classPrivateFieldSet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, blockchainService, "f");
         this.getLedgerTransport = getLedgerTransport;
     }
+    // This verification is necessary because the NEO2 Ledger App also detects NEO3
+    verifyAppName(transport) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const response = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.GET_APP_NAME, 0x00, LedgerSecondParameter.LAST_DATA, undefined);
+                const version = response.toString('ascii');
+                const appName = version.substring(0, version.length - 2);
+                if (appName !== 'NEO N3')
+                    return false;
+                return true;
+            }
+            catch (_a) {
+                return false;
+            }
+        });
+    }
     getAccount(transport, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const bip44Path = __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, "f").bip44DerivationPath.replace('?', index.toString());
             const bip44PathHex = __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_bip44PathToHex).call(this, bip44Path);
+            const isNeoN3App = yield this.verifyAppName(transport);
+            if (!isNeoN3App)
+                throw new Error('App is not NEO N3');
             const result = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.GET_PUBLIC_KEY, 0x00, LedgerSecondParameter.LAST_DATA, bip44PathHex);
             const publicKey = result.toString('hex').substring(0, 130);
             const { address } = new neon_js_1.wallet.Account(publicKey);
@@ -79,6 +99,9 @@ class NeonDappKitLedgerServiceNeo3 {
     }
     getSigningCallback(transport, account) {
         return (transaction, { witnessIndex, network }) => __awaiter(this, void 0, void 0, function* () {
+            const isNeoN3App = yield this.verifyAppName(transport);
+            if (!isNeoN3App)
+                throw new Error('App is not NEO N3');
             try {
                 this.emitter.emit('getSignatureStart');
                 if (!account.bip44Path) {
@@ -120,7 +143,9 @@ class NeonDappKitLedgerServiceNeo3 {
 }
 exports.NeonDappKitLedgerServiceNeo3 = NeonDappKitLedgerServiceNeo3;
 _NeonDappKitLedgerServiceNeo3_blockchainService = new WeakMap(), _NeonDappKitLedgerServiceNeo3_instances = new WeakSet(), _NeonDappKitLedgerServiceNeo3_sendChunk = function _NeonDappKitLedgerServiceNeo3_sendChunk(transport, command, commandIndex, secondParameter, chunk) {
-    return transport.send(0x80, command, commandIndex, secondParameter, Buffer.from(chunk, 'hex'), [LedgerStatus.OK]);
+    return transport.send(0x80, command, commandIndex, secondParameter, chunk ? Buffer.from(chunk, 'hex') : undefined, [
+        LedgerStatus.OK,
+    ]);
 }, _NeonDappKitLedgerServiceNeo3_bip44PathToHex = function _NeonDappKitLedgerServiceNeo3_bip44PathToHex(path) {
     let result = '';
     const components = path.split('/');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.10.9",
+  "version": "1.10.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",