@aztec/end-to-end 0.0.1-commit.7cf39cb55 → 0.0.1-commit.808bf7f90

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 (93) hide show
  1. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +2 -2
  2. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  3. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +3 -3
  4. package/dest/e2e_epochs/epochs_test.d.ts +9 -7
  5. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  6. package/dest/e2e_epochs/epochs_test.js +53 -34
  7. package/dest/e2e_p2p/p2p_network.d.ts +1 -1
  8. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  9. package/dest/e2e_p2p/p2p_network.js +16 -2
  10. package/dest/e2e_p2p/reqresp/utils.d.ts +3 -3
  11. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -1
  12. package/dest/e2e_p2p/reqresp/utils.js +32 -8
  13. package/dest/e2e_token_contract/token_contract_test.d.ts +2 -2
  14. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  15. package/dest/e2e_token_contract/token_contract_test.js +3 -3
  16. package/dest/fixtures/authwit_proxy.d.ts +15 -0
  17. package/dest/fixtures/authwit_proxy.d.ts.map +1 -0
  18. package/dest/fixtures/authwit_proxy.js +30 -0
  19. package/dest/fixtures/e2e_prover_test.d.ts +3 -3
  20. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  21. package/dest/fixtures/e2e_prover_test.js +27 -34
  22. package/dest/fixtures/fixtures.d.ts +5 -1
  23. package/dest/fixtures/fixtures.d.ts.map +1 -1
  24. package/dest/fixtures/fixtures.js +6 -0
  25. package/dest/fixtures/setup.d.ts +25 -8
  26. package/dest/fixtures/setup.d.ts.map +1 -1
  27. package/dest/fixtures/setup.js +46 -77
  28. package/dest/fixtures/setup_p2p_test.d.ts +6 -3
  29. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  30. package/dest/fixtures/setup_p2p_test.js +12 -9
  31. package/dest/fixtures/token_utils.d.ts +2 -2
  32. package/dest/fixtures/token_utils.d.ts.map +1 -1
  33. package/dest/fixtures/token_utils.js +3 -2
  34. package/dest/shared/index.d.ts +2 -1
  35. package/dest/shared/index.d.ts.map +1 -1
  36. package/dest/shared/index.js +1 -0
  37. package/dest/shared/mock_state_view.d.ts +86 -0
  38. package/dest/shared/mock_state_view.d.ts.map +1 -0
  39. package/dest/shared/mock_state_view.js +186 -0
  40. package/dest/shared/submit-transactions.d.ts +1 -1
  41. package/dest/shared/submit-transactions.d.ts.map +1 -1
  42. package/dest/spartan/setup_test_wallets.d.ts +8 -1
  43. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  44. package/dest/spartan/setup_test_wallets.js +28 -0
  45. package/dest/spartan/utils/bot.d.ts +3 -2
  46. package/dest/spartan/utils/bot.d.ts.map +1 -1
  47. package/dest/spartan/utils/bot.js +2 -1
  48. package/dest/spartan/utils/index.d.ts +2 -2
  49. package/dest/spartan/utils/index.d.ts.map +1 -1
  50. package/dest/spartan/utils/index.js +1 -1
  51. package/dest/spartan/utils/k8s.d.ts +3 -1
  52. package/dest/spartan/utils/k8s.d.ts.map +1 -1
  53. package/dest/spartan/utils/k8s.js +6 -0
  54. package/dest/spartan/utils/nodes.d.ts +4 -5
  55. package/dest/spartan/utils/nodes.d.ts.map +1 -1
  56. package/dest/spartan/utils/nodes.js +8 -8
  57. package/dest/test-wallet/test_wallet.d.ts +4 -3
  58. package/dest/test-wallet/test_wallet.d.ts.map +1 -1
  59. package/dest/test-wallet/test_wallet.js +3 -3
  60. package/dest/test-wallet/wallet_worker_script.d.ts +2 -0
  61. package/dest/test-wallet/wallet_worker_script.d.ts.map +1 -0
  62. package/dest/test-wallet/wallet_worker_script.js +48 -0
  63. package/dest/test-wallet/worker_wallet.d.ts +52 -0
  64. package/dest/test-wallet/worker_wallet.d.ts.map +1 -0
  65. package/dest/test-wallet/worker_wallet.js +151 -0
  66. package/dest/test-wallet/worker_wallet_schema.d.ts +274 -0
  67. package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -0
  68. package/dest/test-wallet/worker_wallet_schema.js +10 -0
  69. package/package.json +40 -40
  70. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +3 -3
  71. package/src/e2e_epochs/epochs_test.ts +66 -66
  72. package/src/e2e_p2p/p2p_network.ts +24 -2
  73. package/src/e2e_p2p/reqresp/utils.ts +36 -8
  74. package/src/e2e_token_contract/token_contract_test.ts +3 -3
  75. package/src/fixtures/authwit_proxy.ts +50 -0
  76. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  77. package/src/fixtures/e2e_prover_test.ts +25 -35
  78. package/src/fixtures/fixtures.ts +10 -0
  79. package/src/fixtures/setup.ts +62 -105
  80. package/src/fixtures/setup_p2p_test.ts +9 -17
  81. package/src/fixtures/token_utils.ts +2 -1
  82. package/src/shared/index.ts +1 -0
  83. package/src/shared/mock_state_view.ts +188 -0
  84. package/src/shared/submit-transactions.ts +4 -1
  85. package/src/spartan/setup_test_wallets.ts +55 -3
  86. package/src/spartan/utils/bot.ts +3 -0
  87. package/src/spartan/utils/index.ts +1 -0
  88. package/src/spartan/utils/k8s.ts +8 -0
  89. package/src/spartan/utils/nodes.ts +14 -9
  90. package/src/test-wallet/test_wallet.ts +5 -4
  91. package/src/test-wallet/wallet_worker_script.ts +60 -0
  92. package/src/test-wallet/worker_wallet.ts +213 -0
  93. package/src/test-wallet/worker_wallet_schema.ts +13 -0
@@ -1,6 +1,5 @@
1
1
  import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
2
2
  import { type InitialAccountData, generateSchnorrAccounts } from '@aztec/accounts/testing';
3
- import { type Archiver, createArchiver } from '@aztec/archiver';
4
3
  import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
5
4
  import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
6
5
  import {
@@ -16,7 +15,6 @@ import { type Logger, createLogger } from '@aztec/aztec.js/log';
16
15
  import type { AztecNode } from '@aztec/aztec.js/node';
17
16
  import type { Wallet } from '@aztec/aztec.js/wallet';
18
17
  import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
19
- import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
20
18
  import { SPONSORED_FPC_SALT } from '@aztec/constants';
21
19
  import { isAnvilTestChain } from '@aztec/ethereum/chain';
22
20
  import { createExtendedL1Client } from '@aztec/ethereum/client';
@@ -30,13 +28,8 @@ import {
30
28
  type ZKPassportArgs,
31
29
  deployAztecL1Contracts,
32
30
  } from '@aztec/ethereum/deploy-aztec-l1-contracts';
33
- import {
34
- DelayedTxUtils,
35
- EthCheatCodes,
36
- EthCheatCodesWithState,
37
- createDelayedL1TxUtilsFromViemWallet,
38
- startAnvil,
39
- } from '@aztec/ethereum/test';
31
+ import type { Delayer } from '@aztec/ethereum/l1-tx-utils';
32
+ import { EthCheatCodes, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
40
33
  import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
41
34
  import { SecretValue } from '@aztec/foundation/config';
42
35
  import { randomBytes } from '@aztec/foundation/crypto/random';
@@ -45,16 +38,14 @@ import { withLoggerBindings } from '@aztec/foundation/log/server';
45
38
  import { retryUntil } from '@aztec/foundation/retry';
46
39
  import { sleep } from '@aztec/foundation/sleep';
47
40
  import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
48
- import type { DataStoreConfig } from '@aztec/kv-store/config';
49
41
  import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
50
42
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
51
43
  import type { P2PClientDeps } from '@aztec/p2p';
52
44
  import { MockGossipSubNetwork, getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
53
45
  import { protocolContractsHash } from '@aztec/protocol-contracts';
54
- import { type ProverNode, type ProverNodeConfig, type ProverNodeDeps, createProverNode } from '@aztec/prover-node';
46
+ import type { ProverNodeConfig } from '@aztec/prover-node';
55
47
  import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
56
48
  import type { SequencerClient } from '@aztec/sequencer-client';
57
- import type { TestSequencerClient } from '@aztec/sequencer-client/test';
58
49
  import { type ContractInstanceWithAddress, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
59
50
  import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
60
51
  import { tryStop } from '@aztec/stdlib/interfaces/server';
@@ -219,8 +210,8 @@ export type EndToEndContext = {
219
210
  aztecNodeService: AztecNodeService;
220
211
  /** Client to the Aztec Node admin interface. */
221
212
  aztecNodeAdmin: AztecNodeAdmin;
222
- /** The prover node service (only set if startProverNode is true) */
223
- proverNode: ProverNode | undefined;
213
+ /** The aztec node running the prover node subsystem (only set if startProverNode is true). */
214
+ proverNode: AztecNodeService | undefined;
224
215
  /** A client to the sequencer service. */
225
216
  sequencer: SequencerClient | undefined;
226
217
  /** Return values from deployAztecL1Contracts function. */
@@ -249,6 +240,10 @@ export type EndToEndContext = {
249
240
  telemetryClient: TelemetryClient;
250
241
  /** Mock gossip sub network used for gossipping messages (only if mockGossipSubNetwork was set to true in opts) */
251
242
  mockGossipSubNetwork: MockGossipSubNetwork | undefined;
243
+ /** Delayer for sequencer L1 txs (only when enableDelayer is true). */
244
+ sequencerDelayer: Delayer | undefined;
245
+ /** Delayer for prover node L1 txs (only when enableDelayer and startProverNode are true). */
246
+ proverDelayer: Delayer | undefined;
252
247
  /** Prefilled public data used for setting up nodes. */
253
248
  prefilledPublicData: PublicDataTreeLeaf[] | undefined;
254
249
  /** ACVM config (only set if running locally). */
@@ -288,6 +283,8 @@ export async function setup(
288
283
  config.realProofs = !!opts.realProofs;
289
284
  // Only enforce the time table if requested
290
285
  config.enforceTimeTable = !!opts.enforceTimeTable;
286
+ // Enable the tx delayer for tests (default config has it disabled, so we force-enable it here)
287
+ config.enableDelayer = true;
291
288
  config.listenAddress = '127.0.0.1';
292
289
 
293
290
  config.minTxPoolAgeMs = opts.minTxPoolAgeMs ?? 0;
@@ -339,11 +336,11 @@ export async function setup(
339
336
  publisherPrivKeyHex = opts.l1PublisherKey.getValue();
340
337
  publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
341
338
  } else if (
342
- config.publisherPrivateKeys &&
343
- config.publisherPrivateKeys.length > 0 &&
344
- config.publisherPrivateKeys[0].getValue() != NULL_KEY
339
+ config.sequencerPublisherPrivateKeys &&
340
+ config.sequencerPublisherPrivateKeys.length > 0 &&
341
+ config.sequencerPublisherPrivateKeys[0].getValue() != NULL_KEY
345
342
  ) {
346
- publisherPrivKeyHex = config.publisherPrivateKeys[0].getValue();
343
+ publisherPrivKeyHex = config.sequencerPublisherPrivateKeys[0].getValue();
347
344
  publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
348
345
  } else if (!MNEMONIC) {
349
346
  throw new Error(`Mnemonic not provided and no publisher private key`);
@@ -352,7 +349,7 @@ export async function setup(
352
349
  const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
353
350
  const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
354
351
  publisherPrivKeyHex = `0x${publisherPrivKey!.toString('hex')}` as const;
355
- config.publisherPrivateKeys = [new SecretValue(publisherPrivKeyHex)];
352
+ config.sequencerPublisherPrivateKeys = [new SecretValue(publisherPrivKeyHex)];
356
353
  }
357
354
 
358
355
  if (config.coinbase === undefined) {
@@ -499,36 +496,33 @@ export async function setup(
499
496
  );
500
497
  const sequencerClient = aztecNodeService.getSequencer();
501
498
 
502
- if (sequencerClient) {
503
- const publisher = (sequencerClient as TestSequencerClient).sequencer.publisher;
504
- publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration, l1Client);
505
- }
506
-
507
- let proverNode: ProverNode | undefined = undefined;
499
+ let proverNode: AztecNodeService | undefined = undefined;
508
500
  if (opts.startProverNode) {
509
501
  logger.verbose('Creating and syncing a simulated prover node...');
510
502
  const proverNodePrivateKey = getPrivateKeyFromIndex(2);
511
503
  const proverNodePrivateKeyHex: Hex = `0x${proverNodePrivateKey!.toString('hex')}`;
512
504
  const proverNodeDataDirectory = path.join(directoryToCleanup, randomBytes(8).toString('hex'));
513
- const proverNodeConfig = {
514
- ...config.proverNodeConfig,
515
- dataDirectory: proverNodeDataDirectory,
516
- p2pEnabled: !!mockGossipSubNetwork,
505
+
506
+ const p2pClientDeps: Partial<P2PClientDeps<P2PClientType.Full>> = {
507
+ p2pServiceFactory: mockGossipSubNetwork && getMockPubSubP2PServiceFactory(mockGossipSubNetwork!),
508
+ rpcTxProviders: [aztecNodeService],
517
509
  };
518
- proverNode = await createAndSyncProverNode(
510
+
511
+ ({ proverNode } = await createAndSyncProverNode(
519
512
  proverNodePrivateKeyHex,
520
513
  config,
521
- proverNodeConfig,
522
- aztecNodeService,
523
- prefilledPublicData,
524
514
  {
525
- p2pClientDeps: mockGossipSubNetwork
526
- ? { p2pServiceFactory: getMockPubSubP2PServiceFactory(mockGossipSubNetwork) }
527
- : undefined,
515
+ ...config.proverNodeConfig,
516
+ dataDirectory: proverNodeDataDirectory,
528
517
  },
529
- );
518
+ { dateProvider, p2pClientDeps, telemetry: telemetryClient },
519
+ { prefilledPublicData },
520
+ ));
530
521
  }
531
522
 
523
+ const sequencerDelayer = sequencerClient?.getDelayer();
524
+ const proverDelayer = proverNode?.getProverNode()?.getDelayer();
525
+
532
526
  logger.verbose('Creating a pxe...');
533
527
  const pxeConfig = { ...getPXEConfig(), ...pxeOpts };
534
528
  pxeConfig.dataDirectory = path.join(directoryToCleanup, randomBytes(8).toString('hex'));
@@ -629,6 +623,8 @@ export async function setup(
629
623
  mockGossipSubNetwork,
630
624
  prefilledPublicData,
631
625
  proverNode,
626
+ sequencerDelayer,
627
+ proverDelayer,
632
628
  sequencer: sequencerClient,
633
629
  teardown,
634
630
  telemetryClient,
@@ -712,81 +708,42 @@ export async function waitForProvenChain(node: AztecNode, targetBlock?: BlockNum
712
708
  );
713
709
  }
714
710
 
711
+ /**
712
+ * Creates an AztecNodeService with the prover node enabled as a subsystem.
713
+ * Returns both the aztec node service (for lifecycle management) and the prover node (for test internals access).
714
+ */
715
715
  export function createAndSyncProverNode(
716
716
  proverNodePrivateKey: `0x${string}`,
717
- aztecNodeConfig: AztecNodeConfig,
718
- proverNodeConfig: Partial<ProverNodeConfig> & Pick<DataStoreConfig, 'dataDirectory'> & { dontStart?: boolean },
719
- aztecNode: AztecNode | undefined,
720
- prefilledPublicData: PublicDataTreeLeaf[] = [],
721
- proverNodeDeps: ProverNodeDeps = {},
722
- ) {
717
+ baseConfig: AztecNodeConfig,
718
+ configOverrides: Pick<AztecNodeConfig, 'dataDirectory'>,
719
+ deps: {
720
+ telemetry?: TelemetryClient;
721
+ dateProvider: DateProvider;
722
+ p2pClientDeps?: P2PClientDeps<P2PClientType.Full>;
723
+ },
724
+ options: { prefilledPublicData: PublicDataTreeLeaf[]; dontStart?: boolean },
725
+ ): Promise<{ proverNode: AztecNodeService }> {
723
726
  return withLoggerBindings({ actor: 'prover-0' }, async () => {
724
- const aztecNodeTxProvider = aztecNode && {
725
- getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
726
- getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
727
- stop: () => Promise.resolve(),
728
- };
729
-
730
- const blobClient = await createBlobClientWithFileStores(aztecNodeConfig, createLogger('blob-client:prover-node'));
731
-
732
- const archiverConfig = { ...aztecNodeConfig, dataDirectory: proverNodeConfig.dataDirectory };
733
- const archiver = await createArchiver(
734
- archiverConfig,
735
- { blobClient, dateProvider: proverNodeDeps.dateProvider },
736
- { blockUntilSync: true },
737
- );
738
-
739
- const proverConfig: ProverNodeConfig = {
740
- ...aztecNodeConfig,
741
- txCollectionNodeRpcUrls: [],
742
- realProofs: false,
743
- proverAgentCount: 2,
744
- publisherPrivateKeys: [new SecretValue(proverNodePrivateKey)],
745
- proverNodeMaxPendingJobs: 10,
746
- proverNodeMaxParallelBlocksPerEpoch: 32,
747
- proverNodePollingIntervalMs: 200,
748
- txGatheringIntervalMs: 1000,
749
- txGatheringBatchSize: 10,
750
- txGatheringMaxParallelRequestsPerNode: 10,
751
- txGatheringTimeoutMs: 24_000,
752
- proverNodeFailedEpochStore: undefined,
753
- proverId: EthAddress.fromNumber(1),
754
- proverNodeEpochProvingDelayMs: undefined,
755
- ...proverNodeConfig,
756
- };
757
-
758
- const l1TxUtils = createDelayedL1TxUtils(
759
- aztecNodeConfig,
760
- proverNodePrivateKey,
761
- 'prover-node',
762
- proverNodeDeps.dateProvider,
727
+ const proverNode = await AztecNodeService.createAndSync(
728
+ {
729
+ ...baseConfig,
730
+ ...configOverrides,
731
+ p2pPort: 0,
732
+ enableProverNode: true,
733
+ disableValidator: true,
734
+ proverPublisherPrivateKeys: [new SecretValue(proverNodePrivateKey)],
735
+ },
736
+ deps,
737
+ { ...options, dontStartProverNode: options.dontStart },
763
738
  );
764
739
 
765
- const proverNode = await createProverNode(
766
- proverConfig,
767
- { ...proverNodeDeps, aztecNodeTxProvider, archiver: archiver as Archiver, l1TxUtils },
768
- { prefilledPublicData },
769
- );
770
- getLogger().info(`Created and synced prover node`, { publisherAddress: l1TxUtils.client.account!.address });
771
- if (!proverNodeConfig.dontStart) {
772
- await proverNode.start();
740
+ if (!proverNode.getProverNode()) {
741
+ throw new Error('Prover node subsystem was not created despite enableProverNode being set');
773
742
  }
774
- return proverNode;
775
- });
776
- }
777
743
 
778
- function createDelayedL1TxUtils(
779
- aztecNodeConfig: AztecNodeConfig,
780
- privateKey: `0x${string}`,
781
- logName: string,
782
- dateProvider?: DateProvider,
783
- ) {
784
- const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
785
-
786
- const log = createLogger(logName);
787
- const l1TxUtils = createDelayedL1TxUtilsFromViemWallet(l1Client, log, dateProvider, aztecNodeConfig);
788
- l1TxUtils.enableDelayer(aztecNodeConfig.ethereumSlotDuration);
789
- return l1TxUtils;
744
+ getLogger().info(`Created and synced prover node`);
745
+ return { proverNode };
746
+ });
790
747
  }
791
748
 
792
749
  export type BalancesFn = ReturnType<typeof getBalancesFn>;
@@ -7,7 +7,6 @@ import { SecretValue } from '@aztec/foundation/config';
7
7
  import { withLoggerBindings } from '@aztec/foundation/log/server';
8
8
  import { bufferToHex } from '@aztec/foundation/string';
9
9
  import type { DateProvider } from '@aztec/foundation/timer';
10
- import type { ProverNodeConfig, ProverNodeDeps } from '@aztec/prover-node';
11
10
  import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
12
11
 
13
12
  import getPort from 'get-port';
@@ -131,7 +130,7 @@ export async function createNonValidatorNode(
131
130
  ...p2pConfig,
132
131
  disableValidator: true,
133
132
  validatorPrivateKeys: undefined,
134
- publisherPrivateKeys: [],
133
+ sequencerPublisherPrivateKeys: [],
135
134
  };
136
135
  const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
137
136
  return await AztecNodeService.createAndSync(config, { telemetry, dateProvider }, { prefilledPublicData });
@@ -143,31 +142,24 @@ export async function createProverNode(
143
142
  tcpPort: number,
144
143
  bootstrapNode: string | undefined,
145
144
  addressIndex: number,
146
- proverNodeDeps: ProverNodeDeps & Required<Pick<ProverNodeDeps, 'dateProvider'>>,
145
+ deps: { dateProvider: DateProvider },
147
146
  prefilledPublicData?: PublicDataTreeLeaf[],
148
147
  dataDirectory?: string,
149
148
  metricsPort?: number,
150
- ) {
149
+ ): Promise<{ proverNode: AztecNodeService }> {
151
150
  const actorIndex = proverCounter++;
152
151
  return await withLoggerBindings({ actor: `prover-${actorIndex}` }, async () => {
153
152
  const proverNodePrivateKey = getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex)!;
154
153
  const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
155
154
 
156
- const proverConfig: Partial<ProverNodeConfig> = await createP2PConfig(
157
- config,
158
- bootstrapNode,
159
- tcpPort,
160
- dataDirectory,
161
- );
155
+ const p2pConfig = await createP2PConfig(config, bootstrapNode, tcpPort, dataDirectory);
162
156
 
163
- const aztecNodeRpcTxProvider = undefined;
164
157
  return await createAndSyncProverNode(
165
158
  bufferToHex(proverNodePrivateKey),
166
- config,
167
- { ...proverConfig, dataDirectory },
168
- aztecNodeRpcTxProvider,
169
- prefilledPublicData,
170
- { ...proverNodeDeps, telemetry },
159
+ { ...config, ...p2pConfig },
160
+ { dataDirectory },
161
+ { ...deps, telemetry },
162
+ { prefilledPublicData: prefilledPublicData ?? [] },
171
163
  );
172
164
  });
173
165
  }
@@ -215,7 +207,7 @@ export async function createValidatorConfig(
215
207
  ...config,
216
208
  ...p2pConfig,
217
209
  validatorPrivateKeys: new SecretValue(attesterPrivateKeys),
218
- publisherPrivateKeys: [new SecretValue(attesterPrivateKeys[0])],
210
+ sequencerPublisherPrivateKeys: [new SecretValue(attesterPrivateKeys[0])],
219
211
  };
220
212
 
221
213
  return nodeConfig;
@@ -25,8 +25,9 @@ export async function mintTokensToPrivate(
25
25
  minter: AztecAddress,
26
26
  recipient: AztecAddress,
27
27
  amount: bigint,
28
+ additionalScopes?: AztecAddress[],
28
29
  ) {
29
- await token.methods.mint_to_private(recipient, amount).send({ from: minter });
30
+ await token.methods.mint_to_private(recipient, amount).send({ from: minter, additionalScopes });
30
31
  }
31
32
 
32
33
  export async function expectTokenBalance(
@@ -1 +1,2 @@
1
1
  export { uniswapL1L2TestSuite } from './uniswap_l1_l2.js';
2
+ export { MockStateView, diffInBps } from './mock_state_view.js';
@@ -0,0 +1,188 @@
1
+ import { EthAddress } from '@aztec/aztec.js/addresses';
2
+ import { type Logger, createLogger } from '@aztec/aztec.js/log';
3
+ import type { EthCheatCodes } from '@aztec/aztec/testing';
4
+ import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
5
+
6
+ import { getContract } from 'viem';
7
+
8
+ /**
9
+ * Mock StateView contract for testing the Uniswap price oracle.
10
+ *
11
+ * Wraps a compiled Solidity contract that mimics the Uniswap V4 StateView's getSlot0 function.
12
+ * The mock allows setting return values dynamically for testing different price scenarios.
13
+ *
14
+ * Solidity source:
15
+ * ```solidity
16
+ * // SPDX-License-Identifier: Apache-2.0
17
+ * pragma solidity >=0.8.27;
18
+ *
19
+ * contract MockStateView {
20
+ * uint160 public sqrtPriceX96;
21
+ * int24 public tick;
22
+ * uint24 public protocolFee;
23
+ * uint24 public lpFee;
24
+ *
25
+ * function setReturnValues(
26
+ * uint160 _sqrtPriceX96,
27
+ * int24 _tick,
28
+ * uint24 _protocolFee,
29
+ * uint24 _lpFee
30
+ * ) external {
31
+ * sqrtPriceX96 = _sqrtPriceX96;
32
+ * tick = _tick;
33
+ * protocolFee = _protocolFee;
34
+ * lpFee = _lpFee;
35
+ * }
36
+ *
37
+ * function getSlot0(bytes32 poolId) external view returns (uint160, int24, uint24, uint24) {
38
+ * return (sqrtPriceX96, tick, protocolFee, lpFee);
39
+ * }
40
+ * }
41
+ * ```
42
+ */
43
+ export class MockStateView {
44
+ private static readonly BYTECODE: `0x${string}` =
45
+ '0x608060405234801561000f575f5ffd5b5060043610610060575f3560e01c80633eaf5d9f14610064578063704ce43e146100825780638db791d2146100a0578063b0e21e8a146100be578063b52e4bdd146100dc578063c815641c146100f8575b5f5ffd5b61006c61012b565b60405161007991906102ab565b60405180910390f35b61008a61013d565b60405161009791906102e1565b60405180910390f35b6100a8610151565b6040516100b59190610328565b60405180910390f35b6100c6610175565b6040516100d391906102e1565b60405180910390f35b6100f660048036038101906100f191906103c3565b610189565b005b610112600480360381019061010d919061045a565b61022b565b6040516101229493929190610485565b60405180910390f35b5f60149054906101000a900460020b81565b5f601a9054906101000a900462ffffff1681565b5f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f60179054906101000a900462ffffff1681565b835f5f6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550825f60146101000a81548162ffffff021916908360020b62ffffff160217905550815f60176101000a81548162ffffff021916908362ffffff160217905550805f601a6101000a81548162ffffff021916908362ffffff16021790555050505050565b5f5f5f5f5f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff165f60149054906101000a900460020b5f60179054906101000a900462ffffff165f601a9054906101000a900462ffffff1693509350935093509193509193565b5f8160020b9050919050565b6102a581610290565b82525050565b5f6020820190506102be5f83018461029c565b92915050565b5f62ffffff82169050919050565b6102db816102c4565b82525050565b5f6020820190506102f45f8301846102d2565b92915050565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b610322816102fa565b82525050565b5f60208201905061033b5f830184610319565b92915050565b5f5ffd5b61034e816102fa565b8114610358575f5ffd5b50565b5f8135905061036981610345565b92915050565b61037881610290565b8114610382575f5ffd5b50565b5f813590506103938161036f565b92915050565b6103a2816102c4565b81146103ac575f5ffd5b50565b5f813590506103bd81610399565b92915050565b5f5f5f5f608085870312156103db576103da610341565b5b5f6103e88782880161035b565b94505060206103f987828801610385565b935050604061040a878288016103af565b925050606061041b878288016103af565b91505092959194509250565b5f819050919050565b61043981610427565b8114610443575f5ffd5b50565b5f8135905061045481610430565b92915050565b5f6020828403121561046f5761046e610341565b5b5f61047c84828501610446565b91505092915050565b5f6080820190506104985f830187610319565b6104a5602083018661029c565b6104b260408301856102d2565b6104bf60608301846102d2565b9594505050505056fea2646970667358221220f8b1bfff284535bc078368ed34bd5e78981644845f3c9c1f5a4b8448c976805464736f6c634300081f0033';
46
+ private static readonly ABI = [
47
+ {
48
+ type: 'function',
49
+ name: 'setReturnValues',
50
+ inputs: [
51
+ { name: '_sqrtPriceX96', type: 'uint160' },
52
+ { name: '_tick', type: 'int24' },
53
+ { name: '_protocolFee', type: 'uint24' },
54
+ { name: '_lpFee', type: 'uint24' },
55
+ ],
56
+ outputs: [],
57
+ stateMutability: 'nonpayable',
58
+ },
59
+ {
60
+ inputs: [
61
+ {
62
+ internalType: 'bytes32',
63
+ name: 'poolId',
64
+ type: 'bytes32',
65
+ },
66
+ ],
67
+ name: 'getSlot0',
68
+ outputs: [
69
+ {
70
+ internalType: 'uint160',
71
+ name: '',
72
+ type: 'uint160',
73
+ },
74
+ {
75
+ internalType: 'int24',
76
+ name: '',
77
+ type: 'int24',
78
+ },
79
+ {
80
+ internalType: 'uint24',
81
+ name: '',
82
+ type: 'uint24',
83
+ },
84
+ {
85
+ internalType: 'uint24',
86
+ name: '',
87
+ type: 'uint24',
88
+ },
89
+ ],
90
+ stateMutability: 'view',
91
+ type: 'function',
92
+ },
93
+ ] as const;
94
+
95
+ private constructor(
96
+ private readonly address: EthAddress,
97
+ private readonly walletClient: ExtendedViemWalletClient,
98
+ private readonly log: Logger = createLogger('mock-state-view'),
99
+ ) {}
100
+
101
+ /**
102
+ * Deploys the mock StateView contract at the specified address using etch.
103
+ * @param ethCheatCodes - Cheat codes for etching bytecode
104
+ * @param walletClient - Wallet client for sending transactions
105
+ * @param address - Address to deploy the mock at (typically the real StateView address)
106
+ */
107
+ static async deploy(
108
+ ethCheatCodes: EthCheatCodes,
109
+ walletClient: ExtendedViemWalletClient,
110
+ address: EthAddress,
111
+ ): Promise<MockStateView> {
112
+ await ethCheatCodes.etch(address, MockStateView.BYTECODE);
113
+ return new MockStateView(address, walletClient);
114
+ }
115
+
116
+ /**
117
+ * Sets the price using the ethPerFeeAssetE12 format (same as rollup contract).
118
+ * Computes the corresponding sqrtPriceX96 internally.
119
+ *
120
+ * Math (from fee_asset_price_oracle.ts):
121
+ * ethPerFeeAssetE12 = 1e12 * 2^192 / sqrtPriceX96^2
122
+ *
123
+ * Inverted:
124
+ * sqrtPriceX96^2 = 1e12 * 2^192 / ethPerFeeAssetE12
125
+ * sqrtPriceX96 = sqrt(1e12 * 2^192 / ethPerFeeAssetE12)
126
+ *
127
+ * @param ethPerFeeAssetE12 - The price in ETH per fee asset, scaled by 1e12
128
+ */
129
+ async setEthPerFeeAsset(ethPerFeeAssetE12: bigint) {
130
+ const sqrtPriceX96 = this.ethPerFeeAssetE12ToSqrtPriceX96(ethPerFeeAssetE12);
131
+ return await this.setSqrtPriceX96(sqrtPriceX96);
132
+ }
133
+
134
+ /**
135
+ * Sets the sqrtPriceX96 value directly (Uniswap's price encoding).
136
+ * @param sqrtPriceX96 - The sqrtPriceX96 value
137
+ * @param tick - The tick value (default 10)
138
+ * @param protocolFee - The protocol fee (default 0)
139
+ * @param lpFee - The LP fee (default 500)
140
+ */
141
+ async setSqrtPriceX96(sqrtPriceX96: bigint, tick: number = 10, protocolFee: number = 0, lpFee: number = 500) {
142
+ const contract = getContract({
143
+ address: this.address.toString() as `0x${string}`,
144
+ abi: MockStateView.ABI,
145
+ client: this.walletClient,
146
+ });
147
+
148
+ const hash = await contract.write.setReturnValues([sqrtPriceX96, tick, protocolFee, lpFee]);
149
+ this.log.info(`Set sqrtPriceX96 to ${sqrtPriceX96}`);
150
+ return await this.walletClient.waitForTransactionReceipt({ hash });
151
+ }
152
+
153
+ /**
154
+ * Converts ethPerFeeAssetE12 to sqrtPriceX96 (inverse of sqrtPriceX96ToEthPerFeeAssetE12).
155
+ *
156
+ * Math:
157
+ * sqrtPriceX96 = sqrt(1e12 * 2^192 / ethPerFeeAssetE12)
158
+ */
159
+ ethPerFeeAssetE12ToSqrtPriceX96(ethPerFeeAssetE12: bigint): bigint {
160
+ if (ethPerFeeAssetE12 === 0n) {
161
+ throw new Error('Cannot convert zero ethPerFeeAssetE12');
162
+ }
163
+ const Q192 = 2n ** 192n;
164
+ const sqrtPriceSquared = (10n ** 12n * Q192) / ethPerFeeAssetE12;
165
+ return this.bigintSqrt(sqrtPriceSquared);
166
+ }
167
+
168
+ /** Integer square root using Newton's method */
169
+ bigintSqrt(n: bigint): bigint {
170
+ if (n < 0n) {
171
+ throw new Error('Cannot compute sqrt of negative number');
172
+ }
173
+ if (n === 0n) {
174
+ return 0n;
175
+ }
176
+ let x = n;
177
+ let y = (x + 1n) / 2n;
178
+ while (y < x) {
179
+ x = y;
180
+ y = (x + n / x) / 2n;
181
+ }
182
+ return x;
183
+ }
184
+ }
185
+
186
+ export function diffInBps(a: bigint, b: bigint): bigint {
187
+ return ((a - b) * 10000n) / b;
188
+ }
@@ -19,7 +19,10 @@ export const submitTxsTo = async (
19
19
  times(numTxs, async () => {
20
20
  const accountManager = await wallet.createSchnorrAccount(Fr.random(), Fr.random(), GrumpkinScalar.random());
21
21
  const deployMethod = await accountManager.getDeployMethod();
22
- const txHash = await deployMethod.send({ from: submitter, wait: NO_WAIT });
22
+ const txHash = await deployMethod.send({
23
+ from: submitter,
24
+ wait: NO_WAIT,
25
+ });
23
26
 
24
27
  logger.info(`Tx sent with hash ${txHash}`);
25
28
  const receipt: TxReceipt = await wallet.getTxReceipt(txHash);
@@ -20,6 +20,7 @@ import { getBBConfig } from '../fixtures/get_bb_config.js';
20
20
  import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.js';
21
21
  import { TestWallet } from '../test-wallet/test_wallet.js';
22
22
  import { proveInteraction } from '../test-wallet/utils.js';
23
+ import { WorkerWallet } from '../test-wallet/worker_wallet.js';
23
24
 
24
25
  export interface TestAccounts {
25
26
  aztecNode: AztecNode;
@@ -87,11 +88,19 @@ export async function deploySponsoredTestAccountsWithTokens(
87
88
 
88
89
  const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
89
90
  const recipientDeployMethod = await recipientAccount.getDeployMethod();
90
- await recipientDeployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod }, wait: { timeout: 2400 } });
91
+ await recipientDeployMethod.send({
92
+ from: AztecAddress.ZERO,
93
+ fee: { paymentMethod },
94
+ wait: { timeout: 2400 },
95
+ });
91
96
  await Promise.all(
92
97
  fundedAccounts.map(async a => {
93
98
  const deployMethod = await a.getDeployMethod();
94
- await deployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod }, wait: { timeout: 2400 } }); // increase timeout on purpose in order to account for two empty epochs
99
+ await deployMethod.send({
100
+ from: AztecAddress.ZERO,
101
+ fee: { paymentMethod },
102
+ wait: { timeout: 2400 },
103
+ }); // increase timeout on purpose in order to account for two empty epochs
95
104
  logger.info(`Account deployed at ${a.address}`);
96
105
  }),
97
106
  );
@@ -129,7 +138,11 @@ async function deployAccountWithDiagnostics(
129
138
  const deployMethod = await account.getDeployMethod();
130
139
  let txHash;
131
140
  try {
132
- txHash = await deployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod }, wait: NO_WAIT });
141
+ txHash = await deployMethod.send({
142
+ from: AztecAddress.ZERO,
143
+ fee: { paymentMethod },
144
+ wait: NO_WAIT,
145
+ });
133
146
  await waitForTx(aztecNode, txHash, { timeout: 2400 });
134
147
  logger.info(`${accountLabel} deployed at ${account.address}`);
135
148
  } catch (error) {
@@ -397,3 +410,42 @@ export async function createWalletAndAztecNodeClient(
397
410
  },
398
411
  };
399
412
  }
413
+
414
+ export type WorkerWalletWrapper = {
415
+ wallet: WorkerWallet;
416
+ aztecNode: AztecNode;
417
+ cleanup: () => Promise<void>;
418
+ };
419
+
420
+ export async function createWorkerWalletClient(
421
+ nodeUrl: string,
422
+ proverEnabled: boolean,
423
+ logger: Logger,
424
+ ): Promise<WorkerWalletWrapper> {
425
+ const aztecNode = createAztecNodeClient(nodeUrl);
426
+ const [bbConfig, acvmConfig] = await Promise.all([getBBConfig(logger), getACVMConfig(logger)]);
427
+
428
+ // Strip cleanup functions — they can't be structured-cloned for worker transfer
429
+ const { cleanup: bbCleanup, ...bbPaths } = bbConfig ?? {};
430
+ const { cleanup: acvmCleanup, ...acvmPaths } = acvmConfig ?? {};
431
+
432
+ const pxeConfig = {
433
+ dataDirectory: undefined,
434
+ dataStoreMapSizeKb: 1024 * 1024,
435
+ ...bbPaths,
436
+ ...acvmPaths,
437
+ proverEnabled,
438
+ };
439
+
440
+ const wallet = await WorkerWallet.create(nodeUrl, pxeConfig);
441
+
442
+ return {
443
+ wallet,
444
+ aztecNode,
445
+ async cleanup() {
446
+ await wallet.stop();
447
+ await bbCleanup?.();
448
+ await acvmCleanup?.();
449
+ },
450
+ };
451
+ }
@@ -35,6 +35,7 @@ export async function installTransferBot({
35
35
  replicas = 1,
36
36
  txIntervalSeconds = 10,
37
37
  followChain = 'CHECKPOINTED',
38
+ pxeSyncChainTip = 'proposed',
38
39
  mnemonic = process.env.LABS_INFRA_MNEMONIC ?? 'test test test test test test test test test test test junk',
39
40
  mnemonicStartIndex,
40
41
  botPrivateKey = process.env.BOT_TRANSFERS_L2_PRIVATE_KEY ?? '0xcafe01',
@@ -49,6 +50,7 @@ export async function installTransferBot({
49
50
  replicas?: number;
50
51
  txIntervalSeconds?: number;
51
52
  followChain?: string;
53
+ pxeSyncChainTip?: string;
52
54
  mnemonic?: string;
53
55
  mnemonicStartIndex?: number | string;
54
56
  botPrivateKey?: string;
@@ -67,6 +69,7 @@ export async function installTransferBot({
67
69
  'bot.replicaCount': replicas,
68
70
  'bot.txIntervalSeconds': txIntervalSeconds,
69
71
  'bot.followChain': followChain,
72
+ 'bot.pxeSyncChainTip': pxeSyncChainTip,
70
73
  'bot.botPrivateKey': botPrivateKey,
71
74
  'bot.nodeUrl': resolvedNodeUrl,
72
75
  'bot.mnemonic': mnemonic,
@@ -25,6 +25,7 @@ export {
25
25
  getRPCEndpoint,
26
26
  getEthereumEndpoint,
27
27
  createResilientPrometheusConnection,
28
+ scaleProverAgents,
28
29
  } from './k8s.js';
29
30
 
30
31
  // Chaos Mesh