@arkade-os/sdk 0.4.39 → 0.4.41

package/dist/{chunk-SYEGCMNV.js → chunk-D5MQYYYF.js}

@@ -1,6 +1,6 @@
-import { craftToSpendTx, Transaction, OP_RETURN_EMPTY_PKSCRIPT, baseFetch, Intent, getArkPsbtFields, CosignerPublicKey, setArkPsbtField, VtxoTaprootTree, maybeArkError, AssetRef, AssetId, AssetOutput, AssetGroup, AssetInput, Packet, Metadata, isEventSourceError, RestArkProvider, RestIndexerProvider, ArkError, BufferReader } from './chunk-D744IES4.js';
-import { isMainnetDescriptor, descriptorIsOurs, contractHandlers, DEFAULT_PAGE_SIZE, DelegateVtxo, WALLET_RECEIVE_SOURCE, deriveDescriptorLeafPubKey, DefaultVtxo, BoardingContractHandler } from './chunk-CUSABEUQ.js';
-import { VtxoScript, timelockToSequence, DEFAULT_NETWORK, DEFAULT_NETWORK_NAME, decodeTapscript, scriptFromTapLeafScript, CLTVMultisigTapscript, ArkAddress, CSVMultisigTapscript, getSequence, getNetwork, MultisigTapscript, networks as networks$1, DEFAULT_ARKADE_SERVER_URL } from './chunk-OUVTG72A.js';
+import { craftToSpendTx, Transaction, OP_RETURN_EMPTY_PKSCRIPT, baseFetch, Intent, getArkPsbtFields, CosignerPublicKey, setArkPsbtField, VtxoTaprootTree, maybeArkError, AssetRef, AssetId, AssetOutput, AssetGroup, AssetInput, Packet, Metadata, isEventSourceError, RestArkProvider, RestIndexerProvider, ArkError, BufferReader } from './chunk-5XAYUPK4.js';
+import { isMainnetDescriptor, descriptorIsOurs, contractHandlers, DEFAULT_PAGE_SIZE, DelegateVtxo, WALLET_RECEIVE_SOURCE, deriveDescriptorLeafPubKey, DefaultVtxo, BoardingContractHandler } from './chunk-YNEDJTX2.js';
+import { VtxoScript, timelockToSequence, DEFAULT_NETWORK, DEFAULT_NETWORK_NAME, decodeTapscript, scriptFromTapLeafScript, CLTVMultisigTapscript, ArkAddress, CSVMultisigTapscript, getSequence, getNetwork, MultisigTapscript, networks as networks$1, DEFAULT_ARKADE_SERVER_URL } from './chunk-BE5MUB7T.js';
 import { sha256, hash160, sha256x2, concatBytes, randomPrivateKeyBytes, pubECDSA, pubSchnorr, equalBytes as equalBytes$1 } from '@scure/btc-signer/utils.js';
 import { SigHash, Script, p2tr, RawWitness, Address, OutScript, p2wpkh, TaprootControlBlock, DEFAULT_SEQUENCE, Transaction as Transaction$2 } from '@scure/btc-signer';
 import { hex, base58, base64 } from '@scure/base';
@@ -1209,7 +1209,9 @@ function isValidBlocksTip(tip) {
   });
 }
 var isExplorerTransaction = (tx) => {
-  return typeof tx.txid === "string" && Array.isArray(tx.vout) && tx.vout.every(
+  return typeof tx.txid === "string" && (tx.vin === void 0 || Array.isArray(tx.vin) && tx.vin.every(
+    (vin) => typeof vin.txid === "string" && typeof vin.vout === "number"
+  )) && Array.isArray(tx.vout) && tx.vout.every(
     (vout) => typeof vout.scriptpubkey_address === "string" && typeof vout.value === "number"
   ) && typeof tx.status === "object" && typeof tx.status.confirmed === "boolean";
 };
@@ -1676,6 +1678,122 @@ function validateAssetGroupOutput(packet, outputIndex, assetId, expectedAmount)
   }
 }
 
+// src/wallet/activity.ts
+async function buildActivities(txs, resolvers) {
+  const preparedResolvers = (await Promise.all(
+    resolvers.map(async (r) => {
+      try {
+        await r.prepare?.();
+        return r;
+      } catch {
+        return void 0;
+      }
+    })
+  )).filter((r) => r !== void 0);
+  const keyOf = (tx) => tx.key.arkTxid || tx.key.commitmentTxid || tx.key.boardingTxid;
+  const merge = (a, b) => ({
+    groupId: a.groupId,
+    label: a.label ?? b.label,
+    kind: a.kind ?? b.kind,
+    metadata: { ...b.metadata, ...a.metadata },
+    amount: a.amount ?? b.amount
+  });
+  const isSent = (tx) => tx.type === "SENT" /* TxSent */;
+  const signedAmount = (tx, amount = tx.amount) => {
+    const magnitude = Math.abs(amount);
+    return isSent(tx) ? -magnitude : magnitude;
+  };
+  const buckets = /* @__PURE__ */ new Map();
+  for (const tx of txs) {
+    const perGroup = /* @__PURE__ */ new Map();
+    for (const r of preparedResolvers) {
+      let ms;
+      try {
+        ms = r.resolve(tx);
+      } catch {
+        ms = void 0;
+      }
+      for (const m of ms ?? []) {
+        if (!m.groupId) continue;
+        if (m.amount !== void 0 && !Number.isFinite(m.amount)) continue;
+        const existing = perGroup.get(m.groupId);
+        perGroup.set(m.groupId, existing ? merge(existing, m) : { ...m });
+      }
+    }
+    if (perGroup.size === 0) {
+      const id = keyOf(tx);
+      const b = buckets.get(id) ?? { members: [] };
+      b.members.push({ tx, amount: signedAmount(tx) });
+      buckets.set(id, b);
+      continue;
+    }
+    for (const m of perGroup.values()) {
+      const b = buckets.get(m.groupId) ?? { members: [] };
+      b.intent = {
+        label: b.intent?.label ?? m.label,
+        kind: b.intent?.kind ?? m.kind,
+        metadata: { ...m.metadata, ...b.intent?.metadata }
+      };
+      b.members.push({ tx, amount: signedAmount(tx, m.amount ?? tx.amount) });
+      buckets.set(m.groupId, b);
+    }
+  }
+  const netAmount = (members) => {
+    const sentKeys = new Set(members.filter((x) => isSent(x.tx)).map((x) => keyOf(x.tx)));
+    return members.reduce((s, x) => {
+      if (!isSent(x.tx) && sentKeys.has(keyOf(x.tx))) return s;
+      return s + x.amount;
+    }, 0);
+  };
+  const latest = (a) => a.txs[a.txs.length - 1].createdAt;
+  return [...buckets.entries()].map(([id, b]) => {
+    const members = [...b.members].sort((x, y) => x.tx.createdAt - y.tx.createdAt);
+    return {
+      id,
+      intent: b.intent,
+      txs: members.map((x) => x.tx),
+      amount: netAmount(members),
+      createdAt: members[0].tx.createdAt,
+      settled: members.every((x) => x.tx.settled)
+    };
+  }).sort((a, c) => latest(c) - latest(a));
+}
+var ActivityRegistry = class {
+  resolvers = /* @__PURE__ */ new Map();
+  /** Add a resolver, or override an existing one with the same id (kept in place). */
+  use(resolver) {
+    this.resolvers.set(resolver.id, resolver);
+  }
+  /** Remove a resolver (built-in or custom) by id. */
+  remove(id) {
+    this.resolvers.delete(id);
+  }
+  /** The registered resolver ids, in registration order. */
+  list() {
+    return [...this.resolvers.keys()];
+  }
+  /** All registered resolvers, in registration (priority) order. */
+  all() {
+    return [...this.resolvers.values()];
+  }
+};
+function boardingResolver() {
+  return {
+    id: "boarding",
+    resolve(tx) {
+      if (!tx.key.boardingTxid) return void 0;
+      return [
+        { groupId: `boarding:${tx.key.boardingTxid}`, label: "Deposit", kind: "boarding" }
+      ];
+    }
+  };
+}
+function createDefaultActivityRegistry() {
+  const registry = new ActivityRegistry();
+  registry.use(boardingResolver());
+  return registry;
+}
+
 // src/wallet/index.ts
 var TxType = /* @__PURE__ */ ((TxType2) => {
   TxType2["TxSent"] = "SENT";
@@ -2247,7 +2365,7 @@ var Estimator = class {
    * @param onchainOutputs - Array of onchain outputs to evaluate
    * @returns The total fee amount
    */
-  eval(offchainInputs, onchainInputs, offchainOutputs, onchainOutputs) {
+  evaluate(offchainInputs, onchainInputs, offchainOutputs, onchainOutputs) {
     let fee = FeeAmount.ZERO;
     for (const input of offchainInputs) {
       fee = fee.add(this.evalOffchainInput(input));
@@ -5603,7 +5721,13 @@ async function openDatabase(dbName, dbVersion, initDatabase2) {
       reject(request.error);
     };
     request.onsuccess = () => {
-      resolve(request.result);
+      const db = request.result;
+      db.onversionchange = () => {
+        db.close();
+        dbCache.delete(dbName);
+        refCounts.delete(dbName);
+      };
+      resolve(db);
     };
     request.onupgradeneeded = (event) => {
       const db = request.result;
@@ -8653,6 +8777,8 @@ var ReadonlyWallet = class _ReadonlyWallet {
   // already on their way out. The set is in-memory only: a process crash
   // clears it, and a stale entry only hides a VTXO (never spends one).
   _pendingSpendOutpoints = /* @__PURE__ */ new Set();
+  /** Activity resolvers consumed by {@link getActivityHistory}. */
+  activity = createDefaultActivityRegistry();
   get assetManager() {
     return this._assetManager;
   }
@@ -8858,7 +8984,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       type: info.boardingExitDelay < 512n ? "blocks" : "seconds"
     };
     const serverPubKey = hex.decode(info.signerPubkey).slice(1);
-    const delegatePubKey = config.delegateProvider ? await config.delegateProvider.getDelegateInfo().then((info2) => hex.decode(info2.pubkey).slice(1)) : config.delegatorProvider ? await config.delegatorProvider.getDelegateInfo().then((info2) => hex.decode(info2.pubkey).slice(1)) : void 0;
+    const delegatePubKey = config.delegateProvider ? await config.delegateProvider.getDelegateInfo().then((info2) => hex.decode(info2.pubkey).slice(1)).catch(() => void 0) : config.delegatorProvider ? await config.delegatorProvider.getDelegateInfo().then((info2) => hex.decode(info2.pubkey).slice(1)).catch(() => void 0) : void 0;
     const offchainOptions = {
       pubKey,
       serverPubKey,
@@ -9049,6 +9175,13 @@ var ReadonlyWallet = class _ReadonlyWallet {
     const getTxCreatedAt = (txid) => this.indexerProvider.getVtxos({ outpoints: [{ txid, vout: 0 }] }).then((res) => res.vtxos[0]?.createdAt.getTime());
     return buildTransactionHistory(allVtxos, boardingTxs, commitmentsToIgnore, getTxCreatedAt);
   }
+  /**
+   * Wallet history grouped by registered activity resolvers. With no resolver match,
+   * rows bucket by transaction key so send/change pairs stay together.
+   */
+  async getActivityHistory() {
+    return buildActivities(await this.getTransactionHistory(), this.activity.all());
+  }
   /**
    * Clear the global VTXO sync cursor, forcing a full re-bootstrap on next sync.
    * Useful for recovery after indexer reprocessing or debugging.
@@ -9056,6 +9189,17 @@ var ReadonlyWallet = class _ReadonlyWallet {
   async clearSyncCursor() {
     await clearSyncCursor(this.walletRepository);
   }
+  /**
+   * Wipe all locally persisted wallet data (VTXOs, UTXOs, history, sync
+   * cursor, contracts). Create a fresh wallet instance afterward.
+   */
+  async clear() {
+    try {
+      await this.dispose();
+    } finally {
+      await Promise.all([this.walletRepository.clear(), this.contractRepository.clear()]);
+    }
+  }
   /**
    * The on-chain (P2TR) addresses of every boarding tapscript this wallet
    * uses — the current address plus any historical rotated boarding
@@ -9080,6 +9224,12 @@ var ReadonlyWallet = class _ReadonlyWallet {
       const boardingAddress = tapscript.onchainAddress(this.network);
       const scriptHex = hex.encode(tapscript.pkScript);
       const txs = await this.onchainProvider.getTransactions(boardingAddress);
+      const commitmentByOutpoint = /* @__PURE__ */ new Map();
+      for (const tx of txs) {
+        for (const input of tx.vin ?? []) {
+          commitmentByOutpoint.set(`${input.txid}:${input.vout}`, tx.txid);
+        }
+      }
       for (const tx of txs) {
         for (let i = 0; i < tx.vout.length; i++) {
           const vout = tx.vout[i];
@@ -9090,8 +9240,10 @@ var ReadonlyWallet = class _ReadonlyWallet {
               outspendCache.set(tx.txid, spentStatuses);
             }
             const spentStatus = spentStatuses[i];
-            if (spentStatus?.spent) {
-              commitmentsToIgnore.add(spentStatus.txid);
+            const commitmentTxid = spentStatus?.txid || commitmentByOutpoint.get(`${tx.txid}:${i}`);
+            const spent = Boolean(spentStatus?.spent) || commitmentTxid !== void 0;
+            if (spent && commitmentTxid) {
+              commitmentsToIgnore.add(commitmentTxid);
             }
             utxos.push({
               txid: tx.txid,
@@ -9103,8 +9255,8 @@ var ReadonlyWallet = class _ReadonlyWallet {
               },
               isUnrolled: true,
               virtualStatus: {
-                state: spentStatus?.spent ? "spent" : "settled",
-                commitmentTxIds: spentStatus?.spent ? [spentStatus.txid] : void 0
+                state: spent ? "spent" : "settled",
+                commitmentTxIds: spent && commitmentTxid ? [commitmentTxid] : void 0
               },
               createdAt: tx.status.confirmed ? new Date(tx.status.block_time * 1e3) : /* @__PURE__ */ new Date(0),
               script: scriptHex
@@ -10526,6 +10678,9 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           settlementPsbt = await this._signerRouter.sign(settlementPsbt, [
             { index: i, lookupScript: script }
           ]);
+          if (!settlementPsbt.getInput(i).tapScriptSig?.length) {
+            throw new Error(await this.unsignableBoardingInputError(input, script));
+          }
           hasBoardingUtxos = true;
           break;
         }
@@ -10590,6 +10745,24 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       );
     }
   }
+  // Best-effort: every enrichment is guarded so a secondary failure can't
+  // mask the original signing error.
+  async unsignableBoardingInputError(input, script) {
+    const scriptHex = hex.encode(script);
+    let unresolvedAddress = "<undecodable>";
+    try {
+      unresolvedAddress = Address(this.network).encode(OutScript.decode(script));
+    } catch {
+    }
+    let recognized = "<unavailable>";
+    try {
+      const current = await this.getBoardingAddress();
+      const all = await this.getBoardingAddresses();
+      recognized = `current=${current}; all=[${all.join(", ")}]`;
+    } catch {
+    }
+    return `failed to sign boarding input ${input.txid}:${input.vout}: signer did not recognize script ${scriptHex} (${unresolvedAddress}); would have reached arkd unsigned and been rejected as "not a wallet script". Recognized boarding addresses: ${recognized}. Likely a rotated boarding address with a missing contract row.`;
+  }
   /**
    * Create a batch event handler for settlement flows.
    *
@@ -11517,9 +11690,15 @@ async function waitForIncomingFunds(wallet) {
 
 // src/worker/errors.ts
 var MESSAGE_BUS_NOT_INITIALIZED = "MessageBus not initialized";
+var MESSAGE_BUS_INITIALIZING = `${MESSAGE_BUS_NOT_INITIALIZED}: initializing`;
 var MessageBusNotInitializedError = class extends Error {
+  constructor(message = MESSAGE_BUS_NOT_INITIALIZED) {
+    super(message);
+  }
+};
+var MessageBusInitializingError = class extends MessageBusNotInitializedError {
   constructor() {
-    super(MESSAGE_BUS_NOT_INITIALIZED);
+    super(MESSAGE_BUS_INITIALIZING);
   }
 };
 var ServiceWorkerTimeoutError = class extends Error {
@@ -11561,6 +11740,16 @@ var MessageBus = class {
   tickInProgress = false;
   debug = false;
   initialized = false;
+  /**
+   * FIFO chain that serializes `INITIALIZE_MESSAGE_BUS` handling. Each init
+   * runs to completion in enqueue order.
+   */
+  initChain = Promise.resolve();
+  /**
+   * Number of inits accepted but not yet settled (queued or running). The
+   * bus refuses ordinary wallet messages while this is > 0.
+   */
+  pendingInitCount = 0;
   buildServicesFn;
   boundOnMessage = this.onMessage.bind(this);
   /** Start the message bus and attach service-worker event listeners. */
@@ -11606,11 +11795,12 @@ var MessageBus = class {
   async runTick() {
     if (!this.running) return;
     if (this.tickInProgress) return;
-    this.tickInProgress = true;
     if (this.tickTimeout !== null) {
       self.clearTimeout(this.tickTimeout);
       this.tickTimeout = null;
     }
+    if (this.pendingInitCount > 0) return;
+    this.tickInProgress = true;
     try {
       const now = Date.now();
       for (const updater of this.handlers.values()) {
@@ -11644,7 +11834,34 @@ var MessageBus = class {
       this.scheduleNextTick();
     }
   }
-  async waitForInit(config) {
+  /**
+   * Serialize init requests on {@link initChain}.
+   * Returns this init's own result.
+   */
+  waitForInit(config) {
+    this.pendingInitCount += 1;
+    const run = this.initChain.then(
+      () => this.doInit(config),
+      // A rejected init never blocks the next request.
+      () => this.doInit(config)
+    ).finally(() => {
+      this.pendingInitCount -= 1;
+    });
+    this.initChain = run.catch(() => void 0);
+    return run;
+  }
+  /**
+   * The bus serves ordinary wallet messages only when it is initialized AND
+   * no init is in flight.
+   */
+  acceptsWalletMessages() {
+    return this.initialized && this.pendingInitCount === 0;
+  }
+  async doInit(config) {
+    if (this.tickTimeout !== null) {
+      self.clearTimeout(this.tickTimeout);
+      this.tickTimeout = null;
+    }
     if (this.initialized) {
       this.initialized = false;
       await Promise.all(
@@ -11657,11 +11874,20 @@ var MessageBus = class {
       ...config.messageTimeouts ?? {}
     };
     const services = await this.buildServicesFn(config);
-    for (const updater of this.handlers.values()) {
-      if (this.debug) console.log(`Starting updater: ${updater.messageTag}`);
-      await updater.start(services, {
-        walletRepository: this.walletRepository
-      });
+    const started = [];
+    try {
+      for (const updater of this.handlers.values()) {
+        if (this.debug) console.log(`Starting updater: ${updater.messageTag}`);
+        await updater.start(services, {
+          walletRepository: this.walletRepository
+        });
+        started.push(updater);
+      }
+    } catch (err) {
+      await Promise.all(started.map((h) => h.stop().catch(() => {
+      })));
+      this.initialized = false;
+      throw err;
     }
     this.scheduleNextTick();
     this.initialized = true;
@@ -11720,23 +11946,29 @@ var MessageBus = class {
       if (this.debug) {
         console.log("Init Command received");
       }
-      await this.waitForInit(event.data.config);
-      this.deliverResponse(event.source, { id, tag }, { id, tag });
-      if (this.debug) {
-        console.log("MessageBus initialized");
+      try {
+        await this.waitForInit(event.data.config);
+        this.deliverResponse(event.source, { id, tag }, { id, tag });
+        if (this.debug) {
+          console.log("MessageBus initialized");
+        }
+      } catch (error) {
+        if (this.debug) console.error("MessageBus init failed", error);
+        this.deliverResponse(event.source, { id, tag, error: toError(error) }, { id, tag });
       }
       return;
     }
-    if (!this.initialized) {
+    if (!this.acceptsWalletMessages()) {
       if (this.debug)
-        console.warn("Event received before initialization, dropping", event.data);
+        console.warn("Event received while bus unavailable, dropping", event.data);
       const fallbackTag = tag ?? "unknown";
+      const error = this.pendingInitCount > 0 ? new MessageBusInitializingError() : new MessageBusNotInitializedError();
       this.deliverResponse(
         event.source,
         {
           id,
           tag: fallbackTag,
-          error: new MessageBusNotInitializedError()
+          error
         },
         { id, tag: fallbackTag }
       );
@@ -13119,26 +13351,19 @@ var WalletMessageHandler = class {
     });
     return filteredVtxos;
   }
+  /** Tear down handler subscriptions, then delegate the full wipe to the wallet. */
   async clear() {
-    if (!this.readonlyWallet) return;
-    if (this.incomingFundsSubscription) this.incomingFundsSubscription();
+    const wallet = this.wallet ?? this.readonlyWallet;
+    if (!wallet) return;
+    if (this.incomingFundsSubscription) {
+      this.incomingFundsSubscription();
+      this.incomingFundsSubscription = void 0;
+    }
     if (this.contractEventsSubscription) {
       this.contractEventsSubscription();
       this.contractEventsSubscription = void 0;
     }
-    try {
-      if (this.wallet) {
-        await this.wallet.dispose();
-      } else {
-        await this.readonlyWallet.dispose();
-      }
-    } catch (_) {
-    }
-    try {
-      await this.walletRepository?.clear();
-    } catch (_) {
-      console.warn("Failed to clear vtxos from wallet repository");
-    }
+    await wallet.clear();
     this.wallet = void 0;
     this.readonlyWallet = void 0;
     this.arkProvider = void 0;
@@ -13246,6 +13471,13 @@ var WalletMessageHandler = class {
 function isMessageBusNotInitializedError(error) {
   return error instanceof Error && error.message.includes(MESSAGE_BUS_NOT_INITIALIZED);
 }
+function isMessageBusInitializingError(error) {
+  return error instanceof Error && error.message.includes(MESSAGE_BUS_INITIALIZING);
+}
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var INIT_WAIT_BACKOFF_CAP_MS = 2e3;
+var MAX_INIT_WAITS = 8;
+var initWaitBackoffMs = (attempt) => Math.min(100 * 2 ** attempt, INIT_WAIT_BACKOFF_CAP_MS);
 var DEFAULT_MESSAGE_TIMEOUTS = {
   // Fast reads — fail quickly
   GET_ADDRESS: 1e4,
@@ -13422,6 +13654,7 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
   walletRepository;
   contractRepository;
   identity;
+  activity = createDefaultActivityRegistry();
   _readonlyAssetManager;
   initConfig = null;
   initWalletPayload = null;
@@ -13514,6 +13747,7 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
     wallet.initWalletPayload = initWalletPayload;
     wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
     wallet.messageTimeouts = messageTimeouts;
+    await wallet.assertWorkerIdentityMatches();
     return wallet;
   }
   /**
@@ -13645,7 +13879,7 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
   }
   // send a message, retrying up to 2 times if the service worker was
   // killed and restarted by the OS (mobile browsers do this aggressively)
-  async sendMessageWithRetry(request) {
+  async sendMessageWithRetry(request, withEvents) {
     if (this.initConfig) {
       try {
         await this.pingServiceWorker();
@@ -13655,32 +13889,23 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
     }
     const timeoutMs = this.getTimeoutForRequest(request);
     const maxRetries = 2;
-    for (let attempt = 0; ; attempt++) {
+    for (let attempt = 0, initWaits = 0; ; attempt++) {
       try {
+        if (withEvents) {
+          return await this.sendMessageStreaming(
+            request,
+            withEvents.onEvent,
+            withEvents.isComplete
+          );
+        }
         return await this.sendMessageDirect(request, timeoutMs);
       } catch (error) {
-        if (!isMessageBusNotInitializedError(error) || attempt >= maxRetries) {
-          throw error;
+        if (isMessageBusInitializingError(error)) {
+          if (initWaits >= MAX_INIT_WAITS) throw error;
+          await sleep(initWaitBackoffMs(initWaits++));
+          attempt--;
+          continue;
         }
-        await this.reinitialize();
-      }
-    }
-  }
-  // Like sendMessage but for streaming responses — retries with
-  // reinitialize when the service worker has been killed/restarted.
-  async sendMessageWithEvents(request, onEvent, isComplete) {
-    if (this.initConfig) {
-      try {
-        await this.pingServiceWorker();
-      } catch {
-        await this.reinitialize();
-      }
-    }
-    const maxRetries = 2;
-    for (let attempt = 0; ; attempt++) {
-      try {
-        return await this.sendMessageStreaming(request, onEvent, isComplete);
-      } catch (error) {
         if (!isMessageBusNotInitializedError(error) || attempt >= maxRetries) {
           throw error;
         }
@@ -13753,24 +13978,48 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
         payload
       };
       await this.sendMessageDirect(initMessage, this.getTimeoutForRequest(initMessage));
+      await this.assertWorkerIdentityMatches();
     })().finally(() => {
       this.reinitPromise = null;
     });
     return this.reinitPromise;
   }
-  /** Clear cached wallet state from both the page and service worker storage. */
+  /**
+   * Verify the worker is bound to this wallet's identity before the SDK hands
+   * back (or recovers) a usable wallet object.
+   *
+   * Compares the stable baseline identity key (`identity.xOnlyPublicKey()`) to the one reported
+   * by the worker via GET_STATUS.
+   */
+  async assertWorkerIdentityMatches() {
+    const expected = hex.encode(await this.identity.xOnlyPublicKey());
+    const message = {
+      id: getRandomId(),
+      tag: this.messageTag,
+      type: "GET_STATUS"
+    };
+    const response = await this.sendMessageDirect(
+      message,
+      this.getTimeoutForRequest(message)
+    );
+    const workerKey = response.payload.xOnlyPublicKey;
+    if (!workerKey) {
+      throw new Error("Service worker identity mismatch: worker did not report an identity");
+    }
+    const actual = hex.encode(workerKey);
+    if (actual !== expected) {
+      throw new Error(
+        `Service worker identity mismatch: expected ${expected}, got ${actual}`
+      );
+    }
+  }
+  /** This tells the service worker to wipe all locally persisted wallet data. */
   async clear() {
     const message = {
       id: getRandomId(),
       tag: this.messageTag,
       type: "CLEAR"
     };
-    try {
-      const address = await this.getAddress();
-      await this.walletRepository.deleteVtxos(address);
-    } catch (_) {
-      console.warn("Failed to clear vtxos from wallet repository");
-    }
     await this.sendMessage(message);
   }
   async getAddress() {
@@ -13843,6 +14092,9 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
       throw new Error(`Failed to get status: ${error}`);
     }
   }
+  async getActivityHistory() {
+    return buildActivities(await this.getTransactionHistory(), this.activity.all());
+  }
   async getTransactionHistory() {
     const message = {
       id: getRandomId(),
@@ -14178,6 +14430,7 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
     wallet.initWalletPayload = initWalletPayload;
     wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
     wallet.messageTimeouts = messageTimeouts;
+    await wallet.assertWorkerIdentityMatches();
     return wallet;
   }
   /**
@@ -14225,11 +14478,10 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
       payload: { params }
     };
     try {
-      const response = await this.sendMessageWithEvents(
-        message,
-        (resp) => callback?.(resp.payload),
-        (resp) => resp.type === "SETTLE_SUCCESS"
-      );
+      const response = await this.sendMessageWithRetry(message, {
+        onEvent: (resp) => callback?.(resp.payload),
+        isComplete: (resp) => resp.type === "SETTLE_SUCCESS"
+      });
       return response.payload.txid;
     } catch (error) {
       throw new Error(`Settlement failed: ${error}`);
@@ -14254,12 +14506,11 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
       payload: opts ?? {}
     };
     try {
-      await this.sendMessageWithEvents(
-        message,
-        () => {
+      await this.sendMessageWithRetry(message, {
+        onEvent: () => {
         },
-        (resp) => resp.type === "RESTORE_WALLET_SUCCESS"
-      );
+        isComplete: (resp) => resp.type === "RESTORE_WALLET_SUCCESS"
+      });
     } catch (error) {
       if (isSerializedAggregateError(error)) {
         throw deserializeAggregateError(error);
@@ -14347,11 +14598,10 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
           id: getRandomId()
         };
         try {
-          const response = await wallet.sendMessageWithEvents(
-            message,
-            (resp) => eventCallback?.(resp.payload),
-            (resp) => resp.type === "RECOVER_VTXOS_SUCCESS"
-          );
+          const response = await wallet.sendMessageWithRetry(message, {
+            onEvent: (resp) => eventCallback?.(resp.payload),
+            isComplete: (resp) => resp.type === "RECOVER_VTXOS_SUCCESS"
+          });
           return response.payload.txid;
         } catch (e) {
           throw new Error(`Failed to recover vtxos: ${e}`);
@@ -14398,11 +14648,10 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
           payload: options
         };
         try {
-          const response = await wallet.sendMessageWithEvents(
-            message,
-            (resp) => eventCallback?.(resp.payload),
-            (resp) => resp.type === "RENEW_VTXOS_SUCCESS"
-          );
+          const response = await wallet.sendMessageWithRetry(message, {
+            onEvent: (resp) => eventCallback?.(resp.payload),
+            isComplete: (resp) => resp.type === "RENEW_VTXOS_SUCCESS"
+          });
           return response.payload.txid;
         } catch (e) {
           throw new Error(`Failed to renew vtxos: ${e}`);
@@ -14441,13 +14690,12 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
           id: getRandomId()
         };
         try {
-          const response = await wallet.sendMessageWithEvents(
-            message,
-            (resp) => options?.eventCallback?.(
+          const response = await wallet.sendMessageWithRetry(message, {
+            onEvent: (resp) => options?.eventCallback?.(
               resp.payload
             ),
-            (resp) => resp.type === "MIGRATE_DEPRECATED_SIGNER_VTXOS_SUCCESS"
-          );
+            isComplete: (resp) => resp.type === "MIGRATE_DEPRECATED_SIGNER_VTXOS_SUCCESS"
+          });
           return deserializeMigrationReport(
             response.payload.report
           );
@@ -15383,12 +15631,15 @@ function errorText(err) {
   }
   return "";
 }
+function normalizedErrorText(err) {
+  return errorText(err).toLowerCase().replace(/\s+/g, "");
+}
 function isMissingHeightError(err) {
-  return errorText(err).toLowerCase().includes("missingheight");
+  return normalizedErrorText(err).includes("missingheight");
 }
 function isTxNotInBlockError(err) {
-  const normalized = errorText(err).toLowerCase();
-  return normalized.includes("not yet in a block") || normalized.includes("not in a block") || normalized.includes("not in block") || normalized.includes("no confirmed transaction");
+  const normalized = normalizedErrorText(err);
+  return normalized.includes("notyetinablock") || normalized.includes("notinablock") || normalized.includes("notinblock") || normalized.includes("noconfirmedtransaction");
 }
 function childTxidFromHex(txHex) {
   const tx = Transaction$2.fromRaw(hex.decode(txHex), {
@@ -15659,7 +15910,7 @@ var Unroll;
       let lastStep;
       do {
         if (lastStep !== void 0) {
-          await sleep(1e3);
+          await sleep2(1e3);
         }
         const step = await this.next();
         await step.do();
@@ -15749,7 +16000,7 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
   signedTx.finalize();
   return signedTx;
 }
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function doUnroll(onchainProvider, pkg) {
@@ -15847,6 +16098,6 @@ function isArkContract(str) {
   return str.startsWith(ARKCONTRACT_PREFIX + "=");
 }
 
-export { ArkNote, AssetManager, BIP322, Batch, ContractManager, ContractRepositoryImpl, ContractWatcher, DB_VERSION, DEFAULT_MESSAGE_TIMEOUTS, DelegateManagerImpl, DelegateNotConfiguredError, DelegatorManagerImpl, DelegatorNotConfiguredError, DescriptorSigningProviderMissingError, DustChangeError, ELECTRUM_TCP_HOST, ELECTRUM_WS_URL, ESPLORA_URL, ElectrumOnchainProvider, EsploraProvider, Estimator, HDDescriptorProvider, InMemoryContractRepository, InMemoryWalletRepository, IndexedDBContractRepository, IndexedDBWalletRepository, MESSAGE_BUS_NOT_INITIALIZED, MIGRATION_KEY, MessageBus, MessageBusNotInitializedError, MissingSigningDescriptorError, MnemonicIdentity, OnchainWallet, P2A, Ramps, ReadonlyAssetManager, ReadonlyDescriptorIdentity, ReadonlySingleKey, ReadonlyWallet, ReadonlyWalletError, RestDelegateProvider, RestDelegatorProvider, SeedIdentity, ServiceWorkerReadonlyWallet, ServiceWorkerTimeoutError, ServiceWorkerWallet, SingleKey, TxTree, TxType, TxWeightEstimator, Unroll, VtxoManager, Wallet2 as Wallet, WalletMessageHandler, WalletNotInitializedError, WalletRepositoryImpl, WsElectrumChainSource, buildForfeitTx, buildOffchainTx, classifyAgainstSignerSet, classifyContractSigner, closeDatabase, combineTapscriptSigs, contractFromArkContract, contractFromArkContractWithAddress, decodeArkContract, deserializeAssets, deserializeUtxo, deserializeVtxo, encodeArkContract, extendVirtualCoinForContract, getMigrationStatus, getRandomId, hasBoardingTxExpired, isArkContract, isBatchSignable, isCooperativelyMigratable, isDiscoverable, isExpired, isRecoverable, isSpendable, isSubdust, isValidArkAddress, isVtxoExpiringSoon, isVtxoForScript, migrateWalletRepository, openDatabase, requiresMigration, rollbackMigration, saveVtxosForContract, scriptFromArkAddress, serializeAssets, serializeUtxo, serializeVtxo, setupServiceWorker, signerSetFromInfo, toXOnlySignerHex, validateConnectorsTxGraph, validateVtxoTxGraph, verifyTapscriptSignatures, waitForIncomingFunds, warnAndFilterVtxosForScript };
-//# sourceMappingURL=chunk-SYEGCMNV.js.map
-//# sourceMappingURL=chunk-SYEGCMNV.js.map
+export { ActivityRegistry, ArkNote, AssetManager, BIP322, Batch, ContractManager, ContractRepositoryImpl, ContractWatcher, DB_VERSION, DEFAULT_MESSAGE_TIMEOUTS, DelegateManagerImpl, DelegateNotConfiguredError, DelegatorManagerImpl, DelegatorNotConfiguredError, DescriptorSigningProviderMissingError, DustChangeError, ELECTRUM_TCP_HOST, ELECTRUM_WS_URL, ESPLORA_URL, ElectrumOnchainProvider, EsploraProvider, Estimator, HDDescriptorProvider, InMemoryContractRepository, InMemoryWalletRepository, IndexedDBContractRepository, IndexedDBWalletRepository, MESSAGE_BUS_INITIALIZING, MESSAGE_BUS_NOT_INITIALIZED, MIGRATION_KEY, MessageBus, MessageBusInitializingError, MessageBusNotInitializedError, MissingSigningDescriptorError, MnemonicIdentity, OnchainWallet, P2A, Ramps, ReadonlyAssetManager, ReadonlyDescriptorIdentity, ReadonlySingleKey, ReadonlyWallet, ReadonlyWalletError, RestDelegateProvider, RestDelegatorProvider, SeedIdentity, ServiceWorkerReadonlyWallet, ServiceWorkerTimeoutError, ServiceWorkerWallet, SingleKey, TxTree, TxType, TxWeightEstimator, Unroll, VtxoManager, Wallet2 as Wallet, WalletMessageHandler, WalletNotInitializedError, WalletRepositoryImpl, WsElectrumChainSource, boardingResolver, buildForfeitTx, buildOffchainTx, classifyAgainstSignerSet, classifyContractSigner, closeDatabase, combineTapscriptSigs, contractFromArkContract, contractFromArkContractWithAddress, createDefaultActivityRegistry, decodeArkContract, deserializeAssets, deserializeUtxo, deserializeVtxo, encodeArkContract, extendVirtualCoinForContract, getMigrationStatus, getRandomId, hasBoardingTxExpired, isArkContract, isBatchSignable, isCooperativelyMigratable, isDiscoverable, isExpired, isRecoverable, isSpendable, isSubdust, isValidArkAddress, isVtxoExpiringSoon, isVtxoForScript, migrateWalletRepository, openDatabase, requiresMigration, rollbackMigration, saveVtxosForContract, scriptFromArkAddress, serializeAssets, serializeUtxo, serializeVtxo, setupServiceWorker, signerSetFromInfo, toXOnlySignerHex, validateConnectorsTxGraph, validateVtxoTxGraph, verifyTapscriptSignatures, waitForIncomingFunds, warnAndFilterVtxosForScript };
+//# sourceMappingURL=chunk-D5MQYYYF.js.map
+//# sourceMappingURL=chunk-D5MQYYYF.js.map