@1sat/wallet-toolbox 0.0.18 → 0.0.20

package/dist/wallet/factory.d.ts

@@ -5,8 +5,9 @@
  * (browser extension) and 1sat-website (React app).
  */
 import { PrivateKey } from "@bsv/sdk";
-import { WalletPermissionsManager, Monitor, type PermissionsManagerConfig } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
+import { Monitor, type PermissionsManagerConfig, WalletPermissionsManager } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
 import { OneSatServices } from "../services/OneSatServices";
+import { type FullSyncResult } from "./fullSync";
 type Chain = "main" | "test";
 /**
  * Configuration for creating a web wallet.
@@ -40,6 +41,8 @@ export interface WebWalletResult {
     monitor: Monitor;
     /** Cleanup function - stops monitor, destroys wallet */
     destroy: () => Promise<void>;
+    /** Full sync with remote backup (only available if remoteStorageUrl was provided and connected) */
+    fullSync?: () => Promise<FullSyncResult>;
 }
 /**
  * Create a web wallet with storage, services, permissions, and monitor.

package/dist/wallet/factory.js

@@ -5,8 +5,9 @@
  * (browser extension) and 1sat-website (React app).
  */
 import { KeyDeriver, PrivateKey } from "@bsv/sdk";
-import { Wallet, WalletStorageManager, StorageProvider, StorageIdb, StorageClient, WalletPermissionsManager, Services, Monitor, } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
+import { Monitor, Services, StorageClient, StorageIdb, StorageProvider, Wallet, WalletPermissionsManager, WalletStorageManager, } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
 import { OneSatServices } from "../services/OneSatServices";
+import { fullSync } from "./fullSync";
 // Default database name for IndexedDB storage
 const DEFAULT_DATABASE_NAME = "wallet";
 // Default timeout for remote storage connection
@@ -74,6 +75,8 @@ export async function createWebWallet(config) {
     // 4. Create storage manager (local-only initially)
     let storage = new WalletStorageManager(identityPubKey, localStorage);
     await storage.makeAvailable();
+    // Track remote client for fullSync
+    let remoteClient;
     // 5. Create the underlying Wallet
     const underlyingWallet = new Wallet({
         chain,
@@ -85,7 +88,7 @@ export async function createWebWallet(config) {
     if (config.remoteStorageUrl) {
         console.log(`[createWebWallet] Attempting remote storage connection to ${config.remoteStorageUrl}`);
         try {
-            const remoteClient = new StorageClient(underlyingWallet, config.remoteStorageUrl);
+            remoteClient = new StorageClient(underlyingWallet, config.remoteStorageUrl);
             const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error("Remote storage connection timeout")), DEFAULT_REMOTE_STORAGE_TIMEOUT));
             await Promise.race([remoteClient.makeAvailable(), timeoutPromise]);
             // Remote connected - recreate storage manager with backup
@@ -97,36 +100,44 @@ export async function createWebWallet(config) {
             const storageAny = storage;
             console.log("[createWebWallet] Storage state:", {
                 activeKey: storageAny._active?.settings?.storageIdentityKey,
-                backups: storageAny._backups?.map(b => b.settings?.storageIdentityKey),
-                conflictingActives: storageAny._conflictingActives?.map(c => c.settings?.storageIdentityKey),
+                backups: storageAny._backups?.map((b) => b.settings?.storageIdentityKey),
+                conflictingActives: storageAny._conflictingActives?.map((c) => c.settings?.storageIdentityKey),
             });
-            // Treat backups as conflicts to pull any data they have.
-            // Remote storage may have transactions that local doesn't know about
-            // (e.g., from sweep-ui syncing to remote).
-            if (storageAny._backups && storageAny._backups.length > 0) {
-                console.log("[createWebWallet] Reclassifying backups as conflicts to pull remote data...");
-                storageAny._conflictingActives = storageAny._conflictingActives || [];
-                storageAny._conflictingActives.push(...storageAny._backups);
-                storageAny._backups = [];
-            }
-            // If there are conflicting actives (including reclassified backups), resolve by merging into local
-            // This is now blocking since setActive no longer holds IDB transactions during network calls
-            if (storageAny._conflictingActives && storageAny._conflictingActives.length > 0) {
+            // Only resolve actual conflicts, don't treat backups as conflicts
+            if (storageAny._conflictingActives &&
+                storageAny._conflictingActives.length > 0) {
                 const localKey = storageAny._active?.settings?.storageIdentityKey;
                 if (localKey && storageAny.setActive) {
-                    console.log("[createWebWallet] Syncing with remote storage...");
+                    console.log("[createWebWallet] Resolving conflicting actives...");
                     try {
                         await storageAny.setActive(localKey, (msg) => {
-                            console.log("[createWebWallet] Sync:", msg);
+                            console.log("[createWebWallet] Conflict resolution:", msg);
                             return msg;
                         });
-                        console.log("[createWebWallet] Remote sync complete");
+                        console.log("[createWebWallet] Conflict resolution complete");
                     }
                     catch (err) {
-                        console.log("[createWebWallet] Remote sync failed:", err instanceof Error ? err.message : err);
+                        console.log("[createWebWallet] Conflict resolution failed:", err instanceof Error ? err.message : err);
                     }
                 }
             }
+            else if (storageAny._backups &&
+                storageAny._backups.length > 0 &&
+                storageAny.updateBackups) {
+                // No conflicts - push local state to remote backup (fire-and-forget)
+                console.log("[createWebWallet] Pushing local state to remote backup...");
+                storageAny
+                    .updateBackups(undefined, (msg) => {
+                    console.log("[createWebWallet] Backup:", msg);
+                    return msg;
+                })
+                    .then(() => {
+                    console.log("[createWebWallet] Backup complete");
+                })
+                    .catch((err) => {
+                    console.log("[createWebWallet] Backup failed:", err instanceof Error ? err.message : err);
+                });
+            }
             // Update wallet's storage reference
             underlyingWallet._storage = storage;
             console.log("[createWebWallet] Remote storage connected successfully");
@@ -157,10 +168,21 @@ export async function createWebWallet(config) {
         await monitor.destroy();
         await underlyingWallet.destroy();
     };
+    // 10. Create fullSync function if remote storage is connected
+    const fullSyncFn = remoteClient
+        ? async () => {
+            return fullSync({
+                storage,
+                remoteStorage: remoteClient,
+                identityKey: identityPubKey,
+            });
+        }
+        : undefined;
     return {
         wallet,
         services: oneSatServices,
         monitor,
         destroy,
+        fullSync: fullSyncFn,
     };
 }

package/dist/wallet/fullSync.d.ts

@@ -0,0 +1,53 @@
+/**
+ * Full wallet synchronization with remote backup server.
+ *
+ * Performs a complete resync: push local → reset sync state → full pull from server.
+ * This is a deliberate user action (not automatic) for recovering from sync issues.
+ */
+import type { WalletStorageManager } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
+import type { sdk as mobileToolboxSdk } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
+type WalletStorageProvider = mobileToolboxSdk.WalletStorageProvider;
+export type FullSyncStage = "pushing" | "resetting" | "pulling" | "complete";
+export interface FullSyncOptions {
+    /** Local storage manager */
+    storage: WalletStorageManager;
+    /** Remote backup storage provider (StorageClient) */
+    remoteStorage: WalletStorageProvider;
+    /** Identity key for the wallet */
+    identityKey: string;
+    /** Optional progress callback */
+    onProgress?: (stage: FullSyncStage, message: string) => void;
+}
+export interface FullSyncResult {
+    pushed: {
+        inserts: number;
+        updates: number;
+    };
+    pulled: {
+        inserts: number;
+        updates: number;
+    };
+}
+/**
+ * Perform a full sync with the remote backup server.
+ *
+ * Steps:
+ * 1. Push all local data to remote backup
+ * 2. Clear local syncMap / reset sync state
+ * 3. Pull ALL data from server (not incremental)
+ * 4. Rebuild complete server→client ID mappings
+ *
+ * @example
+ * ```typescript
+ * const result = await fullSync({
+ *   storage,
+ *   remoteStorage: remoteClient,
+ *   identityKey: pubKey,
+ *   onProgress: (stage, msg) => console.log(`[${stage}] ${msg}`)
+ * });
+ * console.log(`Pushed: ${result.pushed.inserts}/${result.pushed.updates}`);
+ * console.log(`Pulled: ${result.pulled.inserts}/${result.pulled.updates}`);
+ * ```
+ */
+export declare function fullSync(options: FullSyncOptions): Promise<FullSyncResult>;
+export {};

package/dist/wallet/fullSync.js

@@ -0,0 +1,69 @@
+/**
+ * Full wallet synchronization with remote backup server.
+ *
+ * Performs a complete resync: push local → reset sync state → full pull from server.
+ * This is a deliberate user action (not automatic) for recovering from sync issues.
+ */
+import { createSyncMap } from "@bsv/wallet-toolbox-mobile/out/src/storage/schema/entities/EntityBase.js";
+/**
+ * Perform a full sync with the remote backup server.
+ *
+ * Steps:
+ * 1. Push all local data to remote backup
+ * 2. Clear local syncMap / reset sync state
+ * 3. Pull ALL data from server (not incremental)
+ * 4. Rebuild complete server→client ID mappings
+ *
+ * @example
+ * ```typescript
+ * const result = await fullSync({
+ *   storage,
+ *   remoteStorage: remoteClient,
+ *   identityKey: pubKey,
+ *   onProgress: (stage, msg) => console.log(`[${stage}] ${msg}`)
+ * });
+ * console.log(`Pushed: ${result.pushed.inserts}/${result.pushed.updates}`);
+ * console.log(`Pulled: ${result.pulled.inserts}/${result.pulled.updates}`);
+ * ```
+ */
+export async function fullSync(options) {
+    const { storage, remoteStorage, identityKey, onProgress } = options;
+    // Step 1: Push local data to remote
+    onProgress?.("pushing", "Pushing local data to remote...");
+    const auth = await storage.getAuth();
+    const pushResult = await storage.syncToWriter(auth, remoteStorage);
+    onProgress?.("pushing", `Pushed ${pushResult.inserts} inserts, ${pushResult.updates} updates`);
+    // Step 2: Reset sync state to force full pull
+    onProgress?.("resetting", "Resetting sync state...");
+    const remoteSettings = remoteStorage.getSettings();
+    await storage.runAsStorageProvider(async (active) => {
+        const syncStates = await active.findSyncStates({
+            partial: {
+                userId: auth.userId,
+                storageIdentityKey: remoteSettings.storageIdentityKey,
+            },
+        });
+        if (syncStates.length > 0) {
+            const syncState = syncStates[0];
+            await active.updateSyncState(syncState.syncStateId, {
+                syncMap: JSON.stringify(createSyncMap()),
+                when: undefined,
+                status: "unknown",
+            });
+            onProgress?.("resetting", "Sync state reset complete");
+        }
+        else {
+            onProgress?.("resetting", "No existing sync state found");
+        }
+    });
+    // Step 3: Pull from remote (full pull due to reset state)
+    onProgress?.("pulling", "Pulling all data from remote...");
+    const pullResult = await storage.syncFromReader(identityKey, remoteStorage);
+    onProgress?.("pulling", `Pulled ${pullResult.inserts} inserts, ${pullResult.updates} updates`);
+    // Step 4: Complete
+    onProgress?.("complete", "Full sync complete");
+    return {
+        pushed: { inserts: pushResult.inserts, updates: pushResult.updates },
+        pulled: { inserts: pullResult.inserts, updates: pullResult.updates },
+    };
+}

package/dist/wallet/index.d.ts

@@ -1 +1,2 @@
 export * from "./factory";
+export * from "./fullSync";

package/dist/wallet/index.js

@@ -1 +1,2 @@
 export * from "./factory";
+export * from "./fullSync";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/wallet-toolbox",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "BSV wallet library extending @bsv/wallet-toolbox with 1Sat Ordinals protocol support",
   "author": "1Sat Team",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "buffer": "^6.0.3"
   },
   "peerDependencies": {
-    "@bsv/wallet-toolbox-mobile": "npm:@bopen-io/wallet-toolbox-mobile@^1.7.20-idb-fix.11"
+    "@bsv/wallet-toolbox-mobile": "npm:@bopen-io/wallet-toolbox-mobile@^1.7.20-idb-fix.15"
   },
   "peerDependenciesMeta": {
     "@bsv/wallet-toolbox-mobile": {
@@ -51,8 +51,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
-    "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@^1.7.20-idb-fix.11",
-    "@bsv/wallet-toolbox-mobile": "npm:@bopen-io/wallet-toolbox-mobile@^1.7.20-idb-fix.11",
+    "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@^1.7.20-idb-fix.15",
+    "@bsv/wallet-toolbox-mobile": "npm:@bopen-io/wallet-toolbox-mobile@^1.7.20-idb-fix.15",
     "@types/bun": "^1.3.4",
     "@types/chrome": "^0.1.32",
     "typescript": "^5.9.3"