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

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(),
@@ -61,18 +76,6 @@ 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) {
@@ -98,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)) {
@@ -119,20 +169,6 @@ 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/cjs/script/base.js

@@ -1,15 +1,14 @@
 "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");
 const psbt_js_1 = require("@scure/btc-signer/psbt.js");
-const utils_js_1 = require("@scure/btc-signer/utils.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
 }
@@ -23,14 +22,23 @@ 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 })));
-        const payment = (0, btc_signer_1.p2tr)(utils_js_1.TAPROOT_UNSPENDABLE_KEY, tapTree, undefined, true);
+        // 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) {
             throw new Error("invalid scripts");
@@ -39,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/script/tapscript.js

@@ -36,10 +36,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.TapscriptType = void 0;
 exports.decodeTapscript = decodeTapscript;
 const bip68 = __importStar(require("bip68"));
-const script_js_1 = require("@scure/btc-signer/script.js");
-const payment_js_1 = require("@scure/btc-signer/payment.js");
+const btc_signer_1 = require("@scure/btc-signer");
 const base_1 = require("@scure/base");
-const MinimalScriptNum = (0, script_js_1.ScriptNum)(undefined, true);
+const MinimalScriptNum = (0, btc_signer_1.ScriptNum)(undefined, true);
 var TapscriptType;
 (function (TapscriptType) {
     TapscriptType["Multisig"] = "multisig";
@@ -109,7 +108,7 @@ var MultisigTapscript;
             return {
                 type: TapscriptType.Multisig,
                 params,
-                script: (0, payment_js_1.p2tr_ms)(params.pubkeys.length, params.pubkeys).script,
+                script: (0, btc_signer_1.p2tr_ms)(params.pubkeys.length, params.pubkeys).script,
             };
         }
         const asm = [];
@@ -126,7 +125,7 @@ var MultisigTapscript;
         return {
             type: TapscriptType.Multisig,
             params,
-            script: script_js_1.Script.encode(asm),
+            script: btc_signer_1.Script.encode(asm),
         };
     }
     MultisigTapscript.encode = encode;
@@ -151,7 +150,7 @@ var MultisigTapscript;
     MultisigTapscript.decode = decode;
     // <pubkey> CHECKSIG <pubkey> CHECKSIGADD <len_keys> NUMEQUAL
     function decodeChecksigAdd(script) {
-        const asm = script_js_1.Script.decode(script);
+        const asm = btc_signer_1.Script.decode(script);
         const pubkeys = [];
         let foundNumEqual = false;
         // Parse through ASM operations
@@ -201,7 +200,7 @@ var MultisigTapscript;
     }
     // <pubkey> CHECKSIGVERIFY <pubkey> CHECKSIG
     function decodeChecksig(script) {
-        const asm = script_js_1.Script.decode(script);
+        const asm = btc_signer_1.Script.decode(script);
         const pubkeys = [];
         // Parse through ASM operations
         for (let i = 0; i < asm.length; i++) {
@@ -278,7 +277,7 @@ var CSVMultisigTapscript;
         ];
         const multisigScript = MultisigTapscript.encode(params);
         const script = new Uint8Array([
-            ...script_js_1.Script.encode(asm),
+            ...btc_signer_1.Script.encode(asm),
             ...multisigScript.script,
         ]);
         return {
@@ -292,7 +291,7 @@ var CSVMultisigTapscript;
         if (script.length === 0) {
             throw new Error("Failed to decode: script is empty");
         }
-        const asm = script_js_1.Script.decode(script);
+        const asm = btc_signer_1.Script.decode(script);
         if (asm.length < 3) {
             throw new Error(`Invalid script: too short (expected at least 3)`);
         }
@@ -303,7 +302,7 @@ var CSVMultisigTapscript;
         if (asm[1] !== "CHECKSEQUENCEVERIFY" || asm[2] !== "DROP") {
             throw new Error("Invalid script: expected CHECKSEQUENCEVERIFY DROP");
         }
-        const multisigScript = new Uint8Array(script_js_1.Script.encode(asm.slice(3)));
+        const multisigScript = new Uint8Array(btc_signer_1.Script.encode(asm.slice(3)));
         let multisig;
         try {
             multisig = MultisigTapscript.decode(multisigScript);
@@ -361,7 +360,7 @@ var ConditionCSVMultisigTapscript;
     function encode(params) {
         const script = new Uint8Array([
             ...params.conditionScript,
-            ...script_js_1.Script.encode(["VERIFY"]),
+            ...btc_signer_1.Script.encode(["VERIFY"]),
             ...CSVMultisigTapscript.encode(params).script,
         ]);
         return {
@@ -375,7 +374,7 @@ var ConditionCSVMultisigTapscript;
         if (script.length === 0) {
             throw new Error("Failed to decode: script is empty");
         }
-        const asm = script_js_1.Script.decode(script);
+        const asm = btc_signer_1.Script.decode(script);
         if (asm.length < 1) {
             throw new Error(`Invalid script: too short (expected at least 1)`);
         }
@@ -388,8 +387,8 @@ var ConditionCSVMultisigTapscript;
         if (verifyIndex === -1) {
             throw new Error("Invalid script: missing VERIFY operation");
         }
-        const conditionScript = new Uint8Array(script_js_1.Script.encode(asm.slice(0, verifyIndex)));
-        const csvMultisigScript = new Uint8Array(script_js_1.Script.encode(asm.slice(verifyIndex + 1)));
+        const conditionScript = new Uint8Array(btc_signer_1.Script.encode(asm.slice(0, verifyIndex)));
+        const csvMultisigScript = new Uint8Array(btc_signer_1.Script.encode(asm.slice(verifyIndex + 1)));
         let csvMultisig;
         try {
             csvMultisig = CSVMultisigTapscript.decode(csvMultisigScript);
@@ -436,7 +435,7 @@ var ConditionMultisigTapscript;
     function encode(params) {
         const script = new Uint8Array([
             ...params.conditionScript,
-            ...script_js_1.Script.encode(["VERIFY"]),
+            ...btc_signer_1.Script.encode(["VERIFY"]),
             ...MultisigTapscript.encode(params).script,
         ]);
         return {
@@ -450,7 +449,7 @@ var ConditionMultisigTapscript;
         if (script.length === 0) {
             throw new Error("Failed to decode: script is empty");
         }
-        const asm = script_js_1.Script.decode(script);
+        const asm = btc_signer_1.Script.decode(script);
         if (asm.length < 1) {
             throw new Error(`Invalid script: too short (expected at least 1)`);
         }
@@ -463,8 +462,8 @@ var ConditionMultisigTapscript;
         if (verifyIndex === -1) {
             throw new Error("Invalid script: missing VERIFY operation");
         }
-        const conditionScript = new Uint8Array(script_js_1.Script.encode(asm.slice(0, verifyIndex)));
-        const multisigScript = new Uint8Array(script_js_1.Script.encode(asm.slice(verifyIndex + 1)));
+        const conditionScript = new Uint8Array(btc_signer_1.Script.encode(asm.slice(0, verifyIndex)));
+        const multisigScript = new Uint8Array(btc_signer_1.Script.encode(asm.slice(verifyIndex + 1)));
         let multisig;
         try {
             multisig = MultisigTapscript.decode(multisigScript);
@@ -515,7 +514,7 @@ var CLTVMultisigTapscript;
             "CHECKLOCKTIMEVERIFY",
             "DROP",
         ];
-        const timelockedScript = script_js_1.Script.encode(asm);
+        const timelockedScript = btc_signer_1.Script.encode(asm);
         const script = new Uint8Array([
             ...timelockedScript,
             ...MultisigTapscript.encode(params).script,
@@ -531,7 +530,7 @@ var CLTVMultisigTapscript;
         if (script.length === 0) {
             throw new Error("Failed to decode: script is empty");
         }
-        const asm = script_js_1.Script.decode(script);
+        const asm = btc_signer_1.Script.decode(script);
         if (asm.length < 3) {
             throw new Error(`Invalid script: too short (expected at least 3)`);
         }
@@ -542,7 +541,7 @@ var CLTVMultisigTapscript;
         if (asm[1] !== "CHECKLOCKTIMEVERIFY" || asm[2] !== "DROP") {
             throw new Error("Invalid script: expected CHECKLOCKTIMEVERIFY DROP");
         }
-        const multisigScript = new Uint8Array(script_js_1.Script.encode(asm.slice(3)));
+        const multisigScript = new Uint8Array(btc_signer_1.Script.encode(asm.slice(3)));
         let multisig;
         try {
             multisig = MultisigTapscript.decode(multisigScript);

package/dist/cjs/script/vhtlc.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VHTLC = void 0;
-const script_js_1 = require("@scure/btc-signer/script.js");
+const btc_signer_1 = require("@scure/btc-signer");
 const tapscript_1 = require("./tapscript");
 const base_1 = require("@scure/base");
 const base_2 = require("./base");
@@ -158,5 +158,5 @@ var VHTLC;
     }
 })(VHTLC || (exports.VHTLC = VHTLC = {}));
 function preimageConditionScript(preimageHash) {
-    return script_js_1.Script.encode(["HASH160", preimageHash, "EQUAL"]);
+    return btc_signer_1.Script.encode(["HASH160", preimageHash, "EQUAL"]);
 }

package/dist/cjs/tree/signingSession.js

@@ -57,15 +57,15 @@ class TreeSignerSession {
         const secretKey = (0, utils_js_1.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_js_1.secp256k1.getPublicKey(this.secretKey);
     }
-    getNonces() {
+    async getNonces() {
         if (!this.graph)
             throw exports.ErrMissingVtxoGraph;
         if (!this.myNonces) {
@@ -77,12 +77,46 @@ 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 exports.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(base_1.hex.encode(myPublicKey.subarray(1)), myNonce);
+        const tx = this.graph.find(txid);
+        if (!tx)
+            throw new Error(`missing tx for txid ${txid}`);
+        const cosigners = (0, unknownFields_1.getArkPsbtFields)(tx.root, 0, unknownFields_1.CosignerPublicKey).map((c) => base_1.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 exports.ErrMissingVtxoGraph;
         if (!this.aggregateNonces)
@@ -166,9 +200,8 @@ async function validateTreeSigs(finalAggregatedKey, sharedOutputAmount, vtxoTree
 function getPrevOutput(finalKey, graph, sharedOutputAmount, tx) {
     // generate P2TR script from musig2 final key
     const pkScript = script_js_1.Script.encode(["OP_1", finalKey.slice(1)]);
-    const txid = base_1.hex.encode((0, utils_js_1.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,
@@ -178,7 +211,7 @@ function getPrevOutput(finalKey, graph, sharedOutputAmount, tx) {
     const parentInput = tx.getInput(0);
     if (!parentInput.txid)
         throw new Error("missing parent input txid");
-    const parentTxid = base_1.hex.encode(new Uint8Array(parentInput.txid));
+    const parentTxid = base_1.hex.encode(parentInput.txid);
     const parent = graph.find(parentTxid);
     if (!parent)
         throw new Error("parent  tx not found");

package/dist/cjs/tree/txTree.js

@@ -4,7 +4,6 @@ exports.TxTree = void 0;
 const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const base_1 = require("@scure/base");
 const base_2 = require("@scure/base");
-const utils_js_1 = require("@scure/btc-signer/utils.js");
 /**
  * TxTree is a graph of bitcoin transactions.
  * It is used to represent batch tree created during settlement session
@@ -22,7 +21,7 @@ class TxTree {
         const chunksByTxid = new Map();
         for (const chunk of chunks) {
             const decodedChunk = decodeNode(chunk);
-            const txid = base_2.hex.encode((0, utils_js_1.sha256x2)(decodedChunk.tx.toBytes(true)).reverse());
+            const txid = decodedChunk.tx.id;
             chunksByTxid.set(txid, decodedChunk);
         }
         // Find the root chunks (the ones that aren't referenced as a child)
@@ -91,7 +90,7 @@ class TxTree {
             }
             child.validate();
             const childInput = child.root.getInput(0);
-            const parentTxid = base_2.hex.encode((0, utils_js_1.sha256x2)(this.root.toBytes(true)).reverse());
+            const parentTxid = this.root.id;
             // verify the input of the child is the output of the parent
             if (!childInput.txid ||
                 base_2.hex.encode(childInput.txid) !== parentTxid ||
@@ -126,7 +125,7 @@ class TxTree {
         return leaves;
     }
     get txid() {
-        return base_2.hex.encode((0, utils_js_1.sha256x2)(this.root.toBytes(true)).reverse());
+        return this.root.id;
     }
     find(txid) {
         if (txid === this.txid) {

package/dist/cjs/tree/validation.js

@@ -6,7 +6,6 @@ exports.validateVtxoTxGraph = validateVtxoTxGraph;
 const base_1 = require("@scure/base");
 const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const base_2 = require("@scure/base");
-const utils_js_1 = require("@scure/btc-signer/utils.js");
 const musig2_1 = require("../musig2");
 const unknownFields_1 = require("../utils/unknownFields");
 const ErrInvalidSettlementTx = (tx) => new Error(`invalid settlement transaction: ${tx}`);
@@ -31,7 +30,7 @@ function validateConnectorsTxGraph(settlementTxB64, connectorsGraph) {
     const settlementTx = transaction_js_1.Transaction.fromPSBT(base_2.base64.decode(settlementTxB64));
     if (settlementTx.outputsLength <= BATCH_OUTPUT_CONNECTORS_INDEX)
         throw exports.ErrInvalidSettlementTxOutputs;
-    const expectedRootTxid = base_1.hex.encode((0, utils_js_1.sha256x2)(settlementTx.toBytes(true)).reverse());
+    const expectedRootTxid = settlementTx.id;
     if (!rootInput.txid)
         throw exports.ErrWrongSettlementTxid;
     if (base_1.hex.encode(rootInput.txid) !== expectedRootTxid)
@@ -58,7 +57,7 @@ function validateVtxoTxGraph(graph, roundTransaction, sweepTapTreeRoot) {
         throw exports.ErrEmptyTree;
     }
     const rootInput = graph.root.getInput(0);
-    const commitmentTxid = base_1.hex.encode((0, utils_js_1.sha256x2)(roundTransaction.toBytes(true)).reverse());
+    const commitmentTxid = roundTransaction.id;
     if (!rootInput.txid ||
         base_1.hex.encode(rootInput.txid) !== commitmentTxid ||
         rootInput.index !== BATCH_OUTPUT_VTXO_INDEX) {