@aztec/end-to-end 0.0.1-commit.2ed92850 → 0.0.1-commit.3d8f95d

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 (90) hide show
  1. package/dest/bench/client_flows/config.d.ts +2 -2
  2. package/dest/bench/client_flows/config.d.ts.map +1 -1
  3. package/dest/bench/client_flows/config.js +18 -0
  4. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +1 -1
  5. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  6. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +3 -2
  7. package/dest/e2e_epochs/epochs_test.d.ts +7 -1
  8. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  9. package/dest/e2e_epochs/epochs_test.js +37 -12
  10. package/dest/e2e_l1_publisher/write_json.d.ts +3 -2
  11. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
  12. package/dest/e2e_l1_publisher/write_json.js +1 -7
  13. package/dest/e2e_p2p/reqresp/utils.d.ts +22 -0
  14. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -0
  15. package/dest/e2e_p2p/reqresp/utils.js +153 -0
  16. package/dest/e2e_p2p/shared.d.ts +1 -1
  17. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  18. package/dest/e2e_p2p/shared.js +5 -2
  19. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +2 -0
  20. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +1 -0
  21. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.js +184 -0
  22. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts +18 -0
  23. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +1 -0
  24. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.js +120 -0
  25. package/dest/fixtures/e2e_prover_test.js +1 -1
  26. package/dest/fixtures/ha_setup.d.ts +71 -0
  27. package/dest/fixtures/ha_setup.d.ts.map +1 -0
  28. package/dest/fixtures/ha_setup.js +114 -0
  29. package/dest/fixtures/index.d.ts +2 -1
  30. package/dest/fixtures/index.d.ts.map +1 -1
  31. package/dest/fixtures/index.js +1 -0
  32. package/dest/fixtures/setup.d.ts +15 -15
  33. package/dest/fixtures/setup.d.ts.map +1 -1
  34. package/dest/fixtures/setup.js +30 -90
  35. package/dest/fixtures/setup_p2p_test.d.ts +12 -8
  36. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  37. package/dest/fixtures/setup_p2p_test.js +29 -21
  38. package/dest/shared/uniswap_l1_l2.d.ts +1 -1
  39. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  40. package/dest/shared/uniswap_l1_l2.js +8 -6
  41. package/dest/spartan/tx_metrics.d.ts +35 -1
  42. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  43. package/dest/spartan/tx_metrics.js +150 -0
  44. package/dest/spartan/utils/config.d.ts +4 -1
  45. package/dest/spartan/utils/config.d.ts.map +1 -1
  46. package/dest/spartan/utils/config.js +2 -1
  47. package/dest/spartan/utils/index.d.ts +4 -4
  48. package/dest/spartan/utils/index.d.ts.map +1 -1
  49. package/dest/spartan/utils/index.js +2 -2
  50. package/dest/spartan/utils/k8s.d.ts +29 -1
  51. package/dest/spartan/utils/k8s.d.ts.map +1 -1
  52. package/dest/spartan/utils/k8s.js +118 -0
  53. package/dest/spartan/utils/nodes.d.ts +11 -1
  54. package/dest/spartan/utils/nodes.d.ts.map +1 -1
  55. package/dest/spartan/utils/nodes.js +198 -27
  56. package/dest/spartan/utils/scripts.d.ts +18 -4
  57. package/dest/spartan/utils/scripts.d.ts.map +1 -1
  58. package/dest/spartan/utils/scripts.js +19 -4
  59. package/package.json +42 -39
  60. package/src/bench/client_flows/client_flows_benchmark.ts +5 -5
  61. package/src/bench/client_flows/config.ts +9 -1
  62. package/src/bench/utils.ts +1 -1
  63. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +1 -1
  64. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +6 -7
  65. package/src/e2e_deploy_contract/deploy_test.ts +2 -2
  66. package/src/e2e_epochs/epochs_test.ts +44 -13
  67. package/src/e2e_fees/fees_test.ts +6 -6
  68. package/src/e2e_l1_publisher/write_json.ts +1 -6
  69. package/src/e2e_nested_contract/nested_contract_test.ts +1 -1
  70. package/src/e2e_p2p/inactivity_slash_test.ts +4 -4
  71. package/src/e2e_p2p/p2p_network.ts +4 -4
  72. package/src/e2e_p2p/reqresp/utils.ts +207 -0
  73. package/src/e2e_p2p/shared.ts +11 -2
  74. package/src/e2e_storage_proof/fixtures/storage_proof.json +915 -0
  75. package/src/e2e_storage_proof/fixtures/storage_proof_fetcher.ts +190 -0
  76. package/src/e2e_storage_proof/fixtures/storage_proof_fixture.ts +173 -0
  77. package/src/e2e_token_contract/token_contract_test.ts +1 -1
  78. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  79. package/src/fixtures/e2e_prover_test.ts +4 -4
  80. package/src/fixtures/ha_setup.ts +184 -0
  81. package/src/fixtures/index.ts +1 -0
  82. package/src/fixtures/setup.ts +33 -118
  83. package/src/fixtures/setup_p2p_test.ts +31 -27
  84. package/src/shared/uniswap_l1_l2.ts +8 -10
  85. package/src/spartan/tx_metrics.ts +126 -0
  86. package/src/spartan/utils/config.ts +1 -0
  87. package/src/spartan/utils/index.ts +3 -1
  88. package/src/spartan/utils/k8s.ts +152 -0
  89. package/src/spartan/utils/nodes.ts +239 -24
  90. package/src/spartan/utils/scripts.ts +43 -7
@@ -30,9 +30,9 @@ export class DeployTest {
30
30
  fundSponsoredFPC: true,
31
31
  skipAccountDeployment: true,
32
32
  });
33
- this.aztecNode = this.context.aztecNodeService!;
33
+ this.aztecNode = this.context.aztecNodeService;
34
34
  this.wallet = this.context.wallet;
35
- this.aztecNodeAdmin = this.context.aztecNodeService!;
35
+ this.aztecNodeAdmin = this.context.aztecNodeService;
36
36
  await this.applyInitialAccount();
37
37
  return this;
38
38
  }
@@ -14,13 +14,15 @@ import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
14
14
  import { BlockNumber, CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
15
15
  import { SecretValue } from '@aztec/foundation/config';
16
16
  import { randomBytes } from '@aztec/foundation/crypto/random';
17
- import { withLogNameSuffix } from '@aztec/foundation/log';
17
+ import { withLoggerBindings } from '@aztec/foundation/log/server';
18
18
  import { retryUntil } from '@aztec/foundation/retry';
19
19
  import { sleep } from '@aztec/foundation/sleep';
20
20
  import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
21
+ import { TestContract } from '@aztec/noir-test-contracts.js/Test';
21
22
  import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
22
23
  import { ProverNode, type ProverNodeConfig, ProverNodePublisher } from '@aztec/prover-node';
23
24
  import type { TestProverNode } from '@aztec/prover-node/test';
25
+ import type { PXEConfig } from '@aztec/pxe/config';
24
26
  import {
25
27
  type SequencerClient,
26
28
  type SequencerEvents,
@@ -49,7 +51,11 @@ export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
49
51
  export const ARCHIVER_POLL_INTERVAL = 50;
50
52
  export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
51
53
 
52
- export type EpochsTestOpts = Partial<SetupOptions> & { numberOfAccounts?: number };
54
+ export type EpochsTestOpts = Partial<SetupOptions> & {
55
+ numberOfAccounts?: number;
56
+ pxeOpts?: Partial<PXEConfig>;
57
+ aztecSlotDurationInL1Slots?: number;
58
+ };
53
59
 
54
60
  export type TrackedSequencerEvent = {
55
61
  [K in keyof SequencerEvents]: Parameters<SequencerEvents[K]>[0] & {
@@ -94,7 +100,7 @@ export class EpochsTestContext {
94
100
  ? parseInt(process.env.L1_BLOCK_TIME)
95
101
  : DEFAULT_L1_BLOCK_TIME;
96
102
  const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
97
- const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
103
+ const aztecSlotDuration = opts.aztecSlotDuration ?? (opts.aztecSlotDurationInL1Slots ?? 2) * ethereumSlotDuration;
98
104
  const aztecEpochDuration = opts.aztecEpochDuration ?? 6;
99
105
  const aztecProofSubmissionEpochs = opts.aztecProofSubmissionEpochs ?? 1;
100
106
  const l1PublishingTime = opts.l1PublishingTime ?? 1;
@@ -147,8 +153,9 @@ export class EpochsTestContext {
147
153
  l1PublishingTime,
148
154
  ...opts,
149
155
  },
150
- // Use checkpointed chain tip for PXE to avoid issues with blocks being dropped due to pruned anchor blocks.
151
- { syncChainTip: 'checkpointed' },
156
+ // Use checkpointed chain tip for PXE by default to avoid issues with blocks being dropped due to pruned anchor blocks.
157
+ // Can be overridden via opts.pxeOpts.
158
+ { syncChainTip: 'checkpointed', ...opts.pxeOpts },
152
159
  );
153
160
 
154
161
  this.context = context;
@@ -187,6 +194,7 @@ export class EpochsTestContext {
187
194
  l1GenesisTime: await this.rollup.getL1GenesisTime(),
188
195
  ethereumSlotDuration,
189
196
  proofSubmissionEpochs: Number(await this.rollup.getProofSubmissionEpochs()),
197
+ targetCommitteeSize: await this.rollup.getTargetCommitteeSize(),
190
198
  };
191
199
 
192
200
  this.logger.info(
@@ -204,20 +212,29 @@ export class EpochsTestContext {
204
212
  public async createProverNode(opts: { dontStart?: boolean } & Partial<ProverNodeConfig> = {}) {
205
213
  this.logger.warn('Creating and syncing a simulated prover node...');
206
214
  const proverNodePrivateKey = this.getNextPrivateKey();
207
- const suffix = (this.proverNodes.length + 1).toString();
208
- const proverNode = await withLogNameSuffix(suffix, () =>
215
+ const proverIndex = this.proverNodes.length + 1;
216
+ const { mockGossipSubNetwork } = this.context;
217
+ const proverNode = await withLoggerBindings({ actor: `prover-${proverIndex}` }, () =>
209
218
  createAndSyncProverNode(
210
219
  proverNodePrivateKey,
211
- { ...this.context.config },
220
+ {
221
+ ...this.context.config,
222
+ p2pEnabled: this.context.config.p2pEnabled || mockGossipSubNetwork !== undefined,
223
+ },
212
224
  {
213
225
  dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
214
- proverId: EthAddress.fromNumber(parseInt(suffix, 10)),
226
+ proverId: EthAddress.fromNumber(proverIndex),
215
227
  dontStart: opts.dontStart,
216
228
  ...opts,
217
229
  },
218
230
  this.context.aztecNode,
219
231
  this.context.prefilledPublicData ?? [],
220
- { dateProvider: this.context.dateProvider },
232
+ {
233
+ dateProvider: this.context.dateProvider,
234
+ p2pClientDeps: mockGossipSubNetwork
235
+ ? { p2pServiceFactory: getMockPubSubP2PServiceFactory(mockGossipSubNetwork) }
236
+ : undefined,
237
+ },
221
238
  ),
222
239
  );
223
240
  this.proverNodes.push(proverNode);
@@ -240,12 +257,13 @@ export class EpochsTestContext {
240
257
  private async createNode(
241
258
  opts: Partial<AztecNodeConfig> & { txDelayerMaxInclusionTimeIntoSlot?: number; dontStartSequencer?: boolean } = {},
242
259
  ) {
243
- const suffix = (this.nodes.length + 1).toString();
260
+ const nodeIndex = this.nodes.length + 1;
261
+ const actorPrefix = opts.disableValidator ? 'node' : 'validator';
244
262
  const { mockGossipSubNetwork } = this.context;
245
263
  const resolvedConfig = { ...this.context.config, ...opts };
246
264
  const p2pEnabled = resolvedConfig.p2pEnabled || mockGossipSubNetwork !== undefined;
247
265
  const p2pIp = resolvedConfig.p2pIp ?? (p2pEnabled ? '127.0.0.1' : undefined);
248
- const node = await withLogNameSuffix(suffix, () =>
266
+ const node = await withLoggerBindings({ actor: `${actorPrefix}-${nodeIndex}` }, () =>
249
267
  AztecNodeService.createAndSync(
250
268
  {
251
269
  ...resolvedConfig,
@@ -375,6 +393,19 @@ export class EpochsTestContext {
375
393
  return SpamContract.at(instance.address, wallet);
376
394
  }
377
395
 
396
+ /** Registers the TestContract on the given wallet. */
397
+ public async registerTestContract(wallet: Wallet, salt = Fr.ZERO) {
398
+ const instance = await getContractInstanceFromInstantiationParams(TestContract.artifact, {
399
+ constructorArgs: [],
400
+ constructorArtifact: undefined,
401
+ salt,
402
+ publicKeys: undefined,
403
+ deployer: undefined,
404
+ });
405
+ await wallet.registerContract(instance, TestContract.artifact);
406
+ return TestContract.at(instance.address, wallet);
407
+ }
408
+
378
409
  /** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */
379
410
  public async createL1Client() {
380
411
  const { client, delayer } = withDelayer(
@@ -383,7 +414,7 @@ export class EpochsTestContext {
383
414
  privateKeyToAccount(this.getNextPrivateKey()),
384
415
  this.l1Client.chain,
385
416
  ),
386
- this.context.dateProvider!,
417
+ this.context.dateProvider,
387
418
  { ethereumSlotDuration: this.L1_BLOCK_TIME_IN_S },
388
419
  );
389
420
  expect(await client.getBalance({ address: client.account.address })).toBeGreaterThan(0n);
@@ -113,7 +113,7 @@ export class FeesTest {
113
113
  });
114
114
 
115
115
  this.rollupContract = RollupContract.getFromConfig(this.context.config);
116
- this.chainMonitor = new ChainMonitor(this.rollupContract, this.context.dateProvider!, this.logger, 200).start();
116
+ this.chainMonitor = new ChainMonitor(this.rollupContract, this.context.dateProvider, this.logger, 200).start();
117
117
 
118
118
  await this.applyBaseSetup();
119
119
 
@@ -126,7 +126,7 @@ export class FeesTest {
126
126
  }
127
127
 
128
128
  setIsMarkingAsProven(b: boolean) {
129
- this.context.watcher!.setIsMarkingAsProven(b);
129
+ this.context.watcher.setIsMarkingAsProven(b);
130
130
  }
131
131
 
132
132
  async catchUpProvenChain() {
@@ -188,8 +188,8 @@ export class FeesTest {
188
188
  });
189
189
 
190
190
  this.wallet = this.context.wallet;
191
- this.aztecNode = this.context.aztecNodeService!;
192
- this.aztecNodeAdmin = this.context.aztecNodeService!;
191
+ this.aztecNode = this.context.aztecNodeService;
192
+ this.aztecNodeAdmin = this.context.aztecNodeService;
193
193
  this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentMinFees()).mul(2) });
194
194
  this.cheatCodes = this.context.cheatCodes;
195
195
  this.accounts = deployedAccounts.map(a => a.address);
@@ -221,8 +221,8 @@ export class FeesTest {
221
221
  );
222
222
 
223
223
  this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
224
- aztecNode: this.context.aztecNodeService!,
225
- aztecNodeAdmin: this.context.aztecNodeService!,
224
+ aztecNode: this.context.aztecNodeService,
225
+ aztecNodeAdmin: this.context.aztecNodeService,
226
226
  l1Client: this.context.deployL1ContractsValues.l1Client,
227
227
  wallet: this.wallet,
228
228
  logger: this.logger,
@@ -15,6 +15,7 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
15
15
  */
16
16
  export async function writeJson(
17
17
  fileName: string,
18
+ checkpointHeader: CheckpointHeader,
18
19
  block: L2Block,
19
20
  l1ToL2Content: Fr[],
20
21
  blobs: Blob[],
@@ -33,12 +34,6 @@ export async function writeJson(
33
34
  return `0x${buffer.toString('hex').padStart(size, '0')}`;
34
35
  };
35
36
 
36
- // Create a checkpoint header for this block
37
- const checkpointHeader = CheckpointHeader.random({
38
- slotNumber: block.slot,
39
- timestamp: block.timestamp,
40
- });
41
-
42
37
  const jsonObject = {
43
38
  populate: {
44
39
  l1ToL2Content: l1ToL2Content.map(value => asHex(value)),
@@ -44,7 +44,7 @@ export class NestedContractTest {
44
44
  });
45
45
  this.wallet = this.context.wallet;
46
46
  [{ address: this.defaultAccountAddress }] = deployedAccounts;
47
- this.aztecNode = this.context.aztecNodeService!;
47
+ this.aztecNode = this.context.aztecNodeService;
48
48
 
49
49
  this.logger.info('Public deploy accounts');
50
50
  await publicDeployAccounts(this.wallet, [this.defaultAccountAddress]);
@@ -98,13 +98,13 @@ export class P2PInactivityTest {
98
98
  this.rollup = rollup;
99
99
 
100
100
  if (!this.keepInitialNode) {
101
- await this.test.ctx.aztecNodeService!.stop();
101
+ await this.test.ctx.aztecNodeService.stop();
102
102
  }
103
103
 
104
104
  // Create all active nodes
105
105
  this.activeNodes = await createNodes(
106
106
  this.test.ctx.aztecNodeConfig,
107
- this.test.ctx.dateProvider!,
107
+ this.test.ctx.dateProvider,
108
108
  this.test.bootstrapNodeEnr,
109
109
  NUM_NODES - this.inactiveNodeCount - Number(this.keepInitialNode),
110
110
  BOOT_NODE_UDP_PORT,
@@ -118,7 +118,7 @@ export class P2PInactivityTest {
118
118
  const inactiveConfig = { ...this.test.ctx.aztecNodeConfig, dontStartSequencer: true };
119
119
  this.inactiveNodes = await createNodes(
120
120
  inactiveConfig,
121
- this.test.ctx.dateProvider!,
121
+ this.test.ctx.dateProvider,
122
122
  this.test.bootstrapNodeEnr,
123
123
  this.inactiveNodeCount,
124
124
  BOOT_NODE_UDP_PORT,
@@ -129,7 +129,7 @@ export class P2PInactivityTest {
129
129
  );
130
130
 
131
131
  this.nodes = [
132
- ...(this.keepInitialNode ? [this.test.ctx.aztecNodeService!] : []),
132
+ ...(this.keepInitialNode ? [this.test.ctx.aztecNodeService] : []),
133
133
  ...this.activeNodes,
134
134
  ...this.inactiveNodes,
135
135
  ];
@@ -333,9 +333,9 @@ export class P2PNetworkTest {
333
333
  const block = await this.context.deployL1ContractsValues.l1Client.getBlock({
334
334
  blockNumber: receipt.blockNumber,
335
335
  });
336
- this.context.dateProvider!.setTime(Number(block.timestamp) * 1000);
336
+ this.context.dateProvider.setTime(Number(block.timestamp) * 1000);
337
337
 
338
- await this.context.aztecNodeService!.stop();
338
+ await this.context.aztecNodeService.stop();
339
339
  }
340
340
 
341
341
  async sendDummyTx() {
@@ -374,8 +374,8 @@ export class P2PNetworkTest {
374
374
  this.prefilledPublicData = prefilledPublicData;
375
375
 
376
376
  const rollupContract = RollupContract.getFromL1ContractsValues(this.context.deployL1ContractsValues);
377
- this.monitor = new ChainMonitor(rollupContract, this.context.dateProvider!).start();
378
- this.monitor.on('l1-block', ({ timestamp }) => this.context.dateProvider!.setTime(Number(timestamp) * 1000));
377
+ this.monitor = new ChainMonitor(rollupContract, this.context.dateProvider).start();
378
+ this.monitor.on('l1-block', ({ timestamp }) => this.context.dateProvider.setTime(Number(timestamp) * 1000));
379
379
  }
380
380
 
381
381
  async stopNodes(nodes: AztecNodeService[]) {
@@ -0,0 +1,207 @@
1
+ import type { AztecNodeService } from '@aztec/aztec-node';
2
+ import { createLogger } from '@aztec/aztec.js/log';
3
+ import { waitForTx } from '@aztec/aztec.js/node';
4
+ import { Tx } from '@aztec/aztec.js/tx';
5
+ import { RollupContract } from '@aztec/ethereum/contracts';
6
+ import { SlotNumber } from '@aztec/foundation/branded-types';
7
+ import { timesAsync } from '@aztec/foundation/collection';
8
+ import { retryUntil } from '@aztec/foundation/retry';
9
+
10
+ import { jest } from '@jest/globals';
11
+ import fs from 'fs';
12
+ import os from 'os';
13
+ import path from 'path';
14
+
15
+ import { shouldCollectMetrics } from '../../fixtures/fixtures.js';
16
+ import { createNodes } from '../../fixtures/setup_p2p_test.js';
17
+ import { P2PNetworkTest, SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES, WAIT_FOR_TX_TIMEOUT } from '../p2p_network.js';
18
+ import { prepareTransactions } from '../shared.js';
19
+
20
+ // Don't set this to a higher value than 9 because each node will use a different L1 publisher account and anvil seeds
21
+ export const NUM_VALIDATORS = 6;
22
+ export const NUM_TXS_PER_NODE = 2;
23
+ export const BOOT_NODE_UDP_PORT = 4500;
24
+
25
+ export const createReqrespDataDir = () => fs.mkdtempSync(path.join(os.tmpdir(), 'reqresp-'));
26
+
27
+ type ReqrespOptions = {
28
+ disableStatusHandshake?: boolean;
29
+ };
30
+
31
+ export async function createReqrespTest(options: ReqrespOptions = {}): Promise<P2PNetworkTest> {
32
+ const { disableStatusHandshake = false } = options;
33
+ const t = await P2PNetworkTest.create({
34
+ testName: 'e2e_p2p_reqresp_tx',
35
+ numberOfNodes: 0,
36
+ numberOfValidators: NUM_VALIDATORS,
37
+ basePort: BOOT_NODE_UDP_PORT,
38
+ // To collect metrics - run in aztec-packages `docker compose --profile metrics up`
39
+ metricsPort: shouldCollectMetrics(),
40
+ initialConfig: {
41
+ ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
42
+ aztecSlotDuration: 24,
43
+ ...(disableStatusHandshake ? { p2pDisableStatusHandshake: true } : {}),
44
+ listenAddress: '127.0.0.1',
45
+ aztecEpochDuration: 64, // stable committee
46
+ },
47
+ });
48
+ await t.setup();
49
+ await t.applyBaseSetup();
50
+ return t;
51
+ }
52
+
53
+ export async function cleanupReqrespTest(params: { t: P2PNetworkTest; nodes?: AztecNodeService[]; dataDir: string }) {
54
+ const { t, nodes, dataDir } = params;
55
+ if (nodes) {
56
+ await t.stopNodes(nodes);
57
+ }
58
+ await t.teardown();
59
+ for (let i = 0; i < NUM_VALIDATORS; i++) {
60
+ fs.rmSync(`${dataDir}-${i}`, { recursive: true, force: true, maxRetries: 3 });
61
+ }
62
+ }
63
+
64
+ const getNodePort = (nodeIndex: number) => BOOT_NODE_UDP_PORT + 1 + nodeIndex;
65
+
66
+ export async function runReqrespTxTest(params: {
67
+ t: P2PNetworkTest;
68
+ dataDir: string;
69
+ disableStatusHandshake?: boolean;
70
+ }): Promise<AztecNodeService[]> {
71
+ const { t, dataDir, disableStatusHandshake = false } = params;
72
+
73
+ if (!t.bootstrapNodeEnr) {
74
+ throw new Error('Bootstrap node ENR is not available');
75
+ }
76
+
77
+ t.logger.info('Creating nodes');
78
+ const aztecNodeConfig = disableStatusHandshake
79
+ ? { ...t.ctx.aztecNodeConfig, p2pDisableStatusHandshake: true }
80
+ : t.ctx.aztecNodeConfig;
81
+
82
+ const nodes = await createNodes(
83
+ aztecNodeConfig,
84
+ t.ctx.dateProvider,
85
+ t.bootstrapNodeEnr,
86
+ NUM_VALIDATORS,
87
+ BOOT_NODE_UDP_PORT,
88
+ t.prefilledPublicData,
89
+ dataDir,
90
+ shouldCollectMetrics(),
91
+ );
92
+
93
+ t.logger.info('Waiting for nodes to connect');
94
+ await t.waitForP2PMeshConnectivity(nodes, NUM_VALIDATORS);
95
+
96
+ await t.setupAccount();
97
+
98
+ const targetBlockNumber = await t.ctx.aztecNodeService.getBlockNumber();
99
+ await retryUntil(
100
+ async () => {
101
+ const blockNumbers = await Promise.all(nodes.map(node => node.getBlockNumber()));
102
+ return blockNumbers.every(blockNumber => blockNumber >= targetBlockNumber) ? true : undefined;
103
+ },
104
+ `validators to sync to L2 block ${targetBlockNumber}`,
105
+ 60,
106
+ 0.5,
107
+ );
108
+
109
+ t.logger.info('Preparing transactions to send');
110
+ const txBatches = await timesAsync(2, () =>
111
+ prepareTransactions(t.logger, t.ctx.aztecNodeService, NUM_TXS_PER_NODE, t.fundedAccount),
112
+ );
113
+
114
+ t.logger.info('Removing initial node');
115
+ await t.removeInitialNode();
116
+
117
+ t.logger.info('Starting fresh slot');
118
+ const [timestamp] = await t.ctx.cheatCodes.rollup.advanceToNextSlot();
119
+ t.ctx.dateProvider.setTime(Number(timestamp) * 1000);
120
+ const startSlotTimestamp = BigInt(timestamp);
121
+
122
+ const { proposerIndexes, nodesToTurnOffTxGossip } = await getProposerIndexes(t, startSlotTimestamp);
123
+ t.logger.info(`Turning off tx gossip for nodes: ${nodesToTurnOffTxGossip.map(getNodePort)}`);
124
+ t.logger.info(`Sending txs to proposer nodes: ${proposerIndexes.map(getNodePort)}`);
125
+
126
+ // Replace the p2p node implementation of some of the nodes with a spy such that it does not store transactions that are gossiped to it
127
+ // Original implementation of `handleGossipedTx` will store received transactions in the tx pool.
128
+ // We chose the first 2 nodes that will be the proposers for the next few slots
129
+ for (const nodeIndex of nodesToTurnOffTxGossip) {
130
+ const logger = createLogger(`p2p:${getNodePort(nodeIndex)}`);
131
+ jest.spyOn((nodes[nodeIndex] as any).p2pClient.p2pService, 'handleGossipedTx').mockImplementation(((
132
+ payloadData: Buffer,
133
+ ) => {
134
+ const txHash = Tx.fromBuffer(payloadData).getTxHash();
135
+ logger.info(`Skipping storage of gossiped transaction ${txHash.toString()}`);
136
+ return Promise.resolve();
137
+ }) as any);
138
+ }
139
+
140
+ // We send the tx to the proposer nodes directly, ignoring the pxe and node in each context
141
+ // We cannot just call tx.send since they were created using a pxe wired to the first node which is now stopped
142
+ t.logger.info('Sending transactions through proposer nodes');
143
+ const submittedTxs = await Promise.all(
144
+ txBatches.map(async (batch, batchIndex) => {
145
+ const proposerNode = nodes[proposerIndexes[batchIndex]];
146
+ await Promise.all(
147
+ batch.map(async tx => {
148
+ try {
149
+ await proposerNode.sendTx(tx);
150
+ } catch (err) {
151
+ t.logger.error(`Error sending tx: ${err}`);
152
+ throw err;
153
+ }
154
+ }),
155
+ );
156
+ return batch.map(tx => ({ node: proposerNode, txHash: tx.getTxHash() }));
157
+ }),
158
+ );
159
+
160
+ t.logger.info('Waiting for all transactions to be mined');
161
+ await Promise.all(
162
+ submittedTxs.flatMap((batch, batchIndex) =>
163
+ batch.map(async (submittedTx, txIndex) => {
164
+ t.logger.info(`Waiting for tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} to be mined`);
165
+ await waitForTx(submittedTx.node, submittedTx.txHash, { timeout: WAIT_FOR_TX_TIMEOUT * 1.5 });
166
+ t.logger.info(`Tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} has been mined`);
167
+ }),
168
+ ),
169
+ );
170
+
171
+ t.logger.info('All transactions mined');
172
+
173
+ return nodes;
174
+ }
175
+
176
+ async function getProposerIndexes(t: P2PNetworkTest, startSlotTimestamp: bigint) {
177
+ // Get the nodes for the next set of slots
178
+ const rollupContract = new RollupContract(
179
+ t.ctx.deployL1ContractsValues.l1Client,
180
+ t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
181
+ );
182
+
183
+ const attesters = await rollupContract.getAttesters();
184
+ const startSlot = await rollupContract.getSlotAt(startSlotTimestamp);
185
+
186
+ const proposers = await Promise.all(
187
+ Array.from({ length: 3 }, async (_, i) => {
188
+ const slot = SlotNumber(startSlot + i);
189
+ const slotTimestamp = await rollupContract.getTimestampForSlot(slot);
190
+ return await rollupContract.getProposerAt(slotTimestamp);
191
+ }),
192
+ );
193
+ // Get the indexes of the nodes that are responsible for the next two slots
194
+ const proposerIndexes = proposers.map(proposer => attesters.findIndex(a => a.equals(proposer)));
195
+
196
+ if (proposerIndexes.some(i => i === -1)) {
197
+ throw new Error(
198
+ `Proposer index not found for proposer ` +
199
+ `(proposers=${proposers.map(p => p.toString()).join(',')}, indices=${proposerIndexes.join(',')})`,
200
+ );
201
+ }
202
+
203
+ const nodesToTurnOffTxGossip = Array.from({ length: NUM_VALIDATORS }, (_, i) => i).filter(
204
+ i => !proposerIndexes.includes(i),
205
+ );
206
+ return { proposerIndexes, nodesToTurnOffTxGossip };
207
+ }
@@ -56,7 +56,11 @@ export const submitTransactions = async (
56
56
  ): Promise<TxHash[]> => {
57
57
  const rpcConfig = getRpcConfig();
58
58
  rpcConfig.proverEnabled = false;
59
- const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
59
+ const wallet = await TestWallet.create(
60
+ node,
61
+ { ...getPXEConfig(), proverEnabled: false },
62
+ { loggerActorLabel: 'pxe-tx' },
63
+ );
60
64
  const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
61
65
  return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
62
66
  };
@@ -70,7 +74,11 @@ export async function prepareTransactions(
70
74
  const rpcConfig = getRpcConfig();
71
75
  rpcConfig.proverEnabled = false;
72
76
 
73
- const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
77
+ const wallet = await TestWallet.create(
78
+ node,
79
+ { ...getPXEConfig(), proverEnabled: false },
80
+ { loggerActorLabel: 'pxe-tx' },
81
+ );
74
82
  const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
75
83
 
76
84
  const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
@@ -137,6 +145,7 @@ export async function awaitCommitteeExists({
137
145
  'non-empty committee',
138
146
  60,
139
147
  );
148
+ logger.warn(`Committee has been formed`, { committee: committee!.map(c => c.toString()) });
140
149
  return committee!.map(c => c.toString() as `0x${string}`);
141
150
  }
142
151