fix(e2e): wait for checkpointed blocks in rediscovery test

## Summary

- Fix flaky `e2e_p2p/rediscovery.test.ts` caused by a race between uncheckpointed block pruning and PXE transaction simulation
- After `setupAccount()` deploys accounts, wait for blocks to reach `CHECKPOINTED` status before proceeding with the stop/restart cycle
- Refactor `deployAccounts` in `setup.ts` to accept optional `DeployOptions`, with `from: NO_FROM` always applied as the base

**Root cause**: After `setupAccount()` produces blocks, the test stops and restarts validator nodes. During the restart (~25s), the L1 clock advances past the block's slot. When restarted nodes sync, `pruneUncheckpointedBlocks()` removes the block because its slot has passed without a checkpoint. The PXE then fails simulating a transaction against the pruned block.

**Fix**: Pass `wait: { waitForStatus: TxStatus.CHECKPOINTED }` to `deployAccounts`, which waits for the deploy tx's block to be checkpointed before returning. This replaces the previous manual `retryUntil` loop.

CI log of the flake: http://ci.aztec-labs.com/19edb028126f87c3
Full analysis: https://gist.github.com/AztecBot/b4101abd080ebd536ac09e7c82188518

Co-authored-by: Phil Windle <philip.windle@gmail.com>

Author: 2 people

yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts

@@ -20,6 +20,7 @@ import type { BootstrapNode } from '@aztec/p2p/bootstrap';
 import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { TopicType } from '@aztec/stdlib/p2p';
+import { TxStatus } from '@aztec/stdlib/tx';
 import type { GenesisData } from '@aztec/stdlib/world-state';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -299,10 +300,11 @@ export class P2PNetworkTest {
 
   async setupAccount() {
     this.logger.info('Setting up account');
-    const { deployedAccounts } = await deployAccounts(
-      1,
-      this.logger,
-    )({
+    const { deployedAccounts } = await deployAccounts(1, this.logger, {
+      wait: {
+        waitForStatus: TxStatus.CHECKPOINTED,
+      },
+    })({
       wallet: this.context.wallet,
       initialFundedAccounts: this.context.initialFundedAccounts,
     });

yarn-project/end-to-end/src/fixtures/setup.ts

@@ -7,6 +7,8 @@ import {
   BatchCall,
   type ContractFunctionInteraction,
   type ContractMethod,
+  type DeployInteractionWaitOptions,
+  type DeployOptions,
   getContractClassFromArtifact,
   waitForProven,
 } from '@aztec/aztec.js/contracts';
@@ -834,7 +836,7 @@ export async function ensureAccountContractsPublished(wallet: Wallet, accountsTo
  * Returns deployed account data that can be used by tests.
  */
 export const deployAccounts =
-  (numberOfAccounts: number, logger: Logger) =>
+  (numberOfAccounts: number, logger: Logger, deployOptions?: Partial<DeployOptions<DeployInteractionWaitOptions>>) =>
   async ({ wallet, initialFundedAccounts }: { wallet: TestWallet; initialFundedAccounts: InitialAccountData[] }) => {
     if (initialFundedAccounts.length < numberOfAccounts) {
       throw new Error(`Cannot deploy more than ${initialFundedAccounts.length} initial accounts.`);
@@ -853,6 +855,7 @@ export const deployAccounts =
       await deployMethod.send({
         from: NO_FROM,
         skipClassPublication: i !== 0, // Publish the contract class at most once.
+        ...deployOptions,
       });
     }