@alephium/ledger-app 0.6.0 → 0.6.1-rc.0

package/dist/src/ledger-app.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-import { Account, KeyType } from '@alephium/web3';
+import { GroupedAccount, KeyType } from '@alephium/web3';
 import Transport from '@ledgerhq/hw-transport';
 export declare const CLA = 128;
 export declare enum INS {
@@ -15,7 +14,7 @@ export declare class AlephiumApp {
     constructor(transport: Transport);
     close(): Promise<void>;
     getVersion(): Promise<string>;
-    getAccount(startPath: string, targetGroup?: number, keyType?: KeyType, display?: boolean): Promise<readonly [Account, number]>;
+    getAccount(startPath: string, targetGroup?: number, keyType?: KeyType, display?: boolean): Promise<readonly [GroupedAccount, number]>;
     signHash(path: string, hash: Buffer): Promise<string>;
     signUnsignedTx(path: string, unsignedTx: Buffer): Promise<string>;
 }

package/dist/src/ledger-app.js

@@ -15,23 +15,31 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlephiumApp = exports.HASH_LEN = exports.GROUP_NUM = exports.INS = exports.CLA = void 0;
 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 types_1 = require("./types");
 const tx_encoder_1 = require("./tx-encoder");
 const merkle_1 = require("./merkle");
-const ec = new elliptic_1.ec('secp256k1');
 exports.CLA = 0x80;
 var INS;
 (function (INS) {
@@ -39,7 +47,7 @@ var INS;
     INS[INS["GET_PUBLIC_KEY"] = 1] = "GET_PUBLIC_KEY";
     INS[INS["SIGN_HASH"] = 2] = "SIGN_HASH";
     INS[INS["SIGN_TX"] = 3] = "SIGN_TX";
-})(INS = exports.INS || (exports.INS = {}));
+})(INS || (exports.INS = INS = {}));
 exports.GROUP_NUM = 4;
 exports.HASH_LEN = 32;
 class AlephiumApp {
@@ -58,18 +66,20 @@ class AlephiumApp {
         if ((targetGroup ?? 0) >= exports.GROUP_NUM) {
             throw Error(`Invalid targetGroup: ${targetGroup}`);
         }
-        if (keyType === 'bip340-schnorr') {
-            throw Error('BIP340-Schnorr is not supported yet');
+        if (keyType !== undefined && keyType !== 'default') {
+            throw Error(`Unsupported key type: ${keyType}`);
         }
         const p1 = targetGroup === undefined ? 0x00 : exports.GROUP_NUM;
         const p2 = targetGroup === undefined ? 0x00 : targetGroup;
         const payload = Buffer.concat([serde.serializePath(startPath), Buffer.from([display ? 1 : 0])]);
         const response = await this.transport.send(exports.CLA, INS.GET_PUBLIC_KEY, p1, p2, payload);
-        const publicKey = ec.keyFromPublic(response.slice(0, 65)).getPublic(true, 'hex');
+        const prefix = (response[64] & 1) === 1 ? '03' : '02';
+        const publicKey = prefix + response.slice(1, 33).toString('hex');
         const address = (0, web3_1.addressFromPublicKey)(publicKey);
         const group = (0, web3_1.groupOfAddress)(address);
         const hdIndex = response.slice(65, 69).readUInt32BE(0);
-        return [{ publicKey: publicKey, address: address, group: group, keyType: keyType ?? 'default' }, hdIndex];
+        const resolvedKeyType = 'default';
+        return [{ publicKey, address, group, keyType: resolvedKeyType }, hdIndex];
     }
     async signHash(path, hash) {
         if (hash.length !== exports.HASH_LEN) {

package/dist/src/merkle.d.ts

@@ -5,5 +5,5 @@ export declare function generateProofs(): {
     proofs: Record<string, string>;
     root: string;
 };
-export declare const tokenMerkleRoot: Uint8Array;
+export declare const tokenMerkleRoot: Uint8Array<ArrayBufferLike>;
 export declare const tokenMerkleProofs: Record<string, string>;

package/dist/src/merkle.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tokenMerkleProofs = exports.tokenMerkleRoot = exports.generateProofs = exports.hashPair = exports.merkleTokens = void 0;
+exports.tokenMerkleProofs = exports.tokenMerkleRoot = exports.merkleTokens = void 0;
+exports.hashPair = hashPair;
+exports.generateProofs = generateProofs;
 const web3_1 = require("@alephium/web3");
 const token_json_1 = __importDefault(require("../merkle-tree/token.json"));
 const proofs_json_1 = __importDefault(require("../merkle-tree/proofs.json"));
@@ -20,7 +22,6 @@ exports.merkleTokens = token_json_1.default.tokens.map((token) => {
 function hashPair(a, b) {
     return (0, blakejs_1.blake2b)(Buffer.concat([a, b].sort(Buffer.compare)), undefined, 32);
 }
-exports.hashPair = hashPair;
 function generateMerkleTree(tokens) {
     let level = tokens.map((token) => (0, blakejs_1.blake2b)((0, serde_1.serializeSingleTokenMetadata)(token), undefined, 32));
     const tree = [];
@@ -54,6 +55,5 @@ function generateProofs() {
     console.log('root', tree[tree.length - 1].map((hash) => (0, web3_1.binToHex)(hash)).join(''));
     return { proofs, root: (0, web3_1.binToHex)(tree[tree.length - 1][0]) };
 }
-exports.generateProofs = generateProofs;
 exports.tokenMerkleRoot = (0, web3_1.hexToBinUnsafe)('b3380866c595544781e9da0ccd79399de8878abfb0bf40545b57a287387d419d');
 exports.tokenMerkleProofs = proofs_json_1.default;

package/dist/src/serde.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { TokenMetadata } from './types';
 export declare const TRUE = 16;
 export declare const FALSE = 0;

package/dist/src/serde.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeTokenMetadata = exports.serializeSingleTokenMetadata = exports.checkTokenMetadata = exports.serializePath = exports.splitPath = exports.FALSE = exports.TRUE = void 0;
+exports.FALSE = exports.TRUE = void 0;
+exports.splitPath = splitPath;
+exports.serializePath = serializePath;
+exports.checkTokenMetadata = checkTokenMetadata;
+exports.serializeSingleTokenMetadata = serializeSingleTokenMetadata;
+exports.serializeTokenMetadata = serializeTokenMetadata;
 const web3_1 = require("@alephium/web3");
 const types_1 = require("./types");
 exports.TRUE = 0x10;
@@ -21,7 +26,6 @@ function splitPath(path) {
     });
     return result;
 }
-exports.splitPath = splitPath;
 function serializePath(path) {
     const nodes = splitPath(path);
     if (nodes.length != 5) {
@@ -31,7 +35,6 @@ function serializePath(path) {
     nodes.forEach((element, index) => buffer.writeUInt32BE(element, 4 * index));
     return buffer;
 }
-exports.serializePath = serializePath;
 function symbolToBytes(symbol) {
     const buffer = Buffer.alloc(types_1.MAX_TOKEN_SYMBOL_LENGTH, 0);
     for (let i = 0; i < symbol.length; i++) {
@@ -56,7 +59,6 @@ function checkTokenMetadata(tokens) {
         throw new Error(`The token size exceeds maximum size`);
     }
 }
-exports.checkTokenMetadata = checkTokenMetadata;
 function serializeSingleTokenMetadata(metadata) {
     const symbolBytes = symbolToBytes(metadata.symbol);
     const buffer = Buffer.concat([
@@ -70,10 +72,8 @@ function serializeSingleTokenMetadata(metadata) {
     }
     return buffer;
 }
-exports.serializeSingleTokenMetadata = serializeSingleTokenMetadata;
 function serializeTokenMetadata(tokens) {
     checkTokenMetadata(tokens);
     const array = tokens.map((metadata) => serializeSingleTokenMetadata(metadata));
     return Buffer.concat([Buffer.from([array.length]), ...array]);
 }
-exports.serializeTokenMetadata = serializeTokenMetadata;

package/dist/src/tx-encoder.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { TokenMetadata } from "./types";
 export interface Frame {
     p1: number;

package/dist/src/tx-encoder.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = exports.encodeUnsignedTx = exports.encodeProofLength = exports.encodeTokenMetadata = void 0;
+exports.encodeTokenMetadata = encodeTokenMetadata;
+exports.encodeProofLength = encodeProofLength;
+exports.encodeUnsignedTx = encodeUnsignedTx;
+exports.assert = assert;
 const merkle_1 = require("./merkle");
 const serde_1 = require("./serde");
 const types_1 = require("./types");
@@ -25,7 +28,6 @@ function encodeTokenMetadata(tokenMetadata) {
         return frames;
     }
 }
-exports.encodeTokenMetadata = encodeTokenMetadata;
 function encodeTokenAndProof(tokenMetadata, firstFramePrefix) {
     const proof = merkle_1.tokenMerkleProofs[tokenMetadata.tokenId];
     if (proof === undefined)
@@ -56,7 +58,6 @@ function encodeProofLength(length) {
     buffer.writeUint16BE(length);
     return buffer;
 }
-exports.encodeProofLength = encodeProofLength;
 function encodeUnsignedTx(path, unsignedTx) {
     const encodedPath = (0, serde_1.serializePath)(path);
     const firstFrameTxLength = types_1.MAX_PAYLOAD_SIZE - 20;
@@ -74,9 +75,7 @@ function encodeUnsignedTx(path, unsignedTx) {
     }
     return frames;
 }
-exports.encodeUnsignedTx = encodeUnsignedTx;
 function assert(condition, msg) {
     if (!condition)
         throw Error(msg);
 }
-exports.assert = assert;

package/dist/test/merkle.test.js

@@ -3,7 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const merkle_1 = require("../src/merkle");
 const serde_1 = require("../src/serde");
 const blakejs_1 = require("blakejs");
+const web3_1 = require("@alephium/web3");
 describe('Merkle', () => {
+    it('should generate the correct proofs', () => {
+        const { proofs, root } = (0, merkle_1.generateProofs)();
+        expect(JSON.stringify(proofs)).toBe(JSON.stringify(merkle_1.tokenMerkleProofs));
+        expect(root).toBe((0, web3_1.binToHex)(merkle_1.tokenMerkleRoot));
+    });
     it('should verify proofs', () => {
         for (const token of merkle_1.merkleTokens) {
             const proof = merkle_1.tokenMerkleProofs[token.tokenId];

package/dist/test/utils.d.ts

@@ -12,8 +12,10 @@ export declare function staxFlexApproveOnce(): Promise<void>;
 export declare function approveTx(outputs: OutputType[], hasExternalInputs?: boolean): Promise<void>;
 export declare function approveHash(): Promise<void>;
 export declare function approveAddress(): Promise<void>;
+export declare function isStaxOrFlex(): boolean;
 export declare function isNanos(): boolean;
-export declare function skipBlindSigningWarning(): void;
+export declare function skipBlindSigningWarning(): Promise<void>;
+export declare function staxFlexAcceptRisk(): Promise<void>;
 export declare function enableBlindSigning(): Promise<void>;
 export declare function getRandomInt(min: number, max: number): number;
 export declare function needToAutoApprove(): boolean;

package/dist/test/utils.js

@@ -3,14 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTransport = exports.needToAutoApprove = exports.getRandomInt = exports.enableBlindSigning = exports.skipBlindSigningWarning = exports.isNanos = exports.approveAddress = exports.approveHash = exports.approveTx = exports.staxFlexApproveOnce = exports.OutputType = void 0;
+exports.OutputType = void 0;
+exports.staxFlexApproveOnce = staxFlexApproveOnce;
+exports.approveTx = approveTx;
+exports.approveHash = approveHash;
+exports.approveAddress = approveAddress;
+exports.isStaxOrFlex = isStaxOrFlex;
+exports.isNanos = isNanos;
+exports.skipBlindSigningWarning = skipBlindSigningWarning;
+exports.staxFlexAcceptRisk = staxFlexAcceptRisk;
+exports.enableBlindSigning = enableBlindSigning;
+exports.getRandomInt = getRandomInt;
+exports.needToAutoApprove = needToAutoApprove;
+exports.createTransport = createTransport;
 const hw_transport_node_speculos_1 = __importDefault(require("@ledgerhq/hw-transport-node-speculos"));
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const web3_1 = require("@alephium/web3");
 const hw_transport_node_hid_1 = __importDefault(require("@ledgerhq/hw-transport-node-hid"));
 async function pressButton(button) {
     await (0, web3_1.sleep)(1000);
-    return (0, node_fetch_1.default)(`http://localhost:25000/button/${button}`, {
+    return fetch(`http://localhost:25000/button/${button}`, {
         method: 'POST',
         body: JSON.stringify({ action: 'press-and-release' })
     });
@@ -34,7 +45,7 @@ var OutputType;
     OutputType[OutputType["Token"] = 4] = "Token";
     OutputType[OutputType["BaseAndToken"] = 5] = "BaseAndToken";
     OutputType[OutputType["MultisigAndToken"] = 6] = "MultisigAndToken";
-})(OutputType = exports.OutputType || (exports.OutputType = {}));
+})(OutputType || (exports.OutputType = OutputType = {}));
 const NanosClickTable = new Map([
     [OutputType.Base, 5],
     [OutputType.Multisig, 10],
@@ -52,11 +63,18 @@ const NanospClickTable = new Map([
     [OutputType.MultisigAndToken, 8],
 ]);
 const StaxClickTable = new Map([
-    [OutputType.Base, 2],
-    [OutputType.Multisig, 3],
-    [OutputType.Token, 3],
-    [OutputType.BaseAndToken, 3],
-    [OutputType.MultisigAndToken, 4],
+    [OutputType.Base, 1],
+    [OutputType.Multisig, 2],
+    [OutputType.Token, 2],
+    [OutputType.BaseAndToken, 2],
+    [OutputType.MultisigAndToken, 2],
+]);
+const FlexClickTable = new Map([
+    [OutputType.Base, 1],
+    [OutputType.Multisig, 2],
+    [OutputType.Token, 2],
+    [OutputType.BaseAndToken, 2],
+    [OutputType.MultisigAndToken, 3],
 ]);
 function getOutputClickSize(outputType) {
     const model = getModel();
@@ -64,8 +82,8 @@ function getOutputClickSize(outputType) {
         case 'nanos': return NanosClickTable.get(outputType);
         case 'nanosp':
         case 'nanox': return NanospClickTable.get(outputType);
-        case 'stax':
-        case 'flex': return StaxClickTable.get(outputType);
+        case 'stax': return StaxClickTable.get(outputType);
+        case 'flex': return FlexClickTable.get(outputType);
         default: throw new Error(`Unknown model ${model}`);
     }
 }
@@ -81,29 +99,40 @@ async function click(outputs, hasExternalInputs) {
 }
 const STAX_CONTINUE_POSITION = { x: 342, y: 606 };
 const STAX_APPROVE_POSITION = { x: 200, y: 515 };
-const STAX_REJECT_POSITION = { x: 36, y: 606 };
 const STAX_SETTINGS_POSITION = { x: 342, y: 55 };
 const STAX_BLIND_SETTING_POSITION = { x: 342, y: 90 };
+const STAX_GO_TO_SETTINGS = { x: 36, y: 606 };
+const STAX_ACCEPT_RISK_POSITION = { x: 36, y: 606 };
 const FLEX_CONTINUE_POSITION = { x: 430, y: 550 };
 const FLEX_APPROVE_POSITION = { x: 240, y: 435 };
-const FLEX_REJECT_POSITION = { x: 55, y: 530 };
 const FLEX_SETTINGS_POSITION = { x: 405, y: 75 };
 const FLEX_BLIND_SETTING_POSITION = { x: 405, y: 96 };
+const FLEX_GO_TO_SETTINGS = { x: 55, y: 530 };
+const FLEX_ACCEPT_RISK_POSITION = { x: 55, y: 530 };
 async function touchPosition(pos) {
     await (0, web3_1.sleep)(1000);
-    return (0, node_fetch_1.default)(`http://localhost:25000/finger`, {
+    return fetch(`http://localhost:25000/finger`, {
         method: 'POST',
         body: JSON.stringify({ action: 'press-and-release', x: pos.x, y: pos.y })
     });
 }
-async function _touch(times) {
+async function longPress(pos) {
+    await (0, web3_1.sleep)(1000);
+    return fetch(`http://localhost:25000/finger`, {
+        method: 'POST',
+        body: JSON.stringify({ action: 'press-and-release', x: pos.x, y: pos.y, delay: 3 })
+    });
+}
+async function _touch(times, approve = false) {
     const model = getModel();
     const continuePos = model === 'stax' ? STAX_CONTINUE_POSITION : FLEX_CONTINUE_POSITION;
     for (let i = 0; i < times; i += 1) {
         await touchPosition(continuePos);
     }
-    const approvePos = model === 'stax' ? STAX_APPROVE_POSITION : FLEX_APPROVE_POSITION;
-    await touchPosition(approvePos);
+    if (approve) {
+        const approvePos = model === 'stax' ? STAX_APPROVE_POSITION : FLEX_APPROVE_POSITION;
+        await longPress(approvePos);
+    }
 }
 async function staxFlexApproveOnce() {
     if (getModel() === 'stax') {
@@ -113,16 +142,17 @@ async function staxFlexApproveOnce() {
         await touchPosition(FLEX_APPROVE_POSITION);
     }
 }
-exports.staxFlexApproveOnce = staxFlexApproveOnce;
 async function touch(outputs, hasExternalInputs) {
-    await (0, web3_1.sleep)(1000);
+    await (0, web3_1.sleep)(3000);
     if (hasExternalInputs) {
         await staxFlexApproveOnce();
     }
+    _touch(1); // the first review page
+    await (0, web3_1.sleep)(1000);
     for (let index = 0; index < outputs.length; index += 1) {
         await _touch(getOutputClickSize(outputs[index]));
     }
-    await _touch(2); // fees
+    await _touch(1, true); // fees
 }
 async function approveTx(outputs, hasExternalInputs = false) {
     if (!needToAutoApprove())
@@ -131,7 +161,7 @@ async function approveTx(outputs, hasExternalInputs = false) {
     const isSelfTransfer = outputs.length === 0 && !hasExternalInputs;
     if (isSelfTransfer) {
         if (isStaxOrFlex()) {
-            await _touch(2);
+            await _touch(2, true);
         }
         else {
             await clickAndApprove(2);
@@ -145,12 +175,11 @@ async function approveTx(outputs, hasExternalInputs = false) {
         await click(outputs, hasExternalInputs);
     }
 }
-exports.approveTx = approveTx;
 async function approveHash() {
     if (!needToAutoApprove())
         return;
     if (isStaxOrFlex()) {
-        return await _touch(3);
+        return await _touch(2, true);
     }
     if (getModel() === 'nanos') {
         await clickAndApprove(5);
@@ -159,12 +188,13 @@ async function approveHash() {
         await clickAndApprove(3);
     }
 }
-exports.approveHash = approveHash;
 async function approveAddress() {
     if (!needToAutoApprove())
         return;
     if (isStaxOrFlex()) {
-        return await _touch(2);
+        await _touch(1);
+        await staxFlexApproveOnce();
+        return;
     }
     if (getModel() === 'nanos') {
         await clickAndApprove(4);
@@ -173,26 +203,35 @@ async function approveAddress() {
         await clickAndApprove(2);
     }
 }
-exports.approveAddress = approveAddress;
 function isStaxOrFlex() {
     return !getModel().startsWith('nano');
 }
 function isNanos() {
     return getModel() === 'nanos';
 }
-exports.isNanos = isNanos;
-function skipBlindSigningWarning() {
+async function skipBlindSigningWarning() {
     if (!needToAutoApprove())
         return;
     if (isStaxOrFlex()) {
-        const rejectPos = getModel() === 'stax' ? STAX_REJECT_POSITION : FLEX_REJECT_POSITION;
-        touchPosition(rejectPos);
+        await (0, web3_1.sleep)(3000);
+        const goToSettings = getModel() === 'stax' ? STAX_GO_TO_SETTINGS : FLEX_GO_TO_SETTINGS;
+        await touchPosition(goToSettings);
     }
     else {
-        clickAndApprove(3);
+        await clickAndApprove(3);
+    }
+}
+async function staxFlexAcceptRisk() {
+    if (!needToAutoApprove())
+        return;
+    await (0, web3_1.sleep)(3000);
+    if (getModel() === 'stax') {
+        await touchPosition(STAX_ACCEPT_RISK_POSITION);
+    }
+    else {
+        await touchPosition(FLEX_ACCEPT_RISK_POSITION);
     }
 }
-exports.skipBlindSigningWarning = skipBlindSigningWarning;
 async function enableBlindSigning() {
     if (!needToAutoApprove())
         return;
@@ -208,13 +247,11 @@ async function enableBlindSigning() {
         await clickAndApprove(2);
     }
 }
-exports.enableBlindSigning = enableBlindSigning;
 function getRandomInt(min, max) {
     min = Math.ceil(min);
     max = Math.floor(max);
     return Math.floor(Math.random() * (max - min) + min); // The maximum is exclusive and the minimum is inclusive
 }
-exports.getRandomInt = getRandomInt;
 function needToAutoApprove() {
     switch (process.env.BACKEND) {
         case "speculos": return true;
@@ -222,7 +259,6 @@ function needToAutoApprove() {
         default: throw new Error(`Invalid backend: ${process.env.BACKEND}`);
     }
 }
-exports.needToAutoApprove = needToAutoApprove;
 const ApduPort = 9999;
 async function createTransport() {
     switch (process.env.BACKEND) {
@@ -231,4 +267,3 @@ async function createTransport() {
         default: throw new Error(`Invalid backend: ${process.env.BACKEND}`);
     }
 }
-exports.createTransport = createTransport;

package/dist/test/wallet.test.js

@@ -209,32 +209,6 @@ describe('ledger wallet', () => {
         expect(token.amount).toEqual('1111111111111111111111111');
         await app.close();
     }, 120000);
-    async function genTokensAndDestinations(fromAddress, toAddress, mintAmount, transferAmount) {
-        const tokens = [];
-        const tokenSymbol = 'TestTokenABC';
-        const destinations = [];
-        for (let i = 0; i < 5; i += 1) {
-            const tokenInfo = await (0, web3_test_1.mintToken)(fromAddress, mintAmount);
-            const tokenMetadata = {
-                version: 0,
-                tokenId: tokenInfo.contractId,
-                symbol: tokenSymbol.slice(0, tokenSymbol.length - i),
-                decimals: 18 - i
-            };
-            tokens.push(tokenMetadata);
-            destinations.push({
-                address: toAddress,
-                attoAlphAmount: web3_1.DUST_AMOUNT.toString(),
-                tokens: [
-                    {
-                        id: tokenMetadata.tokenId,
-                        amount: transferAmount.toString()
-                    }
-                ]
-            });
-        }
-        return { tokens, destinations };
-    }
     it('should transfer tokens with proof', async () => {
         const transport = await (0, utils_1.createTransport)();
         const app = new ledger_app_1.AlephiumApp(transport);
@@ -242,10 +216,10 @@ describe('ledger wallet', () => {
         await transferToAddress(testAccount.address);
         const newAccount = await (0, web3_test_1.getSigner)();
         const selectedTokens = [
-            merkle_1.merkleTokens[5],
-            merkle_1.merkleTokens[6],
-            merkle_1.merkleTokens[8],
-            merkle_1.merkleTokens[11],
+            merkle_1.merkleTokens[5], // decimals is 0
+            merkle_1.merkleTokens[6], // decimals is 18
+            merkle_1.merkleTokens[8], // decimals is 9
+            merkle_1.merkleTokens[11], // decimals is 8
             merkle_1.merkleTokens[13], // decimals is 6
         ];
         const outputs = selectedTokens.map((token, index) => {
@@ -479,7 +453,12 @@ describe('ledger wallet', () => {
         await expect(app.signUnsignedTx(path, Buffer.from(buildTxResult.unsignedTx, 'hex'))).rejects.toThrow();
         await (0, utils_1.enableBlindSigning)();
         if ((0, utils_1.needToAutoApprove)()) {
-            (0, utils_1.staxFlexApproveOnce)().then(() => (0, utils_1.approveTx)([]));
+            if ((0, utils_1.isStaxOrFlex)()) {
+                (0, utils_1.staxFlexAcceptRisk)().then(() => (0, utils_1.approveTx)([]));
+            }
+            else {
+                (0, utils_1.approveTx)([]);
+            }
         }
         else {
             // waiting for blind signing setting to be enabled

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/index.ts","../src/ledger-app.ts","../src/merkle.ts","../src/serde.test.ts","../src/serde.ts","../src/tx-encoder.ts","../src/types.ts","../test/merkle.test.ts","../test/tx-encoder.test.ts","../test/utils.ts","../test/wallet.test.ts"],"version":"5.8.3"}

package/eslint.config.js

@@ -0,0 +1,17 @@
+const tseslint = require('typescript-eslint')
+const eslintConfigPrettier = require('eslint-config-prettier')
+
+module.exports = tseslint.config(
+  {
+    ignores: ['**/dist/', '**/templates/', '**/coverage/', 'eslint.config.js']
+  },
+  ...tseslint.configs.recommended,
+  eslintConfigPrettier,
+  {
+    languageOptions: {
+      parserOptions: {
+        project: 'tsconfig.json'
+      }
+    }
+  }
+)

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "@alephium/ledger-app",
-  "version": "0.6.0",
+  "version": "0.6.1-rc.0",
   "license": "GPL",
+  "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
+  "repository": {
+    "url": "https://github.com/alephium/ledger-alephium"
+  },
   "exports": {
     ".": "./dist/src/index.js"
   },
   "scripts": {
-    "build": "npm run clean:windows && npm run clean:unix && npx --yes tsc --build .",
-    "clean:unix": "node -e \"if (process.platform !== 'win32') process.exit(1)\" || rm -rf dist",
-    "clean:windows": "node -e \"if (process.platform === 'win32') process.exit(1)\" || , if exist dist rmdir /Q /S dist",
-    "lint": "eslint . --ext ts",
-    "lint:fix": "eslint . --fix --ext ts",
+    "build": "rm -rf dist && tsc --build .",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "test": "BACKEND=speculos jest -i --config ./jest-config.json",
     "speculos-test": "BACKEND=speculos jest -i --config ./jest-config.json",
-    "device-test": "BACKEND=device jest -i --config ./jest-config.json",
-    "pub": "npm run build && npm publish --access public"
+    "device-test": "BACKEND=device jest -i --config ./jest-config.json"
   },
   "prettier": {
     "printWidth": 120,
@@ -27,32 +28,27 @@
     "trailingComma": "none"
   },
   "dependencies": {
-    "@alephium/web3": "^1.5.0",
-    "@ledgerhq/hw-transport": "6.31.0",
+    "@alephium/web3": "3.0.0-test.9",
+    "@ledgerhq/hw-transport": "6.34.1",
     "blakejs": "^1.2.1"
   },
   "devDependencies": {
-    "@alephium/cli": "^1.5.0",
-    "@alephium/web3-test": "^1.5.0",
-    "@alephium/web3-wallet": "^1.5.0",
-    "@ledgerhq/hw-transport-node-hid": "6.29.1",
-    "@ledgerhq/hw-transport-node-speculos": "6.29.0",
-    "@types/elliptic": "^6.4.13",
-    "@types/jest": "^27.5.1",
+    "@alephium/cli": "3.0.0-test.9",
+    "@alephium/web3-test": "3.0.0-test.9",
+    "@alephium/web3-wallet": "3.0.0-test.9",
+    "@ledgerhq/hw-transport-node-hid": "6.32.1",
+    "@ledgerhq/hw-transport-node-speculos": "6.33.1",
+    "@types/jest": "^29.5.0",
     "@types/node": "^20.8.10",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^28.1.0",
-    "node-fetch": "^2.6.7",
-    "ts-jest": "^28.0.2",
+    "eslint": "^9.0.0",
+    "eslint-config-prettier": "^10.0.0",
+    "typescript-eslint": "^8.0.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.7.0",
-    "typescript": "^4.4.2"
+    "typescript": "~5.8.0"
   },
   "engines": {
-    "node": ">=14.0.0",
-    "npm": ">=7.0.0"
+    "node": ">=18.0.0"
   }
 }

package/src/ledger-app.ts

@@ -1,13 +1,10 @@
-import { Account, KeyType, addressFromPublicKey, binToHex, codec, encodeHexSignature, groupOfAddress } from '@alephium/web3'
+import { GroupedAccount, GroupedKeyType, KeyType, addressFromPublicKey, binToHex, codec, encodeHexSignature, groupOfAddress } from '@alephium/web3'
 import Transport, { StatusCodes } from '@ledgerhq/hw-transport'
 import * as serde from './serde'
-import { ec as EC } from 'elliptic'
 import { MAX_TOKEN_SIZE, MAX_TOKEN_SYMBOL_LENGTH, TokenMetadata } from './types'
 import { encodeTokenMetadata, encodeUnsignedTx } from './tx-encoder'
 import { merkleTokens } from './merkle'
 
-const ec = new EC('secp256k1')
-
 export const CLA = 0x80
 export enum INS {
   GET_VERSION = 0x00,
@@ -36,25 +33,27 @@ export class AlephiumApp {
     return `${response[0]}.${response[1]}.${response[2]}`
   }
 
-  async getAccount(startPath: string, targetGroup?: number, keyType?: KeyType, display = false): Promise<readonly [Account, number]> {
+  async getAccount(startPath: string, targetGroup?: number, keyType?: KeyType, display = false): Promise<readonly [GroupedAccount, number]> {
     if ((targetGroup ?? 0) >= GROUP_NUM) {
       throw Error(`Invalid targetGroup: ${targetGroup}`)
     }
 
-    if (keyType === 'bip340-schnorr') {
-      throw Error('BIP340-Schnorr is not supported yet')
+    if (keyType !== undefined && keyType !== 'default') {
+      throw Error(`Unsupported key type: ${keyType}`)
     }
 
     const p1 = targetGroup === undefined ? 0x00 : GROUP_NUM
     const p2 = targetGroup === undefined ? 0x00 : targetGroup
     const payload = Buffer.concat([serde.serializePath(startPath), Buffer.from([display ? 1 : 0])]);
     const response = await this.transport.send(CLA, INS.GET_PUBLIC_KEY, p1, p2, payload)
-    const publicKey = ec.keyFromPublic(response.slice(0, 65)).getPublic(true, 'hex')
+    const prefix = (response[64] & 1) === 1 ? '03' : '02'
+    const publicKey = prefix + response.slice(1, 33).toString('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: keyType ?? 'default' }, hdIndex] as const
+    const resolvedKeyType: GroupedKeyType = 'default'
+    return [{ publicKey, address, group, keyType: resolvedKeyType }, hdIndex] as const
   }
 
   async signHash(path: string, hash: Buffer): Promise<string> {

package/src/tx-encoder.ts

@@ -1,5 +1,5 @@
 import { tokenMerkleProofs } from "./merkle"
-import { checkTokenMetadata, serializePath, serializeSingleTokenMetadata } from "./serde"
+import { serializePath, serializeSingleTokenMetadata } from "./serde"
 import { MAX_PAYLOAD_SIZE, TokenMetadata } from "./types"
 
 export interface Frame {

package/test/merkle.test.ts

@@ -1,9 +1,15 @@
-import { hashPair, merkleTokens, tokenMerkleProofs, tokenMerkleRoot } from '../src/merkle'
+import { generateProofs, hashPair, merkleTokens, tokenMerkleProofs, tokenMerkleRoot } from '../src/merkle'
 import { serializeSingleTokenMetadata } from '../src/serde'
 import { blake2b } from 'blakejs'
 import { binToHex } from '@alephium/web3'
 
 describe('Merkle', () => {
+  it('should generate the correct proofs', () => {
+    const { proofs, root } = generateProofs()
+    expect(JSON.stringify(proofs)).toBe(JSON.stringify(tokenMerkleProofs))
+    expect(root).toBe(binToHex(tokenMerkleRoot))
+  })
+
   it('should verify proofs', () => {
     for (const token of merkleTokens) {
       const proof = tokenMerkleProofs[token.tokenId]

package/test/utils.ts

@@ -1,5 +1,4 @@
 import SpeculosTransport from '@ledgerhq/hw-transport-node-speculos'
-import fetch from 'node-fetch'
 import { sleep } from '@alephium/web3'
 import Transport from '@ledgerhq/hw-transport'
 import NodeTransport from '@ledgerhq/hw-transport-node-hid'
@@ -53,11 +52,19 @@ const NanospClickTable = new Map([
 ])
 
 const StaxClickTable = new Map([
-  [OutputType.Base, 2],
-  [OutputType.Multisig, 3],
-  [OutputType.Token, 3],
-  [OutputType.BaseAndToken, 3],
-  [OutputType.MultisigAndToken, 4],
+  [OutputType.Base, 1],
+  [OutputType.Multisig, 2],
+  [OutputType.Token, 2],
+  [OutputType.BaseAndToken, 2],
+  [OutputType.MultisigAndToken, 2],
+])
+
+const FlexClickTable = new Map([
+  [OutputType.Base, 1],
+  [OutputType.Multisig, 2],
+  [OutputType.Token, 2],
+  [OutputType.BaseAndToken, 2],
+  [OutputType.MultisigAndToken, 3],
 ])
 
 function getOutputClickSize(outputType: OutputType) {
@@ -66,8 +73,8 @@ function getOutputClickSize(outputType: OutputType) {
     case 'nanos': return NanosClickTable.get(outputType)!
     case 'nanosp':
     case 'nanox': return NanospClickTable.get(outputType)!
-    case 'stax':
-    case 'flex': return StaxClickTable.get(outputType)!
+    case 'stax': return StaxClickTable.get(outputType)!
+    case 'flex': return FlexClickTable.get(outputType)!
     default: throw new Error(`Unknown model ${model}`)
   }
 }
@@ -92,15 +99,17 @@ interface Position {
 
 const STAX_CONTINUE_POSITION = { x: 342, y: 606 }
 const STAX_APPROVE_POSITION = { x: 200, y: 515 }
-const STAX_REJECT_POSITION = { x: 36, y: 606 }
 const STAX_SETTINGS_POSITION = { x: 342, y: 55 }
 const STAX_BLIND_SETTING_POSITION = { x: 342, y: 90 }
+const STAX_GO_TO_SETTINGS = { x: 36, y: 606 }
+const STAX_ACCEPT_RISK_POSITION = { x: 36, y: 606 }
 
 const FLEX_CONTINUE_POSITION = { x: 430, y: 550 }
 const FLEX_APPROVE_POSITION = { x: 240, y: 435 }
-const FLEX_REJECT_POSITION = { x: 55, y: 530 }
 const FLEX_SETTINGS_POSITION = { x: 405, y: 75 }
 const FLEX_BLIND_SETTING_POSITION = { x: 405, y: 96 }
+const FLEX_GO_TO_SETTINGS = { x: 55, y: 530 }
+const FLEX_ACCEPT_RISK_POSITION = { x: 55, y: 530 }
 
 async function touchPosition(pos: Position) {
   await sleep(1000)
@@ -110,14 +119,24 @@ async function touchPosition(pos: Position) {
   })
 }
 
-async function _touch(times: number) {
+async function longPress(pos: Position) {
+  await sleep(1000)
+  return fetch(`http://localhost:25000/finger`, {
+    method: 'POST',
+    body: JSON.stringify({ action: 'press-and-release', x: pos.x, y: pos.y, delay: 3 })
+  })
+}
+
+async function _touch(times: number, approve: boolean = false) {
   const model = getModel()
   const continuePos = model === 'stax' ? STAX_CONTINUE_POSITION : FLEX_CONTINUE_POSITION
   for (let i = 0; i < times; i += 1) {
     await touchPosition(continuePos)
   }
-  const approvePos = model === 'stax' ? STAX_APPROVE_POSITION : FLEX_APPROVE_POSITION
-  await touchPosition(approvePos)
+  if (approve) {
+    const approvePos = model === 'stax' ? STAX_APPROVE_POSITION : FLEX_APPROVE_POSITION
+    await longPress(approvePos)
+  }
 }
 
 export async function staxFlexApproveOnce() {
@@ -129,16 +148,19 @@ export async function staxFlexApproveOnce() {
 }
 
 async function touch(outputs: OutputType[], hasExternalInputs: boolean) {
-  await sleep(1000);
+  await sleep(3000);
   if (hasExternalInputs) {
     await staxFlexApproveOnce()
   }
 
+  _touch(1) // the first review page
+  await sleep(1000)
+
   for (let index = 0; index < outputs.length; index += 1) {
     await _touch(getOutputClickSize(outputs[index]))
   }
 
-  await _touch(2) // fees
+  await _touch(1, true) // fees
 }
 
 export async function approveTx(outputs: OutputType[], hasExternalInputs: boolean = false) {
@@ -147,7 +169,7 @@ export async function approveTx(outputs: OutputType[], hasExternalInputs: boolea
   const isSelfTransfer = outputs.length === 0 && !hasExternalInputs
   if (isSelfTransfer) {
     if (isStaxOrFlex()) {
-      await _touch(2)
+      await _touch(2, true)
     } else {
       await clickAndApprove(2)
     }
@@ -164,7 +186,7 @@ export async function approveTx(outputs: OutputType[], hasExternalInputs: boolea
 export async function approveHash() {
   if (!needToAutoApprove()) return
   if (isStaxOrFlex()) {
-    return await _touch(3)
+    return await _touch(2, true)
   }
   if (getModel() === 'nanos') {
     await clickAndApprove(5)
@@ -176,7 +198,9 @@ export async function approveHash() {
 export async function approveAddress() {
   if (!needToAutoApprove()) return
   if (isStaxOrFlex()) {
-    return await _touch(2)
+    await _touch(1)
+    await staxFlexApproveOnce()
+    return
   }
   if (getModel() === 'nanos') {
     await clickAndApprove(4)
@@ -185,7 +209,7 @@ export async function approveAddress() {
   }
 }
 
-function isStaxOrFlex(): boolean {
+export function isStaxOrFlex(): boolean {
   return !getModel().startsWith('nano')
 }
 
@@ -193,13 +217,24 @@ export function isNanos(): boolean {
   return getModel() === 'nanos'
 }
 
-export function skipBlindSigningWarning() {
+export async function skipBlindSigningWarning() {
   if (!needToAutoApprove()) return
   if (isStaxOrFlex()) {
-    const rejectPos = getModel() === 'stax' ? STAX_REJECT_POSITION : FLEX_REJECT_POSITION
-    touchPosition(rejectPos)
+    await sleep(3000)
+    const goToSettings = getModel() === 'stax' ? STAX_GO_TO_SETTINGS : FLEX_GO_TO_SETTINGS
+    await touchPosition(goToSettings)
+  } else {
+    await clickAndApprove(3)
+  }
+}
+
+export async function staxFlexAcceptRisk() {
+  if (!needToAutoApprove()) return
+  await sleep(3000)
+  if (getModel() === 'stax') {
+    await touchPosition(STAX_ACCEPT_RISK_POSITION)
   } else {
-    clickAndApprove(3)
+    await touchPosition(FLEX_ACCEPT_RISK_POSITION)
   }
 }
 

package/test/wallet.test.ts

@@ -3,8 +3,7 @@ import { ALPH_TOKEN_ID, Address, DUST_AMOUNT, NodeProvider, ONE_ALPH, binToHex,
 import { getSigner, mintToken, transfer } from '@alephium/web3-test'
 import { PrivateKeyWallet } from '@alephium/web3-wallet'
 import blake from 'blakejs'
-import { approveAddress, approveHash, approveTx, createTransport, enableBlindSigning, getRandomInt, isNanos, needToAutoApprove, OutputType, skipBlindSigningWarning, staxFlexApproveOnce } from './utils'
-import { TokenMetadata } from '../src/types'
+import { approveAddress, approveHash, approveTx, createTransport, enableBlindSigning, getRandomInt, isNanos, isStaxOrFlex, needToAutoApprove, OutputType, skipBlindSigningWarning, staxFlexAcceptRisk } from './utils'
 import { randomBytes } from 'crypto'
 import { merkleTokens, tokenMerkleProofs } from '../src/merkle'
 
@@ -241,38 +240,6 @@ describe('ledger wallet', () => {
     await app.close()
   }, 120000)
 
-  async function genTokensAndDestinations(
-    fromAddress: string,
-    toAddress: string,
-    mintAmount: bigint,
-    transferAmount: bigint
-  ) {
-    const tokens: TokenMetadata[] = []
-    const tokenSymbol = 'TestTokenABC'
-    const destinations: node.Destination[] = []
-    for (let i = 0; i < 5; i += 1) {
-      const tokenInfo = await mintToken(fromAddress, mintAmount);
-      const tokenMetadata: TokenMetadata = {
-        version: 0,
-        tokenId: tokenInfo.contractId,
-        symbol: tokenSymbol.slice(0, tokenSymbol.length - i),
-        decimals: 18 - i
-      }
-      tokens.push(tokenMetadata)
-      destinations.push({
-        address: toAddress,
-        attoAlphAmount: DUST_AMOUNT.toString(),
-        tokens: [
-          {
-            id: tokenMetadata.tokenId,
-            amount: transferAmount.toString()
-          }
-        ]
-      })
-    }
-    return { tokens, destinations }
-  }
-
   it('should transfer tokens with proof', async () => {
     const transport = await createTransport()
     const app = new AlephiumApp(transport)
@@ -547,7 +514,11 @@ describe('ledger wallet', () => {
 
     await enableBlindSigning()
     if (needToAutoApprove()) {
-      staxFlexApproveOnce().then(() => approveTx([]))
+      if (isStaxOrFlex()) {
+        staxFlexAcceptRisk().then(() => approveTx([]))
+      } else {
+        approveTx([])
+      }
     } else {
       // waiting for blind signing setting to be enabled
       await sleep(20000)

package/tsconfig.json

@@ -12,7 +12,6 @@
     "declaration": true,
     "moduleResolution": "node",
     "resolveJsonModule": true,
-    "experimentalDecorators": true,
     "noImplicitOverride": true
   },
   "exclude": ["node_modules"],

package/.eslintignore

@@ -1,2 +0,0 @@
-**/dist/
-**/templates/

package/.eslintrc.json

@@ -1,16 +0,0 @@
-{
-  "extends": [
-    "prettier",
-    "plugin:prettier/recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "rules": {
-    "header/header": ["off"]
-  },
-  "parserOptions": {
-    "project": "tsconfig.json",
-    "ecmaVersion": 2020,
-    "sourceType": "module"
-  },
-  "parser": "@typescript-eslint/parser"
-}