@aztec/end-to-end 0.85.0-nightly.20250417 → 0.85.0-nightly.20250420

package/dest/bench/client_flows/data_extractor.js

@@ -2,7 +2,7 @@ import { BBNativePrivateKernelProver } from '@aztec/bb-prover';
 import { BBWASMBundlePrivateKernelProver } from '@aztec/bb-prover/wasm/bundle';
 import { createLogger, logger } from '@aztec/foundation/log';
 import { WASMSimulator } from '@aztec/simulator/client';
-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';
@@ -131,8 +131,10 @@ async function main() {
     const userLog = createLogger('client_ivc_flows:data_processor');
     for (const flow of flows){
         userLog.info(`Processing flow ${flow}`);
-        const bytecode = await readFile(join(ivcFolder, flow, 'acir.msgpack'));
-        const acirStack = decode(bytecode);
+        const ivcInputs = await readFile(join(ivcFolder, flow, 'ivc-inputs.msgpack'));
+        const stepsFromFile = new Decoder({
+            useRecords: false
+        }).unpack(ivcInputs);
         const witnesses = await readFile(join(ivcFolder, flow, 'witnesses.json'));
         const witnessStack = JSON.parse(witnesses.toString()).map((witnessMap)=>{
             return new Map(Object.entries(witnessMap).map(([k, v])=>[
@@ -145,8 +147,11 @@ async function main() {
         const privateExecutionSteps = executionSteps.map((step, i)=>({
                 functionName: step.fnName,
                 gateCount: step.gateCount,
-                bytecode: acirStack[i],
-                witness: witnessStack[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;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dest/e2e_p2p/p2p_network.d.ts

@@ -283,6 +283,11 @@ export declare class P2PNetworkTest {
     setupAccount(): Promise<void>;
     deploySpamContract(): Promise<void>;
     removeInitialNode(): Promise<void>;
+    sendDummyTx(): Promise<{
+        receipt: import("viem").TransactionReceipt;
+        gasPrice: import("@aztec/ethereum").GasPrice;
+    }>;
+    private _sendDummyTx;
     setup(): Promise<void>;
     stopNodes(nodes: AztecNodeService[]): Promise<void>;
     teardown(): Promise<void>;

package/dest/e2e_p2p/p2p_network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}

package/dest/e2e_p2p/p2p_network.js

@@ -1,5 +1,5 @@
 import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
-import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { L1TxUtils, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
 import { createLogger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
@@ -170,13 +170,7 @@ export class P2PNetworkTest {
                 this.logger.debug('Warp failed, time already satisfied');
             }
             // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-            await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                hash: await deployL1ContractsValues.walletClient.sendTransaction({
-                    to: this.baseAccount.address,
-                    value: 1n,
-                    account: this.baseAccount
-                })
-            });
+            await this._sendDummyTx(deployL1ContractsValues.publicClient, deployL1ContractsValues.walletClient);
             // Set the system time in the node, only after we have warped the time and waited for a block
             // Time is only set in the NEXT block
             dateProvider.setTime(Number(timestamp) * 1000);
@@ -208,13 +202,7 @@ export class P2PNetworkTest {
     async removeInitialNode() {
         await this.snapshotManager.snapshot('remove-inital-validator', async ({ deployL1ContractsValues, aztecNode, dateProvider })=>{
             // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-            const receipt = await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                hash: await deployL1ContractsValues.walletClient.sendTransaction({
-                    to: this.baseAccount.address,
-                    value: 1n,
-                    account: this.baseAccount
-                })
-            });
+            const { receipt } = await this._sendDummyTx(deployL1ContractsValues.publicClient, deployL1ContractsValues.walletClient);
             const block = await deployL1ContractsValues.publicClient.getBlock({
                 blockNumber: receipt.blockNumber
             });
@@ -222,6 +210,16 @@ export class P2PNetworkTest {
             await aztecNode.stop();
         });
     }
+    async sendDummyTx() {
+        return await this._sendDummyTx(this.ctx.deployL1ContractsValues.publicClient, this.ctx.deployL1ContractsValues.walletClient);
+    }
+    async _sendDummyTx(publicClient, walletClient) {
+        const l1TxUtils = new L1TxUtils(publicClient, walletClient);
+        return await l1TxUtils.sendAndMonitorTransaction({
+            to: walletClient.account.address,
+            value: 1n
+        });
+    }
     async setup() {
         this.ctx = await this.snapshotManager.setup();
         const sponsoredFPCAddress = await getSponsoredFPCAddress();

package/dest/e2e_prover/e2e_prover_test.js

@@ -208,7 +208,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }, {
             prefilledPublicData
         });
-        this.proverNode.start();
+        await this.proverNode.start();
         this.logger.warn(`Proofs are now enabled`);
         return this;
     }

package/dest/fixtures/utils.js

@@ -560,7 +560,7 @@ export async function createAndSyncProverNode(proverNodePrivateKey, aztecNodeCon
     getLogger().info(`Created and synced prover node`, {
         publisherAddress: l1TxUtils.walletClient.account.address
     });
-    proverNode.start();
+    await proverNode.start();
     return proverNode;
 }
 function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName) {

package/dest/shared/capture_private_execution_steps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capture_private_execution_steps.d.ts","sourceRoot":"","sources":["../../src/shared/capture_private_execution_steps.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AA0BnC,wBAAsB,oCAAoC,CACxD,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,2BAA2B,GAAG,YAAY,EACvD,IAAI,CAAC,EAAE,IAAI,CAAC,oBAAoB,GAAG,aAAa,EAAE,aAAa,CAAC,EAChE,aAAa,CAAC,EAAE,MAAM,iBAqCvB"}
+{"version":3,"file":"capture_private_execution_steps.d.ts","sourceRoot":"","sources":["../../src/shared/capture_private_execution_steps.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AASnC,wBAAsB,oCAAoC,CACxD,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,2BAA2B,GAAG,YAAY,EACvD,IAAI,CAAC,EAAE,IAAI,CAAC,oBAAoB,GAAG,aAAa,EAAE,aAAa,CAAC,EAChE,aAAa,CAAC,EAAE,MAAM,iBAsCvB"}

package/dest/shared/capture_private_execution_steps.js

@@ -2,25 +2,10 @@
  * This module exposes the ability to capture the private exection steps that go into our "Client IVC" prover.
  * These are used for debugging and benchmarking barretenberg (the prover component).
  */ import { createLogger } from '@aztec/foundation/log';
-import { serializeWitness } from '@aztec/noir-noirc_abi';
-import { encode } from '@msgpack/msgpack';
+import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 import { promises as fs } from 'fs';
 import path from 'path';
 const logger = createLogger('e2e:capture-private-execution-steps');
-// TODO(#7371): This is duplicated.
-// Longer term we won't use this hacked together msgpack format
-// Leaving duplicated as this eventually bb will provide a serialization
-// helper for passing to a generic msgpack RPC endpoint.
-async function _createClientIvcProofFiles(directory, executionSteps) {
-    const acirPath = path.join(directory, 'acir.msgpack');
-    const witnessPath = path.join(directory, 'witnesses.msgpack');
-    await fs.writeFile(acirPath, encode(executionSteps.map((map)=>map.bytecode)));
-    await fs.writeFile(witnessPath, encode(executionSteps.map((map)=>serializeWitness(map.witness))));
-    return {
-        acirPath,
-        witnessPath
-    };
-}
 export async function capturePrivateExecutionStepsIfEnvSet(label, interaction, opts, expectedSteps) {
     // Not included in env_var.ts as internal to e2e tests.
     const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
@@ -45,7 +30,8 @@ export async function capturePrivateExecutionStepsIfEnvSet(label, interaction, o
         recursive: true
     });
     // Write the client IVC files read by the prover.
-    await _createClientIvcProofFiles(resultsDirectory, result.executionSteps);
+    const ivcInputsPath = path.join(resultsDirectory, 'ivc-inputs.msgpack');
+    await fs.writeFile(ivcInputsPath, serializePrivateExecutionSteps(result.executionSteps));
     if (profileMode === 'full') {
         // If we have gate counts, write the steps in human-readable format.
         await fs.writeFile(path.join(resultsDirectory, 'steps.json'), JSON.stringify(result.executionSteps.map((step)=>({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.85.0-nightly.20250417",
+  "version": "0.85.0-nightly.20250420",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,41 +25,40 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.85.0-nightly.20250417",
-    "@aztec/archiver": "0.85.0-nightly.20250417",
-    "@aztec/aztec": "0.85.0-nightly.20250417",
-    "@aztec/aztec-node": "0.85.0-nightly.20250417",
-    "@aztec/aztec.js": "0.85.0-nightly.20250417",
-    "@aztec/bb-prover": "0.85.0-nightly.20250417",
-    "@aztec/blob-lib": "0.85.0-nightly.20250417",
-    "@aztec/blob-sink": "0.85.0-nightly.20250417",
-    "@aztec/bot": "0.85.0-nightly.20250417",
-    "@aztec/cli": "0.85.0-nightly.20250417",
-    "@aztec/constants": "0.85.0-nightly.20250417",
-    "@aztec/entrypoints": "0.85.0-nightly.20250417",
-    "@aztec/epoch-cache": "0.85.0-nightly.20250417",
-    "@aztec/ethereum": "0.85.0-nightly.20250417",
-    "@aztec/foundation": "0.85.0-nightly.20250417",
-    "@aztec/kv-store": "0.85.0-nightly.20250417",
-    "@aztec/l1-artifacts": "0.85.0-nightly.20250417",
-    "@aztec/merkle-tree": "0.85.0-nightly.20250417",
-    "@aztec/noir-contracts.js": "0.85.0-nightly.20250417",
-    "@aztec/noir-noirc_abi": "0.85.0-nightly.20250417",
-    "@aztec/noir-protocol-circuits-types": "0.85.0-nightly.20250417",
-    "@aztec/p2p": "0.85.0-nightly.20250417",
-    "@aztec/protocol-contracts": "0.85.0-nightly.20250417",
-    "@aztec/prover-client": "0.85.0-nightly.20250417",
-    "@aztec/prover-node": "0.85.0-nightly.20250417",
-    "@aztec/pxe": "0.85.0-nightly.20250417",
-    "@aztec/sequencer-client": "0.85.0-nightly.20250417",
-    "@aztec/simulator": "0.85.0-nightly.20250417",
-    "@aztec/stdlib": "0.85.0-nightly.20250417",
-    "@aztec/telemetry-client": "0.85.0-nightly.20250417",
-    "@aztec/validator-client": "0.85.0-nightly.20250417",
-    "@aztec/world-state": "0.85.0-nightly.20250417",
+    "@aztec/accounts": "0.85.0-nightly.20250420",
+    "@aztec/archiver": "0.85.0-nightly.20250420",
+    "@aztec/aztec": "0.85.0-nightly.20250420",
+    "@aztec/aztec-node": "0.85.0-nightly.20250420",
+    "@aztec/aztec.js": "0.85.0-nightly.20250420",
+    "@aztec/bb-prover": "0.85.0-nightly.20250420",
+    "@aztec/blob-lib": "0.85.0-nightly.20250420",
+    "@aztec/blob-sink": "0.85.0-nightly.20250420",
+    "@aztec/bot": "0.85.0-nightly.20250420",
+    "@aztec/cli": "0.85.0-nightly.20250420",
+    "@aztec/constants": "0.85.0-nightly.20250420",
+    "@aztec/entrypoints": "0.85.0-nightly.20250420",
+    "@aztec/epoch-cache": "0.85.0-nightly.20250420",
+    "@aztec/ethereum": "0.85.0-nightly.20250420",
+    "@aztec/foundation": "0.85.0-nightly.20250420",
+    "@aztec/kv-store": "0.85.0-nightly.20250420",
+    "@aztec/l1-artifacts": "0.85.0-nightly.20250420",
+    "@aztec/merkle-tree": "0.85.0-nightly.20250420",
+    "@aztec/noir-contracts.js": "0.85.0-nightly.20250420",
+    "@aztec/noir-noirc_abi": "0.85.0-nightly.20250420",
+    "@aztec/noir-protocol-circuits-types": "0.85.0-nightly.20250420",
+    "@aztec/p2p": "0.85.0-nightly.20250420",
+    "@aztec/protocol-contracts": "0.85.0-nightly.20250420",
+    "@aztec/prover-client": "0.85.0-nightly.20250420",
+    "@aztec/prover-node": "0.85.0-nightly.20250420",
+    "@aztec/pxe": "0.85.0-nightly.20250420",
+    "@aztec/sequencer-client": "0.85.0-nightly.20250420",
+    "@aztec/simulator": "0.85.0-nightly.20250420",
+    "@aztec/stdlib": "0.85.0-nightly.20250420",
+    "@aztec/telemetry-client": "0.85.0-nightly.20250420",
+    "@aztec/validator-client": "0.85.0-nightly.20250420",
+    "@aztec/world-state": "0.85.0-nightly.20250420",
     "@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",
@@ -84,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/data_extractor.ts

@@ -5,7 +5,7 @@ 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/e2e_p2p/p2p_network.ts

@@ -2,7 +2,14 @@ import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import type { AccountWalletWithSecretKey } from '@aztec/aztec.js';
-import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import {
+  L1TxUtils,
+  RollupContract,
+  type ViemPublicClient,
+  type ViemWalletClient,
+  getExpectedAddress,
+  getL1ContractsConfigEnvVars,
+} from '@aztec/ethereum';
 import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
@@ -232,13 +239,7 @@ export class P2PNetworkTest {
         }
 
         // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-        await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-          hash: await deployL1ContractsValues.walletClient.sendTransaction({
-            to: this.baseAccount.address,
-            value: 1n,
-            account: this.baseAccount,
-          }),
-        });
+        await this._sendDummyTx(deployL1ContractsValues.publicClient, deployL1ContractsValues.walletClient);
 
         // Set the system time in the node, only after we have warped the time and waited for a block
         // Time is only set in the NEXT block
@@ -284,13 +285,10 @@ export class P2PNetworkTest {
       'remove-inital-validator',
       async ({ deployL1ContractsValues, aztecNode, dateProvider }) => {
         // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-        const receipt = await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-          hash: await deployL1ContractsValues.walletClient.sendTransaction({
-            to: this.baseAccount.address,
-            value: 1n,
-            account: this.baseAccount,
-          }),
-        });
+        const { receipt } = await this._sendDummyTx(
+          deployL1ContractsValues.publicClient,
+          deployL1ContractsValues.walletClient,
+        );
         const block = await deployL1ContractsValues.publicClient.getBlock({
           blockNumber: receipt.blockNumber,
         });
@@ -301,6 +299,21 @@ export class P2PNetworkTest {
     );
   }
 
+  async sendDummyTx() {
+    return await this._sendDummyTx(
+      this.ctx.deployL1ContractsValues.publicClient,
+      this.ctx.deployL1ContractsValues.walletClient,
+    );
+  }
+
+  private async _sendDummyTx(publicClient: ViemPublicClient, walletClient: ViemWalletClient) {
+    const l1TxUtils = new L1TxUtils(publicClient, walletClient);
+    return await l1TxUtils.sendAndMonitorTransaction({
+      to: walletClient.account!.address,
+      value: 1n,
+    });
+  }
+
   async setup() {
     this.ctx = await this.snapshotManager.setup();
 

package/src/e2e_prover/e2e_prover_test.ts

@@ -308,7 +308,7 @@ export class FullProverTest {
       },
       { prefilledPublicData },
     );
-    this.proverNode.start();
+    await this.proverNode.start();
 
     this.logger.warn(`Proofs are now enabled`);
     return this;

package/src/fixtures/utils.ts

@@ -828,7 +828,7 @@ export async function createAndSyncProverNode(
     { prefilledPublicData },
   );
   getLogger().info(`Created and synced prover node`, { publisherAddress: l1TxUtils.walletClient.account.address });
-  proverNode.start();
+  await proverNode.start();
   return proverNode;
 }
 

package/src/shared/capture_private_execution_steps.ts

@@ -9,30 +9,13 @@ import type {
   ProfileMethodOptions,
 } from '@aztec/aztec.js/contracts';
 import { createLogger } from '@aztec/foundation/log';
-import { serializeWitness } from '@aztec/noir-noirc_abi';
-import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
+import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 
-import { encode } from '@msgpack/msgpack';
 import { promises as fs } from 'fs';
 import path from 'path';
 
 const logger = createLogger('e2e:capture-private-execution-steps');
 
-// TODO(#7371): This is duplicated.
-// Longer term we won't use this hacked together msgpack format
-// Leaving duplicated as this eventually bb will provide a serialization
-// helper for passing to a generic msgpack RPC endpoint.
-async function _createClientIvcProofFiles(directory: string, executionSteps: PrivateExecutionStep[]) {
-  const acirPath = path.join(directory, 'acir.msgpack');
-  const witnessPath = path.join(directory, 'witnesses.msgpack');
-  await fs.writeFile(acirPath, encode(executionSteps.map(map => map.bytecode)));
-  await fs.writeFile(witnessPath, encode(executionSteps.map(map => serializeWitness(map.witness))));
-  return {
-    acirPath,
-    witnessPath,
-  };
-}
-
 export async function capturePrivateExecutionStepsIfEnvSet(
   label: string,
   interaction: ContractFunctionInteraction | DeployMethod,
@@ -56,7 +39,8 @@ export async function capturePrivateExecutionStepsIfEnvSet(
   logger.info(`Writing private execution steps to ${resultsDirectory}`);
   await fs.mkdir(resultsDirectory, { recursive: true });
   // Write the client IVC files read by the prover.
-  await _createClientIvcProofFiles(resultsDirectory, result.executionSteps);
+  const ivcInputsPath = path.join(resultsDirectory, 'ivc-inputs.msgpack');
+  await fs.writeFile(ivcInputsPath, serializePrivateExecutionSteps(result.executionSteps));
   if (profileMode === 'full') {
     // If we have gate counts, write the steps in human-readable format.
     await fs.writeFile(