@aztec/end-to-end 3.0.0-canary.a9708bd → 3.0.0-devnet.2

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -1,17 +1,10 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import type { AztecNodeConfig } from '@aztec/aztec-node';
-import {
-  type AccountWallet,
-  AztecAddress,
-  type AztecNode,
-  type CompleteAddress,
-  EthAddress,
-  type Logger,
-  type PXE,
-  createLogger,
-} from '@aztec/aztec.js';
+import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { type Logger, createLogger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
 import { CheatCodes } from '@aztec/aztec/testing';
 import {
+  type DeployL1ContractsArgs,
   type DeployL1ContractsReturnType,
   type ExtendedViemWalletClient,
   createExtendedL1Client,
@@ -21,6 +14,7 @@ import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { getContract } from 'viem';
 
@@ -32,6 +26,7 @@ import {
   deployAccounts,
   publicDeployAccounts,
 } from '../fixtures/snapshot_manager.js';
+import type { SetupOptions } from '../fixtures/utils.js';
 import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
 
 const { E2E_DATA_PATH: dataPath } = process.env;
@@ -39,21 +34,19 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class CrossChainMessagingTest {
   private snapshotManager: ISnapshotManager;
   logger: Logger;
-  accounts: CompleteAddress[] = [];
   aztecNode!: AztecNode;
-  pxe!: PXE;
   aztecNodeConfig!: AztecNodeConfig;
   aztecNodeAdmin!: AztecNodeAdmin;
+  ctx!: SubsystemsContext;
 
   l1Client!: ExtendedViemWalletClient | undefined;
 
-  user1Wallet!: AccountWallet;
+  wallet!: TestWallet;
+  ownerAddress!: AztecAddress;
   user1Address!: AztecAddress;
-  user2Wallet!: AccountWallet;
   user2Address!: AztecAddress;
   crossChainTestHarness!: CrossChainTestHarness;
   ethAccount!: EthAddress;
-  ownerAddress!: AztecAddress;
   l2Token!: TokenContract;
   l2Bridge!: TokenBridgeContract;
 
@@ -63,9 +56,12 @@ export class CrossChainMessagingTest {
 
   deployL1ContractsValues!: DeployL1ContractsReturnType;
 
-  constructor(testName: string) {
+  constructor(testName: string, opts: SetupOptions = {}, deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {}) {
     this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
-    this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath);
+    this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
+      initialValidators: [],
+      ...deployL1ContractsArgs,
+    });
   }
 
   async assumeProven() {
@@ -73,13 +69,13 @@ export class CrossChainMessagingTest {
   }
 
   async setup() {
-    const { aztecNode, pxe, aztecNodeConfig, deployL1ContractsValues } = await this.snapshotManager.setup();
-    this.aztecNode = aztecNode;
-    this.pxe = pxe;
-    this.aztecNodeConfig = aztecNodeConfig;
-    this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
-    this.deployL1ContractsValues = deployL1ContractsValues;
-    this.aztecNodeAdmin = aztecNode;
+    this.ctx = await this.snapshotManager.setup();
+    this.aztecNode = this.ctx.aztecNode;
+    this.wallet = this.ctx.wallet;
+    this.aztecNodeConfig = this.ctx.aztecNodeConfig;
+    this.cheatCodes = this.ctx.cheatCodes;
+    this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
+    this.aztecNodeAdmin = this.ctx.aztecNode;
   }
 
   snapshot = <T>(
@@ -93,25 +89,18 @@ export class CrossChainMessagingTest {
   }
 
   async applyBaseSnapshots() {
-    // Note that we are using the same `pxe`, `aztecNodeConfig` and `aztecNode` across all snapshots.
+    // Note that we are using the same `wallet`, `aztecNodeConfig` and `aztecNode` across all snapshots.
     // This is to not have issues with different networks.
 
     await this.snapshotManager.snapshot(
       '3_accounts',
       deployAccounts(3, this.logger),
-      async ({ deployedAccounts }, { pxe, aztecNodeConfig, aztecNode }) => {
-        const wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
-        this.accounts = wallets.map(w => w.getCompleteAddress());
-        wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-
-        this.user1Wallet = wallets[0];
-        this.user1Address = this.user1Wallet.getAddress();
-        this.user2Wallet = wallets[1];
-        this.user2Address = this.user2Wallet.getAddress();
-
-        this.pxe = pxe;
+      ({ deployedAccounts }, { wallet, aztecNodeConfig, aztecNode }) => {
+        [this.ownerAddress, this.user1Address, this.user2Address] = deployedAccounts.map(a => a.address);
+        this.wallet = wallet;
         this.aztecNode = aztecNode;
         this.aztecNodeConfig = aztecNodeConfig;
+        return Promise.resolve();
       },
     );
 
@@ -121,7 +110,7 @@ export class CrossChainMessagingTest {
         // Create the token contract state.
         // Move this account thing to addAccounts above?
         this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.user1Wallet, this.accounts.slice(0, 3));
+        await publicDeployAccounts(this.wallet, [this.ownerAddress, this.user1Address, this.user2Address]);
 
         this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
@@ -134,10 +123,9 @@ export class CrossChainMessagingTest {
         this.logger.verbose(`Setting up cross chain harness...`);
         this.crossChainTestHarness = await CrossChainTestHarness.new(
           this.aztecNode,
-          this.pxe,
           this.l1Client,
-          this.user1Wallet,
-          this.user1Address,
+          this.wallet,
+          this.ownerAddress,
           this.logger,
           underlyingERC20Address,
         );
@@ -147,12 +135,11 @@ export class CrossChainMessagingTest {
         return this.crossChainTestHarness.toCrossChainContext();
       },
       async crossChainContext => {
-        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.user1Wallet);
-        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.user1Wallet);
+        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.wallet);
+        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
 
         // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
         this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
-        this.ownerAddress = AztecAddress.fromString(crossChainContext.ownerAddress.toString());
         const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
 
         const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
@@ -170,7 +157,6 @@ export class CrossChainMessagingTest {
 
         this.crossChainTestHarness = new CrossChainTestHarness(
           this.aztecNode,
-          this.pxe,
           this.logger,
           this.l2Token,
           this.l2Bridge,
@@ -179,8 +165,8 @@ export class CrossChainMessagingTest {
           crossChainContext.underlying,
           l1Client,
           this.aztecNodeConfig.l1Contracts,
-          this.user1Wallet,
-          this.user1Address,
+          this.wallet,
+          this.ownerAddress,
         );
 
         this.l1Client = l1Client;

package/src/e2e_deploy_contract/deploy_test.ts

@@ -1,20 +1,14 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import {
-  type AccountWallet,
-  type AztecAddress,
-  type AztecNode,
-  type ContractArtifact,
-  type ContractBase,
-  Fr,
-  type Logger,
-  type PXE,
-  type PublicKeys,
-  type Wallet,
-  createLogger,
-  getContractInstanceFromInstantiationParams,
-} from '@aztec/aztec.js';
+import type { ContractArtifact } from '@aztec/aztec.js/abi';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type ContractBase, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { PublicKeys } from '@aztec/aztec.js/keys';
+import { type Logger, createLogger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { type ISnapshotManager, createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 
@@ -23,8 +17,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class DeployTest {
   private snapshotManager: ISnapshotManager;
   public logger: Logger;
-  public pxe!: PXE;
-  public wallet!: AccountWallet;
+  public wallet!: TestWallet;
   public defaultAccountAddress!: AztecAddress;
   public aztecNode!: AztecNode;
   public aztecNodeAdmin!: AztecNodeAdmin;
@@ -37,7 +30,7 @@ export class DeployTest {
   async setup() {
     await this.applyInitialAccountSnapshot();
     const context = await this.snapshotManager.setup();
-    ({ pxe: this.pxe, aztecNode: this.aztecNode } = context);
+    ({ aztecNode: this.aztecNode, wallet: this.wallet } = context);
     this.aztecNodeAdmin = context.aztecNode;
     return this;
   }
@@ -47,16 +40,10 @@ export class DeployTest {
   }
 
   private async applyInitialAccountSnapshot() {
-    await this.snapshotManager.snapshot(
-      'initial_account',
-      deployAccounts(1, this.logger),
-      async ({ deployedAccounts }, { pxe }) => {
-        const wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
-        wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-        this.wallet = wallets[0];
-        this.defaultAccountAddress = this.wallet.getAddress();
-      },
-    );
+    await this.snapshotManager.snapshot('initial_account', deployAccounts(1, this.logger), ({ deployedAccounts }) => {
+      this.defaultAccountAddress = deployedAccounts[0].address;
+      return Promise.resolve();
+    });
   }
 
   async registerContract<T extends ContractBase>(
@@ -74,18 +61,13 @@ export class DeployTest {
     const instance = await getContractInstanceFromInstantiationParams(contractArtifact.artifact, {
       constructorArgs: initArgs ?? [],
       constructorArtifact: constructorName,
-      salt,
+      salt: salt ?? Fr.random(),
       publicKeys,
       deployer,
     });
-    await wallet.registerContract({ artifact: contractArtifact.artifact, instance });
+    await wallet.registerContract(instance, contractArtifact.artifact);
     return contractArtifact.at(instance.address, wallet);
   }
-
-  async registerRandomAccount(): Promise<AztecAddress> {
-    const completeAddress = await this.pxe.registerAccount(Fr.random(), Fr.random());
-    return completeAddress.address;
-  }
 }
 
 export type StatefulContractCtorArgs = Parameters<StatefulTestContract['methods']['constructor']>;

package/src/e2e_epochs/epochs_test.ts

@@ -1,23 +1,22 @@
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import {
-  Fr,
-  type Logger,
-  MerkleTreeId,
-  type Wallet,
-  getContractInstanceFromInstantiationParams,
-  getTimestampRangeForEpoch,
-  retryUntil,
-  sleep,
-} from '@aztec/aztec.js';
+import { getTimestampRangeForEpoch } from '@aztec/aztec.js/block';
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { Logger } from '@aztec/aztec.js/log';
+import { MerkleTreeId } from '@aztec/aztec.js/trees';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { EpochCache } from '@aztec/epoch-cache';
 import { DefaultL1ContractsConfig, type ExtendedViemWalletClient, createExtendedL1Client } from '@aztec/ethereum';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { withLogNameSuffix } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
+import { sleep } from '@aztec/foundation/sleep';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
-import { ProverNode, ProverNodePublisher } from '@aztec/prover-node';
+import { ProverNode, type ProverNodeConfig, ProverNodePublisher } from '@aztec/prover-node';
 import type { TestProverNode } from '@aztec/prover-node/test';
 import {
   type SequencerClient,
@@ -69,6 +68,7 @@ export class EpochsTestContext {
   public constants!: L1RollupConstants;
   public logger!: Logger;
   public monitor!: ChainMonitor;
+  public epochCache!: EpochCache;
   public proverDelayer!: Delayer;
   public sequencerDelayer!: Delayer;
 
@@ -126,9 +126,6 @@ export class EpochsTestContext {
       // 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),
-      // This must be enough so that the tx from the prover is delayed properly,
-      // but not so much to hang the sequencer and timeout the teardown
-      txPropagationMaxQueryAttempts: opts.txPropagationMaxQueryAttempts ?? 12,
       worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
       exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
       slasherFlavor: 'none',
@@ -141,6 +138,7 @@ export class EpochsTestContext {
     this.logger = context.logger;
     this.l1Client = context.deployL1ContractsValues.l1Client;
     this.rollup = RollupContract.getFromConfig(context.config);
+    this.epochCache = await EpochCache.create(this.rollup, context.config, { dateProvider: context.dateProvider });
 
     // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
     this.monitor = new ChainMonitor(this.rollup, context.dateProvider, this.logger).start();
@@ -184,15 +182,20 @@ export class EpochsTestContext {
     await this.context.teardown();
   }
 
-  public async createProverNode() {
+  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, () =>
       createAndSyncProverNode(
         proverNodePrivateKey,
-        { ...this.context.config, proverId: EthAddress.fromNumber(parseInt(suffix, 10)) },
-        { dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')) },
+        { ...this.context.config },
+        {
+          dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
+          proverId: EthAddress.fromNumber(parseInt(suffix, 10)),
+          dontStart: opts.dontStart,
+          ...opts,
+        },
         this.context.aztecNode,
         undefined,
         { dateProvider: this.context.dateProvider },
@@ -349,7 +352,7 @@ export class EpochsTestContext {
       publicKeys: undefined,
       deployer: undefined,
     });
-    await wallet.registerContract({ artifact: SpamContract.artifact, instance });
+    await wallet.registerContract(instance, SpamContract.artifact);
     return SpamContract.at(instance.address, wallet);
   }
 
@@ -424,7 +427,7 @@ export class EpochsTestContext {
         sequencer.getSequencer().on(eventName, (args: Parameters<SequencerEvents[typeof eventName]>[0]) => {
           const evt = makeEvent(i, eventName, args);
           failEvents.push(evt);
-          this.logger.error(`Failed event ${eventName} from sequencer ${sequencerIndex}`, evt);
+          this.logger.error(`Failed event ${eventName} from sequencer ${sequencerIndex}`, undefined, evt);
         });
       });
     });

package/src/e2e_fees/bridging_race.notest.ts

@@ -1,7 +1,10 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { Fr, type Logger, type PXE, sleep } from '@aztec/aztec.js';
+import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { Logger } from '@aztec/aztec.js/log';
 import { Fq } from '@aztec/foundation/fields';
+import { sleep } from '@aztec/foundation/sleep';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { jest } from '@jest/globals';
 import type { Hex } from 'viem';
@@ -27,7 +30,7 @@ describe('e2e_fees bridging_race', () => {
     await t.applyPublicDeployAccountsSnapshot();
     await t.applySetupFeeJuiceSnapshot();
 
-    ({ pxe, logger } = await t.setup());
+    ({ wallet, logger } = await t.setup());
   });
 
   afterAll(async () => {
@@ -35,17 +38,19 @@ describe('e2e_fees bridging_race', () => {
   });
 
   let logger: Logger;
-  let pxe: PXE;
   let bobsAddress: AztecAddress;
+  let wallet: TestWallet;
 
   beforeEach(async () => {
     const bobsSecretKey = Fr.random();
     const bobsPrivateSigningKey = Fq.random();
-    const bobsAccountManager = await getSchnorrAccount(pxe, bobsSecretKey, bobsPrivateSigningKey, Fr.random());
-    const bobsCompleteAddress = await bobsAccountManager.getCompleteAddress();
-    bobsAddress = bobsCompleteAddress.address;
-    await bobsAccountManager.getWallet();
-    await bobsAccountManager.register();
+    const bobsSalt = Fr.random();
+    const bobsAccountManager = await wallet.createAccount({
+      secret: bobsSecretKey,
+      salt: bobsSalt,
+      contract: new SchnorrAccountContract(bobsPrivateSigningKey),
+    });
+    bobsAddress = bobsAccountManager.address;
   });
 
   it('Alice bridges funds to Bob', async () => {

package/src/e2e_fees/fees_test.ts

@@ -1,17 +1,11 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import {
-  type AccountWallet,
-  type AztecAddress,
-  type AztecNode,
-  type Logger,
-  type PXE,
-  createLogger,
-  sleep,
-} from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type Logger, createLogger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { sleep } from '@aztec/foundation/sleep';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
 import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
@@ -22,6 +16,7 @@ import { CounterContract } from '@aztec/noir-test-contracts.js/Counter';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { GasSettings } from '@aztec/stdlib/gas';
+import { TestWallet } from '@aztec/test-wallet/server';
 
 import { getContract } from 'viem';
 
@@ -56,17 +51,14 @@ const { E2E_DATA_PATH: dataPath } = process.env;
  */
 export class FeesTest {
   private snapshotManager: ISnapshotManager;
-  private wallets: AccountWallet[] = [];
   private accounts: AztecAddress[] = [];
 
   public logger: Logger;
-  public pxe!: PXE;
   public aztecNode!: AztecNode;
   public cheatCodes!: CheatCodes;
 
-  public aliceWallet!: AccountWallet;
+  public wallet!: TestWallet;
   public aliceAddress!: AztecAddress;
-  public bobWallet!: AccountWallet;
   public bobAddress!: AztecAddress;
   public sequencerAddress!: AztecAddress;
   public coinbase!: EthAddress;
@@ -145,13 +137,14 @@ export class FeesTest {
 
   async getBlockRewards() {
     const blockReward = await this.rollupContract.getBlockReward();
+    const rewardConfig = await this.rollupContract.getRewardConfig();
 
     const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
-      this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress,
+      EthAddress.fromString(rewardConfig.rewardDistributor),
     );
 
     const toDistribute = balance > blockReward ? blockReward : balance;
-    const sequencerBlockRewards = toDistribute / 2n;
+    const sequencerBlockRewards = (toDistribute * BigInt(rewardConfig.sequencerBps)) / 10000n;
     const proverBlockRewards = toDistribute - sequencerBlockRewards;
 
     return { sequencerBlockRewards, proverBlockRewards };
@@ -172,7 +165,7 @@ export class FeesTest {
       .balance_of_private(address)
       .simulate({ from: this.aliceAddress });
 
-    await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, this.aliceWallet, address, amount);
+    await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
 
     const balanceAfter = await this.bananaCoin.methods
       .balance_of_private(address)
@@ -191,30 +184,27 @@ export class FeesTest {
     await this.snapshotManager.snapshot(
       'initial_accounts',
       deployAccounts(this.numberOfAccounts, this.logger),
-      async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig }) => {
-        this.pxe = pxe;
-
+      async ({ deployedAccounts }, { wallet, aztecNode, cheatCodes }) => {
+        this.wallet = wallet;
         this.aztecNode = aztecNode;
         this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2) });
-        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
-        this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
-        this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-        this.accounts = this.wallets.map(w => w.getAddress());
-        [this.aliceWallet, this.bobWallet] = this.wallets.slice(0, 2);
-        [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts;
+        this.cheatCodes = cheatCodes;
+        this.accounts = deployedAccounts.map(a => a.address);
+        this.accounts.forEach((a, i) => this.logger.verbose(`Account ${i} address: ${a}`));
+        [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
 
         // We set Alice as the FPC admin to avoid the need for deployment of another account.
         this.fpcAdmin = this.aliceAddress;
 
         const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.aliceWallet);
+        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
       },
     );
   }
 
   async applyPublicDeployAccountsSnapshot() {
     await this.snapshotManager.snapshot('public_deploy_accounts', () =>
-      ensureAccountContractsPublished(this.aliceWallet, this.wallets),
+      ensureAccountContractsPublished(this.wallet, this.accounts),
     );
   }
 
@@ -225,7 +215,7 @@ export class FeesTest {
       async (_data, context) => {
         this.context = context;
 
-        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.aliceWallet);
+        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
 
         this.getGasBalanceFn = getBalancesFn(
           '⛽',
@@ -237,9 +227,8 @@ export class FeesTest {
         this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
-          pxeService: context.pxe,
           l1Client: context.deployL1ContractsValues.l1Client,
-          wallet: this.aliceWallet,
+          wallet: this.wallet,
           logger: this.logger,
         });
       },
@@ -250,14 +239,14 @@ export class FeesTest {
     await this.snapshotManager.snapshot(
       'deploy_banana_token',
       async () => {
-        const bananaCoin = await BananaCoin.deploy(this.aliceWallet, this.aliceAddress, 'BC', 'BC', 18n)
+        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}`);
         return { bananaCoinAddress: bananaCoin.address };
       },
       async ({ bananaCoinAddress }) => {
-        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.aliceWallet);
+        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.wallet);
         const logger = this.logger;
         this.getBananaPublicBalanceFn = getBalancesFn(
           '🍌.public',
@@ -280,10 +269,10 @@ export class FeesTest {
       'fpc_setup',
       async context => {
         const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
         const bananaCoin = this.bananaCoin;
-        const bananaFPC = await FPCContract.deploy(this.aliceWallet, bananaCoin.address, this.fpcAdmin)
+        const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin)
           .send({ from: this.aliceAddress })
           .deployed();
 
@@ -299,7 +288,7 @@ export class FeesTest {
         };
       },
       async (data, context) => {
-        const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.aliceWallet);
+        const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.wallet);
         this.bananaFPC = bananaFPC;
 
         this.getCoinbaseBalance = async () => {
@@ -317,7 +306,7 @@ export class FeesTest {
         };
 
         this.getProverFee = async (blockNumber: number) => {
-          const block = await this.pxe.getBlock(blockNumber);
+          const block = await this.aztecNode.getBlock(blockNumber);
 
           // @todo @lherskind As we deal with #13601
           // Right now the value is from `FeeLib.sol`
@@ -348,9 +337,9 @@ export class FeesTest {
       'sponsored_fpc_setup',
       async context => {
         const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
-        const sponsoredFPC = await setupSponsoredFPC(context.pxe);
+        const sponsoredFPC = await setupSponsoredFPC(this.wallet);
         this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
 
         return {
@@ -358,7 +347,7 @@ export class FeesTest {
         };
       },
       async data => {
-        this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.aliceWallet);
+        this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
       },
     );
   }

package/src/e2e_l1_publisher/write_json.ts

@@ -1,5 +1,7 @@
-import { AztecAddress, Fr, type L2Block } from '@aztec/aztec.js';
-import { BatchedBlob, Blob } from '@aztec/blob-lib';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { L2Block } from '@aztec/aztec.js/block';
+import { Fr } from '@aztec/aztec.js/fields';
+import { BatchedBlob, Blob, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 import { writeFile } from 'fs/promises';
@@ -32,18 +34,18 @@ export async function writeJson(
 
   const jsonObject = {
     populate: {
-      l1ToL2Content: l1ToL2Content.map(asHex),
+      l1ToL2Content: l1ToL2Content.map(value => asHex(value)),
       recipient: asHex(recipientAddress.toField()),
       sender: deployerAddress,
     },
     messages: {
-      l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(asHex),
+      l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(value => asHex(value)),
     },
     block: {
       // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
       // This should not be a problem for testing as long as the values are not larger than u32.
       archive: asHex(block.archive.root),
-      blobCommitments: Blob.getPrefixedEthBlobCommitments(blobs),
+      blobCommitments: getPrefixedEthBlobCommitments(blobs),
       batchedBlobInputs: batchedBlob.getEthBlobEvaluationInputs(),
       blockNumber: block.number,
       body: `0x${block.body.toBuffer().toString('hex')}`,
@@ -64,7 +66,7 @@ export async function writeJson(
         },
         totalManaUsed: block.header.totalManaUsed.toNumber(),
       },
-      headerHash: asHex(block.header.toPropose().hash()),
+      headerHash: asHex(block.getCheckpointHeader().hash()),
       numTxs: block.body.txEffects.length,
     },
   };