@arkade-os/sdk 0.1.3 → 0.2.0

package/dist/cjs/tree/validation.js

@@ -1,184 +1,108 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrInvalidNodeTransaction = exports.ErrInvalidRootTransaction = exports.ErrInvalidControlBlock = exports.ErrInternalKey = exports.ErrInvalidTaprootScript = exports.ErrLeafChildren = exports.ErrParentTxidInput = exports.ErrNodeTxidDifferent = exports.ErrNodeParentTxidEmpty = exports.ErrNodeTxidEmpty = exports.ErrNodeTxEmpty = exports.ErrNoLeaves = exports.ErrInvalidAmount = exports.ErrWrongSettlementTxid = exports.ErrNumberOfInputs = exports.ErrInvalidRootLevel = exports.ErrEmptyTree = exports.ErrInvalidSettlementTxOutputs = exports.ErrInvalidSettlementTx = void 0;
-exports.validateConnectorsTree = validateConnectorsTree;
-exports.validateVtxoTree = validateVtxoTree;
+exports.ErrMissingCosignersPublicKeys = exports.ErrWrongCommitmentTxid = exports.ErrInvalidRoundTxOutputs = exports.ErrInvalidTaprootScript = exports.ErrNoLeaves = exports.ErrInvalidAmount = exports.ErrWrongSettlementTxid = exports.ErrNumberOfInputs = exports.ErrEmptyTree = exports.ErrInvalidSettlementTxOutputs = exports.ErrInvalidSettlementTx = void 0;
+exports.validateConnectorsTxGraph = validateConnectorsTxGraph;
+exports.validateVtxoTxGraph = validateVtxoTxGraph;
 const base_1 = require("@scure/base");
 const btc_signer_1 = require("@scure/btc-signer");
 const base_2 = require("@scure/base");
 const utils_1 = require("@scure/btc-signer/utils");
 const musig2_1 = require("../musig2");
-const vtxoTree_1 = require("./vtxoTree");
-exports.ErrInvalidSettlementTx = new vtxoTree_1.TxTreeError("invalid settlement transaction");
-exports.ErrInvalidSettlementTxOutputs = new vtxoTree_1.TxTreeError("invalid settlement transaction outputs");
-exports.ErrEmptyTree = new vtxoTree_1.TxTreeError("empty tree");
-exports.ErrInvalidRootLevel = new vtxoTree_1.TxTreeError("invalid root level");
-exports.ErrNumberOfInputs = new vtxoTree_1.TxTreeError("invalid number of inputs");
-exports.ErrWrongSettlementTxid = new vtxoTree_1.TxTreeError("wrong settlement txid");
-exports.ErrInvalidAmount = new vtxoTree_1.TxTreeError("invalid amount");
-exports.ErrNoLeaves = new vtxoTree_1.TxTreeError("no leaves");
-exports.ErrNodeTxEmpty = new vtxoTree_1.TxTreeError("node transaction empty");
-exports.ErrNodeTxidEmpty = new vtxoTree_1.TxTreeError("node txid empty");
-exports.ErrNodeParentTxidEmpty = new vtxoTree_1.TxTreeError("node parent txid empty");
-exports.ErrNodeTxidDifferent = new vtxoTree_1.TxTreeError("node txid different");
-exports.ErrParentTxidInput = new vtxoTree_1.TxTreeError("parent txid input mismatch");
-exports.ErrLeafChildren = new vtxoTree_1.TxTreeError("leaf node has children");
-exports.ErrInvalidTaprootScript = new vtxoTree_1.TxTreeError("invalid taproot script");
-exports.ErrInternalKey = new vtxoTree_1.TxTreeError("invalid internal key");
-exports.ErrInvalidControlBlock = new vtxoTree_1.TxTreeError("invalid control block");
-exports.ErrInvalidRootTransaction = new vtxoTree_1.TxTreeError("invalid root transaction");
-exports.ErrInvalidNodeTransaction = new vtxoTree_1.TxTreeError("invalid node transaction");
-const SHARED_OUTPUT_INDEX = 0;
-const CONNECTORS_OUTPUT_INDEX = 1;
-function validateConnectorsTree(settlementTxB64, connectorsTree) {
-    connectorsTree.validate();
-    const rootNode = connectorsTree.root();
-    if (!rootNode)
-        throw exports.ErrEmptyTree;
-    const rootTx = btc_signer_1.Transaction.fromPSBT(base_2.base64.decode(rootNode.tx));
-    if (rootTx.inputsLength !== 1)
+const unknownFields_1 = require("../utils/unknownFields");
+const ErrInvalidSettlementTx = (tx) => new Error(`invalid settlement transaction: ${tx}`);
+exports.ErrInvalidSettlementTx = ErrInvalidSettlementTx;
+exports.ErrInvalidSettlementTxOutputs = new Error("invalid settlement transaction outputs");
+exports.ErrEmptyTree = new Error("empty tree");
+exports.ErrNumberOfInputs = new Error("invalid number of inputs");
+exports.ErrWrongSettlementTxid = new Error("wrong settlement txid");
+exports.ErrInvalidAmount = new Error("invalid amount");
+exports.ErrNoLeaves = new Error("no leaves");
+exports.ErrInvalidTaprootScript = new Error("invalid taproot script");
+exports.ErrInvalidRoundTxOutputs = new Error("invalid round transaction outputs");
+exports.ErrWrongCommitmentTxid = new Error("wrong commitment txid");
+exports.ErrMissingCosignersPublicKeys = new Error("missing cosigners public keys");
+const BATCH_OUTPUT_VTXO_INDEX = 0;
+const BATCH_OUTPUT_CONNECTORS_INDEX = 1;
+function validateConnectorsTxGraph(settlementTxB64, connectorsGraph) {
+    connectorsGraph.validate();
+    if (connectorsGraph.root.inputsLength !== 1)
         throw exports.ErrNumberOfInputs;
-    const rootInput = rootTx.getInput(0);
+    const rootInput = connectorsGraph.root.getInput(0);
     const settlementTx = btc_signer_1.Transaction.fromPSBT(base_2.base64.decode(settlementTxB64));
-    if (settlementTx.outputsLength <= CONNECTORS_OUTPUT_INDEX)
+    if (settlementTx.outputsLength <= BATCH_OUTPUT_CONNECTORS_INDEX)
         throw exports.ErrInvalidSettlementTxOutputs;
     const expectedRootTxid = base_1.hex.encode((0, utils_1.sha256x2)(settlementTx.toBytes(true)).reverse());
     if (!rootInput.txid)
         throw exports.ErrWrongSettlementTxid;
     if (base_1.hex.encode(rootInput.txid) !== expectedRootTxid)
         throw exports.ErrWrongSettlementTxid;
-    if (rootInput.index !== CONNECTORS_OUTPUT_INDEX)
+    if (rootInput.index !== BATCH_OUTPUT_CONNECTORS_INDEX)
         throw exports.ErrWrongSettlementTxid;
 }
-function validateVtxoTree(settlementTx, vtxoTree, sweepTapTreeRoot) {
-    vtxoTree.validate();
-    // Parse settlement transaction
-    let settlementTransaction;
-    try {
-        settlementTransaction = btc_signer_1.Transaction.fromPSBT(base_2.base64.decode(settlementTx));
-    }
-    catch {
-        throw exports.ErrInvalidSettlementTx;
-    }
-    if (settlementTransaction.outputsLength <= SHARED_OUTPUT_INDEX) {
-        throw exports.ErrInvalidSettlementTxOutputs;
-    }
-    const sharedOutput = settlementTransaction.getOutput(SHARED_OUTPUT_INDEX);
-    if (!sharedOutput?.amount)
-        throw exports.ErrInvalidSettlementTxOutputs;
-    const sharedOutputAmount = sharedOutput.amount;
-    const nbNodes = vtxoTree.numberOfNodes();
-    if (nbNodes === 0) {
+// ValidateVtxoTxGraph checks if the given vtxo graph is valid.
+// The function validates:
+// - the number of nodes
+// - the number of leaves
+// - children coherence with parent.
+// - every control block and taproot output scripts.
+// - input and output amounts.
+function validateVtxoTxGraph(graph, roundTransaction, sweepTapTreeRoot) {
+    if (roundTransaction.outputsLength < BATCH_OUTPUT_VTXO_INDEX + 1) {
+        throw exports.ErrInvalidRoundTxOutputs;
+    }
+    const batchOutputAmount = roundTransaction.getOutput(BATCH_OUTPUT_VTXO_INDEX)?.amount;
+    if (!batchOutputAmount) {
+        throw exports.ErrInvalidRoundTxOutputs;
+    }
+    if (!graph.root) {
         throw exports.ErrEmptyTree;
     }
-    if (vtxoTree.levels[0].length !== 1) {
-        throw exports.ErrInvalidRootLevel;
-    }
-    // Check root input is connected to settlement tx
-    const rootNode = vtxoTree.levels[0][0];
-    let rootTx;
-    try {
-        rootTx = btc_signer_1.Transaction.fromPSBT(base_2.base64.decode(rootNode.tx));
+    const rootInput = graph.root.getInput(0);
+    const commitmentTxid = base_1.hex.encode((0, utils_1.sha256x2)(roundTransaction.toBytes(true)).reverse());
+    if (!rootInput.txid ||
+        base_1.hex.encode(rootInput.txid) !== commitmentTxid ||
+        rootInput.index !== BATCH_OUTPUT_VTXO_INDEX) {
+        throw exports.ErrWrongCommitmentTxid;
     }
-    catch {
-        throw exports.ErrInvalidRootTransaction;
-    }
-    if (rootTx.inputsLength !== 1) {
-        throw exports.ErrNumberOfInputs;
-    }
-    const rootInput = rootTx.getInput(0);
-    if (!rootInput.txid || rootInput.index === undefined)
-        throw exports.ErrWrongSettlementTxid;
-    const settlementTxid = base_1.hex.encode((0, utils_1.sha256x2)(settlementTransaction.toBytes(true)).reverse());
-    if (base_1.hex.encode(rootInput.txid) !== settlementTxid ||
-        rootInput.index !== SHARED_OUTPUT_INDEX) {
-        throw exports.ErrWrongSettlementTxid;
-    }
-    // Check root output amounts
     let sumRootValue = 0n;
-    for (let i = 0; i < rootTx.outputsLength; i++) {
-        const output = rootTx.getOutput(i);
-        if (!output?.amount)
-            continue;
-        sumRootValue += output.amount;
+    for (let i = 0; i < graph.root.outputsLength; i++) {
+        const output = graph.root.getOutput(i);
+        if (output?.amount) {
+            sumRootValue += output.amount;
+        }
     }
-    if (sumRootValue >= sharedOutputAmount) {
+    if (sumRootValue !== batchOutputAmount) {
         throw exports.ErrInvalidAmount;
     }
-    if (vtxoTree.leaves().length === 0) {
+    const leaves = graph.leaves();
+    if (leaves.length === 0) {
         throw exports.ErrNoLeaves;
     }
-    // Validate each node in the tree
-    for (const level of vtxoTree.levels) {
-        for (const node of level) {
-            validateNode(vtxoTree, node, sweepTapTreeRoot);
-        }
-    }
-}
-function validateNode(vtxoTree, node, tapTreeRoot) {
-    if (!node.tx)
-        throw exports.ErrNodeTxEmpty;
-    if (!node.txid)
-        throw exports.ErrNodeTxidEmpty;
-    if (!node.parentTxid)
-        throw exports.ErrNodeParentTxidEmpty;
-    // Parse node transaction
-    let tx;
-    try {
-        tx = btc_signer_1.Transaction.fromPSBT(base_2.base64.decode(node.tx));
-    }
-    catch {
-        throw exports.ErrInvalidNodeTransaction;
-    }
-    const txid = base_1.hex.encode((0, utils_1.sha256x2)(tx.toBytes(true)).reverse());
-    if (txid !== node.txid) {
-        throw exports.ErrNodeTxidDifferent;
-    }
-    if (tx.inputsLength !== 1) {
-        throw exports.ErrNumberOfInputs;
-    }
-    const input = tx.getInput(0);
-    if (!input.txid)
-        throw exports.ErrParentTxidInput;
-    if (base_1.hex.encode(input.txid) !== node.parentTxid) {
-        throw exports.ErrParentTxidInput;
-    }
-    const children = vtxoTree.children(node.txid);
-    if (node.leaf && children.length >= 1) {
-        throw exports.ErrLeafChildren;
-    }
-    // Validate each child
-    for (let childIndex = 0; childIndex < children.length; childIndex++) {
-        const child = children[childIndex];
-        const childTx = btc_signer_1.Transaction.fromPSBT(base_2.base64.decode(child.tx));
-        const parentOutput = tx.getOutput(childIndex);
-        if (!parentOutput?.script)
-            throw exports.ErrInvalidTaprootScript;
-        const previousScriptKey = parentOutput.script.slice(2);
-        if (previousScriptKey.length !== 32) {
-            throw exports.ErrInvalidTaprootScript;
-        }
-        // Get cosigner keys from input
-        const cosignerKeys = (0, vtxoTree_1.getCosignerKeys)(childTx);
-        // Aggregate keys
-        const { finalKey } = (0, musig2_1.aggregateKeys)(cosignerKeys, true, {
-            taprootTweak: tapTreeRoot,
-        });
-        if (base_1.hex.encode(finalKey) !== base_1.hex.encode(previousScriptKey.slice(2))) {
-            throw exports.ErrInternalKey;
-        }
-        // Check amounts
-        let sumChildAmount = 0n;
-        for (let i = 0; i < childTx.outputsLength; i++) {
-            const output = childTx.getOutput(i);
-            if (!output?.amount)
-                continue;
-            sumChildAmount += output.amount;
-        }
-        if (!parentOutput.amount)
-            throw exports.ErrInvalidAmount;
-        if (sumChildAmount >= parentOutput.amount) {
-            throw exports.ErrInvalidAmount;
+    // 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 [childIndex, child] of g.children) {
+            const parentOutput = g.root.getOutput(childIndex);
+            if (!parentOutput?.script) {
+                throw new Error(`parent output ${childIndex} not found`);
+            }
+            const previousScriptKey = parentOutput.script.slice(2);
+            if (previousScriptKey.length !== 32) {
+                throw new Error(`parent output ${childIndex} has invalid script`);
+            }
+            const cosigners = (0, unknownFields_1.getArkPsbtFields)(child.root, 0, unknownFields_1.CosignerPublicKey);
+            if (cosigners.length === 0) {
+                throw exports.ErrMissingCosignersPublicKeys;
+            }
+            const cosignerKeys = cosigners.map((c) => c.key);
+            const { finalKey } = (0, musig2_1.aggregateKeys)(cosignerKeys, true, {
+                taprootTweak: sweepTapTreeRoot,
+            });
+            if (!finalKey ||
+                base_1.hex.encode(finalKey.slice(1)) !== base_1.hex.encode(previousScriptKey)) {
+                throw exports.ErrInvalidTaprootScript;
+            }
         }
     }
 }

package/dist/cjs/utils/anchor.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.P2A = exports.ANCHOR_PKSCRIPT = exports.ANCHOR_VALUE = void 0;
+exports.findP2AOutput = findP2AOutput;
+const base_1 = require("@scure/base");
+exports.ANCHOR_VALUE = 0n;
+exports.ANCHOR_PKSCRIPT = new Uint8Array([0x51, 0x02, 0x4e, 0x73]);
+/**
+ * A zero-value anchor output.
+ */
+exports.P2A = {
+    script: exports.ANCHOR_PKSCRIPT,
+    amount: exports.ANCHOR_VALUE,
+};
+const hexP2Ascript = base_1.hex.encode(exports.P2A.script);
+/**
+ * search for anchor in the given transaction.
+ * @throws {Error} if the anchor is not found or has the wrong amount
+ */
+function findP2AOutput(tx) {
+    for (let i = 0; i < tx.outputsLength; i++) {
+        const output = tx.getOutput(i);
+        if (output.script && base_1.hex.encode(output.script) === hexP2Ascript) {
+            if (output.amount !== exports.P2A.amount) {
+                throw new Error(`P2A output has wrong amount, expected ${exports.P2A.amount} got ${output.amount}`);
+            }
+            return {
+                txid: tx.id,
+                index: i,
+                witnessUtxo: exports.P2A,
+            };
+        }
+    }
+    throw new Error("P2A output not found");
+}

package/dist/cjs/utils/arkTransaction.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildOffchainTx = buildOffchainTx;
+const btc_signer_1 = require("@scure/btc-signer");
+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 unknownFields_1 = require("./unknownFields");
+/**
+ * Builds an offchain transaction with checkpoint transactions.
+ *
+ * Creates one checkpoint transaction per input and a virtual transaction that
+ * combines all the checkpoints, sending to the specified outputs. This is the
+ * core function for creating Ark transactions.
+ *
+ * @param inputs - Array of virtual transaction inputs
+ * @param outputs - Array of transaction outputs
+ * @param serverUnrollScript - Server unroll script for checkpoint transactions
+ * @returns Object containing the virtual transaction and checkpoint transactions
+ */
+function buildOffchainTx(inputs, outputs, serverUnrollScript) {
+    const checkpoints = inputs.map((input) => buildCheckpointTx(input, serverUnrollScript));
+    const arkTx = buildVirtualTx(checkpoints.map((c) => c.input), outputs);
+    return {
+        arkTx,
+        checkpoints: checkpoints.map((c) => c.tx),
+    };
+}
+function buildVirtualTx(inputs, outputs) {
+    let lockTime = 0n;
+    for (const input of inputs) {
+        const tapscript = (0, tapscript_1.decodeTapscript)((0, base_1.scriptFromTapLeafScript)(input.tapLeafScript));
+        if (tapscript_1.CLTVMultisigTapscript.is(tapscript)) {
+            if (lockTime !== 0n) {
+                // if a locktime is already set, check if the new locktime is in the same unit
+                if (isSeconds(lockTime) !==
+                    isSeconds(tapscript.params.absoluteTimelock)) {
+                    throw new Error("cannot mix seconds and blocks locktime");
+                }
+            }
+            if (tapscript.params.absoluteTimelock > lockTime) {
+                lockTime = tapscript.params.absoluteTimelock;
+            }
+        }
+    }
+    const tx = new btc_signer_1.Transaction({
+        version: 3,
+        allowUnknown: true,
+        allowUnknownOutputs: true,
+        lockTime: Number(lockTime),
+    });
+    for (const [i, input] of inputs.entries()) {
+        tx.addInput({
+            txid: input.txid,
+            index: input.vout,
+            sequence: lockTime ? btc_signer_1.DEFAULT_SEQUENCE - 1 : undefined,
+            witnessUtxo: {
+                script: base_1.VtxoScript.decode(input.tapTree).pkScript,
+                amount: BigInt(input.value),
+            },
+            tapLeafScript: [input.tapLeafScript],
+        });
+        (0, unknownFields_1.setArkPsbtField)(tx, i, unknownFields_1.VtxoTaprootTree, input.tapTree);
+    }
+    for (const output of outputs) {
+        tx.addOutput(output);
+    }
+    // add the anchor output
+    tx.addOutput(anchor_1.P2A);
+    return tx;
+}
+function buildCheckpointTx(vtxo, serverUnrollScript) {
+    // create the checkpoint vtxo script from collaborative closure
+    const collaborativeClosure = (0, tapscript_1.decodeTapscript)(vtxo.checkpointTapLeafScript ??
+        (0, base_1.scriptFromTapLeafScript)(vtxo.tapLeafScript));
+    // create the checkpoint vtxo script combining collaborative closure and server unroll script
+    const checkpointVtxoScript = new base_1.VtxoScript([
+        serverUnrollScript.script,
+        collaborativeClosure.script,
+    ]);
+    // build the checkpoint virtual tx
+    const checkpointTx = buildVirtualTx([vtxo], [
+        {
+            amount: BigInt(vtxo.value),
+            script: checkpointVtxoScript.pkScript,
+        },
+    ]);
+    // get the collaborative leaf proof
+    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()),
+        vout: 0,
+        value: vtxo.value,
+        tapLeafScript: collaborativeLeafProof,
+        tapTree: checkpointVtxoScript.encode(),
+    };
+    return {
+        tx: checkpointTx,
+        input: checkpointInput,
+    };
+}
+const nLocktimeMinSeconds = 500000000n;
+function isSeconds(locktime) {
+    return locktime >= nLocktimeMinSeconds;
+}

package/dist/cjs/utils/transactionHistory.js

@@ -3,56 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.vtxosToTxs = vtxosToTxs;
 const wallet_1 = require("../wallet");
 /**
- * Helper function to find vtxos that were spent in a settlement
- */
-function findVtxosSpentInSettlement(vtxos, vtxo) {
-    if (vtxo.virtualStatus.state === "pending") {
-        return [];
-    }
-    return vtxos.filter((v) => {
-        if (!v.spentBy)
-            return false;
-        return v.spentBy === vtxo.virtualStatus.batchTxID;
-    });
-}
-/**
- * Helper function to find vtxos that were spent in a payment
- */
-function findVtxosSpentInPayment(vtxos, vtxo) {
-    return vtxos.filter((v) => {
-        if (!v.spentBy)
-            return false;
-        return v.spentBy === vtxo.txid;
-    });
-}
-/**
- * Helper function to find vtxos that resulted from a spentBy transaction
- */
-function findVtxosResultedFromSpentBy(vtxos, spentBy) {
-    return vtxos.filter((v) => {
-        if (v.virtualStatus.state !== "pending" &&
-            v.virtualStatus.batchTxID === spentBy) {
-            return true;
-        }
-        return v.txid === spentBy;
-    });
-}
-/**
- * Helper function to reduce vtxos to their total amount
+ * @param spendable - Vtxos that are spendable
+ * @param spent - Vtxos that are spent
+ * @param boardingBatchTxids - Set of boarding batch txids
+ * @returns Ark transactions
  */
-function reduceVtxosAmount(vtxos) {
-    return vtxos.reduce((sum, v) => sum + v.value, 0);
-}
-/**
- * Helper function to get a vtxo from a list of vtxos
- */
-function getVtxo(resultedVtxos, spentVtxos) {
-    if (resultedVtxos.length === 0) {
-        return spentVtxos[0];
-    }
-    return resultedVtxos[0];
-}
-function vtxosToTxs(spendable, spent, boardingRounds) {
+function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     const txs = [];
     // Receive case
     // All vtxos are received unless:
@@ -60,8 +16,9 @@ function vtxosToTxs(spendable, spent, boardingRounds) {
     // - they are the change of a spend tx
     let vtxosLeftToCheck = [...spent];
     for (const vtxo of [...spendable, ...spent]) {
-        if (vtxo.virtualStatus.state !== "pending" &&
-            boardingRounds.has(vtxo.virtualStatus.batchTxID || "")) {
+        if (vtxo.virtualStatus.state !== "preconfirmed" &&
+            vtxo.virtualStatus.commitmentTxIds &&
+            vtxo.virtualStatus.commitmentTxIds.some((txid) => boardingBatchTxids.has(txid))) {
             continue;
         }
         const settleVtxos = findVtxosSpentInSettlement(vtxosLeftToCheck, vtxo);
@@ -77,13 +34,13 @@ function vtxosToTxs(spendable, spent, boardingRounds) {
             continue; // settlement or change, ignore
         }
         const txKey = {
-            roundTxid: vtxo.virtualStatus.batchTxID || "",
+            commitmentTxid: vtxo.spentBy || "",
             boardingTxid: "",
-            redeemTxid: "",
+            arkTxid: "",
         };
-        let settled = vtxo.virtualStatus.state !== "pending";
-        if (vtxo.virtualStatus.state === "pending") {
-            txKey.redeemTxid = vtxo.txid;
+        let settled = vtxo.virtualStatus.state !== "preconfirmed";
+        if (vtxo.virtualStatus.state === "preconfirmed") {
+            txKey.arkTxid = vtxo.txid;
             if (vtxo.spentBy) {
                 settled = true;
             }
@@ -96,22 +53,27 @@ function vtxosToTxs(spendable, spent, boardingRounds) {
             settled,
         });
     }
-    // send case
-    // All "spentBy" vtxos are payments unless:
-    // - they are settlements
-    // aggregate spent by spentId
-    const vtxosBySpentBy = new Map();
+    // vtxos by settled by or ark txid
+    const vtxosByTxid = new Map();
     for (const v of spent) {
-        if (!v.spentBy)
+        if (v.settledBy) {
+            if (!vtxosByTxid.has(v.settledBy)) {
+                vtxosByTxid.set(v.settledBy, []);
+            }
+            const currentVtxos = vtxosByTxid.get(v.settledBy);
+            vtxosByTxid.set(v.settledBy, [...currentVtxos, v]);
+        }
+        if (!v.arkTxId) {
             continue;
-        if (!vtxosBySpentBy.has(v.spentBy)) {
-            vtxosBySpentBy.set(v.spentBy, []);
         }
-        const currentVtxos = vtxosBySpentBy.get(v.spentBy);
-        vtxosBySpentBy.set(v.spentBy, [...currentVtxos, v]);
+        if (!vtxosByTxid.has(v.arkTxId)) {
+            vtxosByTxid.set(v.arkTxId, []);
+        }
+        const currentVtxos = vtxosByTxid.get(v.arkTxId);
+        vtxosByTxid.set(v.arkTxId, [...currentVtxos, v]);
     }
-    for (const [sb, vtxos] of vtxosBySpentBy) {
-        const resultedVtxos = findVtxosResultedFromSpentBy([...spendable, ...spent], sb);
+    for (const [sb, vtxos] of vtxosByTxid) {
+        const resultedVtxos = findVtxosResultedFromTxid([...spendable, ...spent], sb);
         const resultedAmount = reduceVtxosAmount(resultedVtxos);
         const spentAmount = reduceVtxosAmount(vtxos);
         if (spentAmount <= resultedAmount) {
@@ -119,12 +81,12 @@ function vtxosToTxs(spendable, spent, boardingRounds) {
         }
         const vtxo = getVtxo(resultedVtxos, vtxos);
         const txKey = {
-            roundTxid: vtxo.virtualStatus.batchTxID || "",
+            commitmentTxid: vtxo.virtualStatus.commitmentTxIds?.[0] || "",
             boardingTxid: "",
-            redeemTxid: "",
+            arkTxid: "",
         };
-        if (vtxo.virtualStatus.state === "pending") {
-            txKey.redeemTxid = vtxo.txid;
+        if (vtxo.virtualStatus.state === "preconfirmed") {
+            txKey.arkTxid = vtxo.txid;
         }
         txs.push({
             key: txKey,
@@ -136,6 +98,56 @@ function vtxosToTxs(spendable, spent, boardingRounds) {
     }
     return txs;
 }
+/**
+ * Helper function to find vtxos that were spent in a settlement
+ */
+function findVtxosSpentInSettlement(vtxos, vtxo) {
+    if (vtxo.virtualStatus.state === "preconfirmed") {
+        return [];
+    }
+    return vtxos.filter((v) => {
+        if (!v.settledBy)
+            return false;
+        return (vtxo.virtualStatus.commitmentTxIds?.includes(v.settledBy) ?? false);
+    });
+}
+/**
+ * Helper function to find vtxos that were spent in a payment
+ */
+function findVtxosSpentInPayment(vtxos, vtxo) {
+    return vtxos.filter((v) => {
+        if (!v.arkTxId)
+            return false;
+        return v.arkTxId === vtxo.txid;
+    });
+}
+/**
+ * Helper function to find vtxos that resulted from a spentBy transaction
+ */
+function findVtxosResultedFromTxid(vtxos, txid) {
+    return vtxos.filter((v) => {
+        if (v.virtualStatus.state !== "preconfirmed" &&
+            v.virtualStatus.commitmentTxIds?.includes(txid)) {
+            return true;
+        }
+        return v.txid === txid;
+    });
+}
+/**
+ * Helper function to reduce vtxos to their total amount
+ */
+function reduceVtxosAmount(vtxos) {
+    return vtxos.reduce((sum, v) => sum + v.value, 0);
+}
+/**
+ * Helper function to get a vtxo from a list of vtxos
+ */
+function getVtxo(resultedVtxos, spentVtxos) {
+    if (resultedVtxos.length === 0) {
+        return spentVtxos[0];
+    }
+    return resultedVtxos[0];
+}
 function removeVtxosFromList(vtxos, vtxosToRemove) {
     return vtxos.filter((v) => {
         for (const vtxoToRemove of vtxosToRemove) {

package/dist/cjs/utils/txSizeEstimator.js

@@ -13,6 +13,11 @@ class TxWeightEstimator {
     static create() {
         return new TxWeightEstimator(false, 0, 0, 0, 0, 0);
     }
+    addP2AInput() {
+        this.inputCount++;
+        this.inputSize += TxWeightEstimator.INPUT_SIZE;
+        return this;
+    }
     addKeySpendInput(isDefault = true) {
         this.inputCount++;
         this.inputWitnessSize += 64 + 1 + (isDefault ? 0 : 1);
@@ -48,6 +53,12 @@ class TxWeightEstimator {
             TxWeightEstimator.OUTPUT_SIZE + TxWeightEstimator.P2WKH_OUTPUT_SIZE;
         return this;
     }
+    addP2TROutput() {
+        this.outputCount++;
+        this.outputSize +=
+            TxWeightEstimator.OUTPUT_SIZE + TxWeightEstimator.P2TR_OUTPUT_SIZE;
+        return this;
+    }
     vsize() {
         const getVarIntSize = (n) => {
             if (n < 0xfd)
@@ -86,6 +97,7 @@ TxWeightEstimator.P2WKH_OUTPUT_SIZE = 1 + 1 + 20;
 TxWeightEstimator.BASE_TX_SIZE = 8 + 2; // Version + LockTime
 TxWeightEstimator.WITNESS_HEADER_SIZE = 2; // Flag + Marker
 TxWeightEstimator.WITNESS_SCALE_FACTOR = 4;
+TxWeightEstimator.P2TR_OUTPUT_SIZE = 1 + 1 + 32;
 const vsize = (weight) => {
     const value = BigInt(Math.ceil(weight / TxWeightEstimator.WITNESS_SCALE_FACTOR));
     return {