fix: resolve merge conflicts with base branch

All conflicts were about dateProvider support from PR #21829 - take our version.

Author: spalladino

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

@@ -313,10 +313,7 @@ export async function setup(
         accounts: opts.anvilAccounts,
         port: opts.anvilPort ?? (process.env.ANVIL_PORT ? parseInt(process.env.ANVIL_PORT) : undefined),
         slotsInAnEpoch: opts.anvilSlotsInAnEpoch,
-<<<<<<< HEAD
         dateProvider,
-=======
->>>>>>> origin/backport-to-v4-next-staging
       });
       anvil = res.anvil;
       config.l1RpcUrls = [res.rpcUrl];

yarn-project/ethereum/src/test/start_anvil.ts

@@ -34,15 +34,12 @@ export async function startAnvil(
      * L1-finality-based logic work without needing hundreds of mined blocks.
      */
     slotsInAnEpoch?: number;
-<<<<<<< HEAD
     /**
      * If provided, the date provider will be synced to anvil's block time on every mined block.
      * This keeps the dateProvider in lockstep with anvil's chain time, avoiding drift between
      * the wall clock and the L1 chain when computing L1 slot timestamps.
      */
     dateProvider?: TestDateProvider;
-=======
->>>>>>> origin/backport-to-v4-next-staging
   } = {},
 ): Promise<{ anvil: Anvil; methodCalls?: string[]; rpcUrl: string; stop: () => Promise<void> }> {
   const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
@@ -118,23 +115,15 @@ export async function startAnvil(
         child.once('close', onClose);
       });
 
-<<<<<<< HEAD
       // Continue piping for logging, method-call capture, and/or dateProvider sync after startup.
       if (logger || opts.captureMethodCalls || opts.dateProvider) {
-=======
-      // Continue piping for logging / method-call capture after startup.
-      if (logger || opts.captureMethodCalls) {
->>>>>>> origin/backport-to-v4-next-staging
         child.stdout?.on('data', (data: Buffer) => {
           const text = data.toString();
           logger?.debug(text.trim());
           methodCalls?.push(...(text.match(/eth_[^\s]+/g) || []));
-<<<<<<< HEAD
           if (opts.dateProvider) {
             syncDateProviderFromAnvilOutput(text, opts.dateProvider);
           }
-=======
->>>>>>> origin/backport-to-v4-next-staging
         });
         child.stderr?.on('data', (data: Buffer) => {
           logger?.debug(data.toString().trim());
@@ -181,7 +170,6 @@ export async function startAnvil(
   return { anvil: anvilObj, methodCalls, stop, rpcUrl: `http://127.0.0.1:${port}` };
 }
 
-<<<<<<< HEAD
 /** Extracts block time from anvil stdout and syncs the dateProvider. */
 function syncDateProviderFromAnvilOutput(text: string, dateProvider: TestDateProvider): void {
   // Anvil logs mined blocks as:
@@ -195,8 +183,6 @@ function syncDateProviderFromAnvilOutput(text: string, dateProvider: TestDatePro
   }
 }
 
-=======
->>>>>>> origin/backport-to-v4-next-staging
 /** Send SIGTERM, wait up to 5 s, then SIGKILL. All timers are always cleared. */
 function killChild(child: ChildProcess): Promise<void> {
   return new Promise<void>(resolve => {