@openzeppelin/miden-multisig-client 0.17.0-rc.2 → 0.17.0
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 +172 -47
- package/dist/account/builder.d.ts +2 -2
- package/dist/account/builder.d.ts.map +1 -1
- package/dist/account/builder.js +49 -24
- package/dist/account/builder.js.map +1 -1
- package/dist/connectivity.d.ts +2 -0
- package/dist/connectivity.d.ts.map +1 -1
- package/dist/connectivity.js +7 -4
- package/dist/connectivity.js.map +1 -1
- package/dist/index.d.ts +8 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/multisig/authArgErrors.d.ts +59 -0
- package/dist/multisig/authArgErrors.d.ts.map +1 -0
- package/dist/multisig/authArgErrors.js +115 -0
- package/dist/multisig/authArgErrors.js.map +1 -0
- package/dist/multisig/helpers.d.ts +5 -0
- package/dist/multisig/helpers.d.ts.map +1 -1
- package/dist/multisig/helpers.js +7 -2
- package/dist/multisig/helpers.js.map +1 -1
- package/dist/multisig.d.ts +140 -0
- package/dist/multisig.d.ts.map +1 -1
- package/dist/multisig.js +419 -12
- package/dist/multisig.js.map +1 -1
- package/dist/procedures.d.ts +1 -1
- package/dist/procedures.js +1 -1
- package/dist/recovery/proposalNoteImport.d.ts +173 -0
- package/dist/recovery/proposalNoteImport.d.ts.map +1 -0
- package/dist/recovery/proposalNoteImport.js +411 -0
- package/dist/recovery/proposalNoteImport.js.map +1 -0
- package/dist/recovery/publicNoteBackfill.d.ts +168 -0
- package/dist/recovery/publicNoteBackfill.d.ts.map +1 -0
- package/dist/recovery/publicNoteBackfill.js +368 -0
- package/dist/recovery/publicNoteBackfill.js.map +1 -0
- package/dist/recovery/recoverNotes.d.ts +147 -0
- package/dist/recovery/recoverNotes.d.ts.map +1 -0
- package/dist/recovery/recoverNotes.js +163 -0
- package/dist/recovery/recoverNotes.js.map +1 -0
- package/dist/recovery/transportDrain.d.ts +124 -0
- package/dist/recovery/transportDrain.d.ts.map +1 -0
- package/dist/recovery/transportDrain.js +262 -0
- package/dist/recovery/transportDrain.js.map +1 -0
- package/dist/transaction/consumeNotes.d.ts.map +1 -1
- package/dist/transaction/consumeNotes.js +4 -1
- package/dist/transaction/consumeNotes.js.map +1 -1
- package/dist/transaction/p2id.d.ts.map +1 -1
- package/dist/transaction/p2id.js +4 -1
- package/dist/transaction/p2id.js.map +1 -1
- package/dist/transaction/summary.d.ts +10 -4
- package/dist/transaction/summary.d.ts.map +1 -1
- package/dist/transaction/summary.js +13 -7
- package/dist/transaction/summary.js.map +1 -1
- package/dist/transaction/updateGuardian.js +4 -1
- package/dist/transaction/updateGuardian.js.map +1 -1
- package/dist/transaction/updateProcedureThreshold.js +4 -1
- package/dist/transaction/updateProcedureThreshold.js.map +1 -1
- package/dist/transaction/updateSigners.js +4 -1
- package/dist/transaction/updateSigners.js.map +1 -1
- package/dist/transaction.d.ts +1 -1
- package/dist/transaction.d.ts.map +1 -1
- package/dist/transaction.js +1 -1
- package/dist/transaction.js.map +1 -1
- package/package.json +14 -10
- package/src/account/builder.ts +87 -35
- package/src/connectivity.ts +9 -4
- package/src/index.ts +34 -1
- package/src/multisig/authArgErrors.ts +138 -0
- package/src/multisig/helpers.ts +7 -2
- package/src/multisig.ts +513 -20
- package/src/procedures.ts +1 -1
- package/src/recovery/proposalNoteImport.ts +548 -0
- package/src/recovery/publicNoteBackfill.ts +502 -0
- package/src/recovery/recoverNotes.ts +288 -0
- package/src/recovery/transportDrain.ts +330 -0
- package/src/transaction/consumeNotes.ts +4 -1
- package/src/transaction/p2id.ts +4 -1
- package/src/transaction/summary.ts +13 -7
- package/src/transaction/updateGuardian.ts +4 -1
- package/src/transaction/updateProcedureThreshold.ts +4 -1
- package/src/transaction/updateSigners.ts +4 -1
- package/src/transaction.ts +1 -1
- package/dist/account/builder.test.d.ts +0 -2
- package/dist/account/builder.test.d.ts.map +0 -1
- package/dist/account/builder.test.js +0 -166
- package/dist/account/builder.test.js.map +0 -1
- package/dist/account/masm/account-components/auth.d.ts +0 -2
- package/dist/account/masm/account-components/auth.d.ts.map +0 -1
- package/dist/account/masm/account-components/auth.js +0 -46
- package/dist/account/masm/account-components/auth.js.map +0 -1
- package/dist/account/masm/index.d.ts +0 -2
- package/dist/account/masm/index.d.ts.map +0 -1
- package/dist/account/masm/index.js +0 -4
- package/dist/account/masm/index.js.map +0 -1
- package/dist/account/masm.d.ts +0 -2
- package/dist/account/masm.d.ts.map +0 -1
- package/dist/account/masm.js +0 -4
- package/dist/account/masm.js.map +0 -1
- package/dist/account/storage.test.d.ts +0 -2
- package/dist/account/storage.test.d.ts.map +0 -1
- package/dist/account/storage.test.js +0 -73
- package/dist/account/storage.test.js.map +0 -1
- package/dist/client.test.d.ts +0 -2
- package/dist/client.test.d.ts.map +0 -1
- package/dist/client.test.js +0 -380
- package/dist/client.test.js.map +0 -1
- package/dist/connectivity.test.d.ts +0 -2
- package/dist/connectivity.test.d.ts.map +0 -1
- package/dist/connectivity.test.js +0 -61
- package/dist/connectivity.test.js.map +0 -1
- package/dist/inspector.test.d.ts +0 -2
- package/dist/inspector.test.d.ts.map +0 -1
- package/dist/inspector.test.js +0 -425
- package/dist/inspector.test.js.map +0 -1
- package/dist/lookupAuth.test.d.ts +0 -2
- package/dist/lookupAuth.test.d.ts.map +0 -1
- package/dist/lookupAuth.test.js +0 -138
- package/dist/lookupAuth.test.js.map +0 -1
- package/dist/multisig/consumeNotesErrors.test.d.ts +0 -2
- package/dist/multisig/consumeNotesErrors.test.d.ts.map +0 -1
- package/dist/multisig/consumeNotesErrors.test.js +0 -28
- package/dist/multisig/consumeNotesErrors.test.js.map +0 -1
- package/dist/multisig/helpers.test.d.ts +0 -2
- package/dist/multisig/helpers.test.d.ts.map +0 -1
- package/dist/multisig/helpers.test.js +0 -94
- package/dist/multisig/helpers.test.js.map +0 -1
- package/dist/multisig.test.d.ts +0 -2
- package/dist/multisig.test.d.ts.map +0 -1
- package/dist/multisig.test.js +0 -4112
- package/dist/multisig.test.js.map +0 -1
- package/dist/proposal/factory.test.d.ts +0 -2
- package/dist/proposal/factory.test.d.ts.map +0 -1
- package/dist/proposal/factory.test.js +0 -32
- package/dist/proposal/factory.test.js.map +0 -1
- package/dist/proposal/metadata.test.d.ts +0 -2
- package/dist/proposal/metadata.test.d.ts.map +0 -1
- package/dist/proposal/metadata.test.js +0 -193
- package/dist/proposal/metadata.test.js.map +0 -1
- package/dist/prover/config.test.d.ts +0 -2
- package/dist/prover/config.test.d.ts.map +0 -1
- package/dist/prover/config.test.js +0 -54
- package/dist/prover/config.test.js.map +0 -1
- package/dist/prover/errors.test.d.ts +0 -2
- package/dist/prover/errors.test.d.ts.map +0 -1
- package/dist/prover/errors.test.js +0 -29
- package/dist/prover/errors.test.js.map +0 -1
- package/dist/prover/retry.test.d.ts +0 -2
- package/dist/prover/retry.test.d.ts.map +0 -1
- package/dist/prover/retry.test.js +0 -20
- package/dist/prover/retry.test.js.map +0 -1
- package/dist/prover/workflow.test.d.ts +0 -2
- package/dist/prover/workflow.test.d.ts.map +0 -1
- package/dist/prover/workflow.test.js +0 -105
- package/dist/prover/workflow.test.js.map +0 -1
- package/dist/raw-client.test.d.ts +0 -2
- package/dist/raw-client.test.d.ts.map +0 -1
- package/dist/raw-client.test.js +0 -111
- package/dist/raw-client.test.js.map +0 -1
- package/dist/rpc/config.test.d.ts +0 -2
- package/dist/rpc/config.test.d.ts.map +0 -1
- package/dist/rpc/config.test.js +0 -24
- package/dist/rpc/config.test.js.map +0 -1
- package/dist/rpc/errors.test.d.ts +0 -2
- package/dist/rpc/errors.test.d.ts.map +0 -1
- package/dist/rpc/errors.test.js +0 -34
- package/dist/rpc/errors.test.js.map +0 -1
- package/dist/rpc/retry.test.d.ts +0 -2
- package/dist/rpc/retry.test.d.ts.map +0 -1
- package/dist/rpc/retry.test.js +0 -98
- package/dist/rpc/retry.test.js.map +0 -1
- package/dist/signers/ecdsa.test.d.ts +0 -2
- package/dist/signers/ecdsa.test.d.ts.map +0 -1
- package/dist/signers/ecdsa.test.js +0 -88
- package/dist/signers/ecdsa.test.js.map +0 -1
- package/dist/signers/falcon.test.d.ts +0 -2
- package/dist/signers/falcon.test.d.ts.map +0 -1
- package/dist/signers/falcon.test.js +0 -161
- package/dist/signers/falcon.test.js.map +0 -1
- package/dist/signers/miden-wallet.ecdsa-recovery.test.d.ts +0 -2
- package/dist/signers/miden-wallet.ecdsa-recovery.test.d.ts.map +0 -1
- package/dist/signers/miden-wallet.ecdsa-recovery.test.js +0 -148
- package/dist/signers/miden-wallet.ecdsa-recovery.test.js.map +0 -1
- package/dist/signers/miden-wallet.test.d.ts +0 -2
- package/dist/signers/miden-wallet.test.d.ts.map +0 -1
- package/dist/signers/miden-wallet.test.js +0 -164
- package/dist/signers/miden-wallet.test.js.map +0 -1
- package/dist/signers/para.test.d.ts +0 -2
- package/dist/signers/para.test.d.ts.map +0 -1
- package/dist/signers/para.test.js +0 -146
- package/dist/signers/para.test.js.map +0 -1
- package/dist/transaction/index.d.ts +0 -8
- package/dist/transaction/index.d.ts.map +0 -1
- package/dist/transaction/index.js +0 -7
- package/dist/transaction/index.js.map +0 -1
- package/dist/transaction/p2id.test.d.ts +0 -2
- package/dist/transaction/p2id.test.d.ts.map +0 -1
- package/dist/transaction/p2id.test.js +0 -246
- package/dist/transaction/p2id.test.js.map +0 -1
- package/dist/transaction/rpoRandomCoin.test.d.ts +0 -2
- package/dist/transaction/rpoRandomCoin.test.d.ts.map +0 -1
- package/dist/transaction/rpoRandomCoin.test.js +0 -52
- package/dist/transaction/rpoRandomCoin.test.js.map +0 -1
- package/dist/transaction/summary.test.d.ts +0 -2
- package/dist/transaction/summary.test.d.ts.map +0 -1
- package/dist/transaction/summary.test.js +0 -26
- package/dist/transaction/summary.test.js.map +0 -1
- package/dist/transaction.test.d.ts +0 -2
- package/dist/transaction.test.d.ts.map +0 -1
- package/dist/transaction.test.js +0 -122
- package/dist/transaction.test.js.map +0 -1
- package/dist/types/proposal.test.d.ts +0 -2
- package/dist/types/proposal.test.d.ts.map +0 -1
- package/dist/types/proposal.test.js +0 -56
- package/dist/types/proposal.test.js.map +0 -1
- package/dist/utils/digest.test.d.ts +0 -2
- package/dist/utils/digest.test.d.ts.map +0 -1
- package/dist/utils/digest.test.js +0 -48
- package/dist/utils/digest.test.js.map +0 -1
- package/dist/utils/ecdsa.test.d.ts +0 -2
- package/dist/utils/ecdsa.test.d.ts.map +0 -1
- package/dist/utils/ecdsa.test.js +0 -131
- package/dist/utils/ecdsa.test.js.map +0 -1
- package/dist/utils/encoding.test.d.ts +0 -2
- package/dist/utils/encoding.test.d.ts.map +0 -1
- package/dist/utils/encoding.test.js +0 -185
- package/dist/utils/encoding.test.js.map +0 -1
- package/dist/utils/key.test.d.ts +0 -2
- package/dist/utils/key.test.d.ts.map +0 -1
- package/dist/utils/key.test.js +0 -82
- package/dist/utils/key.test.js.map +0 -1
- package/dist/utils/signature.test.d.ts +0 -2
- package/dist/utils/signature.test.d.ts.map +0 -1
- package/dist/utils/signature.test.js +0 -164
- package/dist/utils/signature.test.js.map +0 -1
- package/dist/utils/word.test.d.ts +0 -2
- package/dist/utils/word.test.d.ts.map +0 -1
- package/dist/utils/word.test.js +0 -54
- package/dist/utils/word.test.js.map +0 -1
- package/masm/account_components/auth/guarded_multisig.masm +0 -42
- package/src/account/builder.test.ts +0 -238
- package/src/account/masm/account-components/auth.ts +0 -46
- package/src/account/masm/index.ts +0 -4
- package/src/account/masm.ts +0 -4
- package/src/account/storage.test.ts +0 -90
- package/src/client.test.ts +0 -473
- package/src/connectivity.test.ts +0 -67
- package/src/inspector.test.ts +0 -542
- package/src/lookupAuth.test.ts +0 -185
- package/src/multisig/consumeNotesErrors.test.ts +0 -43
- package/src/multisig/helpers.test.ts +0 -114
- package/src/multisig.test.ts +0 -5008
- package/src/proposal/factory.test.ts +0 -40
- package/src/proposal/metadata.test.ts +0 -235
- package/src/prover/config.test.ts +0 -90
- package/src/prover/errors.test.ts +0 -61
- package/src/prover/retry.test.ts +0 -38
- package/src/prover/workflow.test.ts +0 -145
- package/src/raw-client.test.ts +0 -171
- package/src/rpc/config.test.ts +0 -45
- package/src/rpc/errors.test.ts +0 -69
- package/src/rpc/retry.test.ts +0 -144
- package/src/signers/ecdsa.test.ts +0 -111
- package/src/signers/falcon.test.ts +0 -197
- package/src/signers/miden-wallet.ecdsa-recovery.test.ts +0 -201
- package/src/signers/miden-wallet.test.ts +0 -206
- package/src/signers/para.test.ts +0 -186
- package/src/transaction/index.ts +0 -13
- package/src/transaction/p2id.test.ts +0 -371
- package/src/transaction/rpoRandomCoin.test.ts +0 -64
- package/src/transaction/summary.test.ts +0 -32
- package/src/transaction.test.ts +0 -142
- package/src/types/proposal.test.ts +0 -68
- package/src/utils/digest.test.ts +0 -55
- package/src/utils/ecdsa.test.ts +0 -164
- package/src/utils/encoding.test.ts +0 -233
- package/src/utils/key.test.ts +0 -91
- package/src/utils/signature.test.ts +0 -210
- package/src/utils/word.test.ts +0 -64
package/dist/client.test.js
DELETED
|
@@ -1,380 +0,0 @@
|
|
|
1
|
-
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
-
import { MultisigClient } from './client.js';
|
|
3
|
-
// Mock the Miden SDK
|
|
4
|
-
vi.mock('@miden-sdk/miden-sdk', () => ({
|
|
5
|
-
AccountId: {
|
|
6
|
-
fromHex: vi.fn((hex) => ({ toString: () => hex })),
|
|
7
|
-
},
|
|
8
|
-
Account: {
|
|
9
|
-
deserialize: vi.fn(() => ({
|
|
10
|
-
id: () => ({
|
|
11
|
-
toString: () => '0x' + 'd'.repeat(30),
|
|
12
|
-
prefix: () => ({ asInt: () => BigInt(1) }),
|
|
13
|
-
suffix: () => ({ asInt: () => BigInt(2) }),
|
|
14
|
-
}),
|
|
15
|
-
serialize: () => new Uint8Array([1, 2, 3]),
|
|
16
|
-
storage: vi.fn(),
|
|
17
|
-
vault: vi.fn(),
|
|
18
|
-
})),
|
|
19
|
-
},
|
|
20
|
-
Word: vi.fn(),
|
|
21
|
-
}));
|
|
22
|
-
// Mock the AccountInspector, keeping the real assertCompleteDetectedConfig
|
|
23
|
-
// so load()'s fail-closed validation is exercised.
|
|
24
|
-
vi.mock('./inspector.js', async (importOriginal) => {
|
|
25
|
-
const actual = await importOriginal();
|
|
26
|
-
return {
|
|
27
|
-
...actual,
|
|
28
|
-
AccountInspector: {
|
|
29
|
-
fromAccount: vi.fn(() => ({
|
|
30
|
-
threshold: 2,
|
|
31
|
-
numSigners: 2,
|
|
32
|
-
signerCommitments: ['0x' + 'a'.repeat(64), '0x' + 'b'.repeat(64)],
|
|
33
|
-
guardianCommitment: '0x' + 'c'.repeat(64),
|
|
34
|
-
vaultBalances: [],
|
|
35
|
-
procedureThresholds: new Map(),
|
|
36
|
-
})),
|
|
37
|
-
},
|
|
38
|
-
};
|
|
39
|
-
});
|
|
40
|
-
// Mock the account creation module
|
|
41
|
-
vi.mock('./account/index.js', () => ({
|
|
42
|
-
createMultisigAccount: vi.fn().mockResolvedValue({
|
|
43
|
-
account: {
|
|
44
|
-
id: () => ({
|
|
45
|
-
toString: () => '0x' + 'a'.repeat(30),
|
|
46
|
-
prefix: () => ({ asInt: () => BigInt(1) }),
|
|
47
|
-
suffix: () => ({ asInt: () => BigInt(2) }),
|
|
48
|
-
}),
|
|
49
|
-
serialize: () => new Uint8Array([1, 2, 3]),
|
|
50
|
-
},
|
|
51
|
-
seed: new Uint8Array([4, 5, 6]),
|
|
52
|
-
}),
|
|
53
|
-
}));
|
|
54
|
-
// Mock fetch for GUARDIAN client
|
|
55
|
-
const mockFetch = vi.fn();
|
|
56
|
-
vi.stubGlobal('fetch', mockFetch);
|
|
57
|
-
const GUARDIAN_URL = 'http://localhost:3000';
|
|
58
|
-
const MIDEN_RPC = 'http://localhost:57291';
|
|
59
|
-
const CLIENT_CONFIG = { guardianEndpoint: GUARDIAN_URL, midenRpcEndpoint: MIDEN_RPC };
|
|
60
|
-
describe('MultisigClient', () => {
|
|
61
|
-
let webClient;
|
|
62
|
-
let mockSigner;
|
|
63
|
-
beforeEach(() => {
|
|
64
|
-
mockFetch.mockReset();
|
|
65
|
-
webClient = {
|
|
66
|
-
accounts: {
|
|
67
|
-
get: vi.fn().mockResolvedValue(null),
|
|
68
|
-
insert: vi.fn().mockResolvedValue(undefined),
|
|
69
|
-
},
|
|
70
|
-
keystore: {
|
|
71
|
-
insert: vi.fn().mockResolvedValue(undefined),
|
|
72
|
-
},
|
|
73
|
-
};
|
|
74
|
-
mockSigner = {
|
|
75
|
-
commitment: '0x' + '1'.repeat(64),
|
|
76
|
-
publicKey: '0x' + '2'.repeat(64),
|
|
77
|
-
scheme: 'falcon',
|
|
78
|
-
signAccountIdWithTimestamp: vi.fn().mockResolvedValue('0x' + 'a'.repeat(128)),
|
|
79
|
-
signRequest: vi.fn().mockReturnValue('0x' + 'a'.repeat(128)),
|
|
80
|
-
signCommitment: vi.fn().mockReturnValue('0x' + 'b'.repeat(128)),
|
|
81
|
-
};
|
|
82
|
-
});
|
|
83
|
-
describe('constructor', () => {
|
|
84
|
-
it('should create client when both endpoints are supplied', () => {
|
|
85
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
86
|
-
expect(client).toBeInstanceOf(MultisigClient);
|
|
87
|
-
});
|
|
88
|
-
it('should create client with custom GUARDIAN endpoint', () => {
|
|
89
|
-
const client = new MultisigClient(webClient, {
|
|
90
|
-
guardianEndpoint: 'http://custom:8080',
|
|
91
|
-
midenRpcEndpoint: MIDEN_RPC,
|
|
92
|
-
});
|
|
93
|
-
expect(client).toBeInstanceOf(MultisigClient);
|
|
94
|
-
});
|
|
95
|
-
it('throws when the config object is omitted', () => {
|
|
96
|
-
expect(() => new MultisigClient(webClient)).toThrow('missing required configuration: midenRpcEndpoint');
|
|
97
|
-
});
|
|
98
|
-
it.each([undefined, null, 42, '', ' '])('throws before any network or store access when midenRpcEndpoint is %j', (endpoint) => {
|
|
99
|
-
expect(() => new MultisigClient(webClient, {
|
|
100
|
-
guardianEndpoint: GUARDIAN_URL,
|
|
101
|
-
midenRpcEndpoint: endpoint,
|
|
102
|
-
})).toThrow('missing required configuration: midenRpcEndpoint');
|
|
103
|
-
expect(mockFetch).not.toHaveBeenCalled();
|
|
104
|
-
expect(webClient.accounts.get).not.toHaveBeenCalled();
|
|
105
|
-
expect(webClient.accounts.insert).not.toHaveBeenCalled();
|
|
106
|
-
});
|
|
107
|
-
it.each([undefined, null, 42, '', ' '])('throws before any network or store access when guardianEndpoint is %j', (endpoint) => {
|
|
108
|
-
expect(() => new MultisigClient(webClient, {
|
|
109
|
-
guardianEndpoint: endpoint,
|
|
110
|
-
midenRpcEndpoint: MIDEN_RPC,
|
|
111
|
-
})).toThrow('missing required configuration: guardianEndpoint');
|
|
112
|
-
expect(mockFetch).not.toHaveBeenCalled();
|
|
113
|
-
expect(webClient.accounts.get).not.toHaveBeenCalled();
|
|
114
|
-
expect(webClient.accounts.insert).not.toHaveBeenCalled();
|
|
115
|
-
});
|
|
116
|
-
it('rejects a blank endpoint passed to setGuardianEndpoint', () => {
|
|
117
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
118
|
-
expect(() => client.setGuardianEndpoint(' ')).toThrow('missing required configuration: guardianEndpoint');
|
|
119
|
-
});
|
|
120
|
-
});
|
|
121
|
-
describe('guardianClient getter', () => {
|
|
122
|
-
it('should expose GUARDIAN client for getting pubkey', () => {
|
|
123
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
124
|
-
expect(client.guardianClient).toBeDefined();
|
|
125
|
-
});
|
|
126
|
-
});
|
|
127
|
-
describe('create', () => {
|
|
128
|
-
it('should create multisig and return Multisig instance', async () => {
|
|
129
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
130
|
-
const config = {
|
|
131
|
-
threshold: 2,
|
|
132
|
-
signerCommitments: ['0x' + 'a'.repeat(64), '0x' + 'b'.repeat(64)],
|
|
133
|
-
guardianCommitment: '0x' + 'c'.repeat(64),
|
|
134
|
-
};
|
|
135
|
-
const multisig = await client.create(config, mockSigner);
|
|
136
|
-
expect(multisig).toBeDefined();
|
|
137
|
-
expect(multisig.threshold).toBe(2);
|
|
138
|
-
expect(multisig.signerCommitments).toEqual(config.signerCommitments);
|
|
139
|
-
expect(multisig.guardianCommitment).toBe(config.guardianCommitment);
|
|
140
|
-
});
|
|
141
|
-
it('should set signer on GUARDIAN client', async () => {
|
|
142
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
143
|
-
const config = {
|
|
144
|
-
threshold: 1,
|
|
145
|
-
signerCommitments: ['0x' + 'a'.repeat(64)],
|
|
146
|
-
guardianCommitment: '0x' + 'c'.repeat(64),
|
|
147
|
-
};
|
|
148
|
-
const multisig = await client.create(config, mockSigner);
|
|
149
|
-
expect(multisig.signerCommitment).toBe(mockSigner.commitment);
|
|
150
|
-
});
|
|
151
|
-
it('binds the signer auth key to the created account when supported', async () => {
|
|
152
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
153
|
-
const bindAccountKey = vi.fn().mockResolvedValue(undefined);
|
|
154
|
-
const bindingSigner = {
|
|
155
|
-
...mockSigner,
|
|
156
|
-
bindAccountKey,
|
|
157
|
-
};
|
|
158
|
-
await client.create({
|
|
159
|
-
threshold: 1,
|
|
160
|
-
signerCommitments: ['0x' + 'a'.repeat(64)],
|
|
161
|
-
guardianCommitment: '0x' + 'c'.repeat(64),
|
|
162
|
-
}, bindingSigner);
|
|
163
|
-
expect(bindAccountKey).toHaveBeenCalledWith(webClient, '0x' + 'a'.repeat(30));
|
|
164
|
-
});
|
|
165
|
-
});
|
|
166
|
-
describe('load', () => {
|
|
167
|
-
it('should load existing multisig account and detect config', async () => {
|
|
168
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
169
|
-
// Mock getState response
|
|
170
|
-
mockFetch.mockResolvedValueOnce({
|
|
171
|
-
ok: true,
|
|
172
|
-
json: async () => ({
|
|
173
|
-
account_id: '0x' + 'd'.repeat(30),
|
|
174
|
-
commitment: '0x' + 'e'.repeat(64),
|
|
175
|
-
state_json: { data: 'base64state' },
|
|
176
|
-
created_at: '2024-01-01T00:00:00Z',
|
|
177
|
-
updated_at: '2024-01-02T00:00:00Z',
|
|
178
|
-
}),
|
|
179
|
-
});
|
|
180
|
-
const accountId = '0x' + 'd'.repeat(30);
|
|
181
|
-
const multisig = await client.load(accountId, mockSigner);
|
|
182
|
-
expect(multisig).toBeDefined();
|
|
183
|
-
expect(multisig.accountId).toBe(accountId);
|
|
184
|
-
// Config is detected from account storage via AccountInspector
|
|
185
|
-
expect(multisig.threshold).toBe(2);
|
|
186
|
-
expect(multisig.signerCommitments).toEqual(['0x' + 'a'.repeat(64), '0x' + 'b'.repeat(64)]);
|
|
187
|
-
expect(multisig.guardianCommitment).toBe('0x' + 'c'.repeat(64));
|
|
188
|
-
expect(multisig.account).not.toBeNull();
|
|
189
|
-
expect(webClient.accounts.get).toHaveBeenCalledTimes(1);
|
|
190
|
-
expect(webClient.accounts.insert).toHaveBeenCalledTimes(1);
|
|
191
|
-
});
|
|
192
|
-
it('fails closed when the detected signer set is incomplete (issue #306 review)', async () => {
|
|
193
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
194
|
-
const { AccountInspector } = await import('./inspector.js');
|
|
195
|
-
// Storage reports 3 signers but only 2 entries were readable — adopting
|
|
196
|
-
// this config would let membership proposals drop the missing key.
|
|
197
|
-
vi.mocked(AccountInspector.fromAccount).mockReturnValueOnce({
|
|
198
|
-
threshold: 2,
|
|
199
|
-
numSigners: 3,
|
|
200
|
-
signerCommitments: ['0x' + 'a'.repeat(64), '0x' + 'b'.repeat(64)],
|
|
201
|
-
guardianCommitment: '0x' + 'c'.repeat(64),
|
|
202
|
-
vaultBalances: [],
|
|
203
|
-
procedureThresholds: new Map(),
|
|
204
|
-
});
|
|
205
|
-
mockFetch.mockResolvedValueOnce({
|
|
206
|
-
ok: true,
|
|
207
|
-
json: async () => ({
|
|
208
|
-
account_id: '0x' + 'd'.repeat(30),
|
|
209
|
-
commitment: '0x' + 'e'.repeat(64),
|
|
210
|
-
state_json: { data: 'base64state' },
|
|
211
|
-
created_at: '2024-01-01T00:00:00Z',
|
|
212
|
-
updated_at: '2024-01-02T00:00:00Z',
|
|
213
|
-
}),
|
|
214
|
-
});
|
|
215
|
-
await expect(client.load('0x' + 'd'.repeat(30), mockSigner)).rejects.toThrow(/incomplete signer set: storage reports 3 signers, read 2/);
|
|
216
|
-
});
|
|
217
|
-
it('fails closed when the guardian commitment is missing', async () => {
|
|
218
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
219
|
-
const { AccountInspector } = await import('./inspector.js');
|
|
220
|
-
vi.mocked(AccountInspector.fromAccount).mockReturnValueOnce({
|
|
221
|
-
threshold: 1,
|
|
222
|
-
numSigners: 1,
|
|
223
|
-
signerCommitments: ['0x' + 'a'.repeat(64)],
|
|
224
|
-
guardianCommitment: null,
|
|
225
|
-
vaultBalances: [],
|
|
226
|
-
procedureThresholds: new Map(),
|
|
227
|
-
});
|
|
228
|
-
mockFetch.mockResolvedValueOnce({
|
|
229
|
-
ok: true,
|
|
230
|
-
json: async () => ({
|
|
231
|
-
account_id: '0x' + 'd'.repeat(30),
|
|
232
|
-
commitment: '0x' + 'e'.repeat(64),
|
|
233
|
-
state_json: { data: 'base64state' },
|
|
234
|
-
created_at: '2024-01-01T00:00:00Z',
|
|
235
|
-
updated_at: '2024-01-02T00:00:00Z',
|
|
236
|
-
}),
|
|
237
|
-
});
|
|
238
|
-
await expect(client.load('0x' + 'd'.repeat(30), mockSigner)).rejects.toThrow(/missing guardian commitment/);
|
|
239
|
-
});
|
|
240
|
-
it('should throw if account not found on GUARDIAN', async () => {
|
|
241
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
242
|
-
mockFetch.mockResolvedValueOnce({
|
|
243
|
-
ok: false,
|
|
244
|
-
status: 404,
|
|
245
|
-
statusText: 'Not Found',
|
|
246
|
-
headers: new Headers(),
|
|
247
|
-
text: async () => JSON.stringify({
|
|
248
|
-
code: 'account_not_found',
|
|
249
|
-
message: 'Account not found',
|
|
250
|
-
meta: { retryable: false },
|
|
251
|
-
}),
|
|
252
|
-
});
|
|
253
|
-
await expect(client.load('0xnonexistent', mockSigner)).rejects.toThrow('Account not found');
|
|
254
|
-
});
|
|
255
|
-
it('should allow registerOnGuardian after load without explicit initial state', async () => {
|
|
256
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
257
|
-
mockFetch.mockResolvedValueOnce({
|
|
258
|
-
ok: true,
|
|
259
|
-
json: async () => ({
|
|
260
|
-
account_id: '0x' + 'd'.repeat(30),
|
|
261
|
-
commitment: '0x' + 'e'.repeat(64),
|
|
262
|
-
state_json: { data: 'base64state' },
|
|
263
|
-
created_at: '2024-01-01T00:00:00Z',
|
|
264
|
-
updated_at: '2024-01-02T00:00:00Z',
|
|
265
|
-
}),
|
|
266
|
-
});
|
|
267
|
-
mockFetch.mockResolvedValueOnce({
|
|
268
|
-
ok: true,
|
|
269
|
-
json: async () => ({
|
|
270
|
-
success: true,
|
|
271
|
-
message: 'Account configured',
|
|
272
|
-
ack_pubkey: '0x' + 'f'.repeat(64),
|
|
273
|
-
}),
|
|
274
|
-
});
|
|
275
|
-
const accountId = '0x' + 'd'.repeat(30);
|
|
276
|
-
const multisig = await client.load(accountId, mockSigner);
|
|
277
|
-
await expect(multisig.registerOnGuardian()).resolves.toBeUndefined();
|
|
278
|
-
expect(webClient.accounts.get).toHaveBeenCalledTimes(1);
|
|
279
|
-
expect(webClient.accounts.insert).toHaveBeenCalledTimes(1);
|
|
280
|
-
});
|
|
281
|
-
it('binds the signer auth key after loading an account when supported', async () => {
|
|
282
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
283
|
-
const bindAccountKey = vi.fn().mockResolvedValue(undefined);
|
|
284
|
-
const bindingSigner = {
|
|
285
|
-
...mockSigner,
|
|
286
|
-
bindAccountKey,
|
|
287
|
-
};
|
|
288
|
-
mockFetch.mockResolvedValueOnce({
|
|
289
|
-
ok: true,
|
|
290
|
-
json: async () => ({
|
|
291
|
-
account_id: '0x' + 'd'.repeat(30),
|
|
292
|
-
commitment: '0x' + 'e'.repeat(64),
|
|
293
|
-
state_json: { data: 'base64state' },
|
|
294
|
-
created_at: '2024-01-01T00:00:00Z',
|
|
295
|
-
updated_at: '2024-01-02T00:00:00Z',
|
|
296
|
-
}),
|
|
297
|
-
});
|
|
298
|
-
await client.load('0x' + 'd'.repeat(30), bindingSigner);
|
|
299
|
-
expect(bindAccountKey).toHaveBeenCalledWith(webClient, '0x' + 'd'.repeat(30));
|
|
300
|
-
});
|
|
301
|
-
});
|
|
302
|
-
// --- recoverByKey -------------------
|
|
303
|
-
describe('recoverByKey', () => {
|
|
304
|
-
function makeLookupCapableSigner() {
|
|
305
|
-
return {
|
|
306
|
-
commitment: '0x' + 'a'.repeat(64),
|
|
307
|
-
publicKey: '0x' + 'p'.repeat(897),
|
|
308
|
-
scheme: 'falcon',
|
|
309
|
-
signAccountIdWithTimestamp: vi.fn().mockResolvedValue('0x' + 'a'.repeat(128)),
|
|
310
|
-
signRequest: vi.fn().mockReturnValue('0x' + 'a'.repeat(128)),
|
|
311
|
-
signCommitment: vi.fn().mockReturnValue('0x' + 'b'.repeat(128)),
|
|
312
|
-
signLookupMessage: vi.fn().mockResolvedValue('0x' + 'c'.repeat(762)),
|
|
313
|
-
};
|
|
314
|
-
}
|
|
315
|
-
function mockServerLookupResponse(accountIds) {
|
|
316
|
-
mockFetch.mockResolvedValueOnce({
|
|
317
|
-
ok: true,
|
|
318
|
-
json: async () => ({
|
|
319
|
-
accounts: accountIds.map((id) => ({ account_id: id })),
|
|
320
|
-
}),
|
|
321
|
-
});
|
|
322
|
-
}
|
|
323
|
-
function mockServerStateResponse(accountId) {
|
|
324
|
-
mockFetch.mockResolvedValueOnce({
|
|
325
|
-
ok: true,
|
|
326
|
-
json: async () => ({
|
|
327
|
-
account_id: accountId,
|
|
328
|
-
commitment: '0x' + 'f'.repeat(64),
|
|
329
|
-
state_json: { data: 'base64data' },
|
|
330
|
-
created_at: '2024-01-01T00:00:00Z',
|
|
331
|
-
updated_at: '2024-01-01T00:00:00Z',
|
|
332
|
-
}),
|
|
333
|
-
});
|
|
334
|
-
}
|
|
335
|
-
it('returns one (accountId, state) pair when lookup matches a single account', async () => {
|
|
336
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
337
|
-
const signer = makeLookupCapableSigner();
|
|
338
|
-
const accountId = '0x7bfb0f38b0fafa103f86a805594170';
|
|
339
|
-
mockServerLookupResponse([accountId]);
|
|
340
|
-
mockServerStateResponse(accountId);
|
|
341
|
-
const recovered = await client.recoverByKey(signer);
|
|
342
|
-
expect(recovered).toHaveLength(1);
|
|
343
|
-
expect(recovered[0].accountId).toBe(accountId);
|
|
344
|
-
expect(recovered[0].state.commitment).toBe('0x' + 'f'.repeat(64));
|
|
345
|
-
expect(signer.signLookupMessage).toHaveBeenCalledTimes(1);
|
|
346
|
-
expect(signer.signLookupMessage).toHaveBeenCalledWith(signer.commitment, expect.any(Number));
|
|
347
|
-
// Lookup + getState = exactly two HTTP requests.
|
|
348
|
-
expect(mockFetch).toHaveBeenCalledTimes(2);
|
|
349
|
-
});
|
|
350
|
-
it('returns multiple (accountId, state) pairs when one commitment authorizes several accounts', async () => {
|
|
351
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
352
|
-
const signer = makeLookupCapableSigner();
|
|
353
|
-
const accountA = '0xaaa1';
|
|
354
|
-
const accountB = '0xbbb2';
|
|
355
|
-
mockServerLookupResponse([accountA, accountB]);
|
|
356
|
-
mockServerStateResponse(accountA);
|
|
357
|
-
mockServerStateResponse(accountB);
|
|
358
|
-
const recovered = await client.recoverByKey(signer);
|
|
359
|
-
expect(recovered.map((r) => r.accountId)).toEqual([accountA, accountB]);
|
|
360
|
-
// 1 lookup + 2 state fetches.
|
|
361
|
-
expect(mockFetch).toHaveBeenCalledTimes(3);
|
|
362
|
-
});
|
|
363
|
-
it('returns empty array when no account authorizes the commitment', async () => {
|
|
364
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
365
|
-
const signer = makeLookupCapableSigner();
|
|
366
|
-
mockServerLookupResponse([]);
|
|
367
|
-
const recovered = await client.recoverByKey(signer);
|
|
368
|
-
expect(recovered).toEqual([]);
|
|
369
|
-
// Only the lookup HTTP call — no per-account state fetches.
|
|
370
|
-
expect(mockFetch).toHaveBeenCalledTimes(1);
|
|
371
|
-
});
|
|
372
|
-
it('throws a clear error when the signer does not implement signLookupMessage', async () => {
|
|
373
|
-
const client = new MultisigClient(webClient, CLIENT_CONFIG);
|
|
374
|
-
// mockSigner from the outer beforeEach lacks signLookupMessage.
|
|
375
|
-
await expect(client.recoverByKey(mockSigner)).rejects.toThrow(/signLookupMessage/);
|
|
376
|
-
expect(mockFetch).not.toHaveBeenCalled();
|
|
377
|
-
});
|
|
378
|
-
});
|
|
379
|
-
});
|
|
380
|
-
//# sourceMappingURL=client.test.js.map
|
package/dist/client.test.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"client.test.js","sourceRoot":"","sources":["../src/client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"connectivity.test.d.ts","sourceRoot":"","sources":["../src/connectivity.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
import { describe, it, expect } from 'vitest';
|
|
2
|
-
import { GuardianHttpError } from '@openzeppelin/guardian-client';
|
|
3
|
-
import { isLikelyNetworkError, toUserFacingError } from './connectivity.js';
|
|
4
|
-
describe('isLikelyNetworkError', () => {
|
|
5
|
-
it('flags codeless transport failures', () => {
|
|
6
|
-
for (const m of [
|
|
7
|
-
'Failed to fetch',
|
|
8
|
-
'NetworkError when attempting to fetch resource',
|
|
9
|
-
'Load failed',
|
|
10
|
-
'The operation was aborted',
|
|
11
|
-
'request timed out',
|
|
12
|
-
'connection refused',
|
|
13
|
-
'getaddrinfo ENOTFOUND guardian.example',
|
|
14
|
-
]) {
|
|
15
|
-
expect(isLikelyNetworkError(new TypeError(m))).toBe(true);
|
|
16
|
-
}
|
|
17
|
-
});
|
|
18
|
-
it('does not flag semantic errors', () => {
|
|
19
|
-
expect(isLikelyNetworkError(new Error('account is paused'))).toBe(false);
|
|
20
|
-
expect(isLikelyNetworkError(new Error('insufficient signatures'))).toBe(false);
|
|
21
|
-
});
|
|
22
|
-
});
|
|
23
|
-
describe('toUserFacingError', () => {
|
|
24
|
-
it('uses the server code + user-safe message when Guardian was reached', () => {
|
|
25
|
-
const body = JSON.stringify({
|
|
26
|
-
code: 'account_paused',
|
|
27
|
-
message: "This account is paused and can't approve transactions right now.",
|
|
28
|
-
meta: { retryable: false },
|
|
29
|
-
});
|
|
30
|
-
const result = toUserFacingError(new GuardianHttpError(409, 'Conflict', body));
|
|
31
|
-
expect(result.code).toBe('account_paused');
|
|
32
|
-
expect(result.userMessage).toContain('paused');
|
|
33
|
-
expect(result.category).toBeUndefined();
|
|
34
|
-
});
|
|
35
|
-
it('classifies a codeless transport failure as connectivity', () => {
|
|
36
|
-
const result = toUserFacingError(new TypeError('Failed to fetch'));
|
|
37
|
-
expect(result.code).toBeUndefined();
|
|
38
|
-
expect(result.category).toBe('unreachable');
|
|
39
|
-
expect(result.userMessage).toContain("Can't reach Guardian");
|
|
40
|
-
// The raw transport text is never the primary message.
|
|
41
|
-
expect(result.userMessage).not.toContain('Failed to fetch');
|
|
42
|
-
});
|
|
43
|
-
it('classifies timeouts and aborts as the timeout category', () => {
|
|
44
|
-
for (const m of ['request timed out', 'The operation was aborted']) {
|
|
45
|
-
const result = toUserFacingError(new Error(m));
|
|
46
|
-
expect(result.category).toBe('timeout');
|
|
47
|
-
expect(result.userMessage).toContain("Can't reach Guardian");
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
it('treats a reachable proxy 5xx with no Guardian body as connectivity', () => {
|
|
51
|
-
const result = toUserFacingError(new GuardianHttpError(502, 'Bad Gateway', '<html>nope</html>'));
|
|
52
|
-
expect(result.category).toBe('unreachable');
|
|
53
|
-
expect(result.userMessage).toContain("Can't reach Guardian");
|
|
54
|
-
});
|
|
55
|
-
it('falls back to a generic message for unknown non-Guardian errors', () => {
|
|
56
|
-
const result = toUserFacingError(new Error('totally unexpected'));
|
|
57
|
-
expect(result.userMessage).toBe('Something went wrong. Please try again.');
|
|
58
|
-
expect(result.userMessage).not.toContain('totally unexpected');
|
|
59
|
-
});
|
|
60
|
-
});
|
|
61
|
-
//# sourceMappingURL=connectivity.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"connectivity.test.js","sourceRoot":"","sources":["../src/connectivity.test.ts"],"names":[],"mappings":"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"}
|
package/dist/inspector.test.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"inspector.test.d.ts","sourceRoot":"","sources":["../src/inspector.test.ts"],"names":[],"mappings":""}
|