@arkade-os/sdk 0.3.7 → 0.3.9

package/dist/cjs/wallet/serviceWorker/wallet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceWorkerWallet = void 0;
+exports.ServiceWorkerWallet = exports.ServiceWorkerReadonlyWallet = void 0;
 const response_1 = require("./response");
 const base_1 = require("@scure/base");
 const indexedDB_1 = require("../../storage/indexedDB");
@@ -16,7 +16,16 @@ class UnexpectedResponseError extends Error {
         this.name = "UnexpectedResponseError";
     }
 }
-class ServiceWorkerWallet {
+const createCommon = (options) => {
+    // Default to IndexedDB for service worker context
+    const storage = new indexedDB_1.IndexedDBStorageAdapter(options.dbName || utils_1.DEFAULT_DB_NAME, options.dbVersion);
+    // Create repositories
+    return {
+        walletRepo: new walletRepository_1.WalletRepositoryImpl(storage),
+        contractRepo: new contractRepository_1.ContractRepositoryImpl(storage),
+    };
+};
+class ServiceWorkerReadonlyWallet {
     constructor(serviceWorker, identity, walletRepository, contractRepository) {
         this.serviceWorker = serviceWorker;
         this.identity = identity;
@@ -24,27 +33,17 @@ class ServiceWorkerWallet {
         this.contractRepository = contractRepository;
     }
     static async create(options) {
-        // Default to IndexedDB for service worker context
-        const storage = new indexedDB_1.IndexedDBStorageAdapter(options.dbName || utils_1.DEFAULT_DB_NAME, options.dbVersion);
-        // Create repositories
-        const walletRepo = new walletRepository_1.WalletRepositoryImpl(storage);
-        const contractRepo = new contractRepository_1.ContractRepositoryImpl(storage);
-        // Extract identity and check if it can expose private key
-        const identity = isPrivateKeyIdentity(options.identity)
-            ? options.identity
-            : null;
-        if (!identity) {
-            throw new Error("ServiceWorkerWallet.create() requires a Identity that can expose a single private key");
-        }
-        // Extract private key for service worker initialization
-        const privateKey = identity.toHex();
+        const { walletRepo, contractRepo } = createCommon(options);
         // Create the wallet instance
-        const wallet = new ServiceWorkerWallet(options.serviceWorker, identity, walletRepo, contractRepo);
+        const wallet = new ServiceWorkerReadonlyWallet(options.serviceWorker, options.identity, walletRepo, contractRepo);
+        const publicKey = await options.identity
+            .compressedPublicKey()
+            .then(base_1.hex.encode);
         // Initialize the service worker with the config
         const initMessage = {
             type: "INIT_WALLET",
             id: getRandomId(),
-            privateKey,
+            key: { publicKey },
             arkServerUrl: options.arkServerUrl,
             arkServerPublicKey: options.arkServerPublicKey,
         };
@@ -59,14 +58,14 @@ class ServiceWorkerWallet {
      * @example
      * ```typescript
      * // One-liner setup - handles everything automatically!
-     * const wallet = await ServiceWorkerWallet.setup({
+     * const wallet = await ServiceWorkerReadonlyWallet.setup({
      *   serviceWorkerPath: '/service-worker.js',
      *   arkServerUrl: 'https://mutinynet.arkade.sh'
      * });
      *
-     * // With custom identity
-     * const identity = SingleKey.fromHex('your_private_key_hex');
-     * const wallet = await ServiceWorkerWallet.setup({
+     * // With custom readonly identity
+     * const identity = ReadonlySingleKey.fromPublicKey('your_public_key_hex');
+     * const wallet = await ServiceWorkerReadonlyWallet.setup({
      *   serviceWorkerPath: '/service-worker.js',
      *   arkServerUrl: 'https://mutinynet.arkade.sh',
      *   identity
@@ -77,7 +76,7 @@ class ServiceWorkerWallet {
         // Register and setup the service worker
         const serviceWorker = await (0, utils_1.setupServiceWorker)(options.serviceWorkerPath);
         // Use the existing create method
-        return ServiceWorkerWallet.create({
+        return ServiceWorkerReadonlyWallet.create({
             ...options,
             serviceWorker,
         });
@@ -229,6 +228,82 @@ class ServiceWorkerWallet {
             throw new Error(`Failed to get vtxos: ${error}`);
         }
     }
+    async reload() {
+        const message = {
+            type: "RELOAD_WALLET",
+            id: getRandomId(),
+        };
+        const response = await this.sendMessage(message);
+        if (response_1.Response.isWalletReloaded(response)) {
+            return response.success;
+        }
+        throw new UnexpectedResponseError(response);
+    }
+}
+exports.ServiceWorkerReadonlyWallet = ServiceWorkerReadonlyWallet;
+class ServiceWorkerWallet extends ServiceWorkerReadonlyWallet {
+    constructor(serviceWorker, identity, walletRepository, contractRepository) {
+        super(serviceWorker, identity, walletRepository, contractRepository);
+        this.serviceWorker = serviceWorker;
+        this.identity = identity;
+        this.walletRepository = walletRepository;
+        this.contractRepository = contractRepository;
+    }
+    static async create(options) {
+        const { walletRepo, contractRepo } = createCommon(options);
+        // Extract identity and check if it can expose private key
+        const identity = isPrivateKeyIdentity(options.identity)
+            ? options.identity
+            : null;
+        if (!identity) {
+            throw new Error("ServiceWorkerWallet.create() requires a Identity that can expose a single private key");
+        }
+        // Extract private key for service worker initialization
+        const privateKey = identity.toHex();
+        // Create the wallet instance
+        const wallet = new ServiceWorkerWallet(options.serviceWorker, identity, walletRepo, contractRepo);
+        // Initialize the service worker with the config
+        const initMessage = {
+            type: "INIT_WALLET",
+            id: getRandomId(),
+            key: { privateKey },
+            arkServerUrl: options.arkServerUrl,
+            arkServerPublicKey: options.arkServerPublicKey,
+        };
+        // Initialize the service worker
+        await wallet.sendMessage(initMessage);
+        return wallet;
+    }
+    /**
+     * Simplified setup method that handles service worker registration,
+     * identity creation, and wallet initialization automatically.
+     *
+     * @example
+     * ```typescript
+     * // One-liner setup - handles everything automatically!
+     * const wallet = await ServiceWorkerWallet.setup({
+     *   serviceWorkerPath: '/service-worker.js',
+     *   arkServerUrl: 'https://mutinynet.arkade.sh'
+     * });
+     *
+     * // With custom identity
+     * const identity = SingleKey.fromHex('your_private_key_hex');
+     * const wallet = await ServiceWorkerWallet.setup({
+     *   serviceWorkerPath: '/service-worker.js',
+     *   arkServerUrl: 'https://mutinynet.arkade.sh',
+     *   identity
+     * });
+     * ```
+     */
+    static async setup(options) {
+        // Register and setup the service worker
+        const serviceWorker = await (0, utils_1.setupServiceWorker)(options.serviceWorkerPath);
+        // Use the existing create method
+        return ServiceWorkerWallet.create({
+            ...options,
+            serviceWorker,
+        });
+    }
     async sendBitcoin(params) {
         const message = {
             type: "SEND_BITCOIN",
@@ -286,17 +361,6 @@ class ServiceWorkerWallet {
             throw new Error(`Settlement failed: ${error}`);
         }
     }
-    async reload() {
-        const message = {
-            type: "RELOAD_WALLET",
-            id: getRandomId(),
-        };
-        const response = await this.sendMessage(message);
-        if (response_1.Response.isWalletReloaded(response)) {
-            return response.success;
-        }
-        throw new UnexpectedResponseError(response);
-    }
 }
 exports.ServiceWorkerWallet = ServiceWorkerWallet;
 function getRandomId() {

package/dist/cjs/wallet/serviceWorker/worker.js

@@ -1,7 +1,7 @@
 "use strict";
+/// <reference lib="webworker" />
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Worker = void 0;
-/// <reference lib="webworker" />
 const singleKey_1 = require("../../identity/singleKey");
 const __1 = require("..");
 const wallet_1 = require("../wallet");
@@ -15,9 +15,70 @@ const indexedDB_1 = require("../../storage/indexedDB");
 const walletRepository_1 = require("../../repositories/walletRepository");
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
+class ReadonlyHandler {
+    constructor(wallet) {
+        this.wallet = wallet;
+    }
+    get offchainTapscript() {
+        return this.wallet.offchainTapscript;
+    }
+    get boardingTapscript() {
+        return this.wallet.boardingTapscript;
+    }
+    get onchainProvider() {
+        return this.wallet.onchainProvider;
+    }
+    get dustAmount() {
+        return this.wallet.dustAmount;
+    }
+    get identity() {
+        return this.wallet.identity;
+    }
+    notifyIncomingFunds(...args) {
+        return this.wallet.notifyIncomingFunds(...args);
+    }
+    getAddress() {
+        return this.wallet.getAddress();
+    }
+    getBoardingAddress() {
+        return this.wallet.getBoardingAddress();
+    }
+    getBoardingTxs() {
+        return this.wallet.getBoardingTxs();
+    }
+    async handleReload(_) {
+        const pending = await this.wallet.fetchPendingTxs();
+        return { pending, finalized: [] };
+    }
+    async handleSettle(..._) {
+        return undefined;
+    }
+    async handleSendBitcoin(..._) {
+        return undefined;
+    }
+}
+class Handler extends ReadonlyHandler {
+    constructor(wallet) {
+        super(wallet);
+        this.wallet = wallet;
+    }
+    async handleReload(vtxos) {
+        return this.wallet.finalizePendingTxs(vtxos.filter((vtxo) => vtxo.virtualStatus.state !== "swept" &&
+            vtxo.virtualStatus.state !== "settled"));
+    }
+    async handleSettle(...args) {
+        return this.wallet.settle(...args);
+    }
+    async handleSendBitcoin(...args) {
+        return this.wallet.sendBitcoin(...args);
+    }
+}
 /**
- * Worker is a class letting to interact with ServiceWorkerWallet from the client
- * it aims to be run in a service worker context
+ * Worker is a class letting to interact with ServiceWorkerWallet and ServiceWorkerReadonlyWallet from
+ * the client; it aims to be run in a service worker context.
+ *
+ * The messages requiring a Wallet rather than a ReadonlyWallet result in no-op
+ * without errors.
  */
 class Worker {
     constructor(dbName = utils_2.DEFAULT_DB_NAME, dbVersion = 1, messageCallback = () => { }) {
@@ -31,9 +92,9 @@ class Worker {
      * Get spendable vtxos for the current wallet address
      */
     async getSpendableVtxos() {
-        if (!this.wallet)
+        if (!this.handler)
             return [];
-        const address = await this.wallet.getAddress();
+        const address = await this.handler.getAddress();
         const allVtxos = await this.walletRepository.getVtxos(address);
         return allVtxos.filter(__1.isSpendable);
     }
@@ -41,9 +102,9 @@ class Worker {
      * Get swept vtxos for the current wallet address
      */
     async getSweptVtxos() {
-        if (!this.wallet)
+        if (!this.handler)
             return [];
-        const address = await this.wallet.getAddress();
+        const address = await this.handler.getAddress();
         const allVtxos = await this.walletRepository.getVtxos(address);
         return allVtxos.filter((vtxo) => vtxo.virtualStatus.state === "swept");
     }
@@ -51,9 +112,9 @@ class Worker {
      * Get all vtxos categorized by type
      */
     async getAllVtxos() {
-        if (!this.wallet)
+        if (!this.handler)
             return { spendable: [], spent: [] };
-        const address = await this.wallet.getAddress();
+        const address = await this.handler.getAddress();
         const allVtxos = await this.walletRepository.getVtxos(address);
         return {
             spendable: allVtxos.filter(__1.isSpendable),
@@ -64,17 +125,17 @@ class Worker {
      * Get all boarding utxos from wallet repository
      */
     async getAllBoardingUtxos() {
-        if (!this.wallet)
+        if (!this.handler)
             return [];
-        const address = await this.wallet.getBoardingAddress();
+        const address = await this.handler.getBoardingAddress();
         return await this.walletRepository.getUtxos(address);
     }
     async getTransactionHistory() {
-        if (!this.wallet)
+        if (!this.handler)
             return [];
         let txs = [];
         try {
-            const { boardingTxs, commitmentsToIgnore: roundsToIgnore } = await this.wallet.getBoardingTxs();
+            const { boardingTxs, commitmentsToIgnore: roundsToIgnore } = await this.handler.getBoardingTxs();
             const { spendable, spent } = await this.getAllVtxos();
             // convert VTXOs to offchain transactions
             const offchainTxs = (0, transactionHistory_1.vtxosToTxs)(spendable, spent, roundsToIgnore);
@@ -117,7 +178,7 @@ class Worker {
         await this.storage.clear();
         // Reset in-memory caches by recreating the repository
         this.walletRepository = new walletRepository_1.WalletRepositoryImpl(this.storage);
-        this.wallet = undefined;
+        this.handler = undefined;
         this.arkProvider = undefined;
         this.indexerProvider = undefined;
     }
@@ -125,26 +186,34 @@ class Worker {
         await this.onWalletInitialized();
     }
     async onWalletInitialized() {
-        if (!this.wallet ||
+        if (!this.handler ||
             !this.arkProvider ||
             !this.indexerProvider ||
-            !this.wallet.offchainTapscript ||
-            !this.wallet.boardingTapscript) {
+            !this.handler.offchainTapscript ||
+            !this.handler.boardingTapscript) {
             return;
         }
         // Get public key script and set the initial vtxos state
-        const script = base_1.hex.encode(this.wallet.offchainTapscript.pkScript);
+        const script = base_1.hex.encode(this.handler.offchainTapscript.pkScript);
         const response = await this.indexerProvider.getVtxos({
             scripts: [script],
         });
-        const vtxos = response.vtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.wallet, vtxo));
+        const vtxos = response.vtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.handler, vtxo));
+        try {
+            // recover pending transactions if possible
+            const { pending, finalized } = await this.handler.handleReload(vtxos);
+            console.info(`Recovered ${finalized.length}/${pending.length} pending transactions: ${finalized.join(", ")}`);
+        }
+        catch (error) {
+            console.error("Error recovering pending transactions:", error);
+        }
         // Get wallet address and save vtxos using unified repository
-        const address = await this.wallet.getAddress();
+        const address = await this.handler.getAddress();
         await this.walletRepository.saveVtxos(address, vtxos);
         // Fetch boarding utxos and save using unified repository
-        const boardingAddress = await this.wallet.getBoardingAddress();
-        const coins = await this.wallet.onchainProvider.getCoins(boardingAddress);
-        await this.walletRepository.saveUtxos(boardingAddress, coins.map((utxo) => (0, utils_1.extendCoin)(this.wallet, utxo)));
+        const boardingAddress = await this.handler.getBoardingAddress();
+        const coins = await this.handler.onchainProvider.getCoins(boardingAddress);
+        await this.walletRepository.saveUtxos(boardingAddress, coins.map((utxo) => (0, utils_1.extendCoin)(this.handler, utxo)));
         // Get transaction history to cache boarding txs
         const txs = await this.getTransactionHistory();
         if (txs)
@@ -153,13 +222,13 @@ class Worker {
         if (this.incomingFundsSubscription)
             this.incomingFundsSubscription();
         // subscribe for incoming funds and notify all clients when new funds arrive
-        this.incomingFundsSubscription = await this.wallet.notifyIncomingFunds(async (funds) => {
+        this.incomingFundsSubscription = await this.handler.notifyIncomingFunds(async (funds) => {
             if (funds.type === "vtxo") {
                 const newVtxos = funds.newVtxos.length > 0
-                    ? funds.newVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.wallet, vtxo))
+                    ? funds.newVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.handler, vtxo))
                     : [];
                 const spentVtxos = funds.spentVtxos.length > 0
-                    ? funds.spentVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.wallet, vtxo))
+                    ? funds.spentVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.handler, vtxo))
                     : [];
                 if ([...newVtxos, ...spentVtxos].length === 0)
                     return;
@@ -172,8 +241,8 @@ class Worker {
                 await this.sendMessageToAllClients(response_1.Response.vtxoUpdate(newVtxos, spentVtxos));
             }
             if (funds.type === "utxo") {
-                const utxos = funds.coins.map((utxo) => (0, utils_1.extendCoin)(this.wallet, utxo));
-                const boardingAddress = await this.wallet?.getBoardingAddress();
+                const utxos = funds.coins.map((utxo) => (0, utils_1.extendCoin)(this.handler, utxo));
+                const boardingAddress = await this.handler?.getBoardingAddress();
                 // save utxos using unified repository
                 await this.walletRepository.clearUtxos(boardingAddress);
                 await this.walletRepository.saveUtxos(boardingAddress, utxos);
@@ -189,31 +258,46 @@ class Worker {
         }
     }
     async handleInitWallet(event) {
-        const message = event.data;
-        if (!request_1.Request.isInitWallet(message)) {
-            console.error("Invalid INIT_WALLET message format", message);
-            event.source?.postMessage(response_1.Response.error(message.id, "Invalid INIT_WALLET message format"));
-            return;
-        }
-        if (!message.privateKey) {
-            const err = "Missing privateKey";
-            event.source?.postMessage(response_1.Response.error(message.id, err));
-            console.error(err);
+        if (!request_1.Request.isInitWallet(event.data)) {
+            console.error("Invalid INIT_WALLET message format", event.data);
+            event.source?.postMessage(response_1.Response.error(event.data.id, "Invalid INIT_WALLET message format"));
             return;
         }
+        const message = event.data;
+        const { arkServerPublicKey, arkServerUrl } = message;
+        this.arkProvider = new ark_1.RestArkProvider(arkServerUrl);
+        this.indexerProvider = new indexer_1.RestIndexerProvider(arkServerUrl);
         try {
-            const { arkServerPublicKey, arkServerUrl, privateKey } = message;
-            const identity = singleKey_1.SingleKey.fromHex(privateKey);
-            this.arkProvider = new ark_1.RestArkProvider(arkServerUrl);
-            this.indexerProvider = new indexer_1.RestIndexerProvider(arkServerUrl);
-            this.wallet = await wallet_1.Wallet.create({
-                identity,
-                arkServerUrl,
-                arkServerPublicKey,
-                storage: this.storage, // Use unified storage for wallet too
-            });
-            event.source?.postMessage(response_1.Response.walletInitialized(message.id));
-            await this.onWalletInitialized();
+            if ("privateKey" in message.key &&
+                typeof message.key.privateKey === "string") {
+                const { key: { privateKey }, } = message;
+                const identity = singleKey_1.SingleKey.fromHex(privateKey);
+                const wallet = await wallet_1.Wallet.create({
+                    identity,
+                    arkServerUrl,
+                    arkServerPublicKey,
+                    storage: this.storage, // Use unified storage for wallet too
+                });
+                this.handler = new Handler(wallet);
+            }
+            else if ("publicKey" in message.key &&
+                typeof message.key.publicKey === "string") {
+                const { key: { publicKey }, } = message;
+                const identity = singleKey_1.ReadonlySingleKey.fromPublicKey(base_1.hex.decode(publicKey));
+                const wallet = await wallet_1.ReadonlyWallet.create({
+                    identity,
+                    arkServerUrl,
+                    arkServerPublicKey,
+                    storage: this.storage, // Use unified storage for wallet too
+                });
+                this.handler = new ReadonlyHandler(wallet);
+            }
+            else {
+                const err = "Missing privateKey or publicKey in key object";
+                event.source?.postMessage(response_1.Response.error(message.id, err));
+                console.error(err);
+                return;
+            }
         }
         catch (error) {
             console.error("Error initializing wallet:", error);
@@ -221,7 +305,10 @@ class Worker {
                 ? error.message
                 : "Unknown error occurred";
             event.source?.postMessage(response_1.Response.error(message.id, errorMessage));
+            return;
         }
+        event.source?.postMessage(response_1.Response.walletInitialized(message.id));
+        await this.onWalletInitialized();
     }
     async handleSettle(event) {
         const message = event.data;
@@ -231,15 +318,20 @@ class Worker {
             return;
         }
         try {
-            if (!this.wallet) {
+            if (!this.handler) {
                 console.error("Wallet not initialized");
                 event.source?.postMessage(response_1.Response.error(message.id, "Wallet not initialized"));
                 return;
             }
-            const txid = await this.wallet.settle(message.params, (e) => {
+            const txid = await this.handler.handleSettle(message.params, (e) => {
                 event.source?.postMessage(response_1.Response.settleEvent(message.id, e));
             });
-            event.source?.postMessage(response_1.Response.settleSuccess(message.id, txid));
+            if (txid) {
+                event.source?.postMessage(response_1.Response.settleSuccess(message.id, txid));
+            }
+            else {
+                event.source?.postMessage(response_1.Response.error(message.id, "Operation not supported in readonly mode"));
+            }
         }
         catch (error) {
             console.error("Error settling:", error);
@@ -256,14 +348,19 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid SEND_BITCOIN message format"));
             return;
         }
-        if (!this.wallet) {
+        if (!this.handler) {
             console.error("Wallet not initialized");
             event.source?.postMessage(response_1.Response.error(message.id, "Wallet not initialized"));
             return;
         }
         try {
-            const txid = await this.wallet.sendBitcoin(message.params);
-            event.source?.postMessage(response_1.Response.sendBitcoinSuccess(message.id, txid));
+            const txid = await this.handler.handleSendBitcoin(message.params);
+            if (txid) {
+                event.source?.postMessage(response_1.Response.sendBitcoinSuccess(message.id, txid));
+            }
+            else {
+                event.source?.postMessage(response_1.Response.error(message.id, "Operation not supported in readonly mode"));
+            }
         }
         catch (error) {
             console.error("Error sending bitcoin:", error);
@@ -280,13 +377,13 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid GET_ADDRESS message format"));
             return;
         }
-        if (!this.wallet) {
+        if (!this.handler) {
             console.error("Wallet not initialized");
             event.source?.postMessage(response_1.Response.error(message.id, "Wallet not initialized"));
             return;
         }
         try {
-            const address = await this.wallet.getAddress();
+            const address = await this.handler.getAddress();
             event.source?.postMessage(response_1.Response.address(message.id, address));
         }
         catch (error) {
@@ -304,13 +401,13 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid GET_BOARDING_ADDRESS message format"));
             return;
         }
-        if (!this.wallet) {
+        if (!this.handler) {
             console.error("Wallet not initialized");
             event.source?.postMessage(response_1.Response.error(message.id, "Wallet not initialized"));
             return;
         }
         try {
-            const address = await this.wallet.getBoardingAddress();
+            const address = await this.handler.getBoardingAddress();
             event.source?.postMessage(response_1.Response.boardingAddress(message.id, address));
         }
         catch (error) {
@@ -328,7 +425,7 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid GET_BALANCE message format"));
             return;
         }
-        if (!this.wallet) {
+        if (!this.handler) {
             console.error("Wallet not initialized");
             event.source?.postMessage(response_1.Response.error(message.id, "Wallet not initialized"));
             return;
@@ -397,14 +494,14 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid GET_VTXOS message format"));
             return;
         }
-        if (!this.wallet) {
+        if (!this.handler) {
             console.error("Wallet not initialized");
             event.source?.postMessage(response_1.Response.error(message.id, "Wallet not initialized"));
             return;
         }
         try {
             const vtxos = await this.getSpendableVtxos();
-            const dustAmount = this.wallet.dustAmount;
+            const dustAmount = this.handler.dustAmount;
             const includeRecoverable = message.filter?.withRecoverable ?? false;
             const filteredVtxos = includeRecoverable
                 ? vtxos
@@ -415,6 +512,9 @@ class Worker {
                     if ((0, __1.isRecoverable)(v)) {
                         return false;
                     }
+                    if ((0, __1.isExpired)(v)) {
+                        return false;
+                    }
                     return true;
                 });
             event.source?.postMessage(response_1.Response.vtxos(message.id, filteredVtxos));
@@ -434,7 +534,7 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid GET_BOARDING_UTXOS message format"));
             return;
         }
-        if (!this.wallet) {
+        if (!this.handler) {
             console.error("Wallet not initialized");
             event.source?.postMessage(response_1.Response.error(message.id, "Wallet not initialized"));
             return;
@@ -458,7 +558,7 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid GET_TRANSACTION_HISTORY message format"));
             return;
         }
-        if (!this.wallet) {
+        if (!this.handler) {
             console.error("Wallet not initialized");
             event.source?.postMessage(response_1.Response.error(message.id, "Wallet not initialized"));
             return;
@@ -482,10 +582,10 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid GET_STATUS message format"));
             return;
         }
-        const pubKey = this.wallet
-            ? await this.wallet.identity.xOnlyPublicKey()
+        const pubKey = this.handler
+            ? await this.handler.identity.xOnlyPublicKey()
             : undefined;
-        event.source?.postMessage(response_1.Response.walletStatus(message.id, this.wallet !== undefined, pubKey));
+        event.source?.postMessage(response_1.Response.walletStatus(message.id, this.handler !== undefined, pubKey));
     }
     async handleMessage(event) {
         this.messageCallback(event);
@@ -564,7 +664,7 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid RELOAD_WALLET message format"));
             return;
         }
-        if (!this.wallet) {
+        if (!this.handler) {
             console.error("Wallet not initialized");
             event.source?.postMessage(response_1.Response.walletReloaded(message.id, false));
             return;

package/dist/cjs/wallet/utils.js

@@ -6,7 +6,7 @@ function extendVirtualCoin(wallet, vtxo) {
     return {
         ...vtxo,
         forfeitTapLeafScript: wallet.offchainTapscript.forfeit(),
-        intentTapLeafScript: wallet.offchainTapscript.exit(),
+        intentTapLeafScript: wallet.offchainTapscript.forfeit(),
         tapTree: wallet.offchainTapscript.encode(),
     };
 }
@@ -14,7 +14,7 @@ function extendCoin(wallet, utxo) {
     return {
         ...utxo,
         forfeitTapLeafScript: wallet.boardingTapscript.forfeit(),
-        intentTapLeafScript: wallet.boardingTapscript.exit(),
+        intentTapLeafScript: wallet.boardingTapscript.forfeit(),
         tapTree: wallet.boardingTapscript.encode(),
     };
 }

package/dist/cjs/wallet/vtxo-manager.js

@@ -31,6 +31,10 @@ function getRecoverableVtxos(vtxos, dustAmount) {
         if ((0, _1.isRecoverable)(vtxo)) {
             return true;
         }
+        // also include vtxos that are not swept but expired
+        if ((0, _1.isSpendable)(vtxo) && (0, _1.isExpired)(vtxo)) {
+            return true;
+        }
         // Recover preconfirmed subdust to consolidate small amounts
         if (vtxo.virtualStatus.state === "preconfirmed" &&
             (0, _1.isSubdust)(vtxo, dustAmount)) {
@@ -105,6 +109,7 @@ function isVtxoExpiringSoon(vtxo, thresholdMs // in milliseconds
 function getExpiringAndRecoverableVtxos(vtxos, thresholdMs, dustAmount) {
     return vtxos.filter((vtxo) => isVtxoExpiringSoon(vtxo, thresholdMs) ||
         (0, _1.isRecoverable)(vtxo) ||
+        ((0, _1.isSpendable)(vtxo) && (0, _1.isExpired)(vtxo)) ||
         (0, _1.isSubdust)(vtxo, dustAmount));
 }
 /**