@ldgr/cli 0.1.0 → 0.2.0

package/README.md

@@ -15,4 +15,4 @@ ldgr send-token t1abcdef01234567 ldgr1… 10
 ldgr network set testnet
 ```
 
-The default owner-only wallet store lives at `~/.config/ldgr/wallet.json`. Each added wallet is encrypted separately using a passphrase requested on the terminal. `wallet list` shows one-based indexes and marks the active wallet; `wallet select <index>` changes it without exposing a secret. Record the recovery key shown at creation offline. `wallet import --testnet` imports a recovery key as a testnet wallet. Testnet prints a warning on every wallet command and only uses `https://tst.ldgr.ltd`.
+The default owner-only wallet store lives at `~/.ldgr/wallet.json`. On first use, an existing `~/.config/ldgr/wallet.json` store is validated, copied to the new owner-only location, and removed from its former location. Each added wallet is encrypted separately using a passphrase requested on the terminal. `wallet list` shows one-based indexes and marks the active wallet; `wallet select <index>` changes it without exposing a secret. Record the recovery key shown at creation offline. `wallet import --testnet` imports a recovery key as a testnet wallet. Testnet prints a warning on every wallet command and only uses `https://tst.ldgr.ltd`.

package/dist/cli.js

@@ -118,7 +118,13 @@ function defaultWalletPath(input = {}) {
   const home = input.home ?? process.env.HOME;
   if (!home)
     throw new Error("Could not determine your home directory; use --wallet <path>");
-  const configHome = process.env.XDG_CONFIG_HOME?.trim() || join(home, ".config");
+  return join(home, ".ldgr", "wallet.json");
+}
+function legacyDefaultWalletPath(input = {}) {
+  const home = input.home ?? process.env.HOME;
+  if (!home)
+    throw new Error("Could not determine your home directory; use --wallet <path>");
+  const configHome = input.configHome ?? (process.env.XDG_CONFIG_HOME?.trim() || join(home, ".config"));
   return join(configHome, "ldgr", "wallet.json");
 }
 async function createEncryptedWalletFile(input) {
@@ -146,7 +152,7 @@ async function encryptWallet(input) {
   return { file, serialized: `${JSON.stringify(file, null, 2)}
 `, recoveryKey: input.recoveryKey };
 }
-async function writeNewWalletFile(path, file) {
+async function writeNewWalletStore(path, store) {
   await mkdir(dirname(path), { recursive: true, mode: 448 });
   const handle = await open(path, "wx", 384).catch((error) => {
     if (error.code === "EEXIST")
@@ -154,12 +160,15 @@ async function writeNewWalletFile(path, file) {
     throw error;
   });
   try {
-    await handle.writeFile(serializeWalletStore(newWalletStore(file)), "utf8");
+    await handle.writeFile(serializeWalletStore(store), "utf8");
     await handle.sync();
   } finally {
     await handle.close();
   }
 }
+async function writeNewWalletFile(path, file) {
+  await writeNewWalletStore(path, newWalletStore(file));
+}
 async function readWalletStore(path) {
   const details = await lstat(path).catch((error) => {
     if (error.code === "ENOENT")
@@ -178,6 +187,32 @@ async function readWalletStore(path) {
   }
   return parseWalletStore(parsed);
 }
+async function migrateDefaultWalletPath(input = {}) {
+  const path = defaultWalletPath(input);
+  try {
+    await lstat(path);
+    return { path, migrated: false };
+  } catch (error) {
+    if (error.code !== "ENOENT")
+      throw error;
+  }
+  const legacyPath = legacyDefaultWalletPath(input);
+  let legacyStore;
+  try {
+    legacyStore = await readWalletStore(legacyPath);
+  } catch (error) {
+    if (error instanceof Error && error.message === `Wallet file not found: ${legacyPath}`)
+      return { path, migrated: false };
+    throw error;
+  }
+  await writeNewWalletStore(path, legacyStore);
+  try {
+    await unlink(legacyPath);
+  } catch (error) {
+    throw new Error(`Migrated wallet to ${path}, but could not remove legacy wallet file ${legacyPath}: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  return { path, migrated: true };
+}
 async function unlockWalletFile(file, passphrase) {
   try {
     const key = await deriveEncryptionKey(passphrase, decodeBase64Url(file.kdf.salt));
@@ -277,7 +312,7 @@ async function walletFileMetadata(path) {
 
 // src/cli.ts
 var HELP = `
-LDGR CLI 0.1.0 — self-custody wallet
+LDGR CLI 0.2.0 — self-custody wallet
 
 Usage:
   ldgr wallet create [--testnet] [--wallet <path>]
@@ -291,7 +326,8 @@ Usage:
   ldgr network show [--wallet <path>]
   ldgr network set <mainnet|testnet> [--wallet <path>]
 
-The default wallet store is ~/.config/ldgr/wallet.json. Each wallet inside it
+The default wallet store is ~/.ldgr/wallet.json. Existing wallets at
+~/.config/ldgr/wallet.json move there safely on first use. Each wallet inside it
 is independently encrypted with a passphrase you enter through the terminal;
 the CLI never accepts recovery keys or passphrases as arguments or environment
 variables. Use \`ldgr wallet select <index>\` to change the active wallet, or
@@ -301,6 +337,7 @@ prints a warning on every wallet command.
 function parseArguments(argv) {
   const command = [];
   let walletPath = defaultWalletPath();
+  let walletPathExplicit = false;
   let walletOnTestnet = false;
   for (let index = 0;index < argv.length; index += 1) {
     const value = argv[index];
@@ -309,6 +346,7 @@ function parseArguments(argv) {
       if (!path || path.startsWith("-"))
         throw new TypeError("--wallet requires a file path");
       walletPath = path;
+      walletPathExplicit = true;
       index += 1;
     } else if (value === "--testnet") {
       walletOnTestnet = true;
@@ -321,7 +359,7 @@ function parseArguments(argv) {
   if (walletOnTestnet && !(command[0] === "wallet" && (command[1] === "create" || command[1] === "import"))) {
     throw new TypeError("--testnet is only used with wallet create or wallet import; use `ldgr network set testnet` to switch an existing wallet");
   }
-  return { command, walletPath, walletOnTestnet };
+  return { command, walletPath, walletPathExplicit, walletOnTestnet };
 }
 function networkLabel(file) {
   return file.ledgerId === 0 ? "testnet" : "mainnet";
@@ -561,26 +599,29 @@ async function main() {
   }
   p.intro("LDGR CLI");
   try {
+    const resolved = parsed.walletPathExplicit ? { path: parsed.walletPath, migrated: false } : await migrateDefaultWalletPath();
+    if (resolved.migrated)
+      p.log.info(`Moved legacy wallet store to ${resolved.path}`);
     if (first === "wallet" && second === "create" && third === undefined)
-      await runCreate(parsed.walletPath, parsed.walletOnTestnet);
+      await runCreate(resolved.path, parsed.walletOnTestnet);
     else if (first === "wallet" && second === "import" && third === undefined)
-      await runImport(parsed.walletPath, parsed.walletOnTestnet);
+      await runImport(resolved.path, parsed.walletOnTestnet);
     else if (first === "wallet" && second === "list" && third === undefined)
-      await runWalletList(parsed.walletPath);
+      await runWalletList(resolved.path);
     else if (first === "wallet" && second === "select" && third && fourth === undefined)
-      await runWalletSelect(parsed.walletPath, third);
+      await runWalletSelect(resolved.path, third);
     else if (first === "address" && second === undefined)
-      await runAddress(parsed.walletPath);
+      await runAddress(resolved.path);
     else if (first === "balance" && second === undefined)
-      await runBalance(parsed.walletPath);
+      await runBalance(resolved.path);
     else if (first === "send" && second && third && fourth === undefined)
-      await runSend(parsed.walletPath, "dng", second, third);
+      await runSend(resolved.path, "dng", second, third);
     else if (first === "send-token" && second && third && fourth)
-      await runSend(parsed.walletPath, second, third, fourth);
+      await runSend(resolved.path, second, third, fourth);
     else if (first === "network" && second === "show" && third === undefined)
-      await runNetwork(parsed.walletPath);
+      await runNetwork(resolved.path);
     else if (first === "network" && second === "set" && third && fourth === undefined)
-      await runNetwork(parsed.walletPath, third);
+      await runNetwork(resolved.path, third);
     else
       throw new TypeError("Unknown command. Run `ldgr --help` for available commands.");
   } catch (error) {

package/dist/wallet-file.d.ts

@@ -27,20 +27,33 @@ export type WalletFileMetadata = EncryptedWalletFile & {
     readonly index: number;
     readonly selected: boolean;
 };
+export type DefaultWalletPathInput = {
+    readonly home?: string | undefined;
+    /** Test seam for the former XDG default; production reads XDG_CONFIG_HOME. */
+    readonly configHome?: string | undefined;
+};
 export type CreatedEncryptedWallet = {
     readonly file: EncryptedWalletFile;
     readonly serialized: string;
     /** Display once during creation; never persist or log this value. */
     readonly recoveryKey: string;
 };
-export declare function defaultWalletPath(input?: {
-    readonly home?: string | undefined;
-}): string;
+export declare function defaultWalletPath(input?: DefaultWalletPathInput): string;
+/** The v0.1 default location, used only to preserve existing local wallets. */
+export declare function legacyDefaultWalletPath(input?: DefaultWalletPathInput): string;
 export declare function createEncryptedWalletFile(input: {
     readonly ledgerId: LedgerId;
     readonly passphrase: string;
 }): Promise<CreatedEncryptedWallet>;
 export declare function writeNewWalletFile(path: string, file: EncryptedWalletFile): Promise<void>;
+/**
+ * Moves the validated former XDG default into ~/.ldgr/ on first wallet use.
+ * Explicit --wallet paths are deliberately never considered here.
+ */
+export declare function migrateDefaultWalletPath(input?: DefaultWalletPathInput): Promise<{
+    readonly path: string;
+    readonly migrated: boolean;
+}>;
 export declare function readEncryptedWalletFile(path: string, passphrase: string): Promise<LdgrSigner>;
 /** Adds a separately encrypted wallet and selects it. */
 export declare function addWalletFile(path: string, file: EncryptedWalletFile): Promise<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldgr/cli",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "bin": {
     "ldgr": "dist/cli.js"
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@ldgr/client": "^0.2.1",
-    "@ldgr/protocol": "^0.2.0",
+    "@ldgr/protocol": "^0.2.1",
     "@clack/prompts": "^0.11.0"
   },
   "scripts": {