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

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

@@ -2,10 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VtxoManager = exports.DEFAULT_RENEWAL_CONFIG = void 0;
 exports.isVtxoExpiringSoon = isVtxoExpiringSoon;
-exports.getExpiringVtxos = getExpiringVtxos;
-exports.calculateExpiryThreshold = calculateExpiryThreshold;
-exports.getMinimumExpiry = getMinimumExpiry;
-exports.calculateDynamicThreshold = calculateDynamicThreshold;
+exports.getExpiringAndRecoverableVtxos = getExpiringAndRecoverableVtxos;
 const _1 = require(".");
 /**
  * Default renewal configuration values
@@ -13,6 +10,9 @@ const _1 = require(".");
 exports.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)
  *
@@ -82,80 +82,35 @@ function getRecoverableWithSubdust(vtxos, dustAmount) {
  * @param thresholdMs - Threshold in milliseconds from now
  * @returns true if VTXO expires within threshold, false otherwise
  */
-function isVtxoExpiringSoon(vtxo, thresholdMs) {
+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
  */
-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)
- */
-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
- */
-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
- */
-function calculateDynamicThreshold(vtxos, percentage) {
-    const minExpiry = getMinimumExpiry(vtxos);
-    if (!minExpiry) {
-        return undefined;
-    }
-    return calculateExpiryThreshold(minExpiry, percentage);
+function getExpiringAndRecoverableVtxos(vtxos, percentage, dustAmount) {
+    return vtxos.filter((vtxo) => isVtxoExpiringSoon(vtxo, percentage) ||
+        (0, _1.isRecoverable)(vtxo) ||
+        (0, _1.isSubdust)(vtxo, dustAmount));
 }
 /**
  * VtxoManager is a unified class for managing VTXO lifecycle operations including
@@ -236,9 +191,7 @@ 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) {
@@ -281,9 +234,7 @@ 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
@@ -313,23 +264,16 @@ 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 ??
             exports.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.
      *
@@ -353,15 +297,13 @@ 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/cjs/wallet/wallet.js

@@ -370,15 +370,12 @@ 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 (0, utils_1.extendCoin)(this, utxo);
+        });
+        // Save boardingUtxos using unified repository
+        await this.walletRepository.saveUtxos(boardingAddress, utxos);
+        return utxos;
     }
     async sendBitcoin(params) {
         if (params.amount <= 0) {
@@ -798,8 +795,6 @@ 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 ||
@@ -815,9 +810,12 @@ 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 ((0, _1.isRecoverable)(vtxo) || (0, _1.isSubdust)(vtxo, this.dustAmount)) {

package/dist/esm/forfeit.js

@@ -1,12 +1,9 @@
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from './utils/transaction.js';
 import { P2A } from './utils/anchor.js';
 export function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
     const tx = new Transaction({
         version: 3,
         lockTime: txLocktime,
-        allowUnknownOutputs: true,
-        allowUnknown: true,
-        allowUnknownInputs: true,
     });
     let amount = 0n;
     for (const input of inputs) {

package/dist/esm/identity/singleKey.js

@@ -1,9 +1,8 @@
 import { pubECDSA, pubSchnorr, randomPrivateKeyBytes, } from "@scure/btc-signer/utils.js";
-import { SigHash } from "@scure/btc-signer/transaction.js";
+import { SigHash } from "@scure/btc-signer";
 import { hex } from "@scure/base";
 import { TreeSignerSession } from '../tree/signingSession.js';
 import { schnorr, sign } from "@noble/secp256k1";
-const ZERO_32 = new Uint8Array(32).fill(0);
 const ALL_SIGHASH = Object.values(SigHash).filter((x) => typeof x === "number");
 /**
  * In-memory single key implementation for Bitcoin transaction signing.
@@ -48,7 +47,7 @@ export class SingleKey {
         const txCpy = tx.clone();
         if (!inputIndexes) {
             try {
-                if (!txCpy.sign(this.key, ALL_SIGHASH, ZERO_32)) {
+                if (!txCpy.sign(this.key, ALL_SIGHASH)) {
                     throw new Error("Failed to sign transaction");
                 }
             }
@@ -64,7 +63,7 @@ export class SingleKey {
             return txCpy;
         }
         for (const inputIndex of inputIndexes) {
-            if (!txCpy.signIdx(this.key, inputIndex, ALL_SIGHASH, ZERO_32)) {
+            if (!txCpy.signIdx(this.key, inputIndex, ALL_SIGHASH)) {
                 throw new Error(`Failed to sign input #${inputIndex}`);
             }
         }

package/dist/esm/index.js

@@ -1,9 +1,9 @@
-import { Transaction } from "@scure/btc-signer/transaction.js";
+import { Transaction } from './utils/transaction.js';
 import { SingleKey } from './identity/singleKey.js';
 import { ArkAddress } from './script/address.js';
 import { VHTLC } from './script/vhtlc.js';
 import { DefaultVtxo } from './script/default.js';
-import { VtxoScript } from './script/base.js';
+import { VtxoScript, TapTreeCoder, } from './script/base.js';
 import { TxType, } from './wallet/index.js';
 import { Wallet, waitForIncomingFunds } from './wallet/wallet.js';
 import { TxTree } from './tree/txTree.js';
@@ -41,7 +41,7 @@ TxType, IndexerTxType, ChainTxType, SettlementEventType,
 // Service Worker
 setupServiceWorker, Worker, ServiceWorkerWallet, Request, Response, 
 // Tapscript
-decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CLTVMultisigTapscript, 
+decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CLTVMultisigTapscript, TapTreeCoder, 
 // Ark PSBT fields
 ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, 
 // Utils

package/dist/esm/intent/index.js

@@ -1,5 +1,6 @@
-import { OP, Transaction, Script, SigHash } from "@scure/btc-signer";
+import { OP, Script, SigHash } from "@scure/btc-signer";
 import { schnorr } from "@noble/curves/secp256k1.js";
+import { Transaction } from '../utils/transaction.js';
 /**
  * Intent proof implementation for Bitcoin message signing.
  *
@@ -84,9 +85,6 @@ function craftToSpendTx(message, pkScript) {
     const messageHash = hashMessage(message);
     const tx = new Transaction({
         version: 0,
-        allowUnknownOutputs: true,
-        allowUnknown: true,
-        allowUnknownInputs: true,
     });
     // add input with zero hash and max index
     tx.addInput({
@@ -109,9 +107,6 @@ function craftToSignTx(toSpend, inputs, outputs) {
     const firstInput = inputs[0];
     const tx = new Transaction({
         version: 2,
-        allowUnknownOutputs: outputs.length === 0,
-        allowUnknown: true,
-        allowUnknownInputs: true,
         lockTime: 0,
     });
     // add the first "toSpend" input

package/dist/esm/providers/onchain.js

@@ -18,9 +18,10 @@ export const ESPLORA_URL = {
  * ```
  */
 export class EsploraProvider {
-    constructor(baseUrl) {
+    constructor(baseUrl, opts) {
         this.baseUrl = baseUrl;
-        this.polling = false;
+        this.pollingInterval = opts?.pollingInterval ?? 15000;
+        this.forcePolling = opts?.forcePolling ?? false;
     }
     async getCoins(address) {
         const response = await fetch(`${this.baseUrl}/address/${address}/utxo`);
@@ -91,13 +92,9 @@ export class EsploraProvider {
         let intervalId = null;
         const wsUrl = this.baseUrl.replace(/^http(s)?:/, "ws$1:") + "/v1/ws";
         const poll = async () => {
-            if (this.polling)
-                return;
-            this.polling = true;
-            // websocket is not reliable, so we will fallback to polling
-            const pollingInterval = 5000; // 5 seconds
-            const getAllTxs = () => {
-                return Promise.all(addresses.map((address) => this.getTransactions(address))).then((txArrays) => txArrays.flat());
+            const getAllTxs = async () => {
+                const txArrays = await Promise.all(addresses.map((address) => this.getTransactions(address)));
+                return txArrays.flat();
             };
             // initial fetch to get existing transactions
             const initialTxs = await getAllTxs();
@@ -122,9 +119,19 @@ export class EsploraProvider {
                 catch (error) {
                     console.error("Error in polling mechanism:", error);
                 }
-            }, pollingInterval);
+            }, this.pollingInterval);
         };
         let ws = null;
+        const stopFunc = () => {
+            if (ws)
+                ws.close();
+            if (intervalId)
+                clearInterval(intervalId);
+        };
+        if (this.forcePolling) {
+            await poll();
+            return stopFunc;
+        }
         try {
             ws = new WebSocket(wsUrl);
             ws.addEventListener("open", () => {
@@ -171,13 +178,6 @@ export class EsploraProvider {
             // if websocket is not available, fallback to polling
             await poll();
         }
-        const stopFunc = () => {
-            if (ws && ws.readyState === WebSocket.OPEN)
-                ws.close();
-            if (intervalId)
-                clearInterval(intervalId);
-            this.polling = false;
-        };
         return stopFunc;
     }
     async getChainTip() {
@@ -245,8 +245,7 @@ const isExplorerTransaction = (tx) => {
     return (typeof tx.txid === "string" &&
         Array.isArray(tx.vout) &&
         tx.vout.every((vout) => typeof vout.scriptpubkey_address === "string" &&
-            typeof vout.value === "string") &&
+            typeof vout.value === "number") &&
         typeof tx.status === "object" &&
-        typeof tx.status.confirmed === "boolean" &&
-        typeof tx.status.block_time === "number");
+        typeof tx.status.confirmed === "boolean");
 };

package/dist/esm/repositories/walletRepository.js

@@ -12,7 +12,14 @@ const serializeVtxo = (v) => ({
     tapTree: toHex(v.tapTree),
     forfeitTapLeafScript: serializeTapLeaf(v.forfeitTapLeafScript),
     intentTapLeafScript: serializeTapLeaf(v.intentTapLeafScript),
-    extraWitness: v.extraWitness?.map((w) => toHex(w)),
+    extraWitness: v.extraWitness?.map(toHex),
+});
+const serializeUtxo = (u) => ({
+    ...u,
+    tapTree: toHex(u.tapTree),
+    forfeitTapLeafScript: serializeTapLeaf(u.forfeitTapLeafScript),
+    intentTapLeafScript: serializeTapLeaf(u.intentTapLeafScript),
+    extraWitness: u.extraWitness?.map(toHex),
 });
 const deserializeTapLeaf = (t) => {
     const cb = TaprootControlBlock.decode(fromHex(t.cb));
@@ -24,13 +31,21 @@ const deserializeVtxo = (o) => ({
     tapTree: fromHex(o.tapTree),
     forfeitTapLeafScript: deserializeTapLeaf(o.forfeitTapLeafScript),
     intentTapLeafScript: deserializeTapLeaf(o.intentTapLeafScript),
-    extraWitness: o.extraWitness?.map((w) => fromHex(w)),
+    extraWitness: o.extraWitness?.map(fromHex),
+});
+const deserializeUtxo = (o) => ({
+    ...o,
+    tapTree: fromHex(o.tapTree),
+    forfeitTapLeafScript: deserializeTapLeaf(o.forfeitTapLeafScript),
+    intentTapLeafScript: deserializeTapLeaf(o.intentTapLeafScript),
+    extraWitness: o.extraWitness?.map(fromHex),
 });
 export class WalletRepositoryImpl {
     constructor(storage) {
         this.storage = storage;
         this.cache = {
             vtxos: new Map(),
+            utxos: new Map(),
             transactions: new Map(),
             walletState: null,
             initialized: new Set(),
@@ -83,6 +98,53 @@ export class WalletRepositoryImpl {
         this.cache.vtxos.set(address, []);
         await this.storage.removeItem(`vtxos:${address}`);
     }
+    async getUtxos(address) {
+        const cacheKey = `utxos:${address}`;
+        if (this.cache.utxos.has(address)) {
+            return this.cache.utxos.get(address);
+        }
+        const stored = await this.storage.getItem(cacheKey);
+        if (!stored) {
+            this.cache.utxos.set(address, []);
+            return [];
+        }
+        try {
+            const parsed = JSON.parse(stored);
+            const utxos = parsed.map(deserializeUtxo);
+            this.cache.utxos.set(address, utxos.slice());
+            return utxos.slice();
+        }
+        catch (error) {
+            console.error(`Failed to parse UTXOs for address ${address}:`, error);
+            this.cache.utxos.set(address, []);
+            return [];
+        }
+    }
+    async saveUtxos(address, utxos) {
+        const storedUtxos = await this.getUtxos(address);
+        utxos.forEach((utxo) => {
+            const existing = storedUtxos.findIndex((u) => u.txid === utxo.txid && u.vout === utxo.vout);
+            if (existing !== -1) {
+                storedUtxos[existing] = utxo;
+            }
+            else {
+                storedUtxos.push(utxo);
+            }
+        });
+        this.cache.utxos.set(address, storedUtxos.slice());
+        await this.storage.setItem(`utxos:${address}`, JSON.stringify(storedUtxos.map(serializeUtxo)));
+    }
+    async removeUtxo(address, utxoId) {
+        const utxos = await this.getUtxos(address);
+        const [txid, vout] = utxoId.split(":");
+        const filtered = utxos.filter((v) => !(v.txid === txid && v.vout === parseInt(vout, 10)));
+        this.cache.utxos.set(address, filtered.slice());
+        await this.storage.setItem(`utxos:${address}`, JSON.stringify(filtered.map(serializeUtxo)));
+    }
+    async clearUtxos(address) {
+        this.cache.utxos.set(address, []);
+        await this.storage.removeItem(`utxos:${address}`);
+    }
     async getTransactionHistory(address) {
         const cacheKey = `tx:${address}`;
         if (this.cache.transactions.has(address)) {

package/dist/esm/script/base.js

@@ -4,7 +4,7 @@ import { PSBTOutput } from "@scure/btc-signer/psbt.js";
 import { hex } from "@scure/base";
 import { ArkAddress } from './address.js';
 import { ConditionCSVMultisigTapscript, CSVMultisigTapscript, } from './tapscript.js';
-const TapTreeCoder = PSBTOutput.tapTree[2];
+export const TapTreeCoder = PSBTOutput.tapTree[2];
 export function scriptFromTapLeafScript(leaf) {
     return leaf[1].subarray(0, leaf[1].length - 1); // remove the version byte
 }
@@ -24,7 +24,16 @@ export class VtxoScript {
     }
     constructor(scripts) {
         this.scripts = scripts;
-        const tapTree = taprootListToTree(scripts.map((script) => ({ script, leafVersion: TAP_LEAF_VERSION })));
+        // reverse the scripts if the number of scripts is odd
+        // this is to be compatible with arkd algorithm computing taproot tree from list of tapscripts
+        // the scripts must be reversed only HERE while we compute the tweaked public key
+        // but the original order should be preserved while encoding as taptree
+        // note: .slice().reverse() is used instead of .reverse() to avoid mutating the original array
+        const list = scripts.length % 2 !== 0 ? scripts.slice().reverse() : scripts;
+        const tapTree = taprootListToTree(list.map((script) => ({
+            script,
+            leafVersion: TAP_LEAF_VERSION,
+        })));
         const payment = p2tr(TAPROOT_UNSPENDABLE_KEY, tapTree, undefined, true);
         if (!payment.tapLeafScript ||
             payment.tapLeafScript.length !== scripts.length) {

package/dist/esm/utils/arkTransaction.js

@@ -1,11 +1,12 @@
 import { schnorr } from "@noble/curves/secp256k1.js";
 import { hex } from "@scure/base";
-import { DEFAULT_SEQUENCE, Transaction, SigHash } from "@scure/btc-signer";
+import { DEFAULT_SEQUENCE, SigHash } from "@scure/btc-signer";
 import { tapLeafHash } from "@scure/btc-signer/payment.js";
 import { CLTVMultisigTapscript, decodeTapscript, } from '../script/tapscript.js';
 import { scriptFromTapLeafScript, VtxoScript, } from '../script/base.js';
 import { P2A } from './anchor.js';
 import { setArkPsbtField, VtxoTaprootTree } from './unknownFields.js';
+import { Transaction } from './transaction.js';
 /**
  * Builds an offchain transaction with checkpoint transactions.
  *
@@ -45,8 +46,6 @@ function buildVirtualTx(inputs, outputs) {
     }
     const tx = new Transaction({
         version: 3,
-        allowUnknown: true,
-        allowUnknownOutputs: true,
         lockTime: Number(lockTime),
     });
     for (const [i, input] of inputs.entries()) {
@@ -71,8 +70,7 @@ function buildVirtualTx(inputs, outputs) {
 }
 function buildCheckpointTx(vtxo, serverUnrollScript) {
     // create the checkpoint vtxo script from collaborative closure
-    const collaborativeClosure = decodeTapscript(vtxo.checkpointTapLeafScript ??
-        scriptFromTapLeafScript(vtxo.tapLeafScript));
+    const collaborativeClosure = decodeTapscript(scriptFromTapLeafScript(vtxo.tapLeafScript));
     // create the checkpoint vtxo script combining collaborative closure and server unroll script
     const checkpointVtxoScript = new VtxoScript([
         serverUnrollScript.script,

package/dist/esm/utils/transaction.js

@@ -0,0 +1,24 @@
+import { Transaction as BtcSignerTransaction } from "@scure/btc-signer";
+/**
+ * Transaction is a wrapper around the @scure/btc-signer Transaction class.
+ * It adds the Ark protocol specific options to the transaction.
+ */
+export class Transaction extends BtcSignerTransaction {
+    constructor(opts) {
+        super(withArkOpts(opts));
+    }
+    static fromPSBT(psbt_, opts) {
+        return BtcSignerTransaction.fromPSBT(psbt_, withArkOpts(opts));
+    }
+    static fromRaw(raw, opts) {
+        return BtcSignerTransaction.fromRaw(raw, withArkOpts(opts));
+    }
+}
+Transaction.ARK_TX_OPTS = {
+    allowUnknown: true,
+    allowUnknownOutputs: true,
+    allowUnknownInputs: true,
+};
+function withArkOpts(opts) {
+    return { ...Transaction.ARK_TX_OPTS, ...opts };
+}

package/dist/esm/wallet/onchain.js

@@ -1,8 +1,9 @@
-import { Transaction, p2tr } from "@scure/btc-signer";
+import { p2tr } from "@scure/btc-signer";
 import { getNetwork } from '../networks.js';
 import { ESPLORA_URL, EsploraProvider, } from '../providers/onchain.js';
 import { findP2AOutput, P2A } from '../utils/anchor.js';
 import { TxWeightEstimator } from '../utils/txSizeEstimator.js';
+import { Transaction } from '../utils/transaction.js';
 /**
  * Onchain Bitcoin wallet implementation for traditional Bitcoin transactions.
  *
@@ -104,9 +105,8 @@ export class OnchainWallet {
     async bumpP2A(parent) {
         const parentVsize = parent.vsize;
         let child = new Transaction({
-            allowUnknownInputs: true,
-            allowLegacyWitnessUtxo: true,
             version: 3,
+            allowLegacyWitnessUtxo: true,
         });
         child.addInput(findP2AOutput(parent)); // throws if not found
         const childVsize = TxWeightEstimator.create()

package/dist/esm/wallet/serviceWorker/worker.js

@@ -1,6 +1,6 @@
 /// <reference lib="webworker" />
 import { SingleKey } from '../../identity/singleKey.js';
-import { isRecoverable, isSpendable, isSubdust } from '../index.js';
+import { isRecoverable, isSpendable, isSubdust, } from '../index.js';
 import { Wallet } from '../wallet.js';
 import { Request } from './request.js';
 import { Response } from './response.js';
@@ -10,7 +10,7 @@ import { RestIndexerProvider } from '../../providers/indexer.js';
 import { hex } from "@scure/base";
 import { IndexedDBStorageAdapter } from '../../storage/indexedDB.js';
 import { WalletRepositoryImpl, } from '../../repositories/walletRepository.js';
-import { extendVirtualCoin } from '../utils.js';
+import { extendCoin, extendVirtualCoin } from '../utils.js';
 import { DEFAULT_DB_NAME } from './utils.js';
 /**
  * Worker is a class letting to interact with ServiceWorkerWallet from the client
@@ -57,6 +57,15 @@ export class Worker {
             spent: allVtxos.filter((vtxo) => !isSpendable(vtxo)),
         };
     }
+    /**
+     * Get all boarding utxos from wallet repository
+     */
+    async getAllBoardingUtxos() {
+        if (!this.wallet)
+            return [];
+        const address = await this.wallet.getBoardingAddress();
+        return await this.walletRepository.getUtxos(address);
+    }
     async start(withServiceWorkerUpdate = true) {
         self.addEventListener("message", async (event) => {
             await this.handleMessage(event);
@@ -130,6 +139,14 @@ export class Worker {
                 this.sendMessageToAllClients(Response.vtxoUpdate(newVtxos, spentVtxos));
             }
             if (funds.type === "utxo") {
+                const newUtxos = funds.coins.map((utxo) => extendCoin(this.wallet, utxo));
+                if (newUtxos.length === 0) {
+                    this.sendMessageToAllClients(Response.utxoUpdate([]));
+                    return;
+                }
+                const boardingAddress = await this.wallet?.getBoardingAddress();
+                // save utxos using unified repository
+                await this.walletRepository.saveUtxos(boardingAddress, newUtxos);
                 // notify all clients about the utxo update
                 this.sendMessageToAllClients(Response.utxoUpdate(funds.coins));
             }
@@ -288,7 +305,7 @@ export class Worker {
         }
         try {
             const [boardingUtxos, spendableVtxos, sweptVtxos] = await Promise.all([
-                this.wallet.getBoardingUtxos(),
+                this.getAllBoardingUtxos(),
                 this.getSpendableVtxos(),
                 this.getSweptVtxos(),
             ]);
@@ -393,7 +410,7 @@ export class Worker {
             return;
         }
         try {
-            const boardingUtxos = await this.wallet.getBoardingUtxos();
+            const boardingUtxos = await this.getAllBoardingUtxos();
             event.source?.postMessage(Response.boardingUtxos(message.id, boardingUtxos));
         }
         catch (error) {