@aztec/end-to-end 1.0.0-nightly.20250714 → 1.0.0-nightly.20250715

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.
Files changed (12) hide show
  1. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  2. package/dest/e2e_epochs/epochs_test.js +2 -1
  3. package/dest/e2e_p2p/p2p_network.d.ts +5 -3
  4. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  5. package/dest/e2e_p2p/p2p_network.js +14 -11
  6. package/dest/fixtures/setup_p2p_test.d.ts +1 -1
  7. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  8. package/dest/fixtures/setup_p2p_test.js +7 -6
  9. package/package.json +35 -35
  10. package/src/e2e_epochs/epochs_test.ts +2 -1
  11. package/src/e2e_p2p/p2p_network.ts +18 -10
  12. package/src/fixtures/setup_p2p_test.ts +7 -5
package/dest/e2e_epochs/epochs_test.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EACL,EAAE,EACF,KAAK,MAAM,EAEX,KAAK,MAAM,EAKZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,wBAAwB,EAA0B,MAAM,iBAAiB,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAqC,MAAM,sBAAsB,CAAC;AAIrH,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAErE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,KAAK,iBAAiB,EAAuC,MAAM,6BAA6B,CAAC;AAO1G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnF,MAAM,MAAM,qBAAqB,GAAG;KACjC,CAAC,IAAI,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QAChE,IAAI,EAAE,CAAC,CAAC;QACR,cAAc,EAAE,MAAM,CAAC;QACvB,SAAS,EAAE,UAAU,CAAC;KACvB;CACF,CAAC,MAAM,eAAe,CAAC,CAAC;AAEzB;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,wBAAwB,CAAC;IACpC,MAAM,EAAG,cAAc,CAAC;IACxB,SAAS,EAAG,iBAAiB,CAAC;IAC9B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAE3B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAE/B,aAAa,EAAG,MAAM,CAAC;IAEvB,kBAAkB,EAAG,MAAM,CAAC;IAC5B,qBAAqB,EAAG,MAAM,CAAC;WAElB,KAAK,CAAC,IAAI,GAAE,cAAmB;WAMrC,gBAAgB,CAAC,IAAI,GAAE,cAAmB;;;;;;IAS3C,KAAK,CAAC,IAAI,GAAE,cAAmB;IA6E/B,QAAQ;IAOR,gBAAgB;IAgBtB,sBAAsB,CAAC,IAAI,GAAE,OAAO,CAAC,eAAe,CAAM;IAK1D,mBAAmB,CACxB,WAAW,EAAE,KAAK,MAAM,EAAE,EAAE,EAC5B,IAAI,GAAE,OAAO,CAAC,eAAe,CAAC,GAAG;QAAE,iCAAiC,CAAC,EAAE,MAAM,CAAC;QAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAO;YAMtG,UAAU;IAiDxB,OAAO,CAAC,iBAAiB;IAKzB,0FAA0F;IAC7E,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAO/C,sDAAsD;IACzC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAK;IAShE,iEAAiE;IACpD,4BAA4B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,SAAK;IAUjE,kFAAkF;IACrE,wCAAwC,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAUlF,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU;IAoB7F,sDAAsD;IACzC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,KAAU;IAYhE,0GAA0G;IAC7F,cAAc;;;;IAc3B,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;IAW9E,oBAAoB,CACzB,UAAU,EAAE,eAAe,EAAE,EAC7B,WAAW,GAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAc;;;;CAiD/D"}
1
+ {"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"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"}
package/dest/e2e_epochs/epochs_test.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { AztecNodeService } from '@aztec/aztec-node';
2
2
  import { Fr, MerkleTreeId, getContractInstanceFromInstantiationParams, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
3
- import { createExtendedL1Client } from '@aztec/ethereum';
3
+ import { DefaultL1ContractsConfig, createExtendedL1Client } from '@aztec/ethereum';
4
4
  import { RollupContract } from '@aztec/ethereum/contracts';
5
5
  import { ChainMonitor, DelayedTxUtils, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
6
6
  import { SecretValue } from '@aztec/foundation/config';
@@ -82,6 +82,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
82
82
  // but not so much to hang the sequencer and timeout the teardown
83
83
  txPropagationMaxQueryAttempts: opts.txPropagationMaxQueryAttempts ?? 12,
84
84
  worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
85
+ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
85
86
  ...opts
86
87
  });
87
88
  this.context = context;
package/dest/e2e_p2p/p2p_network.d.ts CHANGED
@@ -19,7 +19,8 @@ export declare const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES: {
19
19
  export declare class P2PNetworkTest {
20
20
  bootstrapNodeEnr: string;
21
21
  bootNodePort: number;
22
- private numberOfNodes;
22
+ numberOfValidators: number;
23
+ numberOfNodes: number;
23
24
  private metricsPort?;
24
25
  private snapshotManager;
25
26
  baseAccountPrivateKey: `0x${string}`;
@@ -53,10 +54,11 @@ export declare class P2PNetworkTest {
53
54
  wallet?: AccountWalletWithSecretKey;
54
55
  spamContract?: SpamContract;
55
56
  bootstrapNode?: BootstrapNode;
56
- constructor(testName: string, bootstrapNodeEnr: string, bootNodePort: number, numberOfNodes: number, initialValidatorConfig: AztecNodeConfig, metricsPort?: number | undefined, startProverNode?: boolean, mockZkPassportVerifier?: boolean);
57
- static create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier, }: {
57
+ constructor(testName: string, bootstrapNodeEnr: string, bootNodePort: number, numberOfValidators: number, initialValidatorConfig: AztecNodeConfig, numberOfNodes?: number, metricsPort?: number | undefined, startProverNode?: boolean, mockZkPassportVerifier?: boolean);
58
+ static create({ testName, numberOfNodes, numberOfValidators, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier, }: {
58
59
  testName: string;
59
60
  numberOfNodes: number;
61
+ numberOfValidators: number;
60
62
  basePort?: number;
61
63
  metricsPort?: number;
62
64
  initialConfig?: Partial<AztecNodeConfig>;
package/dest/e2e_p2p/p2p_network.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
package/dest/e2e_p2p/p2p_network.js CHANGED
@@ -27,6 +27,7 @@ export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
27
27
  export class P2PNetworkTest {
28
28
  bootstrapNodeEnr;
29
29
  bootNodePort;
30
+ numberOfValidators;
30
31
  numberOfNodes;
31
32
  metricsPort;
32
33
  snapshotManager;
@@ -45,10 +46,11 @@ export class P2PNetworkTest {
45
46
  wallet;
46
47
  spamContract;
47
48
  bootstrapNode;
48
- constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfNodes, initialValidatorConfig, // If set enable metrics collection
49
+ constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfValidators, initialValidatorConfig, numberOfNodes = 0, // If set enable metrics collection
49
50
  metricsPort, startProverNode, mockZkPassportVerifier){
50
51
  this.bootstrapNodeEnr = bootstrapNodeEnr;
51
52
  this.bootNodePort = bootNodePort;
53
+ this.numberOfValidators = numberOfValidators;
52
54
  this.numberOfNodes = numberOfNodes;
53
55
  this.metricsPort = metricsPort;
54
56
  this.attesterPrivateKeys = [];
@@ -61,7 +63,7 @@ export class P2PNetworkTest {
61
63
  // Set up the base account and node private keys for the initial network deployment
62
64
  this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1).toString('hex')}`;
63
65
  this.baseAccount = privateKeyToAccount(this.baseAccountPrivateKey);
64
- this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
66
+ this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX + numberOfNodes, numberOfValidators);
65
67
  this.attesterPublicKeys = this.attesterPrivateKeys.map((privateKey)=>privateKeyToAccount(privateKey).address);
66
68
  this.snapshotManager = createSnapshotManager(`e2e_p2p_network/${testName}`, process.env.E2E_DATA_PATH, {
67
69
  ...initialValidatorConfig,
@@ -69,7 +71,7 @@ export class P2PNetworkTest {
69
71
  aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
70
72
  aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
71
73
  aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
72
- aztecTargetCommitteeSize: numberOfNodes,
74
+ aztecTargetCommitteeSize: numberOfValidators,
73
75
  salt: 420,
74
76
  metricsPort: metricsPort,
75
77
  numberOfInitialFundedAccounts: 2,
@@ -80,19 +82,19 @@ export class P2PNetworkTest {
80
82
  ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
81
83
  aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
82
84
  aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
83
- aztecTargetCommitteeSize: numberOfNodes,
85
+ aztecTargetCommitteeSize: numberOfValidators,
84
86
  initialValidators: [],
85
87
  zkPassportArgs: {
86
88
  mockZkPassportVerifier
87
89
  }
88
90
  });
89
91
  }
90
- static async create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier }) {
92
+ static async create({ testName, numberOfNodes, numberOfValidators, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier }) {
91
93
  const port = basePort || await getPort();
92
94
  const bootstrapNodeENR = await getBootstrapNodeEnr(BOOTSTRAP_NODE_PRIVATE_KEY, port);
93
95
  const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
94
96
  const initialValidatorConfig = await createValidatorConfig(initialConfig ?? {}, bootstrapNodeEnr);
95
- return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfNodes, initialValidatorConfig, metricsPort, startProverNode, mockZkPassportVerifier);
97
+ return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfValidators, initialValidatorConfig, numberOfNodes, metricsPort, startProverNode, mockZkPassportVerifier);
96
98
  }
97
99
  get fundedAccount() {
98
100
  if (!this.deployedAccounts[0]) {
@@ -110,8 +112,9 @@ export class P2PNetworkTest {
110
112
  }
111
113
  getValidators() {
112
114
  const validators = [];
113
- for(let i = 0; i < this.numberOfNodes; i++){
114
- const attester = privateKeyToAccount(this.attesterPrivateKeys[i]);
115
+ for(let i = 0; i < this.numberOfValidators; i++){
116
+ const keyIndex = i;
117
+ const attester = privateKeyToAccount(this.attesterPrivateKeys[keyIndex]);
115
118
  validators.push({
116
119
  attester: EthAddress.fromString(attester.address),
117
120
  withdrawer: EthAddress.fromString(attester.address)
@@ -130,7 +133,7 @@ export class P2PNetworkTest {
130
133
  abi: RollupAbi,
131
134
  client: deployL1ContractsValues.l1Client
132
135
  });
133
- this.logger.verbose(`Adding ${this.numberOfNodes} validators`);
136
+ this.logger.info(`Adding ${this.numberOfValidators} validators`);
134
137
  const stakingAsset = getContract({
135
138
  address: deployL1ContractsValues.l1ContractAddresses.stakingAssetAddress.toString(),
136
139
  abi: TestERC20Abi,
@@ -145,7 +148,7 @@ export class P2PNetworkTest {
145
148
  abi: l1Artifacts.multiAdder.contractAbi,
146
149
  client: deployL1ContractsValues.l1Client
147
150
  });
148
- const stakeNeeded = l1ContractsConfig.depositAmount * BigInt(this.numberOfNodes);
151
+ const stakeNeeded = l1ContractsConfig.depositAmount * BigInt(this.numberOfValidators);
149
152
  await Promise.all([
150
153
  await stakingAsset.write.mint([
151
154
  multiAdder.address,
@@ -198,7 +201,7 @@ export class P2PNetworkTest {
198
201
  });
199
202
  }
200
203
  async removeInitialNode() {
201
- await this.snapshotManager.snapshot('remove-inital-validator', async ({ deployL1ContractsValues, aztecNode, dateProvider })=>{
204
+ await this.snapshotManager.snapshot('remove-initial-validator', async ({ deployL1ContractsValues, aztecNode, dateProvider })=>{
202
205
  // Send and await a tx to make sure we mine a block for the warp to correctly progress.
203
206
  const { receipt } = await this._sendDummyTx(deployL1ContractsValues.l1Client);
204
207
  const block = await deployL1ContractsValues.l1Client.getBlock({
package/dest/fixtures/setup_p2p_test.d.ts CHANGED
@@ -15,7 +15,7 @@ export interface NodeContext {
15
15
  txs: SentTx[];
16
16
  }
17
17
  export declare function generatePrivateKeys(startIndex: number, numberOfKeys: number): `0x${string}`[];
18
- export declare function createNodes(config: AztecNodeConfig, dateProvider: DateProvider, bootstrapNodeEnr: string, numNodes: number, bootNodePort: number, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number): Promise<AztecNodeService[]>;
18
+ export declare function createNodes(config: AztecNodeConfig, dateProvider: DateProvider, bootstrapNodeEnr: string, numNodes: number, bootNodePort: number, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, indexOffset?: number): Promise<AztecNodeService[]>;
19
19
  export declare function createNode(config: AztecNodeConfig, dateProvider: DateProvider, tcpPort: number, bootstrapNode: string | undefined, addressIndex: number, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, loggerIdStorage?: AsyncLocalStorage<string>): Promise<AztecNodeService>;
20
20
  export declare function createProverNode(config: AztecNodeConfig, tcpPort: number, bootstrapNode: string | undefined, addressIndex: number, proverNodeDeps: ProverNodeDeps & Required<Pick<ProverNodeDeps, 'dateProvider'>>, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, loggerIdStorage?: AsyncLocalStorage<string>): Promise<import("@aztec/prover-node").ProverNode>;
21
21
  export declare function createValidatorConfig(config: AztecNodeConfig, bootstrapNodeEnr?: string, port?: number, addressIndex?: number, dataDirectory?: string): Promise<AztecNodeConfig>;
package/dest/fixtures/setup_p2p_test.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAI9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmC7B;AAGD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAQ5C;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,EAC/E,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,oDAyB5C;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAU,EACxB,aAAa,CAAC,EAAE,MAAM,4BAuBvB"}
1
+ {"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAI9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,SAAI,GACd,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoC7B;AAGD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAQ5C;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,EAC/E,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,oDAyB5C;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAU,EACxB,aAAa,CAAC,EAAE,MAAM,4BAuBvB"}
package/dest/fixtures/setup_p2p_test.js CHANGED
@@ -20,22 +20,23 @@ export function generatePrivateKeys(startIndex, numberOfKeys) {
20
20
  }
21
21
  return privateKeys;
22
22
  }
23
- export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNodes, bootNodePort, prefilledPublicData, dataDirectory, metricsPort) {
23
+ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNodes, bootNodePort, prefilledPublicData, dataDirectory, metricsPort, indexOffset = 0) {
24
24
  const nodePromises = [];
25
25
  const loggerIdStorage = new AsyncLocalStorage();
26
26
  const logNameHandler = (module)=>loggerIdStorage.getStore() ? `${module}:${loggerIdStorage.getStore()}` : module;
27
27
  addLogNameHandler(logNameHandler);
28
28
  for(let i = 0; i < numNodes; i++){
29
+ const index = indexOffset + i;
29
30
  // We run on ports from the bootnode upwards
30
- const port = bootNodePort + i + 1;
31
- const dataDir = dataDirectory ? `${dataDirectory}-${i}` : undefined;
32
- const nodePromise = createNode(config, dateProvider, port, bootstrapNodeEnr, i, prefilledPublicData, dataDir, metricsPort, loggerIdStorage);
31
+ const port = bootNodePort + 1 + index;
32
+ const dataDir = dataDirectory ? `${dataDirectory}-${index}` : undefined;
33
+ const nodePromise = createNode(config, dateProvider, port, bootstrapNodeEnr, index, prefilledPublicData, dataDir, metricsPort, loggerIdStorage);
33
34
  nodePromises.push(nodePromise);
34
35
  }
35
36
  const nodes = await Promise.all(nodePromises);
36
- // Sanity check that we have a sequencer
37
+ // Sanity check that we have a sequencer if required
37
38
  const seqClient = nodes[0].getSequencer();
38
- if (!seqClient) {
39
+ if (!seqClient && config.disableValidator === false) {
39
40
  throw new Error('Sequencer not found');
40
41
  }
41
42
  removeLogNameHandler(logNameHandler);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/end-to-end",
3
- "version": "1.0.0-nightly.20250714",
3
+ "version": "1.0.0-nightly.20250715",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "inherits": [
@@ -25,40 +25,40 @@
25
25
  "formatting": "run -T prettier --check ./src && run -T eslint ./src"
26
26
  },
27
27
  "dependencies": {
28
- "@aztec/accounts": "1.0.0-nightly.20250714",
29
- "@aztec/archiver": "1.0.0-nightly.20250714",
30
- "@aztec/aztec": "1.0.0-nightly.20250714",
31
- "@aztec/aztec-node": "1.0.0-nightly.20250714",
32
- "@aztec/aztec.js": "1.0.0-nightly.20250714",
33
- "@aztec/bb-prover": "1.0.0-nightly.20250714",
34
- "@aztec/blob-lib": "1.0.0-nightly.20250714",
35
- "@aztec/blob-sink": "1.0.0-nightly.20250714",
36
- "@aztec/bot": "1.0.0-nightly.20250714",
37
- "@aztec/cli": "1.0.0-nightly.20250714",
38
- "@aztec/constants": "1.0.0-nightly.20250714",
39
- "@aztec/entrypoints": "1.0.0-nightly.20250714",
40
- "@aztec/epoch-cache": "1.0.0-nightly.20250714",
41
- "@aztec/ethereum": "1.0.0-nightly.20250714",
42
- "@aztec/foundation": "1.0.0-nightly.20250714",
43
- "@aztec/kv-store": "1.0.0-nightly.20250714",
44
- "@aztec/l1-artifacts": "1.0.0-nightly.20250714",
45
- "@aztec/merkle-tree": "1.0.0-nightly.20250714",
46
- "@aztec/noir-contracts.js": "1.0.0-nightly.20250714",
47
- "@aztec/noir-noirc_abi": "1.0.0-nightly.20250714",
48
- "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250714",
49
- "@aztec/noir-test-contracts.js": "1.0.0-nightly.20250714",
50
- "@aztec/p2p": "1.0.0-nightly.20250714",
51
- "@aztec/protocol-contracts": "1.0.0-nightly.20250714",
52
- "@aztec/prover-client": "1.0.0-nightly.20250714",
53
- "@aztec/prover-node": "1.0.0-nightly.20250714",
54
- "@aztec/pxe": "1.0.0-nightly.20250714",
55
- "@aztec/sequencer-client": "1.0.0-nightly.20250714",
56
- "@aztec/simulator": "1.0.0-nightly.20250714",
57
- "@aztec/slasher": "1.0.0-nightly.20250714",
58
- "@aztec/stdlib": "1.0.0-nightly.20250714",
59
- "@aztec/telemetry-client": "1.0.0-nightly.20250714",
60
- "@aztec/validator-client": "1.0.0-nightly.20250714",
61
- "@aztec/world-state": "1.0.0-nightly.20250714",
28
+ "@aztec/accounts": "1.0.0-nightly.20250715",
29
+ "@aztec/archiver": "1.0.0-nightly.20250715",
30
+ "@aztec/aztec": "1.0.0-nightly.20250715",
31
+ "@aztec/aztec-node": "1.0.0-nightly.20250715",
32
+ "@aztec/aztec.js": "1.0.0-nightly.20250715",
33
+ "@aztec/bb-prover": "1.0.0-nightly.20250715",
34
+ "@aztec/blob-lib": "1.0.0-nightly.20250715",
35
+ "@aztec/blob-sink": "1.0.0-nightly.20250715",
36
+ "@aztec/bot": "1.0.0-nightly.20250715",
37
+ "@aztec/cli": "1.0.0-nightly.20250715",
38
+ "@aztec/constants": "1.0.0-nightly.20250715",
39
+ "@aztec/entrypoints": "1.0.0-nightly.20250715",
40
+ "@aztec/epoch-cache": "1.0.0-nightly.20250715",
41
+ "@aztec/ethereum": "1.0.0-nightly.20250715",
42
+ "@aztec/foundation": "1.0.0-nightly.20250715",
43
+ "@aztec/kv-store": "1.0.0-nightly.20250715",
44
+ "@aztec/l1-artifacts": "1.0.0-nightly.20250715",
45
+ "@aztec/merkle-tree": "1.0.0-nightly.20250715",
46
+ "@aztec/noir-contracts.js": "1.0.0-nightly.20250715",
47
+ "@aztec/noir-noirc_abi": "1.0.0-nightly.20250715",
48
+ "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250715",
49
+ "@aztec/noir-test-contracts.js": "1.0.0-nightly.20250715",
50
+ "@aztec/p2p": "1.0.0-nightly.20250715",
51
+ "@aztec/protocol-contracts": "1.0.0-nightly.20250715",
52
+ "@aztec/prover-client": "1.0.0-nightly.20250715",
53
+ "@aztec/prover-node": "1.0.0-nightly.20250715",
54
+ "@aztec/pxe": "1.0.0-nightly.20250715",
55
+ "@aztec/sequencer-client": "1.0.0-nightly.20250715",
56
+ "@aztec/simulator": "1.0.0-nightly.20250715",
57
+ "@aztec/slasher": "1.0.0-nightly.20250715",
58
+ "@aztec/stdlib": "1.0.0-nightly.20250715",
59
+ "@aztec/telemetry-client": "1.0.0-nightly.20250715",
60
+ "@aztec/validator-client": "1.0.0-nightly.20250715",
61
+ "@aztec/world-state": "1.0.0-nightly.20250715",
62
62
  "@iarna/toml": "^2.2.5",
63
63
  "@jest/globals": "^30.0.0",
64
64
  "@noble/curves": "^1.0.0",
package/src/e2e_epochs/epochs_test.ts CHANGED
@@ -9,7 +9,7 @@ import {
9
9
  retryUntil,
10
10
  sleep,
11
11
  } from '@aztec/aztec.js';
12
- import { type ExtendedViemWalletClient, createExtendedL1Client } from '@aztec/ethereum';
12
+ import { DefaultL1ContractsConfig, type ExtendedViemWalletClient, createExtendedL1Client } from '@aztec/ethereum';
13
13
  import { RollupContract } from '@aztec/ethereum/contracts';
14
14
  import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
15
15
  import { SecretValue } from '@aztec/foundation/config';
@@ -126,6 +126,7 @@ export class EpochsTestContext {
126
126
  // but not so much to hang the sequencer and timeout the teardown
127
127
  txPropagationMaxQueryAttempts: opts.txPropagationMaxQueryAttempts ?? 12,
128
128
  worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
129
+ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
129
130
  ...opts,
130
131
  });
131
132
 
package/src/e2e_p2p/p2p_network.ts CHANGED
@@ -77,8 +77,9 @@ export class P2PNetworkTest {
77
77
  testName: string,
78
78
  public bootstrapNodeEnr: string,
79
79
  public bootNodePort: number,
80
- private numberOfNodes: number,
80
+ public numberOfValidators: number,
81
81
  initialValidatorConfig: AztecNodeConfig,
82
+ public numberOfNodes = 0,
82
83
  // If set enable metrics collection
83
84
  private metricsPort?: number,
84
85
  startProverNode?: boolean,
@@ -89,7 +90,10 @@ export class P2PNetworkTest {
89
90
  // Set up the base account and node private keys for the initial network deployment
90
91
  this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1)!.toString('hex')}`;
91
92
  this.baseAccount = privateKeyToAccount(this.baseAccountPrivateKey);
92
- this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
93
+ this.attesterPrivateKeys = generatePrivateKeys(
94
+ ATTESTER_PRIVATE_KEYS_START_INDEX + numberOfNodes,
95
+ numberOfValidators,
96
+ );
93
97
  this.attesterPublicKeys = this.attesterPrivateKeys.map(privateKey => privateKeyToAccount(privateKey).address);
94
98
 
95
99
  this.snapshotManager = createSnapshotManager(
@@ -102,7 +106,7 @@ export class P2PNetworkTest {
102
106
  aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
103
107
  aztecProofSubmissionEpochs:
104
108
  initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
105
- aztecTargetCommitteeSize: numberOfNodes,
109
+ aztecTargetCommitteeSize: numberOfValidators,
106
110
  salt: 420,
107
111
  metricsPort: metricsPort,
108
112
  numberOfInitialFundedAccounts: 2,
@@ -115,7 +119,7 @@ export class P2PNetworkTest {
115
119
  aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
116
120
  aztecProofSubmissionEpochs:
117
121
  initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
118
- aztecTargetCommitteeSize: numberOfNodes,
122
+ aztecTargetCommitteeSize: numberOfValidators,
119
123
  initialValidators: [],
120
124
  zkPassportArgs: {
121
125
  mockZkPassportVerifier,
@@ -127,6 +131,7 @@ export class P2PNetworkTest {
127
131
  static async create({
128
132
  testName,
129
133
  numberOfNodes,
134
+ numberOfValidators,
130
135
  basePort,
131
136
  metricsPort,
132
137
  initialConfig,
@@ -135,6 +140,7 @@ export class P2PNetworkTest {
135
140
  }: {
136
141
  testName: string;
137
142
  numberOfNodes: number;
143
+ numberOfValidators: number;
138
144
  basePort?: number;
139
145
  metricsPort?: number;
140
146
  initialConfig?: Partial<AztecNodeConfig>;
@@ -155,8 +161,9 @@ export class P2PNetworkTest {
155
161
  testName,
156
162
  bootstrapNodeEnr,
157
163
  port,
158
- numberOfNodes,
164
+ numberOfValidators,
159
165
  initialValidatorConfig,
166
+ numberOfNodes,
160
167
  metricsPort,
161
168
  startProverNode,
162
169
  mockZkPassportVerifier,
@@ -187,8 +194,9 @@ export class P2PNetworkTest {
187
194
  getValidators() {
188
195
  const validators: Operator[] = [];
189
196
 
190
- for (let i = 0; i < this.numberOfNodes; i++) {
191
- const attester = privateKeyToAccount(this.attesterPrivateKeys[i]!);
197
+ for (let i = 0; i < this.numberOfValidators; i++) {
198
+ const keyIndex = i;
199
+ const attester = privateKeyToAccount(this.attesterPrivateKeys[keyIndex]!);
192
200
 
193
201
  validators.push({
194
202
  attester: EthAddress.fromString(attester.address),
@@ -211,7 +219,7 @@ export class P2PNetworkTest {
211
219
  client: deployL1ContractsValues.l1Client,
212
220
  });
213
221
 
214
- this.logger.verbose(`Adding ${this.numberOfNodes} validators`);
222
+ this.logger.info(`Adding ${this.numberOfValidators} validators`);
215
223
 
216
224
  const stakingAsset = getContract({
217
225
  address: deployL1ContractsValues.l1ContractAddresses.stakingAssetAddress.toString(),
@@ -232,7 +240,7 @@ export class P2PNetworkTest {
232
240
  client: deployL1ContractsValues.l1Client,
233
241
  });
234
242
 
235
- const stakeNeeded = l1ContractsConfig.depositAmount * BigInt(this.numberOfNodes);
243
+ const stakeNeeded = l1ContractsConfig.depositAmount * BigInt(this.numberOfValidators);
236
244
  await Promise.all(
237
245
  [await stakingAsset.write.mint([multiAdder.address, stakeNeeded], {} as any)].map(txHash =>
238
246
  deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: txHash }),
@@ -300,7 +308,7 @@ export class P2PNetworkTest {
300
308
 
301
309
  async removeInitialNode() {
302
310
  await this.snapshotManager.snapshot(
303
- 'remove-inital-validator',
311
+ 'remove-initial-validator',
304
312
  async ({ deployL1ContractsValues, aztecNode, dateProvider }) => {
305
313
  // Send and await a tx to make sure we mine a block for the warp to correctly progress.
306
314
  const { receipt } = await this._sendDummyTx(deployL1ContractsValues.l1Client);
package/src/fixtures/setup_p2p_test.ts CHANGED
@@ -46,6 +46,7 @@ export async function createNodes(
46
46
  prefilledPublicData?: PublicDataTreeLeaf[],
47
47
  dataDirectory?: string,
48
48
  metricsPort?: number,
49
+ indexOffset = 0,
49
50
  ): Promise<AztecNodeService[]> {
50
51
  const nodePromises: Promise<AztecNodeService>[] = [];
51
52
  const loggerIdStorage = new AsyncLocalStorage<string>();
@@ -54,16 +55,17 @@ export async function createNodes(
54
55
  addLogNameHandler(logNameHandler);
55
56
 
56
57
  for (let i = 0; i < numNodes; i++) {
58
+ const index = indexOffset + i;
57
59
  // We run on ports from the bootnode upwards
58
- const port = bootNodePort + i + 1;
60
+ const port = bootNodePort + 1 + index;
59
61
 
60
- const dataDir = dataDirectory ? `${dataDirectory}-${i}` : undefined;
62
+ const dataDir = dataDirectory ? `${dataDirectory}-${index}` : undefined;
61
63
  const nodePromise = createNode(
62
64
  config,
63
65
  dateProvider,
64
66
  port,
65
67
  bootstrapNodeEnr,
66
- i,
68
+ index,
67
69
  prefilledPublicData,
68
70
  dataDir,
69
71
  metricsPort,
@@ -73,9 +75,9 @@ export async function createNodes(
73
75
  }
74
76
  const nodes = await Promise.all(nodePromises);
75
77
 
76
- // Sanity check that we have a sequencer
78
+ // Sanity check that we have a sequencer if required
77
79
  const seqClient = nodes[0].getSequencer();
78
- if (!seqClient) {
80
+ if (!seqClient && config.disableValidator === false) {
79
81
  throw new Error('Sequencer not found');
80
82
  }
81
83