@1sat/wallet-toolbox 0.0.70 → 0.0.72

package/dist/backup/FileBackupProvider.d.ts

@@ -1,7 +1,7 @@
-import type { sdk } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
-import type { TableSettings } from "@bsv/wallet-toolbox-mobile/out/src/storage/schema/tables/TableSettings.js";
-import type { TableSyncState } from "@bsv/wallet-toolbox-mobile/out/src/storage/schema/tables/TableSyncState.js";
-import type { TableUser } from "@bsv/wallet-toolbox-mobile/out/src/storage/schema/tables/TableUser.js";
+import type { sdk } from "@bopen-io/wallet-toolbox-mobile/out/src/index.client.js";
+import type { TableSettings } from "@bopen-io/wallet-toolbox-mobile/out/src/storage/schema/tables/TableSettings.js";
+import type { TableSyncState } from "@bopen-io/wallet-toolbox-mobile/out/src/storage/schema/tables/TableSyncState.js";
+import type { TableUser } from "@bopen-io/wallet-toolbox-mobile/out/src/storage/schema/tables/TableUser.js";
 import { Zip, ZipDeflate } from "fflate";
 type AuthId = sdk.AuthId;
 type ProcessSyncChunkResult = sdk.ProcessSyncChunkResult;

package/dist/backup/FileRestoreReader.d.ts

@@ -1,5 +1,5 @@
-import type { sdk } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
-import type { TableSettings } from "@bsv/wallet-toolbox-mobile/out/src/storage/schema/tables/TableSettings.js";
+import type { sdk } from "@bopen-io/wallet-toolbox-mobile/out/src/index.client.js";
+import type { TableSettings } from "@bopen-io/wallet-toolbox-mobile/out/src/storage/schema/tables/TableSettings.js";
 import type { Unzipped } from "fflate";
 import type { BackupManifest } from "./types";
 type RequestSyncChunkArgs = sdk.RequestSyncChunkArgs;

package/dist/backup/types.d.ts

@@ -1,4 +1,4 @@
-import type { sdk } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
+import type { sdk } from "@bopen-io/wallet-toolbox-mobile/out/src/index.client.js";
 type Chain = sdk.Chain;
 /**
  * Manifest stored in the backup ZIP file describing the backup contents.

package/dist/services/OneSatServices.d.ts

@@ -1,5 +1,5 @@
 import { Beef, Transaction } from "@bsv/sdk";
-import type { TableOutput, sdk as toolboxSdk } from "@bsv/wallet-toolbox";
+import type { TableOutput, sdk as toolboxSdk } from "@bopen-io/wallet-toolbox";
 type Chain = toolboxSdk.Chain;
 type BlockHeader = toolboxSdk.BlockHeader;
 type GetMerklePathResult = toolboxSdk.GetMerklePathResult;

package/dist/services/client/ChaintracksClient.d.ts

@@ -1,10 +1,10 @@
 import type { ChainTracker } from "@bsv/sdk";
-import type { BaseBlockHeader, BlockHeader, Chain } from "@bsv/wallet-toolbox";
+import type { BaseBlockHeader, BlockHeader, Chain } from "@bopen-io/wallet-toolbox";
 import type { ClientOptions } from "../types";
 import { BaseClient } from "./BaseClient";
 /**
  * Client for /1sat/chaintracks/* routes.
- * Implements ChaintracksClientApi interface from @bsv/wallet-toolbox.
+ * Implements ChaintracksClientApi interface from @bopen-io/wallet-toolbox.
  *
  * Routes:
  * - GET /tip - Get chain tip

package/dist/services/client/ChaintracksClient.js

@@ -54,7 +54,7 @@ function toHex(data) {
 }
 /**
  * Client for /1sat/chaintracks/* routes.
- * Implements ChaintracksClientApi interface from @bsv/wallet-toolbox.
+ * Implements ChaintracksClientApi interface from @bopen-io/wallet-toolbox.
  *
  * Routes:
  * - GET /tip - Get chain tip

package/dist/wallet/factory.d.ts

@@ -5,7 +5,7 @@
  * (browser extension) and 1sat-website (React app).
  */
 import { PrivateKey } from "@bsv/sdk";
-import { Monitor, type PermissionsManagerConfig, StorageClient, Wallet, WalletPermissionsManager, WalletStorageManager } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
+import { Monitor, type PermissionsManagerConfig, StorageClient, Wallet, WalletPermissionsManager, WalletStorageManager } from "@bopen-io/wallet-toolbox-mobile/out/src/index.client.js";
 import { OneSatServices } from "../services/OneSatServices";
 import { type FullSyncResult, type FullSyncStage } from "./fullSync";
 type Chain = "main" | "test";

package/dist/wallet/factory.js

@@ -5,7 +5,7 @@
  * (browser extension) and 1sat-website (React app).
  */
 import { KeyDeriver, PrivateKey } from "@bsv/sdk";
-import { Monitor, Services, StorageClient, StorageIdb, StorageProvider, Wallet, WalletPermissionsManager, WalletStorageManager, } from "@bsv/wallet-toolbox-mobile/out/src/index.client.js";
+import { Monitor, Services, StorageClient, StorageIdb, StorageProvider, Wallet, WalletPermissionsManager, WalletStorageManager, } from "@bopen-io/wallet-toolbox-mobile/out/src/index.client.js";
 import { OneSatServices } from "../services/OneSatServices";
 import { fullSync } from "./fullSync";
 // Default database name for IndexedDB storage
@@ -92,9 +92,31 @@ export async function createWebWallet(config) {
             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 as backup destination (push-only, no pull)
+            // Add remote to storage manager - it will partition as conflicting if another device is active
             await storage.addWalletStorageProvider(remoteClient);
-            console.log("[createWebWallet] Remote backup connected");
+            // 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] Remote backup connection failed:", err instanceof Error ? err.message : err);

package/dist/wallet/fullSync.d.ts

@@ -4,8 +4,8 @@
  * 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";
+import type { WalletStorageManager } from "@bopen-io/wallet-toolbox-mobile/out/src/index.client.js";
+import type { sdk as mobileToolboxSdk } from "@bopen-io/wallet-toolbox-mobile/out/src/index.client.js";
 type WalletStorageProvider = mobileToolboxSdk.WalletStorageProvider;
 export type FullSyncStage = "pushing" | "resetting" | "pulling" | "complete";
 export interface FullSyncOptions {

package/dist/wallet/fullSync.js

@@ -4,8 +4,8 @@
  * 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";
-import { EntitySyncState } from "@bsv/wallet-toolbox-mobile/out/src/storage/schema/entities/EntitySyncState.js";
+import { createSyncMap } from "@bopen-io/wallet-toolbox-mobile/out/src/storage/schema/entities/EntityBase.js";
+import { EntitySyncState } from "@bopen-io/wallet-toolbox-mobile/out/src/storage/schema/entities/EntitySyncState.js";
 /**
  * Perform a full sync with the remote backup server.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/wallet-toolbox",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "description": "BSV wallet library extending @bsv/wallet-toolbox with 1Sat Ordinals protocol support",
   "author": "1Sat Team",
   "license": "MIT",
@@ -45,17 +45,17 @@
     "fflate": "^0.8.2"
   },
   "peerDependencies": {
-    "@bsv/wallet-toolbox-mobile": "npm:@bopen-io/wallet-toolbox-mobile@^1.7.22-idb-fix.3"
+    "@bopen-io/wallet-toolbox-mobile": "1.7.24-idb-fix.1"
   },
   "peerDependenciesMeta": {
-    "@bsv/wallet-toolbox-mobile": {
+    "@bopen-io/wallet-toolbox-mobile": {
       "optional": true
     }
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
-    "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@^1.7.22-idb-fix.3",
-    "@bsv/wallet-toolbox-mobile": "npm:@bopen-io/wallet-toolbox-mobile@^1.7.22-idb-fix.3",
+    "@bopen-io/wallet-toolbox": "1.7.24-idb-fix.1",
+    "@bopen-io/wallet-toolbox-mobile": "1.7.24-idb-fix.1",
     "@types/bun": "^1.3.4",
     "@types/chrome": "^0.1.32",
     "typescript": "^5.9.3"