@arkade-os/sdk 0.3.10 → 0.3.11

package/dist/cjs/arkfee/celenv.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntentOnchainInputEnv = exports.IntentOffchainInputEnv = exports.IntentOutputEnv = exports.OutputScriptVariableName = exports.InputTypeVariableName = exports.WeightVariableName = exports.BirthVariableName = exports.ExpiryVariableName = exports.AmountVariableName = void 0;
+const cel_js_1 = require("@marcbachmann/cel-js");
+/**
+ * Variable names used in CEL expressions
+ */
+exports.AmountVariableName = "amount";
+exports.ExpiryVariableName = "expiry";
+exports.BirthVariableName = "birth";
+exports.WeightVariableName = "weight";
+exports.InputTypeVariableName = "inputType";
+exports.OutputScriptVariableName = "script";
+const nowFunction = {
+    signature: "now(): double",
+    implementation: () => Math.floor(Date.now() / 1000),
+};
+/**
+ * IntentOutputEnv is the CEL environment for output fee calculation
+ * Variables: amount, script
+ */
+exports.IntentOutputEnv = new cel_js_1.Environment()
+    .registerVariable(exports.AmountVariableName, "double")
+    .registerVariable(exports.OutputScriptVariableName, "string")
+    .registerFunction(nowFunction.signature, nowFunction.implementation);
+/**
+ * IntentOffchainInputEnv is the CEL environment for offchain input fee calculation
+ * Variables: amount, expiry, birth, weight, inputType
+ */
+exports.IntentOffchainInputEnv = new cel_js_1.Environment()
+    .registerVariable(exports.AmountVariableName, "double")
+    .registerVariable(exports.ExpiryVariableName, "double")
+    .registerVariable(exports.BirthVariableName, "double")
+    .registerVariable(exports.WeightVariableName, "double")
+    .registerVariable(exports.InputTypeVariableName, "string")
+    .registerFunction(nowFunction.signature, nowFunction.implementation);
+/**
+ * IntentOnchainInputEnv is the CEL environment for onchain input fee calculation
+ * Variables: amount
+ */
+exports.IntentOnchainInputEnv = new cel_js_1.Environment()
+    .registerVariable(exports.AmountVariableName, "double")
+    .registerFunction(nowFunction.signature, nowFunction.implementation);

package/dist/cjs/arkfee/estimator.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Estimator = void 0;
+const celenv_js_1 = require("./celenv.js");
+const types_js_1 = require("./types.js");
+/**
+ * Estimator evaluates CEL expressions to calculate fees for Ark intents
+ */
+class Estimator {
+    /**
+     * Creates a new Estimator with the given config
+     * @param config - Configuration containing CEL programs for fee calculation
+     */
+    constructor(config) {
+        this.config = config;
+        this.intentOffchainInput = config.offchainInput
+            ? parseProgram(config.offchainInput, celenv_js_1.IntentOffchainInputEnv)
+            : undefined;
+        this.intentOnchainInput = config.onchainInput
+            ? parseProgram(config.onchainInput, celenv_js_1.IntentOnchainInputEnv)
+            : undefined;
+        this.intentOffchainOutput = config.offchainOutput
+            ? parseProgram(config.offchainOutput, celenv_js_1.IntentOutputEnv)
+            : undefined;
+        this.intentOnchainOutput = config.onchainOutput
+            ? parseProgram(config.onchainOutput, celenv_js_1.IntentOutputEnv)
+            : undefined;
+    }
+    /**
+     * Evaluates the fee for a given vtxo input
+     * @param input - The offchain input to evaluate
+     * @returns The fee amount for this input
+     */
+    evalOffchainInput(input) {
+        if (!this.intentOffchainInput) {
+            return types_js_1.FeeAmount.ZERO;
+        }
+        const args = inputToArgs(input);
+        return new types_js_1.FeeAmount(this.intentOffchainInput.program(args));
+    }
+    /**
+     * Evaluates the fee for a given boarding input
+     * @param input - The onchain input to evaluate
+     * @returns The fee amount for this input
+     */
+    evalOnchainInput(input) {
+        if (!this.intentOnchainInput) {
+            return types_js_1.FeeAmount.ZERO;
+        }
+        const args = {
+            amount: Number(input.amount),
+        };
+        return new types_js_1.FeeAmount(this.intentOnchainInput.program(args));
+    }
+    /**
+     * Evaluates the fee for a given vtxo output
+     * @param output - The output to evaluate
+     * @returns The fee amount for this output
+     */
+    evalOffchainOutput(output) {
+        if (!this.intentOffchainOutput) {
+            return types_js_1.FeeAmount.ZERO;
+        }
+        const args = outputToArgs(output);
+        return new types_js_1.FeeAmount(this.intentOffchainOutput.program(args));
+    }
+    /**
+     * Evaluates the fee for a given collaborative exit output
+     * @param output - The output to evaluate
+     * @returns The fee amount for this output
+     */
+    evalOnchainOutput(output) {
+        if (!this.intentOnchainOutput) {
+            return types_js_1.FeeAmount.ZERO;
+        }
+        const args = outputToArgs(output);
+        return new types_js_1.FeeAmount(this.intentOnchainOutput.program(args));
+    }
+    /**
+     * Evaluates the fee for a given set of inputs and outputs
+     * @param offchainInputs - Array of offchain inputs to evaluate
+     * @param onchainInputs - Array of onchain inputs to evaluate
+     * @param offchainOutputs - Array of offchain outputs to evaluate
+     * @param onchainOutputs - Array of onchain outputs to evaluate
+     * @returns The total fee amount
+     */
+    eval(offchainInputs, onchainInputs, offchainOutputs, onchainOutputs) {
+        let fee = types_js_1.FeeAmount.ZERO;
+        for (const input of offchainInputs) {
+            fee = fee.add(this.evalOffchainInput(input));
+        }
+        for (const input of onchainInputs) {
+            fee = fee.add(this.evalOnchainInput(input));
+        }
+        for (const output of offchainOutputs) {
+            fee = fee.add(this.evalOffchainOutput(output));
+        }
+        for (const output of onchainOutputs) {
+            fee = fee.add(this.evalOnchainOutput(output));
+        }
+        return fee;
+    }
+}
+exports.Estimator = Estimator;
+function inputToArgs(input) {
+    const args = {
+        amount: Number(input.amount),
+        inputType: input.type,
+        weight: input.weight,
+    };
+    if (input.expiry) {
+        args.expiry = Math.floor(input.expiry.getTime() / 1000);
+    }
+    if (input.birth) {
+        args.birth = Math.floor(input.birth.getTime() / 1000);
+    }
+    return args;
+}
+function outputToArgs(output) {
+    return {
+        amount: Number(output.amount),
+        script: output.script,
+    };
+}
+/**
+ * Parses a CEL program and validates its return type
+ * @param text - The CEL program text to parse
+ * @param env - The CEL environment to use
+ * @returns parsed and validated program
+ */
+function parseProgram(text, env) {
+    const program = env.parse(text);
+    // Type check the program
+    const checkResult = program.check();
+    if (!checkResult.valid) {
+        throw new Error(`type check failed: ${checkResult.error?.message ?? "unknown error"}`);
+    }
+    // Verify return type is double
+    if (checkResult.type !== "double") {
+        throw new Error(`expected return type double, got ${checkResult.type}`);
+    }
+    return { program, text };
+}

package/dist/cjs/arkfee/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Estimator = void 0;
+var estimator_1 = require("./estimator");
+Object.defineProperty(exports, "Estimator", { enumerable: true, get: function () { return estimator_1.Estimator; } });

package/dist/cjs/arkfee/types.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FeeAmount = void 0;
+/**
+ * FeeAmount is a wrapper around a number that represents a fee amount in satoshis floating point.
+ * @param value - The fee amount in floating point.
+ * @method satoshis - Returns the fee amount in satoshis as a integer.
+ * @example
+ * const fee = new FeeAmount(1.23456789);
+ * console.log(fee.value); // 1.23456789
+ * console.log(fee.satoshis); // 2
+ */
+class FeeAmount {
+    constructor(value) {
+        this.value = value;
+    }
+    get satoshis() {
+        return this.value ? Math.ceil(this.value) : 0;
+    }
+    add(other) {
+        return new FeeAmount(this.value + other.value);
+    }
+}
+exports.FeeAmount = FeeAmount;
+FeeAmount.ZERO = new FeeAmount(0);

package/dist/cjs/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.networks = exports.ArkNote = exports.isVtxoExpiringSoon = exports.combineTapscriptSigs = exports.hasBoardingTxExpired = exports.waitForIncomingFunds = exports.verifyTapscriptSignatures = exports.buildOffchainTx = exports.ConditionWitness = exports.VtxoTaprootTree = exports.VtxoTreeExpiry = exports.CosignerPublicKey = exports.getArkPsbtFields = exports.setArkPsbtField = exports.ArkPsbtFieldKeyType = exports.ArkPsbtFieldKey = exports.TapTreeCoder = exports.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.decodeTapscript = exports.Response = exports.Request = exports.ServiceWorkerReadonlyWallet = exports.ServiceWorkerWallet = exports.Worker = exports.setupServiceWorker = exports.SettlementEventType = exports.ChainTxType = exports.IndexerTxType = exports.TxType = exports.VHTLC = exports.VtxoScript = exports.DefaultVtxo = exports.ArkAddress = exports.RestIndexerProvider = exports.RestArkProvider = exports.EsploraProvider = exports.ESPLORA_URL = exports.VtxoManager = exports.Ramps = exports.OnchainWallet = exports.ReadonlySingleKey = exports.SingleKey = exports.ReadonlyWallet = exports.Wallet = void 0;
 exports.getSequence = exports.isExpired = exports.isSubdust = exports.isSpendable = exports.isRecoverable = exports.buildForfeitTx = exports.validateConnectorsTxGraph = exports.validateVtxoTxGraph = exports.Batch = exports.maybeArkError = exports.ArkError = exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.Intent = void 0;
@@ -102,3 +116,4 @@ Object.defineProperty(exports, "validateVtxoTxGraph", { enumerable: true, get: f
 Object.defineProperty(exports, "validateConnectorsTxGraph", { enumerable: true, get: function () { return validation_1.validateConnectorsTxGraph; } });
 const forfeit_1 = require("./forfeit");
 Object.defineProperty(exports, "buildForfeitTx", { enumerable: true, get: function () { return forfeit_1.buildForfeitTx; } });
+__exportStar(require("./arkfee"), exports);

package/dist/cjs/intent/index.js

@@ -57,6 +57,27 @@ var Intent;
         return craftToSignTx(toSpend, inputs, outputs);
     }
     Intent.create = create;
+    function fee(proof) {
+        let sumOfInputs = 0n;
+        for (let i = 0; i < proof.inputsLength; i++) {
+            const input = proof.getInput(i);
+            if (input.witnessUtxo === undefined)
+                throw new Error("intent proof input requires witness utxo");
+            sumOfInputs += input.witnessUtxo.amount;
+        }
+        let sumOfOutputs = 0n;
+        for (let i = 0; i < proof.outputsLength; i++) {
+            const output = proof.getOutput(i);
+            if (output.amount === undefined)
+                throw new Error("intent proof output requires amount");
+            sumOfOutputs += output.amount;
+        }
+        if (sumOfOutputs > sumOfInputs) {
+            throw new Error(`intent proof output amount is greater than input amount: ${sumOfOutputs} > ${sumOfInputs}`);
+        }
+        return Number(sumOfInputs - sumOfOutputs);
+    }
+    Intent.fee = fee;
     function encodeMessage(message) {
         switch (message.type) {
             case "register":

package/dist/cjs/providers/ark.js

@@ -48,15 +48,7 @@ class RestArkProvider {
             digest: fromServer.digest ?? "",
             dust: BigInt(fromServer.dust ?? 0),
             fees: {
-                intentFee: {
-                    ...fromServer.fees?.intentFee,
-                    onchainInput: BigInt(
-                    // split(".")[0] to remove the decimal part
-                    (fromServer.fees?.intentFee?.onchainInput ?? "0").split(".")[0] ?? 0),
-                    onchainOutput: BigInt(
-                    // split(".")[0] to remove the decimal part
-                    (fromServer.fees?.intentFee?.onchainOutput ?? "0").split(".")[0] ?? 0),
-                },
+                intentFee: fromServer.fees?.intentFee ?? {},
                 txFeeRate: fromServer?.fees?.txFeeRate ?? "",
             },
             forfeitAddress: fromServer.forfeitAddress ?? "",
@@ -69,6 +61,7 @@ class RestArkProvider {
                     nextStartTime: BigInt(fromServer.scheduledSession.nextStartTime ?? 0),
                     nextEndTime: BigInt(fromServer.scheduledSession.nextEndTime ?? 0),
                     period: BigInt(fromServer.scheduledSession.period ?? 0),
+                    fees: fromServer.scheduledSession.fees ?? {},
                 }
                 : undefined,
             serviceStatus: fromServer.serviceStatus ?? {},

package/dist/cjs/providers/indexer.js

@@ -342,6 +342,7 @@ function convertVtxo(vtxo) {
         value: Number(vtxo.amount),
         status: {
             confirmed: !vtxo.isSwept && !vtxo.isPreconfirmed,
+            isLeaf: !vtxo.isPreconfirmed,
         },
         virtualStatus: {
             state: vtxo.isSwept

package/dist/cjs/utils/transactionHistory.js

@@ -1,168 +1,130 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vtxosToTxs = vtxosToTxs;
+exports.buildTransactionHistory = buildTransactionHistory;
 const wallet_1 = require("../wallet");
+const txKey = {
+    commitmentTxid: "",
+    boardingTxid: "",
+    arkTxid: "",
+};
 /**
- * @param spendable - Vtxos that are spendable
- * @param spent - Vtxos that are spent
- * @param boardingBatchTxids - Set of boarding batch txids
- * @returns Ark transactions
+ * Builds the transaction history by analyzing virtual coins (VTXOs), boarding transactions, and ignored commitments.
+ * History is sorted from newest to oldest and is composed only of SENT and RECEIVED transactions.
+ *
+ * @param {VirtualCoin[]} vtxos - An array of virtual coins representing the user's transactions and balances.
+ * @param {ArkTransaction[]} allBoardingTxs - An array of boarding transactions to include in the history.
+ * @param {Set<string>} commitmentsToIgnore - A set of commitment IDs that should be excluded from processing.
+ * @return {ExtendedArkTransaction[]} A sorted array of extended Ark transactions, representing the transaction history.
  */
-function vtxosToTxs(spendable, spent, boardingBatchTxids) {
-    const txs = [];
-    // Receive case
-    // All vtxos are received unless:
-    // - they resulted from a settlement (either boarding or refresh)
-    // - they are the change of a spend tx
-    let vtxosLeftToCheck = [...spent];
-    for (const vtxo of [...spendable, ...spent]) {
-        if (vtxo.virtualStatus.state !== "preconfirmed" &&
-            vtxo.virtualStatus.commitmentTxIds &&
-            vtxo.virtualStatus.commitmentTxIds.some((txid) => boardingBatchTxids.has(txid))) {
-            continue;
-        }
-        const settleVtxos = findVtxosSpentInSettlement(vtxosLeftToCheck, vtxo);
-        vtxosLeftToCheck = removeVtxosFromList(vtxosLeftToCheck, settleVtxos);
-        const settleAmount = reduceVtxosAmount(settleVtxos);
-        if (vtxo.value <= settleAmount) {
-            continue; // settlement or change, ignore
-        }
-        const spentVtxos = findVtxosSpentInPayment(vtxosLeftToCheck, vtxo);
-        vtxosLeftToCheck = removeVtxosFromList(vtxosLeftToCheck, spentVtxos);
-        const spentAmount = reduceVtxosAmount(spentVtxos);
-        if (vtxo.value <= spentAmount) {
-            continue; // settlement or change, ignore
-        }
-        const txKey = {
-            commitmentTxid: "",
-            boardingTxid: "",
-            arkTxid: "",
-        };
-        let settled = vtxo.virtualStatus.state !== "preconfirmed";
-        if (vtxo.virtualStatus.state === "preconfirmed") {
-            txKey.arkTxid = vtxo.txid;
-            if (vtxo.spentBy) {
-                settled = true;
+function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnore) {
+    const fromOldestVtxo = [...vtxos].sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+    const sent = [];
+    let received = [];
+    for (const vtxo of fromOldestVtxo) {
+        if (vtxo.status.isLeaf) {
+            // If this vtxo is a leaf and it's not the settlement of a boarding or there's no vtxo refreshed by it,
+            // it's translated into a received batch transaction
+            if (!commitmentsToIgnore.has(vtxo.virtualStatus.commitmentTxIds[0]) &&
+                fromOldestVtxo.filter((v) => v.settledBy === vtxo.virtualStatus.commitmentTxIds[0]).length === 0) {
+                received.push({
+                    key: {
+                        ...txKey,
+                        commitmentTxid: vtxo.virtualStatus.commitmentTxIds[0],
+                    },
+                    tag: "batch",
+                    type: wallet_1.TxType.TxReceived,
+                    amount: vtxo.value,
+                    settled: vtxo.status.isLeaf || vtxo.isSpent,
+                    createdAt: vtxo.createdAt.getTime(),
+                });
             }
         }
-        else {
-            txKey.commitmentTxid =
-                vtxo.virtualStatus.commitmentTxIds?.[0] || "";
+        else if (fromOldestVtxo.filter((v) => v.arkTxId === vtxo.txid).length === 0) {
+            // If this vtxo is preconfirmed and does not spend any other vtxos,
+            // it's translated into a received offchain transaction
+            received.push({
+                key: { ...txKey, arkTxid: vtxo.txid },
+                tag: "offchain",
+                type: wallet_1.TxType.TxReceived,
+                amount: vtxo.value,
+                settled: vtxo.status.isLeaf || vtxo.isSpent,
+                createdAt: vtxo.createdAt.getTime(),
+            });
         }
-        txs.push({
-            key: txKey,
-            amount: vtxo.value - settleAmount - spentAmount,
-            type: wallet_1.TxType.TxReceived,
-            createdAt: vtxo.createdAt.getTime(),
-            settled,
-        });
-    }
-    // vtxos by settled by or ark txid
-    const vtxosByTxid = new Map();
-    for (const v of spent) {
-        if (v.settledBy) {
-            if (!vtxosByTxid.has(v.settledBy)) {
-                vtxosByTxid.set(v.settledBy, []);
+        // If the vtxo is spent, it's translated into a sent transaction unless:
+        // - it's been refreshed (we don't want to add any record in this case)
+        // - a sent transaction has been already added to avoid duplicates (can happen if many vtxos have been spent in the same tx or forfeited in the same batch)
+        if (vtxo.isSpent) {
+            // If the vtxo is spent offchain, it's translated into offchain sent tx
+            if (vtxo.arkTxId &&
+                !sent.some((s) => s.key.arkTxid === vtxo.arkTxId)) {
+                const changes = fromOldestVtxo.filter((_) => _.txid === vtxo.arkTxId);
+                let txAmount = 0;
+                let txTime = 0;
+                if (changes.length > 0) {
+                    const changeAmount = changes.reduce((acc, v) => acc + v.value, 0);
+                    // We want to find all the other VTXOs spent by the same transaction to
+                    // calculate the full amount of the change.
+                    const allSpent = fromOldestVtxo.filter((v) => v.arkTxId === vtxo.arkTxId);
+                    const spentAmount = allSpent.reduce((acc, v) => acc + v.value, 0);
+                    txAmount = spentAmount - changeAmount;
+                    txTime = changes[0].createdAt.getTime();
+                }
+                else {
+                    txAmount = vtxo.value;
+                    // TODO: fetch the vtxo with /v1/indexer/vtxos?outpoints=<vtxo.arkTxid:0> to know when the tx was made
+                    txTime = vtxo.createdAt.getTime() + 1;
+                }
+                sent.push({
+                    key: { ...txKey, arkTxid: vtxo.arkTxId },
+                    tag: "offchain",
+                    type: wallet_1.TxType.TxSent,
+                    amount: txAmount,
+                    settled: true,
+                    createdAt: txTime,
+                });
             }
-            const currentVtxos = vtxosByTxid.get(v.settledBy);
-            vtxosByTxid.set(v.settledBy, [...currentVtxos, v]);
-        }
-        if (!v.arkTxId) {
-            continue;
-        }
-        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 vtxosByTxid) {
-        const resultedVtxos = findVtxosResultedFromTxid([...spendable, ...spent], sb);
-        const resultedAmount = reduceVtxosAmount(resultedVtxos);
-        const spentAmount = reduceVtxosAmount(vtxos);
-        if (spentAmount <= resultedAmount) {
-            continue; // settlement or change, ignore
-        }
-        const vtxo = getVtxo(resultedVtxos, vtxos);
-        const txKey = {
-            commitmentTxid: "",
-            boardingTxid: "",
-            arkTxid: "",
-        };
-        if (vtxo.virtualStatus.state === "preconfirmed") {
-            txKey.arkTxid = resultedAmount === 0 ? vtxo.arkTxId : vtxo.txid;
-        }
-        else {
-            txKey.commitmentTxid =
-                vtxo.virtualStatus.commitmentTxIds?.[0] || "";
-        }
-        txs.push({
-            key: txKey,
-            amount: spentAmount - resultedAmount,
-            type: wallet_1.TxType.TxSent,
-            createdAt: vtxo.createdAt.getTime(),
-            settled: true,
-        });
-    }
-    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) {
-            if (v.txid === vtxoToRemove.txid && v.vout === vtxoToRemove.vout) {
-                return false;
+            // If the vtxo is forfeited in a batch and the total sum of forfeited vtxos is bigger than the sum of new vtxos,
+            // it's translated into an exit sent tx
+            if (vtxo.settledBy &&
+                !commitmentsToIgnore.has(vtxo.settledBy) &&
+                !sent.some((s) => s.key.commitmentTxid === vtxo.settledBy)) {
+                const changes = fromOldestVtxo.filter((v) => v.status.isLeaf &&
+                    v.virtualStatus.commitmentTxIds?.every((_) => vtxo.settledBy === _));
+                const forfeitVtxos = fromOldestVtxo.filter((v) => v.settledBy === vtxo.settledBy);
+                const forfeitAmount = forfeitVtxos.reduce((acc, v) => acc + v.value, 0);
+                if (changes.length > 0) {
+                    const settledAmount = changes.reduce((acc, v) => acc + v.value, 0);
+                    // forfeitAmount > settledAmount --> collaborative exit with offchain change
+                    // TODO: make this support fees!
+                    if (forfeitAmount > settledAmount) {
+                        sent.push({
+                            key: { ...txKey, commitmentTxid: vtxo.settledBy },
+                            tag: "exit",
+                            type: wallet_1.TxType.TxSent,
+                            amount: forfeitAmount - settledAmount,
+                            settled: true,
+                            createdAt: changes[0].createdAt.getTime(),
+                        });
+                    }
+                }
+                else {
+                    // forfeitAmount > 0 && settledAmount == 0 --> collaborative exit without any offchain change
+                    sent.push({
+                        key: { ...txKey, commitmentTxid: vtxo.settledBy },
+                        tag: "exit",
+                        type: wallet_1.TxType.TxSent,
+                        amount: forfeitAmount,
+                        settled: true,
+                        // TODO: fetch commitment tx with /v1/indexer/commitmentTx/<commitmentTxid> to know when the tx was made
+                        createdAt: vtxo.createdAt.getTime() + 1,
+                    });
+                }
             }
         }
-        return true;
-    });
+    }
+    // Boardings are always inbound amounts, and we only hide the ones to ignore.
+    const boardingTx = allBoardingTxs.map((tx) => ({ ...tx, tag: "boarding" }));
+    const sorted = [...boardingTx, ...sent, ...received].sort((a, b) => b.createdAt - a.createdAt);
+    return sorted;
 }