perf(e2e): overlap fees harness setup txs

The BananaFPC deploy, SponsoredFPC registration, and Alice's banana mints
each depend only on the BananaCoin deployed during FeesTest.setup, so the
fees suites now run them concurrently instead of paying one production slot
per step. Likewise the cross-chain harness deploys the L2 token and its
bridge concurrently: the bridge takes the token address as a constructor
arg, but that address is deterministic before the deploy tx mines, and the
bridge constructor does not call into the token.

Author: spalladino

yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts

@@ -76,19 +76,17 @@ export async function deployAndInitializeTokenAndBridgeContracts(
     client: l1Client,
   });
 
-  // deploy l2 token
-  const { contract: token } = await testSpan('deploy:token', () =>
-    TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18).send({
-      from: owner,
-    }),
-  );
-
-  // deploy l2 token bridge and attach to the portal
-  const { contract: bridge } = await testSpan('deploy:bridge', () =>
-    TokenBridgeContract.deploy(wallet, token.address, tokenPortalAddress).send({
-      from: owner,
-    }),
-  );
+  // Deploy the L2 token and its bridge concurrently so they share a slot: the bridge takes the token
+  // address as a constructor arg, but that address is known deterministically before the token deploy
+  // mines, and the bridge's constructor only stores it without calling into the token.
+  const tokenDeploy = TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18, { deployer: owner });
+  const tokenAddress = await tokenDeploy.getAddress();
+  const [{ contract: token }, { contract: bridge }] = await Promise.all([
+    testSpan('deploy:token', () => tokenDeploy.send({ from: owner })),
+    testSpan('deploy:bridge', () =>
+      TokenBridgeContract.deploy(wallet, tokenAddress, tokenPortalAddress).send({ from: owner }),
+    ),
+  ]);
 
   if ((await token.methods.get_admin().simulate({ from: owner })).result !== owner.toBigInt()) {
     throw new Error(`Token admin is not ${owner}`);

yarn-project/end-to-end/src/single-node/fees/account_init.test.ts

@@ -33,8 +33,9 @@ describe('single-node/fees/account_init', () => {
 
   beforeAll(async () => {
     await t.setup({ ...PIPELINING_SETUP_OPTS });
-    await t.applyFundAliceWithBananas();
-    await t.applyFPCSetup();
+    // Alice's banana mints and the BananaFPC deploy each depend only on the BananaCoin deployed
+    // during setup, so they run concurrently and share slots.
+    await Promise.all([t.applyFundAliceWithBananas(), t.applyFPCSetup()]);
     ({ aliceAddress, wallet, bananaCoin, bananaFPC, logger, aztecNode } = t);
   });
 

yarn-project/end-to-end/src/single-node/fees/gas_estimation.parallel.test.ts

@@ -46,8 +46,9 @@ describe('single-node/fees/gas_estimation', () => {
 
   beforeAll(async () => {
     await t.setup({ ...PIPELINING_SETUP_OPTS });
-    await t.applyFPCSetup();
-    await t.applyFundAliceWithBananas();
+    // Alice's banana mints and the BananaFPC deploy each depend only on the BananaCoin deployed
+    // during setup, so they run concurrently and share slots.
+    await Promise.all([t.applyFPCSetup(), t.applyFundAliceWithBananas()]);
     ({ wallet, aliceAddress, bobAddress, bananaCoin, bananaFPC, gasSettings, logger, aztecNode } = t);
   });
 

yarn-project/end-to-end/src/single-node/fees/private_payments.parallel.test.ts

@@ -46,11 +46,10 @@ describe('single-node/fees/private_payments', () => {
     // cycle: the prover-node submits a proof as soon as the epoch is complete, so ~8x shorter
     // epochs ≈ ~8x faster proof cadence per cycle. Setup itself stays slot-bound.
     await t.setup({ ...PIPELINING_SETUP_OPTS, aztecProofSubmissionEpochs: 640, aztecEpochDuration: 4 });
-    await t.applyFPCSetup();
-    // Register the SponsoredFPC (funded at genesis via FeesTest's fundSponsoredFPC) so the folded
-    // sponsored-payment it can use it; this is a PXE registration, not an L2 tx.
-    await t.applySponsoredFPCSetup();
-    await t.applyFundAliceWithBananas();
+    // The BananaFPC deploy, the SponsoredFPC registration (funded at genesis via FeesTest's
+    // fundSponsoredFPC; a PXE registration, not an L2 tx), and Alice's banana mints each depend only
+    // on the BananaCoin deployed during setup, so they run concurrently and share slots.
+    await Promise.all([t.applyFPCSetup(), t.applySponsoredFPCSetup(), t.applyFundAliceWithBananas()]);
     ({
       wallet,
       aliceAddress,