@arkade-os/sdk 0.4.13 → 0.4.15

package/dist/cjs/contracts/handlers/helpers.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.timelockToSequence = timelockToSequence;
 exports.sequenceToTimelock = sequenceToTimelock;
 exports.resolveRole = resolveRole;
+exports.isCltvSatisfied = isCltvSatisfied;
 exports.isCsvSpendable = isCsvSpendable;
 const bip68 = __importStar(require("bip68"));
 /**
@@ -78,6 +79,29 @@ function resolveRole(contract, context) {
     }
     return undefined;
 }
+/**
+ * BIP65 threshold: locktime values below this are interpreted as block heights,
+ * values at or above are interpreted as Unix timestamps (seconds).
+ */
+const CLTV_HEIGHT_THRESHOLD = 500000000n;
+/**
+ * Check if an absolute (CLTV) locktime is currently satisfied.
+ *
+ * Following the BIP65 convention:
+ * - locktime < 500_000_000  → interpreted as a block height; compared against `context.blockHeight`
+ * - locktime >= 500_000_000 → interpreted as a Unix timestamp (seconds); compared against `context.currentTime`
+ *
+ * Returns false if the relevant context field is missing.
+ */
+function isCltvSatisfied(context, locktime) {
+    if (locktime < CLTV_HEIGHT_THRESHOLD) {
+        if (context.blockHeight === undefined)
+            return false;
+        return BigInt(context.blockHeight) >= locktime;
+    }
+    const currentTimeSec = BigInt(Math.floor(context.currentTime / 1000));
+    return currentTimeSec >= locktime;
+}
 /**
  * Check if a CSV timelock is currently satisfied for the given context/VTXO.
  */

package/dist/cjs/contracts/handlers/vhtlc.js

@@ -59,7 +59,6 @@ exports.VHTLCContractHandler = {
         const role = (0, helpers_1.resolveRole)(contract, context);
         const preimage = contract.params?.preimage;
         const refundLocktime = BigInt(contract.params.refundLocktime);
-        const currentTimeSec = Math.floor(context.currentTime / 1000);
         if (!role) {
             return null;
         }
@@ -70,7 +69,7 @@ exports.VHTLCContractHandler = {
                     extraWitness: [base_1.hex.decode(preimage)],
                 };
             }
-            if (role === "sender" && BigInt(currentTimeSec) >= refundLocktime) {
+            if (role === "sender" && (0, helpers_1.isCltvSatisfied)(context, refundLocktime)) {
                 return {
                     leaf: script.refundWithoutReceiver(),
                 };
@@ -154,7 +153,6 @@ exports.VHTLCContractHandler = {
         }
         const preimage = contract.params?.preimage;
         const refundLocktime = BigInt(contract.params.refundLocktime);
-        const currentTimeSec = Math.floor(context.currentTime / 1000);
         if (context.collaborative) {
             if (role === "receiver" && preimage) {
                 paths.push({
@@ -162,7 +160,7 @@ exports.VHTLCContractHandler = {
                     extraWitness: [base_1.hex.decode(preimage)],
                 });
             }
-            if (role === "sender" && BigInt(currentTimeSec) >= refundLocktime) {
+            if (role === "sender" && (0, helpers_1.isCltvSatisfied)(context, refundLocktime)) {
                 paths.push({
                     leaf: script.refundWithoutReceiver(),
                 });

package/dist/cjs/identity/index.js

@@ -14,5 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBatchSignable = isBatchSignable;
+/** Type guard for identities that support batch signing. */
+function isBatchSignable(identity) {
+    return ("signMultiple" in identity &&
+        typeof identity.signMultiple === "function");
+}
 __exportStar(require("./singleKey"), exports);
 __exportStar(require("./seedIdentity"), exports);

package/dist/cjs/identity/seedIdentity.js

@@ -17,7 +17,7 @@ const ALL_SIGHASH = Object.values(btc_signer_1.SigHash).filter((x) => typeof x =
 function detectNetwork(descriptor) {
     return descriptor.includes("tpub") ? descriptors_scure_1.networks.testnet : descriptors_scure_1.networks.bitcoin;
 }
-function hasDescriptor(opts) {
+function hasDescriptor(opts = {}) {
     return "descriptor" in opts && typeof opts.descriptor === "string";
 }
 /**
@@ -101,7 +101,7 @@ class SeedIdentity {
      * @param seed - 64-byte seed (typically from mnemonicToSeedSync)
      * @param opts - Network selection or custom descriptor.
      */
-    static fromSeed(seed, opts) {
+    static fromSeed(seed, opts = {}) {
         const descriptor = hasDescriptor(opts)
             ? opts.descriptor
             : buildDescriptor(seed, opts.isMainnet ?? true);
@@ -185,7 +185,7 @@ class MnemonicIdentity extends SeedIdentity {
      * @param phrase - BIP39 mnemonic phrase (12 or 24 words)
      * @param opts - Network selection or custom descriptor, plus optional passphrase
      */
-    static fromMnemonic(phrase, opts) {
+    static fromMnemonic(phrase, opts = {}) {
         if (!(0, bip39_1.validateMnemonic)(phrase, english_js_1.wordlist)) {
             throw new Error("Invalid mnemonic");
         }

package/dist/cjs/index.js

@@ -36,9 +36,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-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.MESSAGE_BUS_NOT_INITIALIZED = 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.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 = exports.VtxoTaprootTree = void 0;
-exports.isArkContract = exports.contractFromArkContractWithAddress = void 0;
+exports.getArkPsbtFields = exports.setArkPsbtField = exports.ArkPsbtFieldKeyType = exports.ArkPsbtFieldKey = exports.TapTreeCoder = exports.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.decodeTapscript = exports.DEFAULT_MESSAGE_TIMEOUTS = exports.ServiceWorkerReadonlyWallet = exports.ServiceWorkerWallet = exports.ServiceWorkerTimeoutError = exports.MessageBusNotInitializedError = exports.MESSAGE_BUS_NOT_INITIALIZED = 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.isBatchSignable = exports.ReadonlyDescriptorIdentity = exports.MnemonicIdentity = exports.SeedIdentity = exports.ReadonlySingleKey = exports.SingleKey = exports.ReadonlyWallet = exports.Wallet = exports.asset = void 0;
+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 = exports.VtxoTaprootTree = exports.VtxoTreeExpiry = exports.CosignerPublicKey = void 0;
+exports.isArkContract = exports.contractFromArkContractWithAddress = exports.contractFromArkContract = exports.decodeArkContract = 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");
@@ -48,6 +48,8 @@ const seedIdentity_1 = require("./identity/seedIdentity");
 Object.defineProperty(exports, "SeedIdentity", { enumerable: true, get: function () { return seedIdentity_1.SeedIdentity; } });
 Object.defineProperty(exports, "MnemonicIdentity", { enumerable: true, get: function () { return seedIdentity_1.MnemonicIdentity; } });
 Object.defineProperty(exports, "ReadonlyDescriptorIdentity", { enumerable: true, get: function () { return seedIdentity_1.ReadonlyDescriptorIdentity; } });
+const identity_1 = require("./identity");
+Object.defineProperty(exports, "isBatchSignable", { enumerable: true, get: function () { return identity_1.isBatchSignable; } });
 const address_1 = require("./script/address");
 Object.defineProperty(exports, "ArkAddress", { enumerable: true, get: function () { return address_1.ArkAddress; } });
 const vhtlc_1 = require("./script/vhtlc");
@@ -84,6 +86,7 @@ Object.defineProperty(exports, "VtxoManager", { enumerable: true, get: function
 const wallet_3 = require("./wallet/serviceWorker/wallet");
 Object.defineProperty(exports, "ServiceWorkerWallet", { enumerable: true, get: function () { return wallet_3.ServiceWorkerWallet; } });
 Object.defineProperty(exports, "ServiceWorkerReadonlyWallet", { enumerable: true, get: function () { return wallet_3.ServiceWorkerReadonlyWallet; } });
+Object.defineProperty(exports, "DEFAULT_MESSAGE_TIMEOUTS", { enumerable: true, get: function () { return wallet_3.DEFAULT_MESSAGE_TIMEOUTS; } });
 const onchain_1 = require("./wallet/onchain");
 Object.defineProperty(exports, "OnchainWallet", { enumerable: true, get: function () { return onchain_1.OnchainWallet; } });
 const utils_1 = require("./worker/browser/utils");

package/dist/cjs/script/tapscript.js

@@ -535,7 +535,7 @@ var CLTVMultisigTapscript;
             throw new Error(`Invalid script: too short (expected at least 3)`);
         }
         const locktime = asm[0];
-        if (typeof locktime === "string" || typeof locktime === "number") {
+        if (typeof locktime === "string") {
             throw new Error("Invalid script: expected locktime number");
         }
         if (asm[1] !== "CHECKLOCKTIMEVERIFY" || asm[2] !== "DROP") {
@@ -549,7 +549,13 @@ var CLTVMultisigTapscript;
         catch (error) {
             throw new Error(`Invalid multisig script: ${error instanceof Error ? error.message : String(error)}`);
         }
-        const absoluteTimelock = MinimalScriptNum.decode(locktime);
+        let absoluteTimelock;
+        if (typeof locktime === "number") {
+            absoluteTimelock = BigInt(locktime);
+        }
+        else {
+            absoluteTimelock = MinimalScriptNum.decode(locktime);
+        }
         const reconstructed = encode({
             absoluteTimelock,
             ...multisig.params,

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceWorkerWallet = exports.ServiceWorkerReadonlyWallet = void 0;
+exports.ServiceWorkerWallet = exports.ServiceWorkerReadonlyWallet = exports.DEFAULT_MESSAGE_TIMEOUTS = void 0;
 const base_1 = require("@scure/base");
 const utils_1 = require("../../worker/browser/utils");
 const repositories_1 = require("../../repositories");
@@ -14,6 +14,47 @@ function isMessageBusNotInitializedError(error) {
     return (error instanceof Error &&
         error.message.includes(errors_1.MESSAGE_BUS_NOT_INITIALIZED));
 }
+exports.DEFAULT_MESSAGE_TIMEOUTS = {
+    // Fast reads — fail quickly
+    GET_ADDRESS: 10000,
+    GET_BALANCE: 10000,
+    GET_BOARDING_ADDRESS: 10000,
+    GET_STATUS: 10000,
+    GET_DELEGATE_INFO: 10000,
+    IS_CONTRACT_MANAGER_WATCHING: 10000,
+    // Medium reads — may involve indexer queries
+    GET_VTXOS: 20000,
+    GET_BOARDING_UTXOS: 20000,
+    GET_TRANSACTION_HISTORY: 20000,
+    GET_CONTRACTS: 20000,
+    GET_CONTRACTS_WITH_VTXOS: 20000,
+    GET_SPENDABLE_PATHS: 20000,
+    GET_ALL_SPENDING_PATHS: 20000,
+    GET_ASSET_DETAILS: 20000,
+    GET_EXPIRING_VTXOS: 20000,
+    GET_EXPIRED_BOARDING_UTXOS: 20000,
+    GET_RECOVERABLE_BALANCE: 20000,
+    RELOAD_WALLET: 20000,
+    // Transactions — need more headroom
+    SEND_BITCOIN: 50000,
+    SEND: 50000,
+    SETTLE: 50000,
+    ISSUE: 50000,
+    REISSUE: 50000,
+    BURN: 50000,
+    DELEGATE: 50000,
+    RECOVER_VTXOS: 50000,
+    RENEW_VTXOS: 50000,
+    SWEEP_EXPIRED_BOARDING_UTXOS: 50000,
+    // Misc writes
+    INIT_WALLET: 30000,
+    CLEAR: 10000,
+    SIGN_TRANSACTION: 30000,
+    CREATE_CONTRACT: 30000,
+    UPDATE_CONTRACT: 30000,
+    DELETE_CONTRACT: 10000,
+    REFRESH_VTXOS: 30000,
+};
 const DEDUPABLE_REQUEST_TYPES = new Set([
     "GET_ADDRESS",
     "GET_BALANCE",
@@ -129,6 +170,7 @@ class ServiceWorkerReadonlyWallet {
         this.messageTag = messageTag;
         this.initConfig = null;
         this.initWalletPayload = null;
+        this.messageTimeouts = exports.DEFAULT_MESSAGE_TIMEOUTS;
         this.reinitPromise = null;
         this.pingPromise = null;
         this.inflightRequests = new Map();
@@ -137,6 +179,9 @@ class ServiceWorkerReadonlyWallet {
         this.contractRepository = contractRepository;
         this._readonlyAssetManager = new ServiceWorkerReadonlyAssetManager((msg) => this.sendMessage(msg), messageTag);
     }
+    getTimeoutForRequest(request) {
+        return this.messageTimeouts[request.type] ?? 30000;
+    }
     static async create(options) {
         const walletRepository = options.storage?.walletRepository ??
             new repositories_1.IndexedDBWalletRepository();
@@ -188,6 +233,12 @@ class ServiceWorkerReadonlyWallet {
         };
         wallet.initWalletPayload = initConfig;
         wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
+        if (options.messageTimeouts) {
+            wallet.messageTimeouts = {
+                ...exports.DEFAULT_MESSAGE_TIMEOUTS,
+                ...options.messageTimeouts,
+            };
+        }
         return wallet;
     }
     /**
@@ -223,7 +274,7 @@ class ServiceWorkerReadonlyWallet {
             serviceWorker,
         });
     }
-    sendMessageDirect(request) {
+    sendMessageDirect(request, timeoutMs) {
         return new Promise((resolve, reject) => {
             const cleanup = () => {
                 clearTimeout(timeoutId);
@@ -232,7 +283,7 @@ class ServiceWorkerReadonlyWallet {
             const timeoutId = setTimeout(() => {
                 cleanup();
                 reject(new errors_1.ServiceWorkerTimeoutError(`Service worker message timed out (${request.type})`));
-            }, 30000);
+            }, timeoutMs);
             const messageHandler = (event) => {
                 const response = event.data;
                 if (request.id !== response.id) {
@@ -255,14 +306,14 @@ class ServiceWorkerReadonlyWallet {
     // first response for which isComplete returns true. The timeout resets
     // on every intermediate event so long-running but progressing operations
     // don't time out prematurely.
-    sendMessageStreaming(request, onEvent, isComplete) {
+    sendMessageStreaming(request, onEvent, isComplete, timeoutMs) {
         return new Promise((resolve, reject) => {
             const resetTimeout = () => {
                 clearTimeout(timeoutId);
                 timeoutId = setTimeout(() => {
                     cleanup();
                     reject(new errors_1.ServiceWorkerTimeoutError(`Service worker message timed out (${request.type})`));
-                }, 30000);
+                }, timeoutMs);
             };
             const cleanup = () => {
                 clearTimeout(timeoutId);
@@ -348,10 +399,11 @@ class ServiceWorkerReadonlyWallet {
                 await this.reinitialize();
             }
         }
+        const timeoutMs = this.getTimeoutForRequest(request);
         const maxRetries = 2;
         for (let attempt = 0;; attempt++) {
             try {
-                return await this.sendMessageDirect(request);
+                return await this.sendMessageDirect(request, timeoutMs);
             }
             catch (error) {
                 if (!isMessageBusNotInitializedError(error) ||
@@ -373,10 +425,11 @@ class ServiceWorkerReadonlyWallet {
                 await this.reinitialize();
             }
         }
+        const timeoutMs = this.getTimeoutForRequest(request);
         const maxRetries = 2;
         for (let attempt = 0;; attempt++) {
             try {
-                return await this.sendMessageStreaming(request, onEvent, isComplete);
+                return await this.sendMessageStreaming(request, onEvent, isComplete, timeoutMs);
             }
             catch (error) {
                 if (!isMessageBusNotInitializedError(error) ||
@@ -401,7 +454,7 @@ class ServiceWorkerReadonlyWallet {
                 id: (0, utils_2.getRandomId)(),
                 payload: this.initWalletPayload,
             };
-            await this.sendMessageDirect(initMessage);
+            await this.sendMessageDirect(initMessage, this.getTimeoutForRequest(initMessage));
         })().finally(() => {
             this.reinitPromise = null;
         });
@@ -793,6 +846,12 @@ class ServiceWorkerWallet extends ServiceWorkerReadonlyWallet {
         };
         wallet.initWalletPayload = initConfig;
         wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
+        if (options.messageTimeouts) {
+            wallet.messageTimeouts = {
+                ...exports.DEFAULT_MESSAGE_TIMEOUTS,
+                ...options.messageTimeouts,
+            };
+        }
         return wallet;
     }
     /**

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

@@ -581,6 +581,7 @@ class VtxoManager {
                                 return;
                             }
                             if (e.message.includes("VTXO_ALREADY_REGISTERED") ||
+                                e.message.includes("VTXO_ALREADY_SPENT") ||
                                 e.message.includes("duplicated input")) {
                                 // VTXO is already being used in a concurrent
                                 // user-initiated operation. Skip silently — the

package/dist/cjs/wallet/wallet.js

@@ -15,6 +15,7 @@ const ark_1 = require("../providers/ark");
 const forfeit_1 = require("../forfeit");
 const validation_1 = require("../tree/validation");
 const validation_2 = require("./validation");
+const identity_1 = require("../identity");
 const _1 = require(".");
 const asset_1 = require("./asset");
 const base_2 = require("../script/base");
@@ -345,6 +346,19 @@ class ReadonlyWallet {
         }
         const requestStartedAt = Date.now();
         const allVtxos = [];
+        const extendWithScript = (vtxo) => {
+            const vtxoScript = vtxo.script
+                ? scriptMap.get(vtxo.script)
+                : undefined;
+            if (!vtxoScript)
+                return undefined;
+            return {
+                ...vtxo,
+                forfeitTapLeafScript: vtxoScript.forfeit(),
+                intentTapLeafScript: vtxoScript.forfeit(),
+                tapTree: vtxoScript.encode(),
+            };
+        };
         // Full fetch for scripts with no cursor.
         if (bootstrapScripts.length > 0) {
             const response = await this.indexerProvider.getVtxos({
@@ -369,46 +383,76 @@ class ReadonlyWallet {
         // Extend every fetched VTXO and upsert into the cache.
         const fetchedExtended = [];
         for (const vtxo of allVtxos) {
-            const vtxoScript = vtxo.script
-                ? scriptMap.get(vtxo.script)
-                : undefined;
-            if (!vtxoScript)
-                continue;
-            fetchedExtended.push({
-                ...vtxo,
-                forfeitTapLeafScript: vtxoScript.forfeit(),
-                intentTapLeafScript: vtxoScript.forfeit(),
-                tapTree: vtxoScript.encode(),
-            });
+            const extended = extendWithScript(vtxo);
+            if (extended)
+                fetchedExtended.push(extended);
         }
         // Save VTXOs first, then advance cursors only on success.
         const cutoff = (0, syncCursors_1.cursorCutoff)(requestStartedAt);
         await this.walletRepository.saveVtxos(address, fetchedExtended);
         await (0, syncCursors_1.advanceSyncCursors)(this.walletRepository, Object.fromEntries(allScripts.map((s) => [s, cutoff])));
-        // For delta syncs, reconcile pending (preconfirmed/spent) VTXOs
-        // whose state may have changed since the cursor so that
-        // getVtxos()/getTransactionHistory() don't serve stale state.
+        // Delta-sync reconciliation: full re-fetch for delta scripts.
+        //
+        // The delta fetch (above) only returns VTXOs changed after the
+        // cursor, so it can miss preconfirmed VTXOs that were consumed
+        // by a round between syncs.  Rather than layering targeted
+        // queries (pendingOnly, spendableOnly) with pagination guards
+        // and set algebra, we perform a single unfiltered re-fetch for
+        // delta scripts.  This is slightly more data over the wire but
+        // gives us complete, authoritative state in one call and keeps
+        // the reconciliation logic simple.
+        //
+        // Any cached non-spent VTXO that is absent from the full
+        // result set is marked spent; any VTXO whose state changed
+        // (e.g. preconfirmed → settled) is updated in place.
         if (hasDelta) {
-            const { vtxos: pendingVtxos } = await this.indexerProvider.getVtxos({
+            const { vtxos: fullVtxos, page: fullPage } = await this.indexerProvider.getVtxos({
                 scripts: deltaScripts,
-                pendingOnly: true,
             });
-            const pendingExtended = [];
-            for (const vtxo of pendingVtxos) {
-                const vtxoScript = vtxo.script
-                    ? scriptMap.get(vtxo.script)
-                    : undefined;
-                if (!vtxoScript)
-                    continue;
-                pendingExtended.push({
-                    ...vtxo,
-                    forfeitTapLeafScript: vtxoScript.forfeit(),
-                    intentTapLeafScript: vtxoScript.forfeit(),
-                    tapTree: vtxoScript.encode(),
-                });
+            // Reconciliation is best-effort: if the response is
+            // paginated we don't have a complete picture, so we skip
+            // rather than act on partial data.  Wallets with enough
+            // VTXOs to exceed a single page rely solely on the
+            // cursor-based delta mechanism for state updates.
+            const fullSetComplete = !fullPage || fullPage.total <= 1;
+            if (fullSetComplete) {
+                const fullOutpoints = new Map(fullVtxos.map((v) => [`${v.txid}:${v.vout}`, v]));
+                const deltaScriptSet = new Set(deltaScripts);
+                const cachedVtxos = await this.walletRepository.getVtxos(address);
+                const reconciledExtended = [];
+                for (const cached of cachedVtxos) {
+                    if (!cached.script ||
+                        !deltaScriptSet.has(cached.script) ||
+                        cached.isSpent) {
+                        continue;
+                    }
+                    const outpoint = `${cached.txid}:${cached.vout}`;
+                    const fresh = fullOutpoints.get(outpoint);
+                    if (!fresh) {
+                        // Server no longer knows about this VTXO —
+                        // it was spent between syncs.
+                        reconciledExtended.push({
+                            ...cached,
+                            isSpent: true,
+                        });
+                        continue;
+                    }
+                    const extended = extendWithScript(fresh);
+                    if (extended &&
+                        extended.virtualStatus.state !==
+                            cached.virtualStatus.state) {
+                        // State transitioned (e.g. preconfirmed →
+                        // settled) — update the cached entry.
+                        reconciledExtended.push(extended);
+                    }
+                }
+                if (reconciledExtended.length > 0) {
+                    console.warn(`[ark-sdk] delta sync: reconciled ${reconciledExtended.length} stale VTXO(s) via full re-fetch`);
+                    await this.walletRepository.saveVtxos(address, reconciledExtended);
+                }
             }
-            if (pendingExtended.length > 0) {
-                await this.walletRepository.saveVtxos(address, pendingExtended);
+            else {
+                console.warn("[ark-sdk] delta sync: skipping reconciliation — full re-fetch was paginated");
             }
         }
         return {
@@ -1719,16 +1763,47 @@ class Wallet extends ReadonlyWallet {
                 tapLeafScript: input.forfeitTapLeafScript,
             };
         }), outputs, this.serverUnrollScript);
-        const signedVirtualTx = await this.identity.sign(offchainTx.arkTx);
+        let signedVirtualTx;
+        let userSignedCheckpoints;
+        if ((0, identity_1.isBatchSignable)(this.identity)) {
+            // Batch-sign arkTx + all checkpoints in one wallet popup.
+            // Clone so the provider can't mutate originals before submitTx.
+            const requests = [
+                { tx: offchainTx.arkTx.clone() },
+                ...offchainTx.checkpoints.map((c) => ({ tx: c.clone() })),
+            ];
+            const signed = await this.identity.signMultiple(requests);
+            if (signed.length !== requests.length) {
+                throw new Error(`signMultiple returned ${signed.length} transactions, expected ${requests.length}`);
+            }
+            const [firstSignedTx, ...signedCheckpoints] = signed;
+            signedVirtualTx = firstSignedTx;
+            userSignedCheckpoints = signedCheckpoints;
+        }
+        else {
+            signedVirtualTx = await this.identity.sign(offchainTx.arkTx);
+        }
         // Mark pending before submitting — if we crash between submit and
         // finalize, the next init will recover via finalizePendingTxs.
         await this.setPendingTxFlag(true);
         const { arkTxid, signedCheckpointTxs } = await this.arkProvider.submitTx(base_1.base64.encode(signedVirtualTx.toPSBT()), offchainTx.checkpoints.map((c) => base_1.base64.encode(c.toPSBT())));
-        const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {
-            const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(c));
-            const signedCheckpoint = await this.identity.sign(tx);
-            return base_1.base64.encode(signedCheckpoint.toPSBT());
-        }));
+        let finalCheckpoints;
+        if (userSignedCheckpoints) {
+            // Merge pre-signed user signatures onto server-signed checkpoints
+            finalCheckpoints = signedCheckpointTxs.map((c, i) => {
+                const serverSigned = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(c));
+                (0, arkTransaction_1.combineTapscriptSigs)(userSignedCheckpoints[i], serverSigned);
+                return base_1.base64.encode(serverSigned.toPSBT());
+            });
+        }
+        else {
+            // Legacy: sign each checkpoint individually (N popups)
+            finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {
+                const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(c));
+                const signedCheckpoint = await this.identity.sign(tx);
+                return base_1.base64.encode(signedCheckpoint.toPSBT());
+            }));
+        }
         await this.arkProvider.finalizeTx(arkTxid, finalCheckpoints);
         try {
             await this.setPendingTxFlag(false);

package/dist/esm/contracts/handlers/helpers.js

@@ -39,6 +39,29 @@ export function resolveRole(contract, context) {
     }
     return undefined;
 }
+/**
+ * BIP65 threshold: locktime values below this are interpreted as block heights,
+ * values at or above are interpreted as Unix timestamps (seconds).
+ */
+const CLTV_HEIGHT_THRESHOLD = 500000000n;
+/**
+ * Check if an absolute (CLTV) locktime is currently satisfied.
+ *
+ * Following the BIP65 convention:
+ * - locktime < 500_000_000  → interpreted as a block height; compared against `context.blockHeight`
+ * - locktime >= 500_000_000 → interpreted as a Unix timestamp (seconds); compared against `context.currentTime`
+ *
+ * Returns false if the relevant context field is missing.
+ */
+export function isCltvSatisfied(context, locktime) {
+    if (locktime < CLTV_HEIGHT_THRESHOLD) {
+        if (context.blockHeight === undefined)
+            return false;
+        return BigInt(context.blockHeight) >= locktime;
+    }
+    const currentTimeSec = BigInt(Math.floor(context.currentTime / 1000));
+    return currentTimeSec >= locktime;
+}
 /**
  * Check if a CSV timelock is currently satisfied for the given context/VTXO.
  */

package/dist/esm/contracts/handlers/vhtlc.js

@@ -1,6 +1,6 @@
 import { hex } from "@scure/base";
 import { VHTLC } from '../../script/vhtlc.js';
-import { isCsvSpendable, resolveRole, sequenceToTimelock, timelockToSequence, } from './helpers.js';
+import { isCltvSatisfied, isCsvSpendable, resolveRole, sequenceToTimelock, timelockToSequence, } from './helpers.js';
 /**
  * Handler for Virtual Hash Time Lock Contract (VHTLC).
  *
@@ -56,7 +56,6 @@ export const VHTLCContractHandler = {
         const role = resolveRole(contract, context);
         const preimage = contract.params?.preimage;
         const refundLocktime = BigInt(contract.params.refundLocktime);
-        const currentTimeSec = Math.floor(context.currentTime / 1000);
         if (!role) {
             return null;
         }
@@ -67,7 +66,7 @@ export const VHTLCContractHandler = {
                     extraWitness: [hex.decode(preimage)],
                 };
             }
-            if (role === "sender" && BigInt(currentTimeSec) >= refundLocktime) {
+            if (role === "sender" && isCltvSatisfied(context, refundLocktime)) {
                 return {
                     leaf: script.refundWithoutReceiver(),
                 };
@@ -151,7 +150,6 @@ export const VHTLCContractHandler = {
         }
         const preimage = contract.params?.preimage;
         const refundLocktime = BigInt(contract.params.refundLocktime);
-        const currentTimeSec = Math.floor(context.currentTime / 1000);
         if (context.collaborative) {
             if (role === "receiver" && preimage) {
                 paths.push({
@@ -159,7 +157,7 @@ export const VHTLCContractHandler = {
                     extraWitness: [hex.decode(preimage)],
                 });
             }
-            if (role === "sender" && BigInt(currentTimeSec) >= refundLocktime) {
+            if (role === "sender" && isCltvSatisfied(context, refundLocktime)) {
                 paths.push({
                     leaf: script.refundWithoutReceiver(),
                 });

package/dist/esm/identity/index.js

@@ -1,2 +1,7 @@
+/** Type guard for identities that support batch signing. */
+export function isBatchSignable(identity) {
+    return ("signMultiple" in identity &&
+        typeof identity.signMultiple === "function");
+}
 export * from './singleKey.js';
 export * from './seedIdentity.js';

package/dist/esm/identity/seedIdentity.js

@@ -14,7 +14,7 @@ const ALL_SIGHASH = Object.values(SigHash).filter((x) => typeof x === "number");
 function detectNetwork(descriptor) {
     return descriptor.includes("tpub") ? networks.testnet : networks.bitcoin;
 }
-function hasDescriptor(opts) {
+function hasDescriptor(opts = {}) {
     return "descriptor" in opts && typeof opts.descriptor === "string";
 }
 /**
@@ -98,7 +98,7 @@ export class SeedIdentity {
      * @param seed - 64-byte seed (typically from mnemonicToSeedSync)
      * @param opts - Network selection or custom descriptor.
      */
-    static fromSeed(seed, opts) {
+    static fromSeed(seed, opts = {}) {
         const descriptor = hasDescriptor(opts)
             ? opts.descriptor
             : buildDescriptor(seed, opts.isMainnet ?? true);
@@ -181,7 +181,7 @@ export class MnemonicIdentity extends SeedIdentity {
      * @param phrase - BIP39 mnemonic phrase (12 or 24 words)
      * @param opts - Network selection or custom descriptor, plus optional passphrase
      */
-    static fromMnemonic(phrase, opts) {
+    static fromMnemonic(phrase, opts = {}) {
         if (!validateMnemonic(phrase, wordlist)) {
             throw new Error("Invalid mnemonic");
         }