@alephium/ledger-app 0.1.1 → 0.1.3

package/dist/src/index.d.ts

@@ -13,6 +13,6 @@ export default class AlephiumApp {
     readonly transport: Transport;
     constructor(transport: Transport);
     getVersion(): Promise<string>;
-    getAccount(startPath: string, targetGroup?: number): Promise<Account>;
+    getAccount(startPath: string, targetGroup?: number): Promise<readonly [Account, number]>;
     signHash(path: string, hash: Buffer): Promise<string>;
 }

package/dist/src/index.js

@@ -28,7 +28,6 @@ const web3_1 = require("@alephium/web3");
 const hw_transport_1 = require("@ledgerhq/hw-transport");
 const serde = __importStar(require("./serde"));
 const elliptic_1 = require("elliptic");
-const console_1 = require("console");
 const ec = new elliptic_1.ec('secp256k1');
 exports.CLA = 0x80;
 var INS;
@@ -50,14 +49,17 @@ class AlephiumApp {
     }
     // TODO: make address display optional
     async getAccount(startPath, targetGroup) {
-        (0, console_1.assert)((targetGroup ?? 0) < exports.GROUP_NUM);
+        if ((targetGroup ?? 0) >= exports.GROUP_NUM) {
+            throw Error(`Invalid targetGroup: ${targetGroup}`);
+        }
         const p1 = targetGroup === undefined ? 0x00 : exports.GROUP_NUM;
         const p2 = targetGroup === undefined ? 0x00 : targetGroup;
         const response = await this.transport.send(exports.CLA, INS.GET_PUBLIC_KEY, p1, p2, serde.serializePath(startPath));
         const publicKey = ec.keyFromPublic(response.slice(0, 65)).getPublic(true, 'hex');
         const address = (0, web3_1.addressFromPublicKey)(publicKey);
         const group = (0, web3_1.groupOfAddress)(address);
-        return { publicKey: publicKey, address: address, group: group, keyType: 'default' };
+        const hdIndex = response.slice(65, 69).readUInt32BE(0);
+        return [{ publicKey: publicKey, address: address, group: group, keyType: 'default' }, hdIndex];
     }
     async signHash(path, hash) {
         if (hash.length !== exports.HASH_LEN) {

package/dist/test/release.test.js

@@ -15,7 +15,7 @@ describe.skip('Integration', () => {
         const transport = await hw_transport_node_hid_1.default.open('');
         (0, logs_1.listen)((log) => console.log(log));
         const app = new src_1.default(transport);
-        const account = await app.getAccount(path);
+        const [account] = await app.getAccount(path);
         console.log(`${JSON.stringify(account)}`);
         const hash = Buffer.from(blakejs_1.default.blake2b(Buffer.from([0, 1, 2, 3, 4]), undefined, 32));
         const signature = await app.signHash(path, hash);

package/dist/test/speculos.test.js

@@ -48,9 +48,11 @@ function getRandomInt(min, max) {
 }
 describe('sdk', () => {
     const apduPort = 9999;
+    let pathIndex;
     let path;
     beforeEach(() => {
-        path = `m/44'/1234'/0'/0/` + getRandomInt(0, 1000000);
+        pathIndex = getRandomInt(0, 1000000);
+        path = `m/44'/1234'/0'/0/` + pathIndex;
     });
     it('should get version', async () => {
         const transport = await hw_transport_node_speculos_1.default.open({ apduPort });
@@ -62,7 +64,8 @@ describe('sdk', () => {
     it('should get public key', async () => {
         const transport = await hw_transport_node_speculos_1.default.open({ apduPort });
         const app = new src_1.default(transport);
-        const account = await app.getAccount(path);
+        const [account, hdIndex] = await app.getAccount(path);
+        expect(hdIndex).toBe(pathIndex);
         console.log(account);
         await transport.close();
     });
@@ -70,7 +73,8 @@ describe('sdk', () => {
         const transport = await hw_transport_node_speculos_1.default.open({ apduPort });
         const app = new src_1.default(transport);
         Array(src_1.GROUP_NUM).forEach(async (_, group) => {
-            const account = await app.getAccount(path, group);
+            const [account, hdIndex] = await app.getAccount(path, group);
+            expect(hdIndex >= pathIndex).toBe(true);
             expect((0, web3_1.groupOfAddress)(account.address)).toBe(group);
         });
         await transport.close();
@@ -78,7 +82,7 @@ describe('sdk', () => {
     it('should sign hash', async () => {
         const transport = await hw_transport_node_speculos_1.default.open({ apduPort });
         const app = new src_1.default(transport);
-        const account = await app.getAccount(path);
+        const [account] = await app.getAccount(path);
         console.log(account);
         const hash = Buffer.from(blakejs_1.default.blake2b(Buffer.from([0, 1, 2, 3, 4]), undefined, 32));
         setTimeout(async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/ledger-app",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "license": "GPL",
   "types": "dist/src/index.d.ts",
   "exports": {

package/src/index.ts

@@ -2,7 +2,6 @@ import { Account, addressFromPublicKey, encodeHexSignature, groupOfAddress } fro
 import Transport, { StatusCodes } from '@ledgerhq/hw-transport'
 import * as serde from './serde'
 import { ec as EC } from 'elliptic'
-import { assert } from 'console'
 
 const ec = new EC('secp256k1')
 
@@ -30,16 +29,20 @@ export default class AlephiumApp {
   }
 
   // TODO: make address display optional
-  async getAccount(startPath: string, targetGroup?: number): Promise<Account> {
-    assert((targetGroup ?? 0) < GROUP_NUM)
+  async getAccount(startPath: string, targetGroup?: number): Promise<readonly [Account, number]> {
+    if ((targetGroup ?? 0) >= GROUP_NUM) {
+      throw Error(`Invalid targetGroup: ${targetGroup}`)
+    }
+
     const p1 = targetGroup === undefined ? 0x00 : GROUP_NUM
     const p2 = targetGroup === undefined ? 0x00 : targetGroup
     const response = await this.transport.send(CLA, INS.GET_PUBLIC_KEY, p1, p2, serde.serializePath(startPath))
     const publicKey = ec.keyFromPublic(response.slice(0, 65)).getPublic(true, 'hex')
     const address = addressFromPublicKey(publicKey)
     const group = groupOfAddress(address)
+    const hdIndex = response.slice(65, 69).readUInt32BE(0)
 
-    return { publicKey: publicKey, address: address, group: group, keyType: 'default' }
+    return [{ publicKey: publicKey, address: address, group: group, keyType: 'default' }, hdIndex] as const
   }
 
   async signHash(path: string, hash: Buffer): Promise<string> {

package/test/release.test.ts

@@ -15,7 +15,7 @@ describe.skip('Integration', () => {
     listen((log) => console.log(log))
     const app = new AlephiumApp(transport)
 
-    const account = await app.getAccount(path)
+    const [account] = await app.getAccount(path)
     console.log(`${JSON.stringify(account)}`)
 
     const hash = Buffer.from(blake.blake2b(Buffer.from([0, 1, 2, 3, 4]), undefined, 32))

package/test/speculos.test.ts

@@ -24,10 +24,12 @@ function getRandomInt(min, max) {
 
 describe('sdk', () => {
   const apduPort = 9999
+  let pathIndex: number
   let path: string
 
   beforeEach(() => {
-    path = `m/44'/1234'/0'/0/` + getRandomInt(0, 1000000)
+    pathIndex = getRandomInt(0, 1000000)
+    path = `m/44'/1234'/0'/0/` + pathIndex
   })
 
   it('should get version', async () => {
@@ -41,7 +43,8 @@ describe('sdk', () => {
   it('should get public key', async () => {
     const transport = await SpeculosTransport.open({ apduPort })
     const app = new AlephiumApp(transport)
-    const account = await app.getAccount(path)
+    const [account, hdIndex] = await app.getAccount(path)
+    expect(hdIndex).toBe(pathIndex)
     console.log(account)
     await transport.close()
   })
@@ -50,7 +53,8 @@ describe('sdk', () => {
     const transport = await SpeculosTransport.open({ apduPort })
     const app = new AlephiumApp(transport)
     Array(GROUP_NUM).forEach(async (_, group) => {
-      const account = await app.getAccount(path, group)
+      const [account, hdIndex] = await app.getAccount(path, group)
+      expect(hdIndex >= pathIndex).toBe(true)
       expect(groupOfAddress(account.address)).toBe(group)
     })
     await transport.close()
@@ -60,7 +64,7 @@ describe('sdk', () => {
     const transport = await SpeculosTransport.open({ apduPort })
     const app = new AlephiumApp(transport)
 
-    const account = await app.getAccount(path)
+    const [account] = await app.getAccount(path)
     console.log(account)
 
     const hash = Buffer.from(blake.blake2b(Buffer.from([0, 1, 2, 3, 4]), undefined, 32))