@aztec/end-to-end 2.0.0-nightly.20250825 → 2.0.0-nightly.20250827

package/dest/fixtures/utils.js

@@ -9,7 +9,7 @@ import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
 import { GENESIS_ARCHIVE_ROOT, SPONSORED_FPC_SALT } from '@aztec/constants';
 import { FeeAssetArtifact, NULL_KEY, RollupContract, createExtendedL1Client, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
-import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
+import { DelayedTxUtils, EthCheatCodes, EthCheatCodesWithState, createDelayedL1TxUtilsFromViemWallet, startAnvil } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -36,7 +36,7 @@ import getPort from 'get-port';
 import { tmpdir } from 'os';
 import * as path from 'path';
 import { getContract } from 'viem';
-import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
+import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 import { MNEMONIC, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
 import { getACVMConfig } from './get_acvm_config.js';
@@ -143,6 +143,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         l1Client,
         rollupVersion
     };
+    const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls);
     const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient);
     const teardown = ()=>Promise.resolve();
     logger.verbose('Constructing available wallets from already registered accounts...');
@@ -166,6 +167,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         accounts: wallets.slice(0, numberOfAccounts).map((w)=>w.getAddress()),
         logger,
         cheatCodes,
+        ethCheatCodes,
         prefilledPublicData: undefined,
         mockGossipSubNetwork: undefined,
         watcher: undefined,
@@ -240,8 +242,10 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         }
         let publisherPrivKey = undefined;
         let publisherHdAccount = undefined;
-        if (config.publisherPrivateKey && config.publisherPrivateKey.getValue() != NULL_KEY) {
-            publisherHdAccount = privateKeyToAccount(config.publisherPrivateKey.getValue());
+        if (opts.l1PublisherKey && opts.l1PublisherKey.getValue() && opts.l1PublisherKey.getValue() != NULL_KEY) {
+            publisherHdAccount = privateKeyToAccount(opts.l1PublisherKey.getValue());
+        } else if (config.publisherPrivateKeys && config.publisherPrivateKeys.length > 0 && config.publisherPrivateKeys[0].getValue() != NULL_KEY) {
+            publisherHdAccount = privateKeyToAccount(config.publisherPrivateKeys[0].getValue());
         } else if (!MNEMONIC) {
             throw new Error(`Mnemonic not provided and no publisher private key`);
         } else {
@@ -250,8 +254,11 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             });
             const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
             publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
-            config.publisherPrivateKey = new SecretValue(`0x${publisherPrivKey.toString('hex')}`);
+            config.publisherPrivateKeys = [
+                new SecretValue(`0x${publisherPrivKey.toString('hex')}`)
+            ];
         }
+        config.coinbase = EthAddress.fromString(publisherHdAccount.address);
         if (PXE_URL) {
             // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
             return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
@@ -365,6 +372,13 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         config.minTxsPerBlock = numberOfAccounts === 0 ? 0 : 1;
         config.p2pEnabled = opts.mockGossipSubNetwork || config.p2pEnabled;
         config.p2pIp = opts.p2pIp ?? config.p2pIp ?? '127.0.0.1';
+        if (!config.disableValidator) {
+            if ((config.validatorPrivateKeys?.getValue().length ?? 0) === 0) {
+                config.validatorPrivateKeys = new SecretValue([
+                    generatePrivateKey()
+                ]);
+            }
+        }
         const aztecNode = await AztecNodeService.createAndSync(config, {
             dateProvider,
             blobSinkClient,
@@ -377,7 +391,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         const sequencerClient = aztecNode.getSequencer();
         if (sequencerClient) {
             const publisher = sequencerClient.sequencer.publisher;
-            publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration);
+            publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration, l1Client);
         }
         let proverNode = undefined;
         if (opts.startProverNode) {
@@ -434,8 +448,8 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
                 if (bbConfig?.cleanup) {
                     await bbConfig.cleanup();
                 }
-                await tryStop(anvil, logger);
                 await tryStop(watcher, logger);
+                await tryStop(anvil, logger);
                 await tryStop(blobSink, logger);
                 await tryRmDir(directoryToCleanup, logger);
             } catch (err) {
@@ -447,6 +461,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             aztecNodeAdmin: aztecNode,
             blobSink,
             cheatCodes,
+            ethCheatCodes,
             config,
             dateProvider,
             deployL1ContractsValues,
@@ -620,7 +635,9 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
             txCollectionNodeRpcUrls: [],
             realProofs: false,
             proverAgentCount: 2,
-            publisherPrivateKey: new SecretValue(proverNodePrivateKey),
+            publisherPrivateKeys: [
+                new SecretValue(proverNodePrivateKey)
+            ],
             proverNodeMaxPendingJobs: 10,
             proverNodeMaxParallelBlocksPerEpoch: 32,
             proverNodePollingIntervalMs: 200,
@@ -629,6 +646,7 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
             txGatheringMaxParallelRequestsPerNode: 10,
             txGatheringTimeoutMs: 24_000,
             proverNodeFailedEpochStore: undefined,
+            proverId: EthAddress.fromNumber(1),
             ...proverNodeConfig
         };
         const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node', proverNodeDeps.dateProvider);
@@ -650,7 +668,7 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
 function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName, dateProvider) {
     const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
     const log = createLogger(logName);
-    const l1TxUtils = new DelayedTxUtils(l1Client, log, dateProvider, aztecNodeConfig);
+    const l1TxUtils = createDelayedL1TxUtilsFromViemWallet(l1Client, log, dateProvider, aztecNodeConfig);
     l1TxUtils.enableDelayer(aztecNodeConfig.ethereumSlotDuration);
     return l1TxUtils;
 }

package/package.json

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

package/src/e2e_epochs/epochs_test.ts

@@ -26,7 +26,7 @@ import {
   SequencerState,
 } from '@aztec/sequencer-client';
 import type { TestSequencerClient } from '@aztec/sequencer-client/test';
-import type { EthAddress, L2BlockNumber } from '@aztec/stdlib/block';
+import { EthAddress, type L2BlockNumber } from '@aztec/stdlib/block';
 import { type L1RollupConstants, getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 
@@ -124,7 +124,8 @@ export class EpochsTestContext {
       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
-      proverId: Fr.fromString('1'),
+      // 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,
@@ -189,7 +190,7 @@ export class EpochsTestContext {
     const proverNode = await withLogNameSuffix(suffix, () =>
       createAndSyncProverNode(
         proverNodePrivateKey,
-        { ...this.context.config, proverId: Fr.fromString(suffix) },
+        { ...this.context.config, proverId: EthAddress.fromNumber(parseInt(suffix, 10)) },
         { dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')) },
         this.context.aztecNode,
         undefined,
@@ -250,9 +251,15 @@ export class EpochsTestContext {
       this.logger.info(
         `Setting tx delayer max inclusion time into slot to ${opts.txDelayerMaxInclusionTimeIntoSlot} seconds`,
       );
+      // Here we reach into the sequencer and hook in a tx delayer. The problem is that the sequencer's l1 utils only uses a public client, not a wallet.
+      // The delayer needs a wallet (a client that can sign), so we have to create one here.
+      const l1Client = createExtendedL1Client(
+        resolvedConfig.l1RpcUrls!,
+        resolvedConfig.publisherPrivateKeys![0]!.getValue(),
+      );
       const sequencer = node.getSequencer() as TestSequencerClient;
       const publisher = sequencer.sequencer.publisher;
-      const delayed = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, this.L1_BLOCK_TIME_IN_S);
+      const delayed = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, this.L1_BLOCK_TIME_IN_S, l1Client);
       delayed.delayer!.setMaxInclusionTimeIntoSlot(opts.txDelayerMaxInclusionTimeIntoSlot);
       publisher.l1TxUtils = delayed;
     }

package/src/e2e_fees/fees_test.ts

@@ -108,6 +108,7 @@ export class FeesTest {
     if (!numberOfAccounts) {
       throw new Error('There must be at least 1 initial account.');
     }
+    this.coinbase = setupOptions.coinbase ?? EthAddress.random();
     this.logger = createLogger(`e2e:e2e_fees:${testName}`);
     this.snapshotManager = createSnapshotManager(
       `e2e_fees/${testName}-${numberOfAccounts}`,
@@ -119,7 +120,6 @@ export class FeesTest {
 
   async setup() {
     const context = await this.snapshotManager.setup();
-    await context.aztecNode.setConfig({ feeRecipient: this.sequencerAddress, coinbase: this.coinbase });
 
     this.rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
     this.chainMonitor = new ChainMonitor(this.rollupContract, context.dateProvider, this.logger, 200).start();
@@ -205,7 +205,6 @@ export class FeesTest {
 
         const canonicalFeeJuice = await getCanonicalFeeJuice();
         this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.aliceWallet);
-        this.coinbase = EthAddress.random();
       },
     );
   }

package/src/e2e_multi_validator/utils.ts

@@ -0,0 +1,264 @@
+import type { AztecAddress } from '@aztec/aztec.js';
+import { getAddressFromPrivateKey } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { EthPrivateKey } from '@aztec/node-keystore';
+
+import { writeFile } from 'fs/promises';
+import { createServer } from 'http';
+import { signMessage, signTypedData } from 'viem/accounts';
+
+// Create a mock JSON RPC signer
+// Only supports signing messages and type data
+
+const SUPPORTED_METHODS = ['eth_sign', 'eth_signTypedData_v4'];
+
+export function createJSONRPCSigner(keyLookup: Map<string, EthPrivateKey>, stats: Map<string, number>) {
+  return createServer((req, res) => {
+    if (req.method === 'POST') {
+      let body = '';
+      req.on('data', chunk => {
+        body += chunk.toString();
+      });
+      req.on('end', () => {
+        try {
+          const jsonRequest = JSON.parse(body);
+          res.writeHead(200, { 'Content-Type': 'application/json' });
+
+          if (!SUPPORTED_METHODS.includes(jsonRequest.method)) {
+            res.end(
+              JSON.stringify({
+                jsonrpc: '2.0',
+                id: jsonRequest.id,
+                error: { code: -32601, message: 'Method not supported' },
+              }),
+            );
+            return;
+          }
+
+          // Get the address sending the transaction
+          const [address, data] = jsonRequest.params;
+
+          const lowerCaseAddress = address.toLowerCase();
+          stats.set(lowerCaseAddress, (stats.get(lowerCaseAddress) ?? 0) + 1);
+
+          // Find the private key for the address
+          const privateKey = keyLookup.get(address.toLowerCase());
+          if (!privateKey) {
+            res.end(
+              JSON.stringify({
+                jsonrpc: '2.0',
+                id: jsonRequest.id,
+                error: { code: -32602, message: `No private key found for address ${address}` },
+              }),
+            );
+            return;
+          }
+
+          const promise =
+            jsonRequest.method === 'eth_sign'
+              ? signMessage({ message: { raw: data as `0x${string}` }, privateKey })
+              : signTypedData({
+                  privateKey,
+                  ...data,
+                });
+
+          void promise.then(signature => {
+            res.end(
+              JSON.stringify({
+                jsonrpc: '2.0',
+                id: jsonRequest.id,
+                result: signature,
+              }),
+            );
+          });
+        } catch (err) {
+          res.end(
+            JSON.stringify({
+              jsonrpc: '2.0',
+              id: 1,
+              error: { code: -32603, message: `${err}` },
+            }),
+          );
+        }
+      });
+    } else {
+      res.writeHead(405);
+      res.end('Method not allowed');
+    }
+  });
+}
+
+// Functions for creating file based key stores for the e2e_multi_validator_node_key_store test
+export async function createKeyFile1(
+  fileName: string,
+  mnemonic: string,
+  validatorIndex: number,
+  publisher1Key: EthPrivateKey,
+  publisher2Key: EthPrivateKey,
+  coinbase: EthAddress,
+  feeRecipient: AztecAddress,
+) {
+  const obj = {
+    schemaVersion: 1,
+    validators: [
+      {
+        attester: {
+          mnemonic: mnemonic,
+          accountIndex: 0,
+          addressIndex: validatorIndex,
+          addressCount: 1,
+        },
+        coinbase: coinbase.toChecksumString(),
+        publisher: [publisher1Key, publisher2Key],
+        feeRecipient: feeRecipient.toString(),
+      },
+    ],
+  };
+  await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+
+export async function createKeyFile2(
+  fileName: string,
+  validatorKey: EthPrivateKey,
+  publisherMnemonic: string,
+  publisher1Index: number,
+  coinbase: EthAddress,
+  feeRecipient: AztecAddress,
+) {
+  const obj = {
+    schemaVersion: 1,
+    validators: [
+      {
+        attester: validatorKey,
+        coinbase: coinbase.toChecksumString(),
+        publisher: {
+          mnemonic: publisherMnemonic,
+          accountIndex: 0,
+          addressIndex: publisher1Index,
+          addressCount: 2,
+        },
+        feeRecipient: feeRecipient.toString(),
+      },
+    ],
+  };
+  await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+
+export async function createKeyFile3(
+  fileName: string,
+  validatorAddress: EthAddress,
+  publisher1Key: EthPrivateKey,
+  publisher2Key: EthPrivateKey,
+  coinbase: EthAddress,
+  remoteSignerUrl: string,
+  feeRecipient: AztecAddress,
+) {
+  const obj = {
+    schemaVersion: 1,
+    validators: [
+      {
+        attester: {
+          address: validatorAddress.toChecksumString(),
+        },
+        coinbase: coinbase.toChecksumString(),
+        publisher: [publisher1Key, publisher2Key],
+        feeRecipient: feeRecipient.toString(),
+        remoteSigner: {
+          remoteSignerUrl: remoteSignerUrl,
+        },
+      },
+    ],
+  };
+  await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+
+export async function createKeyFile4(
+  fileName: string,
+  validator1Address: EthAddress,
+  validator2Address: EthAddress,
+  publisher1Index: number,
+  publisher2Key: EthPrivateKey,
+  mnemonic: string,
+  publisher3Key: EthPrivateKey,
+  coinbase1: EthAddress,
+  coinbase2: EthAddress,
+  remoteSignerUrl: string,
+  feeRecipient1: AztecAddress,
+  feeRecipient2: AztecAddress,
+) {
+  const obj = {
+    schemaVersion: 1,
+    remoteSigner: {
+      remoteSignerUrl: remoteSignerUrl,
+    },
+    validators: [
+      {
+        attester: {
+          address: validator1Address.toChecksumString(),
+        },
+        coinbase: coinbase1.toChecksumString(),
+        publisher: {
+          mnemonic: mnemonic,
+          accountIndex: 0,
+          addressIndex: publisher1Index,
+          addressCount: 2,
+        },
+        feeRecipient: feeRecipient1.toString(),
+      },
+      {
+        attester: {
+          address: validator2Address.toChecksumString(),
+        },
+        coinbase: coinbase2.toChecksumString(),
+        publisher: [publisher2Key, publisher3Key],
+        feeRecipient: feeRecipient2.toString(),
+      },
+    ],
+  };
+  await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+
+export async function createKeyFile5(fileName: string, proverAddress: EthAddress, remoteSignerUrl: string) {
+  const obj = {
+    schemaVersion: 1,
+    prover: {
+      id: '0x1234567890123456789012345678901234567890',
+      publisher: [
+        {
+          address: proverAddress.toChecksumString(),
+          remoteSignerUrl: remoteSignerUrl,
+        },
+      ],
+    },
+  };
+  await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+
+export async function createKeyFile6(
+  fileName: string,
+  mnemonic: string,
+  validator1Index: number,
+  coinbase: EthAddress,
+  feeRecipient: AztecAddress,
+) {
+  const obj = {
+    schemaVersion: 1,
+    validators: [
+      {
+        attester: {
+          mnemonic: mnemonic,
+          accountIndex: 0,
+          addressIndex: validator1Index,
+          addressCount: 2,
+        },
+        coinbase: coinbase.toChecksumString(),
+        feeRecipient: feeRecipient.toString(),
+      },
+    ],
+  };
+  await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+
+export function addressForPrivateKey(privateKey: EthPrivateKey): EthAddress {
+  return EthAddress.fromString(getAddressFromPrivateKey(privateKey));
+}

package/src/e2e_p2p/p2p_network.ts

@@ -5,11 +5,11 @@ import { type AccountWalletWithSecretKey, AztecAddress, EthAddress, Fr } from '@
 import {
   type ExtendedViemWalletClient,
   GSEContract,
-  L1TxUtils,
   MultiAdderArtifact,
   type Operator,
   RollupContract,
   type ViemClient,
+  createL1TxUtilsFromViemWallet,
   deployL1Contract,
   getL1ContractsConfigEnvVars,
 } from '@aztec/ethereum';
@@ -349,7 +349,7 @@ export class P2PNetworkTest {
   }
 
   private async _sendDummyTx(l1Client: ExtendedViemWalletClient) {
-    const l1TxUtils = new L1TxUtils(l1Client);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client);
     return await l1TxUtils.sendAndMonitorTransaction({
       to: l1Client.account!.address,
       value: 1n,

package/src/fixtures/e2e_prover_test.ts

@@ -296,10 +296,10 @@ export class FullProverTest {
       ...this.context.aztecNodeConfig,
       txCollectionNodeRpcUrls: [],
       dataDirectory: undefined,
-      proverId: this.proverAddress.toField(),
+      proverId: this.proverAddress,
       realProofs: this.realProofs,
       proverAgentCount: 2,
-      publisherPrivateKey: new SecretValue(`0x${proverNodePrivateKey!.toString('hex')}` as const),
+      publisherPrivateKeys: [new SecretValue(`0x${proverNodePrivateKey!.toString('hex')}` as const)],
       proverNodeMaxPendingJobs: 100,
       proverNodeMaxParallelBlocksPerEpoch: 32,
       proverNodePollingIntervalMs: 100,

package/src/fixtures/setup_p2p_test.ts

@@ -154,7 +154,7 @@ export async function createValidatorConfig(
   const attesterPrivateKey = bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex)!);
 
   config.validatorPrivateKeys = new SecretValue([attesterPrivateKey]);
-  config.publisherPrivateKey = new SecretValue(attesterPrivateKey);
+  config.publisherPrivateKeys = [new SecretValue(attesterPrivateKey)];
 
   const nodeConfig: AztecNodeConfig = {
     ...config,

package/src/fixtures/snapshot_manager.ts

@@ -8,6 +8,7 @@ import {
   type CompleteAddress,
   type ContractFunctionInteraction,
   DefaultWaitForProvenOpts,
+  EthAddress,
   type Logger,
   type PXE,
   type Wallet,
@@ -342,11 +343,14 @@ async function setupFromFresh(
   const publisherPrivKeyRaw = hdAccount.getHdKey().privateKey;
   const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
 
+  const l1Client = createExtendedL1Client([aztecNodeConfig.l1RpcUrls[0]], hdAccount, foundry);
+
   const validatorPrivKey = getPrivateKeyFromIndex(0);
   const proverNodePrivateKey = getPrivateKeyFromIndex(0);
 
-  aztecNodeConfig.publisherPrivateKey = new SecretValue<`0x${string}`>(`0x${publisherPrivKey!.toString('hex')}`);
+  aztecNodeConfig.publisherPrivateKeys = [new SecretValue<`0x${string}`>(`0x${publisherPrivKey!.toString('hex')}`)];
   aztecNodeConfig.validatorPrivateKeys = new SecretValue([`0x${validatorPrivKey!.toString('hex')}`]);
+  aztecNodeConfig.coinbase = opts.coinbase ?? EthAddress.fromString(`${hdAccount.address}`);
 
   const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
 
@@ -361,7 +365,6 @@ async function setupFromFresh(
     opts.initialAccountFeeJuice,
   );
 
-  const l1Client = createExtendedL1Client([aztecNodeConfig.l1RpcUrls[0]], hdAccount, foundry);
   await deployMulticall3(l1Client, logger);
 
   const deployL1ContractsValues = await setupL1Contracts(aztecNodeConfig.l1RpcUrls[0], hdAccount, logger, {
@@ -439,7 +442,7 @@ async function setupFromFresh(
   );
   await blobSink.start();
 
-  logger.verbose('Creating and synching an aztec node...');
+  logger.info('Creating and synching an aztec node...');
   const aztecNode = await AztecNodeService.createAndSync(
     aztecNodeConfig,
     { telemetry, dateProvider },