@aztec/end-to-end 0.86.0-starknet.1 → 0.87.0-nightly.20250521

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 (50) hide show
  1. package/dest/bench/client_flows/data_extractor.js +0 -1
  2. package/dest/bench/utils.d.ts.map +1 -1
  3. package/dest/bench/utils.js +5 -1
  4. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  5. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +5 -2
  6. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  7. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +8 -4
  8. package/dest/e2e_epochs/epochs_test.d.ts +9 -4
  9. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  10. package/dest/e2e_epochs/epochs_test.js +26 -14
  11. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  12. package/dest/e2e_p2p/p2p_network.d.ts +9 -213
  13. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  14. package/dest/e2e_p2p/p2p_network.js +19 -22
  15. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  16. package/dest/e2e_prover/e2e_prover_test.d.ts.map +1 -1
  17. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  18. package/dest/fixtures/fixtures.d.ts +2 -4
  19. package/dest/fixtures/fixtures.d.ts.map +1 -1
  20. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  21. package/dest/fixtures/l1_to_l2_messaging.d.ts +5 -1
  22. package/dest/fixtures/l1_to_l2_messaging.d.ts.map +1 -1
  23. package/dest/fixtures/l1_to_l2_messaging.js +5 -4
  24. package/dest/fixtures/setup_l1_contracts.d.ts +1 -1
  25. package/dest/fixtures/setup_l1_contracts.d.ts.map +1 -1
  26. package/dest/fixtures/setup_p2p_test.d.ts +1 -2
  27. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  28. package/dest/fixtures/setup_p2p_test.js +3 -3
  29. package/dest/fixtures/snapshot_manager.d.ts.map +1 -1
  30. package/dest/fixtures/utils.d.ts +0 -2
  31. package/dest/fixtures/utils.d.ts.map +1 -1
  32. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  33. package/dest/shared/submit-transactions.d.ts.map +1 -1
  34. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  35. package/dest/simulators/token_simulator.d.ts.map +1 -1
  36. package/dest/simulators/token_simulator.js +1 -1
  37. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  38. package/dest/spartan/utils.d.ts +0 -1
  39. package/dest/spartan/utils.d.ts.map +1 -1
  40. package/package.json +38 -38
  41. package/src/bench/client_flows/data_extractor.ts +3 -3
  42. package/src/bench/utils.ts +3 -1
  43. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +16 -5
  44. package/src/e2e_epochs/epochs_test.ts +28 -15
  45. package/src/e2e_nested_contract/nested_contract_test.ts +4 -1
  46. package/src/e2e_p2p/p2p_network.ts +26 -20
  47. package/src/fixtures/l1_to_l2_messaging.ts +1 -1
  48. package/src/fixtures/setup_p2p_test.ts +3 -3
  49. package/src/simulators/token_simulator.ts +0 -1
  50. package/src/spartan/setup_test_wallets.ts +6 -3
@@ -158,7 +158,6 @@ async function main() {
158
158
  }
159
159
  }));
160
160
  let stats;
161
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
162
161
  let error;
163
162
  let currentLogs = [];
164
163
  let provingTime;
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAIxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAuBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAuEF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiBvG"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAKxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAwBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAuEF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiBvG"}
@@ -2,7 +2,8 @@ import { BatchCall } from '@aztec/aztec.js';
2
2
  import { mean, stdDev, times } from '@aztec/foundation/collection';
3
3
  import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
4
4
  import { createPXEService } from '@aztec/pxe/server';
5
- import { writeFileSync } from 'fs';
5
+ import { mkdirSync, writeFileSync } from 'fs';
6
+ import path from 'path';
6
7
  import { setup } from '../fixtures/utils.js';
7
8
  /**
8
9
  * Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
@@ -28,6 +29,9 @@ import { setup } from '../fixtures/utils.js';
28
29
  throw new Error(`No benchmark data generated. Please review your test setup.`);
29
30
  }
30
31
  const benchOutput = opts.benchOutput ?? process.env.BENCH_OUTPUT ?? 'bench.json';
32
+ mkdirSync(path.dirname(benchOutput), {
33
+ recursive: true
34
+ });
31
35
  writeFileSync(benchOutput, JSON.stringify(formatted));
32
36
  context.logger.info(`Wrote ${data.length} metrics to ${benchOutput}`);
33
37
  await origTeardown();
@@ -1 +1 @@
1
- {"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAItF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS;IAKT,UAAU;IAKV,eAAe;IAKf,YAAY;;;;;CAKb;AAED,qBAAa,0BAA0B;;IAGrC,MAAM,CAAC,KAAK,SAAK;IAEjB,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IAEpC,KAAK,EAAG,aAAa,CAAC;IACtB,KAAK,EAAG,aAAa,CAAC;IACtB,WAAW,EAAG,aAAa,CAAC;gBAEhB,QAAQ,EAAE,MAAM;IAKtB,UAAU,CAAC,MAAM,GAAE,MAAyC;IAMlE;;;;OAIG;IACG,kBAAkB;IA2DlB,KAAK;IAIX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAQR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM;IAgBV,iBAAiB;CAmExB"}
1
+ {"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAItF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS;IAKT,UAAU;IAKV,eAAe;IAKf,YAAY;;;;;CAKb;AAED,qBAAa,0BAA0B;;IAGrC,MAAM,CAAC,KAAK,SAAK;IAEjB,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IAEpC,KAAK,EAAG,aAAa,CAAC;IACtB,KAAK,EAAG,aAAa,CAAC;IACtB,WAAW,EAAG,aAAa,CAAC;gBAEhB,QAAQ,EAAE,MAAM;IAKtB,UAAU,CAAC,MAAM,GAAE,MAAyC;IAMlE;;;;OAIG;IACG,kBAAkB;IA2DlB,KAAK;IAIX,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAQR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM;IAgBV,iBAAiB;CAmExB"}
@@ -1,9 +1,10 @@
1
1
  import type { AztecNodeConfig } from '@aztec/aztec-node';
2
2
  import { type AccountWallet, AztecAddress, type AztecNode, type CompleteAddress, EthAddress, type Logger, type PXE } from '@aztec/aztec.js';
3
3
  import { CheatCodes } from '@aztec/aztec.js/testing';
4
- import { type ExtendedViemWalletClient } from '@aztec/ethereum';
4
+ import { type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
5
5
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
6
6
  import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
7
+ import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
7
8
  import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
8
9
  import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
9
10
  export declare class CrossChainMessagingTest {
@@ -14,6 +15,7 @@ export declare class CrossChainMessagingTest {
14
15
  aztecNode: AztecNode;
15
16
  pxe: PXE;
16
17
  aztecNodeConfig: AztecNodeConfig;
18
+ aztecNodeAdmin: AztecNodeAdmin;
17
19
  l1Client: ExtendedViemWalletClient | undefined;
18
20
  user1Wallet: AccountWallet;
19
21
  user2Wallet: AccountWallet;
@@ -24,7 +26,8 @@ export declare class CrossChainMessagingTest {
24
26
  l2Bridge: TokenBridgeContract;
25
27
  inbox: any;
26
28
  outbox: any;
27
- cheatcodes: CheatCodes;
29
+ cheatCodes: CheatCodes;
30
+ deployL1ContractsValues: DeployL1ContractsReturnType;
28
31
  constructor(testName: string);
29
32
  assumeProven(): Promise<void>;
30
33
  setup(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EAET,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,KAAK,wBAAwB,EAA4C,MAAM,iBAAiB,CAAC;AAE1G,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAK3E,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,SAAS,EAAG,SAAS,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,eAAe,EAAG,eAAe,CAAC;IAElC,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,WAAW,EAAG,aAAa,CAAC;IAC5B,WAAW,EAAG,aAAa,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,YAAY,EAAG,YAAY,CAAC;IAC5B,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,KAAK,EAAG,GAAG,CAAC;IACZ,MAAM,EAAG,GAAG,CAAC;IACb,UAAU,EAAG,UAAU,CAAC;gBAEZ,QAAQ,EAAE,MAAM;IAKtB,YAAY;IAIZ,KAAK;IAQX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,kBAAkB;CA6FzB"}
1
+ {"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EAET,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAG9B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,SAAS,EAAG,SAAS,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAEhC,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,WAAW,EAAG,aAAa,CAAC;IAC5B,WAAW,EAAG,aAAa,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,YAAY,EAAG,YAAY,CAAC;IAC5B,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,KAAK,EAAG,GAAG,CAAC;IACZ,MAAM,EAAG,GAAG,CAAC;IACb,UAAU,EAAG,UAAU,CAAC;IAExB,uBAAuB,EAAG,2BAA2B,CAAC;gBAE1C,QAAQ,EAAE,MAAM;IAKtB,YAAY;IAIZ,KAAK;IAUX,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,kBAAkB;CA6FzB"}
@@ -18,6 +18,7 @@ export class CrossChainMessagingTest {
18
18
  aztecNode;
19
19
  pxe;
20
20
  aztecNodeConfig;
21
+ aztecNodeAdmin;
21
22
  l1Client;
22
23
  user1Wallet;
23
24
  user2Wallet;
@@ -28,20 +29,23 @@ export class CrossChainMessagingTest {
28
29
  l2Bridge;
29
30
  inbox;
30
31
  outbox;
31
- cheatcodes;
32
+ cheatCodes;
33
+ deployL1ContractsValues;
32
34
  constructor(testName){
33
35
  this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
34
36
  this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath);
35
37
  }
36
38
  async assumeProven() {
37
- await this.cheatcodes.rollup.markAsProven();
39
+ await this.cheatCodes.rollup.markAsProven();
38
40
  }
39
41
  async setup() {
40
- const { aztecNode, pxe, aztecNodeConfig } = await this.snapshotManager.setup();
42
+ const { aztecNode, pxe, aztecNodeConfig, deployL1ContractsValues } = await this.snapshotManager.setup();
41
43
  this.aztecNode = aztecNode;
42
44
  this.pxe = pxe;
43
45
  this.aztecNodeConfig = aztecNodeConfig;
44
- this.cheatcodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
46
+ this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
47
+ this.deployL1ContractsValues = deployL1ContractsValues;
48
+ this.aztecNodeAdmin = aztecNode;
45
49
  }
46
50
  snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
47
51
  async teardown() {
@@ -7,13 +7,10 @@ import { ProverNode } from '@aztec/prover-node';
7
7
  import type { L2BlockNumber } from '@aztec/stdlib/block';
8
8
  import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
9
9
  import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
10
- export declare const L1_BLOCK_TIME_IN_S: number;
11
- export declare const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
12
- export declare const L2_SLOT_DURATION_IN_S: number;
13
10
  export declare const WORLD_STATE_BLOCK_HISTORY = 2;
14
11
  export declare const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
15
12
  export declare const ARCHIVER_POLL_INTERVAL = 50;
16
- export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'l1PublishRetryIntervalMS' | 'txPropagationMaxQueryAttempts' | 'proverNodeConfig'>>;
13
+ export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'l1PublishRetryIntervalMS' | 'txPropagationMaxQueryAttempts' | 'proverNodeConfig' | 'ethereumSlotDuration' | 'aztecSlotDuration'>>;
17
14
  /**
18
15
  * Tests building of epochs using fast block times and short epochs.
19
16
  * Spawns an aztec node and a prover node with fake proofs.
@@ -31,7 +28,15 @@ export declare class EpochsTestContext {
31
28
  proverNodes: ProverNode[];
32
29
  nodes: AztecNodeService[];
33
30
  epochDuration: number;
31
+ L1_BLOCK_TIME_IN_S: number;
32
+ L2_SLOT_DURATION_IN_S: number;
34
33
  static setup(opts?: EpochsTestOpts): Promise<EpochsTestContext>;
34
+ static getSlotDurations(opts?: EpochsTestOpts): {
35
+ ethereumSlotDuration: number;
36
+ aztecSlotDuration: number;
37
+ aztecEpochDuration: number;
38
+ aztecProofSubmissionWindow: number;
39
+ };
35
40
  setup(opts?: EpochsTestOpts): Promise<void>;
36
41
  teardown(): Promise<void>;
37
42
  createProverNode(): Promise<ProverNode>;
@@ -1 +1 @@
1
- {"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAA8D,MAAM,iBAAiB,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,iBAAiB,EAAuC,MAAM,6BAA6B,CAAC;AAK1G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,kBAAkB,QAAsE,CAAC;AACtG,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAC9C,eAAO,MAAM,qBAAqB,QAAoD,CAAC;AAEvF,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,IAAI,CACF,YAAY,EACV,iBAAiB,GACjB,4BAA4B,GAC5B,oBAAoB,GACpB,mBAAmB,GACnB,0BAA0B,GAC1B,+BAA+B,GAC/B,kBAAkB,CACrB,CACF,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,UAAU,CAAC;IACtB,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;WAEV,KAAK,CAAC,IAAI,GAAE,cAAmB;IAMtC,KAAK,CAAC,IAAI,GAAE,cAAmB;IAoE/B,QAAQ;IAOR,gBAAgB;IAgBhB,sBAAsB;IAcnC,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,4EAA4E;IAC/D,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAO7E,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU;IAclF,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;CAUtF"}
1
+ {"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAA8D,MAAM,iBAAiB,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,iBAAiB,EAAuC,MAAM,6BAA6B,CAAC;AAK1G,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,CAClC,IAAI,CACF,YAAY,EACV,iBAAiB,GACjB,4BAA4B,GAC5B,oBAAoB,GACpB,mBAAmB,GACnB,0BAA0B,GAC1B,+BAA+B,GAC/B,kBAAkB,GAClB,sBAAsB,GACtB,mBAAmB,CACtB,CACF,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,UAAU,CAAC;IACtB,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;IAwE/B,QAAQ;IAOR,gBAAgB;IAgBhB,sBAAsB;IAcnC,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,4EAA4E;IAC/D,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAO7E,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU;IAclF,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;CAUtF"}
@@ -7,10 +7,6 @@ import { withLogNameSuffix } from '@aztec/foundation/log';
7
7
  import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
8
8
  import { join } from 'path';
9
9
  import { createAndSyncProverNode, getPrivateKeyFromIndex, setup } from '../fixtures/utils.js';
10
- // This can be lowered to as much as 2s in non-CI
11
- export const L1_BLOCK_TIME_IN_S = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
12
- export const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
13
- export const L2_SLOT_DURATION_IN_S = L2_SLOT_DURATION_IN_L1_SLOTS * L1_BLOCK_TIME_IN_S;
14
10
  export const WORLD_STATE_BLOCK_HISTORY = 2;
15
11
  export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
16
12
  export const ARCHIVER_POLL_INTERVAL = 50;
@@ -30,16 +26,32 @@ export const ARCHIVER_POLL_INTERVAL = 50;
30
26
  proverNodes = [];
31
27
  nodes = [];
32
28
  epochDuration;
29
+ L1_BLOCK_TIME_IN_S;
30
+ L2_SLOT_DURATION_IN_S;
33
31
  static async setup(opts = {}) {
34
32
  const test = new EpochsTestContext();
35
33
  await test.setup(opts);
36
34
  return test;
37
35
  }
36
+ static getSlotDurations(opts = {}) {
37
+ const envEthereumSlotDuration = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
38
+ const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
39
+ const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
40
+ const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
41
+ const aztecProofSubmissionWindow = opts.aztecProofSubmissionWindow ?? aztecEpochDuration * 2 - 1;
42
+ return {
43
+ ethereumSlotDuration,
44
+ aztecSlotDuration,
45
+ aztecEpochDuration,
46
+ aztecProofSubmissionWindow
47
+ };
48
+ }
38
49
  async setup(opts = {}) {
50
+ const { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionWindow } = EpochsTestContext.getSlotDurations(opts);
51
+ this.L1_BLOCK_TIME_IN_S = ethereumSlotDuration;
52
+ this.L2_SLOT_DURATION_IN_S = aztecSlotDuration;
39
53
  // Set up system without any account nor protocol contracts
40
54
  // and with faster block times and shorter epochs.
41
- const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
42
- const proofSubmissionWindow = opts.aztecProofSubmissionWindow ?? aztecEpochDuration * 2 - 1;
43
55
  const context = await setup(0, {
44
56
  checkIntervalMs: 50,
45
57
  archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
@@ -47,9 +59,9 @@ export const ARCHIVER_POLL_INTERVAL = 50;
47
59
  skipProtocolContracts: true,
48
60
  salt: 1,
49
61
  aztecEpochDuration,
50
- aztecSlotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
51
- ethereumSlotDuration: L1_BLOCK_TIME_IN_S,
52
- aztecProofSubmissionWindow: proofSubmissionWindow,
62
+ aztecSlotDuration,
63
+ ethereumSlotDuration,
64
+ aztecProofSubmissionWindow,
53
65
  minTxsPerBlock: 0,
54
66
  realProofs: false,
55
67
  startProverNode: true,
@@ -59,7 +71,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
59
71
  proverId: Fr.fromString('1'),
60
72
  // This must be enough so that the tx from the prover is delayed properly,
61
73
  // but not so much to hang the sequencer and timeout the teardown
62
- txPropagationMaxQueryAttempts: 12,
74
+ txPropagationMaxQueryAttempts: opts.txPropagationMaxQueryAttempts ?? 12,
63
75
  worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
64
76
  ...opts
65
77
  });
@@ -86,11 +98,11 @@ export const ARCHIVER_POLL_INTERVAL = 50;
86
98
  this.epochDuration = aztecEpochDuration;
87
99
  this.constants = {
88
100
  epochDuration: aztecEpochDuration,
89
- slotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
101
+ slotDuration: aztecSlotDuration,
90
102
  l1StartBlock: await this.rollup.getL1StartBlock(),
91
103
  l1GenesisTime: await this.rollup.getL1GenesisTime(),
92
- ethereumSlotDuration: L1_BLOCK_TIME_IN_S,
93
- proofSubmissionWindow
104
+ ethereumSlotDuration,
105
+ proofSubmissionWindow: aztecProofSubmissionWindow
94
106
  };
95
107
  this.logger.info(`L2 genesis at L1 block ${this.constants.l1StartBlock} (timestamp ${this.constants.l1GenesisTime})`);
96
108
  }
@@ -131,7 +143,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
131
143
  /** Waits until the epoch begins (ie until the immediately previous L1 block is mined). */ async waitUntilEpochStarts(epoch) {
132
144
  const [start] = getTimestampRangeForEpoch(BigInt(epoch), this.constants);
133
145
  this.logger.info(`Waiting until L1 timestamp ${start} is reached as the start of epoch ${epoch}`);
134
- await waitUntilL1Timestamp(this.l1Client, start - BigInt(L1_BLOCK_TIME_IN_S));
146
+ await waitUntilL1Timestamp(this.l1Client, start - BigInt(this.L1_BLOCK_TIME_IN_S));
135
147
  return start;
136
148
  }
137
149
  /** Waits until the given L2 block number is mined. */ async waitUntilL2BlockNumber(target, timeout = 60) {
@@ -1 +1 @@
1
- {"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAUC,OAAO,CAAC,gBAAgB;IATtD,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,GAAG,EAAG,GAAG,CAAC;IAEV,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAElB,QAAQ,EAAE,MAAM,EAAU,gBAAgB,SAAI;IAK1D;;;;OAIG;IACG,kBAAkB;IAsBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAc3B"}
1
+ {"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,GAAG,EAAG,GAAG,CAAC;IAEV,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAG5B,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI;IAM9B;;;;OAIG;IACG,kBAAkB;IAsBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAc3B"}
@@ -8,9 +8,10 @@ import type { BootstrapNode } from '@aztec/p2p/bootstrap';
8
8
  import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
9
9
  import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
10
10
  export declare const WAIT_FOR_TX_TIMEOUT: number;
11
- export declare const SHORTENED_BLOCK_TIME_CONFIG: {
11
+ export declare const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES: {
12
12
  aztecSlotDuration: number;
13
13
  ethereumSlotDuration: number;
14
+ aztecProofSubmissionWindow: number;
14
15
  };
15
16
  export declare class P2PNetworkTest {
16
17
  bootstrapNodeEnr: string;
@@ -20,225 +21,20 @@ export declare class P2PNetworkTest {
20
21
  private snapshotManager;
21
22
  baseAccountPrivateKey: `0x${string}`;
22
23
  baseAccount: {
23
- address: `0x${string}`;
24
+ address: import("viem").Address;
24
25
  nonceManager?: import("viem").NonceManager | undefined;
25
26
  sign: (parameters: {
26
- hash: `0x${string}`;
27
- }) => Promise<`0x${string}`>;
27
+ hash: import("viem").Hash;
28
+ }) => Promise<import("viem").Hex>;
28
29
  experimental_signAuthorization: (parameters: import("viem/experimental").Authorization) => Promise<import("viem/accounts").SignAuthorizationReturnType>;
29
30
  signMessage: ({ message }: {
30
31
  message: import("viem").SignableMessage;
31
- }) => Promise<`0x${string}`>;
32
+ }) => Promise<import("viem").Hex>;
32
33
  signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
33
34
  serializer?: serializer | undefined;
34
- } | undefined) => Promise<import("viem").IsNarrowable<import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>>, `0x${string}`> extends true ? import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>> : `0x${string}`>;
35
- signTypedData: <const typedData extends Record<string, unknown> | {
36
- [x: string]: readonly import("viem").TypedDataParameter[];
37
- [x: `string[${string}]`]: undefined;
38
- [x: `function[${string}]`]: undefined;
39
- [x: `address[${string}]`]: undefined;
40
- [x: `bool[${string}]`]: undefined;
41
- [x: `bytes[${string}]`]: undefined;
42
- [x: `bytes8[${string}]`]: undefined;
43
- [x: `bytes18[${string}]`]: undefined;
44
- [x: `bytes4[${string}]`]: undefined;
45
- [x: `bytes1[${string}]`]: undefined;
46
- [x: `bytes23[${string}]`]: undefined;
47
- [x: `bytes32[${string}]`]: undefined;
48
- [x: `bytes31[${string}]`]: undefined;
49
- [x: `bytes30[${string}]`]: undefined;
50
- [x: `bytes29[${string}]`]: undefined;
51
- [x: `bytes28[${string}]`]: undefined;
52
- [x: `bytes27[${string}]`]: undefined;
53
- [x: `bytes26[${string}]`]: undefined;
54
- [x: `bytes25[${string}]`]: undefined;
55
- [x: `bytes24[${string}]`]: undefined;
56
- [x: `bytes22[${string}]`]: undefined;
57
- [x: `bytes21[${string}]`]: undefined;
58
- [x: `bytes20[${string}]`]: undefined;
59
- [x: `bytes2[${string}]`]: undefined;
60
- [x: `bytes19[${string}]`]: undefined;
61
- [x: `bytes17[${string}]`]: undefined;
62
- [x: `bytes16[${string}]`]: undefined;
63
- [x: `bytes15[${string}]`]: undefined;
64
- [x: `bytes14[${string}]`]: undefined;
65
- [x: `bytes13[${string}]`]: undefined;
66
- [x: `bytes12[${string}]`]: undefined;
67
- [x: `bytes11[${string}]`]: undefined;
68
- [x: `bytes10[${string}]`]: undefined;
69
- [x: `bytes9[${string}]`]: undefined;
70
- [x: `bytes7[${string}]`]: undefined;
71
- [x: `bytes6[${string}]`]: undefined;
72
- [x: `bytes5[${string}]`]: undefined;
73
- [x: `bytes3[${string}]`]: undefined;
74
- [x: `int[${string}]`]: undefined;
75
- [x: `int8[${string}]`]: undefined;
76
- [x: `int40[${string}]`]: undefined;
77
- [x: `int32[${string}]`]: undefined;
78
- [x: `int24[${string}]`]: undefined;
79
- [x: `int16[${string}]`]: undefined;
80
- [x: `int48[${string}]`]: undefined;
81
- [x: `int56[${string}]`]: undefined;
82
- [x: `int64[${string}]`]: undefined;
83
- [x: `int72[${string}]`]: undefined;
84
- [x: `int80[${string}]`]: undefined;
85
- [x: `int88[${string}]`]: undefined;
86
- [x: `int96[${string}]`]: undefined;
87
- [x: `int104[${string}]`]: undefined;
88
- [x: `int112[${string}]`]: undefined;
89
- [x: `int120[${string}]`]: undefined;
90
- [x: `int128[${string}]`]: undefined;
91
- [x: `int136[${string}]`]: undefined;
92
- [x: `int144[${string}]`]: undefined;
93
- [x: `int152[${string}]`]: undefined;
94
- [x: `int160[${string}]`]: undefined;
95
- [x: `int168[${string}]`]: undefined;
96
- [x: `int176[${string}]`]: undefined;
97
- [x: `int184[${string}]`]: undefined;
98
- [x: `int192[${string}]`]: undefined;
99
- [x: `int200[${string}]`]: undefined;
100
- [x: `int208[${string}]`]: undefined;
101
- [x: `int216[${string}]`]: undefined;
102
- [x: `int224[${string}]`]: undefined;
103
- [x: `int232[${string}]`]: undefined;
104
- [x: `int240[${string}]`]: undefined;
105
- [x: `int248[${string}]`]: undefined;
106
- [x: `int256[${string}]`]: undefined;
107
- [x: `uint[${string}]`]: undefined;
108
- [x: `uint8[${string}]`]: undefined;
109
- [x: `uint40[${string}]`]: undefined;
110
- [x: `uint32[${string}]`]: undefined;
111
- [x: `uint24[${string}]`]: undefined;
112
- [x: `uint16[${string}]`]: undefined;
113
- [x: `uint48[${string}]`]: undefined;
114
- [x: `uint56[${string}]`]: undefined;
115
- [x: `uint64[${string}]`]: undefined;
116
- [x: `uint72[${string}]`]: undefined;
117
- [x: `uint80[${string}]`]: undefined;
118
- [x: `uint88[${string}]`]: undefined;
119
- [x: `uint96[${string}]`]: undefined;
120
- [x: `uint104[${string}]`]: undefined;
121
- [x: `uint112[${string}]`]: undefined;
122
- [x: `uint120[${string}]`]: undefined;
123
- [x: `uint128[${string}]`]: undefined;
124
- [x: `uint136[${string}]`]: undefined;
125
- [x: `uint144[${string}]`]: undefined;
126
- [x: `uint152[${string}]`]: undefined;
127
- [x: `uint160[${string}]`]: undefined;
128
- [x: `uint168[${string}]`]: undefined;
129
- [x: `uint176[${string}]`]: undefined;
130
- [x: `uint184[${string}]`]: undefined;
131
- [x: `uint192[${string}]`]: undefined;
132
- [x: `uint200[${string}]`]: undefined;
133
- [x: `uint208[${string}]`]: undefined;
134
- [x: `uint216[${string}]`]: undefined;
135
- [x: `uint224[${string}]`]: undefined;
136
- [x: `uint232[${string}]`]: undefined;
137
- [x: `uint240[${string}]`]: undefined;
138
- [x: `uint248[${string}]`]: undefined;
139
- [x: `uint256[${string}]`]: undefined;
140
- string?: undefined;
141
- address?: undefined;
142
- bool?: undefined;
143
- bytes?: undefined;
144
- bytes8?: undefined;
145
- bytes18?: undefined;
146
- bytes4?: undefined;
147
- bytes1?: undefined;
148
- bytes23?: undefined;
149
- bytes32?: undefined;
150
- bytes31?: undefined;
151
- bytes30?: undefined;
152
- bytes29?: undefined;
153
- bytes28?: undefined;
154
- bytes27?: undefined;
155
- bytes26?: undefined;
156
- bytes25?: undefined;
157
- bytes24?: undefined;
158
- bytes22?: undefined;
159
- bytes21?: undefined;
160
- bytes20?: undefined;
161
- bytes2?: undefined;
162
- bytes19?: undefined;
163
- bytes17?: undefined;
164
- bytes16?: undefined;
165
- bytes15?: undefined;
166
- bytes14?: undefined;
167
- bytes13?: undefined;
168
- bytes12?: undefined;
169
- bytes11?: undefined;
170
- bytes10?: undefined;
171
- bytes9?: undefined;
172
- bytes7?: undefined;
173
- bytes6?: undefined;
174
- bytes5?: undefined;
175
- bytes3?: undefined;
176
- int8?: undefined;
177
- int40?: undefined;
178
- int32?: undefined;
179
- int24?: undefined;
180
- int16?: undefined;
181
- int48?: undefined;
182
- int56?: undefined;
183
- int64?: undefined;
184
- int72?: undefined;
185
- int80?: undefined;
186
- int88?: undefined;
187
- int96?: undefined;
188
- int104?: undefined;
189
- int112?: undefined;
190
- int120?: undefined;
191
- int128?: undefined;
192
- int136?: undefined;
193
- int144?: undefined;
194
- int152?: undefined;
195
- int160?: undefined;
196
- int168?: undefined;
197
- int176?: undefined;
198
- int184?: undefined;
199
- int192?: undefined;
200
- int200?: undefined;
201
- int208?: undefined;
202
- int216?: undefined;
203
- int224?: undefined;
204
- int232?: undefined;
205
- int240?: undefined;
206
- int248?: undefined;
207
- int256?: undefined;
208
- uint8?: undefined;
209
- uint40?: undefined;
210
- uint32?: undefined;
211
- uint24?: undefined;
212
- uint16?: undefined;
213
- uint48?: undefined;
214
- uint56?: undefined;
215
- uint64?: undefined;
216
- uint72?: undefined;
217
- uint80?: undefined;
218
- uint88?: undefined;
219
- uint96?: undefined;
220
- uint104?: undefined;
221
- uint112?: undefined;
222
- uint120?: undefined;
223
- uint128?: undefined;
224
- uint136?: undefined;
225
- uint144?: undefined;
226
- uint152?: undefined;
227
- uint160?: undefined;
228
- uint168?: undefined;
229
- uint176?: undefined;
230
- uint184?: undefined;
231
- uint192?: undefined;
232
- uint200?: undefined;
233
- uint208?: undefined;
234
- uint216?: undefined;
235
- uint224?: undefined;
236
- uint232?: undefined;
237
- uint240?: undefined;
238
- uint248?: undefined;
239
- uint256?: undefined;
240
- }, primaryType extends "EIP712Domain" | keyof typedData = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<`0x${string}`>;
241
- publicKey: `0x${string}`;
35
+ } | undefined) => Promise<import("viem").IsNarrowable<import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>>, import("viem").Hex> extends true ? import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>> : import("viem").Hex>;
36
+ signTypedData: <const typedData extends import("viem").TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<import("viem").Hex>;
37
+ publicKey: import("viem").Hex;
242
38
  source: "privateKey";
243
39
  type: "local";
244
40
  };
@@ -1 +1 @@
1
- {"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAQlE,OAAO,EAAE,YAAY,EAA0B,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAa9D,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,iCAAiC,CAAC;AAOzC,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E,eAAO,MAAM,2BAA2B;;;CAGvC,CAAC;AAEF,qBAAa,cAAc;IA0BhB,gBAAgB,EAAE,MAAM;IACxB,YAAY,EAAE,MAAM;IAC3B,OAAO,CAAC,aAAa;IAGrB,OAAO,CAAC,WAAW,CAAC;IA9BtB,OAAO,CAAC,eAAe,CAAmB;IACnC,qBAAqB,EAAE,KAAK,MAAM,EAAE,CAAC;IACrC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,YAAY,CAAC;IAEvB,GAAG,EAAG,iBAAiB,CAAC;IACxB,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,iBAAiB,EAAE,MAAM,EAAE,CAAM;IACjC,UAAU,EAAE;QAAE,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,UAAU,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAC/G;IAEE,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAM;IAE/C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,aAAa,CAAC;gBAGnC,QAAQ,EAAE,MAAM,EACT,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAC7B,sBAAsB,EAAE,eAAe,EAE/B,WAAW,CAAC,oBAAQ;WAqCjB,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;KAC1C;IAcD,IAAI,aAAa,uBAKhB;IAEK,gBAAgB;IActB,aAAa;;;;;;;;;IA0BP,kBAAkB;IAuDlB,YAAY;IAYZ,kBAAkB;IAoBlB,iBAAiB;IAgBjB,WAAW;;;;YAIH,YAAY;IAQpB,KAAK;IAaL,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE;IAanC,QAAQ;CAKf"}
1
+ {"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAUlE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAa9D,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,iCAAiC,CAAC;AAOzC,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E,eAAO,MAAM,qCAAqC;;;;CAIjD,CAAC;AAEF,qBAAa,cAAc;IA0BhB,gBAAgB,EAAE,MAAM;IACxB,YAAY,EAAE,MAAM;IAC3B,OAAO,CAAC,aAAa;IAGrB,OAAO,CAAC,WAAW,CAAC;IA9BtB,OAAO,CAAC,eAAe,CAAmB;IACnC,qBAAqB,EAAE,KAAK,MAAM,EAAE,CAAC;IACrC,WAAW;;;;;;;;;;wTAd4C,CAAC;sBAAsB,CAAC;;;;;;MAcnE;IAEZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,YAAY,CAAC;IAEvB,GAAG,EAAG,iBAAiB,CAAC;IACxB,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,iBAAiB,EAAE,MAAM,EAAE,CAAM;IACjC,UAAU,EAAE;QAAE,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,UAAU,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAC/G;IAEE,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAM;IAE/C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,aAAa,CAAC;gBAGnC,QAAQ,EAAE,MAAM,EACT,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAC7B,sBAAsB,EAAE,eAAe,EAE/B,WAAW,CAAC,EAAE,MAAM,YAAA;WAqCjB,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;KAC1C;IAcD,IAAI,aAAa,uBAKhB;IAEK,gBAAgB;IActB,aAAa;;;;;;;;;IA0BP,kBAAkB;IA0DlB,YAAY;IAYZ,kBAAkB;IAoBlB,iBAAiB;IAgBjB,WAAW;;;;YAIH,YAAY;IAQpB,KAAK;IAaL,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE;IAanC,QAAQ;CAKf"}
@@ -1,6 +1,6 @@
1
1
  import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
2
- import { L1TxUtils, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
3
- import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
2
+ import { L1TxUtils, RollupContract, deployL1Contract, getExpectedAddress, getL1ContractsConfigEnvVars, l1Artifacts } from '@aztec/ethereum';
3
+ import { ChainMonitor } from '@aztec/ethereum/test';
4
4
  import { createLogger } from '@aztec/foundation/log';
5
5
  import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
6
6
  import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
@@ -17,9 +17,10 @@ import { getEndToEndTestTelemetryClient } from '../fixtures/with_telemetry_utils
17
17
  const BOOTSTRAP_NODE_PRIVATE_KEY = '080212208f988fc0899e4a73a5aee4d271a5f20670603a756ad8d84f2c94263a6427c591';
18
18
  const l1ContractsConfig = getL1ContractsConfigEnvVars();
19
19
  export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
20
- export const SHORTENED_BLOCK_TIME_CONFIG = {
20
+ export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
21
21
  aztecSlotDuration: 12,
22
- ethereumSlotDuration: 4
22
+ ethereumSlotDuration: 4,
23
+ aztecProofSubmissionWindow: 640
23
24
  };
24
25
  export class P2PNetworkTest {
25
26
  bootstrapNodeEnr;
@@ -58,7 +59,7 @@ export class P2PNetworkTest {
58
59
  this.prefilledPublicData = [];
59
60
  this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
60
61
  // Set up the base account and node private keys for the initial network deployment
61
- this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(0).toString('hex')}`;
62
+ this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1).toString('hex')}`;
62
63
  this.baseAccount = privateKeyToAccount(this.baseAccountPrivateKey);
63
64
  this.proposerPrivateKeys = generatePrivateKeys(PROPOSER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
64
65
  this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
@@ -127,7 +128,7 @@ export class P2PNetworkTest {
127
128
  }
128
129
  async applyBaseSnapshots() {
129
130
  await this.addBootstrapNode();
130
- await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, aztecNodeConfig, dateProvider })=>{
131
+ await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, dateProvider, cheatCodes })=>{
131
132
  const rollup = getContract({
132
133
  address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
133
134
  abi: RollupAbi,
@@ -139,14 +140,19 @@ export class P2PNetworkTest {
139
140
  abi: TestERC20Abi,
140
141
  client: deployL1ContractsValues.l1Client
141
142
  });
143
+ const { address: multiAdderAddress } = await deployL1Contract(deployL1ContractsValues.l1Client, l1Artifacts.multiAdder.contractAbi, l1Artifacts.multiAdder.contractBytecode, [
144
+ rollup.address,
145
+ deployL1ContractsValues.l1Client.account.address
146
+ ]);
147
+ const multiAdder = getContract({
148
+ address: multiAdderAddress.toString(),
149
+ abi: l1Artifacts.multiAdder.contractAbi,
150
+ client: deployL1ContractsValues.l1Client
151
+ });
142
152
  const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
143
153
  await Promise.all([
144
154
  await stakingAsset.write.mint([
145
- deployL1ContractsValues.l1Client.account.address,
146
- stakeNeeded
147
- ], {}),
148
- await stakingAsset.write.approve([
149
- deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
155
+ multiAdder.address,
150
156
  stakeNeeded
151
157
  ], {})
152
158
  ].map((txHash)=>deployL1ContractsValues.l1Client.waitForTransactionReceipt({
@@ -155,20 +161,11 @@ export class P2PNetworkTest {
155
161
  const { validators } = this.getValidators();
156
162
  this.validators = validators;
157
163
  await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
158
- hash: await rollup.write.cheat__InitialiseValidatorSet([
164
+ hash: await multiAdder.write.addValidators([
159
165
  this.validators
160
166
  ])
161
167
  });
162
- const slotsInEpoch = await rollup.read.getEpochDuration();
163
- const timestamp = await rollup.read.getTimestampForSlot([
164
- slotsInEpoch
165
- ]);
166
- const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
167
- try {
168
- await cheatCodes.warp(Number(timestamp));
169
- } catch (err) {
170
- this.logger.debug('Warp failed, time already satisfied');
171
- }
168
+ const timestamp = await cheatCodes.rollup.advanceToEpoch(2n);
172
169
  // Send and await a tx to make sure we mine a block for the warp to correctly progress.
173
170
  await this._sendDummyTx(deployL1ContractsValues.l1Client);
174
171
  // Set the system time in the node, only after we have warped the time and waited for a block
@@ -1 +1 @@
1
- {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAM,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,MAAM,EAAiD,MAAM,iBAAiB,CAAC;AAExH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAyD,MAAM,mBAAmB,CAAC;AAEtG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,WACrB,MAAM,gBACA,YAAY,UAClB,MAAM,SACR;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,sBAsB/B,CAAC;AAGF,eAAO,MAAM,qCAAqC,WACxC,MAAM,QACR,gBAAgB,UACd,MAAM,iBACC,kBAAkB,KAChC,QAAQ,WAAW,CAgBrB,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAqB9E"}
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAM,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,MAAM,EAAiD,MAAM,iBAAiB,CAAC;AAExH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAyD,MAAM,mBAAmB,CAAC;AAEtG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,cAAc,YAAY,EAC1B,QAAQ,MAAM,EACd,OAAM;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,sBAsBpC,CAAC;AAGF,eAAO,MAAM,qCAAqC,GAChD,QAAQ,MAAM,EACd,MAAM,gBAAgB,EACtB,QAAQ,MAAM,EACd,eAAe,kBAAkB,KAChC,OAAO,CAAC,WAAW,CAgBrB,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAqB9E"}
@@ -1 +1 @@
1
- {"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/e2e_prover/e2e_prover_test.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAqB,KAAK,6BAA6B,EAAuB,MAAM,kBAAkB,CAAC;AAE9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,2BAA2B,EAAoB,MAAM,iBAAiB,CAAC;AAGrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AASlE;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,OAAO,EAAE,0BAA0B,EAAE,CAAM;IAC3C,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,UAAU,CAAC;IACjB,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,aAAa,EAAE,CAAM;IACnC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAW3B;;;;OAIG;IACG,kBAAkB;IAqDlB,KAAK;YA+JG,WAAW;IAQzB,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAeR,iBAAiB;IA+CjB,cAAc;CAuBrB"}
1
+ {"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/e2e_prover/e2e_prover_test.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAqB,KAAK,6BAA6B,EAAuB,MAAM,kBAAkB,CAAC;AAE9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,2BAA2B,EAAoB,MAAM,iBAAiB,CAAC;AAGrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AASlE;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,OAAO,EAAE,0BAA0B,EAAE,CAAM;IAC3C,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,UAAU,CAAC;IACjB,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,aAAa,EAAE,CAAM;IACnC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAW3B;;;;OAIG;IACG,kBAAkB;IAqDlB,KAAK;YA+JG,WAAW;IAQzB,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAeR,iBAAiB;IA+CjB,cAAc;CAuBrB"}