@arkade-os/sdk 0.4.8 → 0.4.9

package/dist/cjs/contracts/contractManager.js

@@ -74,9 +74,10 @@ class ContractManager {
         }
         // Load persisted contracts
         const contracts = await this.config.contractRepository.getContracts();
-        // fetch latest VTXOs for all contracts, ensure cache is up to date
+        // fetch all VTXOs (including spent/swept) for all contracts,
+        // so the repository has full history for transaction history and balance
         // TODO: what if the user has 1k contracts?
-        await this.getVtxosForContracts(contracts);
+        await this.fetchContractVxosFromIndexer(contracts, true);
         // add all contracts to the watcher
         const now = Date.now();
         for (const contract of contracts) {
@@ -139,8 +140,8 @@ class ContractManager {
         };
         // Persist
         await this.config.contractRepository.saveContract(contract);
-        // ensure we have the latest VTXOs for this contract
-        await this.getVtxosForContracts([contract]);
+        // fetch all VTXOs (including spent/swept) for this contract
+        await this.fetchContractVxosFromIndexer([contract], true);
         // Add to watcher
         await this.watcher.addContract(contract);
         return contract;
@@ -305,6 +306,14 @@ class ContractManager {
             this.eventCallbacks.delete(callback);
         };
     }
+    /**
+     * Force a full VTXO refresh from the indexer for all contracts.
+     * Populates the wallet repository with complete VTXO history.
+     */
+    async refreshVtxos() {
+        const contracts = await this.config.contractRepository.getContracts();
+        await this.fetchContractVxosFromIndexer(contracts, true);
+    }
     /**
      * Check if currently watching.
      */
@@ -334,11 +343,13 @@ class ContractManager {
             case "vtxo_spent":
                 await this.fetchContractVxosFromIndexer([event.contract], true);
                 break;
-            case "connection_reset":
-                // Refetch all VTXOs for all active contracts
+            case "connection_reset": {
+                // Refetch all VTXOs (including spent/swept) for all active
+                // contracts so the repo stays consistent with bootstrap state
                 const activeWatchedContracts = this.watcher.getActiveContracts();
-                await this.fetchContractVxosFromIndexer(activeWatchedContracts, false);
+                await this.fetchContractVxosFromIndexer(activeWatchedContracts, true);
                 break;
+            }
             case "contract_expired":
                 // just update DB
                 await this.config.contractRepository.saveContract(event.contract);
@@ -365,11 +376,48 @@ class ContractManager {
         return result;
     }
     async fetchContractVtxosBulk(contracts, includeSpent) {
-        const result = new Map();
-        await Promise.all(contracts.map(async (contract) => {
+        if (contracts.length === 0) {
+            return new Map();
+        }
+        // For a single contract, use the paginated path directly.
+        if (contracts.length === 1) {
+            const contract = contracts[0];
             const vtxos = await this.fetchContractVtxosPaginated(contract, includeSpent);
-            result.set(contract.script, vtxos);
-        }));
+            return new Map([[contract.script, vtxos]]);
+        }
+        // For multiple contracts, batch all scripts into a single indexer call
+        // per page to minimise round-trips.  Results are keyed by script so we
+        // can distribute them back to the correct contract afterwards.
+        const scriptToContract = new Map(contracts.map((c) => [c.script, c]));
+        const result = new Map(contracts.map((c) => [c.script, []]));
+        const scripts = contracts.map((c) => c.script);
+        const pageSize = 100;
+        const opts = includeSpent ? {} : { spendableOnly: true };
+        let pageIndex = 0;
+        let hasMore = true;
+        while (hasMore) {
+            const { vtxos, page } = await this.config.indexerProvider.getVtxos({
+                scripts,
+                ...opts,
+                pageIndex,
+                pageSize,
+            });
+            for (const vtxo of vtxos) {
+                // Match the VTXO back to its contract via the script field
+                // populated by the indexer.
+                if (!vtxo.script)
+                    continue;
+                const contract = scriptToContract.get(vtxo.script);
+                if (!contract)
+                    continue;
+                result.get(contract.script).push({
+                    ...(0, utils_1.extendVtxoFromContract)(vtxo, contract),
+                    contractScript: contract.script,
+                });
+            }
+            hasMore = page ? vtxos.length === pageSize : false;
+            pageIndex++;
+        }
         return result;
     }
     async fetchContractVtxosPaginated(contract, includeSpent) {

package/dist/cjs/contracts/contractWatcher.js

@@ -413,8 +413,27 @@ class ContractWatcher {
             }
             return;
         }
-        this.subscriptionId =
-            await this.config.indexerProvider.subscribeForScripts(scriptsToWatch, this.subscriptionId);
+        try {
+            this.subscriptionId =
+                await this.config.indexerProvider.subscribeForScripts(scriptsToWatch, this.subscriptionId);
+        }
+        catch (error) {
+            // If we sent a stale subscription ID that the server no longer
+            // recognises, clear it and retry to create a fresh subscription.
+            // The server currently returns HTTP 500 with a JSON body whose
+            // message field looks like "subscription <uuid> not found".
+            // All other errors (network failures, parse errors, etc.) are rethrown.
+            const isStale = error instanceof Error &&
+                /subscription\s+\S+\s+not\s+found/i.test(error.message);
+            if (this.subscriptionId && isStale) {
+                this.subscriptionId = undefined;
+                this.subscriptionId =
+                    await this.config.indexerProvider.subscribeForScripts(scriptsToWatch);
+            }
+            else {
+                throw error;
+            }
+        }
     }
     /**
      * Main listening loop for subscription events.

package/dist/cjs/providers/expoIndexer.js

@@ -31,6 +31,7 @@ function convertVtxo(vtxo) {
         createdAt: new Date(Number(vtxo.createdAt) * 1000),
         isUnrolled: vtxo.isUnrolled,
         isSpent: vtxo.isSpent,
+        script: vtxo.script,
         assets: vtxo.assets?.map((a) => ({
             assetId: a.assetId,
             amount: Number(a.amount),

package/dist/cjs/providers/indexer.js

@@ -406,6 +406,7 @@ function convertVtxo(vtxo) {
         createdAt: new Date(Number(vtxo.createdAt) * 1000),
         isUnrolled: vtxo.isUnrolled,
         isSpent: vtxo.isSpent,
+        script: vtxo.script,
         assets: vtxo.assets?.map((a) => ({
             assetId: a.assetId,
             amount: Number(a.amount),

package/dist/cjs/utils/transactionHistory.js

@@ -118,7 +118,8 @@ async function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnor
                     txAmount = spentAmount;
                     // TODO: fetch the vtxo with /v1/indexer/vtxos?outpoints=<vtxo.arkTxid:0> to know when the tx was made
                     txTime = getTxCreatedAt
-                        ? await getTxCreatedAt(vtxo.arkTxId)
+                        ? ((await getTxCreatedAt(vtxo.arkTxId)) ??
+                            vtxo.createdAt.getTime() + 1)
                         : vtxo.createdAt.getTime() + 1;
                 }
                 const assets = subtractAssets(allSpent, changes);

package/dist/cjs/wallet/serviceWorker/wallet-message-handler.js

@@ -4,6 +4,7 @@ exports.WalletMessageHandler = exports.DEFAULT_MESSAGE_TAG = exports.DelegatorNo
 const indexer_1 = require("../../providers/indexer");
 const index_1 = require("../index");
 const utils_1 = require("../utils");
+const transactionHistory_1 = require("../../utils/transactionHistory");
 class WalletNotInitializedError extends Error {
     constructor() {
         super("Wallet handler not initialized");
@@ -175,7 +176,8 @@ class WalletMessageHandler {
                     });
                 }
                 case "GET_TRANSACTION_HISTORY": {
-                    const transactions = await this.readonlyWallet.getTransactionHistory();
+                    const allVtxos = await this.getVtxosFromRepo();
+                    const transactions = (await this.buildTransactionHistoryFromCache(allVtxos)) ?? [];
                     return this.tagged({
                         id,
                         type: "TRANSACTION_HISTORY",
@@ -202,7 +204,7 @@ class WalletMessageHandler {
                     });
                 }
                 case "RELOAD_WALLET": {
-                    await this.onWalletInitialized();
+                    await this.reloadWallet();
                     return this.tagged({
                         id,
                         type: "RELOAD_SUCCESS",
@@ -288,6 +290,14 @@ class WalletMessageHandler {
                         payload: { isWatching },
                     });
                 }
+                case "REFRESH_VTXOS": {
+                    const manager = await this.readonlyWallet.getContractManager();
+                    await manager.refreshVtxos();
+                    return this.tagged({
+                        id,
+                        type: "REFRESH_VTXOS_SUCCESS",
+                    });
+                }
                 case "SEND": {
                     const { recipients } = message.payload;
                     const txid = await this.wallet.send(...recipients);
@@ -444,10 +454,9 @@ class WalletMessageHandler {
         await this.onWalletInitialized();
     }
     async handleGetBalance() {
-        const [boardingUtxos, spendableVtxos, sweptVtxos] = await Promise.all([
+        const [boardingUtxos, allVtxos] = await Promise.all([
             this.getAllBoardingUtxos(),
-            this.getSpendableVtxos(),
-            this.getSweptVtxos(),
+            this.getVtxosFromRepo(),
         ]);
         // boarding
         let confirmed = 0;
@@ -460,7 +469,9 @@ class WalletMessageHandler {
                 unconfirmed += utxo.value;
             }
         }
-        // offchain
+        // offchain — split spendable vs swept from single repo read
+        const spendableVtxos = allVtxos.filter(index_1.isSpendable);
+        const sweptVtxos = allVtxos.filter((vtxo) => vtxo.virtualStatus.state === "swept");
         let settled = 0;
         let preconfirmed = 0;
         let recoverable = 0;
@@ -510,23 +521,12 @@ class WalletMessageHandler {
         return this.readonlyWallet.getBoardingUtxos();
     }
     /**
-     * Get spendable vtxos for the current wallet address
+     * Get spendable vtxos from the repository
      */
     async getSpendableVtxos() {
-        if (!this.readonlyWallet)
-            return [];
-        const vtxos = await this.readonlyWallet.getVtxos();
+        const vtxos = await this.getVtxosFromRepo();
         return vtxos.filter(index_1.isSpendable);
     }
-    /**
-     * Get swept vtxos for the current wallet address
-     */
-    async getSweptVtxos() {
-        if (!this.readonlyWallet)
-            return [];
-        const vtxos = await this.readonlyWallet.getVtxos();
-        return vtxos.filter((vtxo) => vtxo.virtualStatus.state === "swept");
-    }
     async onWalletInitialized() {
         if (!this.readonlyWallet ||
             !this.arkProvider ||
@@ -534,10 +534,11 @@ class WalletMessageHandler {
             !this.walletRepository) {
             return;
         }
-        // Get all wallet scripts (current + historical delegate/non-delegate)
-        const scripts = await this.readonlyWallet.getWalletScripts();
-        const response = await this.indexerProvider.getVtxos({ scripts });
-        const vtxos = response.vtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this.readonlyWallet, vtxo));
+        // Initialize contract manager FIRST — this populates the repository
+        // with full VTXO history for all contracts (one indexer call per contract)
+        await this.ensureContractEventBroadcasting();
+        // Read VTXOs from repository (now populated by contract manager)
+        const vtxos = await this.getVtxosFromRepo();
         if (this.wallet) {
             try {
                 // recover pending transactions if possible
@@ -549,15 +550,13 @@ class WalletMessageHandler {
                 console.error("Error recovering pending transactions:", error);
             }
         }
-        // Get wallet address and save vtxos using unified repository
-        const address = await this.readonlyWallet.getAddress();
-        await this.walletRepository.saveVtxos(address, vtxos);
         // Fetch boarding utxos and save using unified repository
         const boardingAddress = await this.readonlyWallet.getBoardingAddress();
         const coins = await this.readonlyWallet.onchainProvider.getCoins(boardingAddress);
         await this.walletRepository.saveUtxos(boardingAddress, coins.map((utxo) => (0, utils_1.extendCoin)(this.readonlyWallet, utxo)));
-        // Get transaction history to cache boarding txs
-        const txs = await this.readonlyWallet.getTransactionHistory();
+        // Build transaction history from cached VTXOs (no indexer call)
+        const address = await this.readonlyWallet.getAddress();
+        const txs = await this.buildTransactionHistoryFromCache(vtxos);
         if (txs)
             await this.walletRepository.saveTransactions(address, txs);
         // unsubscribe previous subscription if any
@@ -602,7 +601,6 @@ class WalletMessageHandler {
                     }));
                 }
             });
-        await this.ensureContractEventBroadcasting();
         // Eagerly start the VtxoManager so its background tasks (auto-renewal,
         // boarding UTXO polling/sweep) run inside the service worker without
         // waiting for a client to send a vtxo-manager message first.
@@ -615,6 +613,17 @@ class WalletMessageHandler {
             }
         }
     }
+    /**
+     * Force a full VTXO refresh from the indexer, then re-run bootstrap.
+     * Used by RELOAD_WALLET to ensure fresh data.
+     */
+    async reloadWallet() {
+        if (!this.readonlyWallet)
+            return;
+        const manager = await this.readonlyWallet.getContractManager();
+        await manager.refreshVtxos();
+        await this.onWalletInitialized();
+    }
     async handleSettle(message) {
         const wallet = this.requireWallet();
         const txid = await wallet.settle(message.payload.params, (e) => {
@@ -738,6 +747,77 @@ class WalletMessageHandler {
         this.arkProvider = undefined;
         this.indexerProvider = undefined;
     }
+    /**
+     * Read all VTXOs from the repository, aggregated across all contract
+     * addresses and the wallet's primary address, with deduplication.
+     */
+    async getVtxosFromRepo() {
+        if (!this.walletRepository || !this.readonlyWallet)
+            return [];
+        const seen = new Set();
+        const allVtxos = [];
+        const addVtxos = (vtxos) => {
+            for (const vtxo of vtxos) {
+                const key = `${vtxo.txid}:${vtxo.vout}`;
+                if (!seen.has(key)) {
+                    seen.add(key);
+                    allVtxos.push(vtxo);
+                }
+            }
+        };
+        // Aggregate VTXOs from all contract addresses
+        const manager = await this.readonlyWallet.getContractManager();
+        const contracts = await manager.getContracts();
+        for (const contract of contracts) {
+            const vtxos = await this.walletRepository.getVtxos(contract.address);
+            addVtxos(vtxos);
+        }
+        // Also check the wallet's primary address
+        const walletAddress = await this.readonlyWallet.getAddress();
+        const walletVtxos = await this.walletRepository.getVtxos(walletAddress);
+        addVtxos(walletVtxos);
+        return allVtxos;
+    }
+    /**
+     * Build transaction history from cached VTXOs without hitting the indexer.
+     * Falls back to indexer only for uncached transaction timestamps.
+     */
+    async buildTransactionHistoryFromCache(vtxos) {
+        if (!this.readonlyWallet)
+            return null;
+        const { boardingTxs, commitmentsToIgnore } = await this.readonlyWallet.getBoardingTxs();
+        // Build a lookup for cached VTXO timestamps, keyed by txid.
+        // Multiple VTXOs can share a txid (different vouts) — we keep the
+        // earliest createdAt so the history ordering is stable.
+        const vtxoCreatedAt = new Map();
+        for (const vtxo of vtxos) {
+            const existing = vtxoCreatedAt.get(vtxo.txid);
+            const ts = vtxo.createdAt.getTime();
+            if (existing === undefined || ts < existing) {
+                vtxoCreatedAt.set(vtxo.txid, ts);
+            }
+        }
+        // getTxCreatedAt resolves the creation timestamp of a transaction.
+        // buildTransactionHistory calls this for spent-offchain VTXOs with
+        // no change outputs to determine the time of the sending tx.
+        // Returns undefined on miss so buildTransactionHistory uses its
+        // own fallback (vtxo.createdAt + 1) rather than epoch 0.
+        // The vout:0 lookup in the indexer fallback mirrors the pre-existing
+        // convention in ReadonlyWallet.getTransactionHistory().
+        const getTxCreatedAt = async (txid) => {
+            const cached = vtxoCreatedAt.get(txid);
+            if (cached !== undefined)
+                return cached;
+            if (this.indexerProvider) {
+                const res = await this.indexerProvider.getVtxos({
+                    outpoints: [{ txid, vout: 0 }],
+                });
+                return res.vtxos[0]?.createdAt.getTime();
+            }
+            return undefined;
+        };
+        return (0, transactionHistory_1.buildTransactionHistory)(vtxos, boardingTxs, commitmentsToIgnore, getTxCreatedAt);
+    }
     async ensureContractEventBroadcasting() {
         if (!this.readonlyWallet)
             return;

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

@@ -161,7 +161,10 @@ class ServiceWorkerReadonlyWallet {
                 publicKey: initConfig.arkServerPublicKey,
             },
             delegatorUrl: initConfig.delegatorUrl,
+            indexerUrl: options.indexerUrl,
+            esploraUrl: options.esploraUrl,
             timeoutMs: options.messageBusTimeoutMs,
+            watcherConfig: options.watcherConfig,
         }, options.messageBusTimeoutMs);
         // Initialize the wallet handler
         const initMessage = {
@@ -178,6 +181,9 @@ class ServiceWorkerReadonlyWallet {
                 publicKey: initConfig.arkServerPublicKey,
             },
             delegatorUrl: initConfig.delegatorUrl,
+            indexerUrl: options.indexerUrl,
+            esploraUrl: options.esploraUrl,
+            watcherConfig: options.watcherConfig,
         };
         wallet.initWalletPayload = initConfig;
         wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
@@ -678,6 +684,14 @@ class ServiceWorkerReadonlyWallet {
                     navigator.serviceWorker.removeEventListener("message", messageHandler);
                 };
             },
+            async refreshVtxos() {
+                const message = {
+                    type: "REFRESH_VTXOS",
+                    id: (0, utils_2.getRandomId)(),
+                    tag: messageTag,
+                };
+                await sendContractMessage(message);
+            },
             async isWatching() {
                 const message = {
                     type: "IS_CONTRACT_MANAGER_WATCHING",
@@ -748,7 +762,11 @@ class ServiceWorkerWallet extends ServiceWorkerReadonlyWallet {
                 publicKey: initConfig.arkServerPublicKey,
             },
             delegatorUrl: initConfig.delegatorUrl,
+            indexerUrl: options.indexerUrl,
+            esploraUrl: options.esploraUrl,
             timeoutMs: options.messageBusTimeoutMs,
+            settlementConfig: options.settlementConfig,
+            watcherConfig: options.watcherConfig,
         }, options.messageBusTimeoutMs);
         // Initialize the service worker with the config
         const initMessage = {
@@ -766,6 +784,10 @@ class ServiceWorkerWallet extends ServiceWorkerReadonlyWallet {
                 publicKey: initConfig.arkServerPublicKey,
             },
             delegatorUrl: initConfig.delegatorUrl,
+            indexerUrl: options.indexerUrl,
+            esploraUrl: options.esploraUrl,
+            settlementConfig: options.settlementConfig,
+            watcherConfig: options.watcherConfig,
         };
         wallet.initWalletPayload = initConfig;
         wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;

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

@@ -157,7 +157,12 @@ class VtxoManager {
         this.knownBoardingUtxos = new Set();
         this.sweptBoardingUtxos = new Set();
         this.pollInProgress = false;
+        this.disposed = false;
         this.consecutivePollFailures = 0;
+        // Guards against renewal feedback loop: when renewVtxos() settles, the
+        // server emits new VTXOs → vtxo_received → renewVtxos() again → infinite loop.
+        this.renewalInProgress = false;
+        this.lastRenewalTimestamp = 0;
         // Normalize: prefer settlementConfig, fall back to renewalConfig, default to enabled
         if (settlementConfig !== undefined) {
             this.settlementConfig = settlementConfig;
@@ -341,32 +346,43 @@ class VtxoManager {
      * ```
      */
     async renewVtxos(eventCallback) {
-        // Get all VTXOs (including recoverable ones)
-        // Use default threshold to bypass settlementConfig gate (manual API should always work)
-        const vtxos = await this.getExpiringVtxos(this.settlementConfig !== false &&
-            this.settlementConfig?.vtxoThreshold !== undefined
-            ? this.settlementConfig.vtxoThreshold * 1000
-            : exports.DEFAULT_RENEWAL_CONFIG.thresholdMs);
-        if (vtxos.length === 0) {
-            throw new Error("No VTXOs available to renew");
-        }
-        const totalAmount = vtxos.reduce((sum, vtxo) => sum + vtxo.value, 0);
-        // Get dust amount from wallet
-        const dustAmount = getDustAmount(this.wallet);
-        // Check if total amount is above dust threshold
-        if (BigInt(totalAmount) < dustAmount) {
-            throw new Error(`Total amount ${totalAmount} is below dust threshold ${dustAmount}`);
+        if (this.renewalInProgress) {
+            throw new Error("Renewal already in progress");
+        }
+        this.renewalInProgress = true;
+        try {
+            // Get all VTXOs (including recoverable ones)
+            // Use default threshold to bypass settlementConfig gate (manual API should always work)
+            const vtxos = await this.getExpiringVtxos(this.settlementConfig !== false &&
+                this.settlementConfig?.vtxoThreshold !== undefined
+                ? this.settlementConfig.vtxoThreshold * 1000
+                : exports.DEFAULT_RENEWAL_CONFIG.thresholdMs);
+            if (vtxos.length === 0) {
+                throw new Error("No VTXOs available to renew");
+            }
+            const totalAmount = vtxos.reduce((sum, vtxo) => sum + vtxo.value, 0);
+            // Get dust amount from wallet
+            const dustAmount = getDustAmount(this.wallet);
+            // Check if total amount is above dust threshold
+            if (BigInt(totalAmount) < dustAmount) {
+                throw new Error(`Total amount ${totalAmount} is below dust threshold ${dustAmount}`);
+            }
+            const arkAddress = await this.wallet.getAddress();
+            const txid = await this.wallet.settle({
+                inputs: vtxos,
+                outputs: [
+                    {
+                        address: arkAddress,
+                        amount: BigInt(totalAmount),
+                    },
+                ],
+            }, eventCallback);
+            this.lastRenewalTimestamp = Date.now();
+            return txid;
+        }
+        finally {
+            this.renewalInProgress = false;
         }
-        const arkAddress = await this.wallet.getAddress();
-        return this.wallet.settle({
-            inputs: vtxos,
-            outputs: [
-                {
-                    address: arkAddress,
-                    amount: BigInt(totalAmount),
-                },
-            ],
-        }, eventCallback);
     }
     // ========== Boarding UTXO Sweep Methods ==========
     /**
@@ -534,7 +550,11 @@ class VtxoManager {
         }
         // Start polling for boarding UTXOs independently of contract manager
         // SSE setup. Use a short delay to let the wallet finish construction.
-        setTimeout(() => this.startBoardingUtxoPoll(), 1000);
+        this.startupPollTimeoutId = setTimeout(() => {
+            if (this.disposed)
+                return;
+            this.startBoardingUtxoPoll();
+        }, 1000);
         try {
             const [delegatorManager, contractManager, destination] = await Promise.all([
                 this.wallet.getDelegatorManager(),
@@ -545,28 +565,33 @@ class VtxoManager {
                 if (event.type !== "vtxo_received") {
                     return;
                 }
-                this.renewVtxos().catch((e) => {
-                    if (e instanceof Error) {
-                        if (e.message.includes("No VTXOs available to renew")) {
-                            // Not an error, just no VTXO eligible for renewal.
-                            return;
+                const msSinceLastRenewal = Date.now() - this.lastRenewalTimestamp;
+                const shouldRenew = !this.renewalInProgress &&
+                    msSinceLastRenewal >= VtxoManager.RENEWAL_COOLDOWN_MS;
+                if (shouldRenew) {
+                    this.renewVtxos().catch((e) => {
+                        if (e instanceof Error) {
+                            if (e.message.includes("No VTXOs available to renew")) {
+                                // Not an error, just no VTXO eligible for renewal.
+                                return;
+                            }
+                            if (e.message.includes("is below dust threshold")) {
+                                // Not an error, just below dust threshold.
+                                // As more VTXOs are received, the threshold will be raised.
+                                return;
+                            }
+                            if (e.message.includes("VTXO_ALREADY_REGISTERED") ||
+                                e.message.includes("duplicated input")) {
+                                // VTXO is already being used in a concurrent
+                                // user-initiated operation. Skip silently — the
+                                // wallet's tx lock serializes these, but the
+                                // renewal will retry on the next cycle.
+                                return;
+                            }
                         }
-                        if (e.message.includes("is below dust threshold")) {
-                            // Not an error, just below dust threshold.
-                            // As more VTXOs are received, the threshold will be raised.
-                            return;
-                        }
-                        if (e.message.includes("VTXO_ALREADY_REGISTERED") ||
-                            e.message.includes("duplicated input")) {
-                            // VTXO is already being used in a concurrent
-                            // user-initiated operation. Skip silently — the
-                            // wallet's tx lock serializes these, but the
-                            // renewal will retry on the next cycle.
-                            return;
-                        }
-                    }
-                    console.error("Error renewing VTXOs:", e);
-                });
+                        console.error("Error renewing VTXOs:", e);
+                    });
+                }
                 delegatorManager
                     ?.delegate(event.vtxos, destination)
                     .catch((e) => {
@@ -606,7 +631,7 @@ class VtxoManager {
         this.pollBoardingUtxos();
     }
     schedulePoll() {
-        if (this.settlementConfig === false)
+        if (this.disposed || this.settlementConfig === false)
             return;
         const delay = this.getNextPollDelay();
         this.pollTimeoutId = setTimeout(() => this.pollBoardingUtxos(), delay);
@@ -680,8 +705,8 @@ class VtxoManager {
             const expired = boardingUtxos.filter((utxo) => (0, arkTransaction_1.hasBoardingTxExpired)(utxo, boardingTimelock, chainTipHeight));
             expiredSet = new Set(expired.map((u) => `${u.txid}:${u.vout}`));
         }
-        catch {
-            return;
+        catch (e) {
+            throw e instanceof Error ? e : new Error(String(e));
         }
         const unsettledUtxos = boardingUtxos.filter((u) => !this.knownBoardingUtxos.has(`${u.txid}:${u.vout}`) &&
             !expiredSet.has(`${u.txid}:${u.vout}`));
@@ -703,6 +728,11 @@ class VtxoManager {
     }
     async dispose() {
         this.disposePromise ?? (this.disposePromise = (async () => {
+            this.disposed = true;
+            if (this.startupPollTimeoutId) {
+                clearTimeout(this.startupPollTimeoutId);
+                this.startupPollTimeoutId = undefined;
+            }
             if (this.pollTimeoutId) {
                 clearTimeout(this.pollTimeoutId);
                 this.pollTimeoutId = undefined;
@@ -719,3 +749,4 @@ class VtxoManager {
 }
 exports.VtxoManager = VtxoManager;
 VtxoManager.MAX_BACKOFF_MS = 5 * 60 * 1000; // 5 minutes
+VtxoManager.RENEWAL_COOLDOWN_MS = 30000; // 30 seconds