@aztec/end-to-end 0.0.1-commit.d6f2b3f94 → 0.0.1-commit.d939eb5aa

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 (174) hide show
  1. package/README.md +27 -0
  2. package/dest/bench/client_flows/client_flows_benchmark.d.ts +2 -2
  3. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  4. package/dest/bench/client_flows/client_flows_benchmark.js +22 -29
  5. package/dest/bench/utils.d.ts +1 -1
  6. package/dest/bench/utils.d.ts.map +1 -1
  7. package/dest/bench/utils.js +6 -3
  8. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +6 -3
  9. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  10. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +23 -13
  11. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +2 -2
  12. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  13. package/dest/e2e_deploy_contract/deploy_test.d.ts +2 -2
  14. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  15. package/dest/e2e_epochs/epochs_test.d.ts +11 -7
  16. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  17. package/dest/e2e_epochs/epochs_test.js +60 -38
  18. package/dest/e2e_fees/fees_test.d.ts +2 -2
  19. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  20. package/dest/e2e_fees/fees_test.js +19 -12
  21. package/dest/e2e_nested_contract/nested_contract_test.d.ts +1 -1
  22. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  23. package/dest/e2e_nested_contract/nested_contract_test.js +4 -6
  24. package/dest/e2e_p2p/inactivity_slash_test.js +3 -3
  25. package/dest/e2e_p2p/p2p_network.d.ts +9 -10
  26. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  27. package/dest/e2e_p2p/p2p_network.js +38 -20
  28. package/dest/e2e_p2p/reqresp/utils.d.ts +3 -3
  29. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -1
  30. package/dest/e2e_p2p/reqresp/utils.js +46 -9
  31. package/dest/e2e_p2p/shared.d.ts +26 -8
  32. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  33. package/dest/e2e_p2p/shared.js +51 -45
  34. package/dest/e2e_token_contract/token_contract_test.d.ts +4 -2
  35. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  36. package/dest/e2e_token_contract/token_contract_test.js +19 -9
  37. package/dest/fixtures/authwit_proxy.d.ts +15 -0
  38. package/dest/fixtures/authwit_proxy.d.ts.map +1 -0
  39. package/dest/fixtures/authwit_proxy.js +34 -0
  40. package/dest/fixtures/e2e_prover_test.d.ts +7 -6
  41. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  42. package/dest/fixtures/e2e_prover_test.js +37 -49
  43. package/dest/fixtures/elu_monitor.d.ts +21 -0
  44. package/dest/fixtures/elu_monitor.d.ts.map +1 -0
  45. package/dest/fixtures/elu_monitor.js +102 -0
  46. package/dest/fixtures/fixtures.d.ts +5 -1
  47. package/dest/fixtures/fixtures.d.ts.map +1 -1
  48. package/dest/fixtures/fixtures.js +6 -0
  49. package/dest/fixtures/get_bb_config.d.ts +1 -1
  50. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  51. package/dest/fixtures/get_bb_config.js +5 -5
  52. package/dest/fixtures/ha_setup.d.ts +1 -1
  53. package/dest/fixtures/ha_setup.d.ts.map +1 -1
  54. package/dest/fixtures/ha_setup.js +3 -1
  55. package/dest/fixtures/setup.d.ts +41 -17
  56. package/dest/fixtures/setup.d.ts.map +1 -1
  57. package/dest/fixtures/setup.js +76 -95
  58. package/dest/fixtures/setup_p2p_test.d.ts +10 -7
  59. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  60. package/dest/fixtures/setup_p2p_test.js +18 -15
  61. package/dest/fixtures/token_utils.d.ts +2 -2
  62. package/dest/fixtures/token_utils.d.ts.map +1 -1
  63. package/dest/fixtures/token_utils.js +5 -7
  64. package/dest/legacy-jest-resolver.d.cts +3 -0
  65. package/dest/legacy-jest-resolver.d.cts.map +1 -0
  66. package/dest/shared/cross_chain_test_harness.d.ts +1 -1
  67. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  68. package/dest/shared/cross_chain_test_harness.js +13 -13
  69. package/dest/shared/gas_portal_test_harness.js +2 -2
  70. package/dest/shared/index.d.ts +2 -1
  71. package/dest/shared/index.d.ts.map +1 -1
  72. package/dest/shared/index.js +1 -0
  73. package/dest/shared/jest_setup.js +41 -1
  74. package/dest/shared/mock_state_view.d.ts +86 -0
  75. package/dest/shared/mock_state_view.d.ts.map +1 -0
  76. package/dest/shared/mock_state_view.js +186 -0
  77. package/dest/shared/submit-transactions.d.ts +2 -2
  78. package/dest/shared/submit-transactions.d.ts.map +1 -1
  79. package/dest/shared/submit-transactions.js +1 -1
  80. package/dest/shared/uniswap_l1_l2.d.ts +1 -1
  81. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  82. package/dest/shared/uniswap_l1_l2.js +14 -17
  83. package/dest/simulators/lending_simulator.d.ts +1 -1
  84. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  85. package/dest/simulators/lending_simulator.js +4 -4
  86. package/dest/simulators/token_simulator.d.ts +1 -1
  87. package/dest/simulators/token_simulator.d.ts.map +1 -1
  88. package/dest/simulators/token_simulator.js +3 -24
  89. package/dest/spartan/setup_test_wallets.d.ts +12 -3
  90. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  91. package/dest/spartan/setup_test_wallets.js +100 -39
  92. package/dest/spartan/tx_metrics.js +1 -1
  93. package/dest/spartan/utils/bot.d.ts +3 -2
  94. package/dest/spartan/utils/bot.d.ts.map +1 -1
  95. package/dest/spartan/utils/bot.js +2 -1
  96. package/dest/spartan/utils/config.d.ts +7 -1
  97. package/dest/spartan/utils/config.d.ts.map +1 -1
  98. package/dest/spartan/utils/config.js +3 -1
  99. package/dest/spartan/utils/index.d.ts +4 -2
  100. package/dest/spartan/utils/index.d.ts.map +1 -1
  101. package/dest/spartan/utils/index.js +5 -1
  102. package/dest/spartan/utils/k8s.d.ts +3 -1
  103. package/dest/spartan/utils/k8s.d.ts.map +1 -1
  104. package/dest/spartan/utils/k8s.js +6 -0
  105. package/dest/spartan/utils/nodes.d.ts +4 -5
  106. package/dest/spartan/utils/nodes.d.ts.map +1 -1
  107. package/dest/spartan/utils/nodes.js +9 -9
  108. package/dest/spartan/utils/pod_logs.d.ts +25 -0
  109. package/dest/spartan/utils/pod_logs.d.ts.map +1 -0
  110. package/dest/spartan/utils/pod_logs.js +74 -0
  111. package/dest/test-wallet/test_wallet.d.ts +84 -0
  112. package/dest/test-wallet/test_wallet.d.ts.map +1 -0
  113. package/dest/test-wallet/test_wallet.js +249 -0
  114. package/dest/test-wallet/utils.d.ts +41 -0
  115. package/dest/test-wallet/utils.d.ts.map +1 -0
  116. package/dest/test-wallet/utils.js +71 -0
  117. package/dest/test-wallet/wallet_worker_script.d.ts +2 -0
  118. package/dest/test-wallet/wallet_worker_script.d.ts.map +1 -0
  119. package/dest/test-wallet/wallet_worker_script.js +48 -0
  120. package/dest/test-wallet/worker_wallet.d.ts +52 -0
  121. package/dest/test-wallet/worker_wallet.d.ts.map +1 -0
  122. package/dest/test-wallet/worker_wallet.js +151 -0
  123. package/dest/test-wallet/worker_wallet_schema.d.ts +279 -0
  124. package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -0
  125. package/dest/test-wallet/worker_wallet_schema.js +10 -0
  126. package/package.json +43 -43
  127. package/src/bench/client_flows/client_flows_benchmark.ts +26 -13
  128. package/src/bench/utils.ts +7 -2
  129. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +30 -20
  130. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +1 -1
  131. package/src/e2e_deploy_contract/deploy_test.ts +1 -1
  132. package/src/e2e_epochs/epochs_test.ts +78 -66
  133. package/src/e2e_fees/bridging_race.notest.ts +1 -1
  134. package/src/e2e_fees/fees_test.ts +15 -23
  135. package/src/e2e_nested_contract/nested_contract_test.ts +6 -4
  136. package/src/e2e_p2p/inactivity_slash_test.ts +3 -3
  137. package/src/e2e_p2p/p2p_network.ts +54 -33
  138. package/src/e2e_p2p/reqresp/utils.ts +58 -9
  139. package/src/e2e_p2p/shared.ts +73 -60
  140. package/src/e2e_token_contract/token_contract_test.ts +25 -8
  141. package/src/fixtures/authwit_proxy.ts +54 -0
  142. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  143. package/src/fixtures/e2e_prover_test.ts +44 -53
  144. package/src/fixtures/elu_monitor.ts +126 -0
  145. package/src/fixtures/fixtures.ts +10 -0
  146. package/src/fixtures/get_bb_config.ts +7 -6
  147. package/src/fixtures/ha_setup.ts +3 -1
  148. package/src/fixtures/setup.ts +108 -130
  149. package/src/fixtures/setup_p2p_test.ts +17 -25
  150. package/src/fixtures/token_utils.ts +3 -3
  151. package/src/guides/up_quick_start.sh +3 -3
  152. package/src/legacy-jest-resolver.cjs +135 -0
  153. package/src/shared/cross_chain_test_harness.ts +13 -9
  154. package/src/shared/gas_portal_test_harness.ts +1 -1
  155. package/src/shared/index.ts +1 -0
  156. package/src/shared/jest_setup.ts +51 -1
  157. package/src/shared/mock_state_view.ts +188 -0
  158. package/src/shared/submit-transactions.ts +3 -2
  159. package/src/shared/uniswap_l1_l2.ts +36 -29
  160. package/src/simulators/lending_simulator.ts +8 -4
  161. package/src/simulators/token_simulator.ts +6 -30
  162. package/src/spartan/setup_test_wallets.ts +141 -32
  163. package/src/spartan/tx_metrics.ts +1 -1
  164. package/src/spartan/utils/bot.ts +4 -1
  165. package/src/spartan/utils/config.ts +2 -0
  166. package/src/spartan/utils/index.ts +7 -0
  167. package/src/spartan/utils/k8s.ts +8 -0
  168. package/src/spartan/utils/nodes.ts +15 -10
  169. package/src/spartan/utils/pod_logs.ts +99 -0
  170. package/src/test-wallet/test_wallet.ts +351 -0
  171. package/src/test-wallet/utils.ts +112 -0
  172. package/src/test-wallet/wallet_worker_script.ts +60 -0
  173. package/src/test-wallet/worker_wallet.ts +214 -0
  174. package/src/test-wallet/worker_wallet_schema.ts +13 -0
@@ -4,7 +4,7 @@ import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
4
4
  import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
5
5
  import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
6
6
  import { MultiAdderArtifact } from '@aztec/ethereum/l1-artifacts';
7
- import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
7
+ import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
8
8
  import { ChainMonitor } from '@aztec/ethereum/test';
9
9
  import { EpochNumber } from '@aztec/foundation/branded-types';
10
10
  import { SecretValue } from '@aztec/foundation/config';
@@ -14,7 +14,8 @@ import { RollupAbi, SlasherAbi, TestERC20Abi } from '@aztec/l1-artifacts';
14
14
  import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
15
15
  import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
16
16
  import { tryStop } from '@aztec/stdlib/interfaces/server';
17
- import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
17
+ import { TopicType } from '@aztec/stdlib/p2p';
18
+ import { TxStatus } from '@aztec/stdlib/tx';
18
19
  import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
19
20
  import { getGenesisValues } from '@aztec/world-state/testing';
20
21
  import getPort from 'get-port';
@@ -30,7 +31,7 @@ export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
30
31
  export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
31
32
  aztecSlotDuration: 12,
32
33
  ethereumSlotDuration: 4,
33
- aztecProofSubmissionWindow: 640
34
+ aztecProofSubmissionEpochs: 640
34
35
  };
35
36
  export class P2PNetworkTest {
36
37
  testName;
@@ -50,7 +51,7 @@ export class P2PNetworkTest {
50
51
  peerIdPrivateKeys;
51
52
  validators;
52
53
  deployedAccounts;
53
- prefilledPublicData;
54
+ genesis;
54
55
  // The re-execution test needs a wallet and a spam contract
55
56
  wallet;
56
57
  defaultAccountAddress;
@@ -72,7 +73,6 @@ export class P2PNetworkTest {
72
73
  this.peerIdPrivateKeys = [];
73
74
  this.validators = [];
74
75
  this.deployedAccounts = [];
75
- this.prefilledPublicData = [];
76
76
  this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
77
77
  // Set up the base account and node private keys for the initial network deployment
78
78
  this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1).toString('hex')}`;
@@ -88,7 +88,7 @@ export class P2PNetworkTest {
88
88
  aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
89
89
  aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
90
90
  slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
91
- slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
91
+ slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
92
92
  aztecTargetCommitteeSize: numberOfValidators,
93
93
  metricsPort: metricsPort,
94
94
  numberOfInitialFundedAccounts: 2,
@@ -99,7 +99,7 @@ export class P2PNetworkTest {
99
99
  ...initialValidatorConfig,
100
100
  aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
101
101
  slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
102
- slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
102
+ slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
103
103
  ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
104
104
  aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
105
105
  aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
@@ -206,7 +206,11 @@ export class P2PNetworkTest {
206
206
  }
207
207
  async setupAccount() {
208
208
  this.logger.info('Setting up account');
209
- const { deployedAccounts } = await deployAccounts(1, this.logger)({
209
+ const { deployedAccounts } = await deployAccounts(1, this.logger, {
210
+ wait: {
211
+ waitForStatus: TxStatus.CHECKPOINTED
212
+ }
213
+ })({
210
214
  wallet: this.context.wallet,
211
215
  initialFundedAccounts: this.context.initialFundedAccounts
212
216
  });
@@ -219,10 +223,9 @@ export class P2PNetworkTest {
219
223
  if (!this.wallet) {
220
224
  throw new Error('Call setupAccount before deploying spam contract');
221
225
  }
222
- const spamContract = await SpamContract.deploy(this.wallet).send({
226
+ ({ contract: this.spamContract } = await SpamContract.deploy(this.wallet).send({
223
227
  from: this.defaultAccountAddress
224
- });
225
- this.spamContract = spamContract;
228
+ }));
226
229
  }
227
230
  async removeInitialNode() {
228
231
  this.logger.info('Removing initial node');
@@ -238,7 +241,7 @@ export class P2PNetworkTest {
238
241
  return await this._sendDummyTx(this.ctx.deployL1ContractsValues.l1Client);
239
242
  }
240
243
  async _sendDummyTx(l1Client) {
241
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client);
244
+ const l1TxUtils = createL1TxUtils(l1Client);
242
245
  return await l1TxUtils.sendAndMonitorTransaction({
243
246
  to: l1Client.account.address,
244
247
  value: 1n
@@ -250,7 +253,7 @@ export class P2PNetworkTest {
250
253
  ...this.setupOptions,
251
254
  fundSponsoredFPC: true,
252
255
  skipAccountDeployment: true,
253
- slasherFlavor: this.setupOptions.slasherFlavor ?? this.deployL1ContractsArgs.slasherFlavor ?? 'none',
256
+ slasherEnabled: this.setupOptions.slasherEnabled ?? this.deployL1ContractsArgs.slasherEnabled ?? false,
254
257
  aztecTargetCommitteeSize: 0,
255
258
  l1ContractsArgs: this.deployL1ContractsArgs
256
259
  }, // Use checkpointed chain tip for PXE to avoid issues with blocks being dropped due to pruned anchor blocks.
@@ -263,8 +266,8 @@ export class P2PNetworkTest {
263
266
  ...this.context.initialFundedAccounts.map((a)=>a.address),
264
267
  sponsoredFPCAddress
265
268
  ];
266
- const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
267
- this.prefilledPublicData = prefilledPublicData;
269
+ const { genesis } = await getGenesisValues(initialFundedAccounts, undefined, undefined, this.context.genesis.genesisTimestamp);
270
+ this.genesis = genesis;
268
271
  const rollupContract = RollupContract.getFromL1ContractsValues(this.context.deployL1ContractsValues);
269
272
  this.monitor = new ChainMonitor(rollupContract, this.context.dateProvider).start();
270
273
  this.monitor.on('l1-block', ({ timestamp })=>this.context.dateProvider.setTime(Number(timestamp) * 1000));
@@ -287,7 +290,9 @@ export class P2PNetworkTest {
287
290
  * @param expectedNodeCount - Expected number of nodes in the network (defaults to nodes.length)
288
291
  * @param timeoutSeconds - Maximum time to wait for connections (default: 30 seconds)
289
292
  * @param checkIntervalSeconds - How often to check connectivity (default: 0.1 seconds)
290
- */ async waitForP2PMeshConnectivity(nodes, expectedNodeCount, timeoutSeconds = 30, checkIntervalSeconds = 0.1) {
293
+ */ async waitForP2PMeshConnectivity(nodes, expectedNodeCount, timeoutSeconds = 30, checkIntervalSeconds = 0.1, topics = [
294
+ TopicType.tx
295
+ ]) {
291
296
  const nodeCount = expectedNodeCount ?? nodes.length;
292
297
  const minPeerCount = nodeCount - 1;
293
298
  this.logger.warn(`Waiting for all ${nodeCount} nodes to connect to P2P mesh (at least ${minPeerCount} peers each)...`);
@@ -300,6 +305,21 @@ export class P2PNetworkTest {
300
305
  }, `Node ${index} to connect to at least ${minPeerCount} peers`, timeoutSeconds, checkIntervalSeconds);
301
306
  }));
302
307
  this.logger.warn('All nodes connected to P2P mesh');
308
+ // Wait for GossipSub mesh to form for all specified topics.
309
+ // We only require at least 1 mesh peer per node because GossipSub
310
+ // stops grafting once it reaches Dlo peers and won't fill the mesh to all available peers.
311
+ for (const topic of topics){
312
+ this.logger.warn(`Waiting for GossipSub mesh to form for ${topic} topic...`);
313
+ await Promise.all(nodes.map(async (node, index)=>{
314
+ const p2p = node.getP2P();
315
+ await retryUntil(async ()=>{
316
+ const meshPeers = await p2p.getGossipMeshPeerCount(topic);
317
+ this.logger.debug(`Node ${index} has ${meshPeers} gossip mesh peers for ${topic} topic`);
318
+ return meshPeers >= 1 ? true : undefined;
319
+ }, `Node ${index} to have gossip mesh peers for ${topic} topic`, timeoutSeconds, checkIntervalSeconds);
320
+ }));
321
+ this.logger.warn(`All nodes have gossip mesh peers for ${topic} topic`);
322
+ }
303
323
  }
304
324
  async teardown() {
305
325
  await this.monitor.stop();
@@ -316,14 +336,12 @@ export class P2PNetworkTest {
316
336
  abi: SlasherAbi,
317
337
  client: this.ctx.deployL1ContractsValues.l1Client
318
338
  });
319
- // Get the actual slashing proposer from rollup (which handles both empire and tally)
339
+ // Get the actual slashing proposer from rollup
320
340
  const slashingProposer = await rollup.getSlashingProposer();
321
- const slashFactory = new SlashFactoryContract(this.ctx.deployL1ContractsValues.l1Client, getAddress(this.ctx.deployL1ContractsValues.l1ContractAddresses.slashFactoryAddress.toString()));
322
341
  return {
323
342
  rollup,
324
343
  slasherContract,
325
- slashingProposer,
326
- slashFactory
344
+ slashingProposer
327
345
  };
328
346
  }
329
347
  }
@@ -1,8 +1,8 @@
1
1
  import type { AztecNodeService } from '@aztec/aztec-node';
2
2
  import { P2PNetworkTest } from '../p2p_network.js';
3
3
  export declare const NUM_VALIDATORS = 6;
4
- export declare const NUM_TXS_PER_NODE = 2;
5
- export declare const BOOT_NODE_UDP_PORT = 4500;
4
+ export declare const NUM_TXS_PER_NODE = 4;
5
+ export declare const BOOT_NODE_UDP_PORT: number;
6
6
  export declare const createReqrespDataDir: () => string;
7
7
  type ReqrespOptions = {
8
8
  disableStatusHandshake?: boolean;
@@ -19,4 +19,4 @@ export declare function runReqrespTxTest(params: {
19
19
  disableStatusHandshake?: boolean;
20
20
  }): Promise<AztecNodeService[]>;
21
21
  export {};
22
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lMmVfcDJwL3JlcXJlc3AvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWdCMUQsT0FBTyxFQUFFLGNBQWMsRUFBOEQsTUFBTSxtQkFBbUIsQ0FBQztBQUkvRyxlQUFPLE1BQU0sY0FBYyxJQUFJLENBQUM7QUFDaEMsZUFBTyxNQUFNLGdCQUFnQixJQUFJLENBQUM7QUFDbEMsZUFBTyxNQUFNLGtCQUFrQixPQUFPLENBQUM7QUFFdkMsZUFBTyxNQUFNLG9CQUFvQixjQUEyRCxDQUFDO0FBRTdGLEtBQUssY0FBYyxHQUFHO0lBQ3BCLHNCQUFzQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ2xDLENBQUM7QUFFRix3QkFBc0IsaUJBQWlCLENBQUMsT0FBTyxHQUFFLGNBQW1CLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQW9CN0Y7QUFFRCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSxFQUFFO0lBQUUsQ0FBQyxFQUFFLGNBQWMsQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLGdCQUFnQixFQUFFLENBQUM7SUFBQyxPQUFPLEVBQUUsTUFBTSxDQUFBO0NBQUUsaUJBU2xIO0FBSUQsd0JBQXNCLGdCQUFnQixDQUFDLE1BQU0sRUFBRTtJQUM3QyxDQUFDLEVBQUUsY0FBYyxDQUFDO0lBQ2xCLE9BQU8sRUFBRSxNQUFNLENBQUM7SUFDaEIsc0JBQXNCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDbEMsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQXdHOUIifQ==
22
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lMmVfcDJwL3JlcXJlc3AvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWdCMUQsT0FBTyxFQUFFLGNBQWMsRUFBdUIsTUFBTSxtQkFBbUIsQ0FBQztBQUl4RSxlQUFPLE1BQU0sY0FBYyxJQUFJLENBQUM7QUFDaEMsZUFBTyxNQUFNLGdCQUFnQixJQUFJLENBQUM7QUFDbEMsZUFBTyxNQUFNLGtCQUFrQixRQUF1QixDQUFDO0FBRXZELGVBQU8sTUFBTSxvQkFBb0IsY0FBMkQsQ0FBQztBQUU3RixLQUFLLGNBQWMsR0FBRztJQUNwQixzQkFBc0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUNsQyxDQUFDO0FBRUYsd0JBQXNCLGlCQUFpQixDQUFDLE9BQU8sR0FBRSxjQUFtQixHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0EwQjdGO0FBRUQsd0JBQXNCLGtCQUFrQixDQUFDLE1BQU0sRUFBRTtJQUFFLENBQUMsRUFBRSxjQUFjLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO0lBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQVNsSDtBQUlELHdCQUFzQixnQkFBZ0IsQ0FBQyxNQUFNLEVBQUU7SUFDN0MsQ0FBQyxFQUFFLGNBQWMsQ0FBQztJQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLHNCQUFzQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ2xDLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FtSjlCIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/e2e_p2p/reqresp/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAgB1D,OAAO,EAAE,cAAc,EAA8D,MAAM,mBAAmB,CAAC;AAI/G,eAAO,MAAM,cAAc,IAAI,CAAC;AAChC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,kBAAkB,OAAO,CAAC;AAEvC,eAAO,MAAM,oBAAoB,cAA2D,CAAC;AAE7F,KAAK,cAAc,GAAG;IACpB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,cAAc,CAAC,CAoB7F;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAAE,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBASlH;AAID,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC7C,CAAC,EAAE,cAAc,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAwG9B"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/e2e_p2p/reqresp/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAgB1D,OAAO,EAAE,cAAc,EAAuB,MAAM,mBAAmB,CAAC;AAIxE,eAAO,MAAM,cAAc,IAAI,CAAC;AAChC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,kBAAkB,QAAuB,CAAC;AAEvD,eAAO,MAAM,oBAAoB,cAA2D,CAAC;AAE7F,KAAK,cAAc,GAAG;IACpB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,cAAc,CAAC,CA0B7F;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAAE,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBASlH;AAID,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC7C,CAAC,EAAE,cAAc,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmJ9B"}
@@ -2,21 +2,21 @@ import { createLogger } from '@aztec/aztec.js/log';
2
2
  import { waitForTx } from '@aztec/aztec.js/node';
3
3
  import { Tx } from '@aztec/aztec.js/tx';
4
4
  import { RollupContract } from '@aztec/ethereum/contracts';
5
- import { SlotNumber } from '@aztec/foundation/branded-types';
5
+ import { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
6
6
  import { timesAsync } from '@aztec/foundation/collection';
7
7
  import { retryUntil } from '@aztec/foundation/retry';
8
- import { jest } from '@jest/globals';
8
+ import { expect, jest } from '@jest/globals';
9
9
  import fs from 'fs';
10
10
  import os from 'os';
11
11
  import path from 'path';
12
- import { shouldCollectMetrics } from '../../fixtures/fixtures.js';
12
+ import { getBootNodeUdpPort, shouldCollectMetrics } from '../../fixtures/fixtures.js';
13
13
  import { createNodes } from '../../fixtures/setup_p2p_test.js';
14
- import { P2PNetworkTest, SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES, WAIT_FOR_TX_TIMEOUT } from '../p2p_network.js';
14
+ import { P2PNetworkTest, WAIT_FOR_TX_TIMEOUT } from '../p2p_network.js';
15
15
  import { prepareTransactions } from '../shared.js';
16
16
  // Don't set this to a higher value than 9 because each node will use a different L1 publisher account and anvil seeds
17
17
  export const NUM_VALIDATORS = 6;
18
- export const NUM_TXS_PER_NODE = 2;
19
- export const BOOT_NODE_UDP_PORT = 4500;
18
+ export const NUM_TXS_PER_NODE = 4;
19
+ export const BOOT_NODE_UDP_PORT = getBootNodeUdpPort();
20
20
  export const createReqrespDataDir = ()=>fs.mkdtempSync(path.join(os.tmpdir(), 'reqresp-'));
21
21
  export async function createReqrespTest(options = {}) {
22
22
  const { disableStatusHandshake = false } = options;
@@ -28,8 +28,14 @@ export async function createReqrespTest(options = {}) {
28
28
  // To collect metrics - run in aztec-packages `docker compose --profile metrics up`
29
29
  metricsPort: shouldCollectMetrics(),
30
30
  initialConfig: {
31
- ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
32
- aztecSlotDuration: 24,
31
+ ethereumSlotDuration: 8,
32
+ aztecSlotDuration: 36,
33
+ blockDurationMs: 6000,
34
+ l1PublishingTime: 8,
35
+ minTxsPerBlock: 1,
36
+ maxTxsPerBlock: 2,
37
+ enforceTimeTable: true,
38
+ aztecProofSubmissionEpochs: 1024,
33
39
  ...disableStatusHandshake ? {
34
40
  p2pDisableStatusHandshake: true
35
41
  } : {},
@@ -66,7 +72,7 @@ export async function runReqrespTxTest(params) {
66
72
  ...t.ctx.aztecNodeConfig,
67
73
  p2pDisableStatusHandshake: true
68
74
  } : t.ctx.aztecNodeConfig;
69
- const nodes = await createNodes(aztecNodeConfig, t.ctx.dateProvider, t.bootstrapNodeEnr, NUM_VALIDATORS, BOOT_NODE_UDP_PORT, t.prefilledPublicData, dataDir, shouldCollectMetrics());
75
+ const nodes = await createNodes(aztecNodeConfig, t.ctx.dateProvider, t.bootstrapNodeEnr, NUM_VALIDATORS, BOOT_NODE_UDP_PORT, t.genesis, dataDir, shouldCollectMetrics());
70
76
  t.logger.info('Waiting for nodes to connect');
71
77
  await t.waitForP2PMeshConnectivity(nodes, NUM_VALIDATORS);
72
78
  await t.setupAccount();
@@ -102,6 +108,11 @@ export async function runReqrespTxTest(params) {
102
108
  t.logger.info('Sending transactions through proposer nodes');
103
109
  const submittedTxs = await Promise.all(txBatches.map(async (batch, batchIndex)=>{
104
110
  const proposerNode = nodes[proposerIndexes[batchIndex]];
111
+ for (const tx of batch){
112
+ t.logger.info(`Tx ${tx.getTxHash().toString()} base64: ${tx.toBuffer().toString('base64')}`);
113
+ }
114
+ const txHashes = batch.map((tx)=>tx.getTxHash().toString());
115
+ t.logger.info(`Sending batch ${batchIndex} to proposer ${getNodePort(proposerIndexes[batchIndex])}: ${txHashes.join(', ')}`);
105
116
  await Promise.all(batch.map(async (tx)=>{
106
117
  try {
107
118
  await proposerNode.sendTx(tx);
@@ -115,6 +126,11 @@ export async function runReqrespTxTest(params) {
115
126
  txHash: tx.getTxHash()
116
127
  }));
117
128
  }));
129
+ // Log pool state per node after sending
130
+ for(let i = 0; i < NUM_VALIDATORS; i++){
131
+ const count = await nodes[i].getPendingTxCount();
132
+ t.logger.info(`Node ${getNodePort(i)} pool has ${count} pending txs`);
133
+ }
118
134
  t.logger.info('Waiting for all transactions to be mined');
119
135
  await Promise.all(submittedTxs.flatMap((batch, batchIndex)=>batch.map(async (submittedTx, txIndex)=>{
120
136
  t.logger.info(`Waiting for tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} to be mined`);
@@ -124,6 +140,27 @@ export async function runReqrespTxTest(params) {
124
140
  t.logger.info(`Tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} has been mined`);
125
141
  })));
126
142
  t.logger.info('All transactions mined');
143
+ // Assert that multiple blocks were built for at least one slot
144
+ t.logger.info('Verifying multiple blocks for at least one checkpoint');
145
+ // Wait for L1 checkpoint sync, which may lag behind P2P block propagation.
146
+ const checkpoints = await retryUntil(async ()=>{
147
+ const cps = await nodes[0].getCheckpoints(CheckpointNumber(1), 50);
148
+ return cps.length > 0 && cps.some((cp)=>cp.checkpoint.blocks.length >= 2) ? cps : undefined;
149
+ }, 'waiting for multi-block checkpoint to sync from L1', 30, 1);
150
+ let mbpsFound = false;
151
+ let expectedBlockNumber = checkpoints[0].checkpoint.blocks[0].number;
152
+ for (const published of checkpoints){
153
+ const blockCount = published.checkpoint.blocks.length;
154
+ mbpsFound = mbpsFound || blockCount >= 2;
155
+ for(let i = 0; i < blockCount; i++){
156
+ const block = published.checkpoint.blocks[i];
157
+ expect(block.indexWithinCheckpoint).toBe(i);
158
+ expect(block.checkpointNumber).toBe(published.checkpoint.number);
159
+ expect(block.number).toBe(expectedBlockNumber);
160
+ expectedBlockNumber++;
161
+ }
162
+ }
163
+ expect(mbpsFound).toBe(true);
127
164
  return nodes;
128
165
  }
129
166
  async function getProposerIndexes(t, startSlotTimestamp) {
@@ -4,21 +4,40 @@ import { AztecAddress } from '@aztec/aztec.js/addresses';
4
4
  import type { Logger } from '@aztec/aztec.js/log';
5
5
  import { TxHash } from '@aztec/aztec.js/tx';
6
6
  import type { RollupCheatCodes } from '@aztec/aztec/testing';
7
- import type { EmpireSlashingProposerContract, RollupContract, TallySlashingProposerContract } from '@aztec/ethereum/contracts';
7
+ import type { EpochCacheInterface } from '@aztec/epoch-cache';
8
+ import type { RollupContract, SlashingProposerContract } from '@aztec/ethereum/contracts';
9
+ import { EpochNumber } from '@aztec/foundation/branded-types';
10
+ import { EthAddress } from '@aztec/foundation/eth-address';
8
11
  import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
9
12
  import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
10
- import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
11
- import { type ProvenTx } from '@aztec/test-wallet/server';
13
+ import { type ProvenTx } from '../test-wallet/utils.js';
12
14
  export declare const submitComplexTxsTo: (logger: Logger, from: AztecAddress, spamContract: SpamContract, numTxs: number, opts?: {
13
15
  callPublic?: boolean | undefined;
14
16
  }) => Promise<TxHash[]>;
15
17
  export declare const submitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<TxHash[]>;
16
18
  export declare function prepareTransactions(logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData): Promise<ProvenTx[]>;
17
- export declare function awaitProposalExecution(slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract, timeoutSeconds: number, logger: Logger): Promise<bigint>;
19
+ export declare function awaitProposalExecution(slashingProposer: SlashingProposerContract, timeoutSeconds: number, logger: Logger): Promise<bigint>;
18
20
  export declare function awaitCommitteeExists({ rollup, logger }: {
19
21
  rollup: RollupContract;
20
22
  logger: Logger;
21
23
  }): Promise<readonly `0x${string}`[]>;
24
+ /**
25
+ * Advance epochs until we find one where the target proposer is selected for at least one slot,
26
+ * then stop one epoch before it. This leaves time for the caller to start sequencers before
27
+ * warping to the target epoch, avoiding the race where the target epoch passes before sequencers
28
+ * are ready.
29
+ *
30
+ * Returns the target epoch number so the caller can warp to it after starting sequencers.
31
+ */
32
+ export declare function advanceToEpochBeforeProposer({ epochCache, cheatCodes, targetProposer, logger, maxAttempts }: {
33
+ epochCache: EpochCacheInterface;
34
+ cheatCodes: RollupCheatCodes;
35
+ targetProposer: EthAddress;
36
+ logger: Logger;
37
+ maxAttempts?: number;
38
+ }): Promise<{
39
+ targetEpoch: EpochNumber;
40
+ }>;
22
41
  export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds }: {
23
42
  nodeAdmin: AztecNodeAdmin;
24
43
  logger: Logger;
@@ -31,16 +50,15 @@ export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundS
31
50
  * Await the committee to be slashed out of the validator set.
32
51
  * Currently assumes that the committee is the same size as the validator set.
33
52
  */
34
- export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }: {
53
+ export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }: {
35
54
  rollup: RollupContract;
36
55
  cheatCodes: RollupCheatCodes;
37
56
  committee: readonly `0x${string}`[];
38
- slashFactory: SlashFactoryContract;
39
- slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract | undefined;
57
+ slashingProposer: SlashingProposerContract | undefined;
40
58
  slashingRoundSize: number;
41
59
  aztecSlotDuration: number;
42
60
  aztecEpochDuration: number;
43
61
  logger: Logger;
44
62
  offenseEpoch: number;
45
63
  }): Promise<void>;
46
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUd6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFDViw4QkFBOEIsRUFDOUIsY0FBYyxFQUNkLDZCQUE2QixFQUM5QixNQUFNLDJCQUEyQixDQUFDO0FBTW5DLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBSXZFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDdkUsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFnQyxNQUFNLDJCQUEyQixDQUFDO0FBS3hGLGVBQU8sTUFBTSxrQkFBa0I7O3VCQWtCOUIsQ0FBQztBQUdGLGVBQU8sTUFBTSxrQkFBa0Isa0hBZTlCLENBQUM7QUFFRix3QkFBc0IsbUJBQW1CLENBQ3ZDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixNQUFNLEVBQUUsTUFBTSxFQUNkLGFBQWEsRUFBRSxrQkFBa0IsR0FDaEMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBd0JyQjtBQUVELHdCQUFnQixzQkFBc0IsQ0FDcEMsZ0JBQWdCLEVBQUUsOEJBQThCLEdBQUcsNkJBQTZCLEVBQ2hGLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTBCakI7QUFFRCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLE1BQU0sRUFDUCxFQUFFO0lBQ0QsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUN2QixNQUFNLEVBQUUsTUFBTSxDQUFDO0NBQ2hCLEdBQUcsT0FBTyxDQUFDLFNBQVMsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBYXBDO0FBRUQsd0JBQXNCLG9CQUFvQixDQUFDLEVBQ3pDLE1BQU0sRUFDTixTQUFTLEVBQ1QsaUJBQWlCLEVBQ2pCLGFBQWEsRUFDYixxQkFBcUIsRUFDckIsY0FBb0IsRUFDckIsRUFBRTtJQUNELFNBQVMsRUFBRSxjQUFjLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQy9CLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN6QiwrQ0FrQkE7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLFVBQVUsRUFDVixTQUFTLEVBQ1QsWUFBWSxFQUNaLGdCQUFnQixFQUNoQixpQkFBaUIsRUFDakIsaUJBQWlCLEVBQ2pCLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sWUFBWSxFQUNiLEVBQUU7SUFDRCxNQUFNLEVBQUUsY0FBYyxDQUFDO0lBQ3ZCLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQztJQUM3QixTQUFTLEVBQUUsU0FBUyxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7SUFDcEMsWUFBWSxFQUFFLG9CQUFvQixDQUFDO0lBQ25DLGdCQUFnQixFQUFFLDhCQUE4QixHQUFHLDZCQUE2QixHQUFHLFNBQVMsQ0FBQztJQUM3RixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsWUFBWSxFQUFFLE1BQU0sQ0FBQztDQUN0QixpQkE2RUEifQ==
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUd6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzFGLE9BQU8sRUFBRSxXQUFXLEVBQWMsTUFBTSxpQ0FBaUMsQ0FBQztBQUUxRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFJdkUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFJdEUsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFvQixNQUFNLHlCQUF5QixDQUFDO0FBRzFFLGVBQU8sTUFBTSxrQkFBa0I7O3VCQWtCOUIsQ0FBQztBQUdGLGVBQU8sTUFBTSxrQkFBa0Isa0hBZTlCLENBQUM7QUFFRix3QkFBc0IsbUJBQW1CLENBQ3ZDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixNQUFNLEVBQUUsTUFBTSxFQUNkLGFBQWEsRUFBRSxrQkFBa0IsR0FDaEMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBd0JyQjtBQUVELHdCQUFnQixzQkFBc0IsQ0FDcEMsZ0JBQWdCLEVBQUUsd0JBQXdCLEVBQzFDLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQWNqQjtBQUVELHdCQUFzQixvQkFBb0IsQ0FBQyxFQUN6QyxNQUFNLEVBQ04sTUFBTSxFQUNQLEVBQUU7SUFDRCxNQUFNLEVBQUUsY0FBYyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxNQUFNLENBQUM7Q0FDaEIsR0FBRyxPQUFPLENBQUMsU0FBUyxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FhcEM7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQXNCLDRCQUE0QixDQUFDLEVBQ2pELFVBQVUsRUFDVixVQUFVLEVBQ1YsY0FBYyxFQUNkLE1BQU0sRUFDTixXQUFnQixFQUNqQixFQUFFO0lBQ0QsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0lBQ2hDLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQztJQUM3QixjQUFjLEVBQUUsVUFBVSxDQUFDO0lBQzNCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDdEIsR0FBRyxPQUFPLENBQUM7SUFBRSxXQUFXLEVBQUUsV0FBVyxDQUFBO0NBQUUsQ0FBQyxDQThCeEM7QUFFRCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLFNBQVMsRUFDVCxpQkFBaUIsRUFDakIsYUFBYSxFQUNiLHFCQUFxQixFQUNyQixjQUFvQixFQUNyQixFQUFFO0lBQ0QsU0FBUyxFQUFFLGNBQWMsQ0FBQztJQUMxQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDL0IsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3pCLCtDQWtCQTtBQUVEOzs7R0FHRztBQUNILHdCQUFzQixvQkFBb0IsQ0FBQyxFQUN6QyxNQUFNLEVBQ04sVUFBVSxFQUNWLFNBQVMsRUFDVCxnQkFBZ0IsRUFDaEIsaUJBQWlCLEVBQ2pCLGlCQUFpQixFQUNqQixrQkFBa0IsRUFDbEIsTUFBTSxFQUNOLFlBQVksRUFDYixFQUFFO0lBQ0QsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUN2QixVQUFVLEVBQUUsZ0JBQWdCLENBQUM7SUFDN0IsU0FBUyxFQUFFLFNBQVMsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQUFDO0lBQ3BDLGdCQUFnQixFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQztJQUN2RCxpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsWUFBWSxFQUFFLE1BQU0sQ0FBQztDQUN0QixpQkF1REEifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EACV,8BAA8B,EAC9B,cAAc,EACd,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AAMnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,KAAK,QAAQ,EAAgC,MAAM,2BAA2B,CAAC;AAKxF,eAAO,MAAM,kBAAkB;;uBAkB9B,CAAC;AAGF,eAAO,MAAM,kBAAkB,kHAe9B,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAwBrB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,8BAA8B,GAAG,6BAA6B,EAChF,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CA0BjB;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,MAAM,EACP,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC,CAapC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,cAAoB,EACrB,EAAE;IACD,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,+CAkBA;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,UAAU,EACV,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,EACN,YAAY,EACb,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC;IACpC,YAAY,EAAE,oBAAoB,CAAC;IACnC,gBAAgB,EAAE,8BAA8B,GAAG,6BAA6B,GAAG,SAAS,CAAC;IAC7F,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,iBA6EA"}
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAc,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,OAAO,EAAE,KAAK,QAAQ,EAAoB,MAAM,yBAAyB,CAAC;AAG1E,eAAO,MAAM,kBAAkB;;uBAkB9B,CAAC;AAGF,eAAO,MAAM,kBAAkB,kHAe9B,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAwBrB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,wBAAwB,EAC1C,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAcjB;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,MAAM,EACP,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC,CAapC;AAED;;;;;;;GAOG;AACH,wBAAsB,4BAA4B,CAAC,EACjD,UAAU,EACV,UAAU,EACV,cAAc,EACd,MAAM,EACN,WAAgB,EACjB,EAAE;IACD,UAAU,EAAE,mBAAmB,CAAC;IAChC,UAAU,EAAE,gBAAgB,CAAC;IAC7B,cAAc,EAAE,UAAU,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,WAAW,CAAA;CAAE,CAAC,CA8BxC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,cAAoB,EACrB,EAAE;IACD,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,+CAkBA;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,EACN,YAAY,EACb,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC;IACpC,gBAAgB,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACvD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,iBAuDA"}
@@ -1,14 +1,15 @@
1
1
  import { NO_WAIT, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
2
2
  import { Fr } from '@aztec/aztec.js/fields';
3
- import { EpochNumber } from '@aztec/foundation/branded-types';
3
+ import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
4
4
  import { timesAsync, unique } from '@aztec/foundation/collection';
5
5
  import { retryUntil } from '@aztec/foundation/retry';
6
6
  import { pluralize } from '@aztec/foundation/string';
7
7
  import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
8
8
  import { getPXEConfig, getPXEConfig as getRpcConfig } from '@aztec/pxe/server';
9
9
  import { getRoundForOffense } from '@aztec/slasher';
10
- import { TestWallet, proveInteraction } from '@aztec/test-wallet/server';
11
10
  import { submitTxsTo } from '../shared/submit-transactions.js';
11
+ import { TestWallet } from '../test-wallet/test_wallet.js';
12
+ import { proveInteraction } from '../test-wallet/utils.js';
12
13
  // submits a set of transactions to the provided Private eXecution Environment (PXE)
13
14
  export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opts = {})=>{
14
15
  const txs = [];
@@ -16,7 +17,7 @@ export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opt
16
17
  const spamCount = 15;
17
18
  for(let i = 0; i < numTxs; i++){
18
19
  const method = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic);
19
- const txHash = await method.send({
20
+ const { txHash } = await method.send({
20
21
  from,
21
22
  wait: NO_WAIT
22
23
  });
@@ -67,24 +68,12 @@ export function awaitProposalExecution(slashingProposer, timeoutSeconds, logger)
67
68
  logger.warn(`Timed out waiting for proposal execution`);
68
69
  reject(new Error(`Timeout waiting for proposal execution after ${timeoutSeconds}s`));
69
70
  }, timeoutSeconds * 1000);
70
- if (slashingProposer.type === 'empire') {
71
- const unwatch = slashingProposer.listenToPayloadSubmitted((args)=>{
72
- logger.warn(`Proposal ${args.payload} from round ${args.round} executed`);
73
- clearTimeout(timeout);
74
- unwatch();
75
- resolve(args.round);
76
- });
77
- } else if (slashingProposer.type === 'tally') {
78
- const unwatch = slashingProposer.listenToRoundExecuted((args)=>{
79
- logger.warn(`Slash from round ${args.round} executed`);
80
- clearTimeout(timeout);
81
- unwatch();
82
- resolve(args.round);
83
- });
84
- } else {
71
+ const unwatch = slashingProposer.listenToRoundExecuted((args)=>{
72
+ logger.warn(`Slash from round ${args.round} executed`);
85
73
  clearTimeout(timeout);
86
- reject(new Error(`Unknown slashing proposer type: ${slashingProposer.type}`));
87
- }
74
+ unwatch();
75
+ resolve(args.round);
76
+ });
88
77
  });
89
78
  }
90
79
  export async function awaitCommitteeExists({ rollup, logger }) {
@@ -99,6 +88,37 @@ export async function awaitCommitteeExists({ rollup, logger }) {
99
88
  });
100
89
  return committee.map((c)=>c.toString());
101
90
  }
91
+ /**
92
+ * Advance epochs until we find one where the target proposer is selected for at least one slot,
93
+ * then stop one epoch before it. This leaves time for the caller to start sequencers before
94
+ * warping to the target epoch, avoiding the race where the target epoch passes before sequencers
95
+ * are ready.
96
+ *
97
+ * Returns the target epoch number so the caller can warp to it after starting sequencers.
98
+ */ export async function advanceToEpochBeforeProposer({ epochCache, cheatCodes, targetProposer, logger, maxAttempts = 20 }) {
99
+ const { epochDuration } = await cheatCodes.getConfig();
100
+ for(let attempt = 0; attempt < maxAttempts; attempt++){
101
+ const currentEpoch = await cheatCodes.getEpoch();
102
+ // Check the NEXT epoch's slots so we stay one epoch before the target,
103
+ // giving the caller time to start sequencers before the target epoch arrives.
104
+ const nextEpoch = Number(currentEpoch) + 1;
105
+ const startSlot = nextEpoch * Number(epochDuration);
106
+ const endSlot = startSlot + Number(epochDuration);
107
+ logger.info(`Checking next epoch ${nextEpoch} (slots ${startSlot}-${endSlot - 1}) for proposer ${targetProposer} (current epoch: ${currentEpoch})`);
108
+ for(let s = startSlot; s < endSlot; s++){
109
+ const proposer = await epochCache.getProposerAttesterAddressInSlot(SlotNumber(s));
110
+ if (proposer && proposer.equals(targetProposer)) {
111
+ logger.warn(`Found target proposer ${targetProposer} in slot ${s} of epoch ${nextEpoch}. Staying at epoch ${currentEpoch} to allow sequencer startup.`);
112
+ return {
113
+ targetEpoch: EpochNumber(nextEpoch)
114
+ };
115
+ }
116
+ }
117
+ logger.info(`Target proposer not found in epoch ${nextEpoch}, advancing to next epoch`);
118
+ await cheatCodes.advanceToNextEpoch();
119
+ }
120
+ throw new Error(`Target proposer ${targetProposer} not found in any slot after ${maxAttempts} epoch attempts`);
121
+ }
102
122
  export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds = 120 }) {
103
123
  const targetOffenseCount = waitUntilOffenseCount ?? 1;
104
124
  logger.warn(`Waiting for ${pluralize('offense', targetOffenseCount)} to be detected`);
@@ -119,35 +139,21 @@ export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSiz
119
139
  /**
120
140
  * Await the committee to be slashed out of the validator set.
121
141
  * Currently assumes that the committee is the same size as the validator set.
122
- */ export async function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }) {
142
+ */ export async function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }) {
123
143
  if (!slashingProposer) {
124
144
  throw new Error('No slashing proposer configured. Cannot test slashing.');
125
145
  }
126
146
  await cheatCodes.debugRollup();
127
- if (slashingProposer.type === 'empire') {
128
- // Await for the slash payload to be created if empire (no payload is created on tally until execution time)
129
- const targetEpoch = EpochNumber(await cheatCodes.getEpoch() + await rollup.getLagInEpochsForValidatorSet() + 1);
130
- logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
131
- await cheatCodes.advanceToEpoch(targetEpoch);
132
- const slashPayloadEvents = await retryUntil(async ()=>{
133
- const events = await slashFactory.getSlashPayloadCreatedEvents();
134
- return events.length > 0 ? events : undefined;
135
- }, 'slash payload created', 120, 1);
136
- expect(slashPayloadEvents.length).toBe(1);
137
- // The uniqueness check is needed since a validator may be slashed more than once on the same round (eg because they let two epochs be pruned)
138
- expect(unique(slashPayloadEvents[0].slashes.map((slash)=>slash.validator.toString()))).toHaveLength(committee.length);
139
- } else {
140
- // Use the slash offset to ensure we are in the right epoch for tally
141
- const slashOffsetInRounds = await slashingProposer.getSlashOffsetInRounds();
142
- const slashingRoundSizeInEpochs = slashingRoundSize / aztecEpochDuration;
143
- const slashingOffsetInEpochs = Number(slashOffsetInRounds) * slashingRoundSizeInEpochs;
144
- const firstEpochInOffenseRound = offenseEpoch - offenseEpoch % slashingRoundSizeInEpochs;
145
- const targetEpoch = firstEpochInOffenseRound + slashingOffsetInEpochs;
146
- logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
147
- await cheatCodes.advanceToEpoch(EpochNumber(targetEpoch), {
148
- offset: -aztecSlotDuration / 2
149
- });
150
- }
147
+ // Use the slash offset to ensure we are in the right epoch for tally
148
+ const slashOffsetInRounds = await slashingProposer.getSlashOffsetInRounds();
149
+ const slashingRoundSizeInEpochs = slashingRoundSize / aztecEpochDuration;
150
+ const slashingOffsetInEpochs = Number(slashOffsetInRounds) * slashingRoundSizeInEpochs;
151
+ const firstEpochInOffenseRound = offenseEpoch - offenseEpoch % slashingRoundSizeInEpochs;
152
+ const targetEpoch = firstEpochInOffenseRound + slashingOffsetInEpochs;
153
+ logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
154
+ await cheatCodes.advanceToEpoch(EpochNumber(targetEpoch), {
155
+ offset: -aztecSlotDuration / 2
156
+ });
151
157
  const attestersPre = await rollup.getAttesters();
152
158
  expect(attestersPre.length).toBe(committee.length);
153
159
  for (const attester of attestersPre){
@@ -2,10 +2,11 @@ import { AztecAddress } from '@aztec/aztec.js/addresses';
2
2
  import { type Logger } from '@aztec/aztec.js/log';
3
3
  import type { AztecNode } from '@aztec/aztec.js/node';
4
4
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
5
+ import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
5
6
  import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
6
- import type { TestWallet } from '@aztec/test-wallet/server';
7
7
  import { type EndToEndContext } from '../fixtures/setup.js';
8
8
  import { TokenSimulator } from '../simulators/token_simulator.js';
9
+ import type { TestWallet } from '../test-wallet/test_wallet.js';
9
10
  export declare class TokenContractTest {
10
11
  static TOKEN_NAME: string;
11
12
  static TOKEN_SYMBOL: string;
@@ -17,6 +18,7 @@ export declare class TokenContractTest {
17
18
  tokenSim: TokenSimulator;
18
19
  node: AztecNode;
19
20
  badAccount: InvalidAccountContract;
21
+ authwitProxy: GenericProxyContract;
20
22
  wallet: TestWallet;
21
23
  adminAddress: AztecAddress;
22
24
  account1Address: AztecAddress;
@@ -39,4 +41,4 @@ export declare class TokenContractTest {
39
41
  teardown(): Promise<void>;
40
42
  private applyMint;
41
43
  }
42
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUVuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFJbEUscUJBQWEsaUJBQWlCO0lBQzVCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixLQUFLLEVBQUcsYUFBYSxDQUFDO0lBQ3RCLFFBQVEsRUFBRyxjQUFjLENBQUM7SUFDMUIsSUFBSSxFQUFHLFNBQVMsQ0FBQztJQUVqQixVQUFVLEVBQUcsc0JBQXNCLENBQUM7SUFDcEMsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLGVBQWUsRUFBRyxZQUFZLENBQUM7SUFDL0IsZUFBZSxFQUFHLFlBQVksQ0FBQztJQUUvQixPQUFPLENBQUMsb0JBQW9CLENBQVM7SUFDckMsT0FBTyxDQUFDLGVBQWUsQ0FBUztJQUVoQyxZQUFZLFFBQVEsRUFBRSxNQUFNLEVBRzNCO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtCLFNBRWpCO0lBRUQ7OztPQUdHO0lBQ0gsaUJBQWlCLFNBRWhCO1lBS2EsY0FBYztJQTZDdEIsS0FBSyxrQkFjVjtJQUVLLFFBQVEsa0JBRWI7WUFFYSxTQUFTO0NBMkJ4QiJ9
44
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQ2xGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBSXRGLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUVuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFJaEUscUJBQWEsaUJBQWlCO0lBQzVCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixLQUFLLEVBQUcsYUFBYSxDQUFDO0lBQ3RCLFFBQVEsRUFBRyxjQUFjLENBQUM7SUFDMUIsSUFBSSxFQUFHLFNBQVMsQ0FBQztJQUVqQixVQUFVLEVBQUcsc0JBQXNCLENBQUM7SUFDcEMsWUFBWSxFQUFHLG9CQUFvQixDQUFDO0lBQ3BDLE1BQU0sRUFBRyxVQUFVLENBQUM7SUFDcEIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixlQUFlLEVBQUcsWUFBWSxDQUFDO0lBQy9CLGVBQWUsRUFBRyxZQUFZLENBQUM7SUFFL0IsT0FBTyxDQUFDLG9CQUFvQixDQUFTO0lBQ3JDLE9BQU8sQ0FBQyxlQUFlLENBQVM7SUFFaEMsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUczQjtJQUVEOzs7T0FHRztJQUNILGtCQUFrQixTQUVqQjtJQUVEOzs7T0FHRztJQUNILGlCQUFpQixTQUVoQjtZQUthLGNBQWM7SUF3RHRCLEtBQUssa0JBY1Y7SUFFSyxRQUFRLGtCQUViO1lBRWEsU0FBUztDQStCeEIifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,EAAE,KAAK,eAAe,EAAyD,MAAM,sBAAsB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAC/B,eAAe,EAAG,YAAY,CAAC;IAE/B,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,eAAe,CAAS;IAEhC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAED;;;OAGG;IACH,kBAAkB,SAEjB;IAED;;;OAGG;IACH,iBAAiB,SAEhB;YAKa,cAAc;IA6CtB,KAAK,kBAcV;IAEK,QAAQ,kBAEb;YAEa,SAAS;CA2BxB"}
1
+ {"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAItF,OAAO,EAAE,KAAK,eAAe,EAAyD,MAAM,sBAAsB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,YAAY,EAAG,oBAAoB,CAAC;IACpC,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAC/B,eAAe,EAAG,YAAY,CAAC;IAE/B,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,eAAe,CAAS;IAEhC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAED;;;OAGG;IACH,kBAAkB,SAEjB;IAED;;;OAGG;IACH,iBAAiB,SAEhB;YAKa,cAAc;IAwDtB,KAAK,kBAcV;IAEK,QAAQ,kBAEb;YAEa,SAAS;CA+BxB"}