@openzeppelin/miden-multisig-client 0.13.1 → 0.13.3

package/README.md

@@ -1,82 +1,77 @@
 # @openzeppelin/miden-multisig-client
 
-TypeScript SDK for private multisignature workflows on Miden. This package wraps the on-chain multisig contracts plus Private State Manager (PSM) coordination so you can:
+TypeScript SDK for private multisignature workflows on Miden. This package wraps the on-chain multisig contracts plus Guardian coordination so you can:
 
-- Create multisig accounts, register them with a PSM, and keep state off-chain
+- Create multisig accounts, register them with a GUARDIAN, and keep state off-chain
 - Propose, sign, and execute transactions with threshold enforcement
 - Export/import proposals as files for sharing using side channels
-- Integrate external wallets via the external signing API
-- Use Falcon or ECDSA signature schemes
 
-## How Private Multisigs & PSM Work
+## How Private Multisigs & GUARDIAN Work
 
-Miden multisig accounts store their authentication logic on-chain, but **their state (signers, metadata, proposals)** is kept private. PSM acts as a coordination server:
+Miden multisig accounts store their authentication logic on-chain, but **their state (signers, metadata, proposals)** is kept private. GUARDIAN acts as a coordination server:
 
-1. A proposer pushes a delta (transaction plan) to Private State Manager (PSM). PSM tracks who signed and emits an ack signature once the threshold is met.
-2. Cosigners fetch pending deltas, verify details locally, sign the transaction summary, and push signatures back to PSM.
-3. Once ready, any cosigner builds the final transaction using all cosigner signatures + the PSM ack, executes it on-chain.
+1. A proposer pushes a delta (transaction plan) to Guardian. GUARDIAN tracks who signed and emits an ack signature once the threshold is met.
+2. Cosigners fetch pending deltas, verify details locally, sign the transaction summary, and push signatures back to GUARDIAN.
+3. Once ready, any cosigner builds the final transaction using all cosigner signatures + the GUARDIAN ack, executes it on-chain.
 
 ## Installation
 
 ```bash
-npm install @openzeppelin/miden-multisig-client @miden-sdk/miden-sdk
+npm install @openzeppelin/miden-multisig-client @demox-labs/miden-sdk
 ```
 
 ## Setup
 
 ```typescript
 import { MultisigClient, FalconSigner } from '@openzeppelin/miden-multisig-client';
-import { WebClient, AuthSecretKey } from '@miden-sdk/miden-sdk';
+import { WebClient, SecretKey } from '@demox-labs/miden-sdk';
 
 // Initialize Miden WebClient
 const webClient = await WebClient.createClient('https://rpc.testnet.miden.io:443');
 
-// Create a Falcon signer
-const secretKey = AuthSecretKey.rpoFalconWithRNG(undefined);
+// Create a signer from your secret key
+const secretKey = SecretKey.rpoFalconWithRNG(seed);
 const signer = new FalconSigner(secretKey);
 
-// Create MultisigClient and fetch PSM info
+// Create MultisigClient
 const client = new MultisigClient(webClient, {
-  psmEndpoint: 'http://localhost:3000',
+  guardianEndpoint: 'http://localhost:3000',
+  midenRpcEndpoint: 'https://rpc.testnet.miden.io:443',
 });
-const { psmCommitment } = await client.initialize();
 ```
 
-### ECDSA Signer
+## Usage
 
-```typescript
-import { MultisigClient, EcdsaSigner } from '@openzeppelin/miden-multisig-client';
-import { AuthSecretKey } from '@miden-sdk/miden-sdk';
+### Get GUARDIAN Public Key
 
-const secretKey = AuthSecretKey.ecdsaWithRNG(undefined);
-const signer = new EcdsaSigner(secretKey);
+Before creating a multisig, get the GUARDIAN server's public key commitment:
 
-const client = new MultisigClient(webClient, { psmEndpoint: 'http://localhost:3000' });
-const { psmCommitment } = await client.initialize('ecdsa');
+```typescript
+const guardianCommitment = await client.guardianClient.getPubkey();
 ```
 
-## Usage
-
 ### Create a Multisig Account
 
 ```typescript
 const config = {
-  threshold: 2,
-  signerCommitments: [signer.commitment, otherSignerCommitment],
-  psmCommitment,
-  signatureScheme: 'falcon', // or 'ecdsa'
+  threshold: 2, // Require 2 signatures
+  signerCommitments: [
+    signer.commitment,      // Your commitment
+    otherSigner.commitment, // Cosigner's commitment
+  ],
+  guardianCommitment,
 };
 
 const multisig = await client.create(config, signer);
 console.log('Account ID:', multisig.accountId);
 ```
 
-### Register on PSM
+### Register on GUARDIAN
 
-After creating the account, register it on the PSM server:
+After creating the account, register it on the GUARDIAN server:
 
 ```typescript
-await multisig.registerOnPsm();
+await multisig.registerOnGuardian();
 ```
 
 ### Load an Existing Multisig
@@ -87,63 +82,59 @@ The configuration is automatically detected from the account's on-chain storage:
 const multisig = await client.load(accountId, signer);
 ```
 
-### Sync Everything
-
-Fetch proposals, state, consumable notes, and config in one call:
+### Fetch Account State
 
 ```typescript
-const { proposals, state, notes, config } = await multisig.syncAll();
-for (const p of proposals) {
-  console.log(`${p.id}: ${p.status.type}`);
-}
+const state = await multisig.fetchState();
+console.log('Commitment:', state.commitment);
+console.log('Created:', state.createdAt);
 ```
 
-### List Cached Proposals
-
-Returns cached proposals without making a network request:
+### Create a Proposal (Add Signer)
 
 ```typescript
-const proposals = multisig.listTransactionProposals();
-for (const p of proposals) {
-  if (p.status.type === 'pending') {
-    console.log(`Pending: ${p.status.signaturesCollected}/${p.status.signaturesRequired}`);
-  } else if (p.status.type === 'ready') {
-    console.log('Ready to execute!');
-  }
-}
+// Create a proposal to add a new signer
+const nonce = Math.floor(Math.random() * 1_000_000_000);
+const proposal = await multisig.createAddSignerProposal(
+  webClient,
+  newSignerCommitment, // Commitment of signer to add
+  nonce,               // Optional nonce (random value)
+  3,                   // Optional new threshold
+);
+console.log('Proposal ID:', proposal.id);
 ```
 
-### Create Proposals
-
-All create methods return `{ proposal, proposals }` — the new proposal plus an auto-synced full list:
+### Sign a Proposal
 
 ```typescript
-// Add a signer
-const { proposal, proposals } = await multisig.createAddSignerProposal(
-  newSignerCommitment,
-  { newThreshold: 3 },
-);
-
-// Remove a signer
-await multisig.createRemoveSignerProposal(signerToRemove);
-
-// Change threshold
-await multisig.createChangeThresholdProposal(3);
+const signedProposal = await multisig.signProposal(proposal.id);
+console.log('Signatures:', signedProposal.signatures.length);
+```
 
-// Consume notes
-await multisig.createConsumeNotesProposal(noteIds);
+### Sync Proposals
 
-// Send payment (P2ID)
-await multisig.createSendProposal(recipientId, faucetId, amount);
+Fetches proposals from the GUARDIAN server and updates local state:
 
-// Switch PSM provider
-await multisig.createSwitchPsmProposal(newEndpoint, newPubkey);
+```typescript
+const proposals = await multisig.syncProposals();
+for (const p of proposals) {
+  console.log(`${p.id}: ${p.status}`);
+}
 ```
 
-### Sign a Proposal
+### Check Proposal Status
+
+Returns cached proposals without making a network request:
 
 ```typescript
-const proposals = await multisig.signTransactionProposal(proposal.commitment);
+const proposals = multisig.listProposals();
+for (const p of proposals) {
+  if (p.status === 'pending') {
+    console.log(`Pending signatures: ${p.signatures.length}`);
+  } else if (p.status === 'ready') {
+    console.log('Ready to execute!');
+  }
+}
 ```
 
 ### Execute a Proposal
@@ -151,69 +142,57 @@ const proposals = await multisig.signTransactionProposal(proposal.commitment);
 When a proposal has enough signatures:
 
 ```typescript
-if (proposal.status.type === 'ready') {
-  await multisig.executeTransactionProposal(proposal.commitment);
+if (proposal.status === 'ready') {
+  await multisig.executeProposal(proposal.id, webClient);
+  console.log('Transaction executed on-chain!');
 }
 ```
 
-### External Signing
-
-For wallet integrations where the signing key is external (e.g., a browser wallet):
+### Export Proposal for Offline Signing
 
 ```typescript
-// Fetch proposals
-const proposals = multisig.listTransactionProposals();
-
-// Sign the commitment externally
-const signature = await wallet.sign(proposals[0].commitment);
-
-// Submit the external signature
-await multisig.signTransactionProposalExternal({
-  commitment: proposals[0].commitment,
-  signature,
-  publicKey: wallet.publicKey,
-  scheme: 'ecdsa',
-});
+const exported = await multisig.exportProposal(proposal.id);
+// Send `exported` to offline signer
+console.log('TX Summary:', exported.txSummaryBase64);
+console.log('Commitment to sign:', exported.commitment);
 ```
 
-### Wallet Signers
+### Import and Sign a Proposal Offline
 
-For integrating with external wallets, use `ParaSigner` or `MidenWalletSigner`:
+Imported proposals are now validated against their transaction summary before they are cached or
+signed:
 
 ```typescript
-import { ParaSigner, MidenWalletSigner } from '@openzeppelin/miden-multisig-client';
-
-// Para wallet integration
-const signer = new ParaSigner(paraContext, walletId, commitment, publicKey);
-
-// Miden wallet integration
-const signer = new MidenWalletSigner(walletContext, commitment, 'ecdsa');
+const imported = await multisig.importProposal(jsonFromCosigner);
+const signedJson = await multisig.signProposalOffline(imported.id);
+console.log(signedJson);
 ```
 
-### Export/Import Proposals
+## Transaction Utilities
 
-Share proposals via side channels for offline signing:
+The package also exports utility functions for building transactions:
 
 ```typescript
-// Export
-const json = multisig.exportTransactionProposalToJson(proposal.commitment);
-
-// Sign offline and get updated JSON
-const signedJson = multisig.signTransactionProposalOffline(proposal.commitment);
-
-// Import
-const { proposal, proposals } = multisig.importTransactionProposal(json);
+import {
+  normalizeHexWord,
+  hexToUint8Array,
+  signatureHexToBytes,
+  buildSignatureAdviceEntry,
+} from '@openzeppelin/miden-multisig-client';
+
+// Normalize hex for Word.fromHex (pads to 64 chars)
+const normalized = normalizeHexWord('abc123');
+// => '0x0000...abc123'
+
+// Convert hex to bytes
+const bytes = hexToUint8Array('deadbeef');
+// => Uint8Array([0xde, 0xad, 0xbe, 0xef])
+
+// Add auth scheme prefix to signature
+const sigBytes = signatureHexToBytes(signatureHex);
+// => Uint8Array with 0x00 prefix (RpoFalcon512)
 ```
 
-## Signers
-
-| Signer | Scheme | Use case |
-|--------|--------|----------|
-| `FalconSigner` | `falcon` | Local Falcon key (default) |
-| `EcdsaSigner` | `ecdsa` | Local ECDSA key |
-| `ParaSigner` | `ecdsa` | External wallet via Para protocol |
-| `MidenWalletSigner` | any | Miden wallet browser extension |
-
 ## Testing
 
 ```bash

package/dist/account/builder.d.ts

@@ -1,5 +1,23 @@
+/**
+ * Account builder for creating multisig accounts with GUARDIAN authentication.
+ *
+ * This module provides functionality to create multisig accounts.
+ */
 import { type WebClient } from '@miden-sdk/miden-sdk';
 import type { MultisigConfig, CreateAccountResult } from '../types.js';
+/**
+ * Creates a multisig account with GUARDIAN authentication.
+ *
+ * @param webClient - Initialized Miden WebClient
+ * @param config - Multisig configuration
+ * @returns The created account and seed
+ */
 export declare function createMultisigAccount(webClient: WebClient, config: MultisigConfig): Promise<CreateAccountResult>;
+/**
+ * Validates a multisig configuration.
+ *
+ * @param config - The configuration to validate
+ * @throws Error if configuration is invalid
+ */
 export declare function validateMultisigConfig(config: MultisigConfig): void;
 //# sourceMappingURL=builder.d.ts.map

package/dist/account/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/account/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIvE,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,mBAAmB,CAAC,CA8C9B;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CA4CnE"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/account/builder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAcvE;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,mBAAmB,CAAC,CAqD9B;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CA6CnE"}

package/dist/account/builder.js

@@ -1,36 +1,59 @@
+/**
+ * Account builder for creating multisig accounts with GUARDIAN authentication.
+ *
+ * This module provides functionality to create multisig accounts.
+ */
 import { AccountBuilder, AccountComponent, AccountType, AccountStorageMode, } from '@miden-sdk/miden-sdk';
-import { buildMultisigStorageSlots, buildPsmStorageSlots } from './storage.js';
-import { MULTISIG_MASM, MULTISIG_ECDSA_MASM, PSM_MASM, PSM_ECDSA_MASM } from './masm.js';
+import { buildMultisigStorageSlots, buildGuardianStorageSlots } from './storage.js';
+import { MULTISIG_ECDSA_MASM, MULTISIG_MASM, GUARDIAN_ECDSA_MASM, GUARDIAN_MASM, } from './masm/auth.js';
+import { MULTISIG_GUARDIAN_ACCOUNT_COMPONENT_MASM, MULTISIG_GUARDIAN_ECDSA_ACCOUNT_COMPONENT_MASM, } from './masm/account-components/auth.js';
+import { normalizeSignerCommitment } from '../utils/signature.js';
+/**
+ * Creates a multisig account with GUARDIAN authentication.
+ *
+ * @param webClient - Initialized Miden WebClient
+ * @param config - Multisig configuration
+ * @returns The created account and seed
+ */
 export async function createMultisigAccount(webClient, config) {
     validateMultisigConfig(config);
     const signatureScheme = config.signatureScheme ?? 'falcon';
-    const multisigSlots = buildMultisigStorageSlots(config);
-    const psmSlots = buildPsmStorageSlots(config);
-    const psmBuilder = webClient.createCodeBuilder();
-    const psmMasm = signatureScheme === 'ecdsa' ? PSM_ECDSA_MASM : PSM_MASM;
-    const psmCode = psmBuilder.compileAccountComponentCode(psmMasm);
-    const psmComponent = AccountComponent
-        .compile(psmCode, psmSlots)
-        .withSupportsAllTypes();
+    const authSlots = [
+        ...buildMultisigStorageSlots(config),
+        ...buildGuardianStorageSlots(config),
+    ];
+    const guardianMasm = signatureScheme === 'ecdsa' ? GUARDIAN_ECDSA_MASM : GUARDIAN_MASM;
     const multisigMasm = signatureScheme === 'ecdsa' ? MULTISIG_ECDSA_MASM : MULTISIG_MASM;
-    const psmLibraryPath = signatureScheme === 'ecdsa' ? 'openzeppelin::psm_ecdsa' : 'openzeppelin::psm';
-    const multisigBuilder = webClient.createCodeBuilder();
-    const psmLib = multisigBuilder.buildLibrary(psmLibraryPath, psmMasm);
-    multisigBuilder.linkStaticLibrary(psmLib);
-    const multisigCode = multisigBuilder.compileAccountComponentCode(multisigMasm);
-    const multisigComponent = AccountComponent
-        .compile(multisigCode, multisigSlots)
+    const authComponentMasm = signatureScheme === 'ecdsa'
+        ? MULTISIG_GUARDIAN_ECDSA_ACCOUNT_COMPONENT_MASM
+        : MULTISIG_GUARDIAN_ACCOUNT_COMPONENT_MASM;
+    const guardianLibraryPath = signatureScheme === 'ecdsa'
+        ? 'openzeppelin::auth::guardian_ecdsa'
+        : 'openzeppelin::auth::guardian';
+    const multisigLibraryPath = signatureScheme === 'ecdsa'
+        ? 'openzeppelin::auth::multisig_ecdsa'
+        : 'openzeppelin::auth::multisig';
+    const authBuilder = webClient.createCodeBuilder();
+    const guardianLib = authBuilder.buildLibrary(guardianLibraryPath, guardianMasm);
+    authBuilder.linkStaticLibrary(guardianLib);
+    const multisigLib = authBuilder.buildLibrary(multisigLibraryPath, multisigMasm);
+    authBuilder.linkStaticLibrary(multisigLib);
+    const authCode = authBuilder.compileAccountComponentCode(authComponentMasm);
+    const authComponent = AccountComponent
+        .compile(authCode, authSlots)
         .withSupportsAllTypes();
-    const seed = new Uint8Array(32);
-    crypto.getRandomValues(seed);
+    let seed = config.seed;
+    // Generate random seed if not provided
+    if (!seed) {
+        seed = crypto.getRandomValues(new Uint8Array(32));
+    }
     const storageMode = config.storageMode === 'public'
         ? AccountStorageMode.public()
         : AccountStorageMode.private();
     const accountBuilder = new AccountBuilder(seed)
         .accountType(AccountType.RegularAccountUpdatableCode)
         .storageMode(storageMode)
-        .withAuthComponent(multisigComponent)
-        .withComponent(psmComponent)
+        .withAuthComponent(authComponent)
         .withBasicWalletComponent();
     const result = accountBuilder.build();
     await webClient.newAccount(result.account, false);
@@ -39,6 +62,12 @@ export async function createMultisigAccount(webClient, config) {
         seed,
     };
 }
+/**
+ * Validates a multisig configuration.
+ *
+ * @param config - The configuration to validate
+ * @throws Error if configuration is invalid
+ */
 export function validateMultisigConfig(config) {
     if (config.threshold === 0) {
         throw new Error('threshold must be greater than 0');
@@ -46,20 +75,21 @@ export function validateMultisigConfig(config) {
     if (config.signerCommitments.length === 0) {
         throw new Error('at least one signer commitment is required');
     }
-    for (const commitment of config.signerCommitments) {
-        const stripped = commitment.startsWith('0x') || commitment.startsWith('0X')
-            ? commitment.slice(2)
-            : commitment;
-        if (stripped.length > 64) {
-            throw new Error(`signerCommitments must be 32-byte commitment hex (64 chars), got ${stripped.length} chars`);
+    const signerCommitments = new Set();
+    for (const signerCommitment of config.signerCommitments) {
+        const normalizedCommitment = normalizeSignerCommitment(signerCommitment);
+        if (signerCommitments.has(normalizedCommitment)) {
+            throw new Error(`duplicate signer commitment: ${normalizedCommitment}`);
         }
+        signerCommitments.add(normalizedCommitment);
     }
     if (config.threshold > config.signerCommitments.length) {
         throw new Error(`threshold (${config.threshold}) cannot exceed number of signers (${config.signerCommitments.length})`);
     }
-    if (!config.psmCommitment) {
-        throw new Error('PSM commitment is required');
+    if (!config.guardianCommitment) {
+        throw new Error('GUARDIAN commitment is required');
     }
+    // Validate procedure thresholds if provided
     if (config.procedureThresholds) {
         const seen = new Set();
         for (const pt of config.procedureThresholds) {

package/dist/account/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/account/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,kBAAkB,GAEnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEzF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,SAAoB,EACpB,MAAsB;IAEtB,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAE/B,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,QAAQ,CAAC;IAC3D,MAAM,aAAa,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE9C,MAAM,UAAU,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IACjD,MAAM,OAAO,GAAG,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxE,MAAM,OAAO,GAAG,UAAU,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,gBAAgB;SAClC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;SAC1B,oBAAoB,EAAE,CAAC;IAE1B,MAAM,YAAY,GAAG,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,aAAa,CAAC;IACvF,MAAM,cAAc,GAAG,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,mBAAmB,CAAC;IACrG,MAAM,eAAe,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IACtD,MAAM,MAAM,GAAG,eAAe,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IACrE,eAAe,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,eAAe,CAAC,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAC/E,MAAM,iBAAiB,GAAG,gBAAgB;SACvC,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC;SACpC,oBAAoB,EAAE,CAAC;IAE1B,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAChC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAE7B,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,KAAK,QAAQ;QACjD,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;QAC7B,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;IAEjC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC;SAC5C,WAAW,CAAC,WAAW,CAAC,2BAA2B,CAAC;SACpD,WAAW,CAAC,WAAW,CAAC;SACxB,iBAAiB,CAAC,iBAAiB,CAAC;SACpC,aAAa,CAAC,YAAY,CAAC;SAC3B,wBAAwB,EAAE,CAAC;IAE9B,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;IAEtC,MAAM,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAElD,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI;KACL,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAsB;IAC3D,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,MAAM,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IACD,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC;YACzE,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,UAAU,CAAC;QACf,IAAI,QAAQ,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,oEAAoE,QAAQ,CAAC,MAAM,QAAQ,CAC5F,CAAC;QACJ,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CACb,cAAc,MAAM,CAAC,SAAS,sCAAsC,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,CACvG,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAC/B,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,mBAAmB,EAAE,CAAC;YAC5C,IAAI,EAAE,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;gBACnD,MAAM,IAAI,KAAK,CACb,wBAAwB,EAAE,CAAC,SAAS,sCAAsC,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAC7G,CAAC;YACJ,CAAC;YAED,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,sCAAsC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;YACxE,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/account/builder.ts"],"names":[],"mappings":"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"}

package/dist/account/builder.test.js

@@ -1,39 +1,115 @@
-import { describe, expect, it, vi } from 'vitest';
-vi.mock('@miden-sdk/miden-sdk', () => ({
-    AccountBuilder: vi.fn(),
-    AccountComponent: { compile: vi.fn() },
-    AccountStorageMode: { public: vi.fn(), private: vi.fn() },
-    AccountType: { RegularAccountUpdatableCode: 'regular' },
-}));
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { createMultisigAccount } from './builder.js';
+import { MULTISIG_ECDSA_MASM, MULTISIG_MASM, GUARDIAN_ECDSA_MASM, GUARDIAN_MASM, } from './masm/auth.js';
+import { MULTISIG_GUARDIAN_ACCOUNT_COMPONENT_MASM, MULTISIG_GUARDIAN_ECDSA_ACCOUNT_COMPONENT_MASM, } from './masm/account-components/auth.js';
+const { buildMultisigStorageSlots, buildGuardianStorageSlots, withSupportsAllTypes, compileComponent, MockAccountBuilder, } = vi.hoisted(() => {
+    const buildMultisigStorageSlots = vi.fn(() => ['multisig-slots']);
+    const buildGuardianStorageSlots = vi.fn(() => ['guardian-slots']);
+    const withSupportsAllTypes = vi.fn((component) => component);
+    const compileComponent = vi.fn((code, slots) => ({
+        code,
+        slots,
+        withSupportsAllTypes: () => withSupportsAllTypes({ code, slots }),
+    }));
+    class MockAccountBuilder {
+        accountType() {
+            return this;
+        }
+        storageMode() {
+            return this;
+        }
+        withAuthComponent() {
+            return this;
+        }
+        withComponent() {
+            return this;
+        }
+        withBasicWalletComponent() {
+            return this;
+        }
+        build() {
+            return {
+                account: { id: () => ({ toString: () => '0x' + 'a'.repeat(30) }) },
+            };
+        }
+    }
+    return {
+        buildMultisigStorageSlots,
+        buildGuardianStorageSlots,
+        withSupportsAllTypes,
+        compileComponent,
+        MockAccountBuilder,
+    };
+});
 vi.mock('./storage.js', () => ({
-    buildMultisigStorageSlots: vi.fn(),
-    buildPsmStorageSlots: vi.fn(),
+    buildMultisigStorageSlots,
+    buildGuardianStorageSlots,
 }));
-vi.mock('./masm.js', () => ({
-    MULTISIG_MASM: '',
-    PSM_MASM: '',
+vi.mock('@miden-sdk/miden-sdk', () => ({
+    AccountBuilder: MockAccountBuilder,
+    AccountComponent: {
+        compile: compileComponent,
+    },
+    AccountType: {
+        RegularAccountUpdatableCode: 'regular',
+    },
+    AccountStorageMode: {
+        public: () => 'public',
+        private: () => 'private',
+    },
 }));
-import { validateMultisigConfig } from './builder.js';
-describe('validateMultisigConfig', () => {
-    it('rejects duplicate signer commitments after normalization', () => {
-        expect(() => validateMultisigConfig({
-            threshold: 2,
-            signerCommitments: [
-                '0x' + 'a'.repeat(64),
-                '0x' + 'A'.repeat(64),
-            ],
-            psmCommitment: '0x' + 'c'.repeat(64),
-        })).toThrow('duplicate signer commitment');
+describe('createMultisigAccount', () => {
+    beforeEach(() => {
+        vi.stubGlobal('crypto', {
+            getRandomValues(buffer) {
+                return buffer;
+            },
+        });
+        buildMultisigStorageSlots.mockClear();
+        buildGuardianStorageSlots.mockClear();
+        withSupportsAllTypes.mockClear();
+        compileComponent.mockClear();
+    });
+    it('uses Falcon MASM by default', async () => {
+        const authBuilder = {
+            buildLibrary: vi.fn((libraryPath, source) => ({ libraryPath, source })),
+            linkStaticLibrary: vi.fn(),
+            compileAccountComponentCode: vi.fn((source) => `auth:${source.slice(0, 16)}`),
+        };
+        const webClient = {
+            createCodeBuilder: vi.fn().mockReturnValue(authBuilder),
+            newAccount: vi.fn(),
+        };
+        await createMultisigAccount(webClient, {
+            threshold: 1,
+            signerCommitments: ['0x' + '1'.repeat(64)],
+            guardianCommitment: '0x' + '2'.repeat(64),
+        });
+        expect(authBuilder.buildLibrary).toHaveBeenNthCalledWith(1, 'openzeppelin::auth::guardian', GUARDIAN_MASM);
+        expect(authBuilder.buildLibrary).toHaveBeenNthCalledWith(2, 'openzeppelin::auth::multisig', MULTISIG_MASM);
+        expect(authBuilder.compileAccountComponentCode).toHaveBeenCalledWith(MULTISIG_GUARDIAN_ACCOUNT_COMPONENT_MASM);
+        expect(webClient.newAccount).toHaveBeenCalledTimes(1);
     });
-    it('accepts unique signer commitments', () => {
-        expect(() => validateMultisigConfig({
-            threshold: 2,
-            signerCommitments: [
-                '0x' + 'a'.repeat(64),
-                '0x' + 'b'.repeat(64),
-            ],
-            psmCommitment: '0x' + 'c'.repeat(64),
-        })).not.toThrow();
+    it('uses ECDSA MASM when requested', async () => {
+        const authBuilder = {
+            buildLibrary: vi.fn((libraryPath, source) => ({ libraryPath, source })),
+            linkStaticLibrary: vi.fn(),
+            compileAccountComponentCode: vi.fn((source) => `auth:${source.slice(0, 16)}`),
+        };
+        const webClient = {
+            createCodeBuilder: vi.fn().mockReturnValue(authBuilder),
+            newAccount: vi.fn(),
+        };
+        await createMultisigAccount(webClient, {
+            threshold: 1,
+            signerCommitments: ['0x' + '1'.repeat(64)],
+            guardianCommitment: '0x' + '2'.repeat(64),
+            signatureScheme: 'ecdsa',
+        });
+        expect(authBuilder.buildLibrary).toHaveBeenNthCalledWith(1, 'openzeppelin::auth::guardian_ecdsa', GUARDIAN_ECDSA_MASM);
+        expect(authBuilder.buildLibrary).toHaveBeenNthCalledWith(2, 'openzeppelin::auth::multisig_ecdsa', MULTISIG_ECDSA_MASM);
+        expect(authBuilder.compileAccountComponentCode).toHaveBeenCalledWith(MULTISIG_GUARDIAN_ECDSA_ACCOUNT_COMPONENT_MASM);
+        expect(webClient.newAccount).toHaveBeenCalledTimes(1);
     });
 });
 //# sourceMappingURL=builder.test.js.map