@arkade-os/sdk 0.3.0-alpha.7 → 0.3.0

package/dist/esm/providers/expoArk.js

@@ -0,0 +1,78 @@
+import { RestArkProvider, isFetchTimeoutError, } from './ark.js';
+import { getExpoFetch, sseStreamIterator } from './expoUtils.js';
+/**
+ * Expo-compatible Ark provider implementation using expo/fetch for SSE support.
+ * This provider works specifically in React Native/Expo environments where
+ * standard EventSource is not available but expo/fetch provides SSE capabilities.
+ *
+ * @example
+ * ```typescript
+ * import { ExpoArkProvider } from '@arkade-os/sdk/providers/expo';
+ *
+ * const provider = new ExpoArkProvider('https://ark.example.com');
+ * const info = await provider.getInfo();
+ * ```
+ */
+export class ExpoArkProvider extends RestArkProvider {
+    constructor(serverUrl) {
+        super(serverUrl);
+    }
+    async *getEventStream(signal, topics) {
+        const expoFetch = await getExpoFetch();
+        const url = `${this.serverUrl}/v1/batch/events`;
+        const queryParams = topics.length > 0
+            ? `?${topics.map((topic) => `topics=${encodeURIComponent(topic)}`).join("&")}`
+            : "";
+        while (!signal?.aborted) {
+            try {
+                yield* sseStreamIterator(url + queryParams, signal, expoFetch, {}, (data) => {
+                    // Handle different response structures
+                    // v8 mesh API might wrap in {result: ...} or send directly
+                    const eventData = data.result || data;
+                    // Skip heartbeat messages
+                    if (eventData.heartbeat !== undefined) {
+                        return null;
+                    }
+                    return this.parseSettlementEvent(eventData);
+                });
+            }
+            catch (error) {
+                if (error instanceof Error && error.name === "AbortError") {
+                    break;
+                }
+                // ignore timeout errors, they're expected when the server is not sending anything for 5 min
+                // these timeouts are set by expo/fetch function
+                if (isFetchTimeoutError(error)) {
+                    console.debug("Timeout error ignored");
+                    continue;
+                }
+                console.error("Event stream error:", error);
+                throw error;
+            }
+        }
+    }
+    async *getTransactionsStream(signal) {
+        const expoFetch = await getExpoFetch();
+        const url = `${this.serverUrl}/v1/txs`;
+        while (!signal?.aborted) {
+            try {
+                yield* sseStreamIterator(url, signal, expoFetch, {}, (data) => {
+                    return this.parseTransactionNotification(data.result);
+                });
+            }
+            catch (error) {
+                if (error instanceof Error && error.name === "AbortError") {
+                    break;
+                }
+                // ignore timeout errors, they're expected when the server is not sending anything for 5 min
+                // these timeouts are set by expo/fetch function
+                if (isFetchTimeoutError(error)) {
+                    console.debug("Timeout error ignored");
+                    continue;
+                }
+                console.error("Transaction stream error:", error);
+                throw error;
+            }
+        }
+    }
+}

package/dist/esm/providers/expoIndexer.js

@@ -0,0 +1,101 @@
+import { RestIndexerProvider } from './indexer.js';
+import { isFetchTimeoutError } from './ark.js';
+import { getExpoFetch, sseStreamIterator } from './expoUtils.js';
+// Helper function to convert Vtxo to VirtualCoin (same as in indexer.ts)
+function convertVtxo(vtxo) {
+    return {
+        txid: vtxo.outpoint.txid,
+        vout: vtxo.outpoint.vout,
+        value: Number(vtxo.amount),
+        status: {
+            confirmed: !vtxo.isSwept && !vtxo.isPreconfirmed,
+        },
+        virtualStatus: {
+            state: vtxo.isSwept
+                ? "swept"
+                : vtxo.isPreconfirmed
+                    ? "preconfirmed"
+                    : "settled",
+            commitmentTxIds: vtxo.commitmentTxids,
+            batchExpiry: vtxo.expiresAt
+                ? Number(vtxo.expiresAt) * 1000
+                : undefined,
+        },
+        spentBy: vtxo.spentBy ?? "",
+        settledBy: vtxo.settledBy,
+        arkTxId: vtxo.arkTxid,
+        createdAt: new Date(Number(vtxo.createdAt) * 1000),
+        isUnrolled: vtxo.isUnrolled,
+        isSpent: vtxo.isSpent,
+    };
+}
+/**
+ * Expo-compatible Indexer provider implementation using expo/fetch for streaming support.
+ * This provider works specifically in React Native/Expo environments where
+ * standard fetch streaming may not work properly but expo/fetch provides streaming capabilities.
+ *
+ * @example
+ * ```typescript
+ * import { ExpoIndexerProvider } from '@arkade-os/sdk/adapters/expo';
+ *
+ * const provider = new ExpoIndexerProvider('https://indexer.example.com');
+ * const vtxos = await provider.getVtxos({ scripts: ['script1'] });
+ * ```
+ */
+export class ExpoIndexerProvider extends RestIndexerProvider {
+    constructor(serverUrl) {
+        super(serverUrl);
+    }
+    async *getSubscription(subscriptionId, abortSignal) {
+        // Detect if we're running in React Native/Expo environment
+        const isReactNative = typeof navigator !== "undefined" &&
+            navigator.product === "ReactNative";
+        const expoFetch = await getExpoFetch().catch((error) => {
+            // In React Native/Expo, expo/fetch is required for proper streaming support
+            if (isReactNative) {
+                throw new Error("expo/fetch is unavailable in React Native environment. " +
+                    "Please ensure expo/fetch is installed and properly configured. " +
+                    "Streaming support may not work with standard fetch in React Native.");
+            }
+            throw error;
+        });
+        const url = `${this.serverUrl}/v1/indexer/script/subscription/${subscriptionId}`;
+        while (!abortSignal.aborted) {
+            try {
+                yield* sseStreamIterator(url, abortSignal, expoFetch, { "Content-Type": "application/json" }, (data) => {
+                    // Handle new v8 proto format with heartbeat or event
+                    if (data.heartbeat !== undefined) {
+                        // Skip heartbeat messages
+                        return null;
+                    }
+                    // Process event messages
+                    if (data.event) {
+                        return {
+                            txid: data.event.txid,
+                            scripts: data.event.scripts || [],
+                            newVtxos: (data.event.newVtxos || []).map(convertVtxo),
+                            spentVtxos: (data.event.spentVtxos || []).map(convertVtxo),
+                            sweptVtxos: (data.event.sweptVtxos || []).map(convertVtxo),
+                            tx: data.event.tx,
+                            checkpointTxs: data.event.checkpointTxs,
+                        };
+                    }
+                    return null;
+                });
+            }
+            catch (error) {
+                if (error instanceof Error && error.name === "AbortError") {
+                    break;
+                }
+                // ignore timeout errors, they're expected when the server is not sending anything for 5 min
+                // these timeouts are set by expo/fetch function
+                if (isFetchTimeoutError(error)) {
+                    console.debug("Timeout error ignored");
+                    continue;
+                }
+                console.error("Subscription error:", error);
+                throw error;
+            }
+        }
+    }
+}

package/dist/esm/providers/expoUtils.js

@@ -0,0 +1,87 @@
+/**
+ * Dynamically imports expo/fetch with fallback to standard fetch.
+ * @returns A fetch function suitable for SSE streaming
+ */
+export async function getExpoFetch(options) {
+    const requireExpo = options?.requireExpo ?? false;
+    try {
+        const expoFetchModule = await import("expo/fetch");
+        console.debug("Using expo/fetch for streaming");
+        return expoFetchModule.fetch;
+    }
+    catch (error) {
+        if (requireExpo) {
+            throw new Error("expo/fetch is unavailable in this environment. " +
+                "Please ensure expo/fetch is installed and properly configured.");
+        }
+        console.warn("Using standard fetch instead of expo/fetch. " +
+            "Streaming may not be fully supported in some environments.", error);
+        return fetch;
+    }
+}
+/**
+ * Generic SSE stream processor using fetch API with ReadableStream.
+ * Handles SSE format parsing, buffer management, and abort signals.
+ *
+ * @param url - The SSE endpoint URL
+ * @param abortSignal - Signal to abort the stream
+ * @param fetchFn - Fetch function to use (defaults to standard fetch)
+ * @param headers - Additional headers to send
+ * @param parseData - Function to parse and yield data from SSE events
+ */
+export async function* sseStreamIterator(url, abortSignal, fetchFn, headers, parseData) {
+    const fetchController = new AbortController();
+    const cleanup = () => fetchController.abort();
+    abortSignal?.addEventListener("abort", cleanup, { once: true });
+    try {
+        const response = await fetchFn(url, {
+            headers: {
+                Accept: "text/event-stream",
+                ...headers,
+            },
+            signal: fetchController.signal,
+        });
+        if (!response.ok) {
+            throw new Error(`Unexpected status ${response.status} when fetching SSE stream`);
+        }
+        if (!response.body) {
+            throw new Error("Response body is null");
+        }
+        const reader = response.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;
+                if (line.startsWith("data:")) {
+                    const jsonStr = line.substring(5).trim();
+                    if (!jsonStr)
+                        continue;
+                    try {
+                        const data = JSON.parse(jsonStr);
+                        const parsed = parseData(data);
+                        if (parsed !== null) {
+                            yield parsed;
+                        }
+                    }
+                    catch (parseError) {
+                        console.error("Failed to parse SSE data:", parseError);
+                        throw parseError;
+                    }
+                }
+            }
+            buffer = lines[lines.length - 1];
+        }
+    }
+    finally {
+        abortSignal?.removeEventListener("abort", cleanup);
+    }
+}

package/dist/esm/providers/indexer.js

@@ -173,6 +173,7 @@ export class RestIndexerProvider {
                                     scripts: data.event.scripts || [],
                                     newVtxos: (data.event.newVtxos || []).map(convertVtxo),
                                     spentVtxos: (data.event.spentVtxos || []).map(convertVtxo),
+                                    sweptVtxos: (data.event.sweptVtxos || []).map(convertVtxo),
                                     tx: data.event.tx,
                                     checkpointTxs: data.event.checkpointTxs,
                                 };
@@ -326,7 +327,7 @@ export class RestIndexerProvider {
         });
         if (!res.ok) {
             const errorText = await res.text();
-            throw new Error(`Failed to unsubscribe to scripts: ${errorText}`);
+            console.warn(`Failed to unsubscribe to scripts: ${errorText}`);
         }
     }
 }
@@ -354,6 +355,7 @@ function convertVtxo(vtxo) {
         arkTxId: vtxo.arkTxid,
         createdAt: new Date(Number(vtxo.createdAt) * 1000),
         isUnrolled: vtxo.isUnrolled,
+        isSpent: vtxo.isSpent,
     };
 }
 // Unexported namespace for type guards only

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(),
@@ -58,18 +73,6 @@ export class WalletRepositoryImpl {
             return [];
         }
     }
-    async saveVtxo(address, vtxo) {
-        const vtxos = await this.getVtxos(address);
-        const existing = vtxos.findIndex((v) => v.txid === vtxo.txid && v.vout === vtxo.vout);
-        if (existing !== -1) {
-            vtxos[existing] = vtxo;
-        }
-        else {
-            vtxos.push(vtxo);
-        }
-        this.cache.vtxos.set(address, vtxos.slice());
-        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(vtxos.map(serializeVtxo)));
-    }
     async saveVtxos(address, vtxos) {
         const storedVtxos = await this.getVtxos(address);
         for (const vtxo of vtxos) {
@@ -95,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)) {
@@ -116,20 +166,6 @@ export class WalletRepositoryImpl {
             return [];
         }
     }
-    async saveTransaction(address, tx) {
-        const transactions = await this.getTransactionHistory(address);
-        const existing = transactions.findIndex((t) => t.key === tx.key);
-        if (existing !== -1) {
-            transactions[existing] = tx;
-        }
-        else {
-            transactions.push(tx);
-        }
-        // Sort by createdAt descending
-        transactions.sort((a, b) => b.createdAt - a.createdAt);
-        this.cache.transactions.set(address, transactions);
-        await this.storage.setItem(`tx:${address}`, JSON.stringify(transactions));
-    }
     async saveTransactions(address, txs) {
         const storedTransactions = await this.getTransactionHistory(address);
         for (const tx of txs) {

package/dist/esm/script/base.js

@@ -1,11 +1,10 @@
-import { Script, Address, p2tr, taprootListToTree } from "@scure/btc-signer";
+import { Script, Address, p2tr, taprootListToTree, TAPROOT_UNSPENDABLE_KEY, } from "@scure/btc-signer";
 import { TAP_LEAF_VERSION } from "@scure/btc-signer/payment.js";
 import { PSBTOutput } from "@scure/btc-signer/psbt.js";
-import { TAPROOT_UNSPENDABLE_KEY, } from "@scure/btc-signer/utils.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
 }
@@ -25,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/script/tapscript.js

@@ -1,6 +1,5 @@
 import * as bip68 from "bip68";
-import { Script, ScriptNum } from "@scure/btc-signer/script.js";
-import { p2tr_ms } from "@scure/btc-signer/payment.js";
+import { Script, ScriptNum, p2tr_ms } from "@scure/btc-signer";
 import { hex } from "@scure/base";
 const MinimalScriptNum = ScriptNum(undefined, true);
 export var TapscriptType;

package/dist/esm/script/vhtlc.js

@@ -1,4 +1,4 @@
-import { Script } from "@scure/btc-signer/script.js";
+import { Script } from "@scure/btc-signer";
 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

@@ -3,7 +3,7 @@ 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.js";
+import { randomPrivateKeyBytes } 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");
@@ -20,15 +20,15 @@ export class TreeSignerSession {
         const secretKey = randomPrivateKeyBytes();
         return new TreeSignerSession(secretKey);
     }
-    init(tree, scriptRoot, rootInputAmount) {
+    async init(tree, scriptRoot, rootInputAmount) {
         this.graph = tree;
         this.scriptRoot = scriptRoot;
         this.rootSharedOutputAmount = rootInputAmount;
     }
-    getPublicKey() {
+    async getPublicKey() {
         return secp256k1.getPublicKey(this.secretKey);
     }
-    getNonces() {
+    async getNonces() {
         if (!this.graph)
             throw ErrMissingVtxoGraph;
         if (!this.myNonces) {
@@ -40,12 +40,46 @@ export class TreeSignerSession {
         }
         return publicNonces;
     }
-    setAggregatedNonces(nonces) {
-        if (this.aggregateNonces)
-            throw new Error("nonces already set");
-        this.aggregateNonces = nonces;
+    async aggregatedNonces(txid, noncesByPubkey) {
+        if (!this.graph)
+            throw ErrMissingVtxoGraph;
+        if (!this.aggregateNonces) {
+            this.aggregateNonces = new Map();
+        }
+        if (!this.myNonces) {
+            await this.getNonces(); // generate nonces if not generated yet
+        }
+        if (this.aggregateNonces.has(txid)) {
+            return {
+                hasAllNonces: this.aggregateNonces.size === this.myNonces?.size,
+            };
+        }
+        const myNonce = this.myNonces.get(txid);
+        if (!myNonce)
+            throw new Error(`missing nonce for txid ${txid}`);
+        const myPublicKey = await this.getPublicKey();
+        // set my nonce to not rely on server
+        noncesByPubkey.set(hex.encode(myPublicKey.subarray(1)), myNonce);
+        const tx = this.graph.find(txid);
+        if (!tx)
+            throw new Error(`missing tx for txid ${txid}`);
+        const cosigners = getArkPsbtFields(tx.root, 0, CosignerPublicKey).map((c) => hex.encode(c.key.subarray(1)) // xonly pubkey
+        );
+        const pubNonces = [];
+        for (const cosigner of cosigners) {
+            const nonce = noncesByPubkey.get(cosigner);
+            if (!nonce) {
+                throw new Error(`missing nonce for cosigner ${cosigner}`);
+            }
+            pubNonces.push(nonce.pubNonce);
+        }
+        const aggregateNonce = musig2.aggregateNonces(pubNonces);
+        this.aggregateNonces.set(txid, { pubNonce: aggregateNonce });
+        return {
+            hasAllNonces: this.aggregateNonces.size === this.myNonces?.size,
+        };
     }
-    sign() {
+    async sign() {
         if (!this.graph)
             throw ErrMissingVtxoGraph;
         if (!this.aggregateNonces)
@@ -128,9 +162,8 @@ export async function validateTreeSigs(finalAggregatedKey, sharedOutputAmount, v
 function getPrevOutput(finalKey, graph, sharedOutputAmount, tx) {
     // generate P2TR script from musig2 final key
     const pkScript = Script.encode(["OP_1", finalKey.slice(1)]);
-    const txid = hex.encode(sha256x2(tx.toBytes(true)).reverse());
     // if the input is the root input, return the shared output amount
-    if (txid === graph.txid) {
+    if (tx.id === graph.txid) {
         return {
             amount: sharedOutputAmount,
             script: pkScript,
@@ -140,7 +173,7 @@ function getPrevOutput(finalKey, graph, sharedOutputAmount, tx) {
     const parentInput = tx.getInput(0);
     if (!parentInput.txid)
         throw new Error("missing parent input txid");
-    const parentTxid = hex.encode(new Uint8Array(parentInput.txid));
+    const parentTxid = hex.encode(parentInput.txid);
     const parent = graph.find(parentTxid);
     if (!parent)
         throw new Error("parent  tx not found");