@arkade-os/sdk 0.3.1-alpha.3 → 0.3.1-alpha.5

package/README.md

@@ -130,22 +130,12 @@ const manager = new VtxoManager(wallet, {
 Renew VTXOs before they expire to keep your liquidity accessible. This settles all VTXOs (including recoverable ones) back to your wallet with a fresh expiration time.
 
 ```typescript
+// Renew all VTXOs to prevent expiration
+const txid = await manager.renewVtxos()
+console.log('Renewed:', txid)
+
 // Check which VTXOs are expiring soon
 const expiringVtxos = await manager.getExpiringVtxos()
-if (expiringVtxos.length > 0) {
-  console.log(`${expiringVtxos.length} VTXOs expiring soon`)
-
-  expiringVtxos.forEach(vtxo => {
-    const timeLeft = vtxo.virtualStatus.batchExpiry! - Date.now()
-    const hoursLeft = Math.floor(timeLeft / (1000 * 60 * 60))
-    console.log(`VTXO ${vtxo.txid} expires in ${hoursLeft} hours`)
-  })
-
-  // Renew all VTXOs to prevent expiration
-  const txid = await manager.renewVtxos()
-  console.log('Renewed:', txid)
-}
-
 // Override threshold percentage (e.g., renew when 5% of time remains)
 const urgentlyExpiring = await manager.getExpiringVtxos(5)
 ```
@@ -156,20 +146,13 @@ const urgentlyExpiring = await manager.getExpiringVtxos(5)
 Recover VTXOs that have been swept by the server or consolidate small amounts (subdust).
 
 ```typescript
+// Recover swept VTXOs and preconfirmed subdust
+const txid = await manager.recoverVtxos((event) => {
+  console.log('Settlement event:', event.type)
+})
+console.log('Recovered:', txid)
 // Check what's recoverable
 const balance = await manager.getRecoverableBalance()
-console.log(`Recoverable: ${balance.recoverable} sats`)
-console.log(`Subdust: ${balance.subdust} sats`)
-console.log(`Subdust included: ${balance.includesSubdust}`)
-console.log(`VTXO count: ${balance.vtxoCount}`)
-
-if (balance.recoverable > 0n) {
-  // Recover swept VTXOs and preconfirmed subdust
-  const txid = await manager.recoverVtxos((event) => {
-    console.log('Settlement event:', event.type)
-  })
-  console.log('Recovered:', txid)
-}
 ```
 
 

package/dist/cjs/forfeit.js

@@ -1,15 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildForfeitTx = buildForfeitTx;
-const btc_signer_1 = require("@scure/btc-signer");
+const transaction_1 = require("./utils/transaction");
 const anchor_1 = require("./utils/anchor");
 function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
-    const tx = new btc_signer_1.Transaction({
+    const tx = new transaction_1.Transaction({
         version: 3,
         lockTime: txLocktime,
-        allowUnknownOutputs: true,
-        allowUnknown: true,
-        allowUnknownInputs: true,
     });
     let amount = 0n;
     for (const input of inputs) {

package/dist/cjs/identity/singleKey.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleKey = void 0;
 const utils_js_1 = require("@scure/btc-signer/utils.js");
-const transaction_js_1 = require("@scure/btc-signer/transaction.js");
+const btc_signer_1 = require("@scure/btc-signer");
 const base_1 = require("@scure/base");
 const signingSession_1 = require("../tree/signingSession");
 const secp256k1_1 = require("@noble/secp256k1");
-const ZERO_32 = new Uint8Array(32).fill(0);
-const ALL_SIGHASH = Object.values(transaction_js_1.SigHash).filter((x) => typeof x === "number");
+const ALL_SIGHASH = Object.values(btc_signer_1.SigHash).filter((x) => typeof x === "number");
 /**
  * In-memory single key implementation for Bitcoin transaction signing.
  *
@@ -51,7 +50,7 @@ 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");
                 }
             }
@@ -67,7 +66,7 @@ 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/cjs/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArkError = exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.Intent = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.networks = exports.ArkNote = 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.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 = void 0;
-const transaction_js_1 = require("@scure/btc-signer/transaction.js");
-Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return transaction_js_1.Transaction; } });
+exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.Intent = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.networks = exports.ArkNote = 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 = 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");
 Object.defineProperty(exports, "SingleKey", { enumerable: true, get: function () { return singleKey_1.SingleKey; } });
 const address_1 = require("./script/address");
@@ -14,6 +14,7 @@ const default_1 = require("./script/default");
 Object.defineProperty(exports, "DefaultVtxo", { enumerable: true, get: function () { return default_1.DefaultVtxo; } });
 const base_1 = require("./script/base");
 Object.defineProperty(exports, "VtxoScript", { enumerable: true, get: function () { return base_1.VtxoScript; } });
+Object.defineProperty(exports, "TapTreeCoder", { enumerable: true, get: function () { return base_1.TapTreeCoder; } });
 const wallet_1 = require("./wallet");
 Object.defineProperty(exports, "TxType", { enumerable: true, get: function () { return wallet_1.TxType; } });
 const wallet_2 = require("./wallet/wallet");

package/dist/cjs/intent/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Intent = void 0;
 const btc_signer_1 = require("@scure/btc-signer");
 const secp256k1_js_1 = require("@noble/curves/secp256k1.js");
+const transaction_1 = require("../utils/transaction");
 /**
  * Intent proof implementation for Bitcoin message signing.
  *
@@ -85,11 +86,8 @@ function validateOutputs(outputs) {
 // craftToSpendTx creates the initial transaction that will be spent in the proof
 function craftToSpendTx(message, pkScript) {
     const messageHash = hashMessage(message);
-    const tx = new btc_signer_1.Transaction({
+    const tx = new transaction_1.Transaction({
         version: 0,
-        allowUnknownOutputs: true,
-        allowUnknown: true,
-        allowUnknownInputs: true,
     });
     // add input with zero hash and max index
     tx.addInput({
@@ -110,11 +108,8 @@ function craftToSpendTx(message, pkScript) {
 // craftToSignTx creates the transaction that will be signed for the proof
 function craftToSignTx(toSpend, inputs, outputs) {
     const firstInput = inputs[0];
-    const tx = new btc_signer_1.Transaction({
+    const tx = new transaction_1.Transaction({
         version: 2,
-        allowUnknownOutputs: outputs.length === 0,
-        allowUnknown: true,
-        allowUnknownInputs: true,
         lockTime: 0,
     });
     // add the first "toSpend" input

package/dist/cjs/providers/onchain.js

@@ -21,9 +21,10 @@ exports.ESPLORA_URL = {
  * ```
  */
 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`);
@@ -94,13 +95,9 @@ 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();
@@ -125,9 +122,19 @@ 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", () => {
@@ -174,13 +181,6 @@ 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() {
@@ -249,8 +249,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/cjs/repositories/walletRepository.js

@@ -15,7 +15,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 = btc_signer_1.TaprootControlBlock.decode(fromHex(t.cb));
@@ -27,13 +34,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),
 });
 class WalletRepositoryImpl {
     constructor(storage) {
         this.storage = storage;
         this.cache = {
             vtxos: new Map(),
+            utxos: new Map(),
             transactions: new Map(),
             walletState: null,
             initialized: new Set(),
@@ -86,6 +101,53 @@ 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/cjs/script/base.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VtxoScript = void 0;
+exports.VtxoScript = exports.TapTreeCoder = void 0;
 exports.scriptFromTapLeafScript = scriptFromTapLeafScript;
 const btc_signer_1 = require("@scure/btc-signer");
 const payment_js_1 = require("@scure/btc-signer/payment.js");
@@ -8,7 +8,7 @@ const psbt_js_1 = require("@scure/btc-signer/psbt.js");
 const base_1 = require("@scure/base");
 const address_1 = require("./address");
 const tapscript_1 = require("./tapscript");
-const TapTreeCoder = psbt_js_1.PSBTOutput.tapTree[2];
+exports.TapTreeCoder = psbt_js_1.PSBTOutput.tapTree[2];
 function scriptFromTapLeafScript(leaf) {
     return leaf[1].subarray(0, leaf[1].length - 1); // remove the version byte
 }
@@ -22,13 +22,22 @@ function scriptFromTapLeafScript(leaf) {
  */
 class VtxoScript {
     static decode(tapTree) {
-        const leaves = TapTreeCoder.decode(tapTree);
+        const leaves = exports.TapTreeCoder.decode(tapTree);
         const scripts = leaves.map((leaf) => leaf.script);
         return new VtxoScript(scripts);
     }
     constructor(scripts) {
         this.scripts = scripts;
-        const tapTree = (0, btc_signer_1.taprootListToTree)(scripts.map((script) => ({ script, leafVersion: payment_js_1.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 = (0, btc_signer_1.taprootListToTree)(list.map((script) => ({
+            script,
+            leafVersion: payment_js_1.TAP_LEAF_VERSION,
+        })));
         const payment = (0, btc_signer_1.p2tr)(btc_signer_1.TAPROOT_UNSPENDABLE_KEY, tapTree, undefined, true);
         if (!payment.tapLeafScript ||
             payment.tapLeafScript.length !== scripts.length) {
@@ -38,7 +47,7 @@ class VtxoScript {
         this.tweakedPublicKey = payment.tweakedPubkey;
     }
     encode() {
-        const tapTree = TapTreeCoder.encode(this.scripts.map((script) => ({
+        const tapTree = exports.TapTreeCoder.encode(this.scripts.map((script) => ({
             depth: 1,
             version: payment_js_1.TAP_LEAF_VERSION,
             script,

package/dist/cjs/utils/arkTransaction.js

@@ -11,6 +11,7 @@ const tapscript_1 = require("../script/tapscript");
 const base_2 = require("../script/base");
 const anchor_1 = require("./anchor");
 const unknownFields_1 = require("./unknownFields");
+const transaction_1 = require("./transaction");
 /**
  * Builds an offchain transaction with checkpoint transactions.
  *
@@ -48,10 +49,8 @@ function buildVirtualTx(inputs, outputs) {
             }
         }
     }
-    const tx = new btc_signer_1.Transaction({
+    const tx = new transaction_1.Transaction({
         version: 3,
-        allowUnknown: true,
-        allowUnknownOutputs: true,
         lockTime: Number(lockTime),
     });
     for (const [i, input] of inputs.entries()) {
@@ -76,8 +75,7 @@ function buildVirtualTx(inputs, outputs) {
 }
 function buildCheckpointTx(vtxo, serverUnrollScript) {
     // create the checkpoint vtxo script from collaborative closure
-    const collaborativeClosure = (0, tapscript_1.decodeTapscript)(vtxo.checkpointTapLeafScript ??
-        (0, base_2.scriptFromTapLeafScript)(vtxo.tapLeafScript));
+    const collaborativeClosure = (0, tapscript_1.decodeTapscript)((0, base_2.scriptFromTapLeafScript)(vtxo.tapLeafScript));
     // create the checkpoint vtxo script combining collaborative closure and server unroll script
     const checkpointVtxoScript = new base_2.VtxoScript([
         serverUnrollScript.script,

package/dist/cjs/utils/transaction.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Transaction = void 0;
+const btc_signer_1 = require("@scure/btc-signer");
+/**
+ * Transaction is a wrapper around the @scure/btc-signer Transaction class.
+ * It adds the Ark protocol specific options to the transaction.
+ */
+class Transaction extends btc_signer_1.Transaction {
+    constructor(opts) {
+        super(withArkOpts(opts));
+    }
+    static fromPSBT(psbt_, opts) {
+        return btc_signer_1.Transaction.fromPSBT(psbt_, withArkOpts(opts));
+    }
+    static fromRaw(raw, opts) {
+        return btc_signer_1.Transaction.fromRaw(raw, withArkOpts(opts));
+    }
+}
+exports.Transaction = Transaction;
+Transaction.ARK_TX_OPTS = {
+    allowUnknown: true,
+    allowUnknownOutputs: true,
+    allowUnknownInputs: true,
+};
+function withArkOpts(opts) {
+    return { ...Transaction.ARK_TX_OPTS, ...opts };
+}

package/dist/cjs/wallet/onchain.js

@@ -7,6 +7,7 @@ const networks_1 = require("../networks");
 const onchain_1 = require("../providers/onchain");
 const anchor_1 = require("../utils/anchor");
 const txSizeEstimator_1 = require("../utils/txSizeEstimator");
+const transaction_1 = require("../utils/transaction");
 /**
  * Onchain Bitcoin wallet implementation for traditional Bitcoin transactions.
  *
@@ -79,7 +80,7 @@ class OnchainWallet {
         // Select coins
         const selected = selectCoins(coins, totalNeeded);
         // Create transaction
-        let tx = new btc_signer_1.Transaction();
+        let tx = new transaction_1.Transaction();
         // Add inputs
         for (const input of selected.inputs) {
             tx.addInput({
@@ -107,10 +108,9 @@ class OnchainWallet {
     }
     async bumpP2A(parent) {
         const parentVsize = parent.vsize;
-        let child = new btc_signer_1.Transaction({
-            allowUnknownInputs: true,
-            allowLegacyWitnessUtxo: true,
+        let child = new transaction_1.Transaction({
             version: 3,
+            allowLegacyWitnessUtxo: true,
         });
         child.addInput((0, anchor_1.findP2AOutput)(parent)); // throws if not found
         const childVsize = txSizeEstimator_1.TxWeightEstimator.create()

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

@@ -60,6 +60,15 @@ class Worker {
             spent: allVtxos.filter((vtxo) => !(0, __1.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);
@@ -133,6 +142,14 @@ class Worker {
                 this.sendMessageToAllClients(response_1.Response.vtxoUpdate(newVtxos, spentVtxos));
             }
             if (funds.type === "utxo") {
+                const newUtxos = funds.coins.map((utxo) => (0, utils_1.extendCoin)(this.wallet, utxo));
+                if (newUtxos.length === 0) {
+                    this.sendMessageToAllClients(response_1.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_1.Response.utxoUpdate(funds.coins));
             }
@@ -291,7 +308,7 @@ class Worker {
         }
         try {
             const [boardingUtxos, spendableVtxos, sweptVtxos] = await Promise.all([
-                this.wallet.getBoardingUtxos(),
+                this.getAllBoardingUtxos(),
                 this.getSpendableVtxos(),
                 this.getSweptVtxos(),
             ]);
@@ -396,7 +413,7 @@ class Worker {
             return;
         }
         try {
-            const boardingUtxos = await this.wallet.getBoardingUtxos();
+            const boardingUtxos = await this.getAllBoardingUtxos();
             event.source?.postMessage(response_1.Response.boardingUtxos(message.id, boardingUtxos));
         }
         catch (error) {

package/dist/cjs/wallet/unroll.js

@@ -7,6 +7,7 @@ const indexer_1 = require("../providers/indexer");
 const base_2 = require("../script/base");
 const txSizeEstimator_1 = require("../utils/txSizeEstimator");
 const wallet_1 = require("./wallet");
+const transaction_1 = require("../utils/transaction");
 var Unroll;
 (function (Unroll) {
     let StepType;
@@ -105,9 +106,7 @@ var Unroll;
             if (virtualTxs.txs.length === 0) {
                 throw new Error(`Tx ${nextTxToBroadcast.txid} not found`);
             }
-            const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(virtualTxs.txs[0]), {
-                allowUnknownInputs: true,
-            });
+            const tx = transaction_1.Transaction.fromPSBT(base_1.base64.decode(virtualTxs.txs[0]));
             // finalize the tree transaction
             if (nextTxToBroadcast.type === indexer_1.ChainTxType.TREE) {
                 const input = tx.getInput(0);
@@ -200,7 +199,7 @@ var Unroll;
             });
             txWeightEstimator.addTapscriptInput(64, spendingLeaf[1].length, btc_signer_1.TaprootControlBlock.encode(spendingLeaf[0]).length);
         }
-        const tx = new btc_signer_1.Transaction({ allowUnknownInputs: true, version: 2 });
+        const tx = new transaction_1.Transaction({ version: 2 });
         for (const input of inputs) {
             tx.addInput(input);
         }

package/dist/cjs/wallet/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendVirtualCoin = extendVirtualCoin;
+exports.extendCoin = extendCoin;
 function extendVirtualCoin(wallet, vtxo) {
     return {
         ...vtxo,
@@ -9,3 +10,11 @@ function extendVirtualCoin(wallet, vtxo) {
         tapTree: wallet.offchainTapscript.encode(),
     };
 }
+function extendCoin(wallet, utxo) {
+    return {
+        ...utxo,
+        forfeitTapLeafScript: wallet.boardingTapscript.forfeit(),
+        intentTapLeafScript: wallet.boardingTapscript.exit(),
+        tapTree: wallet.boardingTapscript.encode(),
+    };
+}

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}`);
             }
         }