@1sat/wallet-toolbox 0.0.38 → 0.0.40

package/dist/wallet/factory.js

@@ -72,84 +72,79 @@ export async function createWebWallet(config) {
     storageOptions.feeModel = feeModel;
     const localStorage = new StorageIdb(storageOptions);
     await localStorage.migrate(DEFAULT_DATABASE_NAME, identityPubKey);
-    // 4. Create storage manager (local-only initially)
-    let storage = new WalletStorageManager(identityPubKey, localStorage);
+    // 4. Create storage manager with local-only storage initially (empty backups)
+    const storage = new WalletStorageManager(identityPubKey, localStorage, []);
     await storage.makeAvailable();
-    // Track remote client for fullSync
-    let remoteClient;
-    // 5. Create the underlying Wallet
+    // 5. Create the underlying Wallet FIRST (needed for StorageClient signing)
     const underlyingWallet = new Wallet({
         chain,
         keyDeriver,
         storage,
         services: oneSatServices,
     });
-    // 6. Attempt remote storage connection if URL provided
+    // 6. Attempt remote storage connection AFTER wallet exists
+    let remoteClient;
     if (config.remoteStorageUrl) {
         console.log(`[createWebWallet] Attempting remote storage connection to ${config.remoteStorageUrl}`);
         try {
+            // Create StorageClient with the REAL wallet (not a temp wallet)
+            // StorageClient captures the wallet at construction for signing requests
             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
-            storage = new WalletStorageManager(identityPubKey, localStorage, [
-                remoteClient,
-            ]);
-            await storage.makeAvailable();
-            // Check for conflicting actives and resolve if needed
-            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),
-            });
-            // 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] Resolving conflicting actives...");
-                    try {
-                        await storageAny.setActive(localKey, (msg) => {
-                            console.log("[createWebWallet] Conflict resolution:", msg);
-                            return msg;
-                        });
-                        console.log("[createWebWallet] Conflict resolution complete");
-                    }
-                    catch (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;
+            // Add remote storage to the existing storage manager using public API
+            await storage.addWalletStorageProvider(remoteClient);
             console.log("[createWebWallet] Remote storage connected successfully");
         }
         catch (err) {
             console.log("[createWebWallet] Remote storage connection failed:", err instanceof Error ? err.message : err);
-            // Graceful degradation - continue with local only
+            remoteClient = undefined;
+        }
+    }
+    // Log storage state using public APIs
+    const stores = storage.getStores();
+    console.log("[createWebWallet] Storage state:", {
+        activeKey: storage.getActiveStore(),
+        backups: storage.getBackupStores(),
+        conflictingActives: storage.getConflictingStores(),
+        isActiveEnabled: storage.isActiveEnabled,
+        allStores: stores.map(s => ({ name: s.storageName, key: s.storageIdentityKey.slice(0, 16) + "..." })),
+    });
+    // 7. Handle conflicting actives or sync to backups
+    const conflictingStores = storage.getConflictingStores();
+    const backupStores = storage.getBackupStores();
+    if (conflictingStores.length > 0) {
+        const localKey = storage.getActiveStore();
+        console.log("[createWebWallet] Resolving conflicting actives...");
+        try {
+            await storage.setActive(localKey, (msg) => {
+                console.log("[createWebWallet] Conflict resolution:", msg);
+                return msg;
+            });
+            console.log("[createWebWallet] Conflict resolution complete");
         }
+        catch (err) {
+            console.log("[createWebWallet] Conflict resolution failed:", err instanceof Error ? err.message : err);
+        }
+    }
+    else if (backupStores.length > 0) {
+        // No conflicts - push local state to remote backup (fire-and-forget)
+        console.log("[createWebWallet] Pushing local state to remote backup...");
+        storage
+            .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);
+        });
     }
-    // 7. Wrap with permissions manager
+    // 8. Wrap with permissions manager
     const wallet = new WalletPermissionsManager(underlyingWallet, adminOriginator, permissionsConfig);
-    // 8. Create monitor (not started - consumer calls startTasks() when ready)
+    // 9. Create monitor (not started - consumer calls startTasks() when ready)
     const monitor = new Monitor({
         chain,
         services: oneSatServices,
@@ -162,17 +157,16 @@ export async function createWebWallet(config) {
         unprovenAttemptsLimitMain: 144,
     });
     monitor.addDefaultTasks();
-    // Helper to sync to remote backup using updateBackups (same as initialization)
+    // Helper to sync to remote backup using public updateBackups API
     const syncToBackup = async (context) => {
-        const storageAny = storage;
-        if (storageAny._backups?.length && storageAny.updateBackups) {
-            await storageAny.updateBackups(undefined, (msg) => {
+        if (storage.getBackupStores().length > 0) {
+            await storage.updateBackups(undefined, (msg) => {
                 console.log(`[Monitor] ${context}:`, msg);
                 return msg;
             });
         }
     };
-    // 9. Wire up monitor callbacks - sync to remote first, then call user callbacks
+    // 10. Wire up monitor callbacks - sync to remote first, then call user callbacks
     monitor.onTransactionBroadcasted = async (result) => {
         console.log("[Monitor] Transaction broadcasted:", result.txid);
         // Sync to remote backup first (if connected)
@@ -217,13 +211,13 @@ export async function createWebWallet(config) {
             }
         }
     };
-    // 10. Create cleanup function
+    // 11. Create cleanup function
     const destroy = async () => {
         monitor.stopTasks();
         await monitor.destroy();
         await underlyingWallet.destroy();
     };
-    // 11. Create fullSync function if remote storage is connected
+    // 12. Create fullSync function if remote storage is connected
     const fullSyncFn = remoteClient
         ? async (onProgress) => {
             return fullSync({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/wallet-toolbox",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "BSV wallet library extending @bsv/wallet-toolbox with 1Sat Ordinals protocol support",
   "author": "1Sat Team",
   "license": "MIT",