@1sat/wallet-toolbox 0.0.69 → 0.0.71

package/dist/wallet/factory.js

@@ -83,56 +83,43 @@ export async function createWebWallet(config) {
         services: oneSatServices,
     });
     // 6. Attempt remote storage connection AFTER wallet exists
+    // Push-only backup: no sync on startup, just connect for incremental backups
+    // Use fullSync() explicitly to restore from backup when needed
     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]);
-            // Add remote storage to the existing storage manager using public API
+            // Add remote to storage manager - it will partition as conflicting if another device is active
             await storage.addWalletStorageProvider(remoteClient);
-            console.log("[createWebWallet] Remote storage connected successfully");
-            // Bidirectional sync: pull first, then push
-            // Pull builds idMap via natural key matching (reference for transactions)
-            // Push sends local changes to remote
-            console.log("[createWebWallet] Pulling from remote...");
-            const pullResult = await storage.syncFromReader(identityPubKey, remoteClient);
-            console.log(`[createWebWallet] Pulled: ${pullResult.inserts} inserts, ${pullResult.updates} updates`);
-            console.log("[createWebWallet] Pushing to remote...");
-            await storage.updateBackups(undefined, (msg) => {
-                console.log("[createWebWallet] Push:", msg);
-                return msg;
-            });
-            console.log("[createWebWallet] Push complete");
-        }
-        catch (err) {
-            console.log("[createWebWallet] Remote storage connection failed:", err instanceof Error ? err.message : err);
-            remoteClient = undefined;
-        }
-    }
-    // Log storage state for debugging
-    console.log("[createWebWallet] Storage state:", {
-        activeKey: storage.getActiveStore(),
-        backups: storage.getBackupStores().length,
-        conflictingActives: storage.getConflictingStores().length,
-        isActiveEnabled: storage.isActiveEnabled,
-    });
-    // Handle conflicting actives - must resolve before wallet can function
-    if (storage.getConflictingStores().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");
+            // Check if remote ended up in backup stores (active) or got partitioned (conflicting)
+            const remoteStorageKey = remoteClient.getSettings().storageIdentityKey;
+            const isActive = storage.getBackupStores().includes(remoteStorageKey);
+            if (isActive) {
+                console.log("[createWebWallet] Remote backup connected (we are active)");
+            }
+            else {
+                // Another device is active - need fullSync then setActive
+                // fullSync builds ID mappings before setActive attempts to merge
+                console.log("[createWebWallet] Another device is active, performing full sync...");
+                await fullSync({
+                    storage,
+                    remoteStorage: remoteClient,
+                    identityKey: identityPubKey,
+                    onProgress: (stage, msg) => console.log(`[createWebWallet] fullSync ${stage}: ${msg}`),
+                });
+                // Claim active status (merge now works because mappings exist from fullSync)
+                await storage.setActive(config.storageIdentityKey, (msg) => {
+                    console.log("[createWebWallet] setActive:", msg);
+                    return msg;
+                });
+                console.log("[createWebWallet] Remote backup connected (now active after handoff)");
+            }
         }
         catch (err) {
-            console.log("[createWebWallet] Conflict resolution failed, falling back to local-only:", err instanceof Error ? err.message : err);
+            console.log("[createWebWallet] Remote backup connection failed:", err instanceof Error ? err.message : err);
             remoteClient = undefined;
         }
     }

package/package.json

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