@arkade-os/sdk 0.4.7 → 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/identity/seedIdentity.js

@@ -105,7 +105,7 @@ class SeedIdentity {
     static fromSeed(seed, opts) {
         const descriptor = hasDescriptor(opts)
             ? opts.descriptor
-            : buildDescriptor(seed, opts.isMainnet);
+            : buildDescriptor(seed, opts.isMainnet ?? true);
         return new SeedIdentity(seed, descriptor);
     }
     async xOnlyPublicKey() {
@@ -194,7 +194,7 @@ class MnemonicIdentity extends SeedIdentity {
         const seed = (0, bip39_1.mnemonicToSeedSync)(phrase, passphrase);
         const descriptor = hasDescriptor(opts)
             ? opts.descriptor
-            : buildDescriptor(seed, opts.isMainnet);
+            : buildDescriptor(seed, opts.isMainnet ?? true);
         return new MnemonicIdentity(seed, descriptor);
     }
 }

package/dist/cjs/index.js

@@ -36,8 +36,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasBoardingTxExpired = exports.waitForIncomingFunds = exports.verifyTapscriptSignatures = exports.buildOffchainTx = exports.ConditionWitness = exports.VtxoTaprootTree = exports.VtxoTreeExpiry = exports.CosignerPublicKey = exports.getArkPsbtFields = exports.setArkPsbtField = exports.ArkPsbtFieldKeyType = exports.ArkPsbtFieldKey = exports.TapTreeCoder = exports.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.decodeTapscript = exports.ServiceWorkerReadonlyWallet = exports.ServiceWorkerWallet = exports.WalletMessageHandler = exports.MessageBus = exports.setupServiceWorker = exports.SettlementEventType = exports.ChainTxType = exports.IndexerTxType = exports.TxType = exports.VHTLC = exports.VtxoScript = exports.DelegateVtxo = exports.DefaultVtxo = exports.ArkAddress = exports.RestIndexerProvider = exports.RestArkProvider = exports.EsploraProvider = exports.ESPLORA_URL = exports.RestDelegatorProvider = exports.DelegatorManagerImpl = exports.VtxoManager = exports.Ramps = exports.OnchainWallet = exports.ReadonlyDescriptorIdentity = exports.MnemonicIdentity = exports.SeedIdentity = exports.ReadonlySingleKey = exports.SingleKey = exports.ReadonlyWallet = exports.Wallet = exports.asset = void 0;
-exports.isArkContract = exports.contractFromArkContractWithAddress = exports.contractFromArkContract = exports.decodeArkContract = exports.encodeArkContract = exports.VHTLCContractHandler = exports.DelegateContractHandler = exports.DefaultContractHandler = exports.contractHandlers = exports.ContractWatcher = exports.ContractManager = exports.getSequence = exports.isExpired = exports.isSubdust = exports.isSpendable = exports.isRecoverable = exports.buildForfeitTx = exports.validateConnectorsTxGraph = exports.validateVtxoTxGraph = exports.Batch = exports.maybeArkError = exports.ArkError = exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.BIP322 = exports.Intent = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.rollbackMigration = exports.getMigrationStatus = exports.requiresMigration = exports.migrateWalletRepository = exports.MIGRATION_KEY = exports.InMemoryContractRepository = exports.InMemoryWalletRepository = exports.IndexedDBContractRepository = exports.IndexedDBWalletRepository = exports.openDatabase = exports.closeDatabase = exports.networks = exports.ArkNote = exports.isValidArkAddress = exports.isVtxoExpiringSoon = exports.combineTapscriptSigs = void 0;
+exports.VtxoTaprootTree = exports.VtxoTreeExpiry = exports.CosignerPublicKey = exports.getArkPsbtFields = exports.setArkPsbtField = exports.ArkPsbtFieldKeyType = exports.ArkPsbtFieldKey = exports.TapTreeCoder = exports.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.decodeTapscript = exports.ServiceWorkerReadonlyWallet = exports.ServiceWorkerWallet = exports.ServiceWorkerTimeoutError = exports.MessageBusNotInitializedError = exports.DelegatorNotConfiguredError = exports.ReadonlyWalletError = exports.WalletNotInitializedError = exports.WalletMessageHandler = exports.MessageBus = exports.setupServiceWorker = exports.SettlementEventType = exports.ChainTxType = exports.IndexerTxType = exports.TxType = exports.VHTLC = exports.VtxoScript = exports.DelegateVtxo = exports.DefaultVtxo = exports.ArkAddress = exports.RestIndexerProvider = exports.RestArkProvider = exports.EsploraProvider = exports.ESPLORA_URL = exports.RestDelegatorProvider = exports.DelegatorManagerImpl = exports.VtxoManager = exports.Ramps = exports.OnchainWallet = exports.ReadonlyDescriptorIdentity = exports.MnemonicIdentity = exports.SeedIdentity = exports.ReadonlySingleKey = exports.SingleKey = exports.ReadonlyWallet = exports.Wallet = exports.asset = void 0;
+exports.contractFromArkContractWithAddress = exports.contractFromArkContract = exports.decodeArkContract = exports.encodeArkContract = exports.VHTLCContractHandler = exports.DelegateContractHandler = exports.DefaultContractHandler = exports.contractHandlers = exports.ContractWatcher = exports.ContractManager = exports.getSequence = exports.isExpired = exports.isSubdust = exports.isSpendable = exports.isRecoverable = exports.buildForfeitTx = exports.validateConnectorsTxGraph = exports.validateVtxoTxGraph = exports.Batch = exports.maybeArkError = exports.ArkError = exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.BIP322 = exports.Intent = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.rollbackMigration = exports.getMigrationStatus = exports.requiresMigration = exports.migrateWalletRepository = exports.MIGRATION_KEY = exports.InMemoryContractRepository = exports.InMemoryWalletRepository = exports.IndexedDBContractRepository = exports.IndexedDBWalletRepository = exports.openDatabase = exports.closeDatabase = exports.networks = exports.ArkNote = exports.isValidArkAddress = exports.isVtxoExpiringSoon = exports.combineTapscriptSigs = exports.hasBoardingTxExpired = exports.waitForIncomingFunds = exports.verifyTapscriptSignatures = exports.buildOffchainTx = exports.ConditionWitness = void 0;
+exports.isArkContract = void 0;
 const transaction_1 = require("./utils/transaction");
 Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return transaction_1.Transaction; } });
 const singleKey_1 = require("./identity/singleKey");
@@ -175,3 +176,9 @@ Object.defineProperty(exports, "closeDatabase", { enumerable: true, get: functio
 Object.defineProperty(exports, "openDatabase", { enumerable: true, get: function () { return manager_1.openDatabase; } });
 const wallet_message_handler_1 = require("./wallet/serviceWorker/wallet-message-handler");
 Object.defineProperty(exports, "WalletMessageHandler", { enumerable: true, get: function () { return wallet_message_handler_1.WalletMessageHandler; } });
+Object.defineProperty(exports, "WalletNotInitializedError", { enumerable: true, get: function () { return wallet_message_handler_1.WalletNotInitializedError; } });
+Object.defineProperty(exports, "ReadonlyWalletError", { enumerable: true, get: function () { return wallet_message_handler_1.ReadonlyWalletError; } });
+Object.defineProperty(exports, "DelegatorNotConfiguredError", { enumerable: true, get: function () { return wallet_message_handler_1.DelegatorNotConfiguredError; } });
+const errors_2 = require("./worker/errors");
+Object.defineProperty(exports, "MessageBusNotInitializedError", { enumerable: true, get: function () { return errors_2.MessageBusNotInitializedError; } });
+Object.defineProperty(exports, "ServiceWorkerTimeoutError", { enumerable: true, get: function () { return errors_2.ServiceWorkerTimeoutError; } });

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

@@ -1,9 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WalletMessageHandler = exports.DEFAULT_MESSAGE_TAG = void 0;
+exports.WalletMessageHandler = exports.DEFAULT_MESSAGE_TAG = exports.DelegatorNotConfiguredError = exports.ReadonlyWalletError = exports.WalletNotInitializedError = void 0;
 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");
+        this.name = "WalletNotInitializedError";
+    }
+}
+exports.WalletNotInitializedError = WalletNotInitializedError;
+class ReadonlyWalletError extends Error {
+    constructor() {
+        super("Read-only wallet: operation requires signing");
+        this.name = "ReadonlyWalletError";
+    }
+}
+exports.ReadonlyWalletError = ReadonlyWalletError;
+class DelegatorNotConfiguredError extends Error {
+    constructor() {
+        super("Delegator not configured");
+        this.name = "DelegatorNotConfiguredError";
+    }
+}
+exports.DelegatorNotConfiguredError = DelegatorNotConfiguredError;
 exports.DEFAULT_MESSAGE_TAG = "WALLET_UPDATER";
 class WalletMessageHandler {
     /**
@@ -24,7 +46,31 @@ class WalletMessageHandler {
         this.walletRepository = repositories.walletRepository;
     }
     async stop() {
-        // optional cleanup and persistence
+        if (this.incomingFundsSubscription) {
+            this.incomingFundsSubscription();
+            this.incomingFundsSubscription = undefined;
+        }
+        if (this.contractEventsSubscription) {
+            this.contractEventsSubscription();
+            this.contractEventsSubscription = undefined;
+        }
+        // Dispose the wallet to stop VtxoManager background tasks
+        // (auto-renewal, boarding UTXO polling) and ContractWatcher.
+        try {
+            if (this.wallet) {
+                await this.wallet.dispose();
+            }
+            else if (this.readonlyWallet) {
+                await this.readonlyWallet.dispose();
+            }
+        }
+        catch (_) {
+            // best-effort teardown
+        }
+        this.wallet = undefined;
+        this.readonlyWallet = undefined;
+        this.arkProvider = undefined;
+        this.indexerProvider = undefined;
     }
     async tick(_now) {
         const results = await Promise.allSettled(this.onNextTick.map((fn) => fn()));
@@ -47,7 +93,7 @@ class WalletMessageHandler {
     }
     requireWallet() {
         if (!this.wallet) {
-            throw new Error("Read-only wallet: operation requires signing");
+            throw new ReadonlyWalletError();
         }
         return this.wallet;
     }
@@ -69,7 +115,7 @@ class WalletMessageHandler {
         if (!this.readonlyWallet) {
             return this.tagged({
                 id,
-                error: new Error("Wallet handler not initialized"),
+                error: new WalletNotInitializedError(),
             });
         }
         try {
@@ -130,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",
@@ -157,7 +204,7 @@ class WalletMessageHandler {
                     });
                 }
                 case "RELOAD_WALLET": {
-                    await this.onWalletInitialized();
+                    await this.reloadWallet();
                     return this.tagged({
                         id,
                         type: "RELOAD_SUCCESS",
@@ -243,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);
@@ -297,7 +352,7 @@ class WalletMessageHandler {
                     const wallet = this.requireWallet();
                     const delegatorManager = await wallet.getDelegatorManager();
                     if (!delegatorManager) {
-                        throw new Error("Delegator not configured");
+                        throw new DelegatorNotConfiguredError();
                     }
                     const info = await delegatorManager.getDelegateInfo();
                     return this.tagged({
@@ -306,6 +361,83 @@ class WalletMessageHandler {
                         payload: { info },
                     });
                 }
+                case "RECOVER_VTXOS": {
+                    const wallet = this.requireWallet();
+                    const vtxoManager = await wallet.getVtxoManager();
+                    const txid = await vtxoManager.recoverVtxos((e) => {
+                        this.scheduleForNextTick(() => this.tagged({
+                            id,
+                            type: "RECOVER_VTXOS_EVENT",
+                            payload: e,
+                        }));
+                    });
+                    return this.tagged({
+                        id,
+                        type: "RECOVER_VTXOS_SUCCESS",
+                        payload: { txid },
+                    });
+                }
+                case "GET_RECOVERABLE_BALANCE": {
+                    const wallet = this.requireWallet();
+                    const vtxoManager = await wallet.getVtxoManager();
+                    const balance = await vtxoManager.getRecoverableBalance();
+                    return this.tagged({
+                        id,
+                        type: "RECOVERABLE_BALANCE",
+                        payload: {
+                            recoverable: balance.recoverable.toString(),
+                            subdust: balance.subdust.toString(),
+                            includesSubdust: balance.includesSubdust,
+                            vtxoCount: balance.vtxoCount,
+                        },
+                    });
+                }
+                case "GET_EXPIRING_VTXOS": {
+                    const wallet = this.requireWallet();
+                    const vtxoManager = await wallet.getVtxoManager();
+                    const vtxos = await vtxoManager.getExpiringVtxos(message.payload.thresholdMs);
+                    return this.tagged({
+                        id,
+                        type: "EXPIRING_VTXOS",
+                        payload: { vtxos },
+                    });
+                }
+                case "RENEW_VTXOS": {
+                    const wallet = this.requireWallet();
+                    const vtxoManager = await wallet.getVtxoManager();
+                    const txid = await vtxoManager.renewVtxos((e) => {
+                        this.scheduleForNextTick(() => this.tagged({
+                            id,
+                            type: "RENEW_VTXOS_EVENT",
+                            payload: e,
+                        }));
+                    });
+                    return this.tagged({
+                        id,
+                        type: "RENEW_VTXOS_SUCCESS",
+                        payload: { txid },
+                    });
+                }
+                case "GET_EXPIRED_BOARDING_UTXOS": {
+                    const wallet = this.requireWallet();
+                    const vtxoManager = await wallet.getVtxoManager();
+                    const utxos = await vtxoManager.getExpiredBoardingUtxos();
+                    return this.tagged({
+                        id,
+                        type: "EXPIRED_BOARDING_UTXOS",
+                        payload: { utxos },
+                    });
+                }
+                case "SWEEP_EXPIRED_BOARDING_UTXOS": {
+                    const wallet = this.requireWallet();
+                    const vtxoManager = await wallet.getVtxoManager();
+                    const txid = await vtxoManager.sweepExpiredBoardingUtxos();
+                    return this.tagged({
+                        id,
+                        type: "SWEEP_EXPIRED_BOARDING_UTXOS_SUCCESS",
+                        payload: { txid },
+                    });
+                }
                 default:
                     console.error("Unknown message type", message);
                     throw new Error("Unknown message");
@@ -322,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;
@@ -338,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;
@@ -388,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 ||
@@ -412,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
@@ -427,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
@@ -480,7 +601,28 @@ 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.
+        if (this.wallet) {
+            try {
+                await this.wallet.getVtxoManager();
+            }
+            catch (error) {
+                console.error("Error starting VtxoManager:", error);
+            }
+        }
+    }
+    /**
+     * 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();
@@ -523,7 +665,7 @@ class WalletMessageHandler {
         const wallet = this.requireWallet();
         const delegatorManager = await wallet.getDelegatorManager();
         if (!delegatorManager) {
-            throw new Error("Delegator not configured");
+            throw new DelegatorNotConfiguredError();
         }
         const { vtxoOutpoints, destination, delegateAt } = message.payload;
         const allVtxos = await wallet.getVtxos();
@@ -550,7 +692,7 @@ class WalletMessageHandler {
     }
     async handleGetVtxos(message) {
         if (!this.readonlyWallet) {
-            throw new Error("Wallet handler not initialized");
+            throw new WalletNotInitializedError();
         }
         const vtxos = await this.getSpendableVtxos();
         const dustAmount = this.readonlyWallet.dustAmount;
@@ -605,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;