@aztec/p2p 4.0.4 → 4.1.0-rc.2
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 +1 -1
- package/dest/client/factory.d.ts.map +1 -1
- package/dest/client/factory.js +2 -1
- package/dest/client/p2p_client.d.ts +1 -1
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +0 -24
- package/dest/config.d.ts +17 -9
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +65 -31
- 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/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 +13 -4
- package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_metadata.js +26 -9
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +1 -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 +2 -1
- package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +5 -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 +5 -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 +12 -9
- package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
- package/dest/msg_validators/proposal_validator/proposal_validator.js +46 -44
- 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 +32 -14
- 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/libp2p/libp2p_service.d.ts +1 -1
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +9 -8
- package/dest/testbench/p2p_client_testbench_worker.js +2 -1
- 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 +4 -1
- package/package.json +14 -14
- package/src/client/factory.ts +1 -0
- package/src/client/p2p_client.ts +0 -22
- package/src/config.ts +89 -32
- package/src/mem_pools/tx_pool_v2/README.md +9 -1
- 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/interfaces.ts +3 -0
- package/src/mem_pools/tx_pool_v2/tx_metadata.ts +37 -7
- package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +3 -1
- package/src/msg_validators/proposal_validator/block_proposal_validator.ts +13 -3
- package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +19 -6
- package/src/msg_validators/proposal_validator/proposal_validator.ts +57 -48
- package/src/msg_validators/tx_validator/allowed_public_setup.ts +38 -18
- package/src/msg_validators/tx_validator/phases_validator.ts +51 -26
- package/src/services/libp2p/libp2p_service.ts +9 -8
- package/src/testbench/p2p_client_testbench_worker.ts +1 -0
- package/src/testbench/worker_client_manager.ts +11 -4
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +0 -24
- 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 -378
- package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +0 -373
|
@@ -81,13 +81,15 @@ class WorkerClientManager {
|
|
|
81
81
|
* Note: We send the raw peerIdPrivateKey string instead of SecretValue
|
|
82
82
|
* because SecretValue.toJSON() returns '[Redacted]', losing the value.
|
|
83
83
|
* The worker must re-wrap it in SecretValue.
|
|
84
|
+
* We also omit priceBumpPercentage since it's a bigint and can't be
|
|
85
|
+
* serialized over IPC (which uses JSON under the hood).
|
|
84
86
|
*/
|
|
85
87
|
private createClientConfig(
|
|
86
88
|
clientIndex: number,
|
|
87
89
|
port: number,
|
|
88
90
|
otherNodes: string[],
|
|
89
|
-
): Omit<P2PConfig, 'peerIdPrivateKey'> & { peerIdPrivateKey: string } & Partial<ChainConfig> {
|
|
90
|
-
|
|
91
|
+
): Omit<P2PConfig, 'peerIdPrivateKey' | 'priceBumpPercentage'> & { peerIdPrivateKey: string } & Partial<ChainConfig> {
|
|
92
|
+
const { priceBumpPercentage: _, ...config } = {
|
|
91
93
|
...getP2PDefaultConfig(),
|
|
92
94
|
p2pEnabled: true,
|
|
93
95
|
peerIdPrivateKey: this.peerIdPrivateKeys[clientIndex],
|
|
@@ -96,7 +98,10 @@ class WorkerClientManager {
|
|
|
96
98
|
p2pPort: port,
|
|
97
99
|
bootstrapNodes: [...otherNodes],
|
|
98
100
|
...this.p2pConfig,
|
|
99
|
-
}
|
|
101
|
+
};
|
|
102
|
+
return config as Omit<P2PConfig, 'peerIdPrivateKey' | 'priceBumpPercentage'> & {
|
|
103
|
+
peerIdPrivateKey: string;
|
|
104
|
+
} & Partial<ChainConfig>;
|
|
100
105
|
}
|
|
101
106
|
|
|
102
107
|
/**
|
|
@@ -104,7 +109,9 @@ class WorkerClientManager {
|
|
|
104
109
|
* Config uses raw string for peerIdPrivateKey (not SecretValue) for IPC serialization.
|
|
105
110
|
*/
|
|
106
111
|
private spawnWorkerProcess(
|
|
107
|
-
config: Omit<P2PConfig, 'peerIdPrivateKey'> & {
|
|
112
|
+
config: Omit<P2PConfig, 'peerIdPrivateKey' | 'priceBumpPercentage'> & {
|
|
113
|
+
peerIdPrivateKey: string;
|
|
114
|
+
} & Partial<ChainConfig>,
|
|
108
115
|
clientIndex: number,
|
|
109
116
|
): [ChildProcess, Promise<void>] {
|
|
110
117
|
const useCompiled = existsSync(workerJsPath);
|
|
@@ -1,24 +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 { type BlockProposal, type CheckpointProposal, type ValidationResult } from '@aztec/stdlib/p2p';
|
|
5
|
-
import type { TxHash } from '@aztec/stdlib/tx';
|
|
6
|
-
import type { MockProxy } from 'jest-mock-extended';
|
|
7
|
-
export interface ProposalValidatorTestParams<TProposal extends BlockProposal | CheckpointProposal> {
|
|
8
|
-
validatorFactory: (epochCache: EpochCacheInterface, opts: {
|
|
9
|
-
txsPermitted: boolean;
|
|
10
|
-
maxTxsPerBlock?: number;
|
|
11
|
-
}) => {
|
|
12
|
-
validate: (proposal: TProposal) => Promise<ValidationResult>;
|
|
13
|
-
};
|
|
14
|
-
makeProposal: (options?: any) => Promise<TProposal>;
|
|
15
|
-
makeHeader: (epochNumber: number | bigint, slotNumber: number | bigint, blockNumber: number | bigint) => any;
|
|
16
|
-
getSigner: () => Secp256k1Signer;
|
|
17
|
-
getAddress: (signer?: Secp256k1Signer) => EthAddress;
|
|
18
|
-
getSlot: (slot: number | bigint) => any;
|
|
19
|
-
getTxHashes: (n: number) => TxHash[];
|
|
20
|
-
getTxs: () => any[];
|
|
21
|
-
epochCacheMock: () => MockProxy<EpochCacheInterface>;
|
|
22
|
-
}
|
|
23
|
-
export declare function sharedProposalValidatorTests<TProposal extends BlockProposal | CheckpointProposal>(params: ProposalValidatorTestParams<TProposal>): void;
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yX3Rlc3Rfc3VpdGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvcHJvcG9zYWxfdmFsaWRhdG9yX3Rlc3Rfc3VpdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQ0wsS0FBSyxhQUFhLEVBQ2xCLEtBQUssa0JBQWtCLEVBRXZCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHL0MsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQsTUFBTSxXQUFXLDJCQUEyQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQy9GLGdCQUFnQixFQUFFLENBQ2hCLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQztRQUFDLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEtBQ3JEO1FBQUUsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFLFNBQVMsS0FBSyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtLQUFFLENBQUM7SUFDdEUsWUFBWSxFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsR0FBRyxLQUFLLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNwRCxVQUFVLEVBQUUsQ0FBQyxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sS0FBSyxHQUFHLENBQUM7SUFDN0csU0FBUyxFQUFFLE1BQU0sZUFBZSxDQUFDO0lBQ2pDLFVBQVUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLGVBQWUsS0FBSyxVQUFVLENBQUM7SUFDckQsT0FBTyxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxNQUFNLEtBQUssR0FBRyxDQUFDO0lBQ3hDLFdBQVcsRUFBRSxDQUFDLENBQUMsRUFBRSxNQUFNLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDckMsTUFBTSxFQUFFLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFDcEIsY0FBYyxFQUFFLE1BQU0sU0FBUyxDQUFDLG1CQUFtQixDQUFDLENBQUM7Q0FDdEQ7QUFFRCx3QkFBZ0IsNEJBQTRCLENBQUMsU0FBUyxTQUFTLGFBQWEsR0FBRyxrQkFBa0IsRUFDL0YsTUFBTSxFQUFFLDJCQUEyQixDQUFDLFNBQVMsQ0FBQyxRQXFWL0MifQ==
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"proposal_validator_test_suite.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator_test_suite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,WAAW,2BAA2B,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB;IAC/F,gBAAgB,EAAE,CAChB,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,KACrD;QAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAAE,CAAC;IACtE,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACpD,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,KAAK,GAAG,CAAC;IAC7G,SAAS,EAAE,MAAM,eAAe,CAAC;IACjC,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,UAAU,CAAC;IACrD,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,KAAK,GAAG,CAAC;IACxC,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACrC,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,SAAS,CAAC,mBAAmB,CAAC,CAAC;CACtD;AAED,wBAAgB,4BAA4B,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB,EAC/F,MAAM,EAAE,2BAA2B,CAAC,SAAS,CAAC,QAqV/C"}
|
|
@@ -1,378 +0,0 @@
|
|
|
1
|
-
import { NoCommitteeError } from '@aztec/ethereum/contracts';
|
|
2
|
-
import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
|
|
3
|
-
import { jest } from '@jest/globals';
|
|
4
|
-
export function sharedProposalValidatorTests(params) {
|
|
5
|
-
const { validatorFactory, makeProposal, makeHeader, getSigner, getAddress, getSlot, getTxHashes, epochCacheMock } = params;
|
|
6
|
-
describe('shared proposal validation logic', ()=>{
|
|
7
|
-
let epochCache;
|
|
8
|
-
let validator;
|
|
9
|
-
const previousSlot = getSlot(99);
|
|
10
|
-
const currentSlot = getSlot(100);
|
|
11
|
-
const nextSlot = getSlot(101);
|
|
12
|
-
function mockGetProposer(currentProposer, nextProposer, previousProposer) {
|
|
13
|
-
epochCache.getProposerAttesterAddressInSlot.mockImplementation((slot)=>{
|
|
14
|
-
if (slot === currentSlot) {
|
|
15
|
-
return Promise.resolve(currentProposer);
|
|
16
|
-
}
|
|
17
|
-
if (slot === nextSlot) {
|
|
18
|
-
return Promise.resolve(nextProposer);
|
|
19
|
-
}
|
|
20
|
-
if (slot === previousSlot && previousProposer) {
|
|
21
|
-
return Promise.resolve(previousProposer);
|
|
22
|
-
}
|
|
23
|
-
throw new Error('Unexpected argument');
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
beforeEach(()=>{
|
|
27
|
-
epochCache = epochCacheMock();
|
|
28
|
-
validator = validatorFactory(epochCache, {
|
|
29
|
-
txsPermitted: true
|
|
30
|
-
});
|
|
31
|
-
epochCache.getCurrentAndNextSlot.mockReturnValue({
|
|
32
|
-
currentSlot: currentSlot,
|
|
33
|
-
nextSlot: nextSlot
|
|
34
|
-
});
|
|
35
|
-
});
|
|
36
|
-
it('returns high tolerance error if slot number is not current or next slot (outside clock tolerance)', async ()=>{
|
|
37
|
-
const header = makeHeader(1, 99, 99);
|
|
38
|
-
const mockProposal = await makeProposal({
|
|
39
|
-
blockHeader: header,
|
|
40
|
-
lastBlockHeader: header
|
|
41
|
-
});
|
|
42
|
-
// Mock getEpochAndSlotNow to return time OUTSIDE clock tolerance (1000ms elapsed)
|
|
43
|
-
epochCache.getEpochAndSlotNow.mockReturnValue({
|
|
44
|
-
epoch: 1,
|
|
45
|
-
slot: currentSlot,
|
|
46
|
-
ts: 1000n,
|
|
47
|
-
nowMs: 1001000n
|
|
48
|
-
});
|
|
49
|
-
epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(getAddress());
|
|
50
|
-
const result = await validator.validate(mockProposal);
|
|
51
|
-
expect(result).toEqual({
|
|
52
|
-
result: 'reject',
|
|
53
|
-
severity: PeerErrorSeverity.HighToleranceError
|
|
54
|
-
});
|
|
55
|
-
// Should not try to resolve proposers if base validation fails
|
|
56
|
-
expect(epochCache.getProposerAttesterAddressInSlot).not.toHaveBeenCalled();
|
|
57
|
-
});
|
|
58
|
-
it('returns ignore if previous slot proposal is within clock tolerance', async ()=>{
|
|
59
|
-
const previousProposer = getSigner();
|
|
60
|
-
const header = makeHeader(1, 99, 99);
|
|
61
|
-
const mockProposal = await makeProposal({
|
|
62
|
-
blockHeader: header,
|
|
63
|
-
lastBlockHeader: header,
|
|
64
|
-
signer: previousProposer
|
|
65
|
-
});
|
|
66
|
-
// Mock getEpochAndSlotNow to return time WITHIN clock tolerance (100ms elapsed)
|
|
67
|
-
epochCache.getEpochAndSlotNow.mockReturnValue({
|
|
68
|
-
epoch: 1,
|
|
69
|
-
slot: currentSlot,
|
|
70
|
-
ts: 1000n,
|
|
71
|
-
nowMs: 1000100n
|
|
72
|
-
});
|
|
73
|
-
mockGetProposer(getAddress(), getAddress(), getAddress(previousProposer));
|
|
74
|
-
const result = await validator.validate(mockProposal);
|
|
75
|
-
expect(result).toEqual({
|
|
76
|
-
result: 'ignore'
|
|
77
|
-
});
|
|
78
|
-
});
|
|
79
|
-
it('returns mid tolerance error if proposal has invalid signature', async ()=>{
|
|
80
|
-
const currentProposer = getSigner();
|
|
81
|
-
const header = makeHeader(1, 100, 100);
|
|
82
|
-
const mockProposal = await makeProposal({
|
|
83
|
-
blockHeader: header,
|
|
84
|
-
lastBlockHeader: header,
|
|
85
|
-
signer: currentProposer
|
|
86
|
-
});
|
|
87
|
-
// Override getSender to return undefined (invalid signature)
|
|
88
|
-
jest.spyOn(mockProposal, 'getSender').mockReturnValue(undefined);
|
|
89
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
90
|
-
const result = await validator.validate(mockProposal);
|
|
91
|
-
expect(result).toEqual({
|
|
92
|
-
result: 'reject',
|
|
93
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
94
|
-
});
|
|
95
|
-
// Should not try to resolve proposer if signature is invalid
|
|
96
|
-
expect(epochCache.getProposerAttesterAddressInSlot).not.toHaveBeenCalled();
|
|
97
|
-
});
|
|
98
|
-
it('returns mid tolerance error if proposer is not current proposer for current slot', async ()=>{
|
|
99
|
-
const currentProposer = getSigner();
|
|
100
|
-
const nextProposer = getSigner();
|
|
101
|
-
const invalidProposer = getSigner();
|
|
102
|
-
const header = makeHeader(1, 100, 100);
|
|
103
|
-
const mockProposal = await makeProposal({
|
|
104
|
-
blockHeader: header,
|
|
105
|
-
lastBlockHeader: header,
|
|
106
|
-
signer: invalidProposer
|
|
107
|
-
});
|
|
108
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
109
|
-
const result = await validator.validate(mockProposal);
|
|
110
|
-
expect(result).toEqual({
|
|
111
|
-
result: 'reject',
|
|
112
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
113
|
-
});
|
|
114
|
-
});
|
|
115
|
-
it('returns mid tolerance error if proposer is not next proposer for next slot', async ()=>{
|
|
116
|
-
const currentProposer = getSigner();
|
|
117
|
-
const nextProposer = getSigner();
|
|
118
|
-
const invalidProposer = getSigner();
|
|
119
|
-
const header = makeHeader(1, 101, 101);
|
|
120
|
-
const mockProposal = await makeProposal({
|
|
121
|
-
blockHeader: header,
|
|
122
|
-
lastBlockHeader: header,
|
|
123
|
-
signer: invalidProposer
|
|
124
|
-
});
|
|
125
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
126
|
-
const result = await validator.validate(mockProposal);
|
|
127
|
-
expect(result).toEqual({
|
|
128
|
-
result: 'reject',
|
|
129
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
130
|
-
});
|
|
131
|
-
});
|
|
132
|
-
it('returns mid tolerance error if proposer is current proposer but proposal is for next slot', async ()=>{
|
|
133
|
-
const currentProposer = getSigner();
|
|
134
|
-
const nextProposer = getSigner();
|
|
135
|
-
const header = makeHeader(1, 101, 101);
|
|
136
|
-
const mockProposal = await makeProposal({
|
|
137
|
-
blockHeader: header,
|
|
138
|
-
lastBlockHeader: header,
|
|
139
|
-
signer: currentProposer
|
|
140
|
-
});
|
|
141
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
142
|
-
const result = await validator.validate(mockProposal);
|
|
143
|
-
expect(result).toEqual({
|
|
144
|
-
result: 'reject',
|
|
145
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
146
|
-
});
|
|
147
|
-
});
|
|
148
|
-
it('accepts proposal when proposer is undefined (open committee)', async ()=>{
|
|
149
|
-
const currentProposer = getSigner();
|
|
150
|
-
const header = makeHeader(1, 100, 100);
|
|
151
|
-
const mockProposal = await makeProposal({
|
|
152
|
-
blockHeader: header,
|
|
153
|
-
lastBlockHeader: header,
|
|
154
|
-
signer: currentProposer
|
|
155
|
-
});
|
|
156
|
-
epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(undefined);
|
|
157
|
-
const result = await validator.validate(mockProposal);
|
|
158
|
-
expect(result).toEqual({
|
|
159
|
-
result: 'accept'
|
|
160
|
-
});
|
|
161
|
-
});
|
|
162
|
-
it('returns low tolerance error when getProposerAttesterAddressInSlot throws NoCommitteeError', async ()=>{
|
|
163
|
-
const currentProposer = getSigner();
|
|
164
|
-
const header = makeHeader(1, 100, 100);
|
|
165
|
-
const mockProposal = await makeProposal({
|
|
166
|
-
blockHeader: header,
|
|
167
|
-
lastBlockHeader: header,
|
|
168
|
-
signer: currentProposer
|
|
169
|
-
});
|
|
170
|
-
epochCache.getProposerAttesterAddressInSlot.mockRejectedValue(new NoCommitteeError());
|
|
171
|
-
const result = await validator.validate(mockProposal);
|
|
172
|
-
expect(result).toEqual({
|
|
173
|
-
result: 'reject',
|
|
174
|
-
severity: PeerErrorSeverity.LowToleranceError
|
|
175
|
-
});
|
|
176
|
-
});
|
|
177
|
-
it('returns undefined if proposal is valid for current slot and proposer', async ()=>{
|
|
178
|
-
const currentProposer = getSigner();
|
|
179
|
-
const nextProposer = getSigner();
|
|
180
|
-
const header = makeHeader(1, 100, 100);
|
|
181
|
-
const mockProposal = await makeProposal({
|
|
182
|
-
blockHeader: header,
|
|
183
|
-
lastBlockHeader: header,
|
|
184
|
-
signer: currentProposer
|
|
185
|
-
});
|
|
186
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
187
|
-
const result = await validator.validate(mockProposal);
|
|
188
|
-
expect(result).toEqual({
|
|
189
|
-
result: 'accept'
|
|
190
|
-
});
|
|
191
|
-
});
|
|
192
|
-
it('returns undefined if proposal is valid for next slot and proposer', async ()=>{
|
|
193
|
-
const currentProposer = getSigner();
|
|
194
|
-
const nextProposer = getSigner();
|
|
195
|
-
const header = makeHeader(1, 101, 101);
|
|
196
|
-
const mockProposal = await makeProposal({
|
|
197
|
-
blockHeader: header,
|
|
198
|
-
lastBlockHeader: header,
|
|
199
|
-
signer: nextProposer
|
|
200
|
-
});
|
|
201
|
-
mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
|
|
202
|
-
const result = await validator.validate(mockProposal);
|
|
203
|
-
expect(result).toEqual({
|
|
204
|
-
result: 'accept'
|
|
205
|
-
});
|
|
206
|
-
});
|
|
207
|
-
describe('transaction permission validation', ()=>{
|
|
208
|
-
it('returns mid tolerance error if txs not permitted and proposal contains txHashes', async ()=>{
|
|
209
|
-
const currentProposer = getSigner();
|
|
210
|
-
const validatorWithTxsDisabled = validatorFactory(epochCache, {
|
|
211
|
-
txsPermitted: false
|
|
212
|
-
});
|
|
213
|
-
const header = makeHeader(1, 100, 100);
|
|
214
|
-
const mockProposal = await makeProposal({
|
|
215
|
-
blockHeader: header,
|
|
216
|
-
lastBlockHeader: header,
|
|
217
|
-
signer: currentProposer,
|
|
218
|
-
txHashes: getTxHashes(2)
|
|
219
|
-
});
|
|
220
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
221
|
-
const result = await validatorWithTxsDisabled.validate(mockProposal);
|
|
222
|
-
expect(result).toEqual({
|
|
223
|
-
result: 'reject',
|
|
224
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
225
|
-
});
|
|
226
|
-
});
|
|
227
|
-
it('returns undefined if txs not permitted but proposal has no txHashes', async ()=>{
|
|
228
|
-
const currentProposer = getSigner();
|
|
229
|
-
const validatorWithTxsDisabled = validatorFactory(epochCache, {
|
|
230
|
-
txsPermitted: false
|
|
231
|
-
});
|
|
232
|
-
const header = makeHeader(1, 100, 100);
|
|
233
|
-
const mockProposal = await makeProposal({
|
|
234
|
-
blockHeader: header,
|
|
235
|
-
lastBlockHeader: header,
|
|
236
|
-
signer: currentProposer,
|
|
237
|
-
txHashes: getTxHashes(0)
|
|
238
|
-
});
|
|
239
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
240
|
-
const result = await validatorWithTxsDisabled.validate(mockProposal);
|
|
241
|
-
expect(result).toEqual({
|
|
242
|
-
result: 'accept'
|
|
243
|
-
});
|
|
244
|
-
});
|
|
245
|
-
it('returns undefined if txs permitted and proposal contains txHashes', async ()=>{
|
|
246
|
-
const currentProposer = getSigner();
|
|
247
|
-
const header = makeHeader(1, 100, 100);
|
|
248
|
-
const mockProposal = await makeProposal({
|
|
249
|
-
blockHeader: header,
|
|
250
|
-
lastBlockHeader: header,
|
|
251
|
-
signer: currentProposer,
|
|
252
|
-
txHashes: getTxHashes(2)
|
|
253
|
-
});
|
|
254
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
255
|
-
const result = await validator.validate(mockProposal);
|
|
256
|
-
expect(result).toEqual({
|
|
257
|
-
result: 'accept'
|
|
258
|
-
});
|
|
259
|
-
});
|
|
260
|
-
});
|
|
261
|
-
describe('embedded tx validation', ()=>{
|
|
262
|
-
it('returns mid tolerance error if embedded txs are not listed in txHashes', async ()=>{
|
|
263
|
-
const currentProposer = getSigner();
|
|
264
|
-
const txHashes = getTxHashes(2);
|
|
265
|
-
const header = makeHeader(1, 100, 100);
|
|
266
|
-
const mockProposal = await makeProposal({
|
|
267
|
-
blockHeader: header,
|
|
268
|
-
lastBlockHeader: header,
|
|
269
|
-
signer: currentProposer,
|
|
270
|
-
txHashes
|
|
271
|
-
});
|
|
272
|
-
// Create a fake tx whose hash is NOT in txHashes
|
|
273
|
-
const fakeTxHash = getTxHashes(1)[0];
|
|
274
|
-
const fakeTx = {
|
|
275
|
-
getTxHash: ()=>fakeTxHash,
|
|
276
|
-
validateTxHash: ()=>Promise.resolve(true)
|
|
277
|
-
};
|
|
278
|
-
Object.defineProperty(mockProposal, 'txs', {
|
|
279
|
-
get: ()=>[
|
|
280
|
-
fakeTx
|
|
281
|
-
],
|
|
282
|
-
configurable: true
|
|
283
|
-
});
|
|
284
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
285
|
-
const result = await validator.validate(mockProposal);
|
|
286
|
-
expect(result).toEqual({
|
|
287
|
-
result: 'reject',
|
|
288
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
289
|
-
});
|
|
290
|
-
});
|
|
291
|
-
it('returns low tolerance error if embedded tx has invalid tx hash', async ()=>{
|
|
292
|
-
const currentProposer = getSigner();
|
|
293
|
-
const txHashes = getTxHashes(2);
|
|
294
|
-
const header = makeHeader(1, 100, 100);
|
|
295
|
-
const mockProposal = await makeProposal({
|
|
296
|
-
blockHeader: header,
|
|
297
|
-
lastBlockHeader: header,
|
|
298
|
-
signer: currentProposer,
|
|
299
|
-
txHashes
|
|
300
|
-
});
|
|
301
|
-
// Create a fake tx whose hash IS in txHashes but validateTxHash returns false
|
|
302
|
-
const fakeTx = {
|
|
303
|
-
getTxHash: ()=>txHashes[0],
|
|
304
|
-
validateTxHash: ()=>Promise.resolve(false)
|
|
305
|
-
};
|
|
306
|
-
Object.defineProperty(mockProposal, 'txs', {
|
|
307
|
-
get: ()=>[
|
|
308
|
-
fakeTx
|
|
309
|
-
],
|
|
310
|
-
configurable: true
|
|
311
|
-
});
|
|
312
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
313
|
-
const result = await validator.validate(mockProposal);
|
|
314
|
-
expect(result).toEqual({
|
|
315
|
-
result: 'reject',
|
|
316
|
-
severity: PeerErrorSeverity.LowToleranceError
|
|
317
|
-
});
|
|
318
|
-
});
|
|
319
|
-
});
|
|
320
|
-
describe('maxTxsPerBlock validation', ()=>{
|
|
321
|
-
it('rejects proposal when txHashes exceed maxTxsPerBlock', async ()=>{
|
|
322
|
-
const validatorWithMaxTxs = validatorFactory(epochCache, {
|
|
323
|
-
txsPermitted: true,
|
|
324
|
-
maxTxsPerBlock: 2
|
|
325
|
-
});
|
|
326
|
-
const currentProposer = getSigner();
|
|
327
|
-
const header = makeHeader(1, 100, 100);
|
|
328
|
-
const mockProposal = await makeProposal({
|
|
329
|
-
blockHeader: header,
|
|
330
|
-
lastBlockHeader: header,
|
|
331
|
-
signer: currentProposer,
|
|
332
|
-
txHashes: getTxHashes(3)
|
|
333
|
-
});
|
|
334
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
335
|
-
const result = await validatorWithMaxTxs.validate(mockProposal);
|
|
336
|
-
expect(result).toEqual({
|
|
337
|
-
result: 'reject',
|
|
338
|
-
severity: PeerErrorSeverity.MidToleranceError
|
|
339
|
-
});
|
|
340
|
-
});
|
|
341
|
-
it('accepts proposal when txHashes count equals maxTxsPerBlock', async ()=>{
|
|
342
|
-
const validatorWithMaxTxs = validatorFactory(epochCache, {
|
|
343
|
-
txsPermitted: true,
|
|
344
|
-
maxTxsPerBlock: 2
|
|
345
|
-
});
|
|
346
|
-
const currentProposer = getSigner();
|
|
347
|
-
const header = makeHeader(1, 100, 100);
|
|
348
|
-
const mockProposal = await makeProposal({
|
|
349
|
-
blockHeader: header,
|
|
350
|
-
lastBlockHeader: header,
|
|
351
|
-
signer: currentProposer,
|
|
352
|
-
txHashes: getTxHashes(2)
|
|
353
|
-
});
|
|
354
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
355
|
-
const result = await validatorWithMaxTxs.validate(mockProposal);
|
|
356
|
-
expect(result).toEqual({
|
|
357
|
-
result: 'accept'
|
|
358
|
-
});
|
|
359
|
-
});
|
|
360
|
-
it('accepts proposal when maxTxsPerBlock is not set (unlimited)', async ()=>{
|
|
361
|
-
// Default validator has no maxTxsPerBlock
|
|
362
|
-
const currentProposer = getSigner();
|
|
363
|
-
const header = makeHeader(1, 100, 100);
|
|
364
|
-
const mockProposal = await makeProposal({
|
|
365
|
-
blockHeader: header,
|
|
366
|
-
lastBlockHeader: header,
|
|
367
|
-
signer: currentProposer,
|
|
368
|
-
txHashes: getTxHashes(10)
|
|
369
|
-
});
|
|
370
|
-
mockGetProposer(getAddress(currentProposer), getAddress());
|
|
371
|
-
const result = await validator.validate(mockProposal);
|
|
372
|
-
expect(result).toEqual({
|
|
373
|
-
result: 'accept'
|
|
374
|
-
});
|
|
375
|
-
});
|
|
376
|
-
});
|
|
377
|
-
});
|
|
378
|
-
}
|