@aztec/end-to-end 0.0.1-commit.59e663cd → 0.0.1-commit.5cf06de3

package/dest/spartan/utils/scripts.js

@@ -4,7 +4,7 @@ import path from 'path';
  * @param scriptPath - The path to the script, relative to the project root
  * @param args - The arguments to pass to the script
  * @param logger - The logger to use
- * @returns The exit code of the script
+ * @returns The exit code, stdout, and stderr of the script
  */ function runScript(scriptPath, args, logger, env) {
     const childProcess = spawn(scriptPath, args, {
         stdio: [
@@ -17,13 +17,21 @@ import path from 'path';
             ...env
         } : process.env
     });
+    const stdoutChunks = [];
+    const stderrChunks = [];
     return new Promise((resolve, reject)=>{
-        childProcess.on('close', (code)=>resolve(code ?? 0));
+        childProcess.on('close', (code)=>resolve({
+                exitCode: code ?? 0,
+                stdout: Buffer.concat(stdoutChunks).toString(),
+                stderr: Buffer.concat(stderrChunks).toString()
+            }));
         childProcess.on('error', reject);
         childProcess.stdout?.on('data', (data)=>{
+            stdoutChunks.push(data);
             logger.info(data.toString());
         });
         childProcess.stderr?.on('data', (data)=>{
+            stderrChunks.push(data);
             logger.error(data.toString());
         });
     });
@@ -53,14 +61,21 @@ export function getAztecBin() {
  * @param args - The arguments to pass to the Aztec binary
  * @param logger - The logger to use
  * @param env - Optional environment variables to set for the process
- * @returns The exit code of the Aztec binary
+ * @returns The exit code, stdout, and stderr of the Aztec binary
  */ export function runAztecBin(args, logger, env) {
     return runScript('node', [
         getAztecBin(),
         ...args
     ], logger, env);
 }
-export function runProjectScript(script, args, logger, env) {
+/**
+ * Runs a script from the project root
+ * @param script - The path to the script, relative to the project root
+ * @param args - The arguments to pass to the script
+ * @param logger - The logger to use
+ * @param env - Optional environment variables to set for the process
+ * @returns The exit code, stdout, and stderr of the script
+ */ export function runProjectScript(script, args, logger, env) {
     const scriptPath = script.startsWith('/') ? script : path.join(getGitProjectRoot(), script);
     return runScript(scriptPath, args, logger, env);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.59e663cd",
+  "version": "0.0.1-commit.5cf06de3",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -22,47 +22,48 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --no-cache --runInBand --config jest.integration.config.json",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests src/fixtures",
     "test:compose": "./scripts/run_test.sh compose",
+    "test:ha": "./scripts/run_test.sh ha",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.59e663cd",
-    "@aztec/archiver": "0.0.1-commit.59e663cd",
-    "@aztec/aztec": "0.0.1-commit.59e663cd",
-    "@aztec/aztec-node": "0.0.1-commit.59e663cd",
-    "@aztec/aztec.js": "0.0.1-commit.59e663cd",
-    "@aztec/bb-prover": "0.0.1-commit.59e663cd",
-    "@aztec/bb.js": "0.0.1-commit.59e663cd",
-    "@aztec/blob-client": "0.0.1-commit.59e663cd",
-    "@aztec/blob-lib": "0.0.1-commit.59e663cd",
-    "@aztec/bot": "0.0.1-commit.59e663cd",
-    "@aztec/cli": "0.0.1-commit.59e663cd",
-    "@aztec/constants": "0.0.1-commit.59e663cd",
-    "@aztec/entrypoints": "0.0.1-commit.59e663cd",
-    "@aztec/epoch-cache": "0.0.1-commit.59e663cd",
-    "@aztec/ethereum": "0.0.1-commit.59e663cd",
-    "@aztec/foundation": "0.0.1-commit.59e663cd",
-    "@aztec/kv-store": "0.0.1-commit.59e663cd",
-    "@aztec/l1-artifacts": "0.0.1-commit.59e663cd",
-    "@aztec/merkle-tree": "0.0.1-commit.59e663cd",
-    "@aztec/node-keystore": "0.0.1-commit.59e663cd",
-    "@aztec/noir-contracts.js": "0.0.1-commit.59e663cd",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.59e663cd",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.59e663cd",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.59e663cd",
-    "@aztec/p2p": "0.0.1-commit.59e663cd",
-    "@aztec/protocol-contracts": "0.0.1-commit.59e663cd",
-    "@aztec/prover-client": "0.0.1-commit.59e663cd",
-    "@aztec/prover-node": "0.0.1-commit.59e663cd",
-    "@aztec/pxe": "0.0.1-commit.59e663cd",
-    "@aztec/sequencer-client": "0.0.1-commit.59e663cd",
-    "@aztec/simulator": "0.0.1-commit.59e663cd",
-    "@aztec/slasher": "0.0.1-commit.59e663cd",
-    "@aztec/stdlib": "0.0.1-commit.59e663cd",
-    "@aztec/telemetry-client": "0.0.1-commit.59e663cd",
-    "@aztec/test-wallet": "0.0.1-commit.59e663cd",
-    "@aztec/validator-client": "0.0.1-commit.59e663cd",
-    "@aztec/validator-ha-signer": "0.0.1-commit.59e663cd",
-    "@aztec/world-state": "0.0.1-commit.59e663cd",
+    "@aztec/accounts": "0.0.1-commit.5cf06de3",
+    "@aztec/archiver": "0.0.1-commit.5cf06de3",
+    "@aztec/aztec": "0.0.1-commit.5cf06de3",
+    "@aztec/aztec-node": "0.0.1-commit.5cf06de3",
+    "@aztec/aztec.js": "0.0.1-commit.5cf06de3",
+    "@aztec/bb-prover": "0.0.1-commit.5cf06de3",
+    "@aztec/bb.js": "0.0.1-commit.5cf06de3",
+    "@aztec/blob-client": "0.0.1-commit.5cf06de3",
+    "@aztec/blob-lib": "0.0.1-commit.5cf06de3",
+    "@aztec/bot": "0.0.1-commit.5cf06de3",
+    "@aztec/cli": "0.0.1-commit.5cf06de3",
+    "@aztec/constants": "0.0.1-commit.5cf06de3",
+    "@aztec/entrypoints": "0.0.1-commit.5cf06de3",
+    "@aztec/epoch-cache": "0.0.1-commit.5cf06de3",
+    "@aztec/ethereum": "0.0.1-commit.5cf06de3",
+    "@aztec/foundation": "0.0.1-commit.5cf06de3",
+    "@aztec/kv-store": "0.0.1-commit.5cf06de3",
+    "@aztec/l1-artifacts": "0.0.1-commit.5cf06de3",
+    "@aztec/merkle-tree": "0.0.1-commit.5cf06de3",
+    "@aztec/node-keystore": "0.0.1-commit.5cf06de3",
+    "@aztec/noir-contracts.js": "0.0.1-commit.5cf06de3",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.5cf06de3",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.5cf06de3",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.5cf06de3",
+    "@aztec/p2p": "0.0.1-commit.5cf06de3",
+    "@aztec/protocol-contracts": "0.0.1-commit.5cf06de3",
+    "@aztec/prover-client": "0.0.1-commit.5cf06de3",
+    "@aztec/prover-node": "0.0.1-commit.5cf06de3",
+    "@aztec/pxe": "0.0.1-commit.5cf06de3",
+    "@aztec/sequencer-client": "0.0.1-commit.5cf06de3",
+    "@aztec/simulator": "0.0.1-commit.5cf06de3",
+    "@aztec/slasher": "0.0.1-commit.5cf06de3",
+    "@aztec/stdlib": "0.0.1-commit.5cf06de3",
+    "@aztec/telemetry-client": "0.0.1-commit.5cf06de3",
+    "@aztec/test-wallet": "0.0.1-commit.5cf06de3",
+    "@aztec/validator-client": "0.0.1-commit.5cf06de3",
+    "@aztec/validator-ha-signer": "0.0.1-commit.5cf06de3",
+    "@aztec/world-state": "0.0.1-commit.5cf06de3",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -90,6 +91,7 @@
     "lodash.every": "^4.6.0",
     "lodash.omit": "^4.5.0",
     "msgpackr": "^1.11.2",
+    "pg": "^8.17.1",
     "process": "^0.11.10",
     "snappy": "^7.2.2",
     "stream-browserify": "^3.0.0",
@@ -108,6 +110,7 @@
     "@types/jest": "^30.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/lodash.chunk": "^4.2.9",
+    "@types/pg": "^8",
     "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "concurrently": "^7.6.0",
     "jest": "^30.0.0",

package/src/e2e_epochs/epochs_test.ts

@@ -14,7 +14,7 @@ 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';
@@ -51,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; pxeOpts?: Partial<PXEConfig> };
+export type EpochsTestOpts = Partial<SetupOptions> & {
+  numberOfAccounts?: number;
+  pxeOpts?: Partial<PXEConfig>;
+  aztecSlotDurationInL1Slots?: number;
+};
 
 export type TrackedSequencerEvent = {
   [K in keyof SequencerEvents]: Parameters<SequencerEvents[K]>[0] & {
@@ -96,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;
@@ -207,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,
         },
@@ -243,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,

package/src/e2e_l1_publisher/write_json.ts

@@ -15,6 +15,7 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
  */
 export async function writeJson(
   fileName: string,
+  checkpointHeader: CheckpointHeader,
   block: L2Block,
   l1ToL2Content: Fr[],
   blobs: Blob[],
@@ -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_p2p/reqresp/utils.ts

@@ -0,0 +1,207 @@
+import type { AztecNodeService } from '@aztec/aztec-node';
+import { createLogger } from '@aztec/aztec.js/log';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { Tx } from '@aztec/aztec.js/tx';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { timesAsync } from '@aztec/foundation/collection';
+import { retryUntil } from '@aztec/foundation/retry';
+
+import { jest } from '@jest/globals';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+
+import { shouldCollectMetrics } from '../../fixtures/fixtures.js';
+import { createNodes } from '../../fixtures/setup_p2p_test.js';
+import { P2PNetworkTest, SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES, WAIT_FOR_TX_TIMEOUT } from '../p2p_network.js';
+import { prepareTransactions } from '../shared.js';
+
+// Don't set this to a higher value than 9 because each node will use a different L1 publisher account and anvil seeds
+export const NUM_VALIDATORS = 6;
+export const NUM_TXS_PER_NODE = 2;
+export const BOOT_NODE_UDP_PORT = 4500;
+
+export const createReqrespDataDir = () => fs.mkdtempSync(path.join(os.tmpdir(), 'reqresp-'));
+
+type ReqrespOptions = {
+  disableStatusHandshake?: boolean;
+};
+
+export async function createReqrespTest(options: ReqrespOptions = {}): Promise<P2PNetworkTest> {
+  const { disableStatusHandshake = false } = options;
+  const t = await P2PNetworkTest.create({
+    testName: 'e2e_p2p_reqresp_tx',
+    numberOfNodes: 0,
+    numberOfValidators: NUM_VALIDATORS,
+    basePort: BOOT_NODE_UDP_PORT,
+    // To collect metrics - run in aztec-packages `docker compose --profile metrics up`
+    metricsPort: shouldCollectMetrics(),
+    initialConfig: {
+      ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
+      aztecSlotDuration: 24,
+      ...(disableStatusHandshake ? { p2pDisableStatusHandshake: true } : {}),
+      listenAddress: '127.0.0.1',
+      aztecEpochDuration: 64, // stable committee
+    },
+  });
+  await t.setup();
+  await t.applyBaseSetup();
+  return t;
+}
+
+export async function cleanupReqrespTest(params: { t: P2PNetworkTest; nodes?: AztecNodeService[]; dataDir: string }) {
+  const { t, nodes, dataDir } = params;
+  if (nodes) {
+    await t.stopNodes(nodes);
+  }
+  await t.teardown();
+  for (let i = 0; i < NUM_VALIDATORS; i++) {
+    fs.rmSync(`${dataDir}-${i}`, { recursive: true, force: true, maxRetries: 3 });
+  }
+}
+
+const getNodePort = (nodeIndex: number) => BOOT_NODE_UDP_PORT + 1 + nodeIndex;
+
+export async function runReqrespTxTest(params: {
+  t: P2PNetworkTest;
+  dataDir: string;
+  disableStatusHandshake?: boolean;
+}): Promise<AztecNodeService[]> {
+  const { t, dataDir, disableStatusHandshake = false } = params;
+
+  if (!t.bootstrapNodeEnr) {
+    throw new Error('Bootstrap node ENR is not available');
+  }
+
+  t.logger.info('Creating nodes');
+  const aztecNodeConfig = disableStatusHandshake
+    ? { ...t.ctx.aztecNodeConfig, p2pDisableStatusHandshake: true }
+    : t.ctx.aztecNodeConfig;
+
+  const nodes = await createNodes(
+    aztecNodeConfig,
+    t.ctx.dateProvider!,
+    t.bootstrapNodeEnr,
+    NUM_VALIDATORS,
+    BOOT_NODE_UDP_PORT,
+    t.prefilledPublicData,
+    dataDir,
+    shouldCollectMetrics(),
+  );
+
+  t.logger.info('Waiting for nodes to connect');
+  await t.waitForP2PMeshConnectivity(nodes, NUM_VALIDATORS);
+
+  await t.setupAccount();
+
+  const targetBlockNumber = await t.ctx.aztecNodeService!.getBlockNumber();
+  await retryUntil(
+    async () => {
+      const blockNumbers = await Promise.all(nodes.map(node => node.getBlockNumber()));
+      return blockNumbers.every(blockNumber => blockNumber >= targetBlockNumber) ? true : undefined;
+    },
+    `validators to sync to L2 block ${targetBlockNumber}`,
+    60,
+    0.5,
+  );
+
+  t.logger.info('Preparing transactions to send');
+  const txBatches = await timesAsync(2, () =>
+    prepareTransactions(t.logger, t.ctx.aztecNodeService!, NUM_TXS_PER_NODE, t.fundedAccount),
+  );
+
+  t.logger.info('Removing initial node');
+  await t.removeInitialNode();
+
+  t.logger.info('Starting fresh slot');
+  const [timestamp] = await t.ctx.cheatCodes.rollup.advanceToNextSlot();
+  t.ctx.dateProvider!.setTime(Number(timestamp) * 1000);
+  const startSlotTimestamp = BigInt(timestamp);
+
+  const { proposerIndexes, nodesToTurnOffTxGossip } = await getProposerIndexes(t, startSlotTimestamp);
+  t.logger.info(`Turning off tx gossip for nodes: ${nodesToTurnOffTxGossip.map(getNodePort)}`);
+  t.logger.info(`Sending txs to proposer nodes: ${proposerIndexes.map(getNodePort)}`);
+
+  // Replace the p2p node implementation of some of the nodes with a spy such that it does not store transactions that are gossiped to it
+  // Original implementation of `handleGossipedTx` will store received transactions in the tx pool.
+  // We chose the first 2 nodes that will be the proposers for the next few slots
+  for (const nodeIndex of nodesToTurnOffTxGossip) {
+    const logger = createLogger(`p2p:${getNodePort(nodeIndex)}`);
+    jest.spyOn((nodes[nodeIndex] as any).p2pClient.p2pService, 'handleGossipedTx').mockImplementation(((
+      payloadData: Buffer,
+    ) => {
+      const txHash = Tx.fromBuffer(payloadData).getTxHash();
+      logger.info(`Skipping storage of gossiped transaction ${txHash.toString()}`);
+      return Promise.resolve();
+    }) as any);
+  }
+
+  // We send the tx to the proposer nodes directly, ignoring the pxe and node in each context
+  // We cannot just call tx.send since they were created using a pxe wired to the first node which is now stopped
+  t.logger.info('Sending transactions through proposer nodes');
+  const submittedTxs = await Promise.all(
+    txBatches.map(async (batch, batchIndex) => {
+      const proposerNode = nodes[proposerIndexes[batchIndex]];
+      await Promise.all(
+        batch.map(async tx => {
+          try {
+            await proposerNode.sendTx(tx);
+          } catch (err) {
+            t.logger.error(`Error sending tx: ${err}`);
+            throw err;
+          }
+        }),
+      );
+      return batch.map(tx => ({ node: proposerNode, txHash: tx.getTxHash() }));
+    }),
+  );
+
+  t.logger.info('Waiting for all transactions to be mined');
+  await Promise.all(
+    submittedTxs.flatMap((batch, batchIndex) =>
+      batch.map(async (submittedTx, txIndex) => {
+        t.logger.info(`Waiting for tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} to be mined`);
+        await waitForTx(submittedTx.node, submittedTx.txHash, { timeout: WAIT_FOR_TX_TIMEOUT * 1.5 });
+        t.logger.info(`Tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} has been mined`);
+      }),
+    ),
+  );
+
+  t.logger.info('All transactions mined');
+
+  return nodes;
+}
+
+async function getProposerIndexes(t: P2PNetworkTest, startSlotTimestamp: bigint) {
+  // Get the nodes for the next set of slots
+  const rollupContract = new RollupContract(
+    t.ctx.deployL1ContractsValues.l1Client,
+    t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+  );
+
+  const attesters = await rollupContract.getAttesters();
+  const startSlot = await rollupContract.getSlotAt(startSlotTimestamp);
+
+  const proposers = await Promise.all(
+    Array.from({ length: 3 }, async (_, i) => {
+      const slot = SlotNumber(startSlot + i);
+      const slotTimestamp = await rollupContract.getTimestampForSlot(slot);
+      return await rollupContract.getProposerAt(slotTimestamp);
+    }),
+  );
+  // Get the indexes of the nodes that are responsible for the next two slots
+  const proposerIndexes = proposers.map(proposer => attesters.findIndex(a => a.equals(proposer)));
+
+  if (proposerIndexes.some(i => i === -1)) {
+    throw new Error(
+      `Proposer index not found for proposer ` +
+        `(proposers=${proposers.map(p => p.toString()).join(',')}, indices=${proposerIndexes.join(',')})`,
+    );
+  }
+
+  const nodesToTurnOffTxGossip = Array.from({ length: NUM_VALIDATORS }, (_, i) => i).filter(
+    i => !proposerIndexes.includes(i),
+  );
+  return { proposerIndexes, nodesToTurnOffTxGossip };
+}

package/src/e2e_p2p/shared.ts

@@ -56,7 +56,11 @@ export const submitTransactions = async (
 ): Promise<TxHash[]> => {
   const rpcConfig = getRpcConfig();
   rpcConfig.proverEnabled = false;
-  const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
+  const wallet = await TestWallet.create(
+    node,
+    { ...getPXEConfig(), proverEnabled: false },
+    { loggerActorLabel: 'pxe-tx' },
+  );
   const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
   return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
 };
@@ -70,7 +74,11 @@ export async function prepareTransactions(
   const rpcConfig = getRpcConfig();
   rpcConfig.proverEnabled = false;
 
-  const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
+  const wallet = await TestWallet.create(
+    node,
+    { ...getPXEConfig(), proverEnabled: false },
+    { loggerActorLabel: 'pxe-tx' },
+  );
   const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
 
   const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {