@arkade-os/sdk 0.3.5 → 0.3.7

package/README.md

@@ -120,8 +120,8 @@ import { VtxoManager } from '@arkade-os/sdk'
 
 // Create manager with optional renewal configuration
 const manager = new VtxoManager(wallet, {
-  enabled: true,           // Enable expiration monitoring
-  thresholdPercentage: 10  // Alert when 10% of lifetime remains (default)
+  enabled: true,                   // Enable expiration monitoring
+  thresholdMs: 24 * 60 * 60 * 1000 // Alert when 24h hours % of lifetime remains (default)
 })
 ```
 
@@ -137,8 +137,8 @@ console.log('Renewed:', txid)
 
 // Check which VTXOs are expiring soon
 const expiringVtxos = await manager.getExpiringVtxos()
-// Override threshold percentage (e.g., renew when 5% of time remains)
-const urgentlyExpiring = await manager.getExpiringVtxos(5)
+// Override thresholdMs (e.g., renew when 5 seconds of time remains)
+const urgentlyExpiring = await manager.getExpiringVtxos(5_000)
 ```
 
 

package/dist/cjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Unroll = exports.P2A = exports.TxTree = exports.Intent = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.networks = exports.ArkNote = exports.combineTapscriptSigs = 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.Response = exports.Request = exports.ServiceWorkerWallet = exports.Worker = exports.setupServiceWorker = exports.SettlementEventType = exports.ChainTxType = exports.IndexerTxType = exports.TxType = exports.VHTLC = exports.VtxoScript = exports.DefaultVtxo = exports.ArkAddress = exports.RestIndexerProvider = exports.RestArkProvider = exports.EsploraProvider = exports.ESPLORA_URL = exports.VtxoManager = exports.Ramps = exports.OnchainWallet = exports.SingleKey = exports.Wallet = void 0;
-exports.maybeArkError = exports.ArkError = exports.Transaction = void 0;
+exports.P2A = exports.TxTree = exports.Intent = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.networks = exports.ArkNote = exports.isVtxoExpiringSoon = exports.combineTapscriptSigs = 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.Response = exports.Request = exports.ServiceWorkerWallet = exports.Worker = exports.setupServiceWorker = exports.SettlementEventType = exports.ChainTxType = exports.IndexerTxType = exports.TxType = exports.VHTLC = exports.VtxoScript = exports.DefaultVtxo = exports.ArkAddress = exports.RestIndexerProvider = exports.RestArkProvider = exports.EsploraProvider = exports.ESPLORA_URL = exports.VtxoManager = exports.Ramps = exports.OnchainWallet = exports.SingleKey = exports.Wallet = void 0;
+exports.maybeArkError = exports.ArkError = exports.Transaction = exports.Unroll = 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");
@@ -25,6 +25,7 @@ Object.defineProperty(exports, "TxTree", { enumerable: true, get: function () {
 const ramps_1 = require("./wallet/ramps");
 Object.defineProperty(exports, "Ramps", { enumerable: true, get: function () { return ramps_1.Ramps; } });
 const vtxo_manager_1 = require("./wallet/vtxo-manager");
+Object.defineProperty(exports, "isVtxoExpiringSoon", { enumerable: true, get: function () { return vtxo_manager_1.isVtxoExpiringSoon; } });
 Object.defineProperty(exports, "VtxoManager", { enumerable: true, get: function () { return vtxo_manager_1.VtxoManager; } });
 const wallet_3 = require("./wallet/serviceWorker/wallet");
 Object.defineProperty(exports, "ServiceWorkerWallet", { enumerable: true, get: function () { return wallet_3.ServiceWorkerWallet; } });

package/dist/cjs/utils/transactionHistory.js

@@ -14,10 +14,6 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     // All vtxos are received unless:
     // - they resulted from a settlement (either boarding or refresh)
     // - they are the change of a spend tx
-    // - they were spent in a payment (have arkTxId set)
-    // - they resulted from a payment (their txid matches an arkTxId of a spent vtxo)
-    // First, collect all arkTxIds from spent vtxos to identify payment transactions
-    const paymentArkTxIds = new Set(spent.filter((v) => v.arkTxId).map((v) => v.arkTxId));
     let vtxosLeftToCheck = [...spent];
     for (const vtxo of [...spendable, ...spent]) {
         if (vtxo.virtualStatus.state !== "preconfirmed" &&
@@ -25,16 +21,6 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
             vtxo.virtualStatus.commitmentTxIds.some((txid) => boardingBatchTxids.has(txid))) {
             continue;
         }
-        // Skip vtxos that were spent in a payment transaction
-        // These will be handled in the sent transaction section below
-        if (vtxo.arkTxId) {
-            continue;
-        }
-        // Skip vtxos that resulted from a payment transaction
-        // (their txid matches an arkTxId from a spent vtxo)
-        if (paymentArkTxIds.has(vtxo.txid)) {
-            continue;
-        }
         const settleVtxos = findVtxosSpentInSettlement(vtxosLeftToCheck, vtxo);
         vtxosLeftToCheck = removeVtxosFromList(vtxosLeftToCheck, settleVtxos);
         const settleAmount = reduceVtxosAmount(settleVtxos);
@@ -48,7 +34,7 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
             continue; // settlement or change, ignore
         }
         const txKey = {
-            commitmentTxid: vtxo.spentBy || "",
+            commitmentTxid: "",
             boardingTxid: "",
             arkTxid: "",
         };
@@ -59,6 +45,10 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
                 settled = true;
             }
         }
+        else {
+            txKey.commitmentTxid =
+                vtxo.virtualStatus.commitmentTxIds?.[0] || "";
+        }
         txs.push({
             key: txKey,
             amount: vtxo.value - settleAmount - spentAmount,
@@ -70,17 +60,21 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     // vtxos by settled by or ark txid
     const vtxosByTxid = new Map();
     for (const v of spent) {
-        // Prefer arkTxId over settledBy to avoid duplicates
-        // A vtxo should only be grouped once
-        const groupKey = v.arkTxId || v.settledBy;
-        if (!groupKey) {
+        if (v.settledBy) {
+            if (!vtxosByTxid.has(v.settledBy)) {
+                vtxosByTxid.set(v.settledBy, []);
+            }
+            const currentVtxos = vtxosByTxid.get(v.settledBy);
+            vtxosByTxid.set(v.settledBy, [...currentVtxos, v]);
+        }
+        if (!v.arkTxId) {
             continue;
         }
-        if (!vtxosByTxid.has(groupKey)) {
-            vtxosByTxid.set(groupKey, []);
+        if (!vtxosByTxid.has(v.arkTxId)) {
+            vtxosByTxid.set(v.arkTxId, []);
         }
-        const currentVtxos = vtxosByTxid.get(groupKey);
-        vtxosByTxid.set(groupKey, [...currentVtxos, v]);
+        const currentVtxos = vtxosByTxid.get(v.arkTxId);
+        vtxosByTxid.set(v.arkTxId, [...currentVtxos, v]);
     }
     for (const [sb, vtxos] of vtxosByTxid) {
         const resultedVtxos = findVtxosResultedFromTxid([...spendable, ...spent], sb);
@@ -91,18 +85,16 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
         }
         const vtxo = getVtxo(resultedVtxos, vtxos);
         const txKey = {
-            commitmentTxid: vtxo.virtualStatus.commitmentTxIds?.[0] || "",
+            commitmentTxid: "",
             boardingTxid: "",
             arkTxid: "",
         };
-        // Use the grouping key (sb) as arkTxid if it looks like an arkTxId
-        // (i.e., if the spent vtxos had arkTxId set, use that instead of result vtxo's txid)
-        const isArkTxId = vtxos.some((v) => v.arkTxId === sb);
-        if (isArkTxId) {
-            txKey.arkTxid = sb;
+        if (vtxo.virtualStatus.state === "preconfirmed") {
+            txKey.arkTxid = resultedAmount === 0 ? vtxo.arkTxId : vtxo.txid;
         }
-        else if (vtxo.virtualStatus.state === "preconfirmed") {
-            txKey.arkTxid = vtxo.txid;
+        else {
+            txKey.commitmentTxid =
+                vtxo.virtualStatus.commitmentTxIds?.[0] || "";
         }
         txs.push({
             key: txKey,

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

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VtxoManager = exports.DEFAULT_RENEWAL_CONFIG = void 0;
+exports.VtxoManager = exports.DEFAULT_RENEWAL_CONFIG = exports.DEFAULT_THRESHOLD_MS = void 0;
 exports.isVtxoExpiringSoon = isVtxoExpiringSoon;
 exports.getExpiringAndRecoverableVtxos = getExpiringAndRecoverableVtxos;
 const _1 = require(".");
+exports.DEFAULT_THRESHOLD_MS = 3 * 24 * 60 * 60 * 1000; // 3 days
 /**
  * Default renewal configuration values
  */
 exports.DEFAULT_RENEWAL_CONFIG = {
-    thresholdPercentage: 10,
+    thresholdMs: exports.DEFAULT_THRESHOLD_MS, // 3 days
 };
 function getDustAmount(wallet) {
     return "dustAmount" in wallet ? wallet.dustAmount : 330n;
@@ -82,22 +83,16 @@ function getRecoverableWithSubdust(vtxos, dustAmount) {
  * @param thresholdMs - Threshold in milliseconds from now
  * @returns true if VTXO expires within threshold, false otherwise
  */
-function isVtxoExpiringSoon(vtxo, percentage) {
+function isVtxoExpiringSoon(vtxo, thresholdMs // in milliseconds
+) {
+    const realThresholdMs = thresholdMs <= 100 ? exports.DEFAULT_THRESHOLD_MS : thresholdMs;
     const { batchExpiry } = vtxo.virtualStatus;
-    if (!batchExpiry) {
+    if (!batchExpiry)
         return false; // it doesn't expire
-    }
     const now = Date.now();
-    if (batchExpiry <= now) {
+    if (batchExpiry <= now)
         return false; // already expired
-    }
-    // It shouldn't happen, but let's be safe
-    if (!vtxo.createdAt) {
-        return false;
-    }
-    const duration = batchExpiry - vtxo.createdAt.getTime();
-    const softExpiry = batchExpiry - (duration * percentage) / 100;
-    return softExpiry > 0 && softExpiry <= now;
+    return batchExpiry - now <= realThresholdMs;
 }
 /**
  * Filter VTXOs that are expiring soon or are recoverable/subdust
@@ -107,8 +102,8 @@ function isVtxoExpiringSoon(vtxo, percentage) {
  * @param dustAmount - Dust threshold amount in satoshis
  * @returns Array of VTXOs expiring within threshold
  */
-function getExpiringAndRecoverableVtxos(vtxos, percentage, dustAmount) {
-    return vtxos.filter((vtxo) => isVtxoExpiringSoon(vtxo, percentage) ||
+function getExpiringAndRecoverableVtxos(vtxos, thresholdMs, dustAmount) {
+    return vtxos.filter((vtxo) => isVtxoExpiringSoon(vtxo, thresholdMs) ||
         (0, _1.isRecoverable)(vtxo) ||
         (0, _1.isSubdust)(vtxo, dustAmount));
 }
@@ -131,7 +126,7 @@ function getExpiringAndRecoverableVtxos(vtxos, percentage, dustAmount) {
  * // Initialize with renewal config
  * const manager = new VtxoManager(wallet, {
  *   enabled: true,
- *   thresholdPercentage: 10
+ *   thresholdMs: 86400000
  * });
  *
  * // Check recoverable balance
@@ -251,24 +246,24 @@ class VtxoManager {
     /**
      * Get VTXOs that are expiring soon based on renewal configuration
      *
-     * @param thresholdPercentage - Optional override for threshold percentage (0-100)
+     * @param thresholdMs - Optional override for threshold in milliseconds
      * @returns Array of expiring VTXOs, empty array if renewal is disabled or no VTXOs expiring
      *
      * @example
      * ```typescript
-     * const manager = new VtxoManager(wallet, { enabled: true, thresholdPercentage: 10 });
+     * const manager = new VtxoManager(wallet, { enabled: true, thresholdMs: 86400000 });
      * const expiringVtxos = await manager.getExpiringVtxos();
      * if (expiringVtxos.length > 0) {
      *   console.log(`${expiringVtxos.length} VTXOs expiring soon`);
      * }
      * ```
      */
-    async getExpiringVtxos(thresholdPercentage) {
+    async getExpiringVtxos(thresholdMs) {
         const vtxos = await this.wallet.getVtxos({ withRecoverable: true });
-        const percentage = thresholdPercentage ??
-            this.renewalConfig?.thresholdPercentage ??
-            exports.DEFAULT_RENEWAL_CONFIG.thresholdPercentage;
-        return getExpiringAndRecoverableVtxos(vtxos, percentage, getDustAmount(this.wallet));
+        const threshold = thresholdMs ??
+            this.renewalConfig?.thresholdMs ??
+            exports.DEFAULT_RENEWAL_CONFIG.thresholdMs;
+        return getExpiringAndRecoverableVtxos(vtxos, threshold, getDustAmount(this.wallet));
     }
     /**
      * Renew expiring VTXOs by settling them back to the wallet's address

package/dist/cjs/wallet/wallet.js

@@ -62,6 +62,7 @@ const inMemory_1 = require("../storage/inMemory");
 const walletRepository_1 = require("../repositories/walletRepository");
 const contractRepository_1 = require("../repositories/contractRepository");
 const utils_1 = require("./utils");
+const errors_1 = require("../providers/errors");
 /**
  * Main wallet implementation for Bitcoin transactions with Ark protocol support.
  * The wallet does not store any data locally and relies on Ark and onchain
@@ -589,7 +590,7 @@ class Wallet {
             this.makeRegisterIntentSignature(params.inputs, outputs, onchainOutputIndexes, signingPublicKeys),
             this.makeDeleteIntentSignature(params.inputs),
         ]);
-        const intentId = await this.arkProvider.registerIntent(intent);
+        const intentId = await this.safeRegisterIntent(intent);
         const abortController = new AbortController();
         // listen to settlement events
         try {
@@ -741,7 +742,9 @@ class Wallet {
                 // delete the intent to not be stuck in the queue
                 await this.arkProvider.deleteIntent(deleteIntent);
             }
-            catch { }
+            catch (error) {
+                console.error("failed to delete intent: ", error);
+            }
             throw error;
         }
         throw new Error("Settlement failed");
@@ -956,6 +959,27 @@ class Wallet {
                 : undefined);
         }
     }
+    async safeRegisterIntent(intent) {
+        try {
+            return this.arkProvider.registerIntent(intent);
+        }
+        catch (error) {
+            // catch the "already registered by another intent" error
+            if (error instanceof errors_1.ArkError &&
+                error.code === 0 &&
+                error.message.includes("duplicated input")) {
+                // delete all intents spending one of the wallet coins
+                const allSpendableCoins = await this.getVtxos({
+                    withRecoverable: true,
+                });
+                const deleteIntent = await this.makeDeleteIntentSignature(allSpendableCoins);
+                await this.arkProvider.deleteIntent(deleteIntent);
+                // try again
+                return this.arkProvider.registerIntent(intent);
+            }
+            throw error;
+        }
+    }
     async makeRegisterIntentSignature(coins, outputs, onchainOutputsIndexes, cosignerPubKeys) {
         const inputs = this.prepareIntentProofInputs(coins);
         const message = {

package/dist/esm/index.js

@@ -8,7 +8,7 @@ import { TxType, } from './wallet/index.js';
 import { Wallet, waitForIncomingFunds } from './wallet/wallet.js';
 import { TxTree } from './tree/txTree.js';
 import { Ramps } from './wallet/ramps.js';
-import { VtxoManager } from './wallet/vtxo-manager.js';
+import { isVtxoExpiringSoon, VtxoManager } from './wallet/vtxo-manager.js';
 import { ServiceWorkerWallet } from './wallet/serviceWorker/wallet.js';
 import { OnchainWallet } from './wallet/onchain.js';
 import { setupServiceWorker } from './wallet/serviceWorker/utils.js';
@@ -45,7 +45,7 @@ decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTa
 // Ark PSBT fields
 ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, 
 // Utils
-buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, combineTapscriptSigs, 
+buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, combineTapscriptSigs, isVtxoExpiringSoon, 
 // Arknote
 ArkNote, 
 // Network

package/dist/esm/utils/transactionHistory.js

@@ -11,10 +11,6 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     // All vtxos are received unless:
     // - they resulted from a settlement (either boarding or refresh)
     // - they are the change of a spend tx
-    // - they were spent in a payment (have arkTxId set)
-    // - they resulted from a payment (their txid matches an arkTxId of a spent vtxo)
-    // First, collect all arkTxIds from spent vtxos to identify payment transactions
-    const paymentArkTxIds = new Set(spent.filter((v) => v.arkTxId).map((v) => v.arkTxId));
     let vtxosLeftToCheck = [...spent];
     for (const vtxo of [...spendable, ...spent]) {
         if (vtxo.virtualStatus.state !== "preconfirmed" &&
@@ -22,16 +18,6 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
             vtxo.virtualStatus.commitmentTxIds.some((txid) => boardingBatchTxids.has(txid))) {
             continue;
         }
-        // Skip vtxos that were spent in a payment transaction
-        // These will be handled in the sent transaction section below
-        if (vtxo.arkTxId) {
-            continue;
-        }
-        // Skip vtxos that resulted from a payment transaction
-        // (their txid matches an arkTxId from a spent vtxo)
-        if (paymentArkTxIds.has(vtxo.txid)) {
-            continue;
-        }
         const settleVtxos = findVtxosSpentInSettlement(vtxosLeftToCheck, vtxo);
         vtxosLeftToCheck = removeVtxosFromList(vtxosLeftToCheck, settleVtxos);
         const settleAmount = reduceVtxosAmount(settleVtxos);
@@ -45,7 +31,7 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
             continue; // settlement or change, ignore
         }
         const txKey = {
-            commitmentTxid: vtxo.spentBy || "",
+            commitmentTxid: "",
             boardingTxid: "",
             arkTxid: "",
         };
@@ -56,6 +42,10 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
                 settled = true;
             }
         }
+        else {
+            txKey.commitmentTxid =
+                vtxo.virtualStatus.commitmentTxIds?.[0] || "";
+        }
         txs.push({
             key: txKey,
             amount: vtxo.value - settleAmount - spentAmount,
@@ -67,17 +57,21 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     // vtxos by settled by or ark txid
     const vtxosByTxid = new Map();
     for (const v of spent) {
-        // Prefer arkTxId over settledBy to avoid duplicates
-        // A vtxo should only be grouped once
-        const groupKey = v.arkTxId || v.settledBy;
-        if (!groupKey) {
+        if (v.settledBy) {
+            if (!vtxosByTxid.has(v.settledBy)) {
+                vtxosByTxid.set(v.settledBy, []);
+            }
+            const currentVtxos = vtxosByTxid.get(v.settledBy);
+            vtxosByTxid.set(v.settledBy, [...currentVtxos, v]);
+        }
+        if (!v.arkTxId) {
             continue;
         }
-        if (!vtxosByTxid.has(groupKey)) {
-            vtxosByTxid.set(groupKey, []);
+        if (!vtxosByTxid.has(v.arkTxId)) {
+            vtxosByTxid.set(v.arkTxId, []);
         }
-        const currentVtxos = vtxosByTxid.get(groupKey);
-        vtxosByTxid.set(groupKey, [...currentVtxos, v]);
+        const currentVtxos = vtxosByTxid.get(v.arkTxId);
+        vtxosByTxid.set(v.arkTxId, [...currentVtxos, v]);
     }
     for (const [sb, vtxos] of vtxosByTxid) {
         const resultedVtxos = findVtxosResultedFromTxid([...spendable, ...spent], sb);
@@ -88,18 +82,16 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
         }
         const vtxo = getVtxo(resultedVtxos, vtxos);
         const txKey = {
-            commitmentTxid: vtxo.virtualStatus.commitmentTxIds?.[0] || "",
+            commitmentTxid: "",
             boardingTxid: "",
             arkTxid: "",
         };
-        // Use the grouping key (sb) as arkTxid if it looks like an arkTxId
-        // (i.e., if the spent vtxos had arkTxId set, use that instead of result vtxo's txid)
-        const isArkTxId = vtxos.some((v) => v.arkTxId === sb);
-        if (isArkTxId) {
-            txKey.arkTxid = sb;
+        if (vtxo.virtualStatus.state === "preconfirmed") {
+            txKey.arkTxid = resultedAmount === 0 ? vtxo.arkTxId : vtxo.txid;
         }
-        else if (vtxo.virtualStatus.state === "preconfirmed") {
-            txKey.arkTxid = vtxo.txid;
+        else {
+            txKey.commitmentTxid =
+                vtxo.virtualStatus.commitmentTxIds?.[0] || "";
         }
         txs.push({
             key: txKey,

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

@@ -1,9 +1,10 @@
 import { isRecoverable, isSubdust } from './index.js';
+export const DEFAULT_THRESHOLD_MS = 3 * 24 * 60 * 60 * 1000; // 3 days
 /**
  * Default renewal configuration values
  */
 export const DEFAULT_RENEWAL_CONFIG = {
-    thresholdPercentage: 10,
+    thresholdMs: DEFAULT_THRESHOLD_MS, // 3 days
 };
 function getDustAmount(wallet) {
     return "dustAmount" in wallet ? wallet.dustAmount : 330n;
@@ -77,22 +78,16 @@ function getRecoverableWithSubdust(vtxos, dustAmount) {
  * @param thresholdMs - Threshold in milliseconds from now
  * @returns true if VTXO expires within threshold, false otherwise
  */
-export function isVtxoExpiringSoon(vtxo, percentage) {
+export function isVtxoExpiringSoon(vtxo, thresholdMs // in milliseconds
+) {
+    const realThresholdMs = thresholdMs <= 100 ? DEFAULT_THRESHOLD_MS : thresholdMs;
     const { batchExpiry } = vtxo.virtualStatus;
-    if (!batchExpiry) {
+    if (!batchExpiry)
         return false; // it doesn't expire
-    }
     const now = Date.now();
-    if (batchExpiry <= now) {
+    if (batchExpiry <= now)
         return false; // already expired
-    }
-    // It shouldn't happen, but let's be safe
-    if (!vtxo.createdAt) {
-        return false;
-    }
-    const duration = batchExpiry - vtxo.createdAt.getTime();
-    const softExpiry = batchExpiry - (duration * percentage) / 100;
-    return softExpiry > 0 && softExpiry <= now;
+    return batchExpiry - now <= realThresholdMs;
 }
 /**
  * Filter VTXOs that are expiring soon or are recoverable/subdust
@@ -102,8 +97,8 @@ export function isVtxoExpiringSoon(vtxo, percentage) {
  * @param dustAmount - Dust threshold amount in satoshis
  * @returns Array of VTXOs expiring within threshold
  */
-export function getExpiringAndRecoverableVtxos(vtxos, percentage, dustAmount) {
-    return vtxos.filter((vtxo) => isVtxoExpiringSoon(vtxo, percentage) ||
+export function getExpiringAndRecoverableVtxos(vtxos, thresholdMs, dustAmount) {
+    return vtxos.filter((vtxo) => isVtxoExpiringSoon(vtxo, thresholdMs) ||
         isRecoverable(vtxo) ||
         isSubdust(vtxo, dustAmount));
 }
@@ -126,7 +121,7 @@ export function getExpiringAndRecoverableVtxos(vtxos, percentage, dustAmount) {
  * // Initialize with renewal config
  * const manager = new VtxoManager(wallet, {
  *   enabled: true,
- *   thresholdPercentage: 10
+ *   thresholdMs: 86400000
  * });
  *
  * // Check recoverable balance
@@ -246,24 +241,24 @@ export class VtxoManager {
     /**
      * Get VTXOs that are expiring soon based on renewal configuration
      *
-     * @param thresholdPercentage - Optional override for threshold percentage (0-100)
+     * @param thresholdMs - Optional override for threshold in milliseconds
      * @returns Array of expiring VTXOs, empty array if renewal is disabled or no VTXOs expiring
      *
      * @example
      * ```typescript
-     * const manager = new VtxoManager(wallet, { enabled: true, thresholdPercentage: 10 });
+     * const manager = new VtxoManager(wallet, { enabled: true, thresholdMs: 86400000 });
      * const expiringVtxos = await manager.getExpiringVtxos();
      * if (expiringVtxos.length > 0) {
      *   console.log(`${expiringVtxos.length} VTXOs expiring soon`);
      * }
      * ```
      */
-    async getExpiringVtxos(thresholdPercentage) {
+    async getExpiringVtxos(thresholdMs) {
         const vtxos = await this.wallet.getVtxos({ withRecoverable: true });
-        const percentage = thresholdPercentage ??
-            this.renewalConfig?.thresholdPercentage ??
-            DEFAULT_RENEWAL_CONFIG.thresholdPercentage;
-        return getExpiringAndRecoverableVtxos(vtxos, percentage, getDustAmount(this.wallet));
+        const threshold = thresholdMs ??
+            this.renewalConfig?.thresholdMs ??
+            DEFAULT_RENEWAL_CONFIG.thresholdMs;
+        return getExpiringAndRecoverableVtxos(vtxos, threshold, getDustAmount(this.wallet));
     }
     /**
      * Renew expiring VTXOs by settling them back to the wallet's address

package/dist/esm/wallet/wallet.js

@@ -25,6 +25,7 @@ import { InMemoryStorageAdapter } from '../storage/inMemory.js';
 import { WalletRepositoryImpl, } from '../repositories/walletRepository.js';
 import { ContractRepositoryImpl, } from '../repositories/contractRepository.js';
 import { extendCoin, extendVirtualCoin } from './utils.js';
+import { ArkError } from '../providers/errors.js';
 /**
  * Main wallet implementation for Bitcoin transactions with Ark protocol support.
  * The wallet does not store any data locally and relies on Ark and onchain
@@ -552,7 +553,7 @@ export class Wallet {
             this.makeRegisterIntentSignature(params.inputs, outputs, onchainOutputIndexes, signingPublicKeys),
             this.makeDeleteIntentSignature(params.inputs),
         ]);
-        const intentId = await this.arkProvider.registerIntent(intent);
+        const intentId = await this.safeRegisterIntent(intent);
         const abortController = new AbortController();
         // listen to settlement events
         try {
@@ -704,7 +705,9 @@ export class Wallet {
                 // delete the intent to not be stuck in the queue
                 await this.arkProvider.deleteIntent(deleteIntent);
             }
-            catch { }
+            catch (error) {
+                console.error("failed to delete intent: ", error);
+            }
             throw error;
         }
         throw new Error("Settlement failed");
@@ -919,6 +922,27 @@ export class Wallet {
                 : undefined);
         }
     }
+    async safeRegisterIntent(intent) {
+        try {
+            return this.arkProvider.registerIntent(intent);
+        }
+        catch (error) {
+            // catch the "already registered by another intent" error
+            if (error instanceof ArkError &&
+                error.code === 0 &&
+                error.message.includes("duplicated input")) {
+                // delete all intents spending one of the wallet coins
+                const allSpendableCoins = await this.getVtxos({
+                    withRecoverable: true,
+                });
+                const deleteIntent = await this.makeDeleteIntentSignature(allSpendableCoins);
+                await this.arkProvider.deleteIntent(deleteIntent);
+                // try again
+                return this.arkProvider.registerIntent(intent);
+            }
+            throw error;
+        }
+    }
     async makeRegisterIntentSignature(coins, outputs, onchainOutputsIndexes, cosignerPubKeys) {
         const inputs = this.prepareIntentProofInputs(coins);
         const message = {

package/dist/types/index.d.ts

@@ -10,7 +10,7 @@ import { Wallet, waitForIncomingFunds, IncomingFunds } from "./wallet/wallet";
 import { TxTree, TxTreeNode } from "./tree/txTree";
 import { SignerSession, TreeNonces, TreePartialSigs } from "./tree/signingSession";
 import { Ramps } from "./wallet/ramps";
-import { VtxoManager } from "./wallet/vtxo-manager";
+import { isVtxoExpiringSoon, VtxoManager } from "./wallet/vtxo-manager";
 import { ServiceWorkerWallet } from "./wallet/serviceWorker/wallet";
 import { OnchainWallet } from "./wallet/onchain";
 import { setupServiceWorker } from "./wallet/serviceWorker/utils";
@@ -33,5 +33,5 @@ import { Unroll } from "./wallet/unroll";
 import { WalletRepositoryImpl } from "./repositories/walletRepository";
 import { ContractRepositoryImpl } from "./repositories/contractRepository";
 import { ArkError, maybeArkError } from "./providers/errors";
-export { Wallet, SingleKey, OnchainWallet, Ramps, VtxoManager, ESPLORA_URL, EsploraProvider, RestArkProvider, RestIndexerProvider, ArkAddress, DefaultVtxo, VtxoScript, VHTLC, TxType, IndexerTxType, ChainTxType, SettlementEventType, setupServiceWorker, Worker, ServiceWorkerWallet, Request, Response, decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CLTVMultisigTapscript, TapTreeCoder, ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, combineTapscriptSigs, ArkNote, networks, WalletRepositoryImpl, ContractRepositoryImpl, Intent, TxTree, P2A, Unroll, Transaction, ArkError, maybeArkError, };
+export { Wallet, SingleKey, OnchainWallet, Ramps, VtxoManager, ESPLORA_URL, EsploraProvider, RestArkProvider, RestIndexerProvider, ArkAddress, DefaultVtxo, VtxoScript, VHTLC, TxType, IndexerTxType, ChainTxType, SettlementEventType, setupServiceWorker, Worker, ServiceWorkerWallet, Request, Response, decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CLTVMultisigTapscript, TapTreeCoder, ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, combineTapscriptSigs, isVtxoExpiringSoon, ArkNote, networks, WalletRepositoryImpl, ContractRepositoryImpl, Intent, TxTree, P2A, Unroll, Transaction, ArkError, maybeArkError, };
 export type { Identity, IWallet, WalletConfig, ProviderClass, ArkTransaction, Coin, ExtendedCoin, ExtendedVirtualCoin, WalletBalance, SendBitcoinParams, Recipient, SettleParams, Status, VirtualStatus, Outpoint, VirtualCoin, TxKey, TapscriptType, ArkTxInput, OffchainTx, TapLeaves, IncomingFunds, IndexerProvider, PageResponse, Batch, ChainTx, CommitmentTx, TxHistoryRecord, Vtxo, VtxoChain, Tx, OnchainProvider, ArkProvider, SettlementEvent, FeeInfo, ArkInfo, SignedIntent, Output, TxNotification, ExplorerTransaction, BatchFinalizationEvent, BatchFinalizedEvent, BatchFailedEvent, TreeSigningStartedEvent, TreeNoncesEvent, BatchStartedEvent, TreeTxEvent, TreeSignatureEvent, ScheduledSession, PaginationOptions, SubscriptionResponse, SubscriptionHeartbeat, SubscriptionEvent, Network, NetworkName, ArkTapscript, RelativeTimelock, EncodedVtxoScript, TapLeafScript, SignerSession, TreeNonces, TreePartialSigs, GetVtxosFilter, Nonces, PartialSig, ArkPsbtFieldCoder, TxTreeNode, AnchorBumper, };

package/dist/types/wallet/vtxo-manager.d.ts

@@ -1,5 +1,6 @@
 import { ExtendedVirtualCoin, IWallet } from ".";
 import { SettlementEvent } from "../providers/ark";
+export declare const DEFAULT_THRESHOLD_MS: number;
 /**
  * Configuration options for automatic VTXO renewal
  */
@@ -10,11 +11,11 @@ export interface RenewalConfig {
      */
     enabled?: boolean;
     /**
-     * Percentage of expiry time to use as threshold (0-100)
-     * E.g., 10 means renew when 10% of time until expiry remains
-     * @default 10
+     * Threshold in milliseconds to use as threshold for renewal
+     * E.g., 86400000 means renew when 24 hours until expiry remains
+     * @default 86400000 (24 hours)
      */
-    thresholdPercentage?: number;
+    thresholdMs?: number;
 }
 /**
  * Default renewal configuration values
@@ -27,7 +28,7 @@ export declare const DEFAULT_RENEWAL_CONFIG: Required<Omit<RenewalConfig, "enabl
  * @param thresholdMs - Threshold in milliseconds from now
  * @returns true if VTXO expires within threshold, false otherwise
  */
-export declare function isVtxoExpiringSoon(vtxo: ExtendedVirtualCoin, percentage: number): boolean;
+export declare function isVtxoExpiringSoon(vtxo: ExtendedVirtualCoin, thresholdMs: number): boolean;
 /**
  * Filter VTXOs that are expiring soon or are recoverable/subdust
  *
@@ -36,7 +37,7 @@ export declare function isVtxoExpiringSoon(vtxo: ExtendedVirtualCoin, percentage
  * @param dustAmount - Dust threshold amount in satoshis
  * @returns Array of VTXOs expiring within threshold
  */
-export declare function getExpiringAndRecoverableVtxos(vtxos: ExtendedVirtualCoin[], percentage: number, dustAmount: bigint): ExtendedVirtualCoin[];
+export declare function getExpiringAndRecoverableVtxos(vtxos: ExtendedVirtualCoin[], thresholdMs: number, dustAmount: bigint): ExtendedVirtualCoin[];
 /**
  * VtxoManager is a unified class for managing VTXO lifecycle operations including
  * recovery of swept/expired VTXOs and renewal to prevent expiration.
@@ -56,7 +57,7 @@ export declare function getExpiringAndRecoverableVtxos(vtxos: ExtendedVirtualCoi
  * // Initialize with renewal config
  * const manager = new VtxoManager(wallet, {
  *   enabled: true,
- *   thresholdPercentage: 10
+ *   thresholdMs: 86400000
  * });
  *
  * // Check recoverable balance
@@ -137,19 +138,19 @@ export declare class VtxoManager {
     /**
      * Get VTXOs that are expiring soon based on renewal configuration
      *
-     * @param thresholdPercentage - Optional override for threshold percentage (0-100)
+     * @param thresholdMs - Optional override for threshold in milliseconds
      * @returns Array of expiring VTXOs, empty array if renewal is disabled or no VTXOs expiring
      *
      * @example
      * ```typescript
-     * const manager = new VtxoManager(wallet, { enabled: true, thresholdPercentage: 10 });
+     * const manager = new VtxoManager(wallet, { enabled: true, thresholdMs: 86400000 });
      * const expiringVtxos = await manager.getExpiringVtxos();
      * if (expiringVtxos.length > 0) {
      *   console.log(`${expiringVtxos.length} VTXOs expiring soon`);
      * }
      * ```
      */
-    getExpiringVtxos(thresholdPercentage?: number): Promise<ExtendedVirtualCoin[]>;
+    getExpiringVtxos(thresholdMs?: number): Promise<ExtendedVirtualCoin[]>;
     /**
      * Renew expiring VTXOs by settling them back to the wallet's address
      *

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

@@ -71,7 +71,7 @@ export declare class Wallet implements IWallet {
     readonly contractRepository: ContractRepository;
     readonly renewalConfig: Required<Omit<WalletConfig["renewalConfig"], "enabled">> & {
         enabled: boolean;
-        thresholdPercentage: number;
+        thresholdMs: number;
     };
     private constructor();
     static create(config: WalletConfig): Promise<Wallet>;
@@ -94,6 +94,7 @@ export declare class Wallet implements IWallet {
     private handleSettlementSigningEvent;
     private handleSettlementTreeNoncesEvent;
     private handleSettlementFinalizationEvent;
+    safeRegisterIntent(intent: SignedIntent): Promise<string>;
     makeRegisterIntentSignature(coins: ExtendedCoin[], outputs: TransactionOutput[], onchainOutputsIndexes: number[], cosignerPubKeys: string[]): Promise<SignedIntent>;
     makeDeleteIntentSignature(coins: ExtendedCoin[]): Promise<SignedIntent>;
     private prepareIntentProofInputs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -63,8 +63,8 @@
     "@types/node": "24.3.1",
     "@vitest/coverage-v8": "3.2.4",
     "esbuild": "^0.25.9",
-    "eventsource": "4.0.0",
     "expo": "~52.0.47",
+    "eventsource": "4.0.0",
     "glob": "11.0.3",
     "husky": "9.1.7",
     "prettier": "3.6.2",