Merge branch 'release/v1.0.33'

Author: andreashuber69

README.md

@@ -130,23 +130,24 @@ COLDCARD copy correctly derives the seed but then generates addresses from a dif
 ``` shell_session cSpell:disable
 $ npx verify-coldcard-dice-seed@latest
 Need to install the following packages:
-  verify-coldcard-dice-seed@1.0.32
+  verify-coldcard-dice-seed@1.0.33
 Ok to proceed? (y) y
-*** Verify COLDCARD Dice Seed v1.0.32 ***
-(tested with COLDCARD Mk4 firmware v5.2.2)
+*** Verify COLDCARD Dice Seed v1.0.33 ***
+(tested with COLDCARD Mk4 firmware v5.3.1)
 
 This application guides you through verifying that your COLDCARD
 correctly derives seeds and addresses from dice rolls.
 
 CAUTION: The very point of a COLDCARD is that the seed of a real wallet
-is never entered outside of a coldcard. You should therefore only use
-this application to verify the seed and address derivation of your
-COLDCARD. Once you are convinced that your COLDCARD works correctly, you
-should then generate the seed of your real wallet on your COLDCARD only.
+*never* appears on any other device. You should therefore only use this
+application to verify the seed and address derivation of your COLDCARD.
+Once you are convinced that your COLDCARD works correctly, you should
+then generate the seed of your real wallet on your COLDCARD only.
 
 Generate 24 instead of the standard 12 words [y, N]? 
 
-Log into your COLDCARD, select 'New Seed Words', '12 Word Dice Roll'.
+Log into your COLDCARD, select 'New Seed Words', 'Advanced',
+'12 Word Dice Roll'.
 Press any key to continue or CTRL-C to abort: 
 
 To perform a realistic test you should enter exactly as many dice rolls

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "verify-coldcard-dice-seed",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "description": "Verify whether your COLDCARD correctly generates seeds and addresses from dice rolls.",
   "keywords": [
     "bitcoin",
@@ -40,9 +40,9 @@
     "preview": "vite build && vite preview --open",
     "prelint": "cspell '**' && markdownlint '**/*.md'",
     "lint": "eslint --ext .cjs,.ts,.tsx --report-unused-disable-directives '.'",
-    "build": "tsc -p './tsconfig.json' && tsc -p './src/package/tsconfig.json' && tsc -p './src/site/tsconfig.json' && tsc -p './scripts/tsconfig.json'",
+    "build": "tsc -p '.' && tsc -p './src/package' && tsc -p './src/site' && tsc -p './scripts'",
     "postbuild": "vite build",
-    "test-no-coverage": "node --import tsx --test src/common/*.spec.ts src/site/*.spec.ts",
+    "test-no-coverage": "node --import tsx --test src/common/*.spec.ts",
     "test-no-coverage-built": "node --test dist/common/*.spec.js",
     "test": "c8 --exclude 'src/common/*.spec.ts' --reporter=text --reporter=lcov npm run test-no-coverage",
     "test-built": "c8 --exclude 'dist/common/*.spec.js' --reporter=text --reporter=lcov npm run test-no-coverage-built",
@@ -62,22 +62,23 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@andreashuber69/eslint-config": "^1.2.6",
+    "@andreashuber69/eslint-config": "^1.2.20",
     "@picocss/pico": "^1.5.13",
     "@preact/preset-vite": "^2.8.2",
     "@tsconfig/node20": "^20.1.4",
     "@tsconfig/strictest": "^2.0.5",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.14.1",
     "c8": "^9.1.0",
     "coveralls": "^3.1.1",
-    "cspell": "^8.6.1",
-    "markdownlint-cli": "^0.39.0",
+    "cspell": "^8.8.4",
+    "kiss-worker": "^3.1.0",
+    "markdownlint-cli": "^0.41.0",
     "node-fetch": "^3.3.2",
-    "preact": "^10.20.1",
-    "tsx": "^4.7.1",
-    "typescript": "^5.4.3",
-    "vite": "^5.2.6",
-    "vite-plugin-node-polyfills": "^0.21.0",
+    "preact": "^10.22.0",
+    "tsx": "^4.11.2",
+    "typescript": "^5.4.5",
+    "vite": "^5.2.12",
+    "vite-plugin-node-polyfills": "^0.22.0",
     "vite-plugin-wasm": "^3.3.0"
   }
 }

package.json

@@ -1,12 +1,14 @@
 // https://github.com/andreashuber69/verify-coldcard-dice-seed/blob/develop/README.md#----verify-coldcard-dice-seed
+import type EventEmitter from "node:events";
+
 type GenericOut<T extends keyof NodeJS.WriteStream> = Pick<NodeJS.WriteStream, T>;
 
 export interface GenericInOut<T, U> {
     readonly stdin: T;
     readonly stdout: U;
 }
 
-export type In = Pick<NodeJS.ReadStream, "once" | "pause" | "resume">;
+export type In = EventEmitter & Pick<NodeJS.ReadStream, "pause" | "resume">;
 
 export type InOut = GenericInOut<In, GenericOut<"write">>;
 

src/package/InOut.ts

@@ -27,7 +27,7 @@ try {
     stdin.setEncoding("utf8");
 
     stdout.write(`*** Verify COLDCARD Dice Seed v${version} ***\r\n`);
-    stdout.write("(tested with COLDCARD Mk4 firmware v5.2.2)\r\n");
+    stdout.write("(tested with COLDCARD Mk4 firmware v5.3.1)\r\n");
     stdout.write("\r\n");
     stdout.write("This application guides you through verifying that your COLDCARD\r\n");
     stdout.write("correctly derives seeds and addresses from dice rolls.\r\n");
@@ -42,7 +42,8 @@ try {
     const generate24WordsPrompt = "Generate 24 instead of the standard 12 words [y, N]? ";
     const generate24Words = (await waitForUser({ stdin, stdout }, generate24WordsPrompt)).toLocaleLowerCase() === "y";
     const wordCount = generate24Words ? 24 : 12;
-    stdout.write(`Log into your COLDCARD, select 'New Seed Words', '${wordCount} Word Dice Roll'.\r\n`);
+    stdout.write("Log into your COLDCARD, select 'New Seed Words', 'Advanced',\r\n");
+    stdout.write(`'${wordCount} Word Dice Roll'.\r\n`);
     await waitForUser(process);
     const words = await verifyWords(process, await readDiceRolls(process, generate24Words), wordCount);
     let currentPassphrase = "";

src/package/main.ts

@@ -0,0 +1,35 @@
+// https://github.com/andreashuber69/verify-coldcard-dice-seed/blob/develop/README.md#----verify-coldcard-dice-seed
+import { useEffect, useState } from "preact/hooks";
+import { getAddresses } from "./getAddresses.js";
+
+interface AddressSectionProps {
+    readonly mnemonic: readonly string[];
+    readonly passphrase: string;
+    readonly account: number;
+    readonly change: boolean;
+}
+
+export const AddressSection = ({ mnemonic, passphrase, account, change }: AddressSectionProps) => {
+    const [addresses, setAddresses] = useState<ReadonlyArray<readonly [string, string]>>([]);
+    const accountRootPath = `m/84'/0'/${account}'/${change ? 1 : 0}`;
+
+    useEffect(
+        () => {
+            const doIt = async () => setAddresses(
+                await getAddresses(mnemonic, passphrase, accountRootPath),
+            );
+
+            void doIt();
+        },
+        [mnemonic, passphrase, accountRootPath],
+    );
+
+    return (
+      <section>
+        <h2>{change ? "Change" : "Receive"} Addresses</h2>
+        <div className="monospace">
+          {addresses.map(([p, a]) => <div key={p} className="grid"><span>{`${p} => ${a}`}</span></div>)}
+        </div>
+      </section>
+    );
+};