@arkade-os/sdk 0.3.0-alpha.8 → 0.3.1-alpha.0

package/README.md

@@ -108,26 +108,76 @@ const settleTxid = await wallet.settle({
 })
 ```
 
+### VTXO Management (Renewal & Recovery)
+
+VTXOs have an expiration time (batch expiry). The SDK provides the `VtxoManager` class to handle both:
+
+- **Renewal**: Renew VTXOs before they expire to maintain unilateral control of the funds.
+- **Recovery**: Reclaim swept or expired VTXOs back to the wallet in case renewal window was missed.
+
+```typescript
+import { VtxoManager } from '@arkade-os/sdk'
+
+// Create manager with optional renewal configuration
+const manager = new VtxoManager(wallet, {
+  enabled: true,           // Enable expiration monitoring
+  thresholdPercentage: 10  // Alert when 10% of lifetime remains (default)
+})
+```
+
+#### Renewal: Prevent Expiration
+
+Renew VTXOs before they expire to keep your liquidity accessible. This settles all VTXOs (including recoverable ones) back to your wallet with a fresh expiration time.
+
+```typescript
+// Check which VTXOs are expiring soon
+const expiringVtxos = await manager.getExpiringVtxos()
+if (expiringVtxos.length > 0) {
+  console.log(`${expiringVtxos.length} VTXOs expiring soon`)
+
+  expiringVtxos.forEach(vtxo => {
+    const timeLeft = vtxo.virtualStatus.batchExpiry! - Date.now()
+    const hoursLeft = Math.floor(timeLeft / (1000 * 60 * 60))
+    console.log(`VTXO ${vtxo.txid} expires in ${hoursLeft} hours`)
+  })
+
+  // Renew all VTXOs to prevent expiration
+  const txid = await manager.renewVtxos()
+  console.log('Renewed:', txid)
+}
+
+// Override threshold percentage (e.g., renew when 5% of time remains)
+const urgentlyExpiring = await manager.getExpiringVtxos(5)
+```
+
+
+#### Recovery: Reclaim Swept VTXOs
+
+Recover VTXOs that have been swept by the server or consolidate small amounts (subdust).
+
+```typescript
+// Check what's recoverable
+const balance = await manager.getRecoverableBalance()
+console.log(`Recoverable: ${balance.recoverable} sats`)
+console.log(`Subdust: ${balance.subdust} sats`)
+console.log(`Subdust included: ${balance.includesSubdust}`)
+console.log(`VTXO count: ${balance.vtxoCount}`)
+
+if (balance.recoverable > 0n) {
+  // Recover swept VTXOs and preconfirmed subdust
+  const txid = await manager.recoverVtxos((event) => {
+    console.log('Settlement event:', event.type)
+  })
+  console.log('Recovered:', txid)
+}
+```
+
 
 ### Transaction History
 
 ```typescript
 // Get transaction history
 const history = await wallet.getTransactionHistory()
-console.log('History:', history)
-
-// Example history entry:
-{
-  key: {
-    boardingTxid: '...', // for boarding transactions
-    commitmentTxid: '...', // for commitment transactions
-    redeemTxid: '...'    // for regular transactions
-  },
-  type: TxType.TxReceived, // or TxType.TxSent
-  amount: 50000,
-  settled: true,
-  createdAt: 1234567890
-}
 ```
 
 ### Offboarding

package/dist/cjs/arknote/index.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArkNote = void 0;
 const base_1 = require("@scure/base");
-const base_2 = require("../script/base");
 const utils_js_1 = require("@scure/btc-signer/utils.js");
-const script_js_1 = require("@scure/btc-signer/script.js");
+const btc_signer_1 = require("@scure/btc-signer");
+const base_2 = require("../script/base");
 /**
  * ArkNotes are special virtual coins in the Ark protocol that can be created
  * and spent without requiring any transactions. The server mints them, and they
@@ -85,5 +85,5 @@ function readUInt32BE(array, offset) {
     return view.getUint32(0, false);
 }
 function noteTapscript(preimageHash) {
-    return script_js_1.Script.encode(["SHA256", preimageHash, "EQUAL"]);
+    return btc_signer_1.Script.encode(["SHA256", preimageHash, "EQUAL"]);
 }

package/dist/cjs/forfeit.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildForfeitTx = buildForfeitTx;
-const transaction_js_1 = require("@scure/btc-signer/transaction.js");
+const btc_signer_1 = require("@scure/btc-signer");
 const anchor_1 = require("./utils/anchor");
 function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
-    const tx = new transaction_js_1.Transaction({
+    const tx = new btc_signer_1.Transaction({
         version: 3,
         lockTime: txLocktime,
+        allowUnknownOutputs: true,
+        allowUnknown: true,
+        allowUnknownInputs: true,
     });
     let amount = 0n;
     for (const input of inputs) {

package/dist/cjs/identity/singleKey.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleKey = void 0;
 const utils_js_1 = require("@scure/btc-signer/utils.js");
-const base_1 = require("@scure/base");
 const transaction_js_1 = require("@scure/btc-signer/transaction.js");
+const base_1 = require("@scure/base");
 const signingSession_1 = require("../tree/signingSession");
 const secp256k1_1 = require("@noble/secp256k1");
 const ZERO_32 = new Uint8Array(32).fill(0);
@@ -82,9 +82,10 @@ class SingleKey {
     signerSession() {
         return signingSession_1.TreeSignerSession.random();
     }
-    async signMessage(message) {
-        const msgBytes = new TextEncoder().encode(message);
-        return secp256k1_1.schnorr.sign((0, utils_js_1.sha256)(msgBytes), this.key);
+    async signMessage(message, signatureType = "schnorr") {
+        if (signatureType === "ecdsa")
+            return (0, secp256k1_1.sign)(message, this.key, { prehash: false });
+        return secp256k1_1.schnorr.sign(message, this.key);
     }
 }
 exports.SingleKey = SingleKey;

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.BIP322 = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.networks = exports.ArkNote = exports.hasBoardingTxExpired = exports.waitForIncomingFunds = exports.buildOffchainTx = exports.ConditionWitness = exports.VtxoTaprootTree = exports.VtxoTreeExpiry = exports.CosignerPublicKey = exports.getArkPsbtFields = exports.setArkPsbtField = exports.ArkPsbtFieldKeyType = exports.ArkPsbtFieldKey = exports.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.decodeTapscript = exports.Response = exports.Request = 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.Ramps = exports.OnchainWallet = exports.SingleKey = exports.Wallet = void 0;
+exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.Intent = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = exports.networks = exports.ArkNote = 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.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.decodeTapscript = exports.Response = exports.Request = 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.SingleKey = exports.Wallet = void 0;
 const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return transaction_js_1.Transaction; } });
 const singleKey_1 = require("./identity/singleKey");
@@ -22,6 +22,8 @@ const txTree_1 = require("./tree/txTree");
 Object.defineProperty(exports, "TxTree", { enumerable: true, get: function () { return txTree_1.TxTree; } });
 const ramps_1 = require("./wallet/ramps");
 Object.defineProperty(exports, "Ramps", { enumerable: true, get: function () { return ramps_1.Ramps; } });
+const vtxo_manager_1 = require("./wallet/vtxo-manager");
+Object.defineProperty(exports, "VtxoManager", { enumerable: true, get: function () { return vtxo_manager_1.VtxoManager; } });
 const wallet_3 = require("./wallet/serviceWorker/wallet");
 Object.defineProperty(exports, "ServiceWorkerWallet", { enumerable: true, get: function () { return wallet_3.ServiceWorkerWallet; } });
 const onchain_1 = require("./wallet/onchain");
@@ -50,6 +52,7 @@ Object.defineProperty(exports, "MultisigTapscript", { enumerable: true, get: fun
 const arkTransaction_1 = require("./utils/arkTransaction");
 Object.defineProperty(exports, "hasBoardingTxExpired", { enumerable: true, get: function () { return arkTransaction_1.hasBoardingTxExpired; } });
 Object.defineProperty(exports, "buildOffchainTx", { enumerable: true, get: function () { return arkTransaction_1.buildOffchainTx; } });
+Object.defineProperty(exports, "verifyTapscriptSignatures", { enumerable: true, get: function () { return arkTransaction_1.verifyTapscriptSignatures; } });
 const unknownFields_1 = require("./utils/unknownFields");
 Object.defineProperty(exports, "VtxoTaprootTree", { enumerable: true, get: function () { return unknownFields_1.VtxoTaprootTree; } });
 Object.defineProperty(exports, "ConditionWitness", { enumerable: true, get: function () { return unknownFields_1.ConditionWitness; } });
@@ -59,8 +62,8 @@ Object.defineProperty(exports, "ArkPsbtFieldKey", { enumerable: true, get: funct
 Object.defineProperty(exports, "ArkPsbtFieldKeyType", { enumerable: true, get: function () { return unknownFields_1.ArkPsbtFieldKeyType; } });
 Object.defineProperty(exports, "CosignerPublicKey", { enumerable: true, get: function () { return unknownFields_1.CosignerPublicKey; } });
 Object.defineProperty(exports, "VtxoTreeExpiry", { enumerable: true, get: function () { return unknownFields_1.VtxoTreeExpiry; } });
-const bip322_1 = require("./bip322");
-Object.defineProperty(exports, "BIP322", { enumerable: true, get: function () { return bip322_1.BIP322; } });
+const intent_1 = require("./intent");
+Object.defineProperty(exports, "Intent", { enumerable: true, get: function () { return intent_1.Intent; } });
 const arknote_1 = require("./arknote");
 Object.defineProperty(exports, "ArkNote", { enumerable: true, get: function () { return arknote_1.ArkNote; } });
 const networks_1 = require("./networks");

package/dist/cjs/{bip322 → intent}/index.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BIP322 = void 0;
-exports.craftToSpendTx = craftToSpendTx;
-const script_js_1 = require("@scure/btc-signer/script.js");
-const transaction_js_1 = require("@scure/btc-signer/transaction.js");
-const script_js_2 = require("@scure/btc-signer/script.js");
-const errors_1 = require("./errors");
+exports.Intent = void 0;
+const btc_signer_1 = require("@scure/btc-signer");
 const secp256k1_js_1 = require("@noble/curves/secp256k1.js");
-const base_1 = require("@scure/base");
 /**
- * BIP-322 signature implementation for Bitcoin message signing.
+ * Intent proof implementation for Bitcoin message signing.
  *
- * BIP-322 defines a standard for signing Bitcoin messages as well as proving
+ * Intent proof defines a standard for signing Bitcoin messages as well as proving
  * ownership of coins. This namespace provides utilities for creating and
- * validating BIP-322.
+ * validating Intent proof.
  *
+ * it is greatly inspired by BIP322.
  * @see https://github.com/bitcoin/bips/blob/master/bip-0322.mediawiki
  *
  * @example
  * ```typescript
- * // Create a BIP-322 proof
- * const proof = BIP322.create(
+ * // Create a Intent proof
+ * const proof = Intent.create(
  *   "Hello Bitcoin!",
  *   [input],
  *   [output]
@@ -29,65 +25,46 @@ const base_1 = require("@scure/base");
  * // Sign the proof
  * const signedProof = await identity.sign(proof);
  *
- * // Extract the signature
- * const signature = BIP322.signature(signedProof);
- * ```
  */
-var BIP322;
-(function (BIP322) {
+var Intent;
+(function (Intent) {
     /**
-     * Creates a new BIP-322 "full" proof of funds unsigned transaction.
+     * Creates a new Intent proof unsigned transaction.
      *
      * This function constructs a special transaction that can be signed to prove
      * ownership of VTXOs and UTXOs. The proof includes the message to be
      * signed and the inputs/outputs that demonstrate ownership.
      *
-     * @param message - The BIP-322 message to be signed
+     * @param message - The Intent message to be signed
      * @param inputs - Array of transaction inputs to prove ownership of
      * @param outputs - Optional array of transaction outputs
-     * @returns An unsigned BIP-322 proof transaction
+     * @returns An unsigned Intent proof transaction
      */
     function create(message, inputs, outputs = []) {
         if (inputs.length == 0)
-            throw errors_1.ErrMissingInputs;
+            throw new Error("intent proof requires at least one input");
         if (!validateInputs(inputs))
-            throw errors_1.ErrMissingData;
+            throw new Error("invalid inputs");
         if (!validateOutputs(outputs))
-            throw errors_1.ErrMissingData;
+            throw new Error("invalid outputs");
         // create the initial transaction to spend
         const toSpend = craftToSpendTx(message, inputs[0].witnessUtxo.script);
         // create the transaction to sign
         return craftToSignTx(toSpend, inputs, outputs);
     }
-    BIP322.create = create;
-    /**
-     * Finalizes and extracts the FullProof transaction into a BIP-322 signature.
-     *
-     * This function takes a signed proof transaction and converts it into a
-     * base64-encoded signature string. If the proof's inputs have special
-     * spending conditions, a custom finalizer can be provided.
-     *
-     * @param signedProof - The signed BIP-322 proof transaction
-     * @param finalizer - Optional custom finalizer function
-     * @returns Base64-encoded BIP-322 signature
-     */
-    function signature(signedProof, finalizer = (tx) => tx.finalize()) {
-        finalizer(signedProof);
-        return base_1.base64.encode(signedProof.extract());
-    }
-    BIP322.signature = signature;
-})(BIP322 || (exports.BIP322 = BIP322 = {}));
-const OP_RETURN_EMPTY_PKSCRIPT = new Uint8Array([script_js_1.OP.RETURN]);
+    Intent.create = create;
+})(Intent || (exports.Intent = Intent = {}));
+const OP_RETURN_EMPTY_PKSCRIPT = new Uint8Array([btc_signer_1.OP.RETURN]);
 const ZERO_32 = new Uint8Array(32).fill(0);
 const MAX_INDEX = 0xffffffff;
-const TAG_BIP322 = "BIP0322-signed-message";
+const TAG_INTENT_PROOF = "ark-intent-proof-message";
 function validateInput(input) {
     if (input.index === undefined)
-        throw errors_1.ErrMissingData;
+        throw new Error("intent proof input requires index");
     if (input.txid === undefined)
-        throw errors_1.ErrMissingData;
+        throw new Error("intent proof input requires txid");
     if (input.witnessUtxo === undefined)
-        throw errors_1.ErrMissingWitnessUtxo;
+        throw new Error("intent proof input requires witness utxo");
     return true;
 }
 function validateInputs(inputs) {
@@ -96,9 +73,9 @@ function validateInputs(inputs) {
 }
 function validateOutput(output) {
     if (output.amount === undefined)
-        throw errors_1.ErrMissingData;
+        throw new Error("intent proof output requires amount");
     if (output.script === undefined)
-        throw errors_1.ErrMissingData;
+        throw new Error("intent proof output requires script");
     return true;
 }
 function validateOutputs(outputs) {
@@ -108,7 +85,7 @@ function validateOutputs(outputs) {
 // craftToSpendTx creates the initial transaction that will be spent in the proof
 function craftToSpendTx(message, pkScript) {
     const messageHash = hashMessage(message);
-    const tx = new transaction_js_1.Transaction({
+    const tx = new btc_signer_1.Transaction({
         version: 0,
         allowUnknownOutputs: true,
         allowUnknown: true,
@@ -126,14 +103,14 @@ function craftToSpendTx(message, pkScript) {
         script: pkScript,
     });
     tx.updateInput(0, {
-        finalScriptSig: script_js_2.Script.encode(["OP_0", messageHash]),
+        finalScriptSig: btc_signer_1.Script.encode(["OP_0", messageHash]),
     });
     return tx;
 }
 // craftToSignTx creates the transaction that will be signed for the proof
 function craftToSignTx(toSpend, inputs, outputs) {
     const firstInput = inputs[0];
-    const tx = new transaction_js_1.Transaction({
+    const tx = new btc_signer_1.Transaction({
         version: 2,
         allowUnknownOutputs: outputs.length === 0,
         allowUnknown: true,
@@ -149,14 +126,19 @@ function craftToSignTx(toSpend, inputs, outputs) {
             script: firstInput.witnessUtxo.script,
             amount: 0n,
         },
-        sighashType: transaction_js_1.SigHash.ALL,
+        sighashType: btc_signer_1.SigHash.ALL,
     });
     // add other inputs
-    for (const input of inputs) {
+    for (const [i, input] of inputs.entries()) {
         tx.addInput({
             ...input,
-            sighashType: transaction_js_1.SigHash.ALL,
+            sighashType: btc_signer_1.SigHash.ALL,
         });
+        if (input.unknown?.length) {
+            tx.updateInput(i + 1, {
+                unknown: input.unknown,
+            });
+        }
     }
     // add the special OP_RETURN output if no outputs are provided
     if (outputs.length === 0) {
@@ -176,5 +158,5 @@ function craftToSignTx(toSpend, inputs, outputs) {
     return tx;
 }
 function hashMessage(message) {
-    return secp256k1_js_1.schnorr.utils.taggedHash(TAG_BIP322, new TextEncoder().encode(message));
+    return secp256k1_js_1.schnorr.utils.taggedHash(TAG_INTENT_PROOF, new TextEncoder().encode(message));
 }

package/dist/cjs/providers/ark.js

@@ -36,25 +36,36 @@ class RestArkProvider {
         }
         const fromServer = await response.json();
         return {
-            ...fromServer,
-            vtxoTreeExpiry: BigInt(fromServer.vtxoTreeExpiry ?? 0),
-            unilateralExitDelay: BigInt(fromServer.unilateralExitDelay ?? 0),
-            roundInterval: BigInt(fromServer.roundInterval ?? 0),
-            dust: BigInt(fromServer.dust ?? 0),
-            utxoMinAmount: BigInt(fromServer.utxoMinAmount ?? 0),
-            utxoMaxAmount: BigInt(fromServer.utxoMaxAmount ?? -1),
-            vtxoMinAmount: BigInt(fromServer.vtxoMinAmount ?? 0),
-            vtxoMaxAmount: BigInt(fromServer.vtxoMaxAmount ?? -1),
             boardingExitDelay: BigInt(fromServer.boardingExitDelay ?? 0),
-            checkpointExitClosure: fromServer.checkpointTapscript ?? "",
-            marketHour: "marketHour" in fromServer && fromServer.marketHour != null
+            checkpointTapscript: fromServer.checkpointTapscript ?? "",
+            deprecatedSigners: fromServer.deprecatedSigners?.map((signer) => ({
+                cutoffDate: BigInt(signer.cutoffDate ?? 0),
+                pubkey: signer.pubkey ?? "",
+            })) ?? [],
+            digest: fromServer.digest ?? "",
+            dust: BigInt(fromServer.dust ?? 0),
+            fees: fromServer.fees,
+            forfeitAddress: fromServer.forfeitAddress ?? "",
+            forfeitPubkey: fromServer.forfeitPubkey ?? "",
+            network: fromServer.network ?? "",
+            scheduledSession: "scheduledSession" in fromServer &&
+                fromServer.scheduledSession != null
                 ? {
-                    nextStartTime: BigInt(fromServer.marketHour.nextStartTime ?? 0),
-                    nextEndTime: BigInt(fromServer.marketHour.nextEndTime ?? 0),
-                    period: BigInt(fromServer.marketHour.period ?? 0),
-                    roundInterval: BigInt(fromServer.marketHour.roundInterval ?? 0),
+                    duration: BigInt(fromServer.scheduledSession.duration ?? 0),
+                    nextStartTime: BigInt(fromServer.scheduledSession.nextStartTime ?? 0),
+                    nextEndTime: BigInt(fromServer.scheduledSession.nextEndTime ?? 0),
+                    period: BigInt(fromServer.scheduledSession.period ?? 0),
                 }
                 : undefined,
+            serviceStatus: fromServer.serviceStatus ?? {},
+            sessionDuration: BigInt(fromServer.sessionDuration ?? 0),
+            signerPubkey: fromServer.signerPubkey ?? "",
+            unilateralExitDelay: BigInt(fromServer.unilateralExitDelay ?? 0),
+            utxoMaxAmount: BigInt(fromServer.utxoMaxAmount ?? -1),
+            utxoMinAmount: BigInt(fromServer.utxoMinAmount ?? 0),
+            version: fromServer.version ?? "",
+            vtxoMaxAmount: BigInt(fromServer.vtxoMaxAmount ?? -1),
+            vtxoMinAmount: BigInt(fromServer.vtxoMinAmount ?? 0),
         };
     }
     async submitTx(signedArkTx, checkpointTxs) {
@@ -65,8 +76,8 @@ class RestArkProvider {
                 "Content-Type": "application/json",
             },
             body: JSON.stringify({
-                signedArkTx: signedArkTx,
-                checkpointTxs: checkpointTxs,
+                signedArkTx,
+                checkpointTxs,
             }),
         });
         if (!response.ok) {
@@ -115,7 +126,7 @@ class RestArkProvider {
             },
             body: JSON.stringify({
                 intent: {
-                    signature: intent.signature,
+                    proof: intent.proof,
                     message: intent.message,
                 },
             }),
@@ -136,7 +147,7 @@ class RestArkProvider {
             },
             body: JSON.stringify({
                 proof: {
-                    signature: intent.signature,
+                    proof: intent.proof,
                     message: intent.message,
                 },
             }),
@@ -309,6 +320,31 @@ class RestArkProvider {
             }
         }
     }
+    async getPendingTxs(intent) {
+        const url = `${this.serverUrl}/v1/tx/pending`;
+        const response = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({ intent }),
+        });
+        if (!response.ok) {
+            const errorText = await response.text();
+            try {
+                const grpcError = JSON.parse(errorText);
+                // gRPC errors usually have a message and code field
+                throw new Error(`Failed to get pending transactions: ${grpcError.message || grpcError.error || errorText}`);
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            }
+            catch (_) {
+                // If JSON parse fails, use the raw error text
+                throw new Error(`Failed to get pending transactions: ${errorText}`);
+            }
+        }
+        const data = await response.json();
+        return data.pendingTxs;
+    }
     parseSettlementEvent(data) {
         // Check for BatchStarted event
         if (data.batchStarted) {
@@ -387,6 +423,10 @@ class RestArkProvider {
                 signature: data.treeSignature.signature,
             };
         }
+        // TODO: Handle TreeNoncesEvent when implemented server-side
+        if (data.treeNonces) {
+            return null;
+        }
         // Skip heartbeat events
         if (data.heartbeat) {
             return null;
@@ -431,17 +471,16 @@ function encodeMusig2Nonces(nonces) {
     for (const [txid, nonce] of nonces) {
         noncesObject[txid] = base_1.hex.encode(nonce.pubNonce);
     }
-    return JSON.stringify(noncesObject);
+    return noncesObject;
 }
 function encodeMusig2Signatures(signatures) {
     const sigObject = {};
     for (const [txid, sig] of signatures) {
         sigObject[txid] = base_1.hex.encode(sig.encode());
     }
-    return JSON.stringify(sigObject);
+    return sigObject;
 }
-function decodeMusig2Nonces(str) {
-    const noncesObject = JSON.parse(str);
+function decodeMusig2Nonces(noncesObject) {
     return new Map(Object.entries(noncesObject).map(([txid, nonce]) => {
         if (typeof nonce !== "string") {
             throw new Error("invalid nonce");