@arkade-os/sdk 0.3.0-alpha.0 → 0.3.0-alpha.2

package/dist/esm/providers/indexer.js

@@ -1,4 +1,5 @@
 import { isFetchTimeoutError } from './ark.js';
+import { eventSourceIterator } from './utils.js';
 export var IndexerTxType;
 (function (IndexerTxType) {
     IndexerTxType[IndexerTxType["INDEXER_TX_TYPE_UNSPECIFIED"] = 0] = "INDEXER_TX_TYPE_UNSPECIFIED";
@@ -27,7 +28,7 @@ export class RestIndexerProvider {
         this.serverUrl = serverUrl;
     }
     async getVtxoTree(batchOutpoint, opts) {
-        let url = `${this.serverUrl}/v1/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/tree`;
+        let url = `${this.serverUrl}/v1/indexer/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/tree`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -55,7 +56,7 @@ export class RestIndexerProvider {
         return data;
     }
     async getVtxoTreeLeaves(batchOutpoint, opts) {
-        let url = `${this.serverUrl}/v1/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/tree/leaves`;
+        let url = `${this.serverUrl}/v1/indexer/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/tree/leaves`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -77,7 +78,7 @@ export class RestIndexerProvider {
         return data;
     }
     async getBatchSweepTransactions(batchOutpoint) {
-        const url = `${this.serverUrl}/v1/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/sweepTxs`;
+        const url = `${this.serverUrl}/v1/indexer/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/sweepTxs`;
         const res = await fetch(url);
         if (!res.ok) {
             throw new Error(`Failed to fetch batch sweep transactions: ${res.statusText}`);
@@ -89,7 +90,7 @@ export class RestIndexerProvider {
         return data;
     }
     async getCommitmentTx(txid) {
-        const url = `${this.serverUrl}/v1/commitmentTx/${txid}`;
+        const url = `${this.serverUrl}/v1/indexer/commitmentTx/${txid}`;
         const res = await fetch(url);
         if (!res.ok) {
             throw new Error(`Failed to fetch commitment tx: ${res.statusText}`);
@@ -101,7 +102,7 @@ export class RestIndexerProvider {
         return data;
     }
     async getCommitmentTxConnectors(txid, opts) {
-        let url = `${this.serverUrl}/v1/commitmentTx/${txid}/connectors`;
+        let url = `${this.serverUrl}/v1/indexer/commitmentTx/${txid}/connectors`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -129,7 +130,7 @@ export class RestIndexerProvider {
         return data;
     }
     async getCommitmentTxForfeitTxs(txid, opts) {
-        let url = `${this.serverUrl}/v1/commitmentTx/${txid}/forfeitTxs`;
+        let url = `${this.serverUrl}/v1/indexer/commitmentTx/${txid}/forfeitTxs`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -151,47 +152,41 @@ export class RestIndexerProvider {
         return data;
     }
     async *getSubscription(subscriptionId, abortSignal) {
-        const url = `${this.serverUrl}/v1/script/subscription/${subscriptionId}`;
-        while (!abortSignal.aborted) {
+        const url = `${this.serverUrl}/v1/indexer/script/subscription/${subscriptionId}`;
+        while (!abortSignal?.aborted) {
             try {
-                const res = await fetch(url, {
-                    headers: {
-                        Accept: "application/json",
-                    },
-                });
-                if (!res.ok) {
-                    throw new Error(`Unexpected status ${res.status} when subscribing to address updates`);
-                }
-                if (!res.body) {
-                    throw new Error("Response body is null");
-                }
-                const reader = res.body.getReader();
-                const decoder = new TextDecoder();
-                let buffer = "";
-                while (!abortSignal.aborted) {
-                    const { done, value } = await reader.read();
-                    if (done) {
-                        break;
-                    }
-                    buffer += decoder.decode(value, { stream: true });
-                    const lines = buffer.split("\n");
-                    for (let i = 0; i < lines.length - 1; i++) {
-                        const line = lines[i].trim();
-                        if (!line)
-                            continue;
-                        const data = JSON.parse(line);
-                        if ("result" in data) {
-                            yield {
-                                txid: data.result.txid,
-                                scripts: data.result.scripts || [],
-                                newVtxos: (data.result.newVtxos || []).map(convertVtxo),
-                                spentVtxos: (data.result.spentVtxos || []).map(convertVtxo),
-                                tx: data.result.tx,
-                                checkpointTxs: data.result.checkpointTxs,
-                            };
+                const eventSource = new EventSource(url);
+                // Set up abort handling
+                const abortHandler = () => {
+                    eventSource.close();
+                };
+                abortSignal?.addEventListener("abort", abortHandler);
+                try {
+                    for await (const event of eventSourceIterator(eventSource)) {
+                        if (abortSignal?.aborted)
+                            break;
+                        try {
+                            const data = JSON.parse(event.data);
+                            if (data.event) {
+                                yield {
+                                    txid: data.event.txid,
+                                    scripts: data.event.scripts || [],
+                                    newVtxos: (data.event.newVtxos || []).map(convertVtxo),
+                                    spentVtxos: (data.event.spentVtxos || []).map(convertVtxo),
+                                    tx: data.event.tx,
+                                    checkpointTxs: data.event.checkpointTxs,
+                                };
+                            }
+                        }
+                        catch (err) {
+                            console.error("Failed to parse subscription event:", err);
+                            throw err;
                         }
                     }
-                    buffer = lines[lines.length - 1];
+                }
+                finally {
+                    abortSignal?.removeEventListener("abort", abortHandler);
+                    eventSource.close();
                 }
             }
             catch (error) {
@@ -199,7 +194,6 @@ export class RestIndexerProvider {
                     break;
                 }
                 // ignore timeout errors, they're expected when the server is not sending anything for 5 min
-                // these timeouts are set by builtin fetch function
                 if (isFetchTimeoutError(error)) {
                     console.debug("Timeout error ignored");
                     continue;
@@ -210,7 +204,7 @@ export class RestIndexerProvider {
         }
     }
     async getVirtualTxs(txids, opts) {
-        let url = `${this.serverUrl}/v1/virtualTx/${txids.join(",")}`;
+        let url = `${this.serverUrl}/v1/indexer/virtualTx/${txids.join(",")}`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -232,7 +226,7 @@ export class RestIndexerProvider {
         return data;
     }
     async getVtxoChain(vtxoOutpoint, opts) {
-        let url = `${this.serverUrl}/v1/vtxo/${vtxoOutpoint.txid}/${vtxoOutpoint.vout}/chain`;
+        let url = `${this.serverUrl}/v1/indexer/vtxo/${vtxoOutpoint.txid}/${vtxoOutpoint.vout}/chain`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -261,7 +255,7 @@ export class RestIndexerProvider {
         if (!opts?.scripts && !opts?.outpoints) {
             throw new Error("Either scripts or outpoints must be provided");
         }
-        let url = `${this.serverUrl}/v1/vtxos`;
+        let url = `${this.serverUrl}/v1/indexer/vtxos`;
         const params = new URLSearchParams();
         // Handle scripts with multi collection format
         if (opts?.scripts && opts.scripts.length > 0) {
@@ -304,7 +298,7 @@ export class RestIndexerProvider {
         };
     }
     async subscribeForScripts(scripts, subscriptionId) {
-        const url = `${this.serverUrl}/v1/script/subscribe`;
+        const url = `${this.serverUrl}/v1/indexer/script/subscribe`;
         const res = await fetch(url, {
             headers: {
                 "Content-Type": "application/json",
@@ -322,7 +316,7 @@ export class RestIndexerProvider {
         return data.subscriptionId;
     }
     async unsubscribeForScripts(subscriptionId, scripts) {
-        const url = `${this.serverUrl}/v1/script/unsubscribe`;
+        const url = `${this.serverUrl}/v1/indexer/script/unsubscribe`;
         const res = await fetch(url, {
             headers: {
                 "Content-Type": "application/json",
@@ -438,7 +432,7 @@ var Response;
         return (typeof data === "object" &&
             isOutpoint(data.outpoint) &&
             typeof data.createdAt === "string" &&
-            typeof data.expiresAt === "string" &&
+            (data.expiresAt === null || typeof data.expiresAt === "string") &&
             typeof data.amount === "string" &&
             typeof data.script === "string" &&
             typeof data.isPreconfirmed === "boolean" &&

package/dist/esm/providers/utils.js

@@ -0,0 +1,57 @@
+export async function* eventSourceIterator(eventSource) {
+    const messageQueue = [];
+    const errorQueue = [];
+    let messageResolve = null;
+    let errorResolve = null;
+    const messageHandler = (event) => {
+        if (messageResolve) {
+            messageResolve(event);
+            messageResolve = null;
+        }
+        else {
+            messageQueue.push(event);
+        }
+    };
+    const errorHandler = () => {
+        const error = new Error("EventSource error");
+        if (errorResolve) {
+            errorResolve(error);
+            errorResolve = null;
+        }
+        else {
+            errorQueue.push(error);
+        }
+    };
+    eventSource.addEventListener("message", messageHandler);
+    eventSource.addEventListener("error", errorHandler);
+    try {
+        while (true) {
+            // if we have queued messages, yield the first one, remove it from the queue
+            if (messageQueue.length > 0) {
+                yield messageQueue.shift();
+                continue;
+            }
+            // if we have queued errors, throw the first one, remove it from the queue
+            if (errorQueue.length > 0) {
+                const error = errorQueue.shift();
+                throw error;
+            }
+            // wait for the next message or error
+            const result = await new Promise((resolve, reject) => {
+                messageResolve = resolve;
+                errorResolve = reject;
+            }).finally(() => {
+                messageResolve = null;
+                errorResolve = null;
+            });
+            if (result) {
+                yield result;
+            }
+        }
+    }
+    finally {
+        // clean up
+        eventSource.removeEventListener("message", messageHandler);
+        eventSource.removeEventListener("error", errorHandler);
+    }
+}

package/dist/esm/repositories/walletRepository.js

@@ -1,3 +1,32 @@
+import { hex } from "@scure/base";
+import { TaprootControlBlock } from "@scure/btc-signer";
+// Utility functions for (de)serializing complex structures
+const toHex = (b) => (b ? hex.encode(b) : undefined);
+const fromHex = (h) => h ? hex.decode(h) : undefined;
+const serializeTapLeaf = ([cb, s]) => ({
+    cb: TaprootControlBlock.encode(cb) &&
+        hex.encode(TaprootControlBlock.encode(cb)),
+    s: hex.encode(s),
+});
+const serializeVtxo = (v) => ({
+    ...v,
+    tapTree: toHex(v.tapTree),
+    forfeitTapLeafScript: serializeTapLeaf(v.forfeitTapLeafScript),
+    intentTapLeafScript: serializeTapLeaf(v.intentTapLeafScript),
+    extraWitness: v.extraWitness?.map((w) => toHex(w)),
+});
+const deserializeTapLeaf = (t) => {
+    const cb = TaprootControlBlock.decode(fromHex(t.cb));
+    const s = fromHex(t.s);
+    return [cb, s];
+};
+const deserializeVtxo = (o) => ({
+    ...o,
+    tapTree: fromHex(o.tapTree),
+    forfeitTapLeafScript: deserializeTapLeaf(o.forfeitTapLeafScript),
+    intentTapLeafScript: deserializeTapLeaf(o.intentTapLeafScript),
+    extraWitness: o.extraWitness?.map((w) => fromHex(w)),
+});
 export class WalletRepositoryImpl {
     constructor(storage) {
         this.storage = storage;
@@ -19,7 +48,8 @@ export class WalletRepositoryImpl {
             return [];
         }
         try {
-            const vtxos = JSON.parse(stored);
+            const parsed = JSON.parse(stored);
+            const vtxos = parsed.map(deserializeVtxo);
             this.cache.vtxos.set(address, vtxos);
             return vtxos.slice();
         }
@@ -39,7 +69,7 @@ export class WalletRepositoryImpl {
             vtxos.push(vtxo);
         }
         this.cache.vtxos.set(address, vtxos);
-        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(vtxos));
+        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(vtxos.map(serializeVtxo)));
     }
     async saveVtxos(address, vtxos) {
         const storedVtxos = await this.getVtxos(address);
@@ -53,14 +83,14 @@ export class WalletRepositoryImpl {
             }
         }
         this.cache.vtxos.set(address, storedVtxos);
-        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(storedVtxos));
+        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(storedVtxos.map(serializeVtxo)));
     }
     async removeVtxo(address, vtxoId) {
         const vtxos = await this.getVtxos(address);
         const [txid, vout] = vtxoId.split(":");
         const filtered = vtxos.filter((v) => !(v.txid === txid && v.vout === parseInt(vout)));
         this.cache.vtxos.set(address, filtered);
-        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(filtered));
+        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(filtered.map(serializeVtxo)));
     }
     async clearVtxos(address) {
         this.cache.vtxos.set(address, []);

package/dist/esm/script/address.js

@@ -1,5 +1,5 @@
 import { bech32m } from "@scure/base";
-import { Script } from "@scure/btc-signer";
+import { Script } from "@scure/btc-signer/script.js";
 /**
  * ArkAddress allows to create and decode bech32m encoded ark address.
  * An ark address is composed of:

package/dist/esm/script/base.js

@@ -1,7 +1,7 @@
-import { Address, p2tr, TAP_LEAF_VERSION, taprootListToTree, } from "@scure/btc-signer/payment";
-import { TAPROOT_UNSPENDABLE_KEY, } from "@scure/btc-signer/utils";
+import { Address, p2tr, TAP_LEAF_VERSION, taprootListToTree, } from "@scure/btc-signer/payment.js";
+import { TAPROOT_UNSPENDABLE_KEY, } from "@scure/btc-signer/utils.js";
 import { ArkAddress } from './address.js';
-import { Script } from "@scure/btc-signer";
+import { Script } from "@scure/btc-signer/script.js";
 import { hex } from "@scure/base";
 import { ConditionCSVMultisigTapscript, CSVMultisigTapscript, } from './tapscript.js';
 export function scriptFromTapLeafScript(leaf) {

package/dist/esm/script/tapscript.js

@@ -1,6 +1,6 @@
 import * as bip68 from "bip68";
-import { Script, ScriptNum } from "@scure/btc-signer/script";
-import { p2tr_ms } from "@scure/btc-signer/payment";
+import { Script, ScriptNum } from "@scure/btc-signer/script.js";
+import { p2tr_ms } from "@scure/btc-signer/payment.js";
 import { hex } from "@scure/base";
 const MinimalScriptNum = ScriptNum(undefined, true);
 export var TapscriptType;
@@ -260,7 +260,7 @@ export var CSVMultisigTapscript;
             throw new Error(`Invalid script: too short (expected at least 3)`);
         }
         const sequence = asm[0];
-        if (typeof sequence === "string" || typeof sequence === "number") {
+        if (typeof sequence === "string") {
             throw new Error("Invalid script: expected sequence number");
         }
         if (asm[1] !== "CHECKSEQUENCEVERIFY" || asm[2] !== "DROP") {
@@ -274,7 +274,13 @@ export var CSVMultisigTapscript;
         catch (error) {
             throw new Error(`Invalid multisig script: ${error instanceof Error ? error.message : String(error)}`);
         }
-        const sequenceNum = Number(MinimalScriptNum.decode(sequence));
+        let sequenceNum;
+        if (typeof sequence === "number") {
+            sequenceNum = sequence;
+        }
+        else {
+            sequenceNum = Number(MinimalScriptNum.decode(sequence));
+        }
         const decodedTimelock = bip68.decode(sequenceNum);
         const timelock = decodedTimelock.blocks !== undefined
             ? { type: "blocks", value: BigInt(decodedTimelock.blocks) }

package/dist/esm/script/vhtlc.js

@@ -1,4 +1,4 @@
-import { Script } from "@scure/btc-signer";
+import { Script } from "@scure/btc-signer/script.js";
 import { CLTVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CSVMultisigTapscript, MultisigTapscript, } from './tapscript.js';
 import { hex } from "@scure/base";
 import { VtxoScript } from './base.js';

package/dist/esm/tree/signingSession.js

@@ -1,8 +1,9 @@
 import * as musig2 from '../musig2/index.js';
-import { Script, SigHash } from "@scure/btc-signer";
+import { Script } from "@scure/btc-signer/script.js";
+import { SigHash } from "@scure/btc-signer/transaction.js";
 import { hex } from "@scure/base";
 import { schnorr, secp256k1 } from "@noble/curves/secp256k1.js";
-import { randomPrivateKeyBytes, sha256x2 } from "@scure/btc-signer/utils";
+import { randomPrivateKeyBytes, sha256x2 } from "@scure/btc-signer/utils.js";
 import { CosignerPublicKey, getArkPsbtFields } from '../utils/unknownFields.js';
 export const ErrMissingVtxoGraph = new Error("missing vtxo graph");
 export const ErrMissingAggregateKey = new Error("missing aggregate key");
@@ -52,7 +53,7 @@ export class TreeSignerSession {
         if (!this.myNonces)
             throw new Error("nonces not generated");
         const sigs = new Map();
-        for (const g of this.graph) {
+        for (const g of this.graph.iterator()) {
             const sig = this.signPartial(g);
             sigs.set(g.txid, sig);
         }
@@ -63,7 +64,7 @@ export class TreeSignerSession {
             throw ErrMissingVtxoGraph;
         const myNonces = new Map();
         const publicKey = secp256k1.getPublicKey(this.secretKey);
-        for (const g of this.graph) {
+        for (const g of this.graph.iterator()) {
             const nonces = musig2.generateNonces(publicKey);
             myNonces.set(g.txid, nonces);
         }
@@ -105,7 +106,7 @@ TreeSignerSession.NOT_INITIALIZED = new Error("session not initialized, call ini
 // Helper function to validate tree signatures
 export async function validateTreeSigs(finalAggregatedKey, sharedOutputAmount, vtxoTree) {
     // Iterate through each level of the tree
-    for (const g of vtxoTree) {
+    for (const g of vtxoTree.iterator()) {
         // Parse the transaction
         const input = g.root.getInput(0);
         // Check if input has signature

package/dist/esm/tree/txTree.js

@@ -1,7 +1,7 @@
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer/transaction.js";
 import { base64 } from "@scure/base";
 import { hex } from "@scure/base";
-import { sha256x2 } from "@scure/btc-signer/utils";
+import { sha256x2 } from "@scure/btc-signer/utils.js";
 /**
  * TxTree is a graph of bitcoin transactions.
  * It is used to represent batch tree created during settlement session
@@ -154,11 +154,11 @@ export class TxTree {
         }
         throw new Error(`tx not found: ${txid}`);
     }
-    *[Symbol.iterator]() {
-        yield this;
+    *iterator() {
         for (const child of this.children.values()) {
-            yield* child;
+            yield* child.iterator();
         }
+        yield this;
     }
 }
 // Helper function to check if a chunk has a specific child

package/dist/esm/tree/validation.js

@@ -1,7 +1,7 @@
 import { hex } from "@scure/base";
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer/transaction.js";
 import { base64 } from "@scure/base";
-import { sha256x2 } from "@scure/btc-signer/utils";
+import { sha256x2 } from "@scure/btc-signer/utils.js";
 import { aggregateKeys } from '../musig2/index.js';
 import { CosignerPublicKey, getArkPsbtFields } from '../utils/unknownFields.js';
 export const ErrInvalidSettlementTx = (tx) => new Error(`invalid settlement transaction: ${tx}`);
@@ -75,7 +75,7 @@ export function validateVtxoTxGraph(graph, roundTransaction, sweepTapTreeRoot) {
     // validate the graph structure
     graph.validate();
     // iterates over all the nodes of the graph to verify that cosigners public keys are corresponding to the parent output
-    for (const g of graph) {
+    for (const g of graph.iterator()) {
         for (const [childIndex, child] of g.children) {
             const parentOutput = g.root.getOutput(childIndex);
             if (!parentOutput?.script) {

package/dist/esm/utils/arkTransaction.js

@@ -1,9 +1,9 @@
-import { DEFAULT_SEQUENCE, Transaction } from "@scure/btc-signer";
+import { DEFAULT_SEQUENCE, Transaction, } from "@scure/btc-signer/transaction.js";
 import { CLTVMultisigTapscript, decodeTapscript } from '../script/tapscript.js';
 import { scriptFromTapLeafScript, VtxoScript, } from '../script/base.js';
 import { P2A } from './anchor.js';
 import { hex } from "@scure/base";
-import { sha256x2 } from "@scure/btc-signer/utils";
+import { sha256x2 } from "@scure/btc-signer/utils.js";
 import { setArkPsbtField, VtxoTaprootTree } from './unknownFields.js';
 /**
  * Builds an offchain transaction with checkpoint transactions.

package/dist/esm/utils/unknownFields.js

@@ -1,5 +1,5 @@
 import * as bip68 from "bip68";
-import { RawWitness, ScriptNum } from "@scure/btc-signer";
+import { RawWitness, ScriptNum } from "@scure/btc-signer/script.js";
 import { hex } from "@scure/base";
 /**
  * ArkPsbtFieldKey is the key values for ark psbt fields.

package/dist/esm/wallet/onchain.js

@@ -1,7 +1,7 @@
-import { p2tr } from "@scure/btc-signer/payment";
+import { p2tr } from "@scure/btc-signer/payment.js";
 import { getNetwork } from '../networks.js';
 import { ESPLORA_URL, EsploraProvider, } from '../providers/onchain.js';
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer/transaction.js";
 import { findP2AOutput, P2A } from '../utils/anchor.js';
 import { TxWeightEstimator } from '../utils/txSizeEstimator.js';
 /**

package/dist/esm/wallet/unroll.js

@@ -1,8 +1,8 @@
-import { SigHash, Transaction } from "@scure/btc-signer";
+import { SigHash, Transaction } from "@scure/btc-signer/transaction.js";
 import { ChainTxType } from '../providers/indexer.js';
 import { base64, hex } from "@scure/base";
 import { VtxoScript } from '../script/base.js';
-import { TaprootControlBlock, } from "@scure/btc-signer/psbt";
+import { TaprootControlBlock, } from "@scure/btc-signer/psbt.js";
 import { TxWeightEstimator } from '../utils/txSizeEstimator.js';
 import { Wallet } from './wallet.js';
 export var Unroll;

package/dist/esm/wallet/wallet.js

@@ -1,8 +1,8 @@
 import { base64, hex } from "@scure/base";
 import * as bip68 from "bip68";
-import { Address, OutScript, tapLeafHash } from "@scure/btc-signer/payment";
-import { SigHash, Transaction } from "@scure/btc-signer";
-import { TaprootControlBlock, } from "@scure/btc-signer/psbt";
+import { Address, OutScript, tapLeafHash } from "@scure/btc-signer/payment.js";
+import { SigHash, Transaction } from "@scure/btc-signer/transaction.js";
+import { TaprootControlBlock, } from "@scure/btc-signer/psbt.js";
 import { vtxosToTxs } from '../utils/transactionHistory.js';
 import { ArkAddress } from '../script/address.js';
 import { DefaultVtxo } from '../script/default.js';
@@ -12,7 +12,7 @@ import { SettlementEventType, RestArkProvider, } from '../providers/ark.js';
 import { buildForfeitTx } from '../forfeit.js';
 import { validateConnectorsTxGraph, validateVtxoTxGraph, } from '../tree/validation.js';
 import { isRecoverable, isSpendable, isSubdust, TxType, } from './index.js';
-import { sha256, sha256x2 } from "@scure/btc-signer/utils";
+import { sha256, sha256x2 } from "@scure/btc-signer/utils.js";
 import { VtxoScript } from '../script/base.js';
 import { CSVMultisigTapscript } from '../script/tapscript.js';
 import { buildOffchainTx } from '../utils/arkTransaction.js';
@@ -98,10 +98,8 @@ export class Wallet {
         // Save tapscripts
         const offchainTapscript = bareVtxoTapscript;
         // the serverUnrollScript is the one used to create output scripts of the checkpoint transactions
-        const serverUnrollScript = CSVMultisigTapscript.encode({
-            timelock: exitTimelock,
-            pubkeys: [serverPubKey],
-        });
+        const rawCheckpointExitClosure = hex.decode(info.checkpointExitClosure);
+        const serverUnrollScript = CSVMultisigTapscript.decode(rawCheckpointExitClosure);
         // parse the server forfeit address
         // server is expecting funds to be sent to this address
         const forfeitAddress = Address(network).decode(info.forfeitAddress);
@@ -167,8 +165,9 @@ export class Wallet {
     }
     async getVtxos(filter) {
         const address = await this.getAddress();
-        // Try to get from cache first
-        const cachedVtxos = await this.walletRepository.getVtxos(address);
+        // Try to get from cache first first (optional fast path)
+        // const cachedVtxos = await this.walletRepository.getVtxos(address);
+        // if (cachedVtxos.length) return cachedVtxos;
         // For now, always fetch fresh data from provider and update cache
         // In future, we can add cache invalidation logic based on timestamps
         const spendableVtxos = await this.getVirtualCoins(filter);

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

@@ -1,5 +1,5 @@
 import { TapLeafScript, VtxoScript } from "../script/base";
-import { Bytes } from "@scure/btc-signer/utils";
+import { Bytes } from "@scure/btc-signer/utils.js";
 import { ExtendedCoin, Status } from "../wallet";
 /**
  * ArkNotes are special virtual coins in the Ark protocol that can be created

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

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

package/dist/types/forfeit.d.ts

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

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

@@ -1,9 +1,10 @@
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer/transaction.js";
 import { SignerSession } from "../tree/signingSession";
 export interface Identity {
-    sign(tx: Transaction, inputIndexes?: number[]): Promise<Transaction>;
-    xOnlyPublicKey(): Promise<Uint8Array>;
     signerSession(): SignerSession;
+    xOnlyPublicKey(): Promise<Uint8Array>;
+    compressedPublicKey(): Promise<Uint8Array>;
     signMessage(message: string): Promise<Uint8Array>;
+    sign(tx: Transaction, inputIndexes?: number[]): Promise<Transaction>;
 }
 export * from "./singleKey";

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

@@ -1,4 +1,4 @@
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer/transaction.js";
 import { Identity } from ".";
 import { SignerSession } from "../tree/signingSession";
 /**
@@ -32,6 +32,7 @@ export declare class SingleKey implements Identity {
      */
     toHex(): string;
     sign(tx: Transaction, inputIndexes?: number[]): Promise<Transaction>;
+    compressedPublicKey(): Promise<Uint8Array>;
     xOnlyPublicKey(): Promise<Uint8Array>;
     signerSession(): SignerSession;
     signMessage(message: string): Promise<Uint8Array>;

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer/transaction.js";
 import { SingleKey } from "./identity/singleKey";
 import { Identity } from "./identity";
 import { ArkAddress } from "./script/address";

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

@@ -84,6 +84,7 @@ export interface ArkInfo {
     vtxoMinAmount: bigint;
     vtxoMaxAmount: bigint;
     boardingExitDelay: bigint;
+    checkpointExitClosure: string;
 }
 export interface Intent {
     signature: string;

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

@@ -0,0 +1 @@
+export declare function eventSourceIterator(eventSource: EventSource): AsyncGenerator<MessageEvent, void, unknown>;

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

@@ -1,4 +1,4 @@
-import { Bytes } from "@scure/btc-signer/utils";
+import { Bytes } from "@scure/btc-signer/utils.js";
 /**
  * ArkAddress allows to create and decode bech32m encoded ark address.
  * An ark address is composed of:

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

@@ -1,4 +1,4 @@
-import { BTC_NETWORK, Bytes } from "@scure/btc-signer/utils";
+import { BTC_NETWORK, Bytes } from "@scure/btc-signer/utils.js";
 import { ArkAddress } from "./address";
 import { ConditionCSVMultisigTapscript, CSVMultisigTapscript } from "./tapscript";
 export type TapLeafScript = [