@aztec/p2p 0.0.1-commit.358457c → 0.0.1-commit.3895657bc
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/dest/client/factory.d.ts +5 -6
- package/dest/client/factory.d.ts.map +1 -1
- package/dest/client/factory.js +7 -6
- package/dest/client/interface.d.ts +4 -4
- package/dest/client/interface.d.ts.map +1 -1
- package/dest/client/p2p_client.d.ts +4 -4
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +1 -25
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +1 -2
- package/dest/config.d.ts +20 -11
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +66 -32
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.js +5 -1
- package/dest/mem_pools/instrumentation.d.ts +4 -2
- package/dest/mem_pools/instrumentation.d.ts.map +1 -1
- package/dest/mem_pools/instrumentation.js +16 -14
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +2 -0
- package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts +7 -1
- package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.js +8 -6
- package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts +2 -2
- package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.js +2 -2
- package/dest/mem_pools/tx_pool_v2/index.d.ts +2 -2
- package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/index.js +1 -1
- package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +3 -1
- package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/interfaces.js +2 -1
- package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +32 -10
- package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_metadata.js +62 -16
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +26 -44
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +3 -0
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +2 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +41 -23
- package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +6 -4
- package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
- package/dest/msg_validators/proposal_validator/block_proposal_validator.js +10 -2
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +6 -4
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +16 -2
- package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +13 -8
- package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
- package/dest/msg_validators/proposal_validator/proposal_validator.js +48 -36
- package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts +2 -1
- package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/allowed_public_setup.js +24 -20
- package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts +17 -0
- package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts.map +1 -0
- package/dest/msg_validators/tx_validator/allowed_setup_helpers.js +24 -0
- package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +1 -1
- package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/fee_payer_balance.js +6 -2
- package/dest/msg_validators/tx_validator/index.d.ts +2 -1
- package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/index.js +1 -0
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/metadata_validator.js +4 -4
- package/dest/msg_validators/tx_validator/phases_validator.d.ts +2 -2
- package/dest/msg_validators/tx_validator/phases_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/phases_validator.js +44 -23
- package/dest/services/encoding.d.ts +2 -2
- package/dest/services/encoding.d.ts.map +1 -1
- package/dest/services/encoding.js +7 -7
- package/dest/services/libp2p/libp2p_service.d.ts +6 -7
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +22 -19
- package/dest/services/peer-manager/metrics.d.ts +3 -1
- package/dest/services/peer-manager/metrics.d.ts.map +1 -1
- package/dest/services/peer-manager/metrics.js +6 -0
- package/dest/services/peer-manager/peer_manager.d.ts +1 -1
- package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_manager.js +2 -1
- package/dest/services/reqresp/reqresp.d.ts +1 -1
- package/dest/services/reqresp/reqresp.d.ts.map +1 -1
- package/dest/services/reqresp/reqresp.js +2 -1
- package/dest/test-helpers/make-test-p2p-clients.d.ts +5 -6
- package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
- package/dest/test-helpers/make-test-p2p-clients.js +1 -2
- package/dest/test-helpers/mock-pubsub.d.ts +2 -3
- package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
- package/dest/test-helpers/mock-pubsub.js +2 -2
- package/dest/test-helpers/reqresp-nodes.d.ts +2 -3
- package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
- package/dest/test-helpers/reqresp-nodes.js +2 -2
- package/dest/testbench/p2p_client_testbench_worker.js +7 -6
- package/dest/testbench/worker_client_manager.d.ts +3 -1
- package/dest/testbench/worker_client_manager.d.ts.map +1 -1
- package/dest/testbench/worker_client_manager.js +6 -2
- package/dest/util.d.ts +1 -1
- package/package.json +14 -14
- package/src/client/factory.ts +10 -14
- package/src/client/interface.ts +3 -9
- package/src/client/p2p_client.ts +2 -34
- package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +2 -3
- package/src/config.ts +91 -34
- package/src/mem_pools/attestation_pool/attestation_pool.ts +5 -4
- package/src/mem_pools/instrumentation.ts +17 -13
- package/src/mem_pools/tx_pool_v2/README.md +9 -1
- package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +3 -0
- package/src/mem_pools/tx_pool_v2/eviction/interfaces.ts +11 -1
- package/src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts +15 -6
- package/src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts +2 -1
- package/src/mem_pools/tx_pool_v2/index.ts +1 -1
- package/src/mem_pools/tx_pool_v2/interfaces.ts +3 -0
- package/src/mem_pools/tx_pool_v2/tx_metadata.ts +91 -19
- package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +29 -43
- package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +3 -0
- package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +48 -21
- package/src/msg_validators/proposal_validator/block_proposal_validator.ts +14 -4
- package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +20 -7
- package/src/msg_validators/proposal_validator/proposal_validator.ts +63 -40
- package/src/msg_validators/tx_validator/allowed_public_setup.ts +22 -27
- package/src/msg_validators/tx_validator/allowed_setup_helpers.ts +31 -0
- package/src/msg_validators/tx_validator/fee_payer_balance.ts +6 -2
- package/src/msg_validators/tx_validator/index.ts +1 -0
- package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
- package/src/msg_validators/tx_validator/phases_validator.ts +51 -26
- package/src/services/encoding.ts +5 -6
- package/src/services/libp2p/libp2p_service.ts +20 -17
- package/src/services/peer-manager/metrics.ts +7 -0
- package/src/services/peer-manager/peer_manager.ts +2 -1
- package/src/services/reqresp/reqresp.ts +3 -1
- package/src/test-helpers/make-test-p2p-clients.ts +1 -3
- package/src/test-helpers/mock-pubsub.ts +3 -6
- package/src/test-helpers/reqresp-nodes.ts +3 -6
- package/src/testbench/p2p_client_testbench_worker.ts +4 -7
- package/src/testbench/worker_client_manager.ts +13 -5
- package/src/util.ts +1 -1
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +0 -23
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +0 -1
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +0 -212
- package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +0 -230
|
@@ -1,212 +0,0 @@
|
|
|
1
|
-
import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
|
|
2
|
-
export function sharedProposalValidatorTests(params) {
|
|
3
|
-
const { validatorFactory, makeProposal, makeHeader, getSigner, getAddress, getSlot, getTxHashes, epochCacheMock } = params;
|
|
4
|
-
describe('shared proposal validation logic', ()=>{
|
|
5
|
-
let epochCache;
|
|
6
|
-
let validator;
|
|
7
|
-
const previousSlot = getSlot(99);
|
|
8
|
-
const currentSlot = getSlot(100);
|
|
9
|
-
const nextSlot = getSlot(101);
|
|
10
|
-
function mockGetProposer(currentProposer, nextProposer, previousProposer) {
|
|
11
|
-
epochCache.getProposerAttesterAddressInSlot.mockImplementation((slot)=>{
|
|
12
|
-
if (slot === currentSlot) {
|
|
13
|
-
return Promise.resolve(currentProposer);
|
|
14
|
-
}
|
|
15
|
-
if (slot === nextSlot) {
|
|
16
|
-
return Promise.resolve(nextProposer);
|
|
17
|
-
}
|
|
18
|
-
if (slot === previousSlot && previousProposer) {
|
|
19
|
-
return Promise.resolve(previousProposer);
|
|
20
|
-
}
|
|
21
|
-
throw new Error('Unexpected argument');
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
beforeEach(()=>{
|
|
25
|
-
epochCache = epochCacheMock();
|
|
26
|
-
validator = validatorFactory(epochCache, {
|
|
27
|
-
txsPermitted: true
|
|
28
|
-
});
|
|
29
|
-
epochCache.getCurrentAndNextSlot.mockReturnValue({
|
|
30
|
-
currentSlot: currentSlot,
|
|
31
|
-
nextSlot: nextSlot
|
|
32
|
-
});
|
|
33
|
-
});
|
|
34
|
-
it('returns high tolerance error if slot number is not current or next slot (outside clock tolerance)', async ()=>{
|
|
35
|
-
const header = makeHeader(1, 99, 99);
|
|
36
|
-
const mockProposal = await makeProposal({
|
|
37
|
-
blockHeader: header,
|
|
38
|
-
lastBlockHeader: header
|
|
39
|
-
});
|
|
40
|
-
// Mock getEpochAndSlotNow to return time OUTSIDE clock tolerance (1000ms elapsed)
|
|
41
|
-
epochCache.getEpochAndSlotNow.mockReturnValue({
|
|
42
|
-
epoch: 1,
|
|
43
|
-
slot: currentSlot,
|
|
44
|
-
ts: 1000n,
|
|
45
|
-
nowMs: 1001000n
|
|
46
|
-
});
|
|
47
|
-
epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(getAddress());
|
|
48
|
-
const result = await validator.validate(mockProposal);
|
|
49
|
-
expect(result).toEqual({
|
|
50
|
-
result: 'reject',
|
|
51
|
-
severity: PeerErrorSeverity.HighToleranceError
|
|
52
|
-
});
|
|
53
|
-
// Should not try to resolve proposers if base validation fails
|
|
54
|
-
expect(epochCache.getProposerAttesterAddressInSlot).not.toHaveBeenCalled();
|
|
55
|
-
});
|
|
56
|
-
it('returns ignore if previous slot proposal is within clock tolerance', async ()=>{
|
|
57
|
-
const previousProposer = getSigner();
|
|
58
|
-
const header = makeHeader(1, 99, 99);
|
|
59
|
-
const mockProposal = await makeProposal({
|
|
60
|
-
blockHeader: header,
|
|
61
|
-
lastBlockHeader: header,
|
|
62
|
-
signer: previousProposer
|
|
63
|
-
});
|
|
64
|
-
// Mock getEpochAndSlotNow to return time WITHIN clock tolerance (100ms elapsed)
|
|
65
|
-
epochCache.getEpochAndSlotNow.mockReturnValue({
|
|
66
|
-
epoch: 1,
|
|
67
|
-
slot: currentSlot,
|
|
68
|
-
ts: 1000n,
|
|
69
|
-
nowMs: 1000100n
|
|
70
|
-
});
|
|
71
|
-
mockGetProposer(getAddress(), getAddress(), getAddress(previousProposer));
|
|
72
|
-
const result = await validator.validate(mockProposal);
|
|
73
|
-
expect(result).toEqual({
|
|
74
|
-
result: 'ignore'
|
|
75
|
-
});
|
|
76
|
-
});
|
|
77
|
-
it('returns mid tolerance error if proposer is not current proposer for current slot', async ()=>{
|
|
78
|
-
const currentProposer = getSigner();
|
|
79
|
-
const nextProposer = getSigner();
|
|
80
|
-
const invalidProposer = getSigner();
|
|
81
|
-
const header = makeHeader(1, 100, 100);
|
|
82
|
-
const mockProposal = await makeProposal({
|
|
83
|
-
blockHeader: header,
|
|
84
|
-
lastBlockHeader: header,
|
|
85
|
-
signer: invalidProposer
|
|
86
|
-
});
|
|
87
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
88
|
-
const result = await validator.validate(mockProposal);
|
|
89
|
-
expect(result).toEqual({
|
|
90
|
-
result: 'reject',
|
|
91
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
92
|
-
});
|
|
93
|
-
});
|
|
94
|
-
it('returns mid tolerance error if proposer is not next proposer for next slot', async ()=>{
|
|
95
|
-
const currentProposer = getSigner();
|
|
96
|
-
const nextProposer = getSigner();
|
|
97
|
-
const invalidProposer = getSigner();
|
|
98
|
-
const header = makeHeader(1, 101, 101);
|
|
99
|
-
const mockProposal = await makeProposal({
|
|
100
|
-
blockHeader: header,
|
|
101
|
-
lastBlockHeader: header,
|
|
102
|
-
signer: invalidProposer
|
|
103
|
-
});
|
|
104
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
105
|
-
const result = await validator.validate(mockProposal);
|
|
106
|
-
expect(result).toEqual({
|
|
107
|
-
result: 'reject',
|
|
108
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
109
|
-
});
|
|
110
|
-
});
|
|
111
|
-
it('returns mid tolerance error if proposer is current proposer but proposal is for next slot', async ()=>{
|
|
112
|
-
const currentProposer = getSigner();
|
|
113
|
-
const nextProposer = getSigner();
|
|
114
|
-
const header = makeHeader(1, 101, 101);
|
|
115
|
-
const mockProposal = await makeProposal({
|
|
116
|
-
blockHeader: header,
|
|
117
|
-
lastBlockHeader: header,
|
|
118
|
-
signer: currentProposer
|
|
119
|
-
});
|
|
120
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
121
|
-
const result = await validator.validate(mockProposal);
|
|
122
|
-
expect(result).toEqual({
|
|
123
|
-
result: 'reject',
|
|
124
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
125
|
-
});
|
|
126
|
-
});
|
|
127
|
-
it('returns undefined if proposal is valid for current slot and proposer', async ()=>{
|
|
128
|
-
const currentProposer = getSigner();
|
|
129
|
-
const nextProposer = getSigner();
|
|
130
|
-
const header = makeHeader(1, 100, 100);
|
|
131
|
-
const mockProposal = await makeProposal({
|
|
132
|
-
blockHeader: header,
|
|
133
|
-
lastBlockHeader: header,
|
|
134
|
-
signer: currentProposer
|
|
135
|
-
});
|
|
136
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
137
|
-
const result = await validator.validate(mockProposal);
|
|
138
|
-
expect(result).toEqual({
|
|
139
|
-
result: 'accept'
|
|
140
|
-
});
|
|
141
|
-
});
|
|
142
|
-
it('returns undefined if proposal is valid for next slot and proposer', async ()=>{
|
|
143
|
-
const currentProposer = getSigner();
|
|
144
|
-
const nextProposer = getSigner();
|
|
145
|
-
const header = makeHeader(1, 101, 101);
|
|
146
|
-
const mockProposal = await makeProposal({
|
|
147
|
-
blockHeader: header,
|
|
148
|
-
lastBlockHeader: header,
|
|
149
|
-
signer: nextProposer
|
|
150
|
-
});
|
|
151
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
152
|
-
const result = await validator.validate(mockProposal);
|
|
153
|
-
expect(result).toEqual({
|
|
154
|
-
result: 'accept'
|
|
155
|
-
});
|
|
156
|
-
});
|
|
157
|
-
describe('transaction permission validation', ()=>{
|
|
158
|
-
it('returns mid tolerance error if txs not permitted and proposal contains txHashes', async ()=>{
|
|
159
|
-
const currentProposer = getSigner();
|
|
160
|
-
const validatorWithTxsDisabled = validatorFactory(epochCache, {
|
|
161
|
-
txsPermitted: false
|
|
162
|
-
});
|
|
163
|
-
const header = makeHeader(1, 100, 100);
|
|
164
|
-
const mockProposal = await makeProposal({
|
|
165
|
-
blockHeader: header,
|
|
166
|
-
lastBlockHeader: header,
|
|
167
|
-
signer: currentProposer,
|
|
168
|
-
txHashes: getTxHashes(2)
|
|
169
|
-
});
|
|
170
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
171
|
-
const result = await validatorWithTxsDisabled.validate(mockProposal);
|
|
172
|
-
expect(result).toEqual({
|
|
173
|
-
result: 'reject',
|
|
174
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
175
|
-
});
|
|
176
|
-
});
|
|
177
|
-
it('returns undefined if txs not permitted but proposal has no txHashes', async ()=>{
|
|
178
|
-
const currentProposer = getSigner();
|
|
179
|
-
const validatorWithTxsDisabled = validatorFactory(epochCache, {
|
|
180
|
-
txsPermitted: false
|
|
181
|
-
});
|
|
182
|
-
const header = makeHeader(1, 100, 100);
|
|
183
|
-
const mockProposal = await makeProposal({
|
|
184
|
-
blockHeader: header,
|
|
185
|
-
lastBlockHeader: header,
|
|
186
|
-
signer: currentProposer,
|
|
187
|
-
txHashes: getTxHashes(0)
|
|
188
|
-
});
|
|
189
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
190
|
-
const result = await validatorWithTxsDisabled.validate(mockProposal);
|
|
191
|
-
expect(result).toEqual({
|
|
192
|
-
result: 'accept'
|
|
193
|
-
});
|
|
194
|
-
});
|
|
195
|
-
it('returns undefined if txs permitted and proposal contains txHashes', async ()=>{
|
|
196
|
-
const currentProposer = getSigner();
|
|
197
|
-
const header = makeHeader(1, 100, 100);
|
|
198
|
-
const mockProposal = await makeProposal({
|
|
199
|
-
blockHeader: header,
|
|
200
|
-
lastBlockHeader: header,
|
|
201
|
-
signer: currentProposer,
|
|
202
|
-
txHashes: getTxHashes(2)
|
|
203
|
-
});
|
|
204
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
205
|
-
const result = await validator.validate(mockProposal);
|
|
206
|
-
expect(result).toEqual({
|
|
207
|
-
result: 'accept'
|
|
208
|
-
});
|
|
209
|
-
});
|
|
210
|
-
});
|
|
211
|
-
});
|
|
212
|
-
}
|
|
@@ -1,230 +0,0 @@
|
|
|
1
|
-
import type { EpochCacheInterface } from '@aztec/epoch-cache';
|
|
2
|
-
import type { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
|
|
3
|
-
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
-
import {
|
|
5
|
-
type BlockProposal,
|
|
6
|
-
type CheckpointProposal,
|
|
7
|
-
PeerErrorSeverity,
|
|
8
|
-
type ValidationResult,
|
|
9
|
-
} from '@aztec/stdlib/p2p';
|
|
10
|
-
import type { TxHash } from '@aztec/stdlib/tx';
|
|
11
|
-
|
|
12
|
-
import type { MockProxy } from 'jest-mock-extended';
|
|
13
|
-
|
|
14
|
-
export interface ProposalValidatorTestParams<TProposal extends BlockProposal | CheckpointProposal> {
|
|
15
|
-
validatorFactory: (
|
|
16
|
-
epochCache: EpochCacheInterface,
|
|
17
|
-
opts: { txsPermitted: boolean },
|
|
18
|
-
) => { validate: (proposal: TProposal) => Promise<ValidationResult> };
|
|
19
|
-
makeProposal: (options?: any) => Promise<TProposal>;
|
|
20
|
-
makeHeader: (epochNumber: number | bigint, slotNumber: number | bigint, blockNumber: number | bigint) => any;
|
|
21
|
-
getSigner: () => Secp256k1Signer;
|
|
22
|
-
getAddress: (signer?: Secp256k1Signer) => EthAddress;
|
|
23
|
-
getSlot: (slot: number | bigint) => any;
|
|
24
|
-
getTxHashes: (n: number) => TxHash[];
|
|
25
|
-
getTxs: () => any[];
|
|
26
|
-
epochCacheMock: () => MockProxy<EpochCacheInterface>;
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
export function sharedProposalValidatorTests<TProposal extends BlockProposal | CheckpointProposal>(
|
|
30
|
-
params: ProposalValidatorTestParams<TProposal>,
|
|
31
|
-
) {
|
|
32
|
-
const { validatorFactory, makeProposal, makeHeader, getSigner, getAddress, getSlot, getTxHashes, epochCacheMock } =
|
|
33
|
-
params;
|
|
34
|
-
|
|
35
|
-
describe('shared proposal validation logic', () => {
|
|
36
|
-
let epochCache: MockProxy<EpochCacheInterface>;
|
|
37
|
-
let validator: { validate: (proposal: TProposal) => Promise<ValidationResult> };
|
|
38
|
-
const previousSlot = getSlot(99);
|
|
39
|
-
const currentSlot = getSlot(100);
|
|
40
|
-
const nextSlot = getSlot(101);
|
|
41
|
-
|
|
42
|
-
function mockGetProposer(currentProposer: EthAddress, nextProposer: EthAddress, previousProposer?: EthAddress) {
|
|
43
|
-
epochCache.getProposerAttesterAddressInSlot.mockImplementation(slot => {
|
|
44
|
-
if (slot === currentSlot) {
|
|
45
|
-
return Promise.resolve(currentProposer);
|
|
46
|
-
}
|
|
47
|
-
if (slot === nextSlot) {
|
|
48
|
-
return Promise.resolve(nextProposer);
|
|
49
|
-
}
|
|
50
|
-
if (slot === previousSlot && previousProposer) {
|
|
51
|
-
return Promise.resolve(previousProposer);
|
|
52
|
-
}
|
|
53
|
-
throw new Error('Unexpected argument');
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
beforeEach(() => {
|
|
58
|
-
epochCache = epochCacheMock();
|
|
59
|
-
validator = validatorFactory(epochCache, { txsPermitted: true });
|
|
60
|
-
epochCache.getCurrentAndNextSlot.mockReturnValue({
|
|
61
|
-
currentSlot: currentSlot,
|
|
62
|
-
nextSlot: nextSlot,
|
|
63
|
-
});
|
|
64
|
-
});
|
|
65
|
-
|
|
66
|
-
it('returns high tolerance error if slot number is not current or next slot (outside clock tolerance)', async () => {
|
|
67
|
-
const header = makeHeader(1, 99, 99);
|
|
68
|
-
const mockProposal = await makeProposal({ blockHeader: header, lastBlockHeader: header });
|
|
69
|
-
|
|
70
|
-
// Mock getEpochAndSlotNow to return time OUTSIDE clock tolerance (1000ms elapsed)
|
|
71
|
-
epochCache.getEpochAndSlotNow.mockReturnValue({
|
|
72
|
-
epoch: 1 as any,
|
|
73
|
-
slot: currentSlot,
|
|
74
|
-
ts: 1000n, // slot started at 1000 seconds
|
|
75
|
-
nowMs: 1001000n, // 1000ms elapsed, outside 500ms tolerance
|
|
76
|
-
});
|
|
77
|
-
|
|
78
|
-
epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(getAddress());
|
|
79
|
-
const result = await validator.validate(mockProposal);
|
|
80
|
-
expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.HighToleranceError });
|
|
81
|
-
|
|
82
|
-
// Should not try to resolve proposers if base validation fails
|
|
83
|
-
expect(epochCache.getProposerAttesterAddressInSlot).not.toHaveBeenCalled();
|
|
84
|
-
});
|
|
85
|
-
|
|
86
|
-
it('returns ignore if previous slot proposal is within clock tolerance', async () => {
|
|
87
|
-
const previousProposer = getSigner();
|
|
88
|
-
const header = makeHeader(1, 99, 99);
|
|
89
|
-
const mockProposal = await makeProposal({
|
|
90
|
-
blockHeader: header,
|
|
91
|
-
lastBlockHeader: header,
|
|
92
|
-
signer: previousProposer,
|
|
93
|
-
});
|
|
94
|
-
|
|
95
|
-
// Mock getEpochAndSlotNow to return time WITHIN clock tolerance (100ms elapsed)
|
|
96
|
-
epochCache.getEpochAndSlotNow.mockReturnValue({
|
|
97
|
-
epoch: 1 as any,
|
|
98
|
-
slot: currentSlot,
|
|
99
|
-
ts: 1000n, // slot started at 1000 seconds
|
|
100
|
-
nowMs: 1000100n, // 100ms elapsed, within 500ms tolerance
|
|
101
|
-
});
|
|
102
|
-
|
|
103
|
-
mockGetProposer(getAddress(), getAddress(), getAddress(previousProposer));
|
|
104
|
-
const result = await validator.validate(mockProposal);
|
|
105
|
-
expect(result).toEqual({ result: 'ignore' });
|
|
106
|
-
});
|
|
107
|
-
|
|
108
|
-
it('returns mid tolerance error if proposer is not current proposer for current slot', async () => {
|
|
109
|
-
const currentProposer = getSigner();
|
|
110
|
-
const nextProposer = getSigner();
|
|
111
|
-
const invalidProposer = getSigner();
|
|
112
|
-
const header = makeHeader(1, 100, 100);
|
|
113
|
-
const mockProposal = await makeProposal({
|
|
114
|
-
blockHeader: header,
|
|
115
|
-
lastBlockHeader: header,
|
|
116
|
-
signer: invalidProposer,
|
|
117
|
-
});
|
|
118
|
-
|
|
119
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
120
|
-
const result = await validator.validate(mockProposal);
|
|
121
|
-
expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.MidToleranceError });
|
|
122
|
-
});
|
|
123
|
-
|
|
124
|
-
it('returns mid tolerance error if proposer is not next proposer for next slot', async () => {
|
|
125
|
-
const currentProposer = getSigner();
|
|
126
|
-
const nextProposer = getSigner();
|
|
127
|
-
const invalidProposer = getSigner();
|
|
128
|
-
const header = makeHeader(1, 101, 101);
|
|
129
|
-
const mockProposal = await makeProposal({
|
|
130
|
-
blockHeader: header,
|
|
131
|
-
lastBlockHeader: header,
|
|
132
|
-
signer: invalidProposer,
|
|
133
|
-
});
|
|
134
|
-
|
|
135
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
136
|
-
const result = await validator.validate(mockProposal);
|
|
137
|
-
expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.MidToleranceError });
|
|
138
|
-
});
|
|
139
|
-
|
|
140
|
-
it('returns mid tolerance error if proposer is current proposer but proposal is for next slot', async () => {
|
|
141
|
-
const currentProposer = getSigner();
|
|
142
|
-
const nextProposer = getSigner();
|
|
143
|
-
const header = makeHeader(1, 101, 101);
|
|
144
|
-
const mockProposal = await makeProposal({
|
|
145
|
-
blockHeader: header,
|
|
146
|
-
lastBlockHeader: header,
|
|
147
|
-
signer: currentProposer,
|
|
148
|
-
});
|
|
149
|
-
|
|
150
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
151
|
-
const result = await validator.validate(mockProposal);
|
|
152
|
-
expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.MidToleranceError });
|
|
153
|
-
});
|
|
154
|
-
|
|
155
|
-
it('returns undefined if proposal is valid for current slot and proposer', async () => {
|
|
156
|
-
const currentProposer = getSigner();
|
|
157
|
-
const nextProposer = getSigner();
|
|
158
|
-
const header = makeHeader(1, 100, 100);
|
|
159
|
-
const mockProposal = await makeProposal({
|
|
160
|
-
blockHeader: header,
|
|
161
|
-
lastBlockHeader: header,
|
|
162
|
-
signer: currentProposer,
|
|
163
|
-
});
|
|
164
|
-
|
|
165
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
166
|
-
const result = await validator.validate(mockProposal);
|
|
167
|
-
expect(result).toEqual({ result: 'accept' });
|
|
168
|
-
});
|
|
169
|
-
|
|
170
|
-
it('returns undefined if proposal is valid for next slot and proposer', async () => {
|
|
171
|
-
const currentProposer = getSigner();
|
|
172
|
-
const nextProposer = getSigner();
|
|
173
|
-
const header = makeHeader(1, 101, 101);
|
|
174
|
-
const mockProposal = await makeProposal({ blockHeader: header, lastBlockHeader: header, signer: nextProposer });
|
|
175
|
-
|
|
176
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
177
|
-
const result = await validator.validate(mockProposal);
|
|
178
|
-
expect(result).toEqual({ result: 'accept' });
|
|
179
|
-
});
|
|
180
|
-
|
|
181
|
-
describe('transaction permission validation', () => {
|
|
182
|
-
it('returns mid tolerance error if txs not permitted and proposal contains txHashes', async () => {
|
|
183
|
-
const currentProposer = getSigner();
|
|
184
|
-
const validatorWithTxsDisabled = validatorFactory(epochCache, { txsPermitted: false });
|
|
185
|
-
const header = makeHeader(1, 100, 100);
|
|
186
|
-
const mockProposal = await makeProposal({
|
|
187
|
-
blockHeader: header,
|
|
188
|
-
lastBlockHeader: header,
|
|
189
|
-
signer: currentProposer,
|
|
190
|
-
txHashes: getTxHashes(2),
|
|
191
|
-
});
|
|
192
|
-
|
|
193
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
194
|
-
const result = await validatorWithTxsDisabled.validate(mockProposal);
|
|
195
|
-
expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.MidToleranceError });
|
|
196
|
-
});
|
|
197
|
-
|
|
198
|
-
it('returns undefined if txs not permitted but proposal has no txHashes', async () => {
|
|
199
|
-
const currentProposer = getSigner();
|
|
200
|
-
const validatorWithTxsDisabled = validatorFactory(epochCache, { txsPermitted: false });
|
|
201
|
-
const header = makeHeader(1, 100, 100);
|
|
202
|
-
const mockProposal = await makeProposal({
|
|
203
|
-
blockHeader: header,
|
|
204
|
-
lastBlockHeader: header,
|
|
205
|
-
signer: currentProposer,
|
|
206
|
-
txHashes: getTxHashes(0),
|
|
207
|
-
});
|
|
208
|
-
|
|
209
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
210
|
-
const result = await validatorWithTxsDisabled.validate(mockProposal);
|
|
211
|
-
expect(result).toEqual({ result: 'accept' });
|
|
212
|
-
});
|
|
213
|
-
|
|
214
|
-
it('returns undefined if txs permitted and proposal contains txHashes', async () => {
|
|
215
|
-
const currentProposer = getSigner();
|
|
216
|
-
const header = makeHeader(1, 100, 100);
|
|
217
|
-
const mockProposal = await makeProposal({
|
|
218
|
-
blockHeader: header,
|
|
219
|
-
lastBlockHeader: header,
|
|
220
|
-
signer: currentProposer,
|
|
221
|
-
txHashes: getTxHashes(2),
|
|
222
|
-
});
|
|
223
|
-
|
|
224
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
225
|
-
const result = await validator.validate(mockProposal);
|
|
226
|
-
expect(result).toEqual({ result: 'accept' });
|
|
227
|
-
});
|
|
228
|
-
});
|
|
229
|
-
});
|
|
230
|
-
}
|