@openzeppelin/miden-multisig-client 0.12.6 → 0.12.8

package/dist/multisig.d.ts

@@ -1,196 +1,74 @@
-/**
- * Multisig class representing a created or loaded multisig account.
- *
- * This class wraps a Miden SDK Account and provides PSM integration
- * for proposal management.
- */
 import { PsmHttpClient, type Signer } from '@openzeppelin/psm-client';
-import type { ConsumableNote, ExportedProposal, MultisigConfig, Proposal, ProposalMetadata, ProposalType } from './types.js';
+import type { ConsumableNote, MultisigConfig, TransactionProposal, ProposalMetadata, ProposalType, SignTransactionProposalParams, SyncResult, TransactionProposalResult } from './types.js';
 import type { ProcedureName } from './procedures.js';
+import { type DetectedMultisigConfig } from './inspector.js';
 import type { WebClient } from '@demox-labs/miden-sdk';
 import { Account } from '@demox-labs/miden-sdk';
-/**
- * Result of fetching account state from PSM.
- */
 export interface AccountState {
-    /** Account ID */
     accountId: string;
-    /** Current commitment */
     commitment: string;
-    /** Raw state data (base64-encoded serialized account) */
     stateDataBase64: string;
     createdAt: string;
     updatedAt: string;
+    authScheme?: string;
 }
-/**
- * Represents a multisig account with PSM integration.
- */
 export declare class Multisig {
     readonly account: Account | null;
     readonly threshold: number;
     readonly signerCommitments: string[];
     readonly psmCommitment: string;
+    psmPublicKey?: string;
     readonly procedureThresholds: Map<ProcedureName, number>;
+    readonly signatureScheme: Signer['scheme'];
     private psm;
     private readonly signer;
     private readonly webClient;
     private readonly _accountId;
     private proposals;
     constructor(account: Account | null, config: MultisigConfig, psm: PsmHttpClient, signer: Signer, webClient: WebClient, accountId?: string);
-    /** The account ID as a string */
     get accountId(): string;
-    /** The signer's commitment */
     get signerCommitment(): string;
-    /**
-     * Maps a proposal type to the procedure that determines its threshold.
-     */
+    setPsmPublicKey(pubkey?: string): void;
     private getProposalProcedure;
-    /**
-     * Get the effective threshold for a given proposal type.
-     * Returns the procedure-specific threshold if configured, otherwise the default threshold.
-     *
-     * @param proposalType - The type of proposal
-     * @returns The threshold that applies to this proposal type
-     */
     getEffectiveThreshold(proposalType: ProposalType): number;
-    /**
-     * Update the PSM client used by this Multisig instance.
-     *
-     * @param psmClient - The new PSM HTTP client
-     */
     setPsmClient(psmClient: PsmHttpClient): void;
-    /**
-     * Fetch the current account state from PSM.
-     *
-     * @returns The account state including commitment and serialized data
-     */
     fetchState(): Promise<AccountState>;
-    /**
-     * Sync account state from PSM into the local WebClient store.
-     *
-     * If the PSM commitment differs from the local commitment (or the account
-     * is missing locally), the local store is overwritten with the PSM state.
-     */
     syncState(): Promise<AccountState>;
-    /**
-     * Register this multisig account on the PSM server.
-     *
-     * The initial state must be the serialized Account bytes (base64-encoded).
-     * If not provided, the account's serialize() method is used.
-     *
-     * @param initialStateBase64 - Optional base64-encoded serialized Account.¡
-     */
     registerOnPsm(initialStateBase64?: string): Promise<void>;
-    /**
-     * Sync proposals from the PSM server.
-     */
-    syncProposals(): Promise<Proposal[]>;
-    /**
-     * List all known proposals
-     */
-    listProposals(): Proposal[];
-    /**
-     * Create a new proposal.
-     *
-     * @param nonce - The nonce for this transaction
-     * @param txSummaryBase64 - Base64-encoded transaction summary
-     * @param metadata - Optional metadata for execution (target config, salt, etc.)
-     */
-    createProposal(nonce: number, txSummaryBase64: string, metadata: ProposalMetadata): Promise<Proposal>;
-    /**
-     * Create an "add signer" proposal.
-     *
-     * @param newCommitment - Commitment of the new signer (hex)
-     * @param nonce - Optional proposal nonce (defaults to Date.now())
-     * @param newThreshold - Optional new threshold (defaults to current threshold)
-     */
-    createAddSignerProposal(newCommitment: string, nonce?: number, newThreshold?: number): Promise<Proposal>;
-    /**
-     * Create a "remove signer" proposal by executing the update_signers script to summary.
-     *
-     * @param signerToRemove - Commitment of the signer to remove (hex)
-     * @param nonce - Optional proposal nonce (defaults to Date.now())
-     * @param newThreshold - Optional new threshold (defaults to min of current threshold and new signer count)
-     */
-    createRemoveSignerProposal(signerToRemove: string, nonce?: number, newThreshold?: number): Promise<Proposal>;
-    /**
-     * Create a "change threshold" proposal.
-     *
-     * @param newThreshold - The new threshold value
-     * @param nonce - Optional proposal nonce (defaults to Date.now())
-     */
-    createChangeThresholdProposal(newThreshold: number, nonce?: number): Promise<Proposal>;
-    /**
-     * Create a "switch PSM" proposal to change the PSM provider.
-     *
-     * @param newPsmEndpoint - The new PSM server endpoint URL
-     * @param newPsmPubkey - The new PSM server's public key commitment (hex)
-     * @param nonce - Optional proposal nonce (defaults to Date.now())
-     */
-    createSwitchPsmProposal(newPsmEndpoint: string, newPsmPubkey: string, nonce?: number): Promise<Proposal>;
-    /**
-     * Create a "consume notes" proposal to consume notes sent to the multisig account.
-     *
-     * @param noteIds - IDs of the notes to consume (hex strings)
-     * @param nonce - Optional proposal nonce (defaults to Date.now())
-     */
-    createConsumeNotesProposal(noteIds: string[], nonce?: number): Promise<Proposal>;
-    /**
-     * Create a P2ID proposal to send funds to another account.
-     *
-     * @param recipientId - Account ID of the recipient (hex string)
-     * @param faucetId - Faucet/token account ID (hex string)
-     * @param amount - Amount to send
-     * @param nonce - Optional proposal nonce (defaults to Date.now())
-     */
-    createP2idProposal(recipientId: string, faucetId: string, amount: bigint, nonce?: number): Promise<Proposal>;
-    /**
-     * Get notes that can be consumed by this multisig account.
-     *
-     * Returns a list of notes that are committed on-chain and can be consumed
-     * immediately by the multisig account.
-     */
+    syncAll(): Promise<SyncResult>;
+    getAccountConfig(): Promise<DetectedMultisigConfig>;
+    switchPsm(psmClient: PsmHttpClient): Promise<void>;
+    syncTransactionProposals(): Promise<TransactionProposal[]>;
+    listTransactionProposals(): TransactionProposal[];
+    createProposal(nonce: number, txSummaryBase64: string, metadata: ProposalMetadata): Promise<TransactionProposal>;
+    createAddSignerProposal(newCommitment: string, options?: {
+        nonce?: number;
+        newThreshold?: number;
+    }): Promise<TransactionProposalResult>;
+    createRemoveSignerProposal(signerToRemove: string, options?: {
+        nonce?: number;
+        newThreshold?: number;
+    }): Promise<TransactionProposalResult>;
+    createChangeThresholdProposal(newThreshold: number, options?: {
+        nonce?: number;
+    }): Promise<TransactionProposalResult>;
+    createSwitchPsmProposal(newPsmEndpoint: string, newPsmPubkey: string, options?: {
+        nonce?: number;
+    }): Promise<TransactionProposalResult>;
+    createConsumeNotesProposal(noteIds: string[], options?: {
+        nonce?: number;
+    }): Promise<TransactionProposalResult>;
+    createSendProposal(recipientId: string, faucetId: string, amount: bigint, options?: {
+        nonce?: number;
+    }): Promise<TransactionProposalResult>;
     getConsumableNotes(): Promise<ConsumableNote[]>;
-    /**
-     * Sign a proposal.
-     *
-     * The proposalId is the tx_summary commitment hex, which is what gets signed.
-     * This matches the Rust client behavior where proposal.id == tx_summary.to_commitment().
-     *
-     * @param proposalId - The proposal commitment/ID (this is also what gets signed)
-     */
-    signProposal(proposalId: string): Promise<Proposal>;
-    /**
-     * Execute a proposal that has enough signatures.
-     *
-     * @param proposalId - The proposal commitment/ID
-     */
-    executeProposal(proposalId: string): Promise<void>;
-    /**
-     * Export a proposal for offline signing
-     */
-    exportProposal(proposalId: string): Promise<ExportedProposal>;
-    /**
-     * Export a proposal to JSON for side-channel sharing.
-     *
-     * @param proposalId - The proposal commitment/ID
-     * @returns JSON string that can be shared and imported by other signers
-     */
-    exportProposalToJson(proposalId: string): string;
-    /**
-     * Import a proposal from JSON (exported via exportProposalToJson).
-     *
-     * @param json - JSON string from exportProposalToJson
-     * @returns The imported proposal
-     */
-    importProposal(json: string): Proposal;
-    /**
-     * Sign an imported proposal and return updated JSON for sharing..
-     *
-     * @param proposalId - The proposal commitment/ID
-     * @returns Updated JSON string with the new signature included
-     */
-    signProposalOffline(proposalId: string): string;
+    signTransactionProposal(commitment: string): Promise<TransactionProposal[]>;
+    signTransactionProposalExternal(params: SignTransactionProposalParams): Promise<TransactionProposal[]>;
+    executeTransactionProposal(commitment: string): Promise<void>;
+    exportTransactionProposalToJson(commitment: string): string;
+    importTransactionProposal(json: string): TransactionProposalResult;
+    signTransactionProposalOffline(commitment: string): string;
+    private syncAfterCreate;
     private deltaToProposal;
     private buildPsmMetadata;
     private fromPsmMetadata;

package/dist/multisig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multisig.d.ts","sourceRoot":"","sources":["../src/multisig.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,aAAa,EAA4D,KAAK,MAAM,EAAmF,MAAM,0BAA0B,CAAC;AACjN,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,cAAc,EAEd,QAAQ,EACR,gBAAgB,EAGhB,YAAY,EACb,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,SAAS,EAAsB,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EACL,OAAO,EAOR,MAAM,uBAAuB,CAAC;AAgB/B;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,QAAQ;IACnB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAEzD,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,SAAS,CAAoC;gBAGnD,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,SAAS,CAAC,EAAE,MAAM;IAepB,iCAAiC;IACjC,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,8BAA8B;IAC9B,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAiB5B;;;;;;OAMG;IACH,qBAAqB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM;IAazD;;;;OAIG;IACH,YAAY,CAAC,SAAS,EAAE,aAAa,GAAG,IAAI;IAK5C;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,YAAY,CAAC;IAYzC;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IAmBxC;;;;;;;OAOG;IACG,aAAa,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+B/D;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAwB1C;;OAEG;IACH,aAAa,IAAI,QAAQ,EAAE;IAI3B;;;;;;OAMG;IACG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAmB3G;;;;;;OAMG;IACG,uBAAuB,CAC3B,aAAa,EAAE,MAAM,EACrB,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,QAAQ,CAAC;IAyBpB;;;;;;OAMG;IACG,0BAA0B,CAC9B,cAAc,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,QAAQ,CAAC;IA8CpB;;;;;OAKG;IACG,6BAA6B,CACjC,YAAY,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IAgCpB;;;;;;OAMG;IACG,uBAAuB,CAC3B,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IAiCpB;;;;;OAKG;IACG,0BAA0B,CAC9B,OAAO,EAAE,MAAM,EAAE,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IAqBpB;;;;;;;OAOG;IACG,kBAAkB,CACtB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IA4BpB;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAuCrD;;;;;;;OAOG;IACG,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IA2BzD;;;;OAIG;IACG,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkJxD;;OAEG;IACG,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyBnE;;;;;OAKG;IACH,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAsBhD;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAmDtC;;;;;OAKG;IACH,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IA8C/C,OAAO,CAAC,eAAe;IA4CvB,OAAO,CAAC,gBAAgB;IAyCxB,OAAO,CAAC,eAAe;IA6CvB,OAAO,CAAC,2BAA2B;CAwBpC"}
+{"version":3,"file":"multisig.d.ts","sourceRoot":"","sources":["../src/multisig.ts"],"names":[],"mappings":"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"}