@aztec/end-to-end 0.0.1-commit.d1f2d6c → 0.0.1-commit.d431d1c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.d1f2d6c",
+  "version": "0.0.1-commit.d431d1c",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,44 +25,44 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.d1f2d6c",
-    "@aztec/archiver": "0.0.1-commit.d1f2d6c",
-    "@aztec/aztec": "0.0.1-commit.d1f2d6c",
-    "@aztec/aztec-node": "0.0.1-commit.d1f2d6c",
-    "@aztec/aztec.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/bb-prover": "0.0.1-commit.d1f2d6c",
-    "@aztec/bb.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/blob-client": "0.0.1-commit.d1f2d6c",
-    "@aztec/blob-lib": "0.0.1-commit.d1f2d6c",
-    "@aztec/bot": "0.0.1-commit.d1f2d6c",
-    "@aztec/cli": "0.0.1-commit.d1f2d6c",
-    "@aztec/constants": "0.0.1-commit.d1f2d6c",
-    "@aztec/entrypoints": "0.0.1-commit.d1f2d6c",
-    "@aztec/epoch-cache": "0.0.1-commit.d1f2d6c",
-    "@aztec/ethereum": "0.0.1-commit.d1f2d6c",
-    "@aztec/foundation": "0.0.1-commit.d1f2d6c",
-    "@aztec/kv-store": "0.0.1-commit.d1f2d6c",
-    "@aztec/l1-artifacts": "0.0.1-commit.d1f2d6c",
-    "@aztec/merkle-tree": "0.0.1-commit.d1f2d6c",
-    "@aztec/node-keystore": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-contracts.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/p2p": "0.0.1-commit.d1f2d6c",
-    "@aztec/protocol-contracts": "0.0.1-commit.d1f2d6c",
-    "@aztec/prover-client": "0.0.1-commit.d1f2d6c",
-    "@aztec/prover-node": "0.0.1-commit.d1f2d6c",
-    "@aztec/pxe": "0.0.1-commit.d1f2d6c",
-    "@aztec/sequencer-client": "0.0.1-commit.d1f2d6c",
-    "@aztec/simulator": "0.0.1-commit.d1f2d6c",
-    "@aztec/slasher": "0.0.1-commit.d1f2d6c",
-    "@aztec/stdlib": "0.0.1-commit.d1f2d6c",
-    "@aztec/telemetry-client": "0.0.1-commit.d1f2d6c",
-    "@aztec/test-wallet": "0.0.1-commit.d1f2d6c",
-    "@aztec/validator-client": "0.0.1-commit.d1f2d6c",
-    "@aztec/validator-ha-signer": "0.0.1-commit.d1f2d6c",
-    "@aztec/world-state": "0.0.1-commit.d1f2d6c",
+    "@aztec/accounts": "0.0.1-commit.d431d1c",
+    "@aztec/archiver": "0.0.1-commit.d431d1c",
+    "@aztec/aztec": "0.0.1-commit.d431d1c",
+    "@aztec/aztec-node": "0.0.1-commit.d431d1c",
+    "@aztec/aztec.js": "0.0.1-commit.d431d1c",
+    "@aztec/bb-prover": "0.0.1-commit.d431d1c",
+    "@aztec/bb.js": "0.0.1-commit.d431d1c",
+    "@aztec/blob-client": "0.0.1-commit.d431d1c",
+    "@aztec/blob-lib": "0.0.1-commit.d431d1c",
+    "@aztec/bot": "0.0.1-commit.d431d1c",
+    "@aztec/cli": "0.0.1-commit.d431d1c",
+    "@aztec/constants": "0.0.1-commit.d431d1c",
+    "@aztec/entrypoints": "0.0.1-commit.d431d1c",
+    "@aztec/epoch-cache": "0.0.1-commit.d431d1c",
+    "@aztec/ethereum": "0.0.1-commit.d431d1c",
+    "@aztec/foundation": "0.0.1-commit.d431d1c",
+    "@aztec/kv-store": "0.0.1-commit.d431d1c",
+    "@aztec/l1-artifacts": "0.0.1-commit.d431d1c",
+    "@aztec/merkle-tree": "0.0.1-commit.d431d1c",
+    "@aztec/node-keystore": "0.0.1-commit.d431d1c",
+    "@aztec/noir-contracts.js": "0.0.1-commit.d431d1c",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.d431d1c",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.d431d1c",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.d431d1c",
+    "@aztec/p2p": "0.0.1-commit.d431d1c",
+    "@aztec/protocol-contracts": "0.0.1-commit.d431d1c",
+    "@aztec/prover-client": "0.0.1-commit.d431d1c",
+    "@aztec/prover-node": "0.0.1-commit.d431d1c",
+    "@aztec/pxe": "0.0.1-commit.d431d1c",
+    "@aztec/sequencer-client": "0.0.1-commit.d431d1c",
+    "@aztec/simulator": "0.0.1-commit.d431d1c",
+    "@aztec/slasher": "0.0.1-commit.d431d1c",
+    "@aztec/stdlib": "0.0.1-commit.d431d1c",
+    "@aztec/telemetry-client": "0.0.1-commit.d431d1c",
+    "@aztec/test-wallet": "0.0.1-commit.d431d1c",
+    "@aztec/validator-client": "0.0.1-commit.d431d1c",
+    "@aztec/validator-ha-signer": "0.0.1-commit.d431d1c",
+    "@aztec/world-state": "0.0.1-commit.d431d1c",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -156,7 +156,8 @@ export class ClientFlowsBenchmark {
     const { claimSecret: secret, messageLeafIndex: index } = claim;
     await this.feeJuiceContract.methods
       .claim(address, claim.claimAmount, secret, index)
-      .send({ from: this.adminAddress });
+      .send({ from: this.adminAddress })
+      .wait();
   }
 
   /** Admin mints bananaCoin tokens privately to the target address and redeems them. */
@@ -251,7 +252,9 @@ export class ClientFlowsBenchmark {
       'BC',
       'BC',
       18n,
-    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
+    )
+      .send({ from: this.adminAddress })
+      .wait();
     this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
     this.bananaCoin = bananaCoin;
     this.bananaCoinInstance = bananaCoinInstance;
@@ -265,7 +268,9 @@ export class ClientFlowsBenchmark {
       'CBC',
       'CBC',
       18n,
-    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
+    )
+      .send({ from: this.adminAddress })
+      .wait();
     this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
     this.candyBarCoin = candyBarCoin;
     this.candyBarCoinInstance = candyBarCoinInstance;
@@ -281,7 +286,9 @@ export class ClientFlowsBenchmark {
       this.adminWallet,
       bananaCoin.address,
       this.adminAddress,
-    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
+    )
+      .send({ from: this.adminAddress })
+      .wait();
 
     this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
@@ -329,10 +336,12 @@ export class ClientFlowsBenchmark {
     const benchysAddress = benchysAccountManager.address;
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
     const behchysDeployMethod = await benchysAccountManager.getDeployMethod();
-    await behchysDeployMethod.send({
-      from: AztecAddress.ZERO,
-      fee: { paymentMethod: new FeeJuicePaymentMethodWithClaim(benchysAddress, claim) },
-    });
+    await behchysDeployMethod
+      .send({
+        from: AztecAddress.ZERO,
+        fee: { paymentMethod: new FeeJuicePaymentMethodWithClaim(benchysAddress, claim) },
+      })
+      .wait();
     // Register benchy on the user's Wallet, where we're going to be interacting from
     const accountManager = await this.userWallet.createAccount({
       secret: benchysAccount.getSecretKey(),
@@ -350,15 +359,19 @@ export class ClientFlowsBenchmark {
       'LPT',
       'LPT',
       18n,
-    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
+    )
+      .send({ from: this.adminAddress })
+      .wait();
     const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
       this.adminWallet,
       this.bananaCoin.address,
       this.candyBarCoin.address,
       liquidityToken.address,
-    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
+    )
+      .send({ from: this.adminAddress })
+      .wait();
     this.logger.info(`AMM deployed at ${amm.address}`);
-    await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress });
+    await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
     this.liquidityToken = liquidityToken;
     this.liquidityTokenInstance = liquidityTokenInstance;
     this.amm = amm;

package/src/bench/utils.ts

@@ -1,10 +1,8 @@
 import type { AztecNodeService } from '@aztec/aztec-node';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { BatchCall, NO_WAIT, type WaitOpts } from '@aztec/aztec.js/contracts';
-import { waitForTx } from '@aztec/aztec.js/node';
+import { BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js/contracts';
 import { mean, stdDev, times } from '@aztec/foundation/collection';
 import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
-import type { TxHash } from '@aztec/stdlib/tx';
 import type { MetricDefinition } from '@aztec/telemetry-client';
 import type { BenchmarkDataPoint, BenchmarkMetricsType, BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
 
@@ -25,7 +23,7 @@ export async function benchmarkSetup(
 ) {
   const context = await setup(1, { ...opts, telemetryConfig: { benchmark: true } });
   const defaultAccountAddress = context.accounts[0];
-  const contract = await BenchmarkingContract.deploy(context.wallet).send({ from: defaultAccountAddress });
+  const contract = await BenchmarkingContract.deploy(context.wallet).send({ from: defaultAccountAddress }).deployed();
   context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
   const sequencer = (context.aztecNode as AztecNodeService).getSequencer()!;
   const telemetry = context.telemetryClient! as BenchmarkTelemetryClient;
@@ -144,18 +142,18 @@ export async function sendTxs(
   context: EndToEndContext,
   contract: BenchmarkingContract,
   heavyPublicCompute: boolean = false,
-): Promise<TxHash[]> {
+): Promise<SentTx[]> {
   const calls = await Promise.all(times(txCount, index => makeCall(index, context, contract, heavyPublicCompute)));
   context.logger.info(`Creating ${txCount} txs`);
   const [from] = context.accounts;
   context.logger.info(`Sending ${txCount} txs`);
-  return Promise.all(calls.map(call => call.send({ from, wait: NO_WAIT })));
+  return calls.map(call => call.send({ from }));
 }
 
-export async function waitTxs(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
+export async function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
   context.logger.info(`Awaiting ${txs.length} txs to be mined`);
-  await Promise.all(txs.map(txHash => waitForTx(context.aztecNode, txHash, txWaitOpts)));
-  context.logger.info(`${txs.length} txs have been mined`);
+  await Promise.all(txs.map(tx => tx.wait(txWaitOpts)));
+  context.logger.info(`All ${txs.length} txs have been mined`);
 }
 
 function randomBytesAsBigInts(length: number): bigint[] {

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -105,13 +105,13 @@ export class BlacklistTokenContractTest {
     await publicDeployAccounts(this.wallet, [this.adminAddress, this.otherAddress, this.blacklistedAddress]);
 
     this.logger.verbose(`Deploying TokenContract...`);
-    this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
-      from: this.adminAddress,
-    });
+    this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress)
+      .send({ from: this.adminAddress })
+      .deployed();
     this.logger.verbose(`Token deployed to ${this.asset.address}`);
 
     this.logger.verbose(`Deploying bad account...`);
-    this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress });
+    this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress }).deployed();
     this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
 
     await this.crossTimestampOfChange();
@@ -171,12 +171,14 @@ export class BlacklistTokenContractTest {
     const adminMinterRole = new Role().withAdmin().withMinter();
     await this.asset.methods
       .update_roles(this.adminAddress, adminMinterRole.toNoirStruct())
-      .send({ from: this.adminAddress });
+      .send({ from: this.adminAddress })
+      .wait();
 
     const blacklistRole = new Role().withBlacklisted();
     await this.asset.methods
       .update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct())
-      .send({ from: this.adminAddress });
+      .send({ from: this.adminAddress })
+      .wait();
 
     await this.crossTimestampOfChange();
 
@@ -185,15 +187,16 @@ export class BlacklistTokenContractTest {
     );
 
     this.logger.verbose(`Minting ${amount} publicly...`);
-    await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress });
+    await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress }).wait();
 
     this.logger.verbose(`Minting ${amount} privately...`);
     const secret = Fr.random();
     const secretHash = await computeSecretHash(secret);
-    const receipt = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress });
+    const receipt = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress }).wait();
 
     await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
-    await asset.methods.redeem_shield(this.adminAddress, amount, secret).send({ from: this.adminAddress });
+    const txClaim = asset.methods.redeem_shield(this.adminAddress, amount, secret).send({ from: this.adminAddress });
+    await txClaim.wait();
     this.logger.verbose(`Minting complete.`);
 
     tokenSim.mintPublic(this.adminAddress, amount);

package/src/e2e_epochs/epochs_test.ts

@@ -121,35 +121,30 @@ export class EpochsTestContext {
 
     // Set up system without any account nor protocol contracts
     // and with faster block times and shorter epochs.
-    const context = await setup(
-      opts.numberOfAccounts ?? 0,
-      {
-        automineL1Setup: true,
-        checkIntervalMs: 50,
-        archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
-        worldStateBlockCheckIntervalMS: WORLD_STATE_BLOCK_CHECK_INTERVAL,
-        aztecEpochDuration,
-        aztecSlotDuration,
-        ethereumSlotDuration,
-        aztecProofSubmissionEpochs,
-        aztecTargetCommitteeSize: opts.initialValidators?.length ?? 0,
-        minTxsPerBlock: 0,
-        realProofs: false,
-        startProverNode: true,
-        proverTestDelayMs: opts.proverTestDelayMs ?? 0,
-        // We use numeric incremental prover ids for simplicity, but we can switch to
-        // using the prover's eth address if the proverId is used for something in the rollup contract
-        // Use numeric EthAddress for deterministic prover id
-        proverId: EthAddress.fromNumber(1),
-        worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
-        exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
-        slasherFlavor: 'none',
-        l1PublishingTime,
-        ...opts,
-      },
-      // Use checkpointed chain tip for PXE to avoid issues with blocks being dropped due to pruned anchor blocks.
-      { syncChainTip: 'checkpointed' },
-    );
+    const context = await setup(opts.numberOfAccounts ?? 0, {
+      automineL1Setup: true,
+      checkIntervalMs: 50,
+      archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
+      worldStateBlockCheckIntervalMS: WORLD_STATE_BLOCK_CHECK_INTERVAL,
+      aztecEpochDuration,
+      aztecSlotDuration,
+      ethereumSlotDuration,
+      aztecProofSubmissionEpochs,
+      aztecTargetCommitteeSize: opts.initialValidators?.length ?? 0,
+      minTxsPerBlock: 0,
+      realProofs: false,
+      startProverNode: true,
+      proverTestDelayMs: opts.proverTestDelayMs ?? 0,
+      // We use numeric incremental prover ids for simplicity, but we can switch to
+      // using the prover's eth address if the proverId is used for something in the rollup contract
+      // Use numeric EthAddress for deterministic prover id
+      proverId: EthAddress.fromNumber(1),
+      worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
+      exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+      slasherFlavor: 'none',
+      l1PublishingTime,
+      ...opts,
+    });
 
     this.context = context;
     this.proverNodes = context.proverNode ? [context.proverNode] : [];

package/src/e2e_fees/bridging_race.notest.ts

@@ -67,7 +67,10 @@ describe('e2e_fees bridging_race', () => {
     // Yes, we need to REFACTOR it at some point
     const claim = await t.feeJuiceBridgeTestHarness.prepareTokensOnL1(bobsAddress);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await t.feeJuiceContract.methods.claim(bobsAddress, claim.claimAmount, secret, index).send({ from: bobsAddress });
+    await t.feeJuiceContract.methods
+      .claim(bobsAddress, claim.claimAmount, secret, index)
+      .send({ from: bobsAddress })
+      .wait();
     const [balance] = await t.getGasBalanceFn(bobsAddress);
     expect(balance).toEqual(claim.claimAmount);
   });

package/src/e2e_fees/fees_test.ts

@@ -152,7 +152,10 @@ export class FeesTest {
   async mintAndBridgeFeeJuice(minter: AztecAddress, recipient: AztecAddress) {
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(recipient);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await this.feeJuiceContract.methods.claim(recipient, claim.claimAmount, secret, index).send({ from: minter });
+    await this.feeJuiceContract.methods
+      .claim(recipient, claim.claimAmount, secret, index)
+      .send({ from: minter })
+      .wait();
   }
 
   /** Alice mints bananaCoin tokens privately to the target address and redeems them. */
@@ -232,9 +235,9 @@ export class FeesTest {
   async applyDeployBananaToken() {
     this.logger.info('Applying deploy banana token setup');
 
-    const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n).send({
-      from: this.aliceAddress,
-    });
+    const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n)
+      .send({ from: this.aliceAddress })
+      .deployed();
     this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
 
     this.bananaCoin = bananaCoin;
@@ -259,9 +262,9 @@ export class FeesTest {
     expect((await this.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
     const bananaCoin = this.bananaCoin;
-    const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin).send({
-      from: this.aliceAddress,
-    });
+    const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin)
+      .send({ from: this.aliceAddress })
+      .deployed();
 
     this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
@@ -303,10 +306,10 @@ export class FeesTest {
           await this.rollupContract.getManaTarget(),
         ) + (await this.rollupContract.getProvingCostPerMana());
 
-      const price = await this.rollupContract.getEthPerFeeAsset();
+      const price = await this.rollupContract.getFeeAssetPerEth();
 
       const mana = block!.header.totalManaUsed.toBigInt();
-      return mulDiv(mana * proverCost, 10n ** 12n, price);
+      return mulDiv(mana * proverCost, price, 10n ** 9n);
     };
   }
 
@@ -328,7 +331,8 @@ export class FeesTest {
     await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
     await this.bananaCoin.methods
       .mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS)
-      .send({ from: this.aliceAddress });
+      .send({ from: this.aliceAddress })
+      .wait();
   }
 
   public async applyFundAliceWithPrivateBananas() {

package/src/e2e_l1_publisher/write_json.ts

@@ -2,7 +2,7 @@ import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { Fr } from '@aztec/aztec.js/fields';
 import { BatchedBlob, Blob, getEthBlobEvaluationInputs, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { L2Block } from '@aztec/stdlib/block';
+import { L2BlockNew } from '@aztec/stdlib/block';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 
 import { writeFile } from 'fs/promises';
@@ -15,7 +15,7 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
  */
 export async function writeJson(
   fileName: string,
-  block: L2Block,
+  block: L2BlockNew,
   l1ToL2Content: Fr[],
   blobs: Blob[],
   batchedBlob: BatchedBlob,

package/src/e2e_nested_contract/nested_contract_test.ts

@@ -65,8 +65,10 @@ export class NestedContractTest {
 
   async applyManual() {
     this.logger.info('Deploying parent and child contracts');
-    const parentContract = await ParentContract.deploy(this.wallet).send({ from: this.defaultAccountAddress });
-    const childContract = await ChildContract.deploy(this.wallet).send({ from: this.defaultAccountAddress });
+    const parentContract = await ParentContract.deploy(this.wallet)
+      .send({ from: this.defaultAccountAddress })
+      .deployed();
+    const childContract = await ChildContract.deploy(this.wallet).send({ from: this.defaultAccountAddress }).deployed();
     this.parentContract = parentContract;
     this.childContract = childContract;
   }

package/src/e2e_p2p/p2p_network.ts

@@ -321,7 +321,7 @@ export class P2PNetworkTest {
       throw new Error('Call setupAccount before deploying spam contract');
     }
 
-    const spamContract = await SpamContract.deploy(this.wallet).send({ from: this.defaultAccountAddress! });
+    const spamContract = await SpamContract.deploy(this.wallet).send({ from: this.defaultAccountAddress! }).deployed();
     this.spamContract = spamContract;
   }
 
@@ -351,19 +351,14 @@ export class P2PNetworkTest {
 
   async setup() {
     this.logger.info('Setting up subsystems from fresh');
-    this.context = await setup(
-      0,
-      {
-        ...this.setupOptions,
-        fundSponsoredFPC: true,
-        skipAccountDeployment: true,
-        slasherFlavor: this.setupOptions.slasherFlavor ?? this.deployL1ContractsArgs.slasherFlavor ?? 'none',
-        aztecTargetCommitteeSize: 0,
-        l1ContractsArgs: this.deployL1ContractsArgs,
-      },
-      // Use checkpointed chain tip for PXE to avoid issues with blocks being dropped due to pruned anchor blocks.
-      { syncChainTip: 'checkpointed' },
-    );
+    this.context = await setup(0, {
+      ...this.setupOptions,
+      fundSponsoredFPC: true,
+      skipAccountDeployment: true,
+      slasherFlavor: this.setupOptions.slasherFlavor ?? this.deployL1ContractsArgs.slasherFlavor ?? 'none',
+      aztecTargetCommitteeSize: 0,
+      l1ContractsArgs: this.deployL1ContractsArgs,
+    });
     this.ctx = this.context;
 
     const sponsoredFPCAddress = await getSponsoredFPCAddress();

package/src/e2e_p2p/shared.ts

@@ -1,10 +1,10 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeService } from '@aztec/aztec-node';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { NO_WAIT, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { type SentTx, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
 import { Fr } from '@aztec/aztec.js/fields';
 import type { Logger } from '@aztec/aztec.js/log';
-import { TxHash } from '@aztec/aztec.js/tx';
+import { Tx, TxStatus } from '@aztec/aztec.js/tx';
 import type { RollupCheatCodes } from '@aztec/aztec/testing';
 import type {
   EmpireSlashingProposerContract,
@@ -22,7 +22,7 @@ import { getPXEConfig, getPXEConfig as getRpcConfig } from '@aztec/pxe/server';
 import { getRoundForOffense } from '@aztec/slasher';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
-import { type ProvenTx, TestWallet, proveInteraction } from '@aztec/test-wallet/server';
+import { TestWallet, proveInteraction } from '@aztec/test-wallet/server';
 
 import { submitTxsTo } from '../shared/submit-transactions.js';
 
@@ -34,15 +34,24 @@ export const submitComplexTxsTo = async (
   numTxs: number,
   opts: { callPublic?: boolean } = {},
 ) => {
-  const txs: TxHash[] = [];
+  const txs: SentTx[] = [];
 
   const seed = 1234n;
   const spamCount = 15;
   for (let i = 0; i < numTxs; i++) {
-    const method = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic);
-    const txHash = await method.send({ from, wait: NO_WAIT });
+    const tx = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic).send({ from });
+    const txHash = await tx.getTxHash();
+
     logger.info(`Tx sent with hash ${txHash.toString()}`);
-    txs.push(txHash);
+    const receipt = await tx.getReceipt();
+    expect(receipt).toEqual(
+      expect.objectContaining({
+        status: TxStatus.PENDING,
+        error: '',
+      }),
+    );
+    logger.info(`Receipt received for ${txHash.toString()}`);
+    txs.push(tx);
   }
   return txs;
 };
@@ -53,7 +62,7 @@ export const submitTransactions = async (
   node: AztecNodeService,
   numTxs: number,
   fundedAccount: InitialAccountData,
-): Promise<TxHash[]> => {
+): Promise<SentTx[]> => {
   const rpcConfig = getRpcConfig();
   rpcConfig.proverEnabled = false;
   const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
@@ -66,7 +75,7 @@ export async function prepareTransactions(
   node: AztecNodeService,
   numTxs: number,
   fundedAccount: InitialAccountData,
-): Promise<ProvenTx[]> {
+): Promise<Tx[]> {
   const rpcConfig = getRpcConfig();
   rpcConfig.proverEnabled = false;
 
@@ -83,7 +92,8 @@ export async function prepareTransactions(
     const tx = await proveInteraction(wallet, contract.methods.emit_nullifier(Fr.random()), {
       from: fundedAccountManager.address,
     });
-    logger.info(`Tx prepared with hash ${tx.getTxHash()}`);
+    const txHash = tx.getTxHash();
+    logger.info(`Tx prepared with hash ${txHash}`);
     return tx;
   });
 }

package/src/e2e_token_contract/token_contract_test.ts

@@ -85,11 +85,13 @@ export class TokenContractTest {
       TokenContractTest.TOKEN_NAME,
       TokenContractTest.TOKEN_SYMBOL,
       TokenContractTest.TOKEN_DECIMALS,
-    ).send({ from: this.adminAddress });
+    )
+      .send({ from: this.adminAddress })
+      .deployed();
     this.logger.verbose(`Token deployed to ${this.asset.address}`);
 
     this.logger.verbose(`Deploying bad account...`);
-    this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress });
+    this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress }).deployed();
     this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
 
     this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
@@ -128,7 +130,7 @@ export class TokenContractTest {
     const amount = 10000n;
 
     this.logger.verbose(`Minting ${amount} publicly...`);
-    await asset.methods.mint_to_public(adminAddress, amount).send({ from: adminAddress });
+    await asset.methods.mint_to_public(adminAddress, amount).send({ from: adminAddress }).wait();
     tokenSim.mintPublic(adminAddress, amount);
 
     const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({ from: adminAddress });

package/src/fixtures/e2e_prover_test.ts

@@ -114,7 +114,9 @@ export class FullProverTest {
       FullProverTest.TOKEN_NAME,
       FullProverTest.TOKEN_SYMBOL,
       FullProverTest.TOKEN_DECIMALS,
-    ).send({ from: this.accounts[0], wait: { returnReceipt: true } });
+    )
+      .send({ from: this.accounts[0] })
+      .wait();
     this.logger.verbose(`Token deployed to ${asset.address}`);
 
     this.fakeProofsAsset = asset;
@@ -306,10 +308,13 @@ export class FullProverTest {
     const publicAmount = 10000n;
 
     this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
-    await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({ from: accounts[0] });
+    await asset.methods
+      .mint_to_public(accounts[0], privateAmount + publicAmount)
+      .send({ from: accounts[0] })
+      .wait();
 
     this.logger.verbose(`Transferring ${privateAmount} to private...`);
-    await asset.methods.transfer_to_private(accounts[0], privateAmount).send({ from: accounts[0] });
+    await asset.methods.transfer_to_private(accounts[0], privateAmount).send({ from: accounts[0] }).wait();
 
     this.logger.info(`Minting complete`);