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

package/dist/esm/wallet/unroll.js

@@ -1,9 +1,10 @@
 import { base64, hex } from "@scure/base";
-import { SigHash, Transaction, TaprootControlBlock } from "@scure/btc-signer";
+import { SigHash, TaprootControlBlock } from "@scure/btc-signer";
 import { ChainTxType } from '../providers/indexer.js';
 import { VtxoScript } from '../script/base.js';
 import { TxWeightEstimator } from '../utils/txSizeEstimator.js';
 import { Wallet } from './wallet.js';
+import { Transaction } from '../utils/transaction.js';
 export var Unroll;
 (function (Unroll) {
     let StepType;
@@ -102,9 +103,7 @@ export var Unroll;
             if (virtualTxs.txs.length === 0) {
                 throw new Error(`Tx ${nextTxToBroadcast.txid} not found`);
             }
-            const tx = Transaction.fromPSBT(base64.decode(virtualTxs.txs[0]), {
-                allowUnknownInputs: true,
-            });
+            const tx = Transaction.fromPSBT(base64.decode(virtualTxs.txs[0]));
             // finalize the tree transaction
             if (nextTxToBroadcast.type === ChainTxType.TREE) {
                 const input = tx.getInput(0);
@@ -197,7 +196,7 @@ export var Unroll;
             });
             txWeightEstimator.addTapscriptInput(64, spendingLeaf[1].length, TaprootControlBlock.encode(spendingLeaf[0]).length);
         }
-        const tx = new Transaction({ allowUnknownInputs: true, version: 2 });
+        const tx = new Transaction({ version: 2 });
         for (const input of inputs) {
             tx.addInput(input);
         }

package/dist/esm/wallet/utils.js

@@ -6,3 +6,11 @@ export function extendVirtualCoin(wallet, vtxo) {
         tapTree: wallet.offchainTapscript.encode(),
     };
 }
+export function extendCoin(wallet, utxo) {
+    return {
+        ...utxo,
+        forfeitTapLeafScript: wallet.boardingTapscript.forfeit(),
+        intentTapLeafScript: wallet.boardingTapscript.exit(),
+        tapTree: wallet.boardingTapscript.encode(),
+    };
+}

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

@@ -5,6 +5,9 @@ import { isRecoverable, isSubdust } from './index.js';
 export const DEFAULT_RENEWAL_CONFIG = {
     thresholdPercentage: 10,
 };
+function getDustAmount(wallet) {
+    return "dustAmount" in wallet ? wallet.dustAmount : 330n;
+}
 /**
  * Filter VTXOs that are recoverable (swept and still spendable, or preconfirmed subdust)
  *
@@ -74,80 +77,35 @@ function getRecoverableWithSubdust(vtxos, dustAmount) {
  * @param thresholdMs - Threshold in milliseconds from now
  * @returns true if VTXO expires within threshold, false otherwise
  */
-export function isVtxoExpiringSoon(vtxo, thresholdMs) {
+export function isVtxoExpiringSoon(vtxo, percentage) {
     const { batchExpiry } = vtxo.virtualStatus;
-    // No expiry set means it doesn't expire
     if (!batchExpiry) {
-        return false;
+        return false; // it doesn't expire
     }
     const now = Date.now();
-    const timeUntilExpiry = batchExpiry - now;
-    return timeUntilExpiry > 0 && timeUntilExpiry <= thresholdMs;
+    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;
 }
 /**
- * Filter VTXOs that are expiring soon
+ * Filter VTXOs that are expiring soon or are recoverable/subdust
  *
  * @param vtxos - Array of virtual coins to check
  * @param thresholdMs - Threshold in milliseconds from now
+ * @param dustAmount - Dust threshold amount in satoshis
  * @returns Array of VTXOs expiring within threshold
  */
-export function getExpiringVtxos(vtxos, thresholdMs) {
-    return vtxos.filter((vtxo) => isVtxoExpiringSoon(vtxo, thresholdMs));
-}
-/**
- * Calculate expiry threshold in milliseconds based on batch expiry and percentage
- *
- * @param batchExpiry - Batch expiry timestamp in milliseconds
- * @param percentage - Percentage of total time (0-100)
- * @returns Threshold timestamp in milliseconds from now
- *
- * @example
- * // VTXO expires in 10 days, threshold is 10%
- * const expiry = Date.now() + 10 * 24 * 60 * 60 * 1000;
- * const threshold = calculateExpiryThreshold(expiry, 10);
- * // Returns 1 day in milliseconds (10% of 10 days)
- */
-export function calculateExpiryThreshold(batchExpiry, percentage) {
-    if (percentage < 0 || percentage > 100) {
-        throw new Error("Percentage must be between 0 and 100");
-    }
-    const now = Date.now();
-    const totalTime = batchExpiry - now;
-    if (totalTime <= 0) {
-        // Already expired
-        return 0;
-    }
-    // Calculate threshold as percentage of total time
-    return Math.floor((totalTime * percentage) / 100);
-}
-/**
- * Get the minimum expiry time from a list of VTXOs
- *
- * @param vtxos - Array of virtual coins
- * @returns Minimum batch expiry timestamp, or undefined if no VTXOs have expiry
- */
-export function getMinimumExpiry(vtxos) {
-    const expiries = vtxos
-        .map((v) => v.virtualStatus.batchExpiry)
-        .filter((e) => e !== undefined);
-    if (expiries.length === 0) {
-        return undefined;
-    }
-    return Math.min(...expiries);
-}
-/**
- * Calculate dynamic threshold based on the earliest expiring VTXO
- *
- * @param vtxos - Array of virtual coins
- * @param percentage - Percentage of time until expiry (0-100)
- * @returns Threshold in milliseconds, or undefined if no VTXOs have expiry
- */
-export function calculateDynamicThreshold(vtxos, percentage) {
-    const minExpiry = getMinimumExpiry(vtxos);
-    if (!minExpiry) {
-        return undefined;
-    }
-    return calculateExpiryThreshold(minExpiry, percentage);
+export function getExpiringAndRecoverableVtxos(vtxos, percentage, dustAmount) {
+    return vtxos.filter((vtxo) => isVtxoExpiringSoon(vtxo, percentage) ||
+        isRecoverable(vtxo) ||
+        isSubdust(vtxo, dustAmount));
 }
 /**
  * VtxoManager is a unified class for managing VTXO lifecycle operations including
@@ -228,9 +186,7 @@ export class VtxoManager {
             withUnrolled: false,
         });
         // Get dust amount from wallet
-        const dustAmount = "dustAmount" in this.wallet
-            ? this.wallet.dustAmount
-            : 1000n;
+        const dustAmount = getDustAmount(this.wallet);
         // Filter recoverable VTXOs and handle subdust logic
         const { vtxosToRecover, includesSubdust, totalAmount } = getRecoverableWithSubdust(allVtxos, dustAmount);
         if (vtxosToRecover.length === 0) {
@@ -273,9 +229,7 @@ export class VtxoManager {
             withRecoverable: true,
             withUnrolled: false,
         });
-        const dustAmount = "dustAmount" in this.wallet
-            ? this.wallet.dustAmount
-            : 1000n;
+        const dustAmount = getDustAmount(this.wallet);
         const { vtxosToRecover, includesSubdust, totalAmount } = getRecoverableWithSubdust(allVtxos, dustAmount);
         // Calculate subdust amount separately for reporting
         const subdustAmount = vtxosToRecover
@@ -305,23 +259,16 @@ export class VtxoManager {
      * ```
      */
     async getExpiringVtxos(thresholdPercentage) {
-        if (!this.renewalConfig?.enabled) {
-            return [];
-        }
-        const vtxos = await this.wallet.getVtxos();
+        const vtxos = await this.wallet.getVtxos({ withRecoverable: true });
         const percentage = thresholdPercentage ??
-            this.renewalConfig.thresholdPercentage ??
+            this.renewalConfig?.thresholdPercentage ??
             DEFAULT_RENEWAL_CONFIG.thresholdPercentage;
-        const threshold = calculateDynamicThreshold(vtxos, percentage);
-        if (!threshold) {
-            return [];
-        }
-        return getExpiringVtxos(vtxos, threshold);
+        return getExpiringAndRecoverableVtxos(vtxos, percentage, getDustAmount(this.wallet));
     }
     /**
-     * Renew VTXOs by settling them back to the wallet's address
+     * Renew expiring VTXOs by settling them back to the wallet's address
      *
-     * This method collects all spendable VTXOs (including recoverable ones) and settles
+     * This method collects all expiring spendable VTXOs (including recoverable ones) and settles
      * them back to the wallet, effectively refreshing their expiration time. This is the
      * primary way to prevent VTXOs from expiring.
      *
@@ -345,15 +292,13 @@ export class VtxoManager {
      */
     async renewVtxos(eventCallback) {
         // Get all VTXOs (including recoverable ones)
-        const vtxos = await this.wallet.getVtxos({ withRecoverable: true });
+        const vtxos = await this.getExpiringVtxos();
         if (vtxos.length === 0) {
             throw new Error("No VTXOs available to renew");
         }
         const totalAmount = vtxos.reduce((sum, vtxo) => sum + vtxo.value, 0);
         // Get dust amount from wallet
-        const dustAmount = "dustAmount" in this.wallet
-            ? this.wallet.dustAmount
-            : 1000n;
+        const dustAmount = getDustAmount(this.wallet);
         // Check if total amount is above dust threshold
         if (BigInt(totalAmount) < dustAmount) {
             throw new Error(`Total amount ${totalAmount} is below dust threshold ${dustAmount}`);

package/dist/esm/wallet/wallet.js

@@ -24,7 +24,7 @@ import { ConditionWitness, VtxoTaprootTree } from '../utils/unknownFields.js';
 import { InMemoryStorageAdapter } from '../storage/inMemory.js';
 import { WalletRepositoryImpl, } from '../repositories/walletRepository.js';
 import { ContractRepositoryImpl, } from '../repositories/contractRepository.js';
-import { extendVirtualCoin } from './utils.js';
+import { extendCoin, extendVirtualCoin } from './utils.js';
 /**
  * Main wallet implementation for Bitcoin transactions with Ark protocol support.
  * The wallet does not store any data locally and relies on Ark and onchain
@@ -333,15 +333,12 @@ export class Wallet {
     async getBoardingUtxos() {
         const boardingAddress = await this.getBoardingAddress();
         const boardingUtxos = await this.onchainProvider.getCoins(boardingAddress);
-        const encodedBoardingTapscript = this.boardingTapscript.encode();
-        const forfeit = this.boardingTapscript.forfeit();
-        const exit = this.boardingTapscript.exit();
-        return boardingUtxos.map((utxo) => ({
-            ...utxo,
-            forfeitTapLeafScript: forfeit,
-            intentTapLeafScript: exit,
-            tapTree: encodedBoardingTapscript,
-        }));
+        const utxos = boardingUtxos.map((utxo) => {
+            return extendCoin(this, utxo);
+        });
+        // Save boardingUtxos using unified repository
+        await this.walletRepository.saveUtxos(boardingAddress, utxos);
+        return utxos;
     }
     async sendBitcoin(params) {
         if (params.amount <= 0) {
@@ -761,8 +758,6 @@ export class Wallet {
             const vtxo = vtxos.find((vtxo) => vtxo.txid === input.txid && vtxo.vout === input.vout);
             // boarding utxo, we need to sign the settlement tx
             if (!vtxo) {
-                hasBoardingUtxos = true;
-                const inputIndexes = [];
                 for (let i = 0; i < settlementPsbt.inputsLength; i++) {
                     const settlementInput = settlementPsbt.getInput(i);
                     if (!settlementInput.txid ||
@@ -778,9 +773,12 @@ export class Wallet {
                     settlementPsbt.updateInput(i, {
                         tapLeafScript: [input.forfeitTapLeafScript],
                     });
-                    inputIndexes.push(i);
+                    settlementPsbt = await this.identity.sign(settlementPsbt, [
+                        i,
+                    ]);
+                    hasBoardingUtxos = true;
+                    break;
                 }
-                settlementPsbt = await this.identity.sign(settlementPsbt, inputIndexes);
                 continue;
             }
             if (isRecoverable(vtxo) || isSubdust(vtxo, this.dustAmount)) {

package/dist/types/forfeit.d.ts

@@ -1,3 +1,3 @@
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "./utils/transaction";
 import { TransactionInputUpdate } from "@scure/btc-signer/psbt.js";
 export declare function buildForfeitTx(inputs: TransactionInputUpdate[], forfeitPkScript: Uint8Array, txLocktime?: number): Transaction;

package/dist/types/identity/index.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from "@scure/btc-signer/transaction.js";
+import { Transaction } from "../utils/transaction";
 import { SignerSession } from "../tree/signingSession";
 export interface Identity {
     signerSession(): SignerSession;

package/dist/types/identity/singleKey.d.ts

@@ -1,5 +1,5 @@
-import { Transaction } from "@scure/btc-signer/transaction.js";
 import { Identity } from ".";
+import { Transaction } from "../utils/transaction";
 import { SignerSession } from "../tree/signingSession";
 /**
  * In-memory single key implementation for Bitcoin transaction signing.

package/dist/types/index.d.ts

@@ -1,10 +1,10 @@
-import { Transaction } from "@scure/btc-signer/transaction.js";
+import { Transaction } from "./utils/transaction";
 import { SingleKey } from "./identity/singleKey";
 import { Identity } from "./identity";
 import { ArkAddress } from "./script/address";
 import { VHTLC } from "./script/vhtlc";
 import { DefaultVtxo } from "./script/default";
-import { VtxoScript, EncodedVtxoScript, TapLeafScript } from "./script/base";
+import { VtxoScript, EncodedVtxoScript, TapLeafScript, TapTreeCoder } from "./script/base";
 import { TxType, IWallet, WalletConfig, ProviderClass, ArkTransaction, Coin, ExtendedCoin, ExtendedVirtualCoin, WalletBalance, SendBitcoinParams, Recipient, SettleParams, Status, VirtualStatus, Outpoint, VirtualCoin, TxKey, GetVtxosFilter, TapLeaves } from "./wallet";
 import { Wallet, waitForIncomingFunds, IncomingFunds } from "./wallet/wallet";
 import { TxTree, TxTreeNode } from "./tree/txTree";
@@ -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, ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, 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, 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, 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/intent/index.d.ts

@@ -1,5 +1,5 @@
-import { Transaction } from "@scure/btc-signer";
 import { TransactionInput, TransactionOutput } from "@scure/btc-signer/psbt.js";
+import { Transaction } from "../utils/transaction";
 /**
  * Intent proof implementation for Bitcoin message signing.
  *

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

@@ -49,8 +49,12 @@ export interface OnchainProvider {
  */
 export declare class EsploraProvider implements OnchainProvider {
     private baseUrl;
-    private polling;
-    constructor(baseUrl: string);
+    readonly pollingInterval: number;
+    readonly forcePolling: boolean;
+    constructor(baseUrl: string, opts?: {
+        pollingInterval?: number;
+        forcePolling?: boolean;
+    });
     getCoins(address: string): Promise<Coin[]>;
     getFeeRate(): Promise<number | undefined>;
     broadcastTransaction(...txs: string[]): Promise<string>;

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

@@ -1,5 +1,5 @@
 import { StorageAdapter } from "../storage";
-import { ArkTransaction, ExtendedVirtualCoin } from "../wallet";
+import { ArkTransaction, ExtendedCoin, ExtendedVirtualCoin } from "../wallet";
 export interface WalletState {
     lastSyncTime?: number;
     settings?: Record<string, any>;
@@ -9,6 +9,10 @@ export interface WalletRepository {
     saveVtxos(address: string, vtxos: ExtendedVirtualCoin[]): Promise<void>;
     removeVtxo(address: string, vtxoId: string): Promise<void>;
     clearVtxos(address: string): Promise<void>;
+    getUtxos(address: string): Promise<ExtendedCoin[]>;
+    saveUtxos(address: string, utxos: ExtendedCoin[]): Promise<void>;
+    removeUtxo(address: string, utxoId: string): Promise<void>;
+    clearUtxos(address: string): Promise<void>;
     getTransactionHistory(address: string): Promise<ArkTransaction[]>;
     saveTransactions(address: string, txs: ArkTransaction[]): Promise<void>;
     clearTransactions(address: string): Promise<void>;
@@ -23,6 +27,10 @@ export declare class WalletRepositoryImpl implements WalletRepository {
     saveVtxos(address: string, vtxos: ExtendedVirtualCoin[]): Promise<void>;
     removeVtxo(address: string, vtxoId: string): Promise<void>;
     clearVtxos(address: string): Promise<void>;
+    getUtxos(address: string): Promise<ExtendedCoin[]>;
+    saveUtxos(address: string, utxos: ExtendedCoin[]): Promise<void>;
+    removeUtxo(address: string, utxoId: string): Promise<void>;
+    clearUtxos(address: string): Promise<void>;
     getTransactionHistory(address: string): Promise<ArkTransaction[]>;
     saveTransactions(address: string, txs: ArkTransaction[]): Promise<void>;
     clearTransactions(address: string): Promise<void>;

package/dist/types/script/base.d.ts

@@ -1,4 +1,5 @@
 import { NETWORK } from "@scure/btc-signer";
+import { PSBTOutput } from "@scure/btc-signer/psbt.js";
 import { Bytes } from "@scure/btc-signer/utils.js";
 import { ArkAddress } from "./address";
 import { ConditionCSVMultisigTapscript, CSVMultisigTapscript } from "./tapscript";
@@ -10,6 +11,7 @@ export type TapLeafScript = [
     },
     Bytes
 ];
+export declare const TapTreeCoder: (typeof PSBTOutput.tapTree)[2];
 export declare function scriptFromTapLeafScript(leaf: TapLeafScript): Bytes;
 /**
  * VtxoScript is a script that contains a list of tapleaf scripts.

package/dist/types/utils/arkTransaction.d.ts

@@ -1,13 +1,11 @@
-import { Transaction } from "@scure/btc-signer";
-import { Bytes } from "@scure/btc-signer/utils.js";
 import { TransactionOutput } from "@scure/btc-signer/psbt.js";
 import { ExtendedCoin, VirtualCoin } from "../wallet";
 import { RelativeTimelock } from "../script/tapscript";
 import { EncodedVtxoScript, TapLeafScript } from "../script/base";
 import { CSVMultisigTapscript } from "../script/tapscript";
+import { Transaction } from "./transaction";
 export type ArkTxInput = {
     tapLeafScript: TapLeafScript;
-    checkpointTapLeafScript?: Bytes;
 } & EncodedVtxoScript & Pick<VirtualCoin, "txid" | "vout" | "value">;
 export type OffchainTx = {
     arkTx: Transaction;

package/dist/types/utils/transaction.d.ts

@@ -0,0 +1,13 @@
+import { Transaction as BtcSignerTransaction } from "@scure/btc-signer";
+import { TxOpts } from "@scure/btc-signer/transaction";
+import { Bytes } from "@scure/btc-signer/utils";
+/**
+ * Transaction is a wrapper around the @scure/btc-signer Transaction class.
+ * It adds the Ark protocol specific options to the transaction.
+ */
+export declare class Transaction extends BtcSignerTransaction {
+    static ARK_TX_OPTS: TxOpts;
+    constructor(opts?: TxOpts);
+    static fromPSBT(psbt_: Bytes, opts?: TxOpts): Transaction;
+    static fromRaw(raw: Bytes, opts?: TxOpts): Transaction;
+}

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

@@ -1,10 +1,10 @@
-import { Transaction } from "@scure/btc-signer";
 import { P2TR } from "@scure/btc-signer/payment.js";
 import { Coin, SendBitcoinParams } from ".";
 import { Identity } from "../identity";
 import { Network, NetworkName } from "../networks";
 import { OnchainProvider } from "../providers/onchain";
 import { AnchorBumper } from "../utils/anchor";
+import { Transaction } from "../utils/transaction";
 /**
  * Onchain Bitcoin wallet implementation for traditional Bitcoin transactions.
  *

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

@@ -25,6 +25,10 @@ export declare class Worker {
      * Get all vtxos categorized by type
      */
     private getAllVtxos;
+    /**
+     * Get all boarding utxos from wallet repository
+     */
+    private getAllBoardingUtxos;
     start(withServiceWorkerUpdate?: boolean): Promise<void>;
     clear(): Promise<void>;
     reload(): Promise<void>;

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

@@ -1,9 +1,9 @@
-import { Transaction } from "@scure/btc-signer";
 import { ChainTx, IndexerProvider } from "../providers/indexer";
 import { AnchorBumper } from "../utils/anchor";
 import { OnchainProvider } from "../providers/onchain";
 import { Outpoint } from ".";
 import { Wallet } from "./wallet";
+import { Transaction } from "../utils/transaction";
 export declare namespace Unroll {
     enum StepType {
         UNROLL = 0,

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

@@ -1,2 +1,3 @@
-import type { ExtendedVirtualCoin, VirtualCoin, Wallet } from "..";
+import type { Coin, ExtendedCoin, ExtendedVirtualCoin, VirtualCoin, Wallet } from "..";
 export declare function extendVirtualCoin(wallet: Wallet, vtxo: VirtualCoin): ExtendedVirtualCoin;
+export declare function extendCoin(wallet: Wallet, utxo: Coin): ExtendedCoin;

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

@@ -8,7 +8,7 @@ export interface RenewalConfig {
      * Enable automatic renewal monitoring
      * @default false
      */
-    enabled: boolean;
+    enabled?: boolean;
     /**
      * Percentage of expiry time to use as threshold (0-100)
      * E.g., 10 means renew when 10% of time until expiry remains
@@ -27,44 +27,16 @@ 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, thresholdMs: number): boolean;
+export declare function isVtxoExpiringSoon(vtxo: ExtendedVirtualCoin, percentage: number): boolean;
 /**
- * Filter VTXOs that are expiring soon
+ * Filter VTXOs that are expiring soon or are recoverable/subdust
  *
  * @param vtxos - Array of virtual coins to check
  * @param thresholdMs - Threshold in milliseconds from now
+ * @param dustAmount - Dust threshold amount in satoshis
  * @returns Array of VTXOs expiring within threshold
  */
-export declare function getExpiringVtxos(vtxos: ExtendedVirtualCoin[], thresholdMs: number): ExtendedVirtualCoin[];
-/**
- * Calculate expiry threshold in milliseconds based on batch expiry and percentage
- *
- * @param batchExpiry - Batch expiry timestamp in milliseconds
- * @param percentage - Percentage of total time (0-100)
- * @returns Threshold timestamp in milliseconds from now
- *
- * @example
- * // VTXO expires in 10 days, threshold is 10%
- * const expiry = Date.now() + 10 * 24 * 60 * 60 * 1000;
- * const threshold = calculateExpiryThreshold(expiry, 10);
- * // Returns 1 day in milliseconds (10% of 10 days)
- */
-export declare function calculateExpiryThreshold(batchExpiry: number, percentage: number): number;
-/**
- * Get the minimum expiry time from a list of VTXOs
- *
- * @param vtxos - Array of virtual coins
- * @returns Minimum batch expiry timestamp, or undefined if no VTXOs have expiry
- */
-export declare function getMinimumExpiry(vtxos: ExtendedVirtualCoin[]): number | undefined;
-/**
- * Calculate dynamic threshold based on the earliest expiring VTXO
- *
- * @param vtxos - Array of virtual coins
- * @param percentage - Percentage of time until expiry (0-100)
- * @returns Threshold in milliseconds, or undefined if no VTXOs have expiry
- */
-export declare function calculateDynamicThreshold(vtxos: ExtendedVirtualCoin[], percentage: number): number | undefined;
+export declare function getExpiringAndRecoverableVtxos(vtxos: ExtendedVirtualCoin[], percentage: 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.
@@ -179,9 +151,9 @@ export declare class VtxoManager {
      */
     getExpiringVtxos(thresholdPercentage?: number): Promise<ExtendedVirtualCoin[]>;
     /**
-     * Renew VTXOs by settling them back to the wallet's address
+     * Renew expiring VTXOs by settling them back to the wallet's address
      *
-     * This method collects all spendable VTXOs (including recoverable ones) and settles
+     * This method collects all expiring spendable VTXOs (including recoverable ones) and settles
      * them back to the wallet, effectively refreshing their expiration time. This is the
      * primary way to prevent VTXOs from expiring.
      *

package/package.json

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