@arkade-os/sdk 0.3.0-alpha.4 → 0.3.0-alpha.6

package/dist/cjs/providers/onchain.js

@@ -23,6 +23,7 @@ exports.ESPLORA_URL = {
 class EsploraProvider {
     constructor(baseUrl) {
         this.baseUrl = baseUrl;
+        this.polling = false;
     }
     async getCoins(address) {
         const response = await fetch(`${this.baseUrl}/address/${address}/utxo`);
@@ -93,6 +94,9 @@ class EsploraProvider {
         let intervalId = null;
         const wsUrl = this.baseUrl.replace(/^http(s)?:/, "ws$1:") + "/v1/ws";
         const poll = async () => {
+            if (this.polling)
+                return;
+            this.polling = true;
             // websocket is not reliable, so we will fallback to polling
             const pollingInterval = 5000; // 5 seconds
             const getAllTxs = () => {
@@ -102,19 +106,19 @@ class EsploraProvider {
             const initialTxs = await getAllTxs();
             // we use block_time in key to also notify when a transaction is confirmed
             const txKey = (tx) => `${tx.txid}_${tx.status.block_time}`;
+            // create a set of existing transactions to avoid duplicates
+            const existingTxs = new Set(initialTxs.map(txKey));
             // polling for new transactions
             intervalId = setInterval(async () => {
                 try {
                     // get current transactions
                     // we will compare with initialTxs to find new ones
                     const currentTxs = await getAllTxs();
-                    // create a set of existing transactions to avoid duplicates
-                    const existingTxs = new Set(initialTxs.map(txKey));
                     // filter out transactions that are already in initialTxs
                     const newTxs = currentTxs.filter((tx) => !existingTxs.has(txKey(tx)));
                     if (newTxs.length > 0) {
                         // Update the tracking set instead of growing the array
-                        initialTxs.push(...newTxs);
+                        newTxs.forEach((tx) => existingTxs.add(txKey(tx)));
                         callback(newTxs);
                     }
                 }
@@ -175,6 +179,7 @@ class EsploraProvider {
                 ws.close();
             if (intervalId)
                 clearInterval(intervalId);
+            this.polling = false;
         };
         return stopFunc;
     }

package/dist/cjs/repositories/contractRepository.js

@@ -126,5 +126,9 @@ class ContractRepositoryImpl {
             throw error; // Rethrow to notify caller of failure
         }
     }
+    async clearContractData() {
+        await this.storage.clear();
+        this.cache.clear();
+    }
 }
 exports.ContractRepositoryImpl = ContractRepositoryImpl;

package/dist/cjs/repositories/walletRepository.js

@@ -7,8 +7,7 @@ const btc_signer_1 = require("@scure/btc-signer");
 const toHex = (b) => (b ? base_1.hex.encode(b) : undefined);
 const fromHex = (h) => h ? base_1.hex.decode(h) : undefined;
 const serializeTapLeaf = ([cb, s]) => ({
-    cb: btc_signer_1.TaprootControlBlock.encode(cb) &&
-        base_1.hex.encode(btc_signer_1.TaprootControlBlock.encode(cb)),
+    cb: base_1.hex.encode(btc_signer_1.TaprootControlBlock.encode(cb)),
     s: base_1.hex.encode(s),
 });
 const serializeVtxo = (v) => ({
@@ -53,7 +52,7 @@ class WalletRepositoryImpl {
         try {
             const parsed = JSON.parse(stored);
             const vtxos = parsed.map(deserializeVtxo);
-            this.cache.vtxos.set(address, vtxos);
+            this.cache.vtxos.set(address, vtxos.slice());
             return vtxos.slice();
         }
         catch (error) {
@@ -71,7 +70,7 @@ class WalletRepositoryImpl {
         else {
             vtxos.push(vtxo);
         }
-        this.cache.vtxos.set(address, vtxos);
+        this.cache.vtxos.set(address, vtxos.slice());
         await this.storage.setItem(`vtxos:${address}`, JSON.stringify(vtxos.map(serializeVtxo)));
     }
     async saveVtxos(address, vtxos) {
@@ -85,14 +84,14 @@ class WalletRepositoryImpl {
                 storedVtxos.push(vtxo);
             }
         }
-        this.cache.vtxos.set(address, storedVtxos);
+        this.cache.vtxos.set(address, storedVtxos.slice());
         await this.storage.setItem(`vtxos:${address}`, JSON.stringify(storedVtxos.map(serializeVtxo)));
     }
     async removeVtxo(address, vtxoId) {
         const vtxos = await this.getVtxos(address);
         const [txid, vout] = vtxoId.split(":");
-        const filtered = vtxos.filter((v) => !(v.txid === txid && v.vout === parseInt(vout)));
-        this.cache.vtxos.set(address, filtered);
+        const filtered = vtxos.filter((v) => !(v.txid === txid && v.vout === parseInt(vout, 10)));
+        this.cache.vtxos.set(address, filtered.slice());
         await this.storage.setItem(`vtxos:${address}`, JSON.stringify(filtered.map(serializeVtxo)));
     }
     async clearVtxos(address) {
@@ -122,18 +121,36 @@ class WalletRepositoryImpl {
     }
     async saveTransaction(address, tx) {
         const transactions = await this.getTransactionHistory(address);
-        const existing = transactions.findIndex((t) => t.id === tx.id);
+        const existing = transactions.findIndex((t) => t.key === tx.key);
         if (existing !== -1) {
             transactions[existing] = tx;
         }
         else {
             transactions.push(tx);
-            // Sort by timestamp descending
-            transactions.sort((a, b) => b.timestamp - a.timestamp);
         }
+        // Sort by createdAt descending
+        transactions.sort((a, b) => b.createdAt - a.createdAt);
         this.cache.transactions.set(address, transactions);
         await this.storage.setItem(`tx:${address}`, JSON.stringify(transactions));
     }
+    async saveTransactions(address, txs) {
+        const storedTransactions = await this.getTransactionHistory(address);
+        for (const tx of txs) {
+            const existing = storedTransactions.findIndex((t) => t.key === tx.key);
+            if (existing !== -1) {
+                storedTransactions[existing] = tx;
+            }
+            else {
+                storedTransactions.push(tx);
+            }
+        }
+        this.cache.transactions.set(address, storedTransactions);
+        await this.storage.setItem(`tx:${address}`, JSON.stringify(storedTransactions));
+    }
+    async clearTransactions(address) {
+        this.cache.transactions.set(address, []);
+        await this.storage.removeItem(`tx:${address}`);
+    }
     async getWalletState() {
         if (this.cache.walletState !== null ||
             this.cache.initialized.has("walletState")) {

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

@@ -69,4 +69,12 @@ var Request;
         return message.type === "GET_STATUS";
     }
     Request.isGetStatus = isGetStatus;
+    function isClear(message) {
+        return message.type === "CLEAR";
+    }
+    Request.isClear = isClear;
+    function isReloadWallet(message) {
+        return message.type === "RELOAD_WALLET";
+    }
+    Request.isReloadWallet = isReloadWallet;
 })(Request || (exports.Request = Request = {}));

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

@@ -175,4 +175,16 @@ var Response;
         };
     }
     Response.clearResponse = clearResponse;
+    function isWalletReloaded(response) {
+        return response.type === "WALLET_RELOADED";
+    }
+    Response.isWalletReloaded = isWalletReloaded;
+    function walletReloaded(id, success) {
+        return {
+            type: "WALLET_RELOADED",
+            success,
+            id,
+        };
+    }
+    Response.walletReloaded = walletReloaded;
 })(Response || (exports.Response = Response = {}));

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupServiceWorker = setupServiceWorker;
+exports.extendVirtualCoin = extendVirtualCoin;
 /**
  * setupServiceWorker sets up the service worker.
  * @param path - the path to the service worker script
@@ -47,3 +48,11 @@ async function setupServiceWorker(path) {
         navigator.serviceWorker.addEventListener("error", onError);
     });
 }
+function extendVirtualCoin(wallet, vtxo) {
+    return {
+        ...vtxo,
+        forfeitTapLeafScript: wallet.offchainTapscript.forfeit(),
+        intentTapLeafScript: wallet.offchainTapscript.exit(),
+        tapTree: wallet.offchainTapscript.encode(),
+    };
+}

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

@@ -8,10 +8,7 @@ const walletRepository_1 = require("../../repositories/walletRepository");
 const contractRepository_1 = require("../../repositories/contractRepository");
 const utils_1 = require("./utils");
 const isPrivateKeyIdentity = (identity) => {
-    return (identity.toHex !== undefined &&
-        typeof identity.toHex === "function" &&
-        typeof identity.toHex() === "string" &&
-        identity.toHex().length > 0);
+    return typeof identity.toHex === "function";
 };
 class UnexpectedResponseError extends Error {
     constructor(response) {
@@ -290,6 +287,17 @@ 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

@@ -13,6 +13,7 @@ const indexer_1 = require("../../providers/indexer");
 const base_1 = require("@scure/base");
 const indexedDB_1 = require("../../storage/indexedDB");
 const walletRepository_1 = require("../../repositories/walletRepository");
+const utils_1 = require("./utils");
 /**
  * Worker is a class letting to interact with ServiceWorkerWallet from the client
  * it aims to be run in a service worker context
@@ -41,7 +42,7 @@ class Worker {
             return [];
         const address = await this.wallet.getAddress();
         const allVtxos = await this.walletRepository.getVtxos(address);
-        return allVtxos.filter((vtxo) => vtxo.virtualStatus.state === "swept" && (0, __1.isSpendable)(vtxo));
+        return allVtxos.filter((vtxo) => vtxo.virtualStatus.state === "swept");
     }
     /**
      * Get all vtxos categorized by type
@@ -72,19 +73,15 @@ class Worker {
         }
     }
     async clear() {
-        if (this.vtxoSubscription) {
-            this.vtxoSubscription.abort();
-        }
+        if (this.incomingFundsSubscription)
+            this.incomingFundsSubscription();
         // Clear storage - this replaces vtxoRepository.close()
         await this.storage.clear();
         this.wallet = undefined;
         this.arkProvider = undefined;
         this.indexerProvider = undefined;
-        this.vtxoSubscription = undefined;
     }
     async reload() {
-        if (this.vtxoSubscription)
-            this.vtxoSubscription.abort();
         await this.onWalletInitialized();
     }
     async onWalletInitialized() {
@@ -95,58 +92,46 @@ class Worker {
             !this.wallet.boardingTapscript) {
             return;
         }
-        const encodedOffchainTapscript = this.wallet.offchainTapscript.encode();
-        const forfeit = this.wallet.offchainTapscript.forfeit();
-        const exit = this.wallet.offchainTapscript.exit();
+        // Get public key script and set the initial vtxos state
         const script = base_1.hex.encode(this.wallet.offchainTapscript.pkScript);
-        // set the initial vtxos state
         const response = await this.indexerProvider.getVtxos({
             scripts: [script],
         });
-        const vtxos = response.vtxos.map((vtxo) => ({
-            ...vtxo,
-            forfeitTapLeafScript: forfeit,
-            intentTapLeafScript: exit,
-            tapTree: encodedOffchainTapscript,
-        }));
+        const vtxos = response.vtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.wallet, vtxo));
         // Get wallet address and save vtxos using unified repository
         const address = await this.wallet.getAddress();
         await this.walletRepository.saveVtxos(address, vtxos);
-        this.processVtxoSubscription({
-            script,
-            vtxoScript: this.wallet.offchainTapscript,
-        });
-    }
-    async processVtxoSubscription({ script, vtxoScript, }) {
-        try {
-            const forfeitTapLeafScript = vtxoScript.forfeit();
-            const intentTapLeafScript = vtxoScript.exit();
-            const abortController = new AbortController();
-            const subscriptionId = await this.indexerProvider.subscribeForScripts([script]);
-            const subscription = this.indexerProvider.getSubscription(subscriptionId, abortController.signal);
-            this.vtxoSubscription = abortController;
-            const tapTree = vtxoScript.encode();
-            for await (const update of subscription) {
-                const vtxos = [...update.newVtxos, ...update.spentVtxos];
-                if (vtxos.length === 0) {
-                    continue;
-                }
-                const extendedVtxos = vtxos.map((vtxo) => ({
-                    ...vtxo,
-                    forfeitTapLeafScript,
-                    intentTapLeafScript,
-                    tapTree,
-                }));
-                // Get wallet address and save vtxos using unified repository
-                const address = await this.wallet.getAddress();
-                await this.walletRepository.saveVtxos(address, extendedVtxos);
-                // Notify all clients about the vtxo update
-                this.sendMessageToAllClients("VTXO_UPDATE", "");
+        // Get transaction history to cache boarding txs
+        const txs = await this.wallet.getTransactionHistory();
+        if (txs)
+            await this.walletRepository.saveTransactions(address, txs);
+        // stop previous subscriptions if any
+        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) => {
+            if (funds.type === "vtxo") {
+                const newVtxos = funds.newVtxos.length > 0
+                    ? funds.newVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.wallet, vtxo))
+                    : [];
+                const spentVtxos = funds.spentVtxos.length > 0
+                    ? funds.spentVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.wallet, vtxo))
+                    : [];
+                if ([...newVtxos, ...spentVtxos].length === 0)
+                    return;
+                // save vtxos using unified repository
+                await this.walletRepository.saveVtxos(address, [
+                    ...newVtxos,
+                    ...spentVtxos,
+                ]);
+                // notify all clients about the vtxo update
+                this.sendMessageToAllClients("VTXO_UPDATE", JSON.stringify({ newVtxos, spentVtxos }));
             }
-        }
-        catch (error) {
-            console.error("Error processing address updates:", error);
-        }
+            if (funds.type === "utxo" && funds.coins.length > 0) {
+                // notify all clients about the utxo update
+                this.sendMessageToAllClients("UTXO_UPDATE", JSON.stringify(funds.coins));
+            }
+        });
     }
     async handleClear(event) {
         await this.clear();
@@ -374,7 +359,11 @@ class Worker {
                 if (!this.wallet)
                     throw new Error("Wallet not initialized");
                 // exclude subdust is we don't want recoverable
-                vtxos = vtxos.filter((v) => !(0, __1.isSubdust)(v, this.wallet.dustAmount));
+                const dustAmount = this.wallet?.dustAmount;
+                vtxos =
+                    dustAmount == null
+                        ? vtxos
+                        : vtxos.filter((v) => !(0, __1.isSubdust)(v, dustAmount));
             }
             if (message.filter?.withRecoverable) {
                 // get also swept and spendable vtxos
@@ -518,6 +507,10 @@ class Worker {
                 await this.handleClear(event);
                 break;
             }
+            case "RELOAD_WALLET": {
+                await this.handleReloadWallet(event);
+                break;
+            }
             default:
                 event.source?.postMessage(response_1.Response.error(message.id, "Unknown message type"));
         }
@@ -534,5 +527,27 @@ class Worker {
             });
         });
     }
+    async handleReloadWallet(event) {
+        const message = event.data;
+        console.log("RELOAD_WALLET message received", message);
+        if (!request_1.Request.isReloadWallet(message)) {
+            console.error("Invalid RELOAD_WALLET message format", message);
+            event.source?.postMessage(response_1.Response.error(message.id, "Invalid RELOAD_WALLET message format"));
+            return;
+        }
+        if (!this.wallet) {
+            console.error("Wallet not initialized");
+            event.source?.postMessage(response_1.Response.walletReloaded(message.id, false));
+            return;
+        }
+        try {
+            await this.onWalletInitialized();
+            event.source?.postMessage(response_1.Response.walletReloaded(message.id, true));
+        }
+        catch (error) {
+            console.error("Error reloading wallet:", error);
+            event.source?.postMessage(response_1.Response.walletReloaded(message.id, false));
+        }
+    }
 }
 exports.Worker = Worker;

package/dist/cjs/wallet/wallet.js

@@ -60,6 +60,7 @@ const txTree_1 = require("../tree/txTree");
 const inMemory_1 = require("../storage/inMemory");
 const walletRepository_1 = require("../repositories/walletRepository");
 const contractRepository_1 = require("../repositories/contractRepository");
+const utils_1 = require("./serviceWorker/utils");
 /**
  * Main wallet implementation for Bitcoin transactions with Ark protocol support.
  * The wallet does not store any data locally and relies on Ark and onchain
@@ -678,7 +679,8 @@ class Wallet {
                         if (update.newVtxos?.length > 0) {
                             eventCallback({
                                 type: "vtxo",
-                                vtxos: update.newVtxos,
+                                newVtxos: update.newVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this, vtxo)),
+                                spentVtxos: update.spentVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this, vtxo)),
                             });
                         }
                     }

package/dist/esm/providers/onchain.js

@@ -20,6 +20,7 @@ export const ESPLORA_URL = {
 export class EsploraProvider {
     constructor(baseUrl) {
         this.baseUrl = baseUrl;
+        this.polling = false;
     }
     async getCoins(address) {
         const response = await fetch(`${this.baseUrl}/address/${address}/utxo`);
@@ -90,6 +91,9 @@ export class EsploraProvider {
         let intervalId = null;
         const wsUrl = this.baseUrl.replace(/^http(s)?:/, "ws$1:") + "/v1/ws";
         const poll = async () => {
+            if (this.polling)
+                return;
+            this.polling = true;
             // websocket is not reliable, so we will fallback to polling
             const pollingInterval = 5000; // 5 seconds
             const getAllTxs = () => {
@@ -99,19 +103,19 @@ export class EsploraProvider {
             const initialTxs = await getAllTxs();
             // we use block_time in key to also notify when a transaction is confirmed
             const txKey = (tx) => `${tx.txid}_${tx.status.block_time}`;
+            // create a set of existing transactions to avoid duplicates
+            const existingTxs = new Set(initialTxs.map(txKey));
             // polling for new transactions
             intervalId = setInterval(async () => {
                 try {
                     // get current transactions
                     // we will compare with initialTxs to find new ones
                     const currentTxs = await getAllTxs();
-                    // create a set of existing transactions to avoid duplicates
-                    const existingTxs = new Set(initialTxs.map(txKey));
                     // filter out transactions that are already in initialTxs
                     const newTxs = currentTxs.filter((tx) => !existingTxs.has(txKey(tx)));
                     if (newTxs.length > 0) {
                         // Update the tracking set instead of growing the array
-                        initialTxs.push(...newTxs);
+                        newTxs.forEach((tx) => existingTxs.add(txKey(tx)));
                         callback(newTxs);
                     }
                 }
@@ -172,6 +176,7 @@ export class EsploraProvider {
                 ws.close();
             if (intervalId)
                 clearInterval(intervalId);
+            this.polling = false;
         };
         return stopFunc;
     }

package/dist/esm/repositories/contractRepository.js

@@ -123,4 +123,8 @@ export class ContractRepositoryImpl {
             throw error; // Rethrow to notify caller of failure
         }
     }
+    async clearContractData() {
+        await this.storage.clear();
+        this.cache.clear();
+    }
 }

package/dist/esm/repositories/walletRepository.js

@@ -4,8 +4,7 @@ import { TaprootControlBlock } from "@scure/btc-signer";
 const toHex = (b) => (b ? hex.encode(b) : undefined);
 const fromHex = (h) => h ? hex.decode(h) : undefined;
 const serializeTapLeaf = ([cb, s]) => ({
-    cb: TaprootControlBlock.encode(cb) &&
-        hex.encode(TaprootControlBlock.encode(cb)),
+    cb: hex.encode(TaprootControlBlock.encode(cb)),
     s: hex.encode(s),
 });
 const serializeVtxo = (v) => ({
@@ -50,7 +49,7 @@ export class WalletRepositoryImpl {
         try {
             const parsed = JSON.parse(stored);
             const vtxos = parsed.map(deserializeVtxo);
-            this.cache.vtxos.set(address, vtxos);
+            this.cache.vtxos.set(address, vtxos.slice());
             return vtxos.slice();
         }
         catch (error) {
@@ -68,7 +67,7 @@ export class WalletRepositoryImpl {
         else {
             vtxos.push(vtxo);
         }
-        this.cache.vtxos.set(address, vtxos);
+        this.cache.vtxos.set(address, vtxos.slice());
         await this.storage.setItem(`vtxos:${address}`, JSON.stringify(vtxos.map(serializeVtxo)));
     }
     async saveVtxos(address, vtxos) {
@@ -82,14 +81,14 @@ export class WalletRepositoryImpl {
                 storedVtxos.push(vtxo);
             }
         }
-        this.cache.vtxos.set(address, storedVtxos);
+        this.cache.vtxos.set(address, storedVtxos.slice());
         await this.storage.setItem(`vtxos:${address}`, JSON.stringify(storedVtxos.map(serializeVtxo)));
     }
     async removeVtxo(address, vtxoId) {
         const vtxos = await this.getVtxos(address);
         const [txid, vout] = vtxoId.split(":");
-        const filtered = vtxos.filter((v) => !(v.txid === txid && v.vout === parseInt(vout)));
-        this.cache.vtxos.set(address, filtered);
+        const filtered = vtxos.filter((v) => !(v.txid === txid && v.vout === parseInt(vout, 10)));
+        this.cache.vtxos.set(address, filtered.slice());
         await this.storage.setItem(`vtxos:${address}`, JSON.stringify(filtered.map(serializeVtxo)));
     }
     async clearVtxos(address) {
@@ -119,18 +118,36 @@ export class WalletRepositoryImpl {
     }
     async saveTransaction(address, tx) {
         const transactions = await this.getTransactionHistory(address);
-        const existing = transactions.findIndex((t) => t.id === tx.id);
+        const existing = transactions.findIndex((t) => t.key === tx.key);
         if (existing !== -1) {
             transactions[existing] = tx;
         }
         else {
             transactions.push(tx);
-            // Sort by timestamp descending
-            transactions.sort((a, b) => b.timestamp - a.timestamp);
         }
+        // Sort by createdAt descending
+        transactions.sort((a, b) => b.createdAt - a.createdAt);
         this.cache.transactions.set(address, transactions);
         await this.storage.setItem(`tx:${address}`, JSON.stringify(transactions));
     }
+    async saveTransactions(address, txs) {
+        const storedTransactions = await this.getTransactionHistory(address);
+        for (const tx of txs) {
+            const existing = storedTransactions.findIndex((t) => t.key === tx.key);
+            if (existing !== -1) {
+                storedTransactions[existing] = tx;
+            }
+            else {
+                storedTransactions.push(tx);
+            }
+        }
+        this.cache.transactions.set(address, storedTransactions);
+        await this.storage.setItem(`tx:${address}`, JSON.stringify(storedTransactions));
+    }
+    async clearTransactions(address) {
+        this.cache.transactions.set(address, []);
+        await this.storage.removeItem(`tx:${address}`);
+    }
     async getWalletState() {
         if (this.cache.walletState !== null ||
             this.cache.initialized.has("walletState")) {

package/dist/esm/wallet/serviceWorker/request.js

@@ -66,4 +66,12 @@ export var Request;
         return message.type === "GET_STATUS";
     }
     Request.isGetStatus = isGetStatus;
+    function isClear(message) {
+        return message.type === "CLEAR";
+    }
+    Request.isClear = isClear;
+    function isReloadWallet(message) {
+        return message.type === "RELOAD_WALLET";
+    }
+    Request.isReloadWallet = isReloadWallet;
 })(Request || (Request = {}));

package/dist/esm/wallet/serviceWorker/response.js

@@ -172,4 +172,16 @@ export var Response;
         };
     }
     Response.clearResponse = clearResponse;
+    function isWalletReloaded(response) {
+        return response.type === "WALLET_RELOADED";
+    }
+    Response.isWalletReloaded = isWalletReloaded;
+    function walletReloaded(id, success) {
+        return {
+            type: "WALLET_RELOADED",
+            success,
+            id,
+        };
+    }
+    Response.walletReloaded = walletReloaded;
 })(Response || (Response = {}));

package/dist/esm/wallet/serviceWorker/utils.js

@@ -44,3 +44,11 @@ export async function setupServiceWorker(path) {
         navigator.serviceWorker.addEventListener("error", onError);
     });
 }
+export function extendVirtualCoin(wallet, vtxo) {
+    return {
+        ...vtxo,
+        forfeitTapLeafScript: wallet.offchainTapscript.forfeit(),
+        intentTapLeafScript: wallet.offchainTapscript.exit(),
+        tapTree: wallet.offchainTapscript.encode(),
+    };
+}

package/dist/esm/wallet/serviceWorker/wallet.js

@@ -5,10 +5,7 @@ import { WalletRepositoryImpl } from '../../repositories/walletRepository.js';
 import { ContractRepositoryImpl } from '../../repositories/contractRepository.js';
 import { setupServiceWorker } from './utils.js';
 const isPrivateKeyIdentity = (identity) => {
-    return (identity.toHex !== undefined &&
-        typeof identity.toHex === "function" &&
-        typeof identity.toHex() === "string" &&
-        identity.toHex().length > 0);
+    return typeof identity.toHex === "function";
 };
 class UnexpectedResponseError extends Error {
     constructor(response) {
@@ -287,6 +284,17 @@ export 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.isWalletReloaded(response)) {
+            return response.success;
+        }
+        throw new UnexpectedResponseError(response);
+    }
 }
 function getRandomId() {
     const randomValue = crypto.getRandomValues(new Uint8Array(16));

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

@@ -10,6 +10,7 @@ import { RestIndexerProvider } from '../../providers/indexer.js';
 import { hex } from "@scure/base";
 import { IndexedDBStorageAdapter } from '../../storage/indexedDB.js';
 import { WalletRepositoryImpl, } from '../../repositories/walletRepository.js';
+import { extendVirtualCoin } from './utils.js';
 /**
  * Worker is a class letting to interact with ServiceWorkerWallet from the client
  * it aims to be run in a service worker context
@@ -38,7 +39,7 @@ export class Worker {
             return [];
         const address = await this.wallet.getAddress();
         const allVtxos = await this.walletRepository.getVtxos(address);
-        return allVtxos.filter((vtxo) => vtxo.virtualStatus.state === "swept" && isSpendable(vtxo));
+        return allVtxos.filter((vtxo) => vtxo.virtualStatus.state === "swept");
     }
     /**
      * Get all vtxos categorized by type
@@ -69,19 +70,15 @@ export class Worker {
         }
     }
     async clear() {
-        if (this.vtxoSubscription) {
-            this.vtxoSubscription.abort();
-        }
+        if (this.incomingFundsSubscription)
+            this.incomingFundsSubscription();
         // Clear storage - this replaces vtxoRepository.close()
         await this.storage.clear();
         this.wallet = undefined;
         this.arkProvider = undefined;
         this.indexerProvider = undefined;
-        this.vtxoSubscription = undefined;
     }
     async reload() {
-        if (this.vtxoSubscription)
-            this.vtxoSubscription.abort();
         await this.onWalletInitialized();
     }
     async onWalletInitialized() {
@@ -92,58 +89,46 @@ export class Worker {
             !this.wallet.boardingTapscript) {
             return;
         }
-        const encodedOffchainTapscript = this.wallet.offchainTapscript.encode();
-        const forfeit = this.wallet.offchainTapscript.forfeit();
-        const exit = this.wallet.offchainTapscript.exit();
+        // Get public key script and set the initial vtxos state
         const script = hex.encode(this.wallet.offchainTapscript.pkScript);
-        // set the initial vtxos state
         const response = await this.indexerProvider.getVtxos({
             scripts: [script],
         });
-        const vtxos = response.vtxos.map((vtxo) => ({
-            ...vtxo,
-            forfeitTapLeafScript: forfeit,
-            intentTapLeafScript: exit,
-            tapTree: encodedOffchainTapscript,
-        }));
+        const vtxos = response.vtxos.map((vtxo) => extendVirtualCoin(this.wallet, vtxo));
         // Get wallet address and save vtxos using unified repository
         const address = await this.wallet.getAddress();
         await this.walletRepository.saveVtxos(address, vtxos);
-        this.processVtxoSubscription({
-            script,
-            vtxoScript: this.wallet.offchainTapscript,
-        });
-    }
-    async processVtxoSubscription({ script, vtxoScript, }) {
-        try {
-            const forfeitTapLeafScript = vtxoScript.forfeit();
-            const intentTapLeafScript = vtxoScript.exit();
-            const abortController = new AbortController();
-            const subscriptionId = await this.indexerProvider.subscribeForScripts([script]);
-            const subscription = this.indexerProvider.getSubscription(subscriptionId, abortController.signal);
-            this.vtxoSubscription = abortController;
-            const tapTree = vtxoScript.encode();
-            for await (const update of subscription) {
-                const vtxos = [...update.newVtxos, ...update.spentVtxos];
-                if (vtxos.length === 0) {
-                    continue;
-                }
-                const extendedVtxos = vtxos.map((vtxo) => ({
-                    ...vtxo,
-                    forfeitTapLeafScript,
-                    intentTapLeafScript,
-                    tapTree,
-                }));
-                // Get wallet address and save vtxos using unified repository
-                const address = await this.wallet.getAddress();
-                await this.walletRepository.saveVtxos(address, extendedVtxos);
-                // Notify all clients about the vtxo update
-                this.sendMessageToAllClients("VTXO_UPDATE", "");
+        // Get transaction history to cache boarding txs
+        const txs = await this.wallet.getTransactionHistory();
+        if (txs)
+            await this.walletRepository.saveTransactions(address, txs);
+        // stop previous subscriptions if any
+        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) => {
+            if (funds.type === "vtxo") {
+                const newVtxos = funds.newVtxos.length > 0
+                    ? funds.newVtxos.map((vtxo) => extendVirtualCoin(this.wallet, vtxo))
+                    : [];
+                const spentVtxos = funds.spentVtxos.length > 0
+                    ? funds.spentVtxos.map((vtxo) => extendVirtualCoin(this.wallet, vtxo))
+                    : [];
+                if ([...newVtxos, ...spentVtxos].length === 0)
+                    return;
+                // save vtxos using unified repository
+                await this.walletRepository.saveVtxos(address, [
+                    ...newVtxos,
+                    ...spentVtxos,
+                ]);
+                // notify all clients about the vtxo update
+                this.sendMessageToAllClients("VTXO_UPDATE", JSON.stringify({ newVtxos, spentVtxos }));
             }
-        }
-        catch (error) {
-            console.error("Error processing address updates:", error);
-        }
+            if (funds.type === "utxo" && funds.coins.length > 0) {
+                // notify all clients about the utxo update
+                this.sendMessageToAllClients("UTXO_UPDATE", JSON.stringify(funds.coins));
+            }
+        });
     }
     async handleClear(event) {
         await this.clear();
@@ -371,7 +356,11 @@ export class Worker {
                 if (!this.wallet)
                     throw new Error("Wallet not initialized");
                 // exclude subdust is we don't want recoverable
-                vtxos = vtxos.filter((v) => !isSubdust(v, this.wallet.dustAmount));
+                const dustAmount = this.wallet?.dustAmount;
+                vtxos =
+                    dustAmount == null
+                        ? vtxos
+                        : vtxos.filter((v) => !isSubdust(v, dustAmount));
             }
             if (message.filter?.withRecoverable) {
                 // get also swept and spendable vtxos
@@ -515,6 +504,10 @@ export class Worker {
                 await this.handleClear(event);
                 break;
             }
+            case "RELOAD_WALLET": {
+                await this.handleReloadWallet(event);
+                break;
+            }
             default:
                 event.source?.postMessage(Response.error(message.id, "Unknown message type"));
         }
@@ -531,4 +524,26 @@ export class Worker {
             });
         });
     }
+    async handleReloadWallet(event) {
+        const message = event.data;
+        console.log("RELOAD_WALLET message received", message);
+        if (!Request.isReloadWallet(message)) {
+            console.error("Invalid RELOAD_WALLET message format", message);
+            event.source?.postMessage(Response.error(message.id, "Invalid RELOAD_WALLET message format"));
+            return;
+        }
+        if (!this.wallet) {
+            console.error("Wallet not initialized");
+            event.source?.postMessage(Response.walletReloaded(message.id, false));
+            return;
+        }
+        try {
+            await this.onWalletInitialized();
+            event.source?.postMessage(Response.walletReloaded(message.id, true));
+        }
+        catch (error) {
+            console.error("Error reloading wallet:", error);
+            event.source?.postMessage(Response.walletReloaded(message.id, false));
+        }
+    }
 }

package/dist/esm/wallet/wallet.js

@@ -23,6 +23,7 @@ import { TxTree } from '../tree/txTree.js';
 import { InMemoryStorageAdapter } from '../storage/inMemory.js';
 import { WalletRepositoryImpl, } from '../repositories/walletRepository.js';
 import { ContractRepositoryImpl, } from '../repositories/contractRepository.js';
+import { extendVirtualCoin } from './serviceWorker/utils.js';
 /**
  * Main wallet implementation for Bitcoin transactions with Ark protocol support.
  * The wallet does not store any data locally and relies on Ark and onchain
@@ -641,7 +642,8 @@ export class Wallet {
                         if (update.newVtxos?.length > 0) {
                             eventCallback({
                                 type: "vtxo",
-                                vtxos: update.newVtxos,
+                                newVtxos: update.newVtxos.map((vtxo) => extendVirtualCoin(this, vtxo)),
+                                spentVtxos: update.spentVtxos.map((vtxo) => extendVirtualCoin(this, vtxo)),
                             });
                         }
                     }

package/dist/types/providers/onchain.d.ts

@@ -49,6 +49,7 @@ export interface OnchainProvider {
  */
 export declare class EsploraProvider implements OnchainProvider {
     private baseUrl;
+    private polling;
     constructor(baseUrl: string);
     getCoins(address: string): Promise<Coin[]>;
     getFeeRate(): Promise<number | undefined>;

package/dist/types/repositories/contractRepository.d.ts

@@ -3,6 +3,7 @@ export interface ContractRepository {
     getContractData<T>(contractId: string, key: string): Promise<T | null>;
     setContractData<T>(contractId: string, key: string, data: T): Promise<void>;
     deleteContractData(contractId: string, key: string): Promise<void>;
+    clearContractData(): Promise<void>;
     getContractCollection<T>(contractType: string): Promise<ReadonlyArray<T>>;
     saveToContractCollection<T, K extends keyof T>(contractType: string, item: T, idField: K): Promise<void>;
     removeFromContractCollection<T, K extends keyof T>(contractType: string, id: T[K], idField: K): Promise<void>;
@@ -17,4 +18,5 @@ export declare class ContractRepositoryImpl implements ContractRepository {
     getContractCollection<T>(contractType: string): Promise<ReadonlyArray<T>>;
     saveToContractCollection<T, K extends keyof T>(contractType: string, item: T, idField: K): Promise<void>;
     removeFromContractCollection<T, K extends keyof T>(contractType: string, id: T[K], idField: K): Promise<void>;
+    clearContractData(): Promise<void>;
 }

package/dist/types/repositories/walletRepository.d.ts

@@ -1,24 +1,19 @@
 import { StorageAdapter } from "../storage";
-import { ExtendedVirtualCoin } from "../wallet";
+import { ArkTransaction, ExtendedVirtualCoin } from "../wallet";
 export interface WalletState {
     lastSyncTime?: number;
     settings?: Record<string, any>;
 }
-export interface Transaction {
-    id: string;
-    timestamp: number;
-    amount: number;
-    type: "send" | "receive";
-    status: "pending" | "confirmed" | "failed";
-}
 export interface WalletRepository {
     getVtxos(address: string): Promise<ExtendedVirtualCoin[]>;
     saveVtxo(address: string, vtxo: ExtendedVirtualCoin): Promise<void>;
     saveVtxos(address: string, vtxos: ExtendedVirtualCoin[]): Promise<void>;
     removeVtxo(address: string, vtxoId: string): Promise<void>;
     clearVtxos(address: string): Promise<void>;
-    getTransactionHistory(address: string): Promise<Transaction[]>;
-    saveTransaction(address: string, tx: Transaction): Promise<void>;
+    getTransactionHistory(address: string): Promise<ArkTransaction[]>;
+    saveTransaction(address: string, tx: ArkTransaction): Promise<void>;
+    saveTransactions(address: string, txs: ArkTransaction[]): Promise<void>;
+    clearTransactions(address: string): Promise<void>;
     getWalletState(): Promise<WalletState | null>;
     saveWalletState(state: WalletState): Promise<void>;
 }
@@ -31,8 +26,10 @@ export declare class WalletRepositoryImpl implements WalletRepository {
     saveVtxos(address: string, vtxos: ExtendedVirtualCoin[]): Promise<void>;
     removeVtxo(address: string, vtxoId: string): Promise<void>;
     clearVtxos(address: string): Promise<void>;
-    getTransactionHistory(address: string): Promise<Transaction[]>;
-    saveTransaction(address: string, tx: Transaction): Promise<void>;
+    getTransactionHistory(address: string): Promise<ArkTransaction[]>;
+    saveTransaction(address: string, tx: ArkTransaction): Promise<void>;
+    saveTransactions(address: string, txs: ArkTransaction[]): Promise<void>;
+    clearTransactions(address: string): Promise<void>;
     getWalletState(): Promise<WalletState | null>;
     saveWalletState(state: WalletState): Promise<void>;
 }

package/dist/types/wallet/serviceWorker/request.d.ts

@@ -3,7 +3,7 @@ import { SettleParams, SendBitcoinParams, GetVtxosFilter } from "..";
  * Request is the namespace that contains the request types for the service worker.
  */
 export declare namespace Request {
-    type Type = "INIT_WALLET" | "SETTLE" | "GET_ADDRESS" | "GET_BOARDING_ADDRESS" | "GET_BALANCE" | "GET_VTXOS" | "GET_VIRTUAL_COINS" | "GET_BOARDING_UTXOS" | "SEND_BITCOIN" | "GET_TRANSACTION_HISTORY" | "GET_STATUS" | "CLEAR";
+    type Type = "INIT_WALLET" | "RELOAD_WALLET" | "SETTLE" | "GET_ADDRESS" | "GET_BOARDING_ADDRESS" | "GET_BALANCE" | "GET_VTXOS" | "GET_VIRTUAL_COINS" | "GET_BOARDING_UTXOS" | "SEND_BITCOIN" | "GET_TRANSACTION_HISTORY" | "GET_STATUS" | "CLEAR";
     interface Base {
         type: Type;
         id: string;
@@ -62,4 +62,9 @@ export declare namespace Request {
     interface Clear extends Base {
         type: "CLEAR";
     }
+    function isClear(message: Base): message is Clear;
+    interface ReloadWallet extends Base {
+        type: "RELOAD_WALLET";
+    }
+    function isReloadWallet(message: Base): message is ReloadWallet;
 }

package/dist/types/wallet/serviceWorker/response.d.ts

@@ -4,7 +4,7 @@ import { SettlementEvent } from "../../providers/ark";
  * Response is the namespace that contains the response types for the service worker.
  */
 export declare namespace Response {
-    type Type = "WALLET_INITIALIZED" | "SETTLE_EVENT" | "SETTLE_SUCCESS" | "ADDRESS" | "BOARDING_ADDRESS" | "BALANCE" | "VTXOS" | "VIRTUAL_COINS" | "BOARDING_UTXOS" | "SEND_BITCOIN_SUCCESS" | "TRANSACTION_HISTORY" | "WALLET_STATUS" | "ERROR" | "CLEAR_RESPONSE";
+    type Type = "WALLET_INITIALIZED" | "WALLET_RELOADED" | "SETTLE_EVENT" | "SETTLE_SUCCESS" | "ADDRESS" | "BOARDING_ADDRESS" | "BALANCE" | "VTXOS" | "VIRTUAL_COINS" | "BOARDING_UTXOS" | "SEND_BITCOIN_SUCCESS" | "TRANSACTION_HISTORY" | "WALLET_STATUS" | "ERROR" | "CLEAR_RESPONSE";
     interface Base {
         type: Type;
         success: boolean;
@@ -101,4 +101,9 @@ export declare namespace Response {
     }
     function isClearResponse(response: Base): response is ClearResponse;
     function clearResponse(id: string, success: boolean): ClearResponse;
+    interface WalletReloaded extends Base {
+        type: "WALLET_RELOADED";
+    }
+    function isWalletReloaded(response: Base): response is WalletReloaded;
+    function walletReloaded(id: string, success: boolean): WalletReloaded;
 }

package/dist/types/wallet/serviceWorker/utils.d.ts

@@ -1,3 +1,4 @@
+import { ExtendedVirtualCoin, VirtualCoin, Wallet } from "../..";
 /**
  * setupServiceWorker sets up the service worker.
  * @param path - the path to the service worker script
@@ -7,3 +8,4 @@
  * ```
  */
 export declare function setupServiceWorker(path: string): Promise<ServiceWorker>;
+export declare function extendVirtualCoin(wallet: Wallet, vtxo: VirtualCoin): ExtendedVirtualCoin;

package/dist/types/wallet/serviceWorker/wallet.d.ts

@@ -93,5 +93,6 @@ export declare class ServiceWorkerWallet implements IWallet {
     getVtxos(filter?: GetVtxosFilter): Promise<ExtendedVirtualCoin[]>;
     sendBitcoin(params: SendBitcoinParams): Promise<string>;
     settle(params?: SettleParams, callback?: (event: SettlementEvent) => void): Promise<string>;
+    reload(): Promise<boolean>;
 }
 export {};

package/dist/types/wallet/serviceWorker/worker.d.ts

@@ -7,7 +7,7 @@ export declare class Worker {
     private wallet;
     private arkProvider;
     private indexerProvider;
-    private vtxoSubscription;
+    private incomingFundsSubscription;
     private walletRepository;
     private storage;
     constructor(messageCallback?: (message: ExtendableMessageEvent) => void);
@@ -27,7 +27,6 @@ export declare class Worker {
     clear(): Promise<void>;
     reload(): Promise<void>;
     private onWalletInitialized;
-    private processVtxoSubscription;
     private handleClear;
     private handleInitWallet;
     private handleSettle;
@@ -41,4 +40,5 @@ export declare class Worker {
     private handleGetStatus;
     private handleMessage;
     private sendMessageToAllClients;
+    private handleReloadWallet;
 }

package/dist/types/wallet/wallet.d.ts

@@ -4,7 +4,7 @@ import { Network, NetworkName } from "../networks";
 import { OnchainProvider } from "../providers/onchain";
 import { SettlementEvent, ArkProvider } from "../providers/ark";
 import { Identity } from "../identity";
-import { ArkTransaction, Coin, ExtendedCoin, ExtendedVirtualCoin, GetVtxosFilter, IWallet, SendBitcoinParams, SettleParams, VirtualCoin, WalletBalance, WalletConfig } from ".";
+import { ArkTransaction, Coin, ExtendedCoin, ExtendedVirtualCoin, GetVtxosFilter, IWallet, SendBitcoinParams, SettleParams, WalletBalance, WalletConfig } from ".";
 import { Bytes } from "@scure/btc-signer/utils.js";
 import { CSVMultisigTapscript } from "../script/tapscript";
 import { IndexerProvider } from "../providers/indexer";
@@ -15,7 +15,8 @@ export type IncomingFunds = {
     coins: Coin[];
 } | {
     type: "vtxo";
-    vtxos: VirtualCoin[];
+    newVtxos: ExtendedVirtualCoin[];
+    spentVtxos: ExtendedVirtualCoin[];
 };
 /**
  * Main wallet implementation for Bitcoin transactions with Ark protocol support.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.3.0-alpha.4",
+  "version": "0.3.0-alpha.6",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",