@arkade-os/sdk 0.3.1-alpha.1 → 0.3.1-alpha.3

package/dist/cjs/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.ArkError = 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;
+exports.maybeArkError = 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");
@@ -80,3 +81,6 @@ const walletRepository_1 = require("./repositories/walletRepository");
 Object.defineProperty(exports, "WalletRepositoryImpl", { enumerable: true, get: function () { return walletRepository_1.WalletRepositoryImpl; } });
 const contractRepository_1 = require("./repositories/contractRepository");
 Object.defineProperty(exports, "ContractRepositoryImpl", { enumerable: true, get: function () { return contractRepository_1.ContractRepositoryImpl; } });
+const errors_1 = require("./providers/errors");
+Object.defineProperty(exports, "ArkError", { enumerable: true, get: function () { return errors_1.ArkError; } });
+Object.defineProperty(exports, "maybeArkError", { enumerable: true, get: function () { return errors_1.maybeArkError; } });

package/dist/cjs/musig2/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregateKeys = exports.sign = exports.PartialSig = exports.generateNonces = void 0;
+exports.aggregateKeys = exports.sign = exports.PartialSig = exports.aggregateNonces = exports.generateNonces = void 0;
 var nonces_1 = require("./nonces");
 Object.defineProperty(exports, "generateNonces", { enumerable: true, get: function () { return nonces_1.generateNonces; } });
+Object.defineProperty(exports, "aggregateNonces", { enumerable: true, get: function () { return nonces_1.aggregateNonces; } });
 var sign_1 = require("./sign");
 Object.defineProperty(exports, "PartialSig", { enumerable: true, get: function () { return sign_1.PartialSig; } });
 Object.defineProperty(exports, "sign", { enumerable: true, get: function () { return sign_1.sign; } });

package/dist/cjs/musig2/nonces.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateNonces = generateNonces;
+exports.aggregateNonces = aggregateNonces;
 const musig = __importStar(require("@scure/btc-signer/musig2.js"));
 /**
  * Generates a pair of public and secret nonces for MuSig2 signing
@@ -42,3 +43,6 @@ function generateNonces(publicKey) {
     const nonces = musig.nonceGen(publicKey);
     return { secNonce: nonces.secret, pubNonce: nonces.public };
 }
+function aggregateNonces(pubNonces) {
+    return musig.nonceAggregate(pubNonces);
+}

package/dist/cjs/providers/ark.js

@@ -4,6 +4,7 @@ exports.RestArkProvider = exports.SettlementEventType = void 0;
 exports.isFetchTimeoutError = isFetchTimeoutError;
 const base_1 = require("@scure/base");
 const utils_1 = require("./utils");
+const errors_1 = require("./errors");
 var SettlementEventType;
 (function (SettlementEventType) {
     SettlementEventType["BatchStarted"] = "batch_started";
@@ -11,7 +12,7 @@ var SettlementEventType;
     SettlementEventType["BatchFinalized"] = "batch_finalized";
     SettlementEventType["BatchFailed"] = "batch_failed";
     SettlementEventType["TreeSigningStarted"] = "tree_signing_started";
-    SettlementEventType["TreeNoncesAggregated"] = "tree_nonces_aggregated";
+    SettlementEventType["TreeNonces"] = "tree_nonces";
     SettlementEventType["TreeTx"] = "tree_tx";
     SettlementEventType["TreeSignature"] = "tree_signature";
 })(SettlementEventType || (exports.SettlementEventType = SettlementEventType = {}));
@@ -32,7 +33,8 @@ class RestArkProvider {
         const url = `${this.serverUrl}/v1/info`;
         const response = await fetch(url);
         if (!response.ok) {
-            throw new Error(`Failed to get server info: ${response.statusText}`);
+            const errorText = await response.text();
+            handleError(errorText, `Failed to get server info: ${response.statusText}`);
         }
         const fromServer = await response.json();
         return {
@@ -82,16 +84,7 @@ class RestArkProvider {
         });
         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 submit virtual transaction: ${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 submit virtual transaction: ${errorText}`);
-            }
+            handleError(errorText, `Failed to submit virtual transaction: ${errorText}`);
         }
         const data = await response.json();
         return {
@@ -114,7 +107,7 @@ class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to finalize offchain transaction: ${errorText}`);
+            handleError(errorText, `Failed to finalize offchain transaction: ${errorText}`);
         }
     }
     async registerIntent(intent) {
@@ -133,7 +126,7 @@ class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to register intent: ${errorText}`);
+            handleError(errorText, `Failed to register intent: ${errorText}`);
         }
         const data = await response.json();
         return data.intentId;
@@ -154,7 +147,7 @@ class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to delete intent: ${errorText}`);
+            handleError(errorText, `Failed to delete intent: ${errorText}`);
         }
     }
     async confirmRegistration(intentId) {
@@ -170,7 +163,7 @@ class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to confirm registration: ${errorText}`);
+            handleError(errorText, `Failed to confirm registration: ${errorText}`);
         }
     }
     async submitTreeNonces(batchId, pubkey, nonces) {
@@ -188,7 +181,7 @@ class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to submit tree nonces: ${errorText}`);
+            handleError(errorText, `Failed to submit tree nonces: ${errorText}`);
         }
     }
     async submitTreeSignatures(batchId, pubkey, signatures) {
@@ -206,7 +199,7 @@ class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to submit tree signatures: ${errorText}`);
+            handleError(errorText, `Failed to submit tree signatures: ${errorText}`);
         }
     }
     async submitSignedForfeitTxs(signedForfeitTxs, signedCommitmentTx) {
@@ -222,7 +215,8 @@ class RestArkProvider {
             }),
         });
         if (!response.ok) {
-            throw new Error(`Failed to submit forfeit transactions: ${response.statusText}`);
+            const errorText = await response.text();
+            handleError(errorText, `Failed to submit forfeit transactions: ${response.statusText}`);
         }
     }
     async *getEventStream(signal, topics) {
@@ -331,16 +325,7 @@ class RestArkProvider {
         });
         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}`);
-            }
+            handleError(errorText, `Failed to get pending transactions: ${errorText}`);
         }
         const data = await response.json();
         return data.pendingTxs;
@@ -390,10 +375,16 @@ class RestArkProvider {
         }
         // Check for TreeNoncesAggregated event
         if (data.treeNoncesAggregated) {
+            // skip treeNoncesAggregated event, deprecated
+            return null;
+        }
+        if (data.treeNonces) {
             return {
-                type: SettlementEventType.TreeNoncesAggregated,
-                id: data.treeNoncesAggregated.id,
-                treeNonces: decodeMusig2Nonces(data.treeNoncesAggregated.treeNonces),
+                type: SettlementEventType.TreeNonces,
+                id: data.treeNonces.id,
+                topic: data.treeNonces.topic,
+                txid: data.treeNonces.txid,
+                nonces: decodeMusig2Nonces(data.treeNonces.nonces), // pubkey -> public nonce
             };
         }
         // Check for TreeTx event
@@ -423,10 +414,6 @@ 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;
@@ -522,3 +509,8 @@ function mapVtxo(vtxo) {
         arkTxid: vtxo.arkTxid,
     };
 }
+function handleError(errorText, defaultMessage) {
+    const error = new Error(errorText);
+    const arkError = (0, errors_1.maybeArkError)(error);
+    throw arkError ?? new Error(defaultMessage);
+}

package/dist/cjs/providers/errors.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArkError = void 0;
+exports.maybeArkError = maybeArkError;
+class ArkError extends Error {
+    constructor(code, message, name, metadata) {
+        super(message);
+        this.code = code;
+        this.message = message;
+        this.name = name;
+        this.metadata = metadata;
+    }
+}
+exports.ArkError = ArkError;
+/**
+ * Try to convert an error to an ArkError class, returning undefined if the error is not an ArkError
+ * @param error - The error to parse
+ * @returns The parsed ArkError, or undefined if the error is not an ArkError
+ */
+function maybeArkError(error) {
+    try {
+        if (!(error instanceof Error))
+            return undefined;
+        const decoded = JSON.parse(error.message);
+        if (!("details" in decoded))
+            return undefined;
+        if (!Array.isArray(decoded.details))
+            return undefined;
+        // search for a valid details object with the correct type
+        for (const details of decoded.details) {
+            if (!("@type" in details))
+                continue;
+            const type = details["@type"];
+            if (type !== "type.googleapis.com/ark.v1.ErrorDetails")
+                continue;
+            if (!("code" in details))
+                continue;
+            const code = details.code;
+            if (!("message" in details))
+                continue;
+            const message = details.message;
+            if (!("name" in details))
+                continue;
+            const name = details.name;
+            let metadata;
+            if ("metadata" in details && isMetadata(details.metadata)) {
+                metadata = details.metadata;
+            }
+            return new ArkError(code, message, name, metadata);
+        }
+        return undefined;
+    }
+    catch (e) {
+        return undefined;
+    }
+}
+function isMetadata(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/dist/cjs/repositories/walletRepository.js

@@ -61,18 +61,6 @@ class WalletRepositoryImpl {
             return [];
         }
     }
-    async saveVtxo(address, vtxo) {
-        const vtxos = await this.getVtxos(address);
-        const existing = vtxos.findIndex((v) => v.txid === vtxo.txid && v.vout === vtxo.vout);
-        if (existing !== -1) {
-            vtxos[existing] = vtxo;
-        }
-        else {
-            vtxos.push(vtxo);
-        }
-        this.cache.vtxos.set(address, vtxos.slice());
-        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(vtxos.map(serializeVtxo)));
-    }
     async saveVtxos(address, vtxos) {
         const storedVtxos = await this.getVtxos(address);
         for (const vtxo of vtxos) {
@@ -119,20 +107,6 @@ class WalletRepositoryImpl {
             return [];
         }
     }
-    async saveTransaction(address, tx) {
-        const transactions = await this.getTransactionHistory(address);
-        const existing = transactions.findIndex((t) => t.key === tx.key);
-        if (existing !== -1) {
-            transactions[existing] = tx;
-        }
-        else {
-            transactions.push(tx);
-        }
-        // Sort by createdAt descending
-        transactions.sort((a, b) => b.createdAt - a.createdAt);
-        this.cache.transactions.set(address, transactions);
-        await this.storage.setItem(`tx:${address}`, JSON.stringify(transactions));
-    }
     async saveTransactions(address, txs) {
         const storedTransactions = await this.getTransactionHistory(address);
         for (const tx of txs) {

package/dist/cjs/tree/signingSession.js

@@ -77,10 +77,44 @@ class TreeSignerSession {
         }
         return publicNonces;
     }
-    async setAggregatedNonces(nonces) {
-        if (this.aggregateNonces)
-            throw new Error("nonces already set");
-        this.aggregateNonces = nonces;
+    async aggregatedNonces(txid, noncesByPubkey) {
+        if (!this.graph)
+            throw exports.ErrMissingVtxoGraph;
+        if (!this.aggregateNonces) {
+            this.aggregateNonces = new Map();
+        }
+        if (!this.myNonces) {
+            await this.getNonces(); // generate nonces if not generated yet
+        }
+        if (this.aggregateNonces.has(txid)) {
+            return {
+                hasAllNonces: this.aggregateNonces.size === this.myNonces?.size,
+            };
+        }
+        const myNonce = this.myNonces.get(txid);
+        if (!myNonce)
+            throw new Error(`missing nonce for txid ${txid}`);
+        const myPublicKey = await this.getPublicKey();
+        // set my nonce to not rely on server
+        noncesByPubkey.set(base_1.hex.encode(myPublicKey.subarray(1)), myNonce);
+        const tx = this.graph.find(txid);
+        if (!tx)
+            throw new Error(`missing tx for txid ${txid}`);
+        const cosigners = (0, unknownFields_1.getArkPsbtFields)(tx.root, 0, unknownFields_1.CosignerPublicKey).map((c) => base_1.hex.encode(c.key.subarray(1)) // xonly pubkey
+        );
+        const pubNonces = [];
+        for (const cosigner of cosigners) {
+            const nonce = noncesByPubkey.get(cosigner);
+            if (!nonce) {
+                throw new Error(`missing nonce for cosigner ${cosigner}`);
+            }
+            pubNonces.push(nonce.pubNonce);
+        }
+        const aggregateNonce = musig2.aggregateNonces(pubNonces);
+        this.aggregateNonces.set(txid, { pubNonce: aggregateNonce });
+        return {
+            hasAllNonces: this.aggregateNonces.size === this.myNonces?.size,
+        };
     }
     async sign() {
         if (!this.graph)

package/dist/cjs/utils/unknownFields.js

@@ -51,9 +51,9 @@ var ArkPsbtFieldKey;
 })(ArkPsbtFieldKey || (exports.ArkPsbtFieldKey = ArkPsbtFieldKey = {}));
 /**
  * ArkPsbtFieldKeyType is the type of the ark psbt field key.
- * Every ark psbt field has key type 255.
+ * Every ark psbt field has key type 222.
  */
-exports.ArkPsbtFieldKeyType = 255;
+exports.ArkPsbtFieldKeyType = 222;
 /**
  * setArkPsbtField appends a new unknown field to the input at inputIndex
  *

package/dist/cjs/wallet/serviceWorker/response.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Response = void 0;
+const base_1 = require("@scure/base");
+function getRandomId() {
+    const randomValue = crypto.getRandomValues(new Uint8Array(16));
+    return base_1.hex.encode(randomValue);
+}
 /**
  * Response is the namespace that contains the response types for the service worker.
  */
@@ -187,4 +192,31 @@ var Response;
         };
     }
     Response.walletReloaded = walletReloaded;
+    function isVtxoUpdate(response) {
+        return response.type === "VTXO_UPDATE";
+    }
+    Response.isVtxoUpdate = isVtxoUpdate;
+    function vtxoUpdate(newVtxos, spentVtxos) {
+        return {
+            type: "VTXO_UPDATE",
+            id: getRandomId(), // spontaneous update, not tied to a request
+            success: true,
+            spentVtxos,
+            newVtxos,
+        };
+    }
+    Response.vtxoUpdate = vtxoUpdate;
+    function isUtxoUpdate(response) {
+        return response.type === "UTXO_UPDATE";
+    }
+    Response.isUtxoUpdate = isUtxoUpdate;
+    function utxoUpdate(coins) {
+        return {
+            type: "UTXO_UPDATE",
+            id: getRandomId(), // spontaneous update, not tied to a request
+            success: true,
+            coins,
+        };
+    }
+    Response.utxoUpdate = utxoUpdate;
 })(Response || (exports.Response = Response = {}));

package/dist/cjs/wallet/serviceWorker/wallet.js

@@ -256,6 +256,9 @@ class ServiceWorkerWallet {
             return new Promise((resolve, reject) => {
                 const messageHandler = (event) => {
                     const response = event.data;
+                    if (response.id !== message.id) {
+                        return;
+                    }
                     if (!response.success) {
                         navigator.serviceWorker.removeEventListener("message", messageHandler);
                         reject(new Error(response.message));

package/dist/cjs/wallet/serviceWorker/worker.js

@@ -130,11 +130,11 @@ class Worker {
                     ...spentVtxos,
                 ]);
                 // notify all clients about the vtxo update
-                this.sendMessageToAllClients("VTXO_UPDATE", JSON.stringify({ newVtxos, spentVtxos }));
+                this.sendMessageToAllClients(response_1.Response.vtxoUpdate(newVtxos, spentVtxos));
             }
             if (funds.type === "utxo") {
                 // notify all clients about the utxo update
-                this.sendMessageToAllClients("UTXO_UPDATE", JSON.stringify(funds.coins));
+                this.sendMessageToAllClients(response_1.Response.utxoUpdate(funds.coins));
             }
         });
     }
@@ -518,15 +518,12 @@ class Worker {
                 event.source?.postMessage(response_1.Response.error(message.id, "Unknown message type"));
         }
     }
-    async sendMessageToAllClients(type, message) {
+    async sendMessageToAllClients(message) {
         self.clients
             .matchAll({ includeUncontrolled: true, type: "window" })
             .then((clients) => {
             clients.forEach((client) => {
-                client.postMessage({
-                    type,
-                    message,
-                });
+                client.postMessage(message);
             });
         });
     }

package/dist/cjs/wallet/wallet.js

@@ -546,13 +546,13 @@ class Wallet {
                             if (!hasOffchainOutputs) {
                                 // if there are no offchain outputs, we don't have to handle musig2 tree signatures
                                 // we can directly advance to the finalization step
-                                step = ark_1.SettlementEventType.TreeNoncesAggregated;
+                                step = ark_1.SettlementEventType.TreeNonces;
                             }
                         }
                         break;
                     case ark_1.SettlementEventType.TreeTx:
                         if (step !== ark_1.SettlementEventType.BatchStarted &&
-                            step !== ark_1.SettlementEventType.TreeNoncesAggregated) {
+                            step !== ark_1.SettlementEventType.TreeNonces) {
                             continue;
                         }
                         // index 0 = vtxo tree
@@ -568,7 +568,7 @@ class Wallet {
                         }
                         break;
                     case ark_1.SettlementEventType.TreeSignature:
-                        if (step !== ark_1.SettlementEventType.TreeNoncesAggregated) {
+                        if (step !== ark_1.SettlementEventType.TreeNonces) {
                             continue;
                         }
                         if (!hasOffchainOutputs) {
@@ -610,7 +610,7 @@ class Wallet {
                         break;
                     // the musig2 nonces of the vtxo tree transactions are generated
                     // the server expects now the partial musig2 signatures
-                    case ark_1.SettlementEventType.TreeNoncesAggregated:
+                    case ark_1.SettlementEventType.TreeNonces:
                         if (step !== ark_1.SettlementEventType.TreeSigningStarted) {
                             continue;
                         }
@@ -618,14 +618,18 @@ class Wallet {
                             if (!session) {
                                 throw new Error("Signing session not set");
                             }
-                            await this.handleSettlementSigningNoncesGeneratedEvent(event, session);
+                            const signed = await this.handleSettlementTreeNoncesEvent(event, session);
+                            if (signed) {
+                                step = event.type;
+                            }
+                            break;
                         }
                         step = event.type;
                         break;
                     // the vtxo tree is signed, craft, sign and submit forfeit transactions
                     // if any boarding utxos are involved, the settlement tx is also signed
                     case ark_1.SettlementEventType.BatchFinalization:
-                        if (step !== ark_1.SettlementEventType.TreeNoncesAggregated) {
+                        if (step !== ark_1.SettlementEventType.TreeNonces) {
                             continue;
                         }
                         if (!this.forfeitOutputScript) {
@@ -771,11 +775,15 @@ class Wallet {
         const nonces = await session.getNonces();
         await this.arkProvider.submitTreeNonces(event.id, pubkey, nonces);
     }
-    async handleSettlementSigningNoncesGeneratedEvent(event, session) {
-        session.setAggregatedNonces(event.treeNonces);
+    async handleSettlementTreeNoncesEvent(event, session) {
+        const { hasAllNonces } = await session.aggregatedNonces(event.txid, event.nonces);
+        // wait to receive and aggregate all nonces before sending signatures
+        if (!hasAllNonces)
+            return false;
         const signatures = await session.sign();
         const pubkey = base_1.hex.encode(await session.getPublicKey());
         await this.arkProvider.submitTreeSignatures(event.id, pubkey, signatures);
+        return true;
     }
     async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, connectorsGraph) {
         // the signed forfeits transactions to submit

package/dist/esm/index.js

@@ -28,6 +28,7 @@ import { P2A } from './utils/anchor.js';
 import { Unroll } from './wallet/unroll.js';
 import { WalletRepositoryImpl } from './repositories/walletRepository.js';
 import { ContractRepositoryImpl } from './repositories/contractRepository.js';
+import { ArkError, maybeArkError } from './providers/errors.js';
 export { 
 // Wallets
 Wallet, SingleKey, OnchainWallet, Ramps, VtxoManager, 
@@ -56,4 +57,6 @@ Intent,
 // TxTree
 TxTree, 
 // Anchor
-P2A, Unroll, Transaction, };
+P2A, Unroll, Transaction, 
+// Errors
+ArkError, maybeArkError, };

package/dist/esm/musig2/index.js

@@ -1,3 +1,3 @@
-export { generateNonces } from './nonces.js';
+export { generateNonces, aggregateNonces } from './nonces.js';
 export { PartialSig, sign } from './sign.js';
 export { aggregateKeys } from './keys.js';

package/dist/esm/musig2/nonces.js

@@ -6,3 +6,6 @@ export function generateNonces(publicKey) {
     const nonces = musig.nonceGen(publicKey);
     return { secNonce: nonces.secret, pubNonce: nonces.public };
 }
+export function aggregateNonces(pubNonces) {
+    return musig.nonceAggregate(pubNonces);
+}

package/dist/esm/providers/ark.js

@@ -1,5 +1,6 @@
 import { hex } from "@scure/base";
 import { eventSourceIterator } from './utils.js';
+import { maybeArkError } from './errors.js';
 export var SettlementEventType;
 (function (SettlementEventType) {
     SettlementEventType["BatchStarted"] = "batch_started";
@@ -7,7 +8,7 @@ export var SettlementEventType;
     SettlementEventType["BatchFinalized"] = "batch_finalized";
     SettlementEventType["BatchFailed"] = "batch_failed";
     SettlementEventType["TreeSigningStarted"] = "tree_signing_started";
-    SettlementEventType["TreeNoncesAggregated"] = "tree_nonces_aggregated";
+    SettlementEventType["TreeNonces"] = "tree_nonces";
     SettlementEventType["TreeTx"] = "tree_tx";
     SettlementEventType["TreeSignature"] = "tree_signature";
 })(SettlementEventType || (SettlementEventType = {}));
@@ -28,7 +29,8 @@ export class RestArkProvider {
         const url = `${this.serverUrl}/v1/info`;
         const response = await fetch(url);
         if (!response.ok) {
-            throw new Error(`Failed to get server info: ${response.statusText}`);
+            const errorText = await response.text();
+            handleError(errorText, `Failed to get server info: ${response.statusText}`);
         }
         const fromServer = await response.json();
         return {
@@ -78,16 +80,7 @@ export class RestArkProvider {
         });
         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 submit virtual transaction: ${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 submit virtual transaction: ${errorText}`);
-            }
+            handleError(errorText, `Failed to submit virtual transaction: ${errorText}`);
         }
         const data = await response.json();
         return {
@@ -110,7 +103,7 @@ export class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to finalize offchain transaction: ${errorText}`);
+            handleError(errorText, `Failed to finalize offchain transaction: ${errorText}`);
         }
     }
     async registerIntent(intent) {
@@ -129,7 +122,7 @@ export class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to register intent: ${errorText}`);
+            handleError(errorText, `Failed to register intent: ${errorText}`);
         }
         const data = await response.json();
         return data.intentId;
@@ -150,7 +143,7 @@ export class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to delete intent: ${errorText}`);
+            handleError(errorText, `Failed to delete intent: ${errorText}`);
         }
     }
     async confirmRegistration(intentId) {
@@ -166,7 +159,7 @@ export class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to confirm registration: ${errorText}`);
+            handleError(errorText, `Failed to confirm registration: ${errorText}`);
         }
     }
     async submitTreeNonces(batchId, pubkey, nonces) {
@@ -184,7 +177,7 @@ export class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to submit tree nonces: ${errorText}`);
+            handleError(errorText, `Failed to submit tree nonces: ${errorText}`);
         }
     }
     async submitTreeSignatures(batchId, pubkey, signatures) {
@@ -202,7 +195,7 @@ export class RestArkProvider {
         });
         if (!response.ok) {
             const errorText = await response.text();
-            throw new Error(`Failed to submit tree signatures: ${errorText}`);
+            handleError(errorText, `Failed to submit tree signatures: ${errorText}`);
         }
     }
     async submitSignedForfeitTxs(signedForfeitTxs, signedCommitmentTx) {
@@ -218,7 +211,8 @@ export class RestArkProvider {
             }),
         });
         if (!response.ok) {
-            throw new Error(`Failed to submit forfeit transactions: ${response.statusText}`);
+            const errorText = await response.text();
+            handleError(errorText, `Failed to submit forfeit transactions: ${response.statusText}`);
         }
     }
     async *getEventStream(signal, topics) {
@@ -327,16 +321,7 @@ export class RestArkProvider {
         });
         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}`);
-            }
+            handleError(errorText, `Failed to get pending transactions: ${errorText}`);
         }
         const data = await response.json();
         return data.pendingTxs;
@@ -386,10 +371,16 @@ export class RestArkProvider {
         }
         // Check for TreeNoncesAggregated event
         if (data.treeNoncesAggregated) {
+            // skip treeNoncesAggregated event, deprecated
+            return null;
+        }
+        if (data.treeNonces) {
             return {
-                type: SettlementEventType.TreeNoncesAggregated,
-                id: data.treeNoncesAggregated.id,
-                treeNonces: decodeMusig2Nonces(data.treeNoncesAggregated.treeNonces),
+                type: SettlementEventType.TreeNonces,
+                id: data.treeNonces.id,
+                topic: data.treeNonces.topic,
+                txid: data.treeNonces.txid,
+                nonces: decodeMusig2Nonces(data.treeNonces.nonces), // pubkey -> public nonce
             };
         }
         // Check for TreeTx event
@@ -419,10 +410,6 @@ export 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;
@@ -517,3 +504,8 @@ function mapVtxo(vtxo) {
         arkTxid: vtxo.arkTxid,
     };
 }
+function handleError(errorText, defaultMessage) {
+    const error = new Error(errorText);
+    const arkError = maybeArkError(error);
+    throw arkError ?? new Error(defaultMessage);
+}

package/dist/esm/providers/errors.js

@@ -0,0 +1,54 @@
+export class ArkError extends Error {
+    constructor(code, message, name, metadata) {
+        super(message);
+        this.code = code;
+        this.message = message;
+        this.name = name;
+        this.metadata = metadata;
+    }
+}
+/**
+ * Try to convert an error to an ArkError class, returning undefined if the error is not an ArkError
+ * @param error - The error to parse
+ * @returns The parsed ArkError, or undefined if the error is not an ArkError
+ */
+export function maybeArkError(error) {
+    try {
+        if (!(error instanceof Error))
+            return undefined;
+        const decoded = JSON.parse(error.message);
+        if (!("details" in decoded))
+            return undefined;
+        if (!Array.isArray(decoded.details))
+            return undefined;
+        // search for a valid details object with the correct type
+        for (const details of decoded.details) {
+            if (!("@type" in details))
+                continue;
+            const type = details["@type"];
+            if (type !== "type.googleapis.com/ark.v1.ErrorDetails")
+                continue;
+            if (!("code" in details))
+                continue;
+            const code = details.code;
+            if (!("message" in details))
+                continue;
+            const message = details.message;
+            if (!("name" in details))
+                continue;
+            const name = details.name;
+            let metadata;
+            if ("metadata" in details && isMetadata(details.metadata)) {
+                metadata = details.metadata;
+            }
+            return new ArkError(code, message, name, metadata);
+        }
+        return undefined;
+    }
+    catch (e) {
+        return undefined;
+    }
+}
+function isMetadata(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/dist/esm/repositories/walletRepository.js

@@ -58,18 +58,6 @@ export class WalletRepositoryImpl {
             return [];
         }
     }
-    async saveVtxo(address, vtxo) {
-        const vtxos = await this.getVtxos(address);
-        const existing = vtxos.findIndex((v) => v.txid === vtxo.txid && v.vout === vtxo.vout);
-        if (existing !== -1) {
-            vtxos[existing] = vtxo;
-        }
-        else {
-            vtxos.push(vtxo);
-        }
-        this.cache.vtxos.set(address, vtxos.slice());
-        await this.storage.setItem(`vtxos:${address}`, JSON.stringify(vtxos.map(serializeVtxo)));
-    }
     async saveVtxos(address, vtxos) {
         const storedVtxos = await this.getVtxos(address);
         for (const vtxo of vtxos) {
@@ -116,20 +104,6 @@ export class WalletRepositoryImpl {
             return [];
         }
     }
-    async saveTransaction(address, tx) {
-        const transactions = await this.getTransactionHistory(address);
-        const existing = transactions.findIndex((t) => t.key === tx.key);
-        if (existing !== -1) {
-            transactions[existing] = tx;
-        }
-        else {
-            transactions.push(tx);
-        }
-        // Sort by createdAt descending
-        transactions.sort((a, b) => b.createdAt - a.createdAt);
-        this.cache.transactions.set(address, transactions);
-        await this.storage.setItem(`tx:${address}`, JSON.stringify(transactions));
-    }
     async saveTransactions(address, txs) {
         const storedTransactions = await this.getTransactionHistory(address);
         for (const tx of txs) {

package/dist/esm/tree/signingSession.js

@@ -40,10 +40,44 @@ export class TreeSignerSession {
         }
         return publicNonces;
     }
-    async setAggregatedNonces(nonces) {
-        if (this.aggregateNonces)
-            throw new Error("nonces already set");
-        this.aggregateNonces = nonces;
+    async aggregatedNonces(txid, noncesByPubkey) {
+        if (!this.graph)
+            throw ErrMissingVtxoGraph;
+        if (!this.aggregateNonces) {
+            this.aggregateNonces = new Map();
+        }
+        if (!this.myNonces) {
+            await this.getNonces(); // generate nonces if not generated yet
+        }
+        if (this.aggregateNonces.has(txid)) {
+            return {
+                hasAllNonces: this.aggregateNonces.size === this.myNonces?.size,
+            };
+        }
+        const myNonce = this.myNonces.get(txid);
+        if (!myNonce)
+            throw new Error(`missing nonce for txid ${txid}`);
+        const myPublicKey = await this.getPublicKey();
+        // set my nonce to not rely on server
+        noncesByPubkey.set(hex.encode(myPublicKey.subarray(1)), myNonce);
+        const tx = this.graph.find(txid);
+        if (!tx)
+            throw new Error(`missing tx for txid ${txid}`);
+        const cosigners = getArkPsbtFields(tx.root, 0, CosignerPublicKey).map((c) => hex.encode(c.key.subarray(1)) // xonly pubkey
+        );
+        const pubNonces = [];
+        for (const cosigner of cosigners) {
+            const nonce = noncesByPubkey.get(cosigner);
+            if (!nonce) {
+                throw new Error(`missing nonce for cosigner ${cosigner}`);
+            }
+            pubNonces.push(nonce.pubNonce);
+        }
+        const aggregateNonce = musig2.aggregateNonces(pubNonces);
+        this.aggregateNonces.set(txid, { pubNonce: aggregateNonce });
+        return {
+            hasAllNonces: this.aggregateNonces.size === this.myNonces?.size,
+        };
     }
     async sign() {
         if (!this.graph)

package/dist/esm/utils/unknownFields.js

@@ -13,9 +13,9 @@ export var ArkPsbtFieldKey;
 })(ArkPsbtFieldKey || (ArkPsbtFieldKey = {}));
 /**
  * ArkPsbtFieldKeyType is the type of the ark psbt field key.
- * Every ark psbt field has key type 255.
+ * Every ark psbt field has key type 222.
  */
-export const ArkPsbtFieldKeyType = 255;
+export const ArkPsbtFieldKeyType = 222;
 /**
  * setArkPsbtField appends a new unknown field to the input at inputIndex
  *

package/dist/esm/wallet/serviceWorker/response.js

@@ -1,3 +1,8 @@
+import { hex } from "@scure/base";
+function getRandomId() {
+    const randomValue = crypto.getRandomValues(new Uint8Array(16));
+    return hex.encode(randomValue);
+}
 /**
  * Response is the namespace that contains the response types for the service worker.
  */
@@ -184,4 +189,31 @@ export var Response;
         };
     }
     Response.walletReloaded = walletReloaded;
+    function isVtxoUpdate(response) {
+        return response.type === "VTXO_UPDATE";
+    }
+    Response.isVtxoUpdate = isVtxoUpdate;
+    function vtxoUpdate(newVtxos, spentVtxos) {
+        return {
+            type: "VTXO_UPDATE",
+            id: getRandomId(), // spontaneous update, not tied to a request
+            success: true,
+            spentVtxos,
+            newVtxos,
+        };
+    }
+    Response.vtxoUpdate = vtxoUpdate;
+    function isUtxoUpdate(response) {
+        return response.type === "UTXO_UPDATE";
+    }
+    Response.isUtxoUpdate = isUtxoUpdate;
+    function utxoUpdate(coins) {
+        return {
+            type: "UTXO_UPDATE",
+            id: getRandomId(), // spontaneous update, not tied to a request
+            success: true,
+            coins,
+        };
+    }
+    Response.utxoUpdate = utxoUpdate;
 })(Response || (Response = {}));

package/dist/esm/wallet/serviceWorker/wallet.js

@@ -253,6 +253,9 @@ export class ServiceWorkerWallet {
             return new Promise((resolve, reject) => {
                 const messageHandler = (event) => {
                     const response = event.data;
+                    if (response.id !== message.id) {
+                        return;
+                    }
                     if (!response.success) {
                         navigator.serviceWorker.removeEventListener("message", messageHandler);
                         reject(new Error(response.message));

package/dist/esm/wallet/serviceWorker/worker.js

@@ -127,11 +127,11 @@ export class Worker {
                     ...spentVtxos,
                 ]);
                 // notify all clients about the vtxo update
-                this.sendMessageToAllClients("VTXO_UPDATE", JSON.stringify({ newVtxos, spentVtxos }));
+                this.sendMessageToAllClients(Response.vtxoUpdate(newVtxos, spentVtxos));
             }
             if (funds.type === "utxo") {
                 // notify all clients about the utxo update
-                this.sendMessageToAllClients("UTXO_UPDATE", JSON.stringify(funds.coins));
+                this.sendMessageToAllClients(Response.utxoUpdate(funds.coins));
             }
         });
     }
@@ -515,15 +515,12 @@ export class Worker {
                 event.source?.postMessage(Response.error(message.id, "Unknown message type"));
         }
     }
-    async sendMessageToAllClients(type, message) {
+    async sendMessageToAllClients(message) {
         self.clients
             .matchAll({ includeUncontrolled: true, type: "window" })
             .then((clients) => {
             clients.forEach((client) => {
-                client.postMessage({
-                    type,
-                    message,
-                });
+                client.postMessage(message);
             });
         });
     }

package/dist/esm/wallet/wallet.js

@@ -509,13 +509,13 @@ export class Wallet {
                             if (!hasOffchainOutputs) {
                                 // if there are no offchain outputs, we don't have to handle musig2 tree signatures
                                 // we can directly advance to the finalization step
-                                step = SettlementEventType.TreeNoncesAggregated;
+                                step = SettlementEventType.TreeNonces;
                             }
                         }
                         break;
                     case SettlementEventType.TreeTx:
                         if (step !== SettlementEventType.BatchStarted &&
-                            step !== SettlementEventType.TreeNoncesAggregated) {
+                            step !== SettlementEventType.TreeNonces) {
                             continue;
                         }
                         // index 0 = vtxo tree
@@ -531,7 +531,7 @@ export class Wallet {
                         }
                         break;
                     case SettlementEventType.TreeSignature:
-                        if (step !== SettlementEventType.TreeNoncesAggregated) {
+                        if (step !== SettlementEventType.TreeNonces) {
                             continue;
                         }
                         if (!hasOffchainOutputs) {
@@ -573,7 +573,7 @@ export class Wallet {
                         break;
                     // the musig2 nonces of the vtxo tree transactions are generated
                     // the server expects now the partial musig2 signatures
-                    case SettlementEventType.TreeNoncesAggregated:
+                    case SettlementEventType.TreeNonces:
                         if (step !== SettlementEventType.TreeSigningStarted) {
                             continue;
                         }
@@ -581,14 +581,18 @@ export class Wallet {
                             if (!session) {
                                 throw new Error("Signing session not set");
                             }
-                            await this.handleSettlementSigningNoncesGeneratedEvent(event, session);
+                            const signed = await this.handleSettlementTreeNoncesEvent(event, session);
+                            if (signed) {
+                                step = event.type;
+                            }
+                            break;
                         }
                         step = event.type;
                         break;
                     // the vtxo tree is signed, craft, sign and submit forfeit transactions
                     // if any boarding utxos are involved, the settlement tx is also signed
                     case SettlementEventType.BatchFinalization:
-                        if (step !== SettlementEventType.TreeNoncesAggregated) {
+                        if (step !== SettlementEventType.TreeNonces) {
                             continue;
                         }
                         if (!this.forfeitOutputScript) {
@@ -734,11 +738,15 @@ export class Wallet {
         const nonces = await session.getNonces();
         await this.arkProvider.submitTreeNonces(event.id, pubkey, nonces);
     }
-    async handleSettlementSigningNoncesGeneratedEvent(event, session) {
-        session.setAggregatedNonces(event.treeNonces);
+    async handleSettlementTreeNoncesEvent(event, session) {
+        const { hasAllNonces } = await session.aggregatedNonces(event.txid, event.nonces);
+        // wait to receive and aggregate all nonces before sending signatures
+        if (!hasAllNonces)
+            return false;
         const signatures = await session.sign();
         const pubkey = hex.encode(await session.getPublicKey());
         await this.arkProvider.submitTreeSignatures(event.id, pubkey, signatures);
+        return true;
     }
     async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, connectorsGraph) {
         // the signed forfeits transactions to submit

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, TreeNoncesAggregatedEvent, 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 } from "./providers/ark";
 import { CLTVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CSVMultisigTapscript, decodeTapscript, MultisigTapscript, TapscriptType, ArkTapscript, RelativeTimelock } from "./script/tapscript";
 import { hasBoardingTxExpired, buildOffchainTx, verifyTapscriptSignatures, ArkTxInput, OffchainTx } from "./utils/arkTransaction";
 import { VtxoTaprootTree, ConditionWitness, getArkPsbtFields, setArkPsbtField, ArkPsbtFieldCoder, ArkPsbtFieldKey, ArkPsbtFieldKeyType, CosignerPublicKey, VtxoTreeExpiry } from "./utils/unknownFields";
@@ -32,5 +32,6 @@ import { AnchorBumper, P2A } from "./utils/anchor";
 import { Unroll } from "./wallet/unroll";
 import { WalletRepositoryImpl } from "./repositories/walletRepository";
 import { ContractRepositoryImpl } from "./repositories/contractRepository";
-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, ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, ArkNote, networks, WalletRepositoryImpl, ContractRepositoryImpl, Intent, TxTree, P2A, Unroll, Transaction, };
-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, TreeNoncesAggregatedEvent, BatchStartedEvent, TreeTxEvent, TreeSignatureEvent, ScheduledSession, PaginationOptions, SubscriptionResponse, SubscriptionHeartbeat, SubscriptionEvent, Network, NetworkName, ArkTapscript, RelativeTimelock, EncodedVtxoScript, TapLeafScript, SignerSession, TreeNonces, TreePartialSigs, GetVtxosFilter, Nonces, PartialSig, ArkPsbtFieldCoder, TxTreeNode, AnchorBumper, };
+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, ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, 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, };

package/dist/types/musig2/index.d.ts

@@ -1,4 +1,4 @@
 export type { Nonces } from "./nonces";
-export { generateNonces } from "./nonces";
+export { generateNonces, aggregateNonces } from "./nonces";
 export { PartialSig, sign } from "./sign";
 export { aggregateKeys } from "./keys";

package/dist/types/musig2/nonces.d.ts

@@ -11,3 +11,4 @@ export type Nonces = {
  * Generates a pair of public and secret nonces for MuSig2 signing
  */
 export declare function generateNonces(publicKey: Uint8Array): Nonces;
+export declare function aggregateNonces(pubNonces: Uint8Array[]): Uint8Array;

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

@@ -11,7 +11,7 @@ export declare enum SettlementEventType {
     BatchFinalized = "batch_finalized",
     BatchFailed = "batch_failed",
     TreeSigningStarted = "tree_signing_started",
-    TreeNoncesAggregated = "tree_nonces_aggregated",
+    TreeNonces = "tree_nonces",
     TreeTx = "tree_tx",
     TreeSignature = "tree_signature"
 }
@@ -36,10 +36,12 @@ export type TreeSigningStartedEvent = {
     cosignersPublicKeys: string[];
     unsignedCommitmentTx: string;
 };
-export type TreeNoncesAggregatedEvent = {
-    type: SettlementEventType.TreeNoncesAggregated;
+export type TreeNoncesEvent = {
+    type: SettlementEventType.TreeNonces;
     id: string;
-    treeNonces: TreeNonces;
+    topic: string[];
+    txid: string;
+    nonces: TreeNonces;
 };
 export type BatchStartedEvent = {
     type: SettlementEventType.BatchStarted;
@@ -62,7 +64,7 @@ export type TreeSignatureEvent = {
     txid: string;
     signature: string;
 };
-export type SettlementEvent = BatchFinalizationEvent | BatchFinalizedEvent | BatchFailedEvent | TreeSigningStartedEvent | TreeNoncesAggregatedEvent | BatchStartedEvent | TreeTxEvent | TreeSignatureEvent;
+export type SettlementEvent = BatchFinalizationEvent | BatchFinalizedEvent | BatchFailedEvent | TreeSigningStartedEvent | TreeNoncesEvent | BatchStartedEvent | TreeTxEvent | TreeSignatureEvent;
 export interface ScheduledSession {
     duration: bigint;
     fees: FeeInfo;

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

@@ -0,0 +1,13 @@
+export declare class ArkError extends Error {
+    readonly code: number;
+    readonly message: string;
+    readonly name: string;
+    readonly metadata?: Record<string, string> | undefined;
+    constructor(code: number, message: string, name: string, metadata?: Record<string, string> | undefined);
+}
+/**
+ * Try to convert an error to an ArkError class, returning undefined if the error is not an ArkError
+ * @param error - The error to parse
+ * @returns The parsed ArkError, or undefined if the error is not an ArkError
+ */
+export declare function maybeArkError(error: any): ArkError | undefined;

package/dist/types/repositories/walletRepository.d.ts

@@ -6,12 +6,10 @@ export interface WalletState {
 }
 export interface WalletRepository {
     getVtxos(address: string): Promise<ExtendedVirtualCoin[]>;
-    saveVtxo(address: string, vtxo: ExtendedVirtualCoin): Promise<void>;
     saveVtxos(address: string, vtxos: ExtendedVirtualCoin[]): Promise<void>;
     removeVtxo(address: string, vtxoId: string): Promise<void>;
     clearVtxos(address: string): Promise<void>;
     getTransactionHistory(address: string): Promise<ArkTransaction[]>;
-    saveTransaction(address: string, tx: ArkTransaction): Promise<void>;
     saveTransactions(address: string, txs: ArkTransaction[]): Promise<void>;
     clearTransactions(address: string): Promise<void>;
     getWalletState(): Promise<WalletState | null>;
@@ -22,12 +20,10 @@ export declare class WalletRepositoryImpl implements WalletRepository {
     private cache;
     constructor(storage: StorageAdapter);
     getVtxos(address: string): Promise<ExtendedVirtualCoin[]>;
-    saveVtxo(address: string, vtxo: ExtendedVirtualCoin): Promise<void>;
     saveVtxos(address: string, vtxos: ExtendedVirtualCoin[]): Promise<void>;
     removeVtxo(address: string, vtxoId: string): Promise<void>;
     clearVtxos(address: string): Promise<void>;
     getTransactionHistory(address: string): Promise<ArkTransaction[]>;
-    saveTransaction(address: string, tx: ArkTransaction): Promise<void>;
     saveTransactions(address: string, txs: ArkTransaction[]): Promise<void>;
     clearTransactions(address: string): Promise<void>;
     getWalletState(): Promise<WalletState | null>;

package/dist/types/tree/signingSession.d.ts

@@ -2,13 +2,16 @@ import * as musig2 from "../musig2";
 import { TxTree } from "./txTree";
 export declare const ErrMissingVtxoGraph: Error;
 export declare const ErrMissingAggregateKey: Error;
-export type TreeNonces = Map<string, Pick<musig2.Nonces, "pubNonce">>;
+export type Musig2PublicNonce = Pick<musig2.Nonces, "pubNonce">;
+export type TreeNonces = Map<string, Musig2PublicNonce>;
 export type TreePartialSigs = Map<string, musig2.PartialSig>;
 export interface SignerSession {
     getPublicKey(): Promise<Uint8Array>;
     init(tree: TxTree, scriptRoot: Uint8Array, rootInputAmount: bigint): Promise<void>;
     getNonces(): Promise<TreeNonces>;
-    setAggregatedNonces(nonces: TreeNonces): Promise<void>;
+    aggregatedNonces(txid: string, noncesByPubkey: TreeNonces): Promise<{
+        hasAllNonces: boolean;
+    }>;
     sign(): Promise<TreePartialSigs>;
 }
 export declare class TreeSignerSession implements SignerSession {
@@ -24,7 +27,9 @@ export declare class TreeSignerSession implements SignerSession {
     init(tree: TxTree, scriptRoot: Uint8Array, rootInputAmount: bigint): Promise<void>;
     getPublicKey(): Promise<Uint8Array>;
     getNonces(): Promise<TreeNonces>;
-    setAggregatedNonces(nonces: TreeNonces): Promise<void>;
+    aggregatedNonces(txid: string, noncesByPubkey: TreeNonces): Promise<{
+        hasAllNonces: boolean;
+    }>;
     sign(): Promise<TreePartialSigs>;
     private generateNonces;
     private signPartial;

package/dist/types/utils/unknownFields.d.ts

@@ -11,9 +11,9 @@ export declare enum ArkPsbtFieldKey {
 }
 /**
  * ArkPsbtFieldKeyType is the type of the ark psbt field key.
- * Every ark psbt field has key type 255.
+ * Every ark psbt field has key type 222.
  */
-export declare const ArkPsbtFieldKeyType = 255;
+export declare const ArkPsbtFieldKeyType = 222;
 /**
  * ArkPsbtFieldCoder is the coder for the ark psbt fields.
  * each type has its own coder.

package/dist/types/wallet/serviceWorker/response.d.ts

@@ -1,10 +1,11 @@
-import { WalletBalance, VirtualCoin, ArkTransaction, IWallet } from "..";
+import { WalletBalance, VirtualCoin, ArkTransaction, IWallet, Coin } from "..";
+import { ExtendedVirtualCoin } from "../..";
 import { SettlementEvent } from "../../providers/ark";
 /**
  * Response is the namespace that contains the response types for the service worker.
  */
 export declare namespace Response {
-    type Type = "WALLET_INITIALIZED" | "WALLET_RELOADED" | "SETTLE_EVENT" | "SETTLE_SUCCESS" | "ADDRESS" | "BOARDING_ADDRESS" | "BALANCE" | "VTXOS" | "VIRTUAL_COINS" | "BOARDING_UTXOS" | "SEND_BITCOIN_SUCCESS" | "TRANSACTION_HISTORY" | "WALLET_STATUS" | "ERROR" | "CLEAR_RESPONSE";
+    type Type = "WALLET_INITIALIZED" | "WALLET_RELOADED" | "SETTLE_EVENT" | "SETTLE_SUCCESS" | "ADDRESS" | "BOARDING_ADDRESS" | "BALANCE" | "VTXOS" | "VIRTUAL_COINS" | "BOARDING_UTXOS" | "SEND_BITCOIN_SUCCESS" | "TRANSACTION_HISTORY" | "WALLET_STATUS" | "ERROR" | "CLEAR_RESPONSE" | "VTXO_UPDATE" | "UTXO_UPDATE";
     interface Base {
         type: Type;
         success: boolean;
@@ -106,4 +107,17 @@ export declare namespace Response {
     }
     function isWalletReloaded(response: Base): response is WalletReloaded;
     function walletReloaded(id: string, success: boolean): WalletReloaded;
+    interface VtxoUpdate extends Base {
+        type: "VTXO_UPDATE";
+        spentVtxos: ExtendedVirtualCoin[];
+        newVtxos: ExtendedVirtualCoin[];
+    }
+    function isVtxoUpdate(response: Base): response is VtxoUpdate;
+    function vtxoUpdate(newVtxos: ExtendedVirtualCoin[], spentVtxos: ExtendedVirtualCoin[]): VtxoUpdate;
+    interface UtxoUpdate extends Base {
+        type: "UTXO_UPDATE";
+        coins: Coin[];
+    }
+    function isUtxoUpdate(response: Base): response is UtxoUpdate;
+    function utxoUpdate(coins: Coin[]): UtxoUpdate;
 }

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

@@ -91,7 +91,7 @@ export declare class Wallet implements IWallet {
     notifyIncomingFunds(eventCallback: (coins: IncomingFunds) => void): Promise<() => void>;
     private handleBatchStartedEvent;
     private handleSettlementSigningEvent;
-    private handleSettlementSigningNoncesGeneratedEvent;
+    private handleSettlementTreeNoncesEvent;
     private handleSettlementFinalizationEvent;
     private makeRegisterIntentSignature;
     private makeDeleteIntentSignature;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.3.1-alpha.1",
+  "version": "0.3.1-alpha.3",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",