@aztec/end-to-end 0.0.1-commit.3469e52 → 0.0.1-commit.54489865

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.3469e52",
+  "version": "0.0.1-commit.54489865",
   "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.3469e52",
-    "@aztec/archiver": "0.0.1-commit.3469e52",
-    "@aztec/aztec": "0.0.1-commit.3469e52",
-    "@aztec/aztec-node": "0.0.1-commit.3469e52",
-    "@aztec/aztec.js": "0.0.1-commit.3469e52",
-    "@aztec/bb-prover": "0.0.1-commit.3469e52",
-    "@aztec/bb.js": "0.0.1-commit.3469e52",
-    "@aztec/blob-client": "0.0.1-commit.3469e52",
-    "@aztec/blob-lib": "0.0.1-commit.3469e52",
-    "@aztec/bot": "0.0.1-commit.3469e52",
-    "@aztec/cli": "0.0.1-commit.3469e52",
-    "@aztec/constants": "0.0.1-commit.3469e52",
-    "@aztec/entrypoints": "0.0.1-commit.3469e52",
-    "@aztec/epoch-cache": "0.0.1-commit.3469e52",
-    "@aztec/ethereum": "0.0.1-commit.3469e52",
-    "@aztec/foundation": "0.0.1-commit.3469e52",
-    "@aztec/kv-store": "0.0.1-commit.3469e52",
-    "@aztec/l1-artifacts": "0.0.1-commit.3469e52",
-    "@aztec/merkle-tree": "0.0.1-commit.3469e52",
-    "@aztec/node-keystore": "0.0.1-commit.3469e52",
-    "@aztec/noir-contracts.js": "0.0.1-commit.3469e52",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.3469e52",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.3469e52",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.3469e52",
-    "@aztec/p2p": "0.0.1-commit.3469e52",
-    "@aztec/protocol-contracts": "0.0.1-commit.3469e52",
-    "@aztec/prover-client": "0.0.1-commit.3469e52",
-    "@aztec/prover-node": "0.0.1-commit.3469e52",
-    "@aztec/pxe": "0.0.1-commit.3469e52",
-    "@aztec/sequencer-client": "0.0.1-commit.3469e52",
-    "@aztec/simulator": "0.0.1-commit.3469e52",
-    "@aztec/slasher": "0.0.1-commit.3469e52",
-    "@aztec/stdlib": "0.0.1-commit.3469e52",
-    "@aztec/telemetry-client": "0.0.1-commit.3469e52",
-    "@aztec/test-wallet": "0.0.1-commit.3469e52",
-    "@aztec/validator-client": "0.0.1-commit.3469e52",
-    "@aztec/validator-ha-signer": "0.0.1-commit.3469e52",
-    "@aztec/world-state": "0.0.1-commit.3469e52",
+    "@aztec/accounts": "0.0.1-commit.54489865",
+    "@aztec/archiver": "0.0.1-commit.54489865",
+    "@aztec/aztec": "0.0.1-commit.54489865",
+    "@aztec/aztec-node": "0.0.1-commit.54489865",
+    "@aztec/aztec.js": "0.0.1-commit.54489865",
+    "@aztec/bb-prover": "0.0.1-commit.54489865",
+    "@aztec/bb.js": "0.0.1-commit.54489865",
+    "@aztec/blob-client": "0.0.1-commit.54489865",
+    "@aztec/blob-lib": "0.0.1-commit.54489865",
+    "@aztec/bot": "0.0.1-commit.54489865",
+    "@aztec/cli": "0.0.1-commit.54489865",
+    "@aztec/constants": "0.0.1-commit.54489865",
+    "@aztec/entrypoints": "0.0.1-commit.54489865",
+    "@aztec/epoch-cache": "0.0.1-commit.54489865",
+    "@aztec/ethereum": "0.0.1-commit.54489865",
+    "@aztec/foundation": "0.0.1-commit.54489865",
+    "@aztec/kv-store": "0.0.1-commit.54489865",
+    "@aztec/l1-artifacts": "0.0.1-commit.54489865",
+    "@aztec/merkle-tree": "0.0.1-commit.54489865",
+    "@aztec/node-keystore": "0.0.1-commit.54489865",
+    "@aztec/noir-contracts.js": "0.0.1-commit.54489865",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.54489865",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.54489865",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.54489865",
+    "@aztec/p2p": "0.0.1-commit.54489865",
+    "@aztec/protocol-contracts": "0.0.1-commit.54489865",
+    "@aztec/prover-client": "0.0.1-commit.54489865",
+    "@aztec/prover-node": "0.0.1-commit.54489865",
+    "@aztec/pxe": "0.0.1-commit.54489865",
+    "@aztec/sequencer-client": "0.0.1-commit.54489865",
+    "@aztec/simulator": "0.0.1-commit.54489865",
+    "@aztec/slasher": "0.0.1-commit.54489865",
+    "@aztec/stdlib": "0.0.1-commit.54489865",
+    "@aztec/telemetry-client": "0.0.1-commit.54489865",
+    "@aztec/test-wallet": "0.0.1-commit.54489865",
+    "@aztec/validator-client": "0.0.1-commit.54489865",
+    "@aztec/validator-ha-signer": "0.0.1-commit.54489865",
+    "@aztec/world-state": "0.0.1-commit.54489865",
     "@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,8 +156,7 @@ export class ClientFlowsBenchmark {
     const { claimSecret: secret, messageLeafIndex: index } = claim;
     await this.feeJuiceContract.methods
       .claim(address, claim.claimAmount, secret, index)
-      .send({ from: this.adminAddress })
-      .wait();
+      .send({ from: this.adminAddress });
   }
 
   /** Admin mints bananaCoin tokens privately to the target address and redeems them. */
@@ -252,9 +251,7 @@ export class ClientFlowsBenchmark {
       'BC',
       'BC',
       18n,
-    )
-      .send({ from: this.adminAddress })
-      .wait();
+    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
     this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
     this.bananaCoin = bananaCoin;
     this.bananaCoinInstance = bananaCoinInstance;
@@ -268,9 +265,7 @@ export class ClientFlowsBenchmark {
       'CBC',
       'CBC',
       18n,
-    )
-      .send({ from: this.adminAddress })
-      .wait();
+    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
     this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
     this.candyBarCoin = candyBarCoin;
     this.candyBarCoinInstance = candyBarCoinInstance;
@@ -286,9 +281,7 @@ export class ClientFlowsBenchmark {
       this.adminWallet,
       bananaCoin.address,
       this.adminAddress,
-    )
-      .send({ from: this.adminAddress })
-      .wait();
+    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
 
     this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
@@ -336,12 +329,10 @@ 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) },
-      })
-      .wait();
+    await behchysDeployMethod.send({
+      from: AztecAddress.ZERO,
+      fee: { paymentMethod: new FeeJuicePaymentMethodWithClaim(benchysAddress, claim) },
+    });
     // Register benchy on the user's Wallet, where we're going to be interacting from
     const accountManager = await this.userWallet.createAccount({
       secret: benchysAccount.getSecretKey(),
@@ -359,19 +350,15 @@ export class ClientFlowsBenchmark {
       'LPT',
       'LPT',
       18n,
-    )
-      .send({ from: this.adminAddress })
-      .wait();
+    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
     const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
       this.adminWallet,
       this.bananaCoin.address,
       this.candyBarCoin.address,
       liquidityToken.address,
-    )
-      .send({ from: this.adminAddress })
-      .wait();
+    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
     this.logger.info(`AMM deployed at ${amm.address}`);
-    await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
+    await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress });
     this.liquidityToken = liquidityToken;
     this.liquidityTokenInstance = liquidityTokenInstance;
     this.amm = amm;

package/src/bench/utils.ts

@@ -1,8 +1,10 @@
 import type { AztecNodeService } from '@aztec/aztec-node';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js/contracts';
+import { BatchCall, NO_WAIT, type WaitOpts } from '@aztec/aztec.js/contracts';
+import { waitForTx } from '@aztec/aztec.js/node';
 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';
 
@@ -23,7 +25,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 }).deployed();
+  const contract = await BenchmarkingContract.deploy(context.wallet).send({ from: defaultAccountAddress });
   context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
   const sequencer = (context.aztecNode as AztecNodeService).getSequencer()!;
   const telemetry = context.telemetryClient! as BenchmarkTelemetryClient;
@@ -142,18 +144,18 @@ export async function sendTxs(
   context: EndToEndContext,
   contract: BenchmarkingContract,
   heavyPublicCompute: boolean = false,
-): Promise<SentTx[]> {
+): Promise<TxHash[]> {
   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 calls.map(call => call.send({ from }));
+  return Promise.all(calls.map(call => call.send({ from, wait: NO_WAIT })));
 }
 
-export async function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
+export async function waitTxs(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
   context.logger.info(`Awaiting ${txs.length} txs to be mined`);
-  await Promise.all(txs.map(tx => tx.wait(txWaitOpts)));
-  context.logger.info(`All ${txs.length} txs have been mined`);
+  await Promise.all(txs.map(txHash => waitForTx(context.aztecNode, txHash, txWaitOpts)));
+  context.logger.info(`${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 })
-      .deployed();
+    this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
+      from: this.adminAddress,
+    });
     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 }).deployed();
+    this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress });
     this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
 
     await this.crossTimestampOfChange();
@@ -171,14 +171,12 @@ export class BlacklistTokenContractTest {
     const adminMinterRole = new Role().withAdmin().withMinter();
     await this.asset.methods
       .update_roles(this.adminAddress, adminMinterRole.toNoirStruct())
-      .send({ from: this.adminAddress })
-      .wait();
+      .send({ from: this.adminAddress });
 
     const blacklistRole = new Role().withBlacklisted();
     await this.asset.methods
       .update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct())
-      .send({ from: this.adminAddress })
-      .wait();
+      .send({ from: this.adminAddress });
 
     await this.crossTimestampOfChange();
 
@@ -187,16 +185,15 @@ export class BlacklistTokenContractTest {
     );
 
     this.logger.verbose(`Minting ${amount} publicly...`);
-    await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress }).wait();
+    await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress });
 
     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 }).wait();
+    const receipt = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress });
 
     await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
-    const txClaim = asset.methods.redeem_shield(this.adminAddress, amount, secret).send({ from: this.adminAddress });
-    await txClaim.wait();
+    await asset.methods.redeem_shield(this.adminAddress, amount, secret).send({ from: this.adminAddress });
     this.logger.verbose(`Minting complete.`);
 
     tokenSim.mintPublic(this.adminAddress, amount);

package/src/e2e_epochs/epochs_test.ts

@@ -14,13 +14,15 @@ import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { BlockNumber, CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto/random';
-import { withLogNameSuffix } from '@aztec/foundation/log';
+import { withLoggerBindings } from '@aztec/foundation/log/server';
 import { retryUntil } from '@aztec/foundation/retry';
 import { sleep } from '@aztec/foundation/sleep';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
+import { TestContract } from '@aztec/noir-test-contracts.js/Test';
 import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
 import { ProverNode, type ProverNodeConfig, ProverNodePublisher } from '@aztec/prover-node';
 import type { TestProverNode } from '@aztec/prover-node/test';
+import type { PXEConfig } from '@aztec/pxe/config';
 import {
   type SequencerClient,
   type SequencerEvents,
@@ -49,7 +51,11 @@ export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
 export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
 
-export type EpochsTestOpts = Partial<SetupOptions> & { numberOfAccounts?: number };
+export type EpochsTestOpts = Partial<SetupOptions> & {
+  numberOfAccounts?: number;
+  pxeOpts?: Partial<PXEConfig>;
+  aztecSlotDurationInL1Slots?: number;
+};
 
 export type TrackedSequencerEvent = {
   [K in keyof SequencerEvents]: Parameters<SequencerEvents[K]>[0] & {
@@ -94,7 +100,7 @@ export class EpochsTestContext {
       ? parseInt(process.env.L1_BLOCK_TIME)
       : DEFAULT_L1_BLOCK_TIME;
     const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
-    const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
+    const aztecSlotDuration = opts.aztecSlotDuration ?? (opts.aztecSlotDurationInL1Slots ?? 2) * ethereumSlotDuration;
     const aztecEpochDuration = opts.aztecEpochDuration ?? 6;
     const aztecProofSubmissionEpochs = opts.aztecProofSubmissionEpochs ?? 1;
     const l1PublishingTime = opts.l1PublishingTime ?? 1;
@@ -121,30 +127,36 @@ 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,
-    });
+    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 by default to avoid issues with blocks being dropped due to pruned anchor blocks.
+      // Can be overridden via opts.pxeOpts.
+      { syncChainTip: 'checkpointed', ...opts.pxeOpts },
+    );
 
     this.context = context;
     this.proverNodes = context.proverNode ? [context.proverNode] : [];
@@ -199,14 +211,14 @@ export class EpochsTestContext {
   public async createProverNode(opts: { dontStart?: boolean } & Partial<ProverNodeConfig> = {}) {
     this.logger.warn('Creating and syncing a simulated prover node...');
     const proverNodePrivateKey = this.getNextPrivateKey();
-    const suffix = (this.proverNodes.length + 1).toString();
-    const proverNode = await withLogNameSuffix(suffix, () =>
+    const proverIndex = this.proverNodes.length + 1;
+    const proverNode = await withLoggerBindings({ actor: `prover-${proverIndex}` }, () =>
       createAndSyncProverNode(
         proverNodePrivateKey,
         { ...this.context.config },
         {
           dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
-          proverId: EthAddress.fromNumber(parseInt(suffix, 10)),
+          proverId: EthAddress.fromNumber(proverIndex),
           dontStart: opts.dontStart,
           ...opts,
         },
@@ -235,12 +247,13 @@ export class EpochsTestContext {
   private async createNode(
     opts: Partial<AztecNodeConfig> & { txDelayerMaxInclusionTimeIntoSlot?: number; dontStartSequencer?: boolean } = {},
   ) {
-    const suffix = (this.nodes.length + 1).toString();
+    const nodeIndex = this.nodes.length + 1;
+    const actorPrefix = opts.disableValidator ? 'node' : 'validator';
     const { mockGossipSubNetwork } = this.context;
     const resolvedConfig = { ...this.context.config, ...opts };
     const p2pEnabled = resolvedConfig.p2pEnabled || mockGossipSubNetwork !== undefined;
     const p2pIp = resolvedConfig.p2pIp ?? (p2pEnabled ? '127.0.0.1' : undefined);
-    const node = await withLogNameSuffix(suffix, () =>
+    const node = await withLoggerBindings({ actor: `${actorPrefix}-${nodeIndex}` }, () =>
       AztecNodeService.createAndSync(
         {
           ...resolvedConfig,
@@ -370,6 +383,19 @@ export class EpochsTestContext {
     return SpamContract.at(instance.address, wallet);
   }
 
+  /** Registers the TestContract on the given wallet. */
+  public async registerTestContract(wallet: Wallet, salt = Fr.ZERO) {
+    const instance = await getContractInstanceFromInstantiationParams(TestContract.artifact, {
+      constructorArgs: [],
+      constructorArtifact: undefined,
+      salt,
+      publicKeys: undefined,
+      deployer: undefined,
+    });
+    await wallet.registerContract(instance, TestContract.artifact);
+    return TestContract.at(instance.address, wallet);
+  }
+
   /** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */
   public async createL1Client() {
     const { client, delayer } = withDelayer(

package/src/e2e_fees/bridging_race.notest.ts

@@ -67,10 +67,7 @@ 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 })
-      .wait();
+    await t.feeJuiceContract.methods.claim(bobsAddress, claim.claimAmount, secret, index).send({ from: bobsAddress });
     const [balance] = await t.getGasBalanceFn(bobsAddress);
     expect(balance).toEqual(claim.claimAmount);
   });

package/src/e2e_fees/fees_test.ts

@@ -152,10 +152,7 @@ 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 })
-      .wait();
+    await this.feeJuiceContract.methods.claim(recipient, claim.claimAmount, secret, index).send({ from: minter });
   }
 
   /** Alice mints bananaCoin tokens privately to the target address and redeems them. */
@@ -235,9 +232,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 })
-      .deployed();
+    const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n).send({
+      from: this.aliceAddress,
+    });
     this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
 
     this.bananaCoin = bananaCoin;
@@ -262,9 +259,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 })
-      .deployed();
+    const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin).send({
+      from: this.aliceAddress,
+    });
 
     this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
@@ -306,10 +303,10 @@ export class FeesTest {
           await this.rollupContract.getManaTarget(),
         ) + (await this.rollupContract.getProvingCostPerMana());
 
-      const price = await this.rollupContract.getFeeAssetPerEth();
+      const price = await this.rollupContract.getEthPerFeeAsset();
 
       const mana = block!.header.totalManaUsed.toBigInt();
-      return mulDiv(mana * proverCost, price, 10n ** 9n);
+      return mulDiv(mana * proverCost, 10n ** 12n, price);
     };
   }
 
@@ -331,8 +328,7 @@ 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 })
-      .wait();
+      .send({ from: this.aliceAddress });
   }
 
   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 { L2BlockNew } from '@aztec/stdlib/block';
+import { L2Block } from '@aztec/stdlib/block';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 
 import { writeFile } from 'fs/promises';
@@ -15,7 +15,8 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
  */
 export async function writeJson(
   fileName: string,
-  block: L2BlockNew,
+  checkpointHeader: CheckpointHeader,
+  block: L2Block,
   l1ToL2Content: Fr[],
   blobs: Blob[],
   batchedBlob: BatchedBlob,
@@ -33,12 +34,6 @@ export async function writeJson(
     return `0x${buffer.toString('hex').padStart(size, '0')}`;
   };
 
-  // Create a checkpoint header for this block
-  const checkpointHeader = CheckpointHeader.random({
-    slotNumber: block.slot,
-    timestamp: block.timestamp,
-  });
-
   const jsonObject = {
     populate: {
       l1ToL2Content: l1ToL2Content.map(value => asHex(value)),

package/src/e2e_nested_contract/nested_contract_test.ts

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

package/src/e2e_p2p/p2p_network.ts

@@ -128,6 +128,7 @@ export class P2PNetworkTest {
       metricsPort: metricsPort,
       numberOfInitialFundedAccounts: 2,
       startProverNode,
+      walletMinFeePadding: 2.0,
     };
 
     this.deployL1ContractsArgs = {
@@ -321,7 +322,7 @@ export class P2PNetworkTest {
       throw new Error('Call setupAccount before deploying spam contract');
     }
 
-    const spamContract = await SpamContract.deploy(this.wallet).send({ from: this.defaultAccountAddress! }).deployed();
+    const spamContract = await SpamContract.deploy(this.wallet).send({ from: this.defaultAccountAddress! });
     this.spamContract = spamContract;
   }
 
@@ -351,14 +352,19 @@ 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,
-    });
+    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.ctx = this.context;
 
     const sponsoredFPCAddress = await getSponsoredFPCAddress();