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

package/dist/cjs/providers/utils.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.eventSourceIterator = eventSourceIterator;
+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/cjs/repositories/walletRepository.js

@@ -1,6 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WalletRepositoryImpl = void 0;
+const base_1 = require("@scure/base");
+const btc_signer_1 = require("@scure/btc-signer");
+// Utility functions for (de)serializing complex structures
+const toHex = (b) => (b ? base_1.hex.encode(b) : undefined);
+const fromHex = (h) => h ? base_1.hex.decode(h) : undefined;
+const serializeTapLeaf = ([cb, s]) => ({
+    cb: btc_signer_1.TaprootControlBlock.encode(cb) &&
+        base_1.hex.encode(btc_signer_1.TaprootControlBlock.encode(cb)),
+    s: base_1.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 = btc_signer_1.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)),
+});
 class WalletRepositoryImpl {
     constructor(storage) {
         this.storage = storage;
@@ -22,7 +51,8 @@ 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();
         }
@@ -42,7 +72,7 @@ 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);
@@ -56,14 +86,14 @@ 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/cjs/script/address.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArkAddress = void 0;
 const base_1 = require("@scure/base");
-const btc_signer_1 = require("@scure/btc-signer");
+const script_js_1 = require("@scure/btc-signer/script.js");
 /**
  * ArkAddress allows to create and decode bech32m encoded ark address.
  * An ark address is composed of:
@@ -66,11 +66,11 @@ class ArkAddress {
     }
     // pkScript is the script that should be used to send non-dust funds to the address
     get pkScript() {
-        return btc_signer_1.Script.encode(["OP_1", this.vtxoTaprootKey]);
+        return script_js_1.Script.encode(["OP_1", this.vtxoTaprootKey]);
     }
     // subdustPkScript is the script that should be used to send sub-dust funds to the address
     get subdustPkScript() {
-        return btc_signer_1.Script.encode(["RETURN", this.vtxoTaprootKey]);
+        return script_js_1.Script.encode(["RETURN", this.vtxoTaprootKey]);
     }
 }
 exports.ArkAddress = ArkAddress;

package/dist/cjs/script/base.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VtxoScript = void 0;
 exports.scriptFromTapLeafScript = scriptFromTapLeafScript;
-const payment_1 = require("@scure/btc-signer/payment");
-const utils_1 = require("@scure/btc-signer/utils");
+const payment_js_1 = require("@scure/btc-signer/payment.js");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const address_1 = require("./address");
-const btc_signer_1 = require("@scure/btc-signer");
+const script_js_1 = require("@scure/btc-signer/script.js");
 const base_1 = require("@scure/base");
 const tapscript_1 = require("./tapscript");
 function scriptFromTapLeafScript(leaf) {
@@ -26,8 +26,8 @@ class VtxoScript {
     }
     constructor(scripts) {
         this.scripts = scripts;
-        const tapTree = (0, payment_1.taprootListToTree)(scripts.map((script) => ({ script, leafVersion: payment_1.TAP_LEAF_VERSION })));
-        const payment = (0, payment_1.p2tr)(utils_1.TAPROOT_UNSPENDABLE_KEY, tapTree, undefined, true);
+        const tapTree = (0, payment_js_1.taprootListToTree)(scripts.map((script) => ({ script, leafVersion: payment_js_1.TAP_LEAF_VERSION })));
+        const payment = (0, payment_js_1.p2tr)(utils_js_1.TAPROOT_UNSPENDABLE_KEY, tapTree, undefined, true);
         if (!payment.tapLeafScript ||
             payment.tapLeafScript.length !== scripts.length) {
             throw new Error("invalid scripts");
@@ -43,10 +43,10 @@ class VtxoScript {
         return new address_1.ArkAddress(serverPubKey, this.tweakedPublicKey, prefix);
     }
     get pkScript() {
-        return btc_signer_1.Script.encode(["OP_1", this.tweakedPublicKey]);
+        return script_js_1.Script.encode(["OP_1", this.tweakedPublicKey]);
     }
     onchainAddress(network) {
-        return (0, payment_1.Address)(network).encode({
+        return (0, payment_js_1.Address)(network).encode({
             type: "tr",
             pubkey: this.tweakedPublicKey,
         });

package/dist/cjs/script/tapscript.js

@@ -36,10 +36,10 @@ 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_1 = require("@scure/btc-signer/script");
-const payment_1 = require("@scure/btc-signer/payment");
+const script_js_1 = require("@scure/btc-signer/script.js");
+const payment_js_1 = require("@scure/btc-signer/payment.js");
 const base_1 = require("@scure/base");
-const MinimalScriptNum = (0, script_1.ScriptNum)(undefined, true);
+const MinimalScriptNum = (0, script_js_1.ScriptNum)(undefined, true);
 var TapscriptType;
 (function (TapscriptType) {
     TapscriptType["Multisig"] = "multisig";
@@ -109,7 +109,7 @@ var MultisigTapscript;
             return {
                 type: TapscriptType.Multisig,
                 params,
-                script: (0, payment_1.p2tr_ms)(params.pubkeys.length, params.pubkeys).script,
+                script: (0, payment_js_1.p2tr_ms)(params.pubkeys.length, params.pubkeys).script,
             };
         }
         const asm = [];
@@ -126,7 +126,7 @@ var MultisigTapscript;
         return {
             type: TapscriptType.Multisig,
             params,
-            script: script_1.Script.encode(asm),
+            script: script_js_1.Script.encode(asm),
         };
     }
     MultisigTapscript.encode = encode;
@@ -151,7 +151,7 @@ var MultisigTapscript;
     MultisigTapscript.decode = decode;
     // <pubkey> CHECKSIG <pubkey> CHECKSIGADD <len_keys> NUMEQUAL
     function decodeChecksigAdd(script) {
-        const asm = script_1.Script.decode(script);
+        const asm = script_js_1.Script.decode(script);
         const pubkeys = [];
         let foundNumEqual = false;
         // Parse through ASM operations
@@ -201,7 +201,7 @@ var MultisigTapscript;
     }
     // <pubkey> CHECKSIGVERIFY <pubkey> CHECKSIG
     function decodeChecksig(script) {
-        const asm = script_1.Script.decode(script);
+        const asm = script_js_1.Script.decode(script);
         const pubkeys = [];
         // Parse through ASM operations
         for (let i = 0; i < asm.length; i++) {
@@ -278,7 +278,7 @@ var CSVMultisigTapscript;
         ];
         const multisigScript = MultisigTapscript.encode(params);
         const script = new Uint8Array([
-            ...script_1.Script.encode(asm),
+            ...script_js_1.Script.encode(asm),
             ...multisigScript.script,
         ]);
         return {
@@ -292,18 +292,18 @@ var CSVMultisigTapscript;
         if (script.length === 0) {
             throw new Error("Failed to decode: script is empty");
         }
-        const asm = script_1.Script.decode(script);
+        const asm = script_js_1.Script.decode(script);
         if (asm.length < 3) {
             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") {
             throw new Error("Invalid script: expected CHECKSEQUENCEVERIFY DROP");
         }
-        const multisigScript = new Uint8Array(script_1.Script.encode(asm.slice(3)));
+        const multisigScript = new Uint8Array(script_js_1.Script.encode(asm.slice(3)));
         let multisig;
         try {
             multisig = MultisigTapscript.decode(multisigScript);
@@ -311,7 +311,13 @@ 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) }
@@ -355,7 +361,7 @@ var ConditionCSVMultisigTapscript;
     function encode(params) {
         const script = new Uint8Array([
             ...params.conditionScript,
-            ...script_1.Script.encode(["VERIFY"]),
+            ...script_js_1.Script.encode(["VERIFY"]),
             ...CSVMultisigTapscript.encode(params).script,
         ]);
         return {
@@ -369,7 +375,7 @@ var ConditionCSVMultisigTapscript;
         if (script.length === 0) {
             throw new Error("Failed to decode: script is empty");
         }
-        const asm = script_1.Script.decode(script);
+        const asm = script_js_1.Script.decode(script);
         if (asm.length < 1) {
             throw new Error(`Invalid script: too short (expected at least 1)`);
         }
@@ -382,8 +388,8 @@ var ConditionCSVMultisigTapscript;
         if (verifyIndex === -1) {
             throw new Error("Invalid script: missing VERIFY operation");
         }
-        const conditionScript = new Uint8Array(script_1.Script.encode(asm.slice(0, verifyIndex)));
-        const csvMultisigScript = new Uint8Array(script_1.Script.encode(asm.slice(verifyIndex + 1)));
+        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)));
         let csvMultisig;
         try {
             csvMultisig = CSVMultisigTapscript.decode(csvMultisigScript);
@@ -430,7 +436,7 @@ var ConditionMultisigTapscript;
     function encode(params) {
         const script = new Uint8Array([
             ...params.conditionScript,
-            ...script_1.Script.encode(["VERIFY"]),
+            ...script_js_1.Script.encode(["VERIFY"]),
             ...MultisigTapscript.encode(params).script,
         ]);
         return {
@@ -444,7 +450,7 @@ var ConditionMultisigTapscript;
         if (script.length === 0) {
             throw new Error("Failed to decode: script is empty");
         }
-        const asm = script_1.Script.decode(script);
+        const asm = script_js_1.Script.decode(script);
         if (asm.length < 1) {
             throw new Error(`Invalid script: too short (expected at least 1)`);
         }
@@ -457,8 +463,8 @@ var ConditionMultisigTapscript;
         if (verifyIndex === -1) {
             throw new Error("Invalid script: missing VERIFY operation");
         }
-        const conditionScript = new Uint8Array(script_1.Script.encode(asm.slice(0, verifyIndex)));
-        const multisigScript = new Uint8Array(script_1.Script.encode(asm.slice(verifyIndex + 1)));
+        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)));
         let multisig;
         try {
             multisig = MultisigTapscript.decode(multisigScript);
@@ -509,7 +515,7 @@ var CLTVMultisigTapscript;
             "CHECKLOCKTIMEVERIFY",
             "DROP",
         ];
-        const timelockedScript = script_1.Script.encode(asm);
+        const timelockedScript = script_js_1.Script.encode(asm);
         const script = new Uint8Array([
             ...timelockedScript,
             ...MultisigTapscript.encode(params).script,
@@ -525,7 +531,7 @@ var CLTVMultisigTapscript;
         if (script.length === 0) {
             throw new Error("Failed to decode: script is empty");
         }
-        const asm = script_1.Script.decode(script);
+        const asm = script_js_1.Script.decode(script);
         if (asm.length < 3) {
             throw new Error(`Invalid script: too short (expected at least 3)`);
         }
@@ -536,7 +542,7 @@ var CLTVMultisigTapscript;
         if (asm[1] !== "CHECKLOCKTIMEVERIFY" || asm[2] !== "DROP") {
             throw new Error("Invalid script: expected CHECKLOCKTIMEVERIFY DROP");
         }
-        const multisigScript = new Uint8Array(script_1.Script.encode(asm.slice(3)));
+        const multisigScript = new Uint8Array(script_js_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 btc_signer_1 = require("@scure/btc-signer");
+const script_js_1 = require("@scure/btc-signer/script.js");
 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 btc_signer_1.Script.encode(["HASH160", preimageHash, "EQUAL"]);
+    return script_js_1.Script.encode(["HASH160", preimageHash, "EQUAL"]);
 }

package/dist/cjs/tree/signingSession.js

@@ -36,10 +36,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TreeSignerSession = exports.ErrMissingAggregateKey = exports.ErrMissingVtxoGraph = void 0;
 exports.validateTreeSigs = validateTreeSigs;
 const musig2 = __importStar(require("../musig2"));
-const btc_signer_1 = require("@scure/btc-signer");
+const script_js_1 = require("@scure/btc-signer/script.js");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const base_1 = require("@scure/base");
 const secp256k1_js_1 = require("@noble/curves/secp256k1.js");
-const utils_1 = require("@scure/btc-signer/utils");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const unknownFields_1 = require("../utils/unknownFields");
 exports.ErrMissingVtxoGraph = new Error("missing vtxo graph");
 exports.ErrMissingAggregateKey = new Error("missing aggregate key");
@@ -53,7 +54,7 @@ class TreeSignerSession {
         this.rootSharedOutputAmount = null;
     }
     static random() {
-        const secretKey = (0, utils_1.randomPrivateKeyBytes)();
+        const secretKey = (0, utils_js_1.randomPrivateKeyBytes)();
         return new TreeSignerSession(secretKey);
     }
     init(tree, scriptRoot, rootInputAmount) {
@@ -89,7 +90,7 @@ 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);
         }
@@ -100,7 +101,7 @@ class TreeSignerSession {
             throw exports.ErrMissingVtxoGraph;
         const myNonces = new Map();
         const publicKey = secp256k1_js_1.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);
         }
@@ -131,7 +132,7 @@ class TreeSignerSession {
             prevoutScripts.push(prevout.script);
         }
         const message = g.root.preimageWitnessV1(0, // always first input
-        prevoutScripts, btc_signer_1.SigHash.DEFAULT, prevoutAmounts);
+        prevoutScripts, transaction_js_1.SigHash.DEFAULT, prevoutAmounts);
         return musig2.sign(myNonce.secNonce, this.secretKey, aggNonce.pubNonce, cosigners, message, {
             taprootTweak: this.scriptRoot,
             sortKeys: true,
@@ -143,7 +144,7 @@ TreeSignerSession.NOT_INITIALIZED = new Error("session not initialized, call ini
 // Helper function to validate tree signatures
 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
@@ -154,7 +155,7 @@ async function validateTreeSigs(finalAggregatedKey, sharedOutputAmount, vtxoTree
         const prevout = getPrevOutput(finalAggregatedKey, vtxoTree, sharedOutputAmount, g.root);
         // Calculate the message that was signed
         const message = g.root.preimageWitnessV1(0, // always first input
-        [prevout.script], btc_signer_1.SigHash.DEFAULT, [prevout.amount]);
+        [prevout.script], transaction_js_1.SigHash.DEFAULT, [prevout.amount]);
         // Verify the signature
         const isValid = secp256k1_js_1.schnorr.verify(input.tapKeySig, message, finalAggregatedKey);
         if (!isValid) {
@@ -164,8 +165,8 @@ async function validateTreeSigs(finalAggregatedKey, sharedOutputAmount, vtxoTree
 }
 function getPrevOutput(finalKey, graph, sharedOutputAmount, tx) {
     // generate P2TR script from musig2 final key
-    const pkScript = btc_signer_1.Script.encode(["OP_1", finalKey.slice(1)]);
-    const txid = base_1.hex.encode((0, utils_1.sha256x2)(tx.toBytes(true)).reverse());
+    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) {
         return {

package/dist/cjs/tree/txTree.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxTree = void 0;
-const btc_signer_1 = require("@scure/btc-signer");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const base_1 = require("@scure/base");
 const base_2 = require("@scure/base");
-const utils_1 = require("@scure/btc-signer/utils");
+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 +22,7 @@ class TxTree {
         const chunksByTxid = new Map();
         for (const chunk of chunks) {
             const decodedChunk = decodeNode(chunk);
-            const txid = base_2.hex.encode((0, utils_1.sha256x2)(decodedChunk.tx.toBytes(true)).reverse());
+            const txid = base_2.hex.encode((0, utils_js_1.sha256x2)(decodedChunk.tx.toBytes(true)).reverse());
             chunksByTxid.set(txid, decodedChunk);
         }
         // Find the root chunks (the ones that aren't referenced as a child)
@@ -91,7 +91,7 @@ class TxTree {
             }
             child.validate();
             const childInput = child.root.getInput(0);
-            const parentTxid = base_2.hex.encode((0, utils_1.sha256x2)(this.root.toBytes(true)).reverse());
+            const parentTxid = base_2.hex.encode((0, utils_js_1.sha256x2)(this.root.toBytes(true)).reverse());
             // verify the input of the child is the output of the parent
             if (!childInput.txid ||
                 base_2.hex.encode(childInput.txid) !== parentTxid ||
@@ -126,7 +126,7 @@ class TxTree {
         return leaves;
     }
     get txid() {
-        return base_2.hex.encode((0, utils_1.sha256x2)(this.root.toBytes(true)).reverse());
+        return base_2.hex.encode((0, utils_js_1.sha256x2)(this.root.toBytes(true)).reverse());
     }
     find(txid) {
         if (txid === this.txid) {
@@ -157,11 +157,11 @@ 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;
     }
 }
 exports.TxTree = TxTree;
@@ -188,6 +188,6 @@ function buildGraph(rootTxid, chunksByTxid) {
     return new TxTree(rootTx, children);
 }
 function decodeNode(chunk) {
-    const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(chunk.tx));
+    const tx = transaction_js_1.Transaction.fromPSBT(base_1.base64.decode(chunk.tx));
     return { tx, children: chunk.children };
 }

package/dist/cjs/tree/validation.js

@@ -4,9 +4,9 @@ exports.ErrMissingCosignersPublicKeys = exports.ErrWrongCommitmentTxid = exports
 exports.validateConnectorsTxGraph = validateConnectorsTxGraph;
 exports.validateVtxoTxGraph = validateVtxoTxGraph;
 const base_1 = require("@scure/base");
-const btc_signer_1 = require("@scure/btc-signer");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const base_2 = require("@scure/base");
-const utils_1 = require("@scure/btc-signer/utils");
+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}`);
@@ -28,10 +28,10 @@ function validateConnectorsTxGraph(settlementTxB64, connectorsGraph) {
     if (connectorsGraph.root.inputsLength !== 1)
         throw exports.ErrNumberOfInputs;
     const rootInput = connectorsGraph.root.getInput(0);
-    const settlementTx = btc_signer_1.Transaction.fromPSBT(base_2.base64.decode(settlementTxB64));
+    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_1.sha256x2)(settlementTx.toBytes(true)).reverse());
+    const expectedRootTxid = base_1.hex.encode((0, utils_js_1.sha256x2)(settlementTx.toBytes(true)).reverse());
     if (!rootInput.txid)
         throw exports.ErrWrongSettlementTxid;
     if (base_1.hex.encode(rootInput.txid) !== expectedRootTxid)
@@ -58,7 +58,7 @@ function validateVtxoTxGraph(graph, roundTransaction, sweepTapTreeRoot) {
         throw exports.ErrEmptyTree;
     }
     const rootInput = graph.root.getInput(0);
-    const commitmentTxid = base_1.hex.encode((0, utils_1.sha256x2)(roundTransaction.toBytes(true)).reverse());
+    const commitmentTxid = base_1.hex.encode((0, utils_js_1.sha256x2)(roundTransaction.toBytes(true)).reverse());
     if (!rootInput.txid ||
         base_1.hex.encode(rootInput.txid) !== commitmentTxid ||
         rootInput.index !== BATCH_OUTPUT_VTXO_INDEX) {
@@ -81,7 +81,7 @@ 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/cjs/utils/arkTransaction.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildOffchainTx = buildOffchainTx;
-const btc_signer_1 = require("@scure/btc-signer");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const tapscript_1 = require("../script/tapscript");
 const base_1 = require("../script/base");
 const anchor_1 = require("./anchor");
 const base_2 = require("@scure/base");
-const utils_1 = require("@scure/btc-signer/utils");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const unknownFields_1 = require("./unknownFields");
 /**
  * Builds an offchain transaction with checkpoint transactions.
@@ -45,7 +45,7 @@ function buildVirtualTx(inputs, outputs) {
             }
         }
     }
-    const tx = new btc_signer_1.Transaction({
+    const tx = new transaction_js_1.Transaction({
         version: 3,
         allowUnknown: true,
         allowUnknownOutputs: true,
@@ -55,7 +55,7 @@ function buildVirtualTx(inputs, outputs) {
         tx.addInput({
             txid: input.txid,
             index: input.vout,
-            sequence: lockTime ? btc_signer_1.DEFAULT_SEQUENCE - 1 : undefined,
+            sequence: lockTime ? transaction_js_1.DEFAULT_SEQUENCE - 1 : undefined,
             witnessUtxo: {
                 script: base_1.VtxoScript.decode(input.tapTree).pkScript,
                 amount: BigInt(input.value),
@@ -91,7 +91,7 @@ function buildCheckpointTx(vtxo, serverUnrollScript) {
     const collaborativeLeafProof = checkpointVtxoScript.findLeaf(base_2.hex.encode(collaborativeClosure.script));
     // create the checkpoint input that will be used as input of the virtual tx
     const checkpointInput = {
-        txid: base_2.hex.encode((0, utils_1.sha256x2)(checkpointTx.toBytes(true)).reverse()),
+        txid: base_2.hex.encode((0, utils_js_1.sha256x2)(checkpointTx.toBytes(true)).reverse()),
         vout: 0,
         value: vtxo.value,
         tapLeafScript: collaborativeLeafProof,

package/dist/cjs/utils/unknownFields.js

@@ -37,7 +37,7 @@ exports.VtxoTreeExpiry = exports.CosignerPublicKey = exports.ConditionWitness =
 exports.setArkPsbtField = setArkPsbtField;
 exports.getArkPsbtFields = getArkPsbtFields;
 const bip68 = __importStar(require("bip68"));
-const btc_signer_1 = require("@scure/btc-signer");
+const script_js_1 = require("@scure/btc-signer/script.js");
 const base_1 = require("@scure/base");
 /**
  * ArkPsbtFieldKey is the key values for ark psbt fields.
@@ -126,12 +126,12 @@ exports.ConditionWitness = {
             type: exports.ArkPsbtFieldKeyType,
             key: encodedPsbtFieldKey[ArkPsbtFieldKey.ConditionWitness],
         },
-        btc_signer_1.RawWitness.encode(value),
+        script_js_1.RawWitness.encode(value),
     ],
     decode: (value) => nullIfCatch(() => {
         if (!checkKeyIncludes(value[0], ArkPsbtFieldKey.ConditionWitness))
             return null;
-        return btc_signer_1.RawWitness.decode(value[1]);
+        return script_js_1.RawWitness.decode(value[1]);
     }),
 };
 /**
@@ -176,12 +176,12 @@ exports.VtxoTreeExpiry = {
             type: exports.ArkPsbtFieldKeyType,
             key: encodedPsbtFieldKey[ArkPsbtFieldKey.VtxoTreeExpiry],
         },
-        (0, btc_signer_1.ScriptNum)(6, true).encode(value.value === 0n ? 0n : value.value),
+        (0, script_js_1.ScriptNum)(6, true).encode(value.value === 0n ? 0n : value.value),
     ],
     decode: (unknown) => nullIfCatch(() => {
         if (!checkKeyIncludes(unknown[0], ArkPsbtFieldKey.VtxoTreeExpiry))
             return null;
-        const v = (0, btc_signer_1.ScriptNum)(6, true).decode(unknown[1]);
+        const v = (0, script_js_1.ScriptNum)(6, true).decode(unknown[1]);
         if (!v)
             return null;
         const { blocks, seconds } = bip68.decode(Number(v));