@aztec/end-to-end 0.0.1-commit.c7c42ec → 0.0.1-commit.f295ac2

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 (111) hide show
  1. package/dest/bench/client_flows/benchmark.d.ts +3 -2
  2. package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
  3. package/dest/bench/client_flows/benchmark.js +21 -1
  4. package/dest/bench/client_flows/client_flows_benchmark.d.ts +12 -13
  5. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  6. package/dest/bench/client_flows/client_flows_benchmark.js +105 -135
  7. package/dest/bench/client_flows/data_extractor.js +3 -1
  8. package/dest/bench/utils.d.ts +5 -5
  9. package/dest/bench/utils.d.ts.map +1 -1
  10. package/dest/bench/utils.js +8 -5
  11. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +6 -7
  12. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  13. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +98 -113
  14. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +15 -10
  15. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  16. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +89 -70
  17. package/dest/e2e_deploy_contract/deploy_test.d.ts +4 -3
  18. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  19. package/dest/e2e_deploy_contract/deploy_test.js +18 -13
  20. package/dest/e2e_epochs/epochs_test.js +2 -2
  21. package/dest/e2e_fees/bridging_race.notest.js +2 -4
  22. package/dest/e2e_fees/fees_test.d.ts +13 -13
  23. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  24. package/dest/e2e_fees/fees_test.js +123 -141
  25. package/dest/e2e_l1_publisher/write_json.d.ts +3 -3
  26. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
  27. package/dest/e2e_l1_publisher/write_json.js +19 -15
  28. package/dest/e2e_nested_contract/nested_contract_test.d.ts +6 -9
  29. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  30. package/dest/e2e_nested_contract/nested_contract_test.js +32 -40
  31. package/dest/e2e_p2p/inactivity_slash_test.d.ts +3 -3
  32. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
  33. package/dest/e2e_p2p/inactivity_slash_test.js +3 -3
  34. package/dest/e2e_p2p/p2p_network.d.ts +7 -6
  35. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  36. package/dest/e2e_p2p/p2p_network.js +107 -104
  37. package/dest/e2e_p2p/shared.d.ts +1 -1
  38. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  39. package/dest/e2e_p2p/shared.js +4 -4
  40. package/dest/e2e_token_contract/token_contract_test.d.ts +16 -9
  41. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  42. package/dest/e2e_token_contract/token_contract_test.js +90 -92
  43. package/dest/fixtures/e2e_prover_test.d.ts +8 -14
  44. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  45. package/dest/fixtures/e2e_prover_test.js +83 -95
  46. package/dest/fixtures/setup.d.ts +216 -0
  47. package/dest/fixtures/setup.d.ts.map +1 -0
  48. package/dest/fixtures/setup.js +684 -0
  49. package/dest/fixtures/utils.d.ts +5 -194
  50. package/dest/fixtures/utils.d.ts.map +1 -1
  51. package/dest/fixtures/utils.js +4 -619
  52. package/dest/quality_of_service/grafana_client.d.ts +41 -0
  53. package/dest/quality_of_service/grafana_client.d.ts.map +1 -0
  54. package/dest/quality_of_service/{alert_checker.js → grafana_client.js} +1 -1
  55. package/dest/quality_of_service/prometheus_client.d.ts +38 -0
  56. package/dest/quality_of_service/prometheus_client.d.ts.map +1 -0
  57. package/dest/quality_of_service/prometheus_client.js +67 -0
  58. package/dest/shared/cross_chain_test_harness.d.ts +14 -3
  59. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  60. package/dest/shared/cross_chain_test_harness.js +2 -2
  61. package/dest/shared/gas_portal_test_harness.d.ts +11 -1
  62. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  63. package/dest/shared/index.d.ts +2 -2
  64. package/dest/shared/index.d.ts.map +1 -1
  65. package/dest/shared/uniswap_l1_l2.d.ts +3 -28
  66. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  67. package/dest/shared/uniswap_l1_l2.js +39 -21
  68. package/dest/simulators/lending_simulator.d.ts +5 -1
  69. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  70. package/dest/spartan/setup_test_wallets.d.ts +4 -3
  71. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  72. package/dest/spartan/tx_metrics.d.ts +4 -1
  73. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  74. package/dest/spartan/tx_metrics.js +24 -1
  75. package/dest/spartan/utils.d.ts +12 -5
  76. package/dest/spartan/utils.d.ts.map +1 -1
  77. package/dest/spartan/utils.js +123 -73
  78. package/package.json +40 -39
  79. package/src/bench/client_flows/benchmark.ts +24 -2
  80. package/src/bench/client_flows/client_flows_benchmark.ts +143 -196
  81. package/src/bench/client_flows/data_extractor.ts +1 -1
  82. package/src/bench/utils.ts +11 -7
  83. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +107 -142
  84. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +127 -116
  85. package/src/e2e_deploy_contract/deploy_test.ts +21 -14
  86. package/src/e2e_epochs/epochs_test.ts +2 -2
  87. package/src/e2e_fees/bridging_race.notest.ts +2 -5
  88. package/src/e2e_fees/fees_test.ts +172 -216
  89. package/src/e2e_l1_publisher/write_json.ts +22 -17
  90. package/src/e2e_nested_contract/nested_contract_test.ts +35 -56
  91. package/src/e2e_p2p/inactivity_slash_test.ts +5 -5
  92. package/src/e2e_p2p/p2p_network.ts +166 -168
  93. package/src/e2e_p2p/shared.ts +6 -5
  94. package/src/e2e_token_contract/token_contract_test.ts +105 -118
  95. package/src/fixtures/e2e_prover_test.ts +107 -137
  96. package/src/fixtures/setup.ts +1010 -0
  97. package/src/fixtures/utils.ts +27 -907
  98. package/src/quality_of_service/{alert_checker.ts → grafana_client.ts} +1 -1
  99. package/src/quality_of_service/prometheus_client.ts +113 -0
  100. package/src/shared/cross_chain_test_harness.ts +3 -9
  101. package/src/shared/index.ts +1 -1
  102. package/src/shared/uniswap_l1_l2.ts +46 -58
  103. package/src/spartan/setup_test_wallets.ts +7 -1
  104. package/src/spartan/tx_metrics.ts +27 -4
  105. package/src/spartan/utils.ts +112 -24
  106. package/dest/fixtures/snapshot_manager.d.ts +0 -93
  107. package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
  108. package/dest/fixtures/snapshot_manager.js +0 -493
  109. package/dest/quality_of_service/alert_checker.d.ts +0 -41
  110. package/dest/quality_of_service/alert_checker.d.ts.map +0 -1
  111. package/src/fixtures/snapshot_manager.ts +0 -651
@@ -8,7 +8,7 @@ import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist'
8
8
  import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
9
9
  import type { SequencerClient } from '@aztec/sequencer-client';
10
10
  import type { TestWallet } from '@aztec/test-wallet/server';
11
- import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
11
+ import { type EndToEndContext } from '../fixtures/setup.js';
12
12
  import { TokenSimulator } from '../simulators/token_simulator.js';
13
13
  export declare class Role {
14
14
  private isAdmin;
@@ -25,7 +25,7 @@ export declare class Role {
25
25
  }
26
26
  export declare class BlacklistTokenContractTest {
27
27
  static CHANGE_ROLES_DELAY: number;
28
- private snapshotManager;
28
+ context: EndToEndContext;
29
29
  logger: Logger;
30
30
  wallet: TestWallet;
31
31
  asset: TokenBlacklistContract;
@@ -40,15 +40,14 @@ export declare class BlacklistTokenContractTest {
40
40
  constructor(testName: string);
41
41
  crossTimestampOfChange(): Promise<void>;
42
42
  /**
43
- * Adds two state shifts to snapshot manager.
43
+ * Applies base setup:
44
44
  * 1. Add 3 accounts.
45
45
  * 2. Publicly deploy accounts, deploy token contract and a "bad account".
46
46
  */
47
- applyBaseSnapshots(): Promise<void>;
47
+ applyBaseSetup(): Promise<void>;
48
48
  setup(): Promise<void>;
49
- snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
50
49
  teardown(): Promise<void>;
51
50
  addPendingShieldNoteToPXE(contract: TokenBlacklistContract, recipient: AztecAddress, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
52
- applyMintSnapshot(): Promise<void>;
51
+ applyMint(): Promise<void>;
53
52
  }
54
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0L2JsYWNrbGlzdF90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXZELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFFTCxLQUFLLGlCQUFpQixFQUl2QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUlsRSxxQkFBYSxJQUFJO0lBQ2YsT0FBTyxDQUFDLE9BQU8sQ0FBUztJQUN4QixPQUFPLENBQUMsUUFBUSxDQUFTO0lBQ3pCLE9BQU8sQ0FBQyxhQUFhLENBQVM7SUFFOUIsU0FBUyxTQUdSO0lBRUQsVUFBVSxTQUdUO0lBRUQsZUFBZSxTQUdkO0lBRUQsWUFBWTs7OztNQUlYO0NBQ0Y7QUFFRCxxQkFBYSwwQkFBMEI7SUFFckMsTUFBTSxDQUFDLGtCQUFrQixTQUFTO0lBRWxDLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsRUFBRyxlQUFlLENBQUM7SUFDNUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsa0JBQWtCLEVBQUcsWUFBWSxDQUFDO0lBRWxDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFHM0I7SUFFSyxzQkFBc0Isa0JBTTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkE4RHZCO0lBRUssS0FBSyxrQkFFVjtJQUVELFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQUViO0lBRUsseUJBQXlCLENBQzdCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFlBQVksRUFDdkIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUNkLE1BQU0sRUFBRSxNQUFNLGlCQWNmO0lBRUssaUJBQWlCLGtCQWtFdEI7Q0FDRiJ9
53
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0L2JsYWNrbGlzdF90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXZELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUNuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEUscUJBQWEsSUFBSTtJQUNmLE9BQU8sQ0FBQyxPQUFPLENBQVM7SUFDeEIsT0FBTyxDQUFDLFFBQVEsQ0FBUztJQUN6QixPQUFPLENBQUMsYUFBYSxDQUFTO0lBRTlCLFNBQVMsU0FHUjtJQUVELFVBQVUsU0FHVDtJQUVELGVBQWUsU0FHZDtJQUVELFlBQVk7Ozs7TUFJWDtDQUNGO0FBRUQscUJBQWEsMEJBQTBCO0lBRXJDLE1BQU0sQ0FBQyxrQkFBa0IsU0FBUztJQUVsQyxPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsRUFBRyxlQUFlLENBQUM7SUFDNUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsa0JBQWtCLEVBQUcsWUFBWSxDQUFDO0lBRWxDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFFM0I7SUFFSyxzQkFBc0Isa0JBTTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGNBQWMsa0JBaURuQjtJQUVLLEtBQUssa0JBT1Y7SUFFSyxRQUFRLGtCQUViO0lBRUsseUJBQXlCLENBQzdCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFlBQVksRUFDdkIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUNkLE1BQU0sRUFBRSxNQUFNLGlCQWNmO0lBRUssU0FBUyxrQkFzRGQ7Q0FDRiJ9
@@ -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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,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,SAGR;IAED,UAAU,SAGT;IAED,eAAe,SAGd;IAED,YAAY;;;;MAIX;CACF;AAED,qBAAa,0BAA0B;IAErC,MAAM,CAAC,kBAAkB,SAAS;IAElC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,EAAG,eAAe,CAAC;IAC5B,SAAS,EAAG,SAAS,CAAC;IAEtB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,kBAAkB,EAAG,YAAY,CAAC;IAElC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAEK,sBAAsB,kBAM3B;IAED;;;;OAIG;IACG,kBAAkB,kBA8DvB;IAEK,KAAK,kBAEV;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAEb;IAEK,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM,iBAcf;IAEK,iBAAiB,kBAkEtB;CACF"}
1
+ {"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,EAAE,KAAK,eAAe,EAAyD,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS,SAGR;IAED,UAAU,SAGT;IAED,eAAe,SAGd;IAED,YAAY;;;;MAIX;CACF;AAED,qBAAa,0BAA0B;IAErC,MAAM,CAAC,kBAAkB,SAAS;IAElC,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,EAAG,eAAe,CAAC;IAC5B,SAAS,EAAG,SAAS,CAAC;IAEtB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,kBAAkB,EAAG,YAAY,CAAC;IAElC,YAAY,QAAQ,EAAE,MAAM,EAE3B;IAEK,sBAAsB,kBAM3B;IAED;;;;OAIG;IACG,cAAc,kBAiDnB;IAEK,KAAK,kBAOV;IAEK,QAAQ,kBAEb;IAEK,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM,iBAcf;IAEK,SAAS,kBAsDd;CACF"}
@@ -4,9 +4,8 @@ import { createLogger } from '@aztec/aztec.js/log';
4
4
  import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
5
5
  import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
6
6
  import { jest } from '@jest/globals';
7
- import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
7
+ import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
8
8
  import { TokenSimulator } from '../simulators/token_simulator.js';
9
- const { E2E_DATA_PATH: dataPath } = process.env;
10
9
  export class Role {
11
10
  isAdmin = false;
12
11
  isMinter = false;
@@ -36,7 +35,7 @@ export class Role {
36
35
  export class BlacklistTokenContractTest {
37
36
  // This value MUST match the same value that we have in the contract
38
37
  static CHANGE_ROLES_DELAY = 86400;
39
- snapshotManager;
38
+ context;
40
39
  logger;
41
40
  wallet;
42
41
  asset;
@@ -50,136 +49,122 @@ export class BlacklistTokenContractTest {
50
49
  blacklistedAddress;
51
50
  constructor(testName){
52
51
  this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
53
- this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
54
52
  }
55
53
  async crossTimestampOfChange() {
56
54
  await this.cheatCodes.warpL2TimeAtLeastBy(this.sequencer, this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
57
55
  }
58
56
  /**
59
- * Adds two state shifts to snapshot manager.
57
+ * Applies base setup:
60
58
  * 1. Add 3 accounts.
61
59
  * 2. Publicly deploy accounts, deploy token contract and a "bad account".
62
- */ async applyBaseSnapshots() {
60
+ */ async applyBaseSetup() {
63
61
  // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
64
62
  jest.setTimeout(120_000);
65
- await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { cheatCodes, aztecNode, sequencer, wallet })=>{
66
- this.cheatCodes = cheatCodes;
67
- this.aztecNode = aztecNode;
68
- this.sequencer = sequencer;
69
- this.wallet = wallet;
70
- this.adminAddress = deployedAccounts[0].address;
71
- this.otherAddress = deployedAccounts[1].address;
72
- this.blacklistedAddress = deployedAccounts[2].address;
73
- return Promise.resolve();
74
- });
75
- await this.snapshotManager.snapshot('e2e_blacklist_token_contract', async ()=>{
76
- // Create the token contract state.
77
- // Move this account thing to addAccounts above?
78
- this.logger.verbose(`Public deploy accounts...`);
79
- await publicDeployAccounts(this.wallet, [
80
- this.adminAddress,
81
- this.otherAddress,
82
- this.blacklistedAddress
83
- ]);
84
- this.logger.verbose(`Deploying TokenContract...`);
85
- this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
86
- from: this.adminAddress
87
- }).deployed();
88
- this.logger.verbose(`Token deployed to ${this.asset.address}`);
89
- this.logger.verbose(`Deploying bad account...`);
90
- this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
91
- from: this.adminAddress
92
- }).deployed();
93
- this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
94
- await this.crossTimestampOfChange();
95
- return {
96
- tokenContractAddress: this.asset.address,
97
- badAccountAddress: this.badAccount.address
98
- };
99
- }, async ({ tokenContractAddress, badAccountAddress })=>{
100
- // Restore the token contract state.
101
- this.asset = TokenBlacklistContract.at(tokenContractAddress, this.wallet);
102
- this.logger.verbose(`Token contract address: ${this.asset.address}`);
103
- this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
104
- this.adminAddress,
105
- this.otherAddress,
106
- this.blacklistedAddress
107
- ]);
108
- this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
109
- this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
110
- expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
111
- from: this.adminAddress
112
- })).toEqual(new Role().withAdmin().toNoirStruct());
63
+ this.logger.info('Deploying 3 accounts');
64
+ const { deployedAccounts } = await deployAccounts(3, this.logger)({
65
+ wallet: this.context.wallet,
66
+ initialFundedAccounts: this.context.initialFundedAccounts
113
67
  });
68
+ this.cheatCodes = this.context.cheatCodes;
69
+ this.aztecNode = this.context.aztecNodeService;
70
+ this.sequencer = this.context.sequencer;
71
+ this.wallet = this.context.wallet;
72
+ this.adminAddress = deployedAccounts[0].address;
73
+ this.otherAddress = deployedAccounts[1].address;
74
+ this.blacklistedAddress = deployedAccounts[2].address;
75
+ this.logger.info('Setting up blacklist token contract');
76
+ // Create the token contract state.
77
+ this.logger.verbose(`Public deploy accounts...`);
78
+ await publicDeployAccounts(this.wallet, [
79
+ this.adminAddress,
80
+ this.otherAddress,
81
+ this.blacklistedAddress
82
+ ]);
83
+ this.logger.verbose(`Deploying TokenContract...`);
84
+ this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
85
+ from: this.adminAddress
86
+ }).deployed();
87
+ this.logger.verbose(`Token deployed to ${this.asset.address}`);
88
+ this.logger.verbose(`Deploying bad account...`);
89
+ this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
90
+ from: this.adminAddress
91
+ }).deployed();
92
+ this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
93
+ await this.crossTimestampOfChange();
94
+ this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
95
+ this.adminAddress,
96
+ this.otherAddress,
97
+ this.blacklistedAddress
98
+ ]);
99
+ expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
100
+ from: this.adminAddress
101
+ })).toEqual(new Role().withAdmin().toNoirStruct());
114
102
  }
115
103
  async setup() {
116
- await this.snapshotManager.setup();
104
+ this.logger.info('Setting up fresh context');
105
+ this.context = await setup(0, {
106
+ fundSponsoredFPC: true,
107
+ skipAccountDeployment: true
108
+ });
109
+ await this.applyBaseSetup();
117
110
  }
118
- snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
119
111
  async teardown() {
120
- await this.snapshotManager.teardown();
112
+ await teardown(this.context);
121
113
  }
122
114
  async addPendingShieldNoteToPXE(contract, recipient, amount, secretHash, txHash) {
123
115
  const txEffects = await this.aztecNode.getTxEffect(txHash);
124
- await contract.methods.deliver_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
116
+ await contract.methods.process_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
125
117
  from: recipient
126
118
  });
127
119
  }
128
- async applyMintSnapshot() {
129
- await this.snapshotManager.snapshot('mint', async ()=>{
130
- const { asset } = this;
131
- const amount = 10000n;
132
- const adminMinterRole = new Role().withAdmin().withMinter();
133
- await this.asset.methods.update_roles(this.adminAddress, adminMinterRole.toNoirStruct()).send({
134
- from: this.adminAddress
135
- }).wait();
136
- const blacklistRole = new Role().withBlacklisted();
137
- await this.asset.methods.update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct()).send({
138
- from: this.adminAddress
139
- }).wait();
140
- await this.crossTimestampOfChange();
141
- expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
142
- from: this.adminAddress
143
- })).toEqual(adminMinterRole.toNoirStruct());
144
- this.logger.verbose(`Minting ${amount} publicly...`);
145
- await asset.methods.mint_public(this.adminAddress, amount).send({
146
- from: this.adminAddress
147
- }).wait();
148
- this.logger.verbose(`Minting ${amount} privately...`);
149
- const secret = Fr.random();
150
- const secretHash = await computeSecretHash(secret);
151
- const receipt = await asset.methods.mint_private(amount, secretHash).send({
152
- from: this.adminAddress
153
- }).wait();
154
- await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
155
- const txClaim = asset.methods.redeem_shield(this.adminAddress, amount, secret).send({
156
- from: this.adminAddress
157
- });
158
- await txClaim.wait();
159
- this.logger.verbose(`Minting complete.`);
160
- return {
161
- amount
162
- };
163
- }, async ({ amount })=>{
164
- const { asset, tokenSim } = this;
165
- tokenSim.mintPublic(this.adminAddress, amount);
166
- const publicBalance = await asset.methods.balance_of_public(this.adminAddress).simulate({
167
- from: this.adminAddress
168
- });
169
- this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
170
- expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
171
- tokenSim.mintPrivate(this.adminAddress, amount);
172
- const privateBalance = await asset.methods.balance_of_private(this.adminAddress).simulate({
173
- from: this.adminAddress
174
- });
175
- this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
176
- expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
177
- const totalSupply = await asset.methods.total_supply().simulate({
178
- from: this.adminAddress
179
- });
180
- this.logger.verbose(`Total supply: ${totalSupply}`);
181
- expect(totalSupply).toEqual(tokenSim.totalSupply);
182
- return Promise.resolve();
120
+ async applyMint() {
121
+ this.logger.info('Applying mint setup');
122
+ const { asset, tokenSim } = this;
123
+ const amount = 10000n;
124
+ const adminMinterRole = new Role().withAdmin().withMinter();
125
+ await this.asset.methods.update_roles(this.adminAddress, adminMinterRole.toNoirStruct()).send({
126
+ from: this.adminAddress
127
+ }).wait();
128
+ const blacklistRole = new Role().withBlacklisted();
129
+ await this.asset.methods.update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct()).send({
130
+ from: this.adminAddress
131
+ }).wait();
132
+ await this.crossTimestampOfChange();
133
+ expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
134
+ from: this.adminAddress
135
+ })).toEqual(adminMinterRole.toNoirStruct());
136
+ this.logger.verbose(`Minting ${amount} publicly...`);
137
+ await asset.methods.mint_public(this.adminAddress, amount).send({
138
+ from: this.adminAddress
139
+ }).wait();
140
+ this.logger.verbose(`Minting ${amount} privately...`);
141
+ const secret = Fr.random();
142
+ const secretHash = await computeSecretHash(secret);
143
+ const receipt = await asset.methods.mint_private(amount, secretHash).send({
144
+ from: this.adminAddress
145
+ }).wait();
146
+ await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
147
+ const txClaim = asset.methods.redeem_shield(this.adminAddress, amount, secret).send({
148
+ from: this.adminAddress
149
+ });
150
+ await txClaim.wait();
151
+ this.logger.verbose(`Minting complete.`);
152
+ tokenSim.mintPublic(this.adminAddress, amount);
153
+ const publicBalance = await asset.methods.balance_of_public(this.adminAddress).simulate({
154
+ from: this.adminAddress
155
+ });
156
+ this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
157
+ expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
158
+ tokenSim.mintPrivate(this.adminAddress, amount);
159
+ const privateBalance = await asset.methods.balance_of_private(this.adminAddress).simulate({
160
+ from: this.adminAddress
161
+ });
162
+ this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
163
+ expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
164
+ const totalSupply = await asset.methods.total_supply().simulate({
165
+ from: this.adminAddress
183
166
  });
167
+ this.logger.verbose(`Total supply: ${totalSupply}`);
168
+ expect(totalSupply).toEqual(tokenSim.totalSupply);
184
169
  }
185
170
  }
@@ -2,23 +2,27 @@ import type { AztecNodeConfig } from '@aztec/aztec-node';
2
2
  import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
3
3
  import { type Logger } from '@aztec/aztec.js/log';
4
4
  import type { AztecNode } from '@aztec/aztec.js/node';
5
+ import type { TxReceipt } from '@aztec/aztec.js/tx';
5
6
  import { CheatCodes } from '@aztec/aztec/testing';
7
+ import { InboxContract, OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
6
8
  import type { DeployAztecL1ContractsArgs, DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
7
9
  import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
10
+ import { EpochNumber } from '@aztec/foundation/branded-types';
8
11
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
9
12
  import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
10
13
  import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
11
14
  import type { TestWallet } from '@aztec/test-wallet/server';
12
- import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
13
- import type { SetupOptions } from '../fixtures/utils.js';
15
+ import { type EndToEndContext, type SetupOptions } from '../fixtures/setup.js';
14
16
  import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
15
17
  export declare class CrossChainMessagingTest {
16
- private snapshotManager;
18
+ private requireEpochProven;
19
+ private setupOptions;
20
+ private deployL1ContractsArgs;
17
21
  logger: Logger;
22
+ context: EndToEndContext;
18
23
  aztecNode: AztecNode;
19
24
  aztecNodeConfig: AztecNodeConfig;
20
25
  aztecNodeAdmin: AztecNodeAdmin;
21
- ctx: SubsystemsContext;
22
26
  l1Client: ExtendedViemWalletClient | undefined;
23
27
  wallet: TestWallet;
24
28
  ownerAddress: AztecAddress;
@@ -28,15 +32,16 @@ export declare class CrossChainMessagingTest {
28
32
  ethAccount: EthAddress;
29
33
  l2Token: TokenContract;
30
34
  l2Bridge: TokenBridgeContract;
31
- inbox: any;
32
- outbox: any;
35
+ rollup: RollupContract;
36
+ inbox: InboxContract;
37
+ outbox: OutboxContract;
33
38
  cheatCodes: CheatCodes;
34
39
  deployL1ContractsValues: DeployAztecL1ContractsReturnType;
35
40
  constructor(testName: string, opts?: SetupOptions, deployL1ContractsArgs?: Partial<DeployAztecL1ContractsArgs>);
36
- assumeProven(): Promise<void>;
37
41
  setup(): Promise<void>;
38
- snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
42
+ advanceToEpochProven(l2TxReceipt: TxReceipt): Promise<EpochNumber>;
43
+ catchUpProvenChain(): Promise<void>;
39
44
  teardown(): Promise<void>;
40
- applyBaseSnapshots(): Promise<void>;
45
+ applyBaseSetup(): Promise<void>;
41
46
  }
42
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fbWVzc2FnaW5nX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfY3Jvc3NfY2hhaW5fbWVzc2FnaW5nL2Nyb3NzX2NoYWluX21lc3NhZ2luZ190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEtBQUssRUFDViwwQkFBMEIsRUFDMUIsZ0NBQWdDLEVBQ2pDLE1BQU0sMkNBQTJDLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV0RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDM0UsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFLNUQsT0FBTyxFQUVMLEtBQUssaUJBQWlCLEVBSXZCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFJOUUscUJBQWEsdUJBQXVCO0lBQ2xDLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGVBQWUsRUFBRyxlQUFlLENBQUM7SUFDbEMsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxHQUFHLEVBQUcsaUJBQWlCLENBQUM7SUFFeEIsUUFBUSxFQUFHLHdCQUF3QixHQUFHLFNBQVMsQ0FBQztJQUVoRCxNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLHFCQUFxQixFQUFHLHFCQUFxQixDQUFDO0lBQzlDLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFDeEIsT0FBTyxFQUFHLGFBQWEsQ0FBQztJQUN4QixRQUFRLEVBQUcsbUJBQW1CLENBQUM7SUFFL0IsS0FBSyxFQUFHLEdBQUcsQ0FBQztJQUNaLE1BQU0sRUFBRyxHQUFHLENBQUM7SUFDYixVQUFVLEVBQUcsVUFBVSxDQUFDO0lBRXhCLHVCQUF1QixFQUFHLGdDQUFnQyxDQUFDO0lBRTNELFlBQ0UsUUFBUSxFQUFFLE1BQU0sRUFDaEIsSUFBSSxHQUFFLFlBQWlCLEVBQ3ZCLHFCQUFxQixHQUFFLE9BQU8sQ0FBQywwQkFBMEIsQ0FBTSxFQU9oRTtJQUVLLFlBQVksa0JBRWpCO0lBRUssS0FBSyxrQkFRVjtJQUVELFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQUViO0lBRUssa0JBQWtCLGtCQXVGdkI7Q0FDRiJ9
47
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fbWVzc2FnaW5nX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfY3Jvc3NfY2hhaW5fbWVzc2FnaW5nL2Nyb3NzX2NoYWluX21lc3NhZ2luZ190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFDViwwQkFBMEIsRUFDMUIsZ0NBQWdDLEVBQ2pDLE1BQU0sMkNBQTJDLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN0RSxPQUFPLEVBQW9CLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2hGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUc1RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssWUFBWSxFQUtsQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRTlFLHFCQUFhLHVCQUF1QjtJQUNsQyxPQUFPLENBQUMsa0JBQWtCLENBQVU7SUFDcEMsT0FBTyxDQUFDLFlBQVksQ0FBZTtJQUNuQyxPQUFPLENBQUMscUJBQXFCLENBQXNDO0lBQ25FLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsZUFBZSxFQUFHLGVBQWUsQ0FBQztJQUNsQyxjQUFjLEVBQUcsY0FBYyxDQUFDO0lBRWhDLFFBQVEsRUFBRyx3QkFBd0IsR0FBRyxTQUFTLENBQUM7SUFFaEQsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixxQkFBcUIsRUFBRyxxQkFBcUIsQ0FBQztJQUM5QyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sRUFBRyxhQUFhLENBQUM7SUFDeEIsUUFBUSxFQUFHLG1CQUFtQixDQUFDO0lBRS9CLE1BQU0sRUFBRyxjQUFjLENBQUM7SUFDeEIsS0FBSyxFQUFHLGFBQWEsQ0FBQztJQUN0QixNQUFNLEVBQUcsY0FBYyxDQUFDO0lBQ3hCLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFFeEIsdUJBQXVCLEVBQUcsZ0NBQWdDLENBQUM7SUFFM0QsWUFDRSxRQUFRLEVBQUUsTUFBTSxFQUNoQixJQUFJLEdBQUUsWUFBaUIsRUFDdkIscUJBQXFCLEdBQUUsT0FBTyxDQUFDLDBCQUEwQixDQUFNLEVBU2hFO0lBRUssS0FBSyxrQkFTVjtJQUVLLG9CQUFvQixDQUFDLFdBQVcsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQVV2RTtJQUVLLGtCQUFrQixrQkFLdkI7SUFFSyxRQUFRLGtCQUViO0lBRUssY0FBYyxrQkFrRm5CO0NBQ0YifQ==
@@ -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":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,EACV,0BAA0B,EAC1B,gCAAgC,EACjC,MAAM,2CAA2C,CAAC;AAEnD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEtE,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;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAK5D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAG,SAAS,CAAC;IACtB,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,iBAAiB,CAAC;IAExB,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,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,gCAAgC,CAAC;IAE3D,YACE,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,YAAiB,EACvB,qBAAqB,GAAE,OAAO,CAAC,0BAA0B,CAAM,EAOhE;IAEK,YAAY,kBAEjB;IAEK,KAAK,kBAQV;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAEb;IAEK,kBAAkB,kBAuFvB;CACF"}
1
+ {"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,KAAK,EACV,0BAA0B,EAC1B,gCAAgC,EACjC,MAAM,2CAA2C,CAAC;AAEnD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAoB,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGhF,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;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG5D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAKlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,qBAAqB,CAAsC;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,eAAe,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAEhC,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,MAAM,EAAG,cAAc,CAAC;IACxB,KAAK,EAAG,aAAa,CAAC;IACtB,MAAM,EAAG,cAAc,CAAC;IACxB,UAAU,EAAG,UAAU,CAAC;IAExB,uBAAuB,EAAG,gCAAgC,CAAC;IAE3D,YACE,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,YAAiB,EACvB,qBAAqB,GAAE,OAAO,CAAC,0BAA0B,CAAM,EAShE;IAEK,KAAK,kBASV;IAEK,oBAAoB,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAUvE;IAEK,kBAAkB,kBAKvB;IAEK,QAAQ,kBAEb;IAEK,cAAc,kBAkFnB;CACF"}
@@ -1,22 +1,26 @@
1
1
  import { EthAddress } from '@aztec/aztec.js/addresses';
2
+ import { waitForProven } from '@aztec/aztec.js/contracts';
2
3
  import { createLogger } from '@aztec/aztec.js/log';
3
4
  import { createExtendedL1Client } from '@aztec/ethereum/client';
5
+ import { InboxContract, OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
4
6
  import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
5
- import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
7
+ import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
8
+ import { sleep } from '@aztec/foundation/sleep';
9
+ import { TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
6
10
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
7
11
  import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
8
- import { getContract } from 'viem';
9
12
  import { MNEMONIC } from '../fixtures/fixtures.js';
10
- import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
13
+ import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
11
14
  import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
12
- const { E2E_DATA_PATH: dataPath } = process.env;
13
15
  export class CrossChainMessagingTest {
14
- snapshotManager;
16
+ requireEpochProven;
17
+ setupOptions;
18
+ deployL1ContractsArgs;
15
19
  logger;
20
+ context;
16
21
  aztecNode;
17
22
  aztecNodeConfig;
18
23
  aztecNodeAdmin;
19
- ctx;
20
24
  l1Client;
21
25
  wallet;
22
26
  ownerAddress;
@@ -26,84 +30,99 @@ export class CrossChainMessagingTest {
26
30
  ethAccount;
27
31
  l2Token;
28
32
  l2Bridge;
33
+ rollup;
29
34
  inbox;
30
35
  outbox;
31
36
  cheatCodes;
32
37
  deployL1ContractsValues;
33
38
  constructor(testName, opts = {}, deployL1ContractsArgs = {}){
34
39
  this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
35
- this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
40
+ this.setupOptions = opts;
41
+ this.deployL1ContractsArgs = {
36
42
  initialValidators: [],
37
43
  ...deployL1ContractsArgs
44
+ };
45
+ this.requireEpochProven = opts.startProverNode ?? false;
46
+ }
47
+ async setup() {
48
+ this.logger.info('Setting up cross chain messaging test');
49
+ this.context = await setup(0, {
50
+ ...this.setupOptions,
51
+ fundSponsoredFPC: true,
52
+ skipAccountDeployment: true,
53
+ l1ContractsArgs: this.deployL1ContractsArgs
38
54
  });
55
+ await this.applyBaseSetup();
39
56
  }
40
- async assumeProven() {
41
- await this.cheatCodes.rollup.markAsProven();
57
+ async advanceToEpochProven(l2TxReceipt) {
58
+ const epoch = await this.rollup.getEpochNumberForCheckpoint(CheckpointNumber.fromBlockNumber(l2TxReceipt.blockNumber));
59
+ // Warp to the next epoch.
60
+ await this.cheatCodes.rollup.advanceToEpoch(EpochNumber(epoch + 1));
61
+ // Wait for the tx to be proven.
62
+ await waitForProven(this.aztecNode, l2TxReceipt, {
63
+ provenTimeout: 300
64
+ });
65
+ // Return the epoch the tx is in.
66
+ return epoch;
42
67
  }
43
- async setup() {
44
- this.ctx = await this.snapshotManager.setup();
45
- this.aztecNode = this.ctx.aztecNode;
46
- this.wallet = this.ctx.wallet;
47
- this.aztecNodeConfig = this.ctx.aztecNodeConfig;
48
- this.cheatCodes = this.ctx.cheatCodes;
49
- this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
50
- this.aztecNodeAdmin = this.ctx.aztecNode;
68
+ async catchUpProvenChain() {
69
+ const bn = await this.aztecNode.getBlockNumber();
70
+ while(await this.aztecNode.getProvenBlockNumber() < bn){
71
+ await sleep(1000);
72
+ }
51
73
  }
52
- snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
53
74
  async teardown() {
54
- await this.snapshotManager.teardown();
75
+ await teardown(this.context);
55
76
  }
56
- async applyBaseSnapshots() {
57
- // Note that we are using the same `wallet`, `aztecNodeConfig` and `aztecNode` across all snapshots.
58
- // This is to not have issues with different networks.
59
- await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { wallet, aztecNodeConfig, aztecNode })=>{
60
- [this.ownerAddress, this.user1Address, this.user2Address] = deployedAccounts.map((a)=>a.address);
61
- this.wallet = wallet;
62
- this.aztecNode = aztecNode;
63
- this.aztecNodeConfig = aztecNodeConfig;
64
- return Promise.resolve();
65
- });
66
- await this.snapshotManager.snapshot('e2e_cross_chain_messaging', async ()=>{
67
- // Create the token contract state.
68
- // Move this account thing to addAccounts above?
69
- this.logger.verbose(`Public deploy accounts...`);
70
- await publicDeployAccounts(this.wallet, [
71
- this.ownerAddress,
72
- this.user1Address,
73
- this.user2Address
74
- ]);
75
- this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
76
- const underlyingERC20Address = await deployL1Contract(this.l1Client, TestERC20Abi, TestERC20Bytecode, [
77
- 'Underlying',
78
- 'UND',
79
- this.l1Client.account.address
80
- ]).then(({ address })=>address);
81
- this.logger.verbose(`Setting up cross chain harness...`);
82
- this.crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.l1Client, this.wallet, this.ownerAddress, this.logger, underlyingERC20Address);
83
- this.logger.verbose(`L2 token deployed to: ${this.crossChainTestHarness.l2Token.address}`);
84
- return this.crossChainTestHarness.toCrossChainContext();
85
- }, (crossChainContext)=>{
86
- this.l2Token = TokenContract.at(crossChainContext.l2Token, this.wallet);
87
- this.l2Bridge = TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
88
- // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
89
- this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
90
- const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
91
- const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
92
- const inbox = getContract({
93
- address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),
94
- abi: InboxAbi,
95
- client: l1Client
96
- });
97
- const outbox = getContract({
98
- address: this.aztecNodeConfig.l1Contracts.outboxAddress.toString(),
99
- abi: OutboxAbi,
100
- client: l1Client
101
- });
102
- this.crossChainTestHarness = new CrossChainTestHarness(this.aztecNode, this.logger, this.l2Token, this.l2Bridge, this.ethAccount, tokenPortalAddress, crossChainContext.underlying, l1Client, this.aztecNodeConfig.l1Contracts, this.wallet, this.ownerAddress);
103
- this.l1Client = l1Client;
104
- this.inbox = inbox;
105
- this.outbox = outbox;
106
- return Promise.resolve();
77
+ async applyBaseSetup() {
78
+ // Set up base context fields
79
+ this.aztecNode = this.context.aztecNodeService;
80
+ this.wallet = this.context.wallet;
81
+ this.aztecNodeConfig = this.context.config;
82
+ this.cheatCodes = this.context.cheatCodes;
83
+ this.deployL1ContractsValues = this.context.deployL1ContractsValues;
84
+ this.aztecNodeAdmin = this.context.aztecNodeService;
85
+ if (this.requireEpochProven) {
86
+ // Turn off the watcher to prevent it from keep marking blocks as proven.
87
+ this.context.watcher.setIsMarkingAsProven(false);
88
+ }
89
+ // Deploy 3 accounts
90
+ this.logger.info('Applying 3_accounts setup');
91
+ const { deployedAccounts } = await deployAccounts(3, this.logger)({
92
+ wallet: this.context.wallet,
93
+ initialFundedAccounts: this.context.initialFundedAccounts
107
94
  });
95
+ [this.ownerAddress, this.user1Address, this.user2Address] = deployedAccounts.map((a)=>a.address);
96
+ // Set up cross chain messaging
97
+ this.logger.info('Applying e2e_cross_chain_messaging setup');
98
+ // Create the token contract state.
99
+ this.logger.verbose(`Public deploy accounts...`);
100
+ await publicDeployAccounts(this.wallet, [
101
+ this.ownerAddress,
102
+ this.user1Address,
103
+ this.user2Address
104
+ ]);
105
+ this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
106
+ const underlyingERC20Address = await deployL1Contract(this.l1Client, TestERC20Abi, TestERC20Bytecode, [
107
+ 'Underlying',
108
+ 'UND',
109
+ this.l1Client.account.address
110
+ ]).then(({ address })=>address);
111
+ this.logger.verbose(`Setting up cross chain harness...`);
112
+ this.crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.l1Client, this.wallet, this.ownerAddress, this.logger, underlyingERC20Address);
113
+ this.logger.verbose(`L2 token deployed to: ${this.crossChainTestHarness.l2Token.address}`);
114
+ const crossChainContext = this.crossChainTestHarness.toCrossChainContext();
115
+ this.l2Token = TokenContract.at(crossChainContext.l2Token, this.wallet);
116
+ this.l2Bridge = TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
117
+ // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
118
+ this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
119
+ const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
120
+ const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
121
+ this.l1Client = l1Client;
122
+ const l1Contracts = this.aztecNodeConfig.l1Contracts;
123
+ this.rollup = new RollupContract(l1Client, l1Contracts.rollupAddress.toString());
124
+ this.inbox = new InboxContract(l1Client, l1Contracts.inboxAddress.toString());
125
+ this.outbox = new OutboxContract(l1Client, l1Contracts.outboxAddress.toString());
126
+ this.crossChainTestHarness = new CrossChainTestHarness(this.aztecNode, this.logger, this.l2Token, this.l2Bridge, this.ethAccount, tokenPortalAddress, crossChainContext.underlying, l1Client, this.aztecNodeConfig.l1Contracts, this.wallet, this.ownerAddress);
108
127
  }
109
128
  }
@@ -9,8 +9,9 @@ import type { Wallet } from '@aztec/aztec.js/wallet';
9
9
  import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
10
10
  import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
11
11
  import type { TestWallet } from '@aztec/test-wallet/server';
12
+ import { type EndToEndContext } from '../fixtures/setup.js';
12
13
  export declare class DeployTest {
13
- private snapshotManager;
14
+ context: EndToEndContext;
14
15
  logger: Logger;
15
16
  wallet: TestWallet;
16
17
  defaultAccountAddress: AztecAddress;
@@ -19,7 +20,7 @@ export declare class DeployTest {
19
20
  constructor(testName: string);
20
21
  setup(): Promise<this>;
21
22
  teardown(): Promise<void>;
22
- private applyInitialAccountSnapshot;
23
+ private applyInitialAccount;
23
24
  registerContract<T extends ContractBase>(wallet: Wallet, contractArtifact: ContractArtifactClass<T>, opts?: {
24
25
  salt?: Fr;
25
26
  publicKeys?: PublicKeys;
@@ -33,4 +34,4 @@ export type ContractArtifactClass<T extends ContractBase> = {
33
34
  at(address: AztecAddress, wallet: Wallet): T;
34
35
  artifact: ContractArtifact;
35
36
  };
36
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfZGVwbG95X2NvbnRyYWN0L2RlcGxveV90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssWUFBWSxFQUE4QyxNQUFNLDJCQUEyQixDQUFDO0FBQzFHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUN2RixPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQU01RCxxQkFBYSxVQUFVO0lBQ3JCLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQ25DLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLHFCQUFxQixFQUFHLFlBQVksQ0FBQztJQUNyQyxTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFFdkMsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUczQjtJQUVLLEtBQUssa0JBTVY7SUFFSyxRQUFRLGtCQUViO1lBRWEsMkJBQTJCO0lBT25DLGdCQUFnQixDQUFDLENBQUMsU0FBUyxZQUFZLEVBQzNDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsZ0JBQWdCLEVBQUUscUJBQXFCLENBQUMsQ0FBQyxDQUFDLEVBQzFDLElBQUksR0FBRTtRQUNKLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNWLFVBQVUsQ0FBQyxFQUFFLFVBQVUsQ0FBQztRQUN4QixRQUFRLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUNqQixlQUFlLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDekIsUUFBUSxDQUFDLEVBQUUsWUFBWSxDQUFDO0tBQ3BCLEdBQ0wsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQVdaO0NBQ0Y7QUFFRCxNQUFNLE1BQU0sd0JBQXdCLEdBQUcsVUFBVSxDQUFDLG9CQUFvQixDQUFDLFNBQVMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7QUFFbEcsTUFBTSxNQUFNLHFCQUFxQixDQUFDLENBQUMsU0FBUyxZQUFZLElBQUk7SUFDMUQsRUFBRSxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sR0FBRyxDQUFDLENBQUM7SUFDN0MsUUFBUSxFQUFFLGdCQUFnQixDQUFDO0NBQzVCLENBQUMifQ==
37
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfZGVwbG95X2NvbnRyYWN0L2RlcGxveV90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssWUFBWSxFQUE4QyxNQUFNLDJCQUEyQixDQUFDO0FBQzFHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUN2RixPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU1RCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQW1DLE1BQU0sc0JBQXNCLENBQUM7QUFFN0YscUJBQWEsVUFBVTtJQUNkLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRyxVQUFVLENBQUM7SUFDcEIscUJBQXFCLEVBQUcsWUFBWSxDQUFDO0lBQ3JDLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUV2QyxZQUFZLFFBQVEsRUFBRSxNQUFNLEVBRTNCO0lBRUssS0FBSyxrQkFXVjtJQUVLLFFBQVEsa0JBRWI7WUFFYSxtQkFBbUI7SUFZM0IsZ0JBQWdCLENBQUMsQ0FBQyxTQUFTLFlBQVksRUFDM0MsTUFBTSxFQUFFLE1BQU0sRUFDZCxnQkFBZ0IsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsRUFDMUMsSUFBSSxHQUFFO1FBQ0osSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ1YsVUFBVSxDQUFDLEVBQUUsVUFBVSxDQUFDO1FBQ3hCLFFBQVEsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2pCLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUN6QixRQUFRLENBQUMsRUFBRSxZQUFZLENBQUM7S0FDcEIsR0FDTCxPQUFPLENBQUMsQ0FBQyxDQUFDLENBV1o7Q0FDRjtBQUVELE1BQU0sTUFBTSx3QkFBd0IsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUMsU0FBUyxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztBQUVsRyxNQUFNLE1BQU0scUJBQXFCLENBQUMsQ0FBQyxTQUFTLFlBQVksSUFBSTtJQUMxRCxFQUFFLENBQUMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsTUFBTSxHQUFHLENBQUMsQ0FBQztJQUM3QyxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7Q0FDNUIsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"deploy_test.d.ts","sourceRoot":"","sources":["../../src/e2e_deploy_contract/deploy_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAA8C,MAAM,2BAA2B,CAAC;AAC1G,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAM5D,qBAAa,UAAU;IACrB,OAAO,CAAC,eAAe,CAAmB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAEvC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAEK,KAAK,kBAMV;IAEK,QAAQ,kBAEb;YAEa,2BAA2B;IAOnC,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAC3C,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAC1C,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,EAAE,CAAC;QACV,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,YAAY,CAAC;KACpB,GACL,OAAO,CAAC,CAAC,CAAC,CAWZ;CACF;AAED,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AAElG,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,YAAY,IAAI;IAC1D,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC;IAC7C,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC"}
1
+ {"version":3,"file":"deploy_test.d.ts","sourceRoot":"","sources":["../../src/e2e_deploy_contract/deploy_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAA8C,MAAM,2BAA2B,CAAC;AAC1G,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,sBAAsB,CAAC;AAE7F,qBAAa,UAAU;IACd,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAEvC,YAAY,QAAQ,EAAE,MAAM,EAE3B;IAEK,KAAK,kBAWV;IAEK,QAAQ,kBAEb;YAEa,mBAAmB;IAY3B,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAC3C,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAC1C,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,EAAE,CAAC;QACV,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,YAAY,CAAC;KACpB,GACL,OAAO,CAAC,CAAC,CAAC,CAWZ;CACF;AAED,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AAElG,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,YAAY,IAAI;IAC1D,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC;IAC7C,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC"}