@arkade-os/sdk 0.3.4 → 0.3.5

package/README.md

@@ -171,7 +171,13 @@ Collaborative exit or "offboarding" allows you to withdraw your virtual funds to
 ```typescript
 import { Ramps } from '@arkade-os/sdk'
 
-const exitTxid = await new Ramps(wallet).offboard(onchainAddress);
+// Get fee information from the server
+const info = await wallet.arkProvider.getInfo();
+
+const exitTxid = await new Ramps(wallet).offboard(
+  onchainAddress,
+  info.fees
+);
 ```
 
 ### Unilateral Exit

package/dist/cjs/providers/ark.js

@@ -46,7 +46,14 @@ class RestArkProvider {
             })) ?? [],
             digest: fromServer.digest ?? "",
             dust: BigInt(fromServer.dust ?? 0),
-            fees: fromServer.fees,
+            fees: {
+                intentFee: {
+                    ...fromServer.fees?.intentFee,
+                    onchainInput: BigInt(fromServer.fees?.intentFee?.onchainInput ?? 0),
+                    onchainOutput: BigInt(fromServer.fees?.intentFee?.onchainOutput ?? 0),
+                },
+                txFeeRate: fromServer?.fees?.txFeeRate ?? "",
+            },
             forfeitAddress: fromServer.forfeitAddress ?? "",
             forfeitPubkey: fromServer.forfeitPubkey ?? "",
             network: fromServer.network ?? "",

package/dist/cjs/utils/transactionHistory.js

@@ -14,6 +14,10 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     // All vtxos are received unless:
     // - they resulted from a settlement (either boarding or refresh)
     // - they are the change of a spend tx
+    // - they were spent in a payment (have arkTxId set)
+    // - they resulted from a payment (their txid matches an arkTxId of a spent vtxo)
+    // First, collect all arkTxIds from spent vtxos to identify payment transactions
+    const paymentArkTxIds = new Set(spent.filter((v) => v.arkTxId).map((v) => v.arkTxId));
     let vtxosLeftToCheck = [...spent];
     for (const vtxo of [...spendable, ...spent]) {
         if (vtxo.virtualStatus.state !== "preconfirmed" &&
@@ -21,6 +25,16 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
             vtxo.virtualStatus.commitmentTxIds.some((txid) => boardingBatchTxids.has(txid))) {
             continue;
         }
+        // Skip vtxos that were spent in a payment transaction
+        // These will be handled in the sent transaction section below
+        if (vtxo.arkTxId) {
+            continue;
+        }
+        // Skip vtxos that resulted from a payment transaction
+        // (their txid matches an arkTxId from a spent vtxo)
+        if (paymentArkTxIds.has(vtxo.txid)) {
+            continue;
+        }
         const settleVtxos = findVtxosSpentInSettlement(vtxosLeftToCheck, vtxo);
         vtxosLeftToCheck = removeVtxosFromList(vtxosLeftToCheck, settleVtxos);
         const settleAmount = reduceVtxosAmount(settleVtxos);
@@ -56,21 +70,17 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     // 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, []);
-            }
-            const currentVtxos = vtxosByTxid.get(v.settledBy);
-            vtxosByTxid.set(v.settledBy, [...currentVtxos, v]);
-        }
-        if (!v.arkTxId) {
+        // Prefer arkTxId over settledBy to avoid duplicates
+        // A vtxo should only be grouped once
+        const groupKey = v.arkTxId || v.settledBy;
+        if (!groupKey) {
             continue;
         }
-        if (!vtxosByTxid.has(v.arkTxId)) {
-            vtxosByTxid.set(v.arkTxId, []);
+        if (!vtxosByTxid.has(groupKey)) {
+            vtxosByTxid.set(groupKey, []);
         }
-        const currentVtxos = vtxosByTxid.get(v.arkTxId);
-        vtxosByTxid.set(v.arkTxId, [...currentVtxos, v]);
+        const currentVtxos = vtxosByTxid.get(groupKey);
+        vtxosByTxid.set(groupKey, [...currentVtxos, v]);
     }
     for (const [sb, vtxos] of vtxosByTxid) {
         const resultedVtxos = findVtxosResultedFromTxid([...spendable, ...spent], sb);
@@ -85,7 +95,13 @@ function vtxosToTxs(spendable, spent, boardingBatchTxids) {
             boardingTxid: "",
             arkTxid: "",
         };
-        if (vtxo.virtualStatus.state === "preconfirmed") {
+        // Use the grouping key (sb) as arkTxid if it looks like an arkTxId
+        // (i.e., if the spent vtxos had arkTxId set, use that instead of result vtxo's txid)
+        const isArkTxId = vtxos.some((v) => v.arkTxId === sb);
+        if (isArkTxId) {
+            txKey.arkTxid = sb;
+        }
+        else if (vtxo.virtualStatus.state === "preconfirmed") {
             txKey.arkTxid = vtxo.txid;
         }
         txs.push({

package/dist/cjs/wallet/ramps.js

@@ -56,10 +56,11 @@ class Ramps {
      * Offboard vtxos, or "collaborative exit" vtxos to onchain address.
      *
      * @param destinationAddress - The destination address to offboard to.
+     * @param feeInfo - The fee info to deduct from the offboard amount.
      * @param amount - The amount to offboard. If not provided, the total amount of vtxos will be offboarded.
      * @param eventCallback - The callback to receive settlement events. optional.
      */
-    async offboard(destinationAddress, amount, eventCallback) {
+    async offboard(destinationAddress, feeInfo, amount, eventCallback) {
         const vtxos = await this.wallet.getVtxos({
             withRecoverable: true,
             withUnrolled: false,
@@ -73,6 +74,11 @@ class Ramps {
             change = totalAmount - amount;
         }
         amount = amount ?? totalAmount;
+        const fees = feeInfo.intentFee.onchainOutput;
+        if (fees > amount) {
+            throw new Error(`can't deduct fees from offboard amount (${fees} > ${amount})`);
+        }
+        amount -= fees;
         const outputs = [
             {
                 address: destinationAddress,

package/dist/cjs/wallet/wallet.js

@@ -431,14 +431,13 @@ class Wallet {
             });
         }
         const tapTree = this.offchainTapscript.encode();
-        let offchainTx = (0, arkTransaction_1.buildOffchainTx)(selected.inputs.map((input) => ({
+        const offchainTx = (0, arkTransaction_1.buildOffchainTx)(selected.inputs.map((input) => ({
             ...input,
             tapLeafScript: selectedLeaf,
             tapTree,
         })), outputs, this.serverUnrollScript);
         const signedVirtualTx = await this.identity.sign(offchainTx.arkTx);
         const { arkTxid, signedCheckpointTxs } = await this.arkProvider.submitTx(base_1.base64.encode(signedVirtualTx.toPSBT()), offchainTx.checkpoints.map((c) => base_1.base64.encode(c.toPSBT())));
-        // TODO persist final virtual tx and checkpoints to repository
         // sign the checkpoints
         const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {
             const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(c));
@@ -446,7 +445,78 @@ class Wallet {
             return base_1.base64.encode(signedCheckpoint.toPSBT());
         }));
         await this.arkProvider.finalizeTx(arkTxid, finalCheckpoints);
-        return arkTxid;
+        try {
+            // mark VTXOs as spent and optionally add the change VTXO
+            const spentVtxos = [];
+            const commitmentTxIds = new Set();
+            let batchExpiry = Number.MAX_SAFE_INTEGER;
+            for (const [inputIndex, input] of selected.inputs.entries()) {
+                const vtxo = (0, utils_1.extendVirtualCoin)(this, input);
+                const checkpointB64 = signedCheckpointTxs[inputIndex];
+                const checkpoint = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(checkpointB64));
+                spentVtxos.push({
+                    ...vtxo,
+                    virtualStatus: { ...vtxo.virtualStatus, state: "spent" },
+                    spentBy: checkpoint.id,
+                    arkTxId: arkTxid,
+                    isSpent: true,
+                });
+                if (vtxo.virtualStatus.commitmentTxIds) {
+                    for (const commitmentTxId of vtxo.virtualStatus
+                        .commitmentTxIds) {
+                        commitmentTxIds.add(commitmentTxId);
+                    }
+                }
+                if (vtxo.virtualStatus.batchExpiry) {
+                    batchExpiry = Math.min(batchExpiry, vtxo.virtualStatus.batchExpiry);
+                }
+            }
+            const createdAt = Date.now();
+            const addr = this.arkAddress.encode();
+            if (selected.changeAmount > 0n &&
+                batchExpiry !== Number.MAX_SAFE_INTEGER) {
+                const changeVtxo = {
+                    txid: arkTxid,
+                    vout: outputs.length - 1,
+                    createdAt: new Date(createdAt),
+                    forfeitTapLeafScript: this.offchainTapscript.forfeit(),
+                    intentTapLeafScript: this.offchainTapscript.exit(),
+                    isUnrolled: false,
+                    isSpent: false,
+                    tapTree: this.offchainTapscript.encode(),
+                    value: Number(selected.changeAmount),
+                    virtualStatus: {
+                        state: "preconfirmed",
+                        commitmentTxIds: Array.from(commitmentTxIds),
+                        batchExpiry,
+                    },
+                    status: {
+                        confirmed: false,
+                    },
+                };
+                await this.walletRepository.saveVtxos(addr, [changeVtxo]);
+            }
+            await this.walletRepository.saveVtxos(addr, spentVtxos);
+            await this.walletRepository.saveTransactions(addr, [
+                {
+                    key: {
+                        boardingTxid: "",
+                        commitmentTxid: "",
+                        arkTxid: arkTxid,
+                    },
+                    amount: params.amount,
+                    type: _1.TxType.TxSent,
+                    settled: false,
+                    createdAt: Date.now(),
+                },
+            ]);
+        }
+        catch (e) {
+            console.warn("error saving offchain tx to repository", e);
+        }
+        finally {
+            return arkTxid;
+        }
     }
     async settle(params, eventCallback) {
         if (params?.inputs) {
@@ -719,7 +789,8 @@ class Wallet {
             (async () => {
                 try {
                     for await (const update of subscription) {
-                        if (update.newVtxos?.length > 0) {
+                        if (update.newVtxos?.length > 0 ||
+                            update.spentVtxos?.length > 0) {
                             eventCallback({
                                 type: "vtxo",
                                 newVtxos: update.newVtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this, vtxo)),

package/dist/esm/providers/ark.js

@@ -42,7 +42,14 @@ export class RestArkProvider {
             })) ?? [],
             digest: fromServer.digest ?? "",
             dust: BigInt(fromServer.dust ?? 0),
-            fees: fromServer.fees,
+            fees: {
+                intentFee: {
+                    ...fromServer.fees?.intentFee,
+                    onchainInput: BigInt(fromServer.fees?.intentFee?.onchainInput ?? 0),
+                    onchainOutput: BigInt(fromServer.fees?.intentFee?.onchainOutput ?? 0),
+                },
+                txFeeRate: fromServer?.fees?.txFeeRate ?? "",
+            },
             forfeitAddress: fromServer.forfeitAddress ?? "",
             forfeitPubkey: fromServer.forfeitPubkey ?? "",
             network: fromServer.network ?? "",

package/dist/esm/utils/transactionHistory.js

@@ -11,6 +11,10 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     // All vtxos are received unless:
     // - they resulted from a settlement (either boarding or refresh)
     // - they are the change of a spend tx
+    // - they were spent in a payment (have arkTxId set)
+    // - they resulted from a payment (their txid matches an arkTxId of a spent vtxo)
+    // First, collect all arkTxIds from spent vtxos to identify payment transactions
+    const paymentArkTxIds = new Set(spent.filter((v) => v.arkTxId).map((v) => v.arkTxId));
     let vtxosLeftToCheck = [...spent];
     for (const vtxo of [...spendable, ...spent]) {
         if (vtxo.virtualStatus.state !== "preconfirmed" &&
@@ -18,6 +22,16 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
             vtxo.virtualStatus.commitmentTxIds.some((txid) => boardingBatchTxids.has(txid))) {
             continue;
         }
+        // Skip vtxos that were spent in a payment transaction
+        // These will be handled in the sent transaction section below
+        if (vtxo.arkTxId) {
+            continue;
+        }
+        // Skip vtxos that resulted from a payment transaction
+        // (their txid matches an arkTxId from a spent vtxo)
+        if (paymentArkTxIds.has(vtxo.txid)) {
+            continue;
+        }
         const settleVtxos = findVtxosSpentInSettlement(vtxosLeftToCheck, vtxo);
         vtxosLeftToCheck = removeVtxosFromList(vtxosLeftToCheck, settleVtxos);
         const settleAmount = reduceVtxosAmount(settleVtxos);
@@ -53,21 +67,17 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
     // 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, []);
-            }
-            const currentVtxos = vtxosByTxid.get(v.settledBy);
-            vtxosByTxid.set(v.settledBy, [...currentVtxos, v]);
-        }
-        if (!v.arkTxId) {
+        // Prefer arkTxId over settledBy to avoid duplicates
+        // A vtxo should only be grouped once
+        const groupKey = v.arkTxId || v.settledBy;
+        if (!groupKey) {
             continue;
         }
-        if (!vtxosByTxid.has(v.arkTxId)) {
-            vtxosByTxid.set(v.arkTxId, []);
+        if (!vtxosByTxid.has(groupKey)) {
+            vtxosByTxid.set(groupKey, []);
         }
-        const currentVtxos = vtxosByTxid.get(v.arkTxId);
-        vtxosByTxid.set(v.arkTxId, [...currentVtxos, v]);
+        const currentVtxos = vtxosByTxid.get(groupKey);
+        vtxosByTxid.set(groupKey, [...currentVtxos, v]);
     }
     for (const [sb, vtxos] of vtxosByTxid) {
         const resultedVtxos = findVtxosResultedFromTxid([...spendable, ...spent], sb);
@@ -82,7 +92,13 @@ export function vtxosToTxs(spendable, spent, boardingBatchTxids) {
             boardingTxid: "",
             arkTxid: "",
         };
-        if (vtxo.virtualStatus.state === "preconfirmed") {
+        // Use the grouping key (sb) as arkTxid if it looks like an arkTxId
+        // (i.e., if the spent vtxos had arkTxId set, use that instead of result vtxo's txid)
+        const isArkTxId = vtxos.some((v) => v.arkTxId === sb);
+        if (isArkTxId) {
+            txKey.arkTxid = sb;
+        }
+        else if (vtxo.virtualStatus.state === "preconfirmed") {
             txKey.arkTxid = vtxo.txid;
         }
         txs.push({

package/dist/esm/wallet/ramps.js

@@ -53,10 +53,11 @@ export class Ramps {
      * Offboard vtxos, or "collaborative exit" vtxos to onchain address.
      *
      * @param destinationAddress - The destination address to offboard to.
+     * @param feeInfo - The fee info to deduct from the offboard amount.
      * @param amount - The amount to offboard. If not provided, the total amount of vtxos will be offboarded.
      * @param eventCallback - The callback to receive settlement events. optional.
      */
-    async offboard(destinationAddress, amount, eventCallback) {
+    async offboard(destinationAddress, feeInfo, amount, eventCallback) {
         const vtxos = await this.wallet.getVtxos({
             withRecoverable: true,
             withUnrolled: false,
@@ -70,6 +71,11 @@ export class Ramps {
             change = totalAmount - amount;
         }
         amount = amount ?? totalAmount;
+        const fees = feeInfo.intentFee.onchainOutput;
+        if (fees > amount) {
+            throw new Error(`can't deduct fees from offboard amount (${fees} > ${amount})`);
+        }
+        amount -= fees;
         const outputs = [
             {
                 address: destinationAddress,

package/dist/esm/wallet/wallet.js

@@ -394,14 +394,13 @@ export class Wallet {
             });
         }
         const tapTree = this.offchainTapscript.encode();
-        let offchainTx = buildOffchainTx(selected.inputs.map((input) => ({
+        const offchainTx = buildOffchainTx(selected.inputs.map((input) => ({
             ...input,
             tapLeafScript: selectedLeaf,
             tapTree,
         })), outputs, this.serverUnrollScript);
         const signedVirtualTx = await this.identity.sign(offchainTx.arkTx);
         const { arkTxid, signedCheckpointTxs } = await this.arkProvider.submitTx(base64.encode(signedVirtualTx.toPSBT()), offchainTx.checkpoints.map((c) => base64.encode(c.toPSBT())));
-        // TODO persist final virtual tx and checkpoints to repository
         // sign the checkpoints
         const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {
             const tx = Transaction.fromPSBT(base64.decode(c));
@@ -409,7 +408,78 @@ export class Wallet {
             return base64.encode(signedCheckpoint.toPSBT());
         }));
         await this.arkProvider.finalizeTx(arkTxid, finalCheckpoints);
-        return arkTxid;
+        try {
+            // mark VTXOs as spent and optionally add the change VTXO
+            const spentVtxos = [];
+            const commitmentTxIds = new Set();
+            let batchExpiry = Number.MAX_SAFE_INTEGER;
+            for (const [inputIndex, input] of selected.inputs.entries()) {
+                const vtxo = extendVirtualCoin(this, input);
+                const checkpointB64 = signedCheckpointTxs[inputIndex];
+                const checkpoint = Transaction.fromPSBT(base64.decode(checkpointB64));
+                spentVtxos.push({
+                    ...vtxo,
+                    virtualStatus: { ...vtxo.virtualStatus, state: "spent" },
+                    spentBy: checkpoint.id,
+                    arkTxId: arkTxid,
+                    isSpent: true,
+                });
+                if (vtxo.virtualStatus.commitmentTxIds) {
+                    for (const commitmentTxId of vtxo.virtualStatus
+                        .commitmentTxIds) {
+                        commitmentTxIds.add(commitmentTxId);
+                    }
+                }
+                if (vtxo.virtualStatus.batchExpiry) {
+                    batchExpiry = Math.min(batchExpiry, vtxo.virtualStatus.batchExpiry);
+                }
+            }
+            const createdAt = Date.now();
+            const addr = this.arkAddress.encode();
+            if (selected.changeAmount > 0n &&
+                batchExpiry !== Number.MAX_SAFE_INTEGER) {
+                const changeVtxo = {
+                    txid: arkTxid,
+                    vout: outputs.length - 1,
+                    createdAt: new Date(createdAt),
+                    forfeitTapLeafScript: this.offchainTapscript.forfeit(),
+                    intentTapLeafScript: this.offchainTapscript.exit(),
+                    isUnrolled: false,
+                    isSpent: false,
+                    tapTree: this.offchainTapscript.encode(),
+                    value: Number(selected.changeAmount),
+                    virtualStatus: {
+                        state: "preconfirmed",
+                        commitmentTxIds: Array.from(commitmentTxIds),
+                        batchExpiry,
+                    },
+                    status: {
+                        confirmed: false,
+                    },
+                };
+                await this.walletRepository.saveVtxos(addr, [changeVtxo]);
+            }
+            await this.walletRepository.saveVtxos(addr, spentVtxos);
+            await this.walletRepository.saveTransactions(addr, [
+                {
+                    key: {
+                        boardingTxid: "",
+                        commitmentTxid: "",
+                        arkTxid: arkTxid,
+                    },
+                    amount: params.amount,
+                    type: TxType.TxSent,
+                    settled: false,
+                    createdAt: Date.now(),
+                },
+            ]);
+        }
+        catch (e) {
+            console.warn("error saving offchain tx to repository", e);
+        }
+        finally {
+            return arkTxid;
+        }
     }
     async settle(params, eventCallback) {
         if (params?.inputs) {
@@ -682,7 +752,8 @@ export class Wallet {
             (async () => {
                 try {
                     for await (const update of subscription) {
-                        if (update.newVtxos?.length > 0) {
+                        if (update.newVtxos?.length > 0 ||
+                            update.spentVtxos?.length > 0) {
                             eventCallback({
                                 type: "vtxo",
                                 newVtxos: update.newVtxos.map((vtxo) => extendVirtualCoin(this, vtxo)),

package/dist/types/index.d.ts

@@ -18,7 +18,7 @@ import { Worker } from "./wallet/serviceWorker/worker";
 import { Request } from "./wallet/serviceWorker/request";
 import { Response } from "./wallet/serviceWorker/response";
 import { ESPLORA_URL, EsploraProvider, OnchainProvider, ExplorerTransaction } from "./providers/onchain";
-import { RestArkProvider, ArkProvider, SettlementEvent, SettlementEventType, ArkInfo, SignedIntent, Output, TxNotification, BatchFinalizationEvent, BatchFinalizedEvent, BatchFailedEvent, TreeSigningStartedEvent, TreeNoncesEvent, BatchStartedEvent, TreeTxEvent, TreeSignatureEvent, ScheduledSession } from "./providers/ark";
+import { RestArkProvider, ArkProvider, SettlementEvent, SettlementEventType, ArkInfo, SignedIntent, Output, TxNotification, BatchFinalizationEvent, BatchFinalizedEvent, BatchFailedEvent, TreeSigningStartedEvent, TreeNoncesEvent, BatchStartedEvent, TreeTxEvent, TreeSignatureEvent, ScheduledSession, FeeInfo } from "./providers/ark";
 import { CLTVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CSVMultisigTapscript, decodeTapscript, MultisigTapscript, TapscriptType, ArkTapscript, RelativeTimelock } from "./script/tapscript";
 import { hasBoardingTxExpired, buildOffchainTx, verifyTapscriptSignatures, ArkTxInput, OffchainTx, combineTapscriptSigs } from "./utils/arkTransaction";
 import { VtxoTaprootTree, ConditionWitness, getArkPsbtFields, setArkPsbtField, ArkPsbtFieldCoder, ArkPsbtFieldKey, ArkPsbtFieldKeyType, CosignerPublicKey, VtxoTreeExpiry } from "./utils/unknownFields";
@@ -34,4 +34,4 @@ import { WalletRepositoryImpl } from "./repositories/walletRepository";
 import { ContractRepositoryImpl } from "./repositories/contractRepository";
 import { ArkError, maybeArkError } from "./providers/errors";
 export { Wallet, SingleKey, OnchainWallet, Ramps, VtxoManager, ESPLORA_URL, EsploraProvider, RestArkProvider, RestIndexerProvider, ArkAddress, DefaultVtxo, VtxoScript, VHTLC, TxType, IndexerTxType, ChainTxType, SettlementEventType, setupServiceWorker, Worker, ServiceWorkerWallet, Request, Response, decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CLTVMultisigTapscript, TapTreeCoder, ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, combineTapscriptSigs, ArkNote, networks, WalletRepositoryImpl, ContractRepositoryImpl, Intent, TxTree, P2A, Unroll, Transaction, ArkError, maybeArkError, };
-export type { Identity, IWallet, WalletConfig, ProviderClass, ArkTransaction, Coin, ExtendedCoin, ExtendedVirtualCoin, WalletBalance, SendBitcoinParams, Recipient, SettleParams, Status, VirtualStatus, Outpoint, VirtualCoin, TxKey, TapscriptType, ArkTxInput, OffchainTx, TapLeaves, IncomingFunds, IndexerProvider, PageResponse, Batch, ChainTx, CommitmentTx, TxHistoryRecord, Vtxo, VtxoChain, Tx, OnchainProvider, ArkProvider, SettlementEvent, ArkInfo, SignedIntent, Output, TxNotification, ExplorerTransaction, BatchFinalizationEvent, BatchFinalizedEvent, BatchFailedEvent, TreeSigningStartedEvent, TreeNoncesEvent, BatchStartedEvent, TreeTxEvent, TreeSignatureEvent, ScheduledSession, PaginationOptions, SubscriptionResponse, SubscriptionHeartbeat, SubscriptionEvent, Network, NetworkName, ArkTapscript, RelativeTimelock, EncodedVtxoScript, TapLeafScript, SignerSession, TreeNonces, TreePartialSigs, GetVtxosFilter, Nonces, PartialSig, ArkPsbtFieldCoder, TxTreeNode, AnchorBumper, };
+export type { Identity, IWallet, WalletConfig, ProviderClass, ArkTransaction, Coin, ExtendedCoin, ExtendedVirtualCoin, WalletBalance, SendBitcoinParams, Recipient, SettleParams, Status, VirtualStatus, Outpoint, VirtualCoin, TxKey, TapscriptType, ArkTxInput, OffchainTx, TapLeaves, IncomingFunds, IndexerProvider, PageResponse, Batch, ChainTx, CommitmentTx, TxHistoryRecord, Vtxo, VtxoChain, Tx, OnchainProvider, ArkProvider, SettlementEvent, FeeInfo, ArkInfo, SignedIntent, Output, TxNotification, ExplorerTransaction, BatchFinalizationEvent, BatchFinalizedEvent, BatchFailedEvent, TreeSigningStartedEvent, TreeNoncesEvent, BatchStartedEvent, TreeTxEvent, TreeSignatureEvent, ScheduledSession, PaginationOptions, SubscriptionResponse, SubscriptionHeartbeat, SubscriptionEvent, Network, NetworkName, ArkTapscript, RelativeTimelock, EncodedVtxoScript, TapLeafScript, SignerSession, TreeNonces, TreePartialSigs, GetVtxosFilter, Nonces, PartialSig, ArkPsbtFieldCoder, TxTreeNode, AnchorBumper, };

package/dist/types/providers/ark.d.ts

@@ -75,8 +75,8 @@ export interface ScheduledSession {
 export interface IntentFeeInfo {
     offchainInput: string;
     offchainOutput: string;
-    onchainInput: string;
-    onchainOutput: string;
+    onchainInput: bigint;
+    onchainOutput: bigint;
 }
 export interface FeeInfo {
     intentFee: IntentFeeInfo;

package/dist/types/wallet/ramps.d.ts

@@ -1,5 +1,5 @@
 import { ExtendedCoin, IWallet } from ".";
-import { SettlementEvent } from "../providers/ark";
+import { FeeInfo, SettlementEvent } from "../providers/ark";
 /**
  * Ramps is a class wrapping IWallet.settle method to provide a more convenient interface for onboarding and offboarding operations.
  *
@@ -25,8 +25,9 @@ export declare class Ramps {
      * Offboard vtxos, or "collaborative exit" vtxos to onchain address.
      *
      * @param destinationAddress - The destination address to offboard to.
+     * @param feeInfo - The fee info to deduct from the offboard amount.
      * @param amount - The amount to offboard. If not provided, the total amount of vtxos will be offboarded.
      * @param eventCallback - The callback to receive settlement events. optional.
      */
-    offboard(destinationAddress: string, amount?: bigint, eventCallback?: (event: SettlementEvent) => void): ReturnType<IWallet["settle"]>;
+    offboard(destinationAddress: string, feeInfo: FeeInfo, amount?: bigint, eventCallback?: (event: SettlementEvent) => void): ReturnType<IWallet["settle"]>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -63,8 +63,8 @@
     "@types/node": "24.3.1",
     "@vitest/coverage-v8": "3.2.4",
     "esbuild": "^0.25.9",
-    "expo": "~52.0.47",
     "eventsource": "4.0.0",
+    "expo": "~52.0.47",
     "glob": "11.0.3",
     "husky": "9.1.7",
     "prettier": "3.6.2",