@openzeppelin/miden-multisig-client 0.12.8 → 0.13.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +42 -4
- package/dist/account/builder.d.ts +1 -1
- package/dist/account/builder.d.ts.map +1 -1
- package/dist/account/builder.js +7 -5
- package/dist/account/builder.js.map +1 -1
- package/dist/account/builder.test.d.ts +2 -0
- package/dist/account/builder.test.d.ts.map +1 -0
- package/dist/account/builder.test.js +39 -0
- package/dist/account/builder.test.js.map +1 -0
- package/dist/account/masm.d.ts +3 -3
- package/dist/account/masm.d.ts.map +1 -1
- package/dist/account/masm.js +101 -98
- package/dist/account/masm.js.map +1 -1
- package/dist/account/storage.d.ts +1 -1
- package/dist/account/storage.d.ts.map +1 -1
- package/dist/account/storage.js +17 -7
- package/dist/account/storage.js.map +1 -1
- package/dist/client.d.ts +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +2 -2
- package/dist/client.js.map +1 -1
- package/dist/client.test.js +4 -4
- package/dist/client.test.js.map +1 -1
- package/dist/index.d.ts +8 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -1
- package/dist/index.js.map +1 -1
- package/dist/inspector.d.ts +1 -1
- package/dist/inspector.d.ts.map +1 -1
- package/dist/inspector.js +16 -10
- package/dist/inspector.js.map +1 -1
- package/dist/inspector.test.js +33 -22
- package/dist/inspector.test.js.map +1 -1
- package/dist/multisig/helpers.d.ts +1 -1
- package/dist/multisig/helpers.d.ts.map +1 -1
- package/dist/multisig/helpers.js +1 -1
- package/dist/multisig/helpers.js.map +1 -1
- package/dist/multisig/helpers.test.js +2 -2
- package/dist/multisig/helpers.test.js.map +1 -1
- package/dist/multisig/proposal/execution.d.ts +19 -0
- package/dist/multisig/proposal/execution.d.ts.map +1 -0
- package/dist/multisig/proposal/execution.js +158 -0
- package/dist/multisig/proposal/execution.js.map +1 -0
- package/dist/multisig/proposal/parser.d.ts +17 -0
- package/dist/multisig/proposal/parser.d.ts.map +1 -0
- package/dist/multisig/proposal/parser.js +147 -0
- package/dist/multisig/proposal/parser.js.map +1 -0
- package/dist/multisig/signing.d.ts +5 -0
- package/dist/multisig/signing.d.ts.map +1 -0
- package/dist/multisig/signing.js +14 -0
- package/dist/multisig/signing.js.map +1 -0
- package/dist/multisig.d.ts +10 -13
- package/dist/multisig.d.ts.map +1 -1
- package/dist/multisig.js +128 -337
- package/dist/multisig.js.map +1 -1
- package/dist/multisig.test.js +8 -4
- package/dist/multisig.test.js.map +1 -1
- package/dist/proposal/exported.d.ts +12 -0
- package/dist/proposal/exported.d.ts.map +1 -0
- package/dist/proposal/exported.js +88 -0
- package/dist/proposal/exported.js.map +1 -0
- package/dist/proposal/metadata.d.ts +15 -0
- package/dist/proposal/metadata.d.ts.map +1 -0
- package/dist/proposal/metadata.js +212 -0
- package/dist/proposal/metadata.js.map +1 -0
- package/dist/signer.d.ts +2 -20
- package/dist/signer.d.ts.map +1 -1
- package/dist/signer.js +2 -82
- package/dist/signer.js.map +1 -1
- package/dist/signer.test.js +22 -16
- package/dist/signer.test.js.map +1 -1
- package/dist/signers/ecdsa.d.ts +12 -0
- package/dist/signers/ecdsa.d.ts.map +1 -0
- package/dist/signers/ecdsa.js +30 -0
- package/dist/signers/ecdsa.js.map +1 -0
- package/dist/signers/falcon.d.ts +12 -0
- package/dist/signers/falcon.d.ts.map +1 -0
- package/dist/signers/falcon.js +31 -0
- package/dist/signers/falcon.js.map +1 -0
- package/dist/signers/falcon.test.d.ts +2 -0
- package/dist/signers/falcon.test.d.ts.map +1 -0
- package/dist/signers/falcon.test.js +113 -0
- package/dist/signers/falcon.test.js.map +1 -0
- package/dist/signers/index.d.ts +5 -0
- package/dist/signers/index.d.ts.map +1 -0
- package/dist/signers/index.js +5 -0
- package/dist/signers/index.js.map +1 -0
- package/dist/signers/miden-wallet.d.ts +16 -0
- package/dist/signers/miden-wallet.d.ts.map +1 -0
- package/dist/signers/miden-wallet.js +35 -0
- package/dist/signers/miden-wallet.js.map +1 -0
- package/dist/signers/miden-wallet.test.d.ts +2 -0
- package/dist/signers/miden-wallet.test.d.ts.map +1 -0
- package/dist/signers/miden-wallet.test.js +107 -0
- package/dist/signers/miden-wallet.test.js.map +1 -0
- package/dist/signers/para.d.ts +21 -0
- package/dist/signers/para.d.ts.map +1 -0
- package/dist/signers/para.js +43 -0
- package/dist/signers/para.js.map +1 -0
- package/dist/signers/para.test.d.ts +2 -0
- package/dist/signers/para.test.d.ts.map +1 -0
- package/dist/signers/para.test.js +88 -0
- package/dist/signers/para.test.js.map +1 -0
- package/dist/transaction/consumeNotes.d.ts +3 -3
- package/dist/transaction/consumeNotes.d.ts.map +1 -1
- package/dist/transaction/consumeNotes.js +11 -7
- package/dist/transaction/consumeNotes.js.map +1 -1
- package/dist/transaction/options.d.ts +2 -2
- package/dist/transaction/options.d.ts.map +1 -1
- package/dist/transaction/p2id.d.ts +1 -1
- package/dist/transaction/p2id.d.ts.map +1 -1
- package/dist/transaction/p2id.interop.test.d.ts +2 -0
- package/dist/transaction/p2id.interop.test.d.ts.map +1 -0
- package/dist/transaction/p2id.interop.test.js +36 -0
- package/dist/transaction/p2id.interop.test.js.map +1 -0
- package/dist/transaction/p2id.js +5 -5
- package/dist/transaction/p2id.js.map +1 -1
- package/dist/transaction/p2id.test.d.ts +2 -0
- package/dist/transaction/p2id.test.d.ts.map +1 -0
- package/dist/transaction/p2id.test.js +138 -0
- package/dist/transaction/p2id.test.js.map +1 -0
- package/dist/transaction/rpoRandomCoin.d.ts +7 -0
- package/dist/transaction/rpoRandomCoin.d.ts.map +1 -0
- package/dist/transaction/rpoRandomCoin.js +17 -0
- package/dist/transaction/rpoRandomCoin.js.map +1 -0
- package/dist/transaction/rpoRandomCoin.test.d.ts +2 -0
- package/dist/transaction/rpoRandomCoin.test.d.ts.map +1 -0
- package/dist/transaction/rpoRandomCoin.test.js +52 -0
- package/dist/transaction/rpoRandomCoin.test.js.map +1 -0
- package/dist/transaction/summary.d.ts +1 -1
- package/dist/transaction/summary.d.ts.map +1 -1
- package/dist/transaction/summary.js +1 -1
- package/dist/transaction/summary.js.map +1 -1
- package/dist/transaction/updatePsm.d.ts +1 -1
- package/dist/transaction/updatePsm.d.ts.map +1 -1
- package/dist/transaction/updatePsm.js +5 -5
- package/dist/transaction/updatePsm.js.map +1 -1
- package/dist/transaction/updateSigners.d.ts +1 -1
- package/dist/transaction/updateSigners.d.ts.map +1 -1
- package/dist/transaction/updateSigners.js +5 -5
- package/dist/transaction/updateSigners.js.map +1 -1
- package/dist/transaction.test.js +1 -1
- package/dist/transaction.test.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/digest.d.ts +6 -0
- package/dist/utils/digest.d.ts.map +1 -0
- package/dist/utils/digest.js +22 -0
- package/dist/utils/digest.js.map +1 -0
- package/dist/utils/ecdsa.d.ts +8 -0
- package/dist/utils/ecdsa.d.ts.map +1 -0
- package/dist/utils/ecdsa.js +60 -0
- package/dist/utils/ecdsa.js.map +1 -0
- package/dist/utils/ecdsa.test.d.ts +2 -0
- package/dist/utils/ecdsa.test.d.ts.map +1 -0
- package/dist/utils/ecdsa.test.js +85 -0
- package/dist/utils/ecdsa.test.js.map +1 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/key.d.ts +10 -0
- package/dist/utils/key.d.ts.map +1 -0
- package/dist/utils/key.js +38 -0
- package/dist/utils/key.js.map +1 -0
- package/dist/utils/key.test.d.ts +2 -0
- package/dist/utils/key.test.d.ts.map +1 -0
- package/dist/utils/key.test.js +80 -0
- package/dist/utils/key.test.js.map +1 -0
- package/dist/utils/random.d.ts +1 -1
- package/dist/utils/random.d.ts.map +1 -1
- package/dist/utils/random.js +1 -1
- package/dist/utils/random.js.map +1 -1
- package/dist/utils/signature.d.ts +2 -1
- package/dist/utils/signature.d.ts.map +1 -1
- package/dist/utils/signature.js +6 -3
- package/dist/utils/signature.js.map +1 -1
- package/dist/utils/signature.test.js +11 -11
- package/dist/utils/signature.test.js.map +1 -1
- package/dist/utils/state-validation.d.ts +5 -0
- package/dist/utils/state-validation.d.ts.map +1 -0
- package/dist/utils/state-validation.js +30 -0
- package/dist/utils/state-validation.js.map +1 -0
- package/dist/utils/validation.d.ts +6 -0
- package/dist/utils/validation.d.ts.map +1 -0
- package/dist/utils/validation.js +52 -0
- package/dist/utils/validation.js.map +1 -0
- package/dist/utils/word.d.ts +6 -1
- package/dist/utils/word.d.ts.map +1 -1
- package/dist/utils/word.js +11 -0
- package/dist/utils/word.js.map +1 -1
- package/dist/utils/word.test.js +54 -3
- package/dist/utils/word.test.js.map +1 -1
- package/package.json +4 -5
- package/src/account/builder.ts +7 -5
- package/src/account/masm.ts +103 -99
- package/src/account/storage.ts +19 -7
- package/src/client.test.ts +4 -4
- package/src/client.ts +3 -3
- package/src/index.ts +8 -1
- package/src/inspector.test.ts +38 -25
- package/src/inspector.ts +18 -10
- package/src/multisig/helpers.test.ts +2 -2
- package/src/multisig/helpers.ts +2 -1
- package/src/multisig/proposal/execution.ts +364 -0
- package/src/multisig/proposal/parser.ts +191 -0
- package/src/multisig/signing.ts +24 -0
- package/src/multisig.test.ts +8 -4
- package/src/multisig.ts +176 -434
- package/src/signer.ts +2 -95
- package/src/signers/ecdsa.ts +35 -0
- package/src/{signer.test.ts → signers/falcon.test.ts} +29 -33
- package/src/signers/falcon.ts +36 -0
- package/src/signers/index.ts +4 -0
- package/src/signers/miden-wallet.test.ts +119 -0
- package/src/signers/miden-wallet.ts +49 -0
- package/src/signers/para.test.ts +103 -0
- package/src/signers/para.ts +60 -0
- package/src/transaction/consumeNotes.ts +14 -10
- package/src/transaction/options.ts +2 -2
- package/src/transaction/p2id.ts +3 -8
- package/src/transaction/summary.ts +2 -2
- package/src/transaction/updatePsm.ts +5 -6
- package/src/transaction/updateSigners.ts +5 -6
- package/src/transaction.test.ts +1 -1
- package/src/types.ts +1 -1
- package/src/utils/digest.ts +25 -0
- package/src/utils/ecdsa.test.ts +104 -0
- package/src/utils/ecdsa.ts +77 -0
- package/src/utils/index.ts +1 -0
- package/src/utils/key.test.ts +89 -0
- package/src/utils/key.ts +49 -0
- package/src/utils/random.ts +1 -1
- package/src/utils/signature.test.ts +11 -11
- package/src/utils/signature.ts +10 -3
- package/src/utils/word.test.ts +57 -3
- package/src/utils/word.ts +13 -1
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
import { AccountId, AdviceMap, FeltArray, Signature, TransactionSummary, Word, } from '@miden-sdk/miden-sdk';
|
|
2
|
+
import { buildConsumeNotesTransactionRequest, buildP2idTransactionRequest, buildUpdatePsmTransactionRequest, buildUpdateSignersTransactionRequest, } from '../../transaction.js';
|
|
3
|
+
import { base64ToUint8Array, normalizeHexWord } from '../../utils/encoding.js';
|
|
4
|
+
import { buildSignatureAdviceEntry, signatureHexToBytes, tryComputeEcdsaCommitmentHex, } from '../../utils/signature.js';
|
|
5
|
+
import { computeCommitmentFromTxSummary } from '../helpers.js';
|
|
6
|
+
export async function executeProposalWorkflow(params) {
|
|
7
|
+
ensureProposalReady(params.proposal, params.threshold, params.getEffectiveThreshold);
|
|
8
|
+
const isSwitchPsm = params.proposal.metadata.proposalType === 'switch_psm';
|
|
9
|
+
const executionSource = await resolveExecutionSource(params.psm, params.accountId, params.proposal, isSwitchPsm);
|
|
10
|
+
const executionData = prepareExecutionData(executionSource.txSummaryBase64);
|
|
11
|
+
const adviceMap = buildCosignerAdviceMap(params.proposal, params.signerCommitments, executionData.txCommitmentHex);
|
|
12
|
+
if (!isSwitchPsm && executionSource.delta) {
|
|
13
|
+
await appendPsmAckAdvice(params.psm, executionSource.delta, params.psmCommitment, params.psmPublicKey, params.signatureScheme, executionData.txCommitmentHex, adviceMap);
|
|
14
|
+
}
|
|
15
|
+
const finalRequest = await buildFinalRequest(params, executionData.saltHex, adviceMap);
|
|
16
|
+
await submitTransaction(params.webClient, params.accountId, finalRequest);
|
|
17
|
+
}
|
|
18
|
+
export async function createTransactionProposalRequest(params) {
|
|
19
|
+
ensureProposalReady(params.proposal, params.threshold, params.getEffectiveThreshold);
|
|
20
|
+
const isSwitchPsm = params.proposal.metadata.proposalType === 'switch_psm';
|
|
21
|
+
const executionSource = await resolveExecutionSource(params.psm, params.accountId, params.proposal, isSwitchPsm);
|
|
22
|
+
const executionData = prepareExecutionData(executionSource.txSummaryBase64);
|
|
23
|
+
const adviceMap = buildCosignerAdviceMap(params.proposal, params.signerCommitments, executionData.txCommitmentHex);
|
|
24
|
+
if (!isSwitchPsm && executionSource.delta) {
|
|
25
|
+
await appendPsmAckAdvice(params.psm, executionSource.delta, params.psmCommitment, params.psmPublicKey, params.signatureScheme, executionData.txCommitmentHex, adviceMap);
|
|
26
|
+
}
|
|
27
|
+
return await buildFinalRequest(params, executionData.saltHex, adviceMap);
|
|
28
|
+
}
|
|
29
|
+
function ensureProposalReady(proposal, defaultThreshold, getEffectiveThreshold) {
|
|
30
|
+
const proposalType = proposal.metadata?.proposalType;
|
|
31
|
+
const effectiveThreshold = proposalType
|
|
32
|
+
? getEffectiveThreshold(proposalType)
|
|
33
|
+
: defaultThreshold;
|
|
34
|
+
if (proposal.signatures.length < effectiveThreshold) {
|
|
35
|
+
throw new Error('Proposal is not ready for execution. Still pending signatures.');
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
async function resolveExecutionSource(psm, accountId, proposal, isSwitchPsm) {
|
|
39
|
+
if (isSwitchPsm) {
|
|
40
|
+
return { txSummaryBase64: proposal.txSummary };
|
|
41
|
+
}
|
|
42
|
+
const deltas = await psm.getDeltaProposals(accountId);
|
|
43
|
+
const delta = deltas.find((d) => computeCommitmentFromTxSummary(d.deltaPayload.txSummary.data) === proposal.commitment);
|
|
44
|
+
if (!delta) {
|
|
45
|
+
throw new Error(`Proposal not found on server: ${proposal.commitment}`);
|
|
46
|
+
}
|
|
47
|
+
return {
|
|
48
|
+
delta,
|
|
49
|
+
txSummaryBase64: delta.deltaPayload.txSummary.data,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
function prepareExecutionData(txSummaryBase64) {
|
|
53
|
+
const txSummaryBytes = base64ToUint8Array(txSummaryBase64);
|
|
54
|
+
const txSummary = TransactionSummary.deserialize(txSummaryBytes);
|
|
55
|
+
const saltHex = txSummary.salt().toHex();
|
|
56
|
+
const txCommitmentHex = txSummary.toCommitment().toHex();
|
|
57
|
+
return { txSummary, saltHex, txCommitmentHex };
|
|
58
|
+
}
|
|
59
|
+
function buildCosignerAdviceMap(proposal, signerCommitments, txCommitmentHex) {
|
|
60
|
+
const adviceMap = new AdviceMap();
|
|
61
|
+
const normalizedSignerCommitments = new Set(signerCommitments.map((c) => normalizeHexWord(c)));
|
|
62
|
+
for (const cosignerSig of proposal.signatures) {
|
|
63
|
+
let signerCommitmentHex = normalizeHexWord(cosignerSig.signerId);
|
|
64
|
+
if (cosignerSig.signature.scheme === 'ecdsa' && cosignerSig.signature.publicKey) {
|
|
65
|
+
const derived = tryComputeEcdsaCommitmentHex(cosignerSig.signature.publicKey);
|
|
66
|
+
if (derived && derived !== signerCommitmentHex) {
|
|
67
|
+
if (!normalizedSignerCommitments.has(derived)) {
|
|
68
|
+
throw new Error(`ECDSA public key commitment mismatch: derived commitment ${derived} is not in signerCommitments.`);
|
|
69
|
+
}
|
|
70
|
+
signerCommitmentHex = derived;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
const signerCommitment = Word.fromHex(signerCommitmentHex);
|
|
74
|
+
const sigBytes = signatureHexToBytes(cosignerSig.signature.signature, cosignerSig.signature.scheme);
|
|
75
|
+
const signature = Signature.deserialize(sigBytes);
|
|
76
|
+
const txCommitment = Word.fromHex(normalizeHexWord(txCommitmentHex));
|
|
77
|
+
const isEcdsa = cosignerSig.signature.scheme === 'ecdsa' && cosignerSig.signature.publicKey;
|
|
78
|
+
const { key, values } = buildSignatureAdviceEntry(signerCommitment, txCommitment, signature, isEcdsa ? cosignerSig.signature.publicKey : undefined, isEcdsa ? cosignerSig.signature.signature : undefined);
|
|
79
|
+
adviceMap.insert(key, new FeltArray(values));
|
|
80
|
+
}
|
|
81
|
+
return adviceMap;
|
|
82
|
+
}
|
|
83
|
+
async function appendPsmAckAdvice(psm, delta, psmCommitmentHex, psmPublicKey, defaultAckScheme, txCommitmentHex, adviceMap) {
|
|
84
|
+
const executionDelta = {
|
|
85
|
+
...delta,
|
|
86
|
+
deltaPayload: delta.deltaPayload.txSummary,
|
|
87
|
+
};
|
|
88
|
+
const pushResult = await psm.pushDelta(executionDelta);
|
|
89
|
+
const ackSigHex = pushResult.ackSig;
|
|
90
|
+
if (!ackSigHex) {
|
|
91
|
+
throw new Error('PSM did not return acknowledgment signature');
|
|
92
|
+
}
|
|
93
|
+
const psmAckScheme = pushResult.ackScheme || defaultAckScheme;
|
|
94
|
+
const ackPubkey = pushResult.ackPubkey || psmPublicKey;
|
|
95
|
+
const normalizedPsmCommitment = normalizeHexWord(psmCommitmentHex);
|
|
96
|
+
if (psmAckScheme === 'ecdsa' && ackPubkey) {
|
|
97
|
+
const derived = tryComputeEcdsaCommitmentHex(ackPubkey);
|
|
98
|
+
if (derived && derived !== normalizedPsmCommitment) {
|
|
99
|
+
throw new Error('PSM public key commitment mismatch');
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
const psmCommitment = Word.fromHex(normalizedPsmCommitment);
|
|
103
|
+
const ackSigBytes = signatureHexToBytes(ackSigHex, psmAckScheme);
|
|
104
|
+
const ackSignature = Signature.deserialize(ackSigBytes);
|
|
105
|
+
const txCommitment = Word.fromHex(normalizeHexWord(txCommitmentHex));
|
|
106
|
+
const isAckEcdsa = psmAckScheme === 'ecdsa' && ackPubkey;
|
|
107
|
+
const { key, values } = buildSignatureAdviceEntry(psmCommitment, txCommitment, ackSignature, isAckEcdsa ? ackPubkey : undefined, isAckEcdsa ? ackSigHex : undefined);
|
|
108
|
+
adviceMap.insert(key, new FeltArray(values));
|
|
109
|
+
}
|
|
110
|
+
async function buildFinalRequest(params, saltHex, adviceMap) {
|
|
111
|
+
const metadata = params.proposal.metadata;
|
|
112
|
+
const normalizedSalt = Word.fromHex(normalizeHexWord(saltHex));
|
|
113
|
+
switch (metadata.proposalType) {
|
|
114
|
+
case 'consume_notes': {
|
|
115
|
+
if (!metadata.noteIds || metadata.noteIds.length === 0) {
|
|
116
|
+
throw new Error('Proposal missing noteIds. Was it created with createConsumeNotesProposal?');
|
|
117
|
+
}
|
|
118
|
+
const { request } = await buildConsumeNotesTransactionRequest(params.webClient, metadata.noteIds, { salt: normalizedSalt, signatureAdviceMap: adviceMap });
|
|
119
|
+
return request;
|
|
120
|
+
}
|
|
121
|
+
case 'switch_psm': {
|
|
122
|
+
if (!metadata.newPsmPubkey) {
|
|
123
|
+
throw new Error('Proposal missing newPsmPubkey. Was it created with createSwitchPsmProposal?');
|
|
124
|
+
}
|
|
125
|
+
const { request } = await buildUpdatePsmTransactionRequest(params.webClient, metadata.newPsmPubkey, {
|
|
126
|
+
salt: normalizedSalt,
|
|
127
|
+
signatureAdviceMap: adviceMap,
|
|
128
|
+
signatureScheme: params.signatureScheme,
|
|
129
|
+
});
|
|
130
|
+
return request;
|
|
131
|
+
}
|
|
132
|
+
case 'p2id': {
|
|
133
|
+
if (!metadata.recipientId || !metadata.faucetId || !metadata.amount) {
|
|
134
|
+
throw new Error('Proposal missing P2ID metadata (recipientId, faucetId, amount). Was it created with createP2idProposal?');
|
|
135
|
+
}
|
|
136
|
+
const { request } = buildP2idTransactionRequest(params.accountId, metadata.recipientId, metadata.faucetId, BigInt(metadata.amount), { salt: normalizedSalt, signatureAdviceMap: adviceMap });
|
|
137
|
+
return request;
|
|
138
|
+
}
|
|
139
|
+
case 'unknown':
|
|
140
|
+
throw new Error('Cannot execute proposal with unknown type. The proposal must have been imported without proper metadata.');
|
|
141
|
+
default: {
|
|
142
|
+
const { request } = await buildUpdateSignersTransactionRequest(params.webClient, metadata.targetThreshold, metadata.targetSignerCommitments, {
|
|
143
|
+
salt: normalizedSalt,
|
|
144
|
+
signatureAdviceMap: adviceMap,
|
|
145
|
+
signatureScheme: params.signatureScheme,
|
|
146
|
+
});
|
|
147
|
+
return request;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
async function submitTransaction(webClient, accountIdHex, request) {
|
|
152
|
+
const accountId = AccountId.fromHex(accountIdHex);
|
|
153
|
+
const result = await webClient.executeTransaction(accountId, request);
|
|
154
|
+
const proven = await webClient.proveTransaction(result, null);
|
|
155
|
+
const submissionHeight = await webClient.submitProvenTransaction(proven, result);
|
|
156
|
+
await webClient.applyTransaction(result, submissionHeight);
|
|
157
|
+
}
|
|
158
|
+
//# sourceMappingURL=execution.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../../src/multisig/proposal/execution.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { DeltaObject, DeltaStatus, ProposalMetadata as PsmProposalMetadata } from '@openzeppelin/psm-client';
|
|
2
|
+
import type { ProposalMetadata, ProposalType, TransactionProposal, TransactionProposalSignature, TransactionProposalStatus } from '../../types.js';
|
|
3
|
+
export declare function buildPsmMetadata(metadata: ProposalMetadata): PsmProposalMetadata;
|
|
4
|
+
export declare function fromPsmMetadata(psm: PsmProposalMetadata): ProposalMetadata | undefined;
|
|
5
|
+
export declare function deltaStatusToProposalStatus(status: DeltaStatus, signaturesRequired: number): TransactionProposalStatus;
|
|
6
|
+
interface DeltaToProposalParams {
|
|
7
|
+
delta: DeltaObject;
|
|
8
|
+
proposalId: string;
|
|
9
|
+
metadata: ProposalMetadata;
|
|
10
|
+
signaturesRequired: number;
|
|
11
|
+
existingSignatures?: TransactionProposalSignature[];
|
|
12
|
+
}
|
|
13
|
+
export declare function deltaToProposal({ delta, proposalId, metadata, signaturesRequired, existingSignatures, }: DeltaToProposalParams): TransactionProposal;
|
|
14
|
+
export declare function resolveMetadata(delta: DeltaObject, existingMetadata?: ProposalMetadata): ProposalMetadata | undefined;
|
|
15
|
+
export declare function signatureRequirementForProposal(metadata: ProposalMetadata, defaultThreshold: number, getEffectiveThreshold: (proposalType: ProposalType) => number): number;
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=parser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"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,mBAAmB,EACxC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,4BAA4B,EAC5B,yBAAyB,EAC1B,MAAM,gBAAgB,CAAC;AAExB,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,mBAAmB,CAyChF;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,mBAAmB,GAAG,gBAAgB,GAAG,SAAS,CA4CtF;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"}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
export function buildPsmMetadata(metadata) {
|
|
2
|
+
const base = {
|
|
3
|
+
proposalType: metadata.proposalType,
|
|
4
|
+
description: metadata.description,
|
|
5
|
+
salt: metadata.saltHex,
|
|
6
|
+
};
|
|
7
|
+
switch (metadata.proposalType) {
|
|
8
|
+
case 'consume_notes':
|
|
9
|
+
return {
|
|
10
|
+
...base,
|
|
11
|
+
noteIds: metadata.noteIds,
|
|
12
|
+
};
|
|
13
|
+
case 'p2id':
|
|
14
|
+
return {
|
|
15
|
+
...base,
|
|
16
|
+
recipientId: metadata.recipientId,
|
|
17
|
+
faucetId: metadata.faucetId,
|
|
18
|
+
amount: metadata.amount,
|
|
19
|
+
};
|
|
20
|
+
case 'switch_psm':
|
|
21
|
+
return {
|
|
22
|
+
...base,
|
|
23
|
+
targetThreshold: metadata.targetThreshold,
|
|
24
|
+
signerCommitments: metadata.targetSignerCommitments,
|
|
25
|
+
newPsmPubkey: metadata.newPsmPubkey,
|
|
26
|
+
newPsmEndpoint: metadata.newPsmEndpoint,
|
|
27
|
+
};
|
|
28
|
+
case 'add_signer':
|
|
29
|
+
case 'remove_signer':
|
|
30
|
+
case 'change_threshold':
|
|
31
|
+
return {
|
|
32
|
+
...base,
|
|
33
|
+
targetThreshold: metadata.targetThreshold,
|
|
34
|
+
signerCommitments: metadata.targetSignerCommitments,
|
|
35
|
+
};
|
|
36
|
+
case 'unknown':
|
|
37
|
+
return base;
|
|
38
|
+
default:
|
|
39
|
+
return base;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
export function fromPsmMetadata(psm) {
|
|
43
|
+
if (!psm.proposalType)
|
|
44
|
+
return undefined;
|
|
45
|
+
const base = {
|
|
46
|
+
description: psm.description ?? '',
|
|
47
|
+
saltHex: psm.salt,
|
|
48
|
+
};
|
|
49
|
+
switch (psm.proposalType) {
|
|
50
|
+
case 'p2id':
|
|
51
|
+
return {
|
|
52
|
+
...base,
|
|
53
|
+
proposalType: 'p2id',
|
|
54
|
+
recipientId: psm.recipientId ?? '',
|
|
55
|
+
faucetId: psm.faucetId ?? '',
|
|
56
|
+
amount: psm.amount ?? '0',
|
|
57
|
+
};
|
|
58
|
+
case 'consume_notes':
|
|
59
|
+
return {
|
|
60
|
+
...base,
|
|
61
|
+
proposalType: 'consume_notes',
|
|
62
|
+
noteIds: psm.noteIds ?? [],
|
|
63
|
+
};
|
|
64
|
+
case 'switch_psm':
|
|
65
|
+
return {
|
|
66
|
+
...base,
|
|
67
|
+
proposalType: 'switch_psm',
|
|
68
|
+
newPsmPubkey: psm.newPsmPubkey ?? '',
|
|
69
|
+
newPsmEndpoint: psm.newPsmEndpoint,
|
|
70
|
+
targetThreshold: psm.targetThreshold,
|
|
71
|
+
targetSignerCommitments: psm.signerCommitments,
|
|
72
|
+
};
|
|
73
|
+
case 'add_signer':
|
|
74
|
+
case 'remove_signer':
|
|
75
|
+
case 'change_threshold':
|
|
76
|
+
return {
|
|
77
|
+
...base,
|
|
78
|
+
proposalType: psm.proposalType,
|
|
79
|
+
targetThreshold: psm.targetThreshold ?? 0,
|
|
80
|
+
targetSignerCommitments: psm.signerCommitments ?? [],
|
|
81
|
+
};
|
|
82
|
+
default:
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
export function deltaStatusToProposalStatus(status, signaturesRequired) {
|
|
87
|
+
switch (status.status) {
|
|
88
|
+
case 'pending': {
|
|
89
|
+
const signaturesCollected = status.cosignerSigs.length;
|
|
90
|
+
if (signaturesCollected >= signaturesRequired) {
|
|
91
|
+
return { type: 'ready' };
|
|
92
|
+
}
|
|
93
|
+
return {
|
|
94
|
+
type: 'pending',
|
|
95
|
+
signaturesCollected,
|
|
96
|
+
signaturesRequired,
|
|
97
|
+
signers: status.cosignerSigs.map((s) => s.signerId),
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
case 'candidate':
|
|
101
|
+
return { type: 'ready' };
|
|
102
|
+
case 'canonical':
|
|
103
|
+
case 'discarded':
|
|
104
|
+
return { type: 'finalized' };
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
export function deltaToProposal({ delta, proposalId, metadata, signaturesRequired, existingSignatures, }) {
|
|
108
|
+
const status = deltaStatusToProposalStatus(delta.status, signaturesRequired);
|
|
109
|
+
const signaturesFromStatus = delta.status.status === 'pending'
|
|
110
|
+
? delta.status.cosignerSigs.map((s) => ({
|
|
111
|
+
signerId: s.signerId,
|
|
112
|
+
signature: s.signature,
|
|
113
|
+
timestamp: s.timestamp,
|
|
114
|
+
}))
|
|
115
|
+
: [];
|
|
116
|
+
const signaturesMap = new Map();
|
|
117
|
+
for (const sig of existingSignatures ?? []) {
|
|
118
|
+
signaturesMap.set(sig.signerId, sig);
|
|
119
|
+
}
|
|
120
|
+
for (const sig of signaturesFromStatus) {
|
|
121
|
+
signaturesMap.set(sig.signerId, sig);
|
|
122
|
+
}
|
|
123
|
+
const signatures = Array.from(signaturesMap.values());
|
|
124
|
+
return {
|
|
125
|
+
id: proposalId,
|
|
126
|
+
commitment: proposalId,
|
|
127
|
+
accountId: delta.accountId,
|
|
128
|
+
nonce: delta.nonce,
|
|
129
|
+
status,
|
|
130
|
+
txSummary: delta.deltaPayload.txSummary.data,
|
|
131
|
+
signatures,
|
|
132
|
+
metadata,
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
export function resolveMetadata(delta, existingMetadata) {
|
|
136
|
+
if (existingMetadata)
|
|
137
|
+
return existingMetadata;
|
|
138
|
+
if (!delta.deltaPayload.metadata)
|
|
139
|
+
return undefined;
|
|
140
|
+
return fromPsmMetadata(delta.deltaPayload.metadata);
|
|
141
|
+
}
|
|
142
|
+
export function signatureRequirementForProposal(metadata, defaultThreshold, getEffectiveThreshold) {
|
|
143
|
+
if (metadata.proposalType === 'unknown')
|
|
144
|
+
return defaultThreshold;
|
|
145
|
+
return getEffectiveThreshold(metadata.proposalType);
|
|
146
|
+
}
|
|
147
|
+
//# sourceMappingURL=parser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/multisig/proposal/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { ProposalSignature, Signer } from '@openzeppelin/psm-client';
|
|
2
|
+
import type { SignatureScheme } from '../types.js';
|
|
3
|
+
export declare function toPsmSignature(scheme: SignatureScheme, signatureHex: string, publicKey?: string): ProposalSignature;
|
|
4
|
+
export declare function buildPsmSignatureFromSigner(signer: Signer, commitment: string): Promise<ProposalSignature>;
|
|
5
|
+
//# sourceMappingURL=signing.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signing.d.ts","sourceRoot":"","sources":["../../src/multisig/signing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,GACjB,iBAAiB,CAQnB;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAG5B"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export function toPsmSignature(scheme, signatureHex, publicKey) {
|
|
2
|
+
if (scheme === 'ecdsa') {
|
|
3
|
+
if (!publicKey) {
|
|
4
|
+
throw new Error('ECDSA signature requires publicKey');
|
|
5
|
+
}
|
|
6
|
+
return { scheme: 'ecdsa', signature: signatureHex, publicKey };
|
|
7
|
+
}
|
|
8
|
+
return { scheme: 'falcon', signature: signatureHex };
|
|
9
|
+
}
|
|
10
|
+
export async function buildPsmSignatureFromSigner(signer, commitment) {
|
|
11
|
+
const signatureHex = await signer.signCommitment(commitment);
|
|
12
|
+
return toPsmSignature(signer.scheme, signatureHex, signer.publicKey);
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=signing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signing.js","sourceRoot":"","sources":["../../src/multisig/signing.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,cAAc,CAC5B,MAAuB,EACvB,YAAoB,EACpB,SAAkB;IAElB,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;IACjE,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,MAAc,EACd,UAAkB;IAElB,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC7D,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;AACvE,CAAC"}
|
package/dist/multisig.d.ts
CHANGED
|
@@ -2,8 +2,8 @@ import { PsmHttpClient, type Signer } from '@openzeppelin/psm-client';
|
|
|
2
2
|
import type { ConsumableNote, MultisigConfig, TransactionProposal, ProposalMetadata, ProposalType, SignTransactionProposalParams, SyncResult, TransactionProposalResult } from './types.js';
|
|
3
3
|
import type { ProcedureName } from './procedures.js';
|
|
4
4
|
import { type DetectedMultisigConfig } from './inspector.js';
|
|
5
|
-
import type { WebClient } from '@
|
|
6
|
-
import { Account } from '@
|
|
5
|
+
import type { WebClient, TransactionRequest } from '@miden-sdk/miden-sdk';
|
|
6
|
+
import { Account } from '@miden-sdk/miden-sdk';
|
|
7
7
|
export interface AccountState {
|
|
8
8
|
accountId: string;
|
|
9
9
|
commitment: string;
|
|
@@ -13,12 +13,12 @@ export interface AccountState {
|
|
|
13
13
|
authScheme?: string;
|
|
14
14
|
}
|
|
15
15
|
export declare class Multisig {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
account: Account | null;
|
|
17
|
+
threshold: number;
|
|
18
|
+
signerCommitments: string[];
|
|
19
|
+
psmCommitment: string;
|
|
20
20
|
psmPublicKey?: string;
|
|
21
|
-
|
|
21
|
+
procedureThresholds: Map<ProcedureName, number>;
|
|
22
22
|
readonly signatureScheme: Signer['scheme'];
|
|
23
23
|
private psm;
|
|
24
24
|
private readonly signer;
|
|
@@ -66,12 +66,9 @@ export declare class Multisig {
|
|
|
66
66
|
signTransactionProposalExternal(params: SignTransactionProposalParams): Promise<TransactionProposal[]>;
|
|
67
67
|
executeTransactionProposal(commitment: string): Promise<void>;
|
|
68
68
|
exportTransactionProposalToJson(commitment: string): string;
|
|
69
|
+
createTransactionProposalRequest(commitment: string): Promise<TransactionRequest>;
|
|
69
70
|
importTransactionProposal(json: string): TransactionProposalResult;
|
|
70
|
-
signTransactionProposalOffline(commitment: string): string
|
|
71
|
-
private
|
|
72
|
-
private deltaToProposal;
|
|
73
|
-
private buildPsmMetadata;
|
|
74
|
-
private fromPsmMetadata;
|
|
75
|
-
private deltaStatusToProposalStatus;
|
|
71
|
+
signTransactionProposalOffline(commitment: string): Promise<string>;
|
|
72
|
+
private createAndSyncFromRequest;
|
|
76
73
|
}
|
|
77
74
|
//# sourceMappingURL=multisig.d.ts.map
|
package/dist/multisig.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multisig.d.ts","sourceRoot":"","sources":["../src/multisig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"multisig.d.ts","sourceRoot":"","sources":["../src/multisig.ts"],"names":[],"mappings":"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"}
|