@cogcoin/client 0.5.5 → 0.5.7

package/dist/wallet/read/context.js

@@ -4,11 +4,13 @@ import { attachOrStartIndexerDaemon, probeIndexerDaemon, readObservedIndexerDaem
 import { createRpcClient } from "../../bitcoind/node.js";
 import { UNINITIALIZED_WALLET_ROOT_ID } from "../../bitcoind/service-paths.js";
 import { attachOrStartManagedBitcoindService, probeManagedBitcoindService, } from "../../bitcoind/service.js";
+import { resolveCogcoinProcessingStartHeight } from "../../bitcoind/processing-start-height.js";
 import {} from "../../bitcoind/types.js";
 import { loadOrAutoUnlockWalletState, verifyManagedCoreWalletReplica, } from "../lifecycle.js";
 import { persistNormalizedWalletDescriptorStateIfNeeded } from "../descriptor-normalization.js";
 import { inspectMiningControlPlane } from "../mining/index.js";
 import { normalizeMiningStateRecord } from "../mining/state.js";
+import { resolveWalletRootIdFromLocalArtifacts } from "../root-resolution.js";
 import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
 import { loadWalletExplicitLock } from "../state/explicit-lock.js";
 import { loadWalletState } from "../state/storage.js";
@@ -86,6 +88,7 @@ async function normalizeLoadedWalletStateForRead(options) {
 async function inspectWalletLocalState(options = {}) {
     const paths = options.paths ?? resolveWalletRuntimePathsForTesting();
     const now = options.now ?? Date.now();
+    const provider = options.secretProvider ?? createDefaultWalletSecretProvider();
     const [hasPrimaryStateFile, hasBackupStateFile, hasUnlockSessionFile] = await Promise.all([
         pathExists(paths.walletStatePath),
         pathExists(paths.walletStateBackupPath),
@@ -106,7 +109,6 @@ async function inspectWalletLocalState(options = {}) {
     }
     if (options.passphrase === undefined) {
         try {
-            const provider = options.secretProvider ?? createDefaultWalletSecretProvider();
             const unlocked = await loadOrAutoUnlockWalletState({
                 provider,
                 nowUnixMs: now,
@@ -147,10 +149,14 @@ async function inspectWalletLocalState(options = {}) {
                     };
                 }
                 catch (error) {
+                    const resolvedRoot = await resolveWalletRootIdFromLocalArtifacts({
+                        paths,
+                        provider,
+                    }).catch(() => null);
                     if (isLockedWalletAccessError(error)) {
                         return {
                             availability: "locked",
-                            walletRootId: null,
+                            walletRootId: resolvedRoot?.walletRootId ?? null,
                             state: null,
                             source: null,
                             unlockUntilUnixMs: null,
@@ -166,7 +172,7 @@ async function inspectWalletLocalState(options = {}) {
                     }
                     return {
                         availability: "local-state-corrupt",
-                        walletRootId: null,
+                        walletRootId: resolvedRoot?.walletRootId ?? null,
                         state: null,
                         source: null,
                         unlockUntilUnixMs: null,
@@ -461,7 +467,7 @@ async function attachNodeStatus(options) {
         const handle = await attachOrStartManagedBitcoindService({
             dataDir: options.dataDir,
             chain: "main",
-            startHeight: genesis.genesisBlock,
+            startHeight: resolveCogcoinProcessingStartHeight(genesis),
             walletRootId: options.walletRootId,
             startupTimeoutMs: options.startupTimeoutMs,
         });

package/dist/wallet/reset.d.ts

@@ -1,9 +1,12 @@
+import { createRpcClient } from "../bitcoind/node.js";
+import { attachOrStartManagedBitcoindService } from "../bitcoind/service.js";
 import { type WalletRuntimePaths } from "./runtime.js";
 import { type WalletSecretProvider } from "./state/provider.js";
 import type { WalletPrompter } from "./lifecycle.js";
-export type WalletResetAction = "not-present" | "kept-unchanged" | "reset-base-entropy" | "deleted";
+export type WalletResetAction = "not-present" | "kept-unchanged" | "retain-mnemonic" | "deleted";
 export type WalletResetSecretCleanupStatus = "deleted" | "not-found" | "failed" | "unknown";
 export type WalletResetSnapshotResultStatus = "not-present" | "invalid-removed" | "deleted" | "preserved";
+export type WalletResetBitcoinDataDirResultStatus = "not-present" | "preserved" | "deleted" | "outside-reset-scope";
 export interface WalletResetResult {
     dataRoot: string;
     factoryResetReady: true;
@@ -24,13 +27,17 @@ export interface WalletResetResult {
         status: WalletResetSnapshotResultStatus;
         path: string;
     };
+    bitcoinDataDir: {
+        status: WalletResetBitcoinDataDirResultStatus;
+        path: string;
+    };
     removedPaths: string[];
 }
 export interface WalletResetPreview {
     dataRoot: string;
     confirmationPhrase: "permanently reset";
     walletPrompt: null | {
-        defaultAction: "reset-base-entropy";
+        defaultAction: "retain-mnemonic";
         acceptedInputs: ["", "skip", "delete wallet"];
         entropyRetainingResetAvailable: boolean;
         requiresPassphrase: boolean;
@@ -41,10 +48,59 @@ export interface WalletResetPreview {
         path: string;
         defaultAction: "preserve" | "delete";
     };
+    bitcoinDataDir: {
+        status: "not-present" | "within-reset-scope" | "outside-reset-scope";
+        path: string;
+        conditionalPrompt: null | {
+            prompt: "Delete managed Bitcoin datadir too? [y/N]: ";
+            defaultAction: "preserve";
+            acceptedInputs: ["", "n", "no", "y", "yes"];
+        };
+    };
     trackedProcessKinds: Array<"managed-bitcoind" | "indexer-daemon" | "background-mining">;
     willDeleteOsSecrets: boolean;
     removedPaths: string[];
 }
+interface ResetWalletRpcClient {
+    getDescriptorInfo(descriptor: string): Promise<{
+        descriptor: string;
+        checksum: string;
+    }>;
+    createWallet(walletName: string, options: {
+        blank: boolean;
+        descriptors: boolean;
+        disablePrivateKeys: boolean;
+        loadOnStartup: boolean;
+        passphrase: string;
+    }): Promise<unknown>;
+    walletPassphrase(walletName: string, passphrase: string, timeoutSeconds: number): Promise<null>;
+    importDescriptors(walletName: string, requests: Array<{
+        desc: string;
+        timestamp: string | number;
+        active?: boolean;
+        internal?: boolean;
+        range?: number | [number, number];
+    }>): Promise<Array<{
+        success: boolean;
+    }>>;
+    walletLock(walletName: string): Promise<null>;
+    deriveAddresses(descriptor: string, range?: number | [number, number]): Promise<string[]>;
+    listDescriptors(walletName: string, privateOnly?: boolean): Promise<{
+        descriptors: Array<{
+            desc: string;
+        }>;
+    }>;
+    getWalletInfo(walletName: string): Promise<{
+        walletname: string;
+        private_keys_enabled: boolean;
+        descriptors: boolean;
+    }>;
+    loadWallet(walletName: string, loadOnStartup?: boolean): Promise<{
+        name: string;
+        warning: string;
+    }>;
+    listWallets(): Promise<string[]>;
+}
 export declare function previewResetWallet(options: {
     dataDir: string;
     provider?: WalletSecretProvider;
@@ -58,4 +114,7 @@ export declare function resetWallet(options: {
     nowUnixMs?: number;
     paths?: WalletRuntimePaths;
     validateSnapshotFile?: (path: string) => Promise<void>;
+    attachService?: typeof attachOrStartManagedBitcoindService;
+    rpcFactory?: (config: Parameters<typeof createRpcClient>[0]) => ResetWalletRpcClient;
 }): Promise<WalletResetResult>;
+export {};