@aztec/end-to-end 0.85.0 → 0.86.0-nightly.20250426

package/dest/shared/uniswap_l1_l2.js

@@ -25,8 +25,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
         let aztecNode;
         let pxe;
         let logger;
-        let walletClient;
-        let publicClient;
+        let l1Client;
         let ownerWallet;
         let ownerAddress;
         let ownerEthAddress;
@@ -46,29 +45,29 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
         let cheatCodes;
         let version;
         beforeAll(async ()=>{
-            ({ aztecNode, pxe, logger, publicClient, walletClient, ownerWallet, sponsorWallet, deployL1ContractsValues, cheatCodes } = await setup());
-            if (Number(await publicClient.getBlockNumber()) < expectedForkBlockNumber) {
+            ({ aztecNode, pxe, logger, l1Client, ownerWallet, sponsorWallet, deployL1ContractsValues, cheatCodes } = await setup());
+            if (Number(await l1Client.getBlockNumber()) < expectedForkBlockNumber) {
                 throw new Error('This test must be run on a fork of mainnet with the expected fork block');
             }
-            rollup = new RollupContract(deployL1ContractsValues.publicClient, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
+            rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
             version = Number(await rollup.getVersion());
             ownerAddress = ownerWallet.getAddress();
             // sponsorAddress = sponsorWallet.getAddress();
-            ownerEthAddress = EthAddress.fromString((await walletClient.getAddresses())[0]);
+            ownerEthAddress = EthAddress.fromString((await l1Client.getAddresses())[0]);
             await ensureAccountsPubliclyDeployed(ownerWallet, [
                 ownerWallet,
                 sponsorWallet
             ]);
             logger.info('Deploying DAI Portal, initializing and deploying l2 contract...');
-            daiCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, publicClient, walletClient, ownerWallet, logger, DAI_ADDRESS);
+            daiCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, deployL1ContractsValues.l1Client, ownerWallet, logger, DAI_ADDRESS);
             logger.info('Deploying WETH Portal, initializing and deploying l2 contract...');
-            wethCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, publicClient, walletClient, ownerWallet, logger, WETH9_ADDRESS);
+            wethCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, l1Client, ownerWallet, logger, WETH9_ADDRESS);
             logger.info('Deploy Uniswap portal on L1 and L2...');
-            uniswapPortalAddress = await deployL1Contract(walletClient, publicClient, UniswapPortalAbi, UniswapPortalBytecode).then(({ address })=>address);
+            uniswapPortalAddress = await deployL1Contract(l1Client, UniswapPortalAbi, UniswapPortalBytecode).then(({ address })=>address);
             uniswapPortal = getContract({
                 address: uniswapPortalAddress.toString(),
                 abi: UniswapPortalAbi,
-                client: walletClient
+                client: l1Client
             });
             // deploy l2 uniswap contract and attach to portal
             uniswapL2Contract = await UniswapContract.deploy(ownerWallet, uniswapPortalAddress).send().deployed();
@@ -79,11 +78,11 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ], {});
             // Give me some WETH so I can deposit to L2 and do the swap...
             logger.info('Getting some weth');
-            const hash = await walletClient.sendTransaction({
+            const hash = await l1Client.sendTransaction({
                 to: WETH9_ADDRESS.toString(),
                 value: parseEther('1000')
             });
-            await publicClient.waitForTransactionReceipt({
+            await l1Client.waitForTransactionReceipt({
                 hash
             });
             const wethBalance = await wethCrossChainHarness.getL1BalanceOf(ownerEthAddress);
@@ -139,7 +138,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 uniswapL2Contract.address,
                 new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(publicClient.chain.id),
+                new Fr(l1Client.chain.id),
                 swapPrivateContent
             ]);
             const withdrawContent = sha256ToField([
@@ -152,7 +151,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 wethCrossChainHarness.l2Bridge.address,
                 new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(publicClient.chain.id),
+                new Fr(l1Client.chain.id),
                 withdrawContent
             ]);
             // ensure that user's funds were burnt
@@ -190,7 +189,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 ]
             ];
             // this should also insert a message into the inbox.
-            const txReceipt = await daiCrossChainHarness.publicClient.waitForTransactionReceipt({
+            const txReceipt = await daiCrossChainHarness.l1Client.waitForTransactionReceipt({
                 hash: await uniswapPortal.write.swapPrivate(swapArgs)
             });
             // We get the msg leaf from event so that we can later wait for it to be available for consumption
@@ -536,7 +535,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 uniswapL2Contract.address,
                 new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(publicClient.chain.id),
+                new Fr(l1Client.chain.id),
                 swapPrivateContent
             ]);
             const withdrawContent = sha256ToField([
@@ -549,7 +548,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 wethCrossChainHarness.l2Bridge.address,
                 new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(publicClient.chain.id),
+                new Fr(l1Client.chain.id),
                 withdrawContent
             ]);
             const [swapPrivateL2MessageIndex, swapPrivateSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(withdrawReceipt.blockNumber, swapPrivateLeaf);
@@ -616,7 +615,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 uniswapL2Contract.address,
                 new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(publicClient.chain.id),
+                new Fr(l1Client.chain.id),
                 swapPublicContent
             ]);
             const withdrawContent = sha256ToField([
@@ -629,7 +628,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 wethCrossChainHarness.l2Bridge.address,
                 new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(publicClient.chain.id),
+                new Fr(l1Client.chain.id),
                 withdrawContent
             ]);
             const [swapPublicL2MessageIndex, swapPublicSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(withdrawReceipt.blockNumber, swapPublicLeaf);

package/dest/spartan/setup_test_wallets.js

@@ -1,7 +1,7 @@
 import { getSchnorrAccount, getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
 import { generateSchnorrAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
 import { FeeJuicePaymentMethodWithClaim, Fr, L1FeeJuicePortalManager, createAztecNodeClient, createCompatibleClient, retryUntil } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 const TOKEN_NAME = 'USDC';
 const TOKEN_SYMBOL = 'USD';
@@ -59,9 +59,9 @@ export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mne
 async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, recipient, amount, log) {
     const { l1ChainId } = await pxe.getNodeInfo();
     const chain = createEthereumChain(l1RpcUrls, l1ChainId);
-    const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
+    const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
     // docs:start:bridge_fee_juice
-    const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, log);
+    const portal = await L1FeeJuicePortalManager.new(pxe, l1Client, log);
     const claim = await portal.bridgeTokensPublic(recipient, amount, true);
     // docs:end:bridge_fee_juice
     const isSynced = async ()=>await pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.85.0",
+  "version": "0.86.0-nightly.20250426",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -11,7 +11,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test:with-alerts": "./scripts/test-with-alerts.sh",
     "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
     "test:e2e-docker": "./scripts/run_test.sh simple",
@@ -26,41 +25,40 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.85.0",
-    "@aztec/archiver": "0.85.0",
-    "@aztec/aztec": "0.85.0",
-    "@aztec/aztec-node": "0.85.0",
-    "@aztec/aztec.js": "0.85.0",
-    "@aztec/bb-prover": "0.85.0",
-    "@aztec/blob-lib": "0.85.0",
-    "@aztec/blob-sink": "0.85.0",
-    "@aztec/bot": "0.85.0",
-    "@aztec/cli": "0.85.0",
-    "@aztec/constants": "0.85.0",
-    "@aztec/entrypoints": "0.85.0",
-    "@aztec/epoch-cache": "0.85.0",
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/foundation": "0.85.0",
-    "@aztec/kv-store": "0.85.0",
-    "@aztec/l1-artifacts": "0.85.0",
-    "@aztec/merkle-tree": "0.85.0",
-    "@aztec/noir-contracts.js": "0.85.0",
-    "@aztec/noir-noirc_abi": "0.85.0",
-    "@aztec/noir-protocol-circuits-types": "0.85.0",
-    "@aztec/p2p": "0.85.0",
-    "@aztec/protocol-contracts": "0.85.0",
-    "@aztec/prover-client": "0.85.0",
-    "@aztec/prover-node": "0.85.0",
-    "@aztec/pxe": "0.85.0",
-    "@aztec/sequencer-client": "0.85.0",
-    "@aztec/simulator": "0.85.0",
-    "@aztec/stdlib": "0.85.0",
-    "@aztec/telemetry-client": "0.85.0",
-    "@aztec/validator-client": "0.85.0",
-    "@aztec/world-state": "0.85.0",
+    "@aztec/accounts": "0.86.0-nightly.20250426",
+    "@aztec/archiver": "0.86.0-nightly.20250426",
+    "@aztec/aztec": "0.86.0-nightly.20250426",
+    "@aztec/aztec-node": "0.86.0-nightly.20250426",
+    "@aztec/aztec.js": "0.86.0-nightly.20250426",
+    "@aztec/bb-prover": "0.86.0-nightly.20250426",
+    "@aztec/blob-lib": "0.86.0-nightly.20250426",
+    "@aztec/blob-sink": "0.86.0-nightly.20250426",
+    "@aztec/bot": "0.86.0-nightly.20250426",
+    "@aztec/cli": "0.86.0-nightly.20250426",
+    "@aztec/constants": "0.86.0-nightly.20250426",
+    "@aztec/entrypoints": "0.86.0-nightly.20250426",
+    "@aztec/epoch-cache": "0.86.0-nightly.20250426",
+    "@aztec/ethereum": "0.86.0-nightly.20250426",
+    "@aztec/foundation": "0.86.0-nightly.20250426",
+    "@aztec/kv-store": "0.86.0-nightly.20250426",
+    "@aztec/l1-artifacts": "0.86.0-nightly.20250426",
+    "@aztec/merkle-tree": "0.86.0-nightly.20250426",
+    "@aztec/noir-contracts.js": "0.86.0-nightly.20250426",
+    "@aztec/noir-noirc_abi": "0.86.0-nightly.20250426",
+    "@aztec/noir-protocol-circuits-types": "0.86.0-nightly.20250426",
+    "@aztec/p2p": "0.86.0-nightly.20250426",
+    "@aztec/protocol-contracts": "0.86.0-nightly.20250426",
+    "@aztec/prover-client": "0.86.0-nightly.20250426",
+    "@aztec/prover-node": "0.86.0-nightly.20250426",
+    "@aztec/pxe": "0.86.0-nightly.20250426",
+    "@aztec/sequencer-client": "0.86.0-nightly.20250426",
+    "@aztec/simulator": "0.86.0-nightly.20250426",
+    "@aztec/stdlib": "0.86.0-nightly.20250426",
+    "@aztec/telemetry-client": "0.86.0-nightly.20250426",
+    "@aztec/validator-client": "0.86.0-nightly.20250426",
+    "@aztec/world-state": "0.86.0-nightly.20250426",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^29.5.0",
-    "@msgpack/msgpack": "^3.0.0-beta2",
     "@noble/curves": "^1.0.0",
     "@swc/core": "^1.4.11",
     "@swc/jest": "^0.2.36",
@@ -85,6 +83,7 @@
     "lodash.compact": "^3.0.1",
     "lodash.every": "^4.6.0",
     "lodash.omit": "^4.5.0",
+    "msgpackr": "^1.11.2",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
     "string-argv": "^0.3.2",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -16,7 +16,7 @@ import {
 } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
 import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
-import { type DeployL1ContractsArgs, RollupContract, createL1Clients, deployL1Contract } from '@aztec/ethereum';
+import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -234,8 +234,7 @@ export class ClientFlowsBenchmark {
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
           pxeService: context.pxe,
-          publicClient: context.deployL1ContractsValues.publicClient,
-          walletClient: context.deployL1ContractsValues.walletClient,
+          l1Client: context.deployL1ContractsValues.l1Client,
           wallet: this.adminWallet,
           logger: this.logger,
         });
@@ -314,20 +313,19 @@ export class ClientFlowsBenchmark {
   }
 
   public async createCrossChainTestHarness(owner: AccountWallet) {
-    const { publicClient, walletClient } = createL1Clients(this.context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+    const l1Client = createExtendedL1Client(this.context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
-    const underlyingERC20Address = await deployL1Contract(walletClient, publicClient, TestERC20Abi, TestERC20Bytecode, [
+    const underlyingERC20Address = await deployL1Contract(l1Client, TestERC20Abi, TestERC20Bytecode, [
       'Underlying',
       'UND',
-      walletClient.account.address,
+      l1Client.account.address,
     ]).then(({ address }) => address);
 
     this.logger.verbose(`Setting up cross chain harness...`);
     const crossChainTestHarness = await CrossChainTestHarness.new(
       this.aztecNode,
       this.pxe,
-      publicClient,
-      walletClient,
+      l1Client,
       owner,
       this.logger,
       underlyingERC20Address,

package/src/bench/client_flows/config.ts

@@ -26,9 +26,9 @@ export const KEY_FLOWS_CONFIG: ClientFlowsConfig = {
     feePaymentMethods: ['sponsored_fpc'],
   },
   transfers: {
-    accounts: ['ecdsar1', 'schnorr'],
-    feePaymentMethods: ['sponsored_fpc', 'fee_juice'],
-    recursions: [1],
+    accounts: ['ecdsar1'],
+    feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
+    recursions: [0, 1],
   },
 };
 

package/src/bench/client_flows/data_extractor.ts

@@ -1,11 +1,11 @@
 import type { Logger } from '@aztec/aztec.js';
-import { BBNativePrivateKernelProver } from '@aztec/bb-prover';
-import { BBWASMBundlePrivateKernelProver } from '@aztec/bb-prover/wasm/bundle';
+import { BBNativePrivateKernelProver } from '@aztec/bb-prover/client/native';
+import { BBWASMBundlePrivateKernelProver } from '@aztec/bb-prover/client/wasm/bundle';
 import { createLogger, logger } from '@aztec/foundation/log';
 import { WASMSimulator } from '@aztec/simulator/client';
 import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
 
-import { decode } from '@msgpack/msgpack';
+import { Decoder } from 'msgpackr';
 import assert from 'node:assert';
 import { readFile, readdir, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
@@ -149,9 +149,10 @@ async function main() {
 
   for (const flow of flows) {
     userLog.info(`Processing flow ${flow}`);
-    const bytecode = await readFile(join(ivcFolder, flow, 'acir.msgpack'));
-    const acirStack = decode(bytecode) as Buffer[];
+    const ivcInputs = await readFile(join(ivcFolder, flow, 'ivc-inputs.msgpack'));
+    const stepsFromFile: PrivateExecutionStep[] = new Decoder({ useRecords: false }).unpack(ivcInputs);
     const witnesses = await readFile(join(ivcFolder, flow, 'witnesses.json'));
+
     const witnessStack = JSON.parse(witnesses.toString()).map((witnessMap: Record<string, string>) => {
       return new Map<number, string>(Object.entries(witnessMap).map(([k, v]) => [Number(k), v]));
     });
@@ -160,8 +161,11 @@ async function main() {
     const privateExecutionSteps: PrivateExecutionStep[] = executionSteps.map((step, i) => ({
       functionName: step.fnName,
       gateCount: step.gateCount,
-      bytecode: acirStack[i],
+      bytecode: stepsFromFile[i].bytecode,
+      // TODO(AD) do we still want to take this from witness.json?
       witness: witnessStack[i],
+      // This can be left empty. If so, the prover will generate a vk on the fly (~25% slower).
+      vk: Buffer.from([]),
     }));
     let stats: { duration: number; eventName: string; proofSize: number } | undefined;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/bench/utils.ts

@@ -166,7 +166,9 @@ export async function createNewPXE(node: AztecNode, contract: BenchmarkingContra
     l1ChainId,
     rollupVersion,
   } as PXEServiceConfig;
+  // docs:start:PXEcreate
   const pxe = await createPXEService(node, pxeConfig);
+  // docs:end:PXEcreate
   await pxe.registerContract(contract);
   return pxe;
 }

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -11,7 +11,7 @@ import {
   createLogger,
 } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
-import { type ViemPublicClient, createL1Clients, deployL1Contract } from '@aztec/ethereum';
+import { type ExtendedViemWalletClient, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
@@ -39,7 +39,7 @@ export class CrossChainMessagingTest {
   pxe!: PXE;
   aztecNodeConfig!: AztecNodeConfig;
 
-  publicClient!: ViemPublicClient | undefined;
+  l1Client!: ExtendedViemWalletClient | undefined;
 
   user1Wallet!: AccountWallet;
   user2Wallet!: AccountWallet;
@@ -109,22 +109,19 @@ export class CrossChainMessagingTest {
         this.logger.verbose(`Public deploy accounts...`);
         await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 3));
 
-        const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+        this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
-        const underlyingERC20Address = await deployL1Contract(
-          walletClient,
-          publicClient,
-          TestERC20Abi,
-          TestERC20Bytecode,
-          ['Underlying', 'UND', walletClient.account.address],
-        ).then(({ address }) => address);
+        const underlyingERC20Address = await deployL1Contract(this.l1Client, TestERC20Abi, TestERC20Bytecode, [
+          'Underlying',
+          'UND',
+          this.l1Client.account.address,
+        ]).then(({ address }) => address);
 
         this.logger.verbose(`Setting up cross chain harness...`);
         this.crossChainTestHarness = await CrossChainTestHarness.new(
           this.aztecNode,
           this.pxe,
-          publicClient,
-          walletClient,
+          this.l1Client,
           this.wallets[0],
           this.logger,
           underlyingERC20Address,
@@ -143,17 +140,17 @@ export class CrossChainMessagingTest {
         this.ownerAddress = AztecAddress.fromString(crossChainContext.ownerAddress.toString());
         const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
 
-        const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+        const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
         const inbox = getContract({
           address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),
           abi: InboxAbi,
-          client: walletClient,
+          client: l1Client,
         });
         const outbox = getContract({
           address: this.aztecNodeConfig.l1Contracts.outboxAddress.toString(),
           abi: OutboxAbi,
-          client: walletClient,
+          client: l1Client,
         });
 
         this.crossChainTestHarness = new CrossChainTestHarness(
@@ -165,13 +162,12 @@ export class CrossChainMessagingTest {
           this.ethAccount,
           tokenPortalAddress,
           crossChainContext.underlying,
-          publicClient,
-          walletClient,
+          l1Client,
           this.aztecNodeConfig.l1Contracts,
           this.user1Wallet,
         );
 
-        this.publicClient = publicClient;
+        this.l1Client = l1Client;
         this.inbox = inbox;
         this.outbox = outbox;
       },

package/src/e2e_epochs/epochs_test.ts

@@ -1,5 +1,6 @@
 import { AztecNodeService } from '@aztec/aztec-node';
 import { Fr, type Logger, MerkleTreeId, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
+import type { ViemClient } from '@aztec/ethereum';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';
@@ -12,7 +13,7 @@ import type { L2BlockNumber } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 
 import { join } from 'path';
-import type { Hex, PublicClient } from 'viem';
+import type { Hex } from 'viem';
 
 import {
   type EndToEndContext,
@@ -30,7 +31,10 @@ export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
 
 export type EpochsTestOpts = Partial<
-  Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs'>
+  Pick<
+    SetupOptions,
+    'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'proverNodeConfig'
+  >
 >;
 
 /**
@@ -40,7 +44,7 @@ export type EpochsTestOpts = Partial<
  */
 export class EpochsTestContext {
   public context!: EndToEndContext;
-  public l1Client!: PublicClient;
+  public l1Client!: ViemClient;
   public rollup!: RollupContract;
   public constants!: L1RollupConstants;
   public logger!: Logger;
@@ -92,7 +96,7 @@ export class EpochsTestContext {
     this.proverNodes = context.proverNode ? [context.proverNode] : [];
     this.nodes = context.aztecNode ? [context.aztecNode as AztecNodeService] : [];
     this.logger = context.logger;
-    this.l1Client = context.deployL1ContractsValues.publicClient;
+    this.l1Client = context.deployL1ContractsValues.l1Client;
     this.rollup = RollupContract.getFromConfig(context.config);
 
     // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
@@ -142,8 +146,8 @@ export class EpochsTestContext {
       createAndSyncProverNode(
         proverNodePrivateKey,
         { ...this.context.config, proverId: Fr.fromString(suffix) },
+        { dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')) },
         this.context.aztecNode,
-        join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
       ),
     );
     this.proverNodes.push(proverNode);

package/src/e2e_fees/fees_test.ts

@@ -10,7 +10,13 @@ import {
 } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
 import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
-import { type DeployL1ContractsArgs, RollupContract, createL1Clients, getPublicClient } from '@aztec/ethereum';
+import {
+  type DeployL1ContractsArgs,
+  RollupContract,
+  createExtendedL1Client,
+  getPublicClient,
+  l1Artifacts,
+} from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
@@ -140,6 +146,26 @@ export class FeesTest {
     }
   }
 
+  async getBlockRewards() {
+    const rewardDistributor = getContract({
+      address: this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
+      abi: l1Artifacts.rewardDistributor.contractAbi,
+      client: this.context.deployL1ContractsValues.l1Client,
+    });
+
+    const blockReward = await rewardDistributor.read.BLOCK_REWARD();
+
+    const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
+      EthAddress.fromString(rewardDistributor.address),
+    );
+
+    const toDistribute = balance > blockReward ? blockReward : balance;
+    const sequencerBlockRewards = toDistribute / 2n;
+    const proverBlockRewards = toDistribute - sequencerBlockRewards;
+
+    return { sequencerBlockRewards, proverBlockRewards };
+  }
+
   async mintAndBridgeFeeJuice(address: AztecAddress, amount: bigint) {
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, address);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
@@ -209,8 +235,7 @@ export class FeesTest {
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
           pxeService: context.pxe,
-          publicClient: context.deployL1ContractsValues.publicClient,
-          walletClient: context.deployL1ContractsValues.walletClient,
+          l1Client: context.deployL1ContractsValues.l1Client,
           wallet: this.aliceWallet,
           logger: this.logger,
         });
@@ -269,21 +294,18 @@ export class FeesTest {
         this.bananaFPC = bananaFPC;
 
         this.getCoinbaseBalance = async () => {
-          const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+          const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
           const gasL1 = getContract({
             address: data.l1FeeJuiceAddress.toString(),
             abi: TestERC20Abi,
-            client: walletClient,
+            client: l1Client,
           });
           return await gasL1.read.balanceOf([this.coinbase.toString()]);
         };
 
         this.getCoinbaseSequencerRewards = async () => {
-          const publicClient = getPublicClient({
-            l1RpcUrls: context.aztecNodeConfig.l1RpcUrls,
-            l1ChainId: context.aztecNodeConfig.l1ChainId,
-          });
-          const rollup = new RollupContract(publicClient, data.rollupAddress);
+          const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+          const rollup = new RollupContract(l1Client, data.rollupAddress);
           return await rollup.getSequencerRewards(this.coinbase);
         };