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

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

@@ -11,7 +11,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 = {}));
@@ -390,10 +390,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 +429,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;

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/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/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

@@ -7,7 +7,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 = {}));
@@ -386,10 +386,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 +425,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;

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/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";
@@ -33,4 +33,4 @@ 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, };
+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/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/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.2",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",