@1sat/wallet-toolbox 0.0.39 → 0.0.41

package/dist/wallet/factory.js

@@ -72,37 +72,35 @@ export async function createWebWallet(config) {
     storageOptions.feeModel = feeModel;
     const localStorage = new StorageIdb(storageOptions);
     await localStorage.migrate(DEFAULT_DATABASE_NAME, identityPubKey);
-    // 4. Attempt remote storage connection BEFORE creating Wallet (if URL provided)
+    // 4. Create storage manager with local-only storage initially (empty backups)
+    const storage = new WalletStorageManager(identityPubKey, localStorage, []);
+    await storage.makeAvailable();
+    // 5. Create the underlying Wallet FIRST (needed for StorageClient signing)
+    const underlyingWallet = new Wallet({
+        chain,
+        keyDeriver,
+        storage,
+        services: oneSatServices,
+    });
+    // 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 a temporary wallet just for StorageClient auth
-            // StorageClient needs a wallet to sign requests
-            const tempStorage = new WalletStorageManager(identityPubKey, localStorage);
-            await tempStorage.makeAvailable();
-            const tempWallet = new Wallet({
-                chain,
-                keyDeriver,
-                storage: tempStorage,
-                services: oneSatServices,
-            });
-            remoteClient = new StorageClient(tempWallet, config.remoteStorageUrl);
+            // 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
+            await storage.addWalletStorageProvider(remoteClient);
             console.log("[createWebWallet] Remote storage connected successfully");
-            // Clean up temp wallet (don't destroy storage - we'll reuse localStorage)
-            await tempWallet.destroy();
         }
         catch (err) {
             console.log("[createWebWallet] Remote storage connection failed:", err instanceof Error ? err.message : err);
             remoteClient = undefined;
         }
     }
-    // 5. Create storage manager with final configuration (local + remote if connected)
-    const backups = remoteClient ? [remoteClient] : [];
-    const storage = new WalletStorageManager(identityPubKey, localStorage, backups);
-    await storage.makeAvailable();
     // Log storage state using public APIs
     const stores = storage.getStores();
     console.log("[createWebWallet] Storage state:", {
@@ -112,7 +110,7 @@ export async function createWebWallet(config) {
         isActiveEnabled: storage.isActiveEnabled,
         allStores: stores.map(s => ({ name: s.storageName, key: s.storageIdentityKey.slice(0, 16) + "..." })),
     });
-    // 6. Handle conflicting actives or push to backups
+    // 7. Handle conflicting actives or sync to backups
     const conflictingStores = storage.getConflictingStores();
     const backupStores = storage.getBackupStores();
     if (conflictingStores.length > 0) {
@@ -144,13 +142,6 @@ export async function createWebWallet(config) {
             console.log("[createWebWallet] Backup failed:", err instanceof Error ? err.message : err);
         });
     }
-    // 7. Create the underlying Wallet with the FINAL storage configuration
-    const underlyingWallet = new Wallet({
-        chain,
-        keyDeriver,
-        storage,
-        services: oneSatServices,
-    });
     // 8. Wrap with permissions manager
     const wallet = new WalletPermissionsManager(underlyingWallet, adminOriginator, permissionsConfig);
     // 9. Create monitor (not started - consumer calls startTasks() when ready)

package/dist/wallet/fullSync.js

@@ -5,6 +5,7 @@
  * 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";
+import { EntitySyncState } from "@bsv/wallet-toolbox-mobile/out/src/storage/schema/entities/EntitySyncState.js";
 /**
  * Perform a full sync with the remote backup server.
  *
@@ -28,14 +29,34 @@ import { createSyncMap } from "@bsv/wallet-toolbox-mobile/out/src/storage/schema
  */
 export async function fullSync(options) {
     const { storage, remoteStorage, identityKey, onProgress } = options;
-    // Step 1: Push local data to remote
+    // Step 1: Push ALL local data to remote (bypassing timestamp filter)
     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`);
+    const localSettings = storage.getSettings();
+    const remoteSettings = await remoteStorage.makeAvailable();
+    let pushInserts = 0;
+    let pushUpdates = 0;
+    let chunkCount = 0;
+    for (;;) {
+        // Get sync state from remote for proper offsets
+        const ss = await EntitySyncState.fromStorage(remoteStorage, identityKey, localSettings);
+        const args = ss.makeRequestSyncChunkArgs(identityKey, remoteSettings.storageIdentityKey);
+        // KEY: Override since to undefined - includes ALL data regardless of timestamp
+        args.since = undefined;
+        // Get chunk from local storage
+        const chunk = await storage.runAsSync(async (sync) => sync.getSyncChunk(args));
+        // Send chunk to remote
+        const result = await remoteStorage.processSyncChunk(args, chunk);
+        pushInserts += result.inserts;
+        pushUpdates += result.updates;
+        chunkCount++;
+        onProgress?.("pushing", `Chunk ${chunkCount}: ${result.inserts} inserts, ${result.updates} updates`);
+        if (result.done)
+            break;
+    }
+    onProgress?.("pushing", `Pushed ${pushInserts} inserts, ${pushUpdates} updates`);
     // Step 2: Reset sync state to force full pull
     onProgress?.("resetting", "Resetting sync state...");
-    const remoteSettings = remoteStorage.getSettings();
+    const auth = await storage.getAuth();
     await storage.runAsStorageProvider(async (active) => {
         const syncStates = await active.findSyncStates({
             partial: {
@@ -63,7 +84,7 @@ export async function fullSync(options) {
     // Step 4: Complete
     onProgress?.("complete", "Full sync complete");
     return {
-        pushed: { inserts: pushResult.inserts, updates: pushResult.updates },
+        pushed: { inserts: pushInserts, updates: pushUpdates },
         pulled: { inserts: pullResult.inserts, updates: pullResult.updates },
     };
 }

package/package.json

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