@openzeppelin/miden-multisig-client 0.15.0-rc.0 → 0.15.2

package/src/utils/ecdsa.ts

@@ -1,5 +1,6 @@
+import { secp256k1 } from '@noble/curves/secp256k1';
 import { keccak_256 } from '@noble/hashes/sha3.js';
-import { ensureHexPrefix } from './encoding.js';
+import { bytesToHex, ensureHexPrefix } from './encoding.js';
 
 const ECDSA_SIGNATURE_BYTE_LENGTH = 64;
 const ECDSA_SIGNATURE_WITH_RECOVERY_BYTE_LENGTH = 65;
@@ -50,6 +51,21 @@ export class EcdsaFormat {
     return byteLength === 33 || byteLength === 65;
   }
 
+  /**
+   * Whether `publicKeyHex` decodes to a valid secp256k1 curve point (compressed
+   * 33-byte or uncompressed 65-byte). Unlike {@link EcdsaFormat.validatePublicKeyHex}
+   * this rejects well-formed-length but off-curve or bad-prefix keys, and does so
+   * without the Miden WASM SDK.
+   */
+  static isValidPublicKeyPoint(publicKeyHex: string): boolean {
+    try {
+      secp256k1.ProjectivePoint.fromHex(ensureHexPrefix(publicKeyHex).slice(2));
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
   static compressPublicKey(uncompressedHex: string): string {
     const clean = ensureHexPrefix(uncompressedHex).slice(2);
     const byteLength = clean.length / 2;
@@ -74,4 +90,38 @@ export class EcdsaFormat {
     }
     return hex;
   }
+
+  /**
+   * Recover the compressed (33-byte) secp256k1 public key that produced an
+   * `ecdsa_k256_keccak` signature over `messageBytes`.
+   *
+   * `messageBytes` is the raw word/message bytes (the digest is `keccak256` of
+   * these, matching the transaction kernel and {@link EcdsaFormat.keccakDigestHex}).
+   * `signature` must be the 65-byte `r||s||v` form; the recovery byte may be the
+   * canonical `0/1` or the Ethereum-style `27/28`.
+   */
+  static recoverCompressedPublicKeyHex(messageBytes: Uint8Array, signature: Uint8Array): string {
+    if (signature.length !== ECDSA_SIGNATURE_WITH_RECOVERY_BYTE_LENGTH) {
+      throw new Error(
+        `ECDSA public-key recovery requires a ${ECDSA_SIGNATURE_WITH_RECOVERY_BYTE_LENGTH}-byte signature (r||s||v), got ${signature.length}`,
+      );
+    }
+
+    let recoveryBit = signature[ECDSA_SIGNATURE_BYTE_LENGTH];
+    if (recoveryBit === 27 || recoveryBit === 28) {
+      recoveryBit -= 27;
+    }
+    if (recoveryBit !== 0 && recoveryBit !== 1) {
+      throw new Error(
+        `ECDSA recovery byte must be 0/1 (or 27/28), got ${signature[ECDSA_SIGNATURE_BYTE_LENGTH]}`,
+      );
+    }
+
+    const compact = signature.slice(0, ECDSA_SIGNATURE_BYTE_LENGTH);
+    const msgHash = keccak_256(messageBytes);
+    const recovered = secp256k1.Signature.fromCompact(compact)
+      .addRecoveryBit(recoveryBit)
+      .recoverPublicKey(msgHash);
+    return bytesToHex(recovered.toRawBytes(true));
+  }
 }

package/dist/account/masm/authLibraries.d.ts

@@ -1,6 +0,0 @@
-export interface AuthLibraryModule {
-    namespace: string;
-    code: string;
-}
-export declare const AUTH_LIBRARY_MODULES: ReadonlyArray<AuthLibraryModule>;
-//# sourceMappingURL=authLibraries.d.ts.map

package/dist/account/masm/authLibraries.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"authLibraries.d.ts","sourceRoot":"","sources":["../../../src/account/masm/authLibraries.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAAC,iBAAiB,CAMjE,CAAC"}

package/dist/account/masm/authLibraries.js

@@ -1,17 +0,0 @@
-/**
- * Upstream `miden-standards` guarded-multisig MASM library modules, in dependency order.
- *
- * These are linked into the code builder (for account-component compilation) or built as
- * libraries (for transaction scripts) before referencing `miden::standards::auth::*`
- * procedures. The guarded-multisig component is scheme-agnostic (the per-signer scheme
- * lives in account storage), so there is a single closure — no Falcon/ECDSA split.
- */
-import { AUTH_MOD_MASM, AUTH_SIGNATURE_MASM, AUTH_TX_POLICY_MASM, MULTISIG_MASM, GUARDIAN_MASM, } from './auth.js';
-export const AUTH_LIBRARY_MODULES = [
-    { namespace: 'miden::standards::auth', code: AUTH_MOD_MASM },
-    { namespace: 'miden::standards::auth::signature', code: AUTH_SIGNATURE_MASM },
-    { namespace: 'miden::standards::auth::tx_policy', code: AUTH_TX_POLICY_MASM },
-    { namespace: 'miden::standards::auth::multisig', code: MULTISIG_MASM },
-    { namespace: 'miden::standards::auth::guardian', code: GUARDIAN_MASM },
-];
-//# sourceMappingURL=authLibraries.js.map

package/dist/account/masm/authLibraries.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"authLibraries.js","sourceRoot":"","sources":["../../../src/account/masm/authLibraries.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,aAAa,GACd,MAAM,WAAW,CAAC;AAOnB,MAAM,CAAC,MAAM,oBAAoB,GAAqC;IACpE,EAAE,SAAS,EAAE,wBAAwB,EAAE,IAAI,EAAE,aAAa,EAAE;IAC5D,EAAE,SAAS,EAAE,mCAAmC,EAAE,IAAI,EAAE,mBAAmB,EAAE;IAC7E,EAAE,SAAS,EAAE,mCAAmC,EAAE,IAAI,EAAE,mBAAmB,EAAE;IAC7E,EAAE,SAAS,EAAE,kCAAkC,EAAE,IAAI,EAAE,aAAa,EAAE;IACtE,EAAE,SAAS,EAAE,kCAAkC,EAAE,IAAI,EAAE,aAAa,EAAE;CACvE,CAAC"}

package/dist/multisig/proposal/execution.d.ts

@@ -1,20 +0,0 @@
-import { type GuardianHttpClient } from '@openzeppelin/guardian-client';
-import type { MidenClient, TransactionProver, TransactionRequest } from '@miden-sdk/miden-sdk';
-import type { ProposalType, TransactionProposal } from '../../types.js';
-interface ExecuteProposalWorkflowParams {
-    proposal: TransactionProposal;
-    accountId: string;
-    threshold: number;
-    signerCommitments: string[];
-    guardianCommitment: string;
-    guardianPublicKey?: string;
-    signatureScheme: 'falcon' | 'ecdsa';
-    getEffectiveThreshold: (proposalType: ProposalType) => number;
-    guardian: GuardianHttpClient;
-    midenClient: MidenClient;
-    transactionProver?: TransactionProver | null;
-}
-export declare function executeProposalWorkflow(params: ExecuteProposalWorkflowParams): Promise<void>;
-export declare function createTransactionProposalRequest(params: ExecuteProposalWorkflowParams): Promise<TransactionRequest>;
-export {};
-//# sourceMappingURL=execution.d.ts.map

package/dist/multisig/proposal/execution.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../../src/multisig/proposal/execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AA2BxE,UAAU,6BAA6B;IACrC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,QAAQ,GAAG,OAAO,CAAC;IACpC,qBAAqB,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,MAAM,CAAC;IAC9D,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC9C;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,IAAI,CAAC,CA4Cf;AAGD,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,kBAAkB,CAAC,CAuC7B"}

package/dist/multisig/proposal/execution.js

@@ -1,166 +0,0 @@
-import { AdviceMap, FeltArray, Signature, TransactionSummary, Word, } from '@miden-sdk/miden-sdk';
-import { buildConsumeNotesTransactionRequest, buildP2idTransactionRequest, buildUpdateGuardianTransactionRequest, buildUpdateProcedureThresholdTransactionRequest, buildUpdateSignersTransactionRequest, } from '../../transaction.js';
-import { base64ToUint8Array, normalizeHexWord } from '../../utils/encoding.js';
-import { buildSignatureAdviceEntry, signatureHexToBytes, tryComputeEcdsaCommitmentHex, } from '../../utils/signature.js';
-import { computeCommitmentFromTxSummary } from '../helpers.js';
-export async function executeProposalWorkflow(params) {
-    ensureProposalReady(params.proposal, params.threshold, params.getEffectiveThreshold);
-    const isSwitchGuardian = params.proposal.metadata.proposalType === 'switch_guardian';
-    const executionSource = await resolveExecutionSource(params.guardian, params.accountId, params.proposal, isSwitchGuardian);
-    const executionData = prepareExecutionData(executionSource.txSummaryBase64);
-    const adviceMap = buildCosignerAdviceMap(params.proposal, params.signerCommitments, executionData.txCommitmentHex);
-    if (!isSwitchGuardian && executionSource.delta) {
-        await appendGuardianAckAdvice(params.guardian, executionSource.delta, params.guardianCommitment, params.guardianPublicKey, params.signatureScheme, executionData.txCommitmentHex, adviceMap);
-    }
-    const finalRequest = await buildFinalRequest(params, executionData.saltHex, adviceMap);
-    await submitTransaction(params.midenClient, params.accountId, finalRequest);
-}
-export async function createTransactionProposalRequest(params) {
-    ensureProposalReady(params.proposal, params.threshold, params.getEffectiveThreshold);
-    const isSwitchGuardian = params.proposal.metadata.proposalType === 'switch_guardian';
-    const executionSource = await resolveExecutionSource(params.guardian, params.accountId, params.proposal, isSwitchGuardian);
-    const executionData = prepareExecutionData(executionSource.txSummaryBase64);
-    const adviceMap = buildCosignerAdviceMap(params.proposal, params.signerCommitments, executionData.txCommitmentHex);
-    if (!isSwitchGuardian && executionSource.delta) {
-        await appendGuardianAckAdvice(params.guardian, executionSource.delta, params.guardianCommitment, params.guardianPublicKey, params.signatureScheme, executionData.txCommitmentHex, adviceMap);
-    }
-    return await buildFinalRequest(params, executionData.saltHex, adviceMap);
-}
-function ensureProposalReady(proposal, defaultThreshold, getEffectiveThreshold) {
-    const proposalType = proposal.metadata?.proposalType;
-    const effectiveThreshold = proposalType
-        ? getEffectiveThreshold(proposalType)
-        : defaultThreshold;
-    if (proposal.signatures.length < effectiveThreshold) {
-        throw new Error('Proposal is not ready for execution. Still pending signatures.');
-    }
-}
-async function resolveExecutionSource(guardian, accountId, proposal, isSwitchGuardian) {
-    if (isSwitchGuardian) {
-        return { txSummaryBase64: proposal.txSummary };
-    }
-    const deltas = await guardian.getDeltaProposals(accountId);
-    const delta = deltas.find((d) => computeCommitmentFromTxSummary(d.deltaPayload.txSummary.data) === proposal.commitment);
-    if (!delta) {
-        throw new Error(`Proposal not found on server: ${proposal.commitment}`);
-    }
-    return {
-        delta,
-        txSummaryBase64: delta.deltaPayload.txSummary.data,
-    };
-}
-function prepareExecutionData(txSummaryBase64) {
-    const txSummaryBytes = base64ToUint8Array(txSummaryBase64);
-    const txSummary = TransactionSummary.deserialize(txSummaryBytes);
-    const saltHex = txSummary.salt().toHex();
-    const txCommitmentHex = txSummary.toCommitment().toHex();
-    return { txSummary, saltHex, txCommitmentHex };
-}
-function buildCosignerAdviceMap(proposal, signerCommitments, txCommitmentHex) {
-    const adviceMap = new AdviceMap();
-    const normalizedSignerCommitments = new Set(signerCommitments.map((c) => normalizeHexWord(c)));
-    for (const cosignerSig of proposal.signatures) {
-        let signerCommitmentHex = normalizeHexWord(cosignerSig.signerId);
-        if (cosignerSig.signature.scheme === 'ecdsa' && cosignerSig.signature.publicKey) {
-            const derived = tryComputeEcdsaCommitmentHex(cosignerSig.signature.publicKey);
-            if (derived && derived !== signerCommitmentHex) {
-                if (!normalizedSignerCommitments.has(derived)) {
-                    throw new Error(`ECDSA public key commitment mismatch: derived commitment ${derived} is not in signerCommitments.`);
-                }
-                signerCommitmentHex = derived;
-            }
-        }
-        const signerCommitment = Word.fromHex(signerCommitmentHex);
-        const sigBytes = signatureHexToBytes(cosignerSig.signature.signature, cosignerSig.signature.scheme);
-        const signature = Signature.deserialize(sigBytes);
-        const txCommitment = Word.fromHex(normalizeHexWord(txCommitmentHex));
-        const ecdsaPublicKey = cosignerSig.signature.scheme === 'ecdsa'
-            ? cosignerSig.signature.publicKey
-            : undefined;
-        const isEcdsa = cosignerSig.signature.scheme === 'ecdsa' && Boolean(ecdsaPublicKey);
-        const { key, values } = buildSignatureAdviceEntry(signerCommitment, txCommitment, signature, ecdsaPublicKey, isEcdsa ? cosignerSig.signature.signature : undefined);
-        adviceMap.insert(key, new FeltArray(values));
-    }
-    return adviceMap;
-}
-async function appendGuardianAckAdvice(guardian, delta, guardianCommitmentHex, guardianPublicKey, defaultAckScheme, txCommitmentHex, adviceMap) {
-    const executionDelta = {
-        ...delta,
-        deltaPayload: delta.deltaPayload.txSummary,
-    };
-    const pushResult = await guardian.pushDelta(executionDelta);
-    const ackSigHex = pushResult.ackSig;
-    if (!ackSigHex) {
-        throw new Error('GUARDIAN did not return acknowledgment signature');
-    }
-    const guardianAckScheme = pushResult.ackScheme || defaultAckScheme;
-    const ackPubkey = pushResult.ackPubkey || guardianPublicKey;
-    const normalizedGuardianCommitment = normalizeHexWord(guardianCommitmentHex);
-    if (guardianAckScheme === 'ecdsa' && ackPubkey) {
-        const derived = tryComputeEcdsaCommitmentHex(ackPubkey);
-        if (derived && derived !== normalizedGuardianCommitment) {
-            throw new Error('GUARDIAN public key commitment mismatch');
-        }
-    }
-    const guardianCommitment = Word.fromHex(normalizedGuardianCommitment);
-    const ackSigBytes = signatureHexToBytes(ackSigHex, guardianAckScheme);
-    const ackSignature = Signature.deserialize(ackSigBytes);
-    const txCommitment = Word.fromHex(normalizeHexWord(txCommitmentHex));
-    const isAckEcdsa = guardianAckScheme === 'ecdsa' && ackPubkey;
-    const { key, values } = buildSignatureAdviceEntry(guardianCommitment, txCommitment, ackSignature, isAckEcdsa ? ackPubkey : undefined, isAckEcdsa ? ackSigHex : undefined);
-    adviceMap.insert(key, new FeltArray(values));
-}
-async function buildFinalRequest(params, saltHex, adviceMap) {
-    const metadata = params.proposal.metadata;
-    const normalizedSalt = Word.fromHex(normalizeHexWord(saltHex));
-    switch (metadata.proposalType) {
-        case 'consume_notes': {
-            if (!metadata.noteIds || metadata.noteIds.length === 0) {
-                throw new Error('Proposal missing noteIds. Was it created with createConsumeNotesProposal?');
-            }
-            const { request } = await buildConsumeNotesTransactionRequest(params.midenClient, metadata.noteIds, { salt: normalizedSalt, signatureAdviceMap: adviceMap });
-            return request;
-        }
-        case 'switch_guardian': {
-            if (!metadata.newGuardianPubkey) {
-                throw new Error('Proposal missing newGuardianPubkey. Was it created with createSwitchGuardianProposal?');
-            }
-            const { request } = await buildUpdateGuardianTransactionRequest(params.midenClient, metadata.newGuardianPubkey, {
-                salt: normalizedSalt,
-                signatureAdviceMap: adviceMap,
-                signatureScheme: params.signatureScheme,
-            });
-            return request;
-        }
-        case 'update_procedure_threshold': {
-            const { request } = await buildUpdateProcedureThresholdTransactionRequest(params.midenClient, metadata.targetProcedure, metadata.targetThreshold, {
-                salt: normalizedSalt,
-                signatureAdviceMap: adviceMap,
-                signatureScheme: params.signatureScheme,
-            });
-            return request;
-        }
-        case 'p2id': {
-            if (!metadata.recipientId || !metadata.faucetId || !metadata.amount) {
-                throw new Error('Proposal missing P2ID metadata (recipientId, faucetId, amount). Was it created with createP2idProposal?');
-            }
-            const { request } = buildP2idTransactionRequest(params.accountId, metadata.recipientId, metadata.faucetId, BigInt(metadata.amount), { salt: normalizedSalt, signatureAdviceMap: adviceMap });
-            return request;
-        }
-        case 'custom':
-            throw new Error(`Cannot execute a custom proposal type (${metadata.rawProposalType ?? 'custom'}) via the generic SDK; ` +
-                'use prepareCustomExecution to get the cosigner + GUARDIAN advice, then submitTransaction with your rebuilt request (issue #266).');
-        default: {
-            const { request } = await buildUpdateSignersTransactionRequest(params.midenClient, metadata.targetThreshold, metadata.targetSignerCommitments, {
-                salt: normalizedSalt,
-                signatureAdviceMap: adviceMap,
-                signatureScheme: params.signatureScheme,
-            });
-            return request;
-        }
-    }
-}
-async function submitTransaction(midenClient, accountIdHex, request) {
-    await midenClient.transactions.submit(accountIdHex, request);
-}
-//# sourceMappingURL=execution.js.map

package/dist/multisig/proposal/execution.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../../src/multisig/proposal/execution.ts"],"names":[],"mappings":"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"}

package/dist/multisig/proposal/parser.d.ts

@@ -1,17 +0,0 @@
-import type { DeltaObject, DeltaStatus, ProposalMetadata as GuardianProposalMetadata } from '@openzeppelin/guardian-client';
-import type { ProposalMetadata, ProposalType, TransactionProposal, TransactionProposalSignature, TransactionProposalStatus } from '../../types.js';
-export declare function buildGuardianMetadata(metadata: ProposalMetadata): GuardianProposalMetadata;
-export declare function fromGuardianMetadata(guardian: GuardianProposalMetadata): ProposalMetadata | undefined;
-export declare function deltaStatusToProposalStatus(status: DeltaStatus, signaturesRequired: number): TransactionProposalStatus;
-interface DeltaToProposalParams {
-    delta: DeltaObject;
-    proposalId: string;
-    metadata: ProposalMetadata;
-    signaturesRequired: number;
-    existingSignatures?: TransactionProposalSignature[];
-}
-export declare function deltaToProposal({ delta, proposalId, metadata, signaturesRequired, existingSignatures, }: DeltaToProposalParams): TransactionProposal;
-export declare function resolveMetadata(delta: DeltaObject, existingMetadata?: ProposalMetadata): ProposalMetadata | undefined;
-export declare function signatureRequirementForProposal(metadata: ProposalMetadata, defaultThreshold: number, getEffectiveThreshold: (proposalType: ProposalType) => number): number;
-export {};
-//# sourceMappingURL=parser.d.ts.map

package/dist/multisig/proposal/parser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/multisig/proposal/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,gBAAgB,IAAI,wBAAwB,EAC7C,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,4BAA4B,EAC5B,yBAAyB,EAC1B,MAAM,gBAAgB,CAAC;AAExB,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,wBAAwB,CAyC1F;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,wBAAwB,GAAG,gBAAgB,GAAG,SAAS,CA4CrG;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,WAAW,EACnB,kBAAkB,EAAE,MAAM,GACzB,yBAAyB,CAoB3B;AAED,UAAU,qBAAqB;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,4BAA4B,EAAE,CAAC;CACrD;AAED,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,UAAU,EACV,QAAQ,EACR,kBAAkB,EAClB,kBAAkB,GACnB,EAAE,qBAAqB,GAAG,mBAAmB,CA+B7C;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,WAAW,EAClB,gBAAgB,CAAC,EAAE,gBAAgB,GAClC,gBAAgB,GAAG,SAAS,CAI9B;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,MAAM,GAC5D,MAAM,CAGR"}

package/dist/multisig/proposal/parser.js

@@ -1,147 +0,0 @@
-export function buildGuardianMetadata(metadata) {
-    const base = {
-        proposalType: metadata.proposalType,
-        description: metadata.description,
-        salt: metadata.saltHex,
-    };
-    switch (metadata.proposalType) {
-        case 'consume_notes':
-            return {
-                ...base,
-                noteIds: metadata.noteIds,
-            };
-        case 'p2id':
-            return {
-                ...base,
-                recipientId: metadata.recipientId,
-                faucetId: metadata.faucetId,
-                amount: metadata.amount,
-            };
-        case 'switch_guardian':
-            return {
-                ...base,
-                targetThreshold: metadata.targetThreshold,
-                signerCommitments: metadata.targetSignerCommitments,
-                newGuardianPubkey: metadata.newGuardianPubkey,
-                newGuardianEndpoint: metadata.newGuardianEndpoint,
-            };
-        case 'add_signer':
-        case 'remove_signer':
-        case 'change_threshold':
-            return {
-                ...base,
-                targetThreshold: metadata.targetThreshold,
-                signerCommitments: metadata.targetSignerCommitments,
-            };
-        case 'unknown':
-            return base;
-        default:
-            return base;
-    }
-}
-export function fromGuardianMetadata(guardian) {
-    if (!guardian.proposalType)
-        return undefined;
-    const base = {
-        description: guardian.description ?? '',
-        saltHex: guardian.salt,
-    };
-    switch (guardian.proposalType) {
-        case 'p2id':
-            return {
-                ...base,
-                proposalType: 'p2id',
-                recipientId: guardian.recipientId ?? '',
-                faucetId: guardian.faucetId ?? '',
-                amount: guardian.amount ?? '0',
-            };
-        case 'consume_notes':
-            return {
-                ...base,
-                proposalType: 'consume_notes',
-                noteIds: guardian.noteIds ?? [],
-            };
-        case 'switch_guardian':
-            return {
-                ...base,
-                proposalType: 'switch_guardian',
-                newGuardianPubkey: guardian.newGuardianPubkey ?? '',
-                newGuardianEndpoint: guardian.newGuardianEndpoint,
-                targetThreshold: guardian.targetThreshold,
-                targetSignerCommitments: guardian.signerCommitments,
-            };
-        case 'add_signer':
-        case 'remove_signer':
-        case 'change_threshold':
-            return {
-                ...base,
-                proposalType: guardian.proposalType,
-                targetThreshold: guardian.targetThreshold ?? 0,
-                targetSignerCommitments: guardian.signerCommitments ?? [],
-            };
-        default:
-            return undefined;
-    }
-}
-export function deltaStatusToProposalStatus(status, signaturesRequired) {
-    switch (status.status) {
-        case 'pending': {
-            const signaturesCollected = status.cosignerSigs.length;
-            if (signaturesCollected >= signaturesRequired) {
-                return { type: 'ready' };
-            }
-            return {
-                type: 'pending',
-                signaturesCollected,
-                signaturesRequired,
-                signers: status.cosignerSigs.map((s) => s.signerId),
-            };
-        }
-        case 'candidate':
-            return { type: 'ready' };
-        case 'canonical':
-        case 'discarded':
-            return { type: 'finalized' };
-    }
-}
-export function deltaToProposal({ delta, proposalId, metadata, signaturesRequired, existingSignatures, }) {
-    const status = deltaStatusToProposalStatus(delta.status, signaturesRequired);
-    const signaturesFromStatus = delta.status.status === 'pending'
-        ? delta.status.cosignerSigs.map((s) => ({
-            signerId: s.signerId,
-            signature: s.signature,
-            timestamp: s.timestamp,
-        }))
-        : [];
-    const signaturesMap = new Map();
-    for (const sig of existingSignatures ?? []) {
-        signaturesMap.set(sig.signerId, sig);
-    }
-    for (const sig of signaturesFromStatus) {
-        signaturesMap.set(sig.signerId, sig);
-    }
-    const signatures = Array.from(signaturesMap.values());
-    return {
-        id: proposalId,
-        commitment: proposalId,
-        accountId: delta.accountId,
-        nonce: delta.nonce,
-        status,
-        txSummary: delta.deltaPayload.txSummary.data,
-        signatures,
-        metadata,
-    };
-}
-export function resolveMetadata(delta, existingMetadata) {
-    if (existingMetadata)
-        return existingMetadata;
-    if (!delta.deltaPayload.metadata)
-        return undefined;
-    return fromGuardianMetadata(delta.deltaPayload.metadata);
-}
-export function signatureRequirementForProposal(metadata, defaultThreshold, getEffectiveThreshold) {
-    if (metadata.proposalType === 'unknown')
-        return defaultThreshold;
-    return getEffectiveThreshold(metadata.proposalType);
-}
-//# sourceMappingURL=parser.js.map

package/dist/multisig/proposal/parser.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/multisig/proposal/parser.ts"],"names":[],"mappings":"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"}