@faremeter/wallet-ledger 0.1.2 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faremeter/wallet-ledger",
-  "version": "0.1.2",
+  "version": "0.5.0",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -8,14 +8,15 @@
     "@ledgerhq/hw-app-eth": "^6.36.0",
     "@ledgerhq/hw-app-solana": "^7.2.0",
     "@ledgerhq/hw-transport": "^6.31.0",
-    "@ledgerhq/hw-transport-webusb": "^6.29.0",
     "@ledgerhq/hw-transport-node-hid": "^6.29.0",
-    "@solana/web3.js": "^1.95.0",
-    "arktype": "^2.1.20",
-    "viem": "^2.23.6"
+    "@ledgerhq/hw-transport-webusb": "^6.29.0",
+    "@logtape/logtape": "1.0.4",
+    "@solana/web3.js": "1.98.4",
+    "arktype": "2.1.21",
+    "viem": "2.37.2"
   },
   "devDependencies": {
-    "typescript": "^5.5.4",
-    "tsc-esm-fix": "^3.1.2"
+    "tsc-esm-fix": "3.1.2",
+    "typescript": "5.9.2"
   }
 }

package/src/evm.ts

@@ -13,7 +13,7 @@ import { baseSepolia, mainnet, sepolia } from "viem/chains";
 import Eth from "@ledgerhq/hw-app-eth/lib-es/Eth";
 import { type } from "arktype";
 import { createTransport } from "./transport";
-import type { LedgerEvmWallet } from "./types";
+import type { LedgerEvmWallet, UserInterface } from "./types";
 
 interface NetworkConfig {
   chain: Chain;
@@ -45,6 +45,7 @@ const NETWORK_CONFIGS = new Map<string, NetworkConfig>([
 ]);
 
 export async function createLedgerEvmWallet(
+  ui: UserInterface,
   network: string,
   derivationPath: string,
 ): Promise<LedgerEvmWallet> {
@@ -169,12 +170,10 @@ export async function createLedgerEvmWallet(
           types,
         });
 
-        console.log("\nEIP-712 hashes calculated:");
-        console.log("  Domain separator:", domainSeparator);
-        console.log("  Message hash:", messageHash);
-        console.log(
-          "\nPlease approve the transaction on your Ledger device...",
-        );
+        ui.message("\nEIP-712 hashes calculated:");
+        ui.message(`  Domain separator: ${domainSeparator}`);
+        ui.message(`  Message hash: ${messageHash}`);
+        ui.message(`\nPlease approve the transaction on your Ledger device...`);
 
         const result = await eth.signEIP712HashedMessage(
           derivationPath,
@@ -186,7 +185,7 @@ export async function createLedgerEvmWallet(
           `0x${result.r}${result.s}${result.v.toString(16).padStart(2, "0")}` as Hex;
         return signature;
       } catch (error) {
-        console.error("EIP-712 signing failed:", error);
+        ui.message(`EIP-712 signing failed: ${error}`);
         throw error;
       }
     },

package/src/index.ts

@@ -2,3 +2,4 @@ export { createLedgerEvmWallet } from "./evm";
 export { createLedgerSolanaWallet } from "./solana";
 export { selectLedgerAccount } from "./utils";
 export type { LedgerEvmWallet, LedgerSolanaWallet } from "./types";
+export * from "./interface";

package/src/interface.ts

@@ -0,0 +1,25 @@
+import type { UserInterface } from "./types";
+
+export type createReadlineInterfaceArgs = {
+  stdin: NodeJS.ReadableStream;
+  stdout: NodeJS.WritableStream;
+};
+
+export async function createReadlineInterface(
+  args: createReadlineInterfaceArgs,
+) {
+  const readline = await import("readline");
+  const rl = readline.createInterface({
+    input: args.stdin,
+    output: args.stdout,
+  });
+
+  return {
+    message: (msg: string) => void args.stdout.write(msg + "\n"),
+    question: async (q: string) =>
+      new Promise<string>((resolve) => {
+        rl.question(q, resolve);
+      }),
+    close: async () => rl.close(),
+  } satisfies UserInterface;
+}

package/src/logger.ts

@@ -0,0 +1,3 @@
+import { getLogger } from "@logtape/logtape";
+
+export const logger = getLogger(["faremeter", "wallet-ledger"]);

package/src/transport.ts

@@ -1,3 +1,4 @@
+import { logger } from "./logger";
 import type Transport from "@ledgerhq/hw-transport";
 
 const LEDGER_ERRORS: Record<string, string> = {
@@ -67,7 +68,7 @@ export async function createTransport(maxRetries = 3): Promise<Transport> {
         i < maxRetries - 1 &&
         (errorMessage.includes("USB") || errorMessage.includes("device"))
       ) {
-        console.log(`USB connection attempt ${i + 1} failed, retrying...`);
+        logger.warning(`USB connection attempt ${i + 1} failed, retrying...`);
         await new Promise((resolve) => setTimeout(resolve, 1000));
         continue;
       }

package/src/types.ts

@@ -29,3 +29,9 @@ export interface LedgerTransportWrapper {
   transport: Transport;
   close: () => Promise<void>;
 }
+
+export interface UserInterface {
+  message: (msg: string) => void;
+  question: (prompt: string) => Promise<string>;
+  close: () => Promise<void>;
+}

package/src/utils.ts

@@ -2,6 +2,7 @@ import Eth from "@ledgerhq/hw-app-eth/lib-es/Eth";
 import Solana from "@ledgerhq/hw-app-solana/lib-es/Solana";
 import { PublicKey } from "@solana/web3.js";
 import { createTransport, translateLedgerError } from "./transport";
+import type { UserInterface } from "./types";
 
 function evmDerivationPath(index: number) {
   return `m/44'/60'/${index}'/0/0`;
@@ -12,11 +13,12 @@ function solanaDerivationPath(index: number) {
 }
 
 export async function selectLedgerAccount(
+  ui: UserInterface,
   type: "evm" | "solana",
   numAccounts = 5,
 ): Promise<{ path: string; address: string } | null> {
   const isEvm = type === "evm";
-  console.log(
+  ui.message(
     `\nScanning first ${numAccounts} ${isEvm ? "Ethereum" : "Solana"} accounts...`,
   );
 
@@ -39,7 +41,7 @@ export async function selectLedgerAccount(
           ? address
           : `0x${address}`;
         accounts.push({ path, address: normalizedAddress });
-        console.log(`${i + 1}. ${normalizedAddress}`);
+        ui.message(`${i + 1}. ${normalizedAddress}`);
       }
     } else {
       const solana = new Solana(transport);
@@ -54,28 +56,19 @@ export async function selectLedgerAccount(
         const publicKey = new PublicKey(result.address);
         const address = publicKey.toBase58();
         accounts.push({ path, address });
-        console.log(`${i + 1}. ${address}`);
+        ui.message(`${i + 1}. ${address}`);
       }
     }
   } finally {
     await transport.close();
   }
 
-  const readline = await import("readline");
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  const selection = await new Promise<string>((resolve) => {
-    rl.question(`\nSelect account (1-${numAccounts}): `, resolve);
-  });
-  rl.close();
+  const selection = await ui.question(`\nSelect account (1-${numAccounts}): `);
 
   const index = parseInt(selection) - 1;
 
   if (index < 0 || index >= accounts.length) {
-    console.log("Invalid selection");
+    ui.message("Invalid selection");
     return null;
   }