@aztec/end-to-end 0.87.2 → 0.87.3-nightly.20250528

package/dest/bench/client_flows/benchmark.d.ts

@@ -0,0 +1,59 @@
+import type { ContractFunctionInteraction, DeployMethod, DeployOptions, Logger, ProfileMethodOptions } from '@aztec/aztec.js';
+import { type PrivateExecutionStep } from '@aztec/stdlib/kernel';
+import type { ProvingTimings, SimulationTimings } from '@aztec/stdlib/tx';
+import type { GithubActionBenchmarkResult } from '../utils.js';
+declare const logLevel: readonly ["silent", "fatal", "error", "warn", "info", "verbose", "debug", "trace"];
+type LogLevel = (typeof logLevel)[number];
+export type Log = {
+    type: LogLevel;
+    timestamp: number;
+    prefix: string;
+    message: string;
+    data: any;
+};
+declare const GATE_TYPES: readonly ["ecc_op", "busread", "lookup", "pub_inputs", "arithmetic", "delta_range", "elliptic", "aux", "poseidon2_external", "poseidon2_internal", "overflow"];
+type GateType = (typeof GATE_TYPES)[number];
+type StructuredTrace = {
+    [k in GateType]: number;
+};
+export declare class ProxyLogger {
+    private static instance;
+    private logs;
+    private constructor();
+    static create(): void;
+    static getInstance(): ProxyLogger;
+    createLogger(prefix: string): Logger;
+    private handleLog;
+    flushLogs(): void;
+    getLogs(): Log[];
+}
+export type ProverType = 'wasm' | 'native';
+type OracleRecording = {
+    calls: number;
+    max: number;
+    min: number;
+    avg: number;
+    total: number;
+};
+type Step = Pick<PrivateExecutionStep, 'functionName' | 'gateCount'> & {
+    time: number;
+    accGateCount?: number;
+    oracles: Record<string, OracleRecording>;
+};
+type ClientFlowBenchmark = {
+    name: string;
+    timings: Omit<ProvingTimings & SimulationTimings, 'perFunction'> & {
+        witgen: number;
+    };
+    maxMemory: number;
+    proverType: ProverType;
+    minimumTrace: StructuredTrace;
+    totalGateCount: number;
+    steps: Step[];
+    error: string | undefined;
+};
+export declare function generateBenchmark(flow: string, logs: Log[], timings: ProvingTimings | SimulationTimings, privateExecutionSteps: PrivateExecutionStep[], proverType: ProverType, error: string | undefined): ClientFlowBenchmark;
+export declare function convertProfileToGHBenchmark(benchmark: ClientFlowBenchmark): GithubActionBenchmarkResult[];
+export declare function captureProfile(label: string, interaction: ContractFunctionInteraction | DeployMethod, opts?: Omit<ProfileMethodOptions & DeployOptions, 'profileMode'>, expectedSteps?: number): Promise<import("@aztec/aztec.js").TxProfileResult>;
+export {};
+//# sourceMappingURL=benchmark.d.ts.map

package/dest/bench/client_flows/benchmark.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/benchmark.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACZ,aAAa,EACb,MAAM,EACN,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,oBAAoB,EAAkC,MAAM,sBAAsB,CAAC;AACjG,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAM1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAI/D,QAAA,MAAM,QAAQ,oFAAqF,CAAC;AACpG,KAAK,QAAQ,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1C,MAAM,MAAM,GAAG,GAAG;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,QAAA,MAAM,UAAU,gKAYN,CAAC;AAEX,KAAK,QAAQ,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5C,KAAK,eAAe,GAAG;KACpB,CAAC,IAAI,QAAQ,GAAG,MAAM;CACxB,CAAC;AAEF,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,IAAI,CAAa;IAEzB,OAAO;IAEP,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,WAAW;IAIlB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAiBpC,OAAO,CAAC,SAAS;IAIV,SAAS;IAIT,OAAO;CAGf;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE3C,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,IAAI,GAAG,IAAI,CAAC,oBAAoB,EAAE,cAAc,GAAG,WAAW,CAAC,GAAG;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC1C,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,IAAI,CAAC,cAAc,GAAG,iBAAiB,EAAE,aAAa,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACtF,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAsCF,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,cAAc,GAAG,iBAAiB,EAC3C,qBAAqB,EAAE,oBAAoB,EAAE,EAC7C,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,mBAAmB,CAsDrB;AAED,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,mBAAmB,GAAG,2BAA2B,EAAE,CA6CzG;AAED,wBAAsB,cAAc,CAClC,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,sDAoCvB"}

package/dest/bench/client_flows/benchmark.js

@@ -0,0 +1,240 @@
+import { createLogger } from '@aztec/foundation/log';
+import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
+import assert from 'node:assert';
+import { mkdir, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+const logger = createLogger('bench:profile_capture');
+const logLevel = [
+    'silent',
+    'fatal',
+    'error',
+    'warn',
+    'info',
+    'verbose',
+    'debug',
+    'trace'
+];
+const GATE_TYPES = [
+    'ecc_op',
+    'busread',
+    'lookup',
+    'pub_inputs',
+    'arithmetic',
+    'delta_range',
+    'elliptic',
+    'aux',
+    'poseidon2_external',
+    'poseidon2_internal',
+    'overflow'
+];
+export class ProxyLogger {
+    static instance;
+    logs = [];
+    constructor(){}
+    static create() {
+        ProxyLogger.instance = new ProxyLogger();
+    }
+    static getInstance() {
+        return ProxyLogger.instance;
+    }
+    createLogger(prefix) {
+        return new Proxy(createLogger(prefix), {
+            get: (target, prop)=>{
+                if (logLevel.includes(prop)) {
+                    return function(...data) {
+                        const loggingFn = prop;
+                        const args = [
+                            loggingFn,
+                            prefix,
+                            ...data
+                        ];
+                        ProxyLogger.getInstance().handleLog(...args);
+                        target[loggingFn].call(this, ...[
+                            data[0],
+                            data[1]
+                        ]);
+                    };
+                } else {
+                    return target[prop];
+                }
+            }
+        });
+    }
+    handleLog(type, prefix, message, data) {
+        this.logs.unshift({
+            type,
+            prefix,
+            message,
+            data,
+            timestamp: Date.now()
+        });
+    }
+    flushLogs() {
+        this.logs = [];
+    }
+    getLogs() {
+        return this.logs;
+    }
+}
+function getMinimumTrace(logs) {
+    const minimumMessage = 'Minimum required block sizes for structured trace';
+    const minimumMessageIndex = logs.findIndex((log)=>log.message.includes(minimumMessage));
+    const candidateLogs = logs.slice(minimumMessageIndex - GATE_TYPES.length, minimumMessageIndex + 5);
+    const traceLogs = candidateLogs.filter((log)=>GATE_TYPES.some((type)=>log.message.includes(type))).map((log)=>log.message.split(/\t|\n/)).flat().map((log)=>log.replace(/\(mem: .*\)/, '').trim()).filter(Boolean);
+    const traceSizes = traceLogs.map((log)=>{
+        const [gateType, gateSizeStr] = log.replace(/\n.*\)$/, '').replace(/bb - /, '').split(':').map((s)=>s.trim());
+        const gateSize = parseInt(gateSizeStr);
+        assert(GATE_TYPES.includes(gateType), `Gate type ${gateType} is not recognized`);
+        return {
+            [gateType]: gateSize
+        };
+    });
+    assert(traceSizes.length === GATE_TYPES.length, 'Decoded trace sizes do not match expected amount of gate types');
+    return traceSizes.reduce((acc, curr)=>({
+            ...acc,
+            ...curr
+        }), {});
+}
+function getMaxMemory(logs) {
+    const candidateLogs = logs.slice(0, 100).filter((log)=>/\(mem: .*MiB\)/.test(log.message));
+    const usage = candidateLogs.map((log)=>{
+        const memStr = log ? log.message.slice(log.message.indexOf('(mem: ') + 6, log.message.indexOf('MiB') - 3) : '';
+        return memStr ? parseInt(memStr) : 0;
+    });
+    return Math.max(...usage);
+}
+export function generateBenchmark(flow, logs, timings, privateExecutionSteps, proverType, error) {
+    let maxMemory = 0;
+    let minimumTrace;
+    try {
+        minimumTrace = getMinimumTrace(logs);
+        maxMemory = getMaxMemory(logs);
+    } catch  {
+        logger.warn(`Failed obtain minimum trace and max memory for ${flow}. Did you run with REAL_PROOFS=1?`);
+    }
+    const steps = privateExecutionSteps.reduce((acc, step, i)=>{
+        const previousAccGateCount = i === 0 ? 0 : acc[i - 1].accGateCount;
+        return [
+            ...acc,
+            {
+                functionName: step.functionName,
+                gateCount: step.gateCount,
+                accGateCount: previousAccGateCount + step.gateCount,
+                time: step.timings.witgen,
+                oracles: Object.entries(step.timings.oracles ?? {}).reduce((acc, [oracleName, oracleData])=>{
+                    const total = oracleData.times.reduce((sum, time)=>sum + time, 0);
+                    const calls = oracleData.times.length;
+                    acc[oracleName] = {
+                        calls,
+                        max: Math.max(...oracleData.times),
+                        min: Math.min(...oracleData.times),
+                        total,
+                        avg: total / calls
+                    };
+                    return acc;
+                }, {})
+            }
+        ];
+    }, []);
+    const totalGateCount = steps[steps.length - 1].accGateCount;
+    return {
+        name: flow,
+        timings: {
+            total: timings.total,
+            sync: timings.sync,
+            proving: timings.proving,
+            unaccounted: timings.unaccounted,
+            witgen: timings.perFunction.reduce((acc, fn)=>acc + fn.time, 0)
+        },
+        maxMemory,
+        proverType,
+        minimumTrace: minimumTrace,
+        totalGateCount: totalGateCount,
+        steps,
+        error
+    };
+}
+export function convertProfileToGHBenchmark(benchmark) {
+    const benches = [
+        {
+            name: `${benchmark.name}/witgen`,
+            value: benchmark.timings.witgen,
+            unit: 'ms'
+        },
+        {
+            name: `${benchmark.name}/total`,
+            value: benchmark.timings.total,
+            unit: 'ms'
+        },
+        {
+            name: `${benchmark.name}/sync`,
+            value: benchmark.timings.sync,
+            unit: 'ms'
+        },
+        {
+            name: `${benchmark.name}/unaccounted`,
+            value: benchmark.timings.unaccounted,
+            unit: 'ms'
+        },
+        {
+            name: `${benchmark.name}/total_gate_count`,
+            value: benchmark.totalGateCount,
+            unit: 'gates'
+        }
+    ];
+    if (benchmark.timings.proving) {
+        benches.push({
+            name: `${benchmark.name}/proving`,
+            value: benchmark.timings.proving,
+            unit: 'ms'
+        });
+    }
+    if (benchmark.maxMemory) {
+        benches.push({
+            name: `${benchmark.name}/max_memory`,
+            value: benchmark.maxMemory,
+            unit: 'MiB'
+        });
+    }
+    return benches;
+}
+export async function captureProfile(label, interaction, opts, expectedSteps) {
+    // Make sure the proxy logger starts from a clean slate
+    ProxyLogger.getInstance().flushLogs();
+    const result = await interaction.profile({
+        ...opts,
+        profileMode: 'full',
+        skipProofGeneration: false
+    });
+    const logs = ProxyLogger.getInstance().getLogs();
+    if (expectedSteps !== undefined && result.executionSteps.length !== expectedSteps) {
+        throw new Error(`Expected ${expectedSteps} execution steps, got ${result.executionSteps.length}`);
+    }
+    const benchmark = generateBenchmark(label, logs, result.timings, result.executionSteps, 'wasm', undefined);
+    const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
+    if (ivcFolder) {
+        logger.info(`Capturing client ivc execution profile for ${label}`);
+        const resultsDirectory = join(ivcFolder, label);
+        logger.info(`Writing private execution steps to ${resultsDirectory}`);
+        await mkdir(resultsDirectory, {
+            recursive: true
+        });
+        // Write the client IVC files read by the prover.
+        const ivcInputsPath = join(resultsDirectory, 'ivc-inputs.msgpack');
+        await writeFile(ivcInputsPath, serializePrivateExecutionSteps(result.executionSteps));
+        await writeFile(join(resultsDirectory, 'logs.json'), JSON.stringify(logs, null, 2));
+        await writeFile(join(resultsDirectory, 'benchmark.json'), JSON.stringify(benchmark, null, 2));
+        logger.info(`Wrote private execution steps to ${resultsDirectory}`);
+    }
+    const benchOutput = process.env.BENCH_OUTPUT;
+    if (benchOutput) {
+        await mkdir(benchOutput, {
+            recursive: true
+        });
+        const ghBenchmark = convertProfileToGHBenchmark(benchmark);
+        const benchFile = join(benchOutput, `${label}.bench.json`);
+        await writeFile(benchFile, JSON.stringify(ghBenchmark));
+        logger.info(`Wrote benchmark to ${benchFile}`);
+    }
+    return result;
+}

package/dest/bench/client_flows/client_flows_benchmark.d.ts

@@ -1,4 +1,4 @@
-import { type AccountWallet, AztecAddress, type AztecNode, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, type FeePaymentMethod, type Logger, type PXE, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, type Wallet } from '@aztec/aztec.js';
+import { type AccountWallet, AccountWalletWithSecretKey, AztecAddress, type AztecNode, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, type FeePaymentMethod, type Logger, type PXE, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, type Wallet } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
 import { type DeployL1ContractsArgs } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
@@ -37,18 +37,20 @@ export declare class ClientFlowsBenchmark {
     liquidityToken: TokenContract;
     sponsoredFPC: SponsoredFPCContract;
     userPXE: PXE;
+    realProofs: boolean;
     paymentMethods: Record<BenchmarkingFeePaymentMethod, {
         forWallet: FeePaymentMethodGetter;
         circuits: number;
     }>;
     config: ClientFlowsConfig;
+    private proxyLogger;
     constructor(testName?: string, setupOptions?: Partial<SetupOptions & DeployL1ContractsArgs>);
     setup(): Promise<this>;
     teardown(): Promise<void>;
     mintAndBridgeFeeJuice(address: AztecAddress, amount: bigint): Promise<void>;
     /** Admin mints bananaCoin tokens privately to the target address and redeems them. */
     mintPrivateBananas(amount: bigint, address: AztecAddress): Promise<void>;
-    createBenchmarkingAccountManager(type: 'ecdsar1' | 'schnorr'): Promise<import("@aztec/aztec.js").AccountManager>;
+    createBenchmarkingAccountManager(pxe: PXE, type: 'ecdsar1' | 'schnorr'): Promise<import("@aztec/aztec.js").AccountManager>;
     applyBaseSnapshots(): Promise<void>;
     applyInitialAccountsSnapshot(): Promise<void>;
     applySetupFeeJuiceSnapshot(): Promise<void>;
@@ -57,7 +59,7 @@ export declare class ClientFlowsBenchmark {
     applyFPCSetupSnapshot(): Promise<void>;
     applyDeploySponsoredFPCSnapshot(): Promise<void>;
     createCrossChainTestHarness(owner: AccountWallet): Promise<CrossChainTestHarness>;
-    createAndFundBenchmarkingWallet(accountType: AccountType): Promise<import("@aztec/aztec.js").AccountWalletWithSecretKey>;
+    createAndFundBenchmarkingWallet(accountType: AccountType): Promise<AccountWalletWithSecretKey>;
     applyDeployAmmSnapshot(): Promise<void>;
     getBridgedFeeJuicePaymentMethodForWallet(wallet: Wallet): Promise<FeeJuicePaymentMethodWithClaim>;
     getPrivateFPCPaymentMethodForWallet(wallet: Wallet): Promise<PrivateFeePaymentMethod>;

package/dest/bench/client_flows/client_flows_benchmark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client_flows_benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/client_flows_benchmark.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client_flows_benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/client_flows_benchmark.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,aAAa,EAClB,0BAA0B,EAC1B,YAAY,EACZ,KAAK,SAAS,EACd,qBAAqB,EACrB,8BAA8B,EAC9B,KAAK,gBAAgB,EACrB,KAAK,MAAM,EACX,KAAK,GAAG,EACR,uBAAuB,EACvB,yBAAyB,EACzB,KAAK,MAAM,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,KAAK,qBAAqB,EAA4D,MAAM,iBAAiB,CAAC;AACvH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAI3D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,IAAI,UAAU,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO5F,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,KAAK,iBAAiB,EAAuC,MAAM,aAAa,CAAC;AAI1F,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC;AAChD,MAAM,MAAM,sBAAsB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACnF,MAAM,MAAM,4BAA4B,GAAG,mBAAmB,GAAG,aAAa,GAAG,eAAe,GAAG,WAAW,CAAC;AAE/G,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,eAAe,CAAmB;IAEnC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IACtB,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,iBAAiB,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,yBAAyB,EAAG,sBAAsB,CAAC;IAGnD,WAAW,EAAG,aAAa,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAG5B,gBAAgB,EAAG,YAAY,CAAC;IAChC,QAAQ,EAAG,UAAU,CAAC;IAGtB,gBAAgB,EAAG,gBAAgB,CAAC;IAEpC,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,EAAG,WAAW,CAAC;IAExB,YAAY,EAAG,aAAa,CAAC;IAE7B,GAAG,EAAG,WAAW,CAAC;IAElB,cAAc,EAAG,aAAa,CAAC;IAE/B,YAAY,EAAG,oBAAoB,CAAC;IAGpC,OAAO,EAAG,GAAG,CAAC;IAEd,UAAU,UAAyD;IAEnE,cAAc,EAAE,MAAM,CAAC,4BAA4B,EAAE;QAAE,SAAS,EAAE,sBAAsB,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CA0BhH;IAEG,MAAM,EAAE,iBAAiB,CAAC;IAEjC,OAAO,CAAC,WAAW,CAAc;gBAErB,QAAQ,CAAC,EAAE,MAAM,EAAE,YAAY,GAAE,OAAO,CAAC,YAAY,GAAG,qBAAqB,CAAM;IAazF,KAAK;IAUL,QAAQ;IAKR,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAMjE,sFAAsF;IAChF,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY;IASxD,gCAAgC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS;IAmB/D,kBAAkB;IAKzB,4BAA4B;IAsC5B,0BAA0B;IAqB1B,8BAA8B;IAgB9B,gCAAgC;IAgBzB,qBAAqB;IAwB5B,+BAA+B;IAcxB,2BAA2B,CAAC,KAAK,EAAE,aAAa;IAwBhD,+BAA+B,CAAC,WAAW,EAAE,WAAW;IAyBxD,sBAAsB;IA0BtB,wCAAwC,CAAC,MAAM,EAAE,MAAM;IAQ7D,mCAAmC,CAAC,MAAM,EAAE,MAAM;IAIlD,qCAAqC,CAAC,OAAO,EAAE,MAAM;IAIrD,iCAAiC,CAAC,MAAM,EAAE,MAAM;CAGxD"}

package/dest/bench/client_flows/client_flows_benchmark.js

@@ -1,6 +1,6 @@
 import { EcdsaRAccountContractArtifact, getEcdsaRAccount } from '@aztec/accounts/ecdsa';
 import { SchnorrAccountContractArtifact, getSchnorrAccount, getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, createLogger } from '@aztec/aztec.js';
+import { AccountWalletWithSecretKey, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, createLogger } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
 import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
 import { RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
@@ -25,6 +25,7 @@ import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
 import { setupSponsoredFPC } from '../../fixtures/utils.js';
 import { CrossChainTestHarness } from '../../shared/cross_chain_test_harness.js';
 import { FeeJuicePortalTestingHarnessFactory } from '../../shared/gas_portal_test_harness.js';
+import { ProxyLogger } from './benchmark.js';
 import { FULL_FLOWS_CONFIG, KEY_FLOWS_CONFIG } from './config.js';
 const { E2E_DATA_PATH: dataPath, BENCHMARK_CONFIG } = process.env;
 export class ClientFlowsBenchmark {
@@ -57,6 +58,10 @@ export class ClientFlowsBenchmark {
     sponsoredFPC;
     // PXE used by the benchmarking user. It can be set up with client-side proving enabled
     userPXE;
+    realProofs = [
+        'true',
+        '1'
+    ].includes(process.env.REAL_PROOFS ?? '');
     paymentMethods = {
         // eslint-disable-next-line camelcase
         bridged_fee_juice: {
@@ -83,6 +88,7 @@ export class ClientFlowsBenchmark {
         }
     };
     config;
+    proxyLogger;
     constructor(testName, setupOptions = {}){
         this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
         this.snapshotManager = createSnapshotManager(`bench_client_flows${testName ? `/${testName}` : ''}`, dataPath, {
@@ -92,6 +98,8 @@ export class ClientFlowsBenchmark {
             ...setupOptions
         });
         this.config = BENCHMARK_CONFIG === 'key_flows' ? KEY_FLOWS_CONFIG : FULL_FLOWS_CONFIG;
+        ProxyLogger.create();
+        this.proxyLogger = ProxyLogger.getInstance();
     }
     async setup() {
         const context = await this.snapshotManager.setup();
@@ -118,17 +126,17 @@ export class ClientFlowsBenchmark {
         const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate();
         expect(balanceAfter).toEqual(balanceBefore + amount);
     }
-    async createBenchmarkingAccountManager(type) {
+    async createBenchmarkingAccountManager(pxe, type) {
         const benchysSecretKey = Fr.random();
         const salt = Fr.random();
         let benchysPrivateSigningKey;
         let benchysAccountManager;
         if (type === 'schnorr') {
             benchysPrivateSigningKey = deriveSigningKey(benchysSecretKey);
-            benchysAccountManager = await getSchnorrAccount(this.userPXE, benchysSecretKey, benchysPrivateSigningKey, salt);
+            benchysAccountManager = await getSchnorrAccount(pxe, benchysSecretKey, benchysPrivateSigningKey, salt);
         } else if (type === 'ecdsar1') {
             benchysPrivateSigningKey = randomBytes(32);
-            benchysAccountManager = await getEcdsaRAccount(this.userPXE, benchysSecretKey, benchysPrivateSigningKey, salt);
+            benchysAccountManager = await getEcdsaRAccount(pxe, benchysSecretKey, benchysPrivateSigningKey, salt);
         } else {
             throw new Error(`Unknown account type: ${type}`);
         }
@@ -155,13 +163,14 @@ export class ClientFlowsBenchmark {
             const l1Contracts = await aztecNode.getL1ContractAddresses();
             const userPXEConfigWithContracts = {
                 ...userPXEConfig,
-                proverEnabled: [
-                    'true',
-                    '1'
-                ].includes(process.env.REAL_PROOFS ?? ''),
+                proverEnabled: this.realProofs,
                 l1Contracts
             };
-            this.userPXE = await createPXEService(this.aztecNode, userPXEConfigWithContracts, 'pxe-user');
+            this.userPXE = await createPXEService(this.aztecNode, userPXEConfigWithContracts, {
+                loggers: {
+                    prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied')
+                }
+            });
         });
     }
     async applySetupFeeJuiceSnapshot() {
@@ -239,7 +248,7 @@ export class ClientFlowsBenchmark {
         return crossChainTestHarness;
     }
     async createAndFundBenchmarkingWallet(accountType) {
-        const benchysAccountManager = await this.createBenchmarkingAccountManager(accountType);
+        const benchysAccountManager = await this.createBenchmarkingAccountManager(this.pxe, accountType);
         const benchysWallet = await benchysAccountManager.getWallet();
         const benchysAddress = benchysAccountManager.getAddress();
         const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(FEE_FUNDING_FOR_TESTER_ACCOUNT, benchysAddress);
@@ -249,13 +258,14 @@ export class ClientFlowsBenchmark {
                 paymentMethod
             }
         }).wait();
-        // Register benchy on admin's PXE so we can check its balances
-        await this.pxe.registerContract({
+        // Register benchy on the user's PXE, where we're going to be interacting from
+        await this.userPXE.registerContract({
             instance: benchysAccountManager.getInstance(),
             artifact: accountType === 'ecdsar1' ? EcdsaRAccountContractArtifact : SchnorrAccountContractArtifact
         });
-        await this.pxe.registerAccount(benchysWallet.getSecretKey(), benchysWallet.getCompleteAddress().partialAddress);
-        return benchysWallet;
+        await this.userPXE.registerAccount(benchysWallet.getSecretKey(), benchysWallet.getCompleteAddress().partialAddress);
+        const entrypoint = await benchysAccountManager.getAccount();
+        return new AccountWalletWithSecretKey(this.userPXE, entrypoint, benchysWallet.getSecretKey(), benchysAccountManager.salt);
     }
     async applyDeployAmmSnapshot() {
         await this.snapshotManager.snapshot('deploy_amm', async ()=>{

package/dest/bench/client_flows/data_extractor.d.ts

@@ -1,23 +1,2 @@
-import type { Logger } from '@aztec/aztec.js';
-declare const logLevel: readonly ["silent", "fatal", "error", "warn", "info", "verbose", "debug", "trace"];
-type LogLevel = (typeof logLevel)[number];
-type Log = {
-    type: LogLevel;
-    timestamp: number;
-    prefix: string;
-    message: string;
-    data: any;
-};
-export declare class ProxyLogger {
-    private static instance;
-    private logs;
-    private constructor();
-    static create(): void;
-    static getInstance(): ProxyLogger;
-    createLogger(prefix: string): Logger;
-    private handleLog;
-    flushLogs(): void;
-    getLogs(): Log[];
-}
 export {};
 //# sourceMappingURL=data_extractor.d.ts.map

package/dest/bench/client_flows/data_extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data_extractor.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/data_extractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAa9C,QAAA,MAAM,QAAQ,oFAAqF,CAAC;AACpG,KAAK,QAAQ,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1C,KAAK,GAAG,GAAG;IACT,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAEhB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAsBF,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,IAAI,CAAa;IAEzB,OAAO;IAEP,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,WAAW;IAIlB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAiBpC,OAAO,CAAC,SAAS;IAIV,SAAS;IAIT,OAAO;CAGf"}
+{"version":3,"file":"data_extractor.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/data_extractor.ts"],"names":[],"mappings":""}

package/dest/bench/client_flows/data_extractor.js

@@ -4,81 +4,9 @@ import { createLogger, logger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { WASMSimulator } from '@aztec/simulator/client';
 import { Decoder } from 'msgpackr';
-import assert from 'node:assert';
 import { readFile, readdir, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
-const logLevel = [
-    'silent',
-    'fatal',
-    'error',
-    'warn',
-    'info',
-    'verbose',
-    'debug',
-    'trace'
-];
-const GATE_TYPES = [
-    'ecc_op',
-    'busread',
-    'lookup',
-    'pub_inputs',
-    'arithmetic',
-    'delta_range',
-    'elliptic',
-    'aux',
-    'poseidon2_external',
-    'poseidon2_internal',
-    'overflow'
-];
-export class ProxyLogger {
-    static instance;
-    logs = [];
-    constructor(){}
-    static create() {
-        ProxyLogger.instance = new ProxyLogger();
-    }
-    static getInstance() {
-        return ProxyLogger.instance;
-    }
-    createLogger(prefix) {
-        return new Proxy(createLogger(prefix), {
-            get: (target, prop)=>{
-                if (logLevel.includes(prop)) {
-                    return function(...data) {
-                        const loggingFn = prop;
-                        const args = [
-                            loggingFn,
-                            prefix,
-                            ...data
-                        ];
-                        ProxyLogger.getInstance().handleLog(...args);
-                        target[loggingFn].call(this, ...[
-                            data[0],
-                            data[1]
-                        ]);
-                    };
-                } else {
-                    return target[prop];
-                }
-            }
-        });
-    }
-    handleLog(type, prefix, message, data) {
-        this.logs.unshift({
-            type,
-            prefix,
-            message,
-            data,
-            timestamp: Date.now()
-        });
-    }
-    flushLogs() {
-        this.logs = [];
-    }
-    getLogs() {
-        return this.logs;
-    }
-}
+import { ProxyLogger, generateBenchmark } from './benchmark.js';
 async function createProver(config = {}, log) {
     const simulationProvider = new WASMSimulator();
     if (!config.bbBinaryPath || !config.bbWorkingDirectory) {
@@ -97,25 +25,6 @@ async function createProver(config = {}, log) {
         };
     }
 }
-function getMinimumTrace(logs) {
-    const minimumMessage = 'Trace details:';
-    const minimumMessageIndex = logs.findIndex((log)=>log.message.includes(minimumMessage));
-    const candidateLogs = logs.slice(minimumMessageIndex - GATE_TYPES.length, minimumMessageIndex);
-    const traceLogs = candidateLogs.filter((log)=>GATE_TYPES.some((type)=>log.message.includes(type))).map((log)=>log.message.split(/\t|\n/)).flat().map((log)=>log.replace(/\(mem: .*\)/, '').trim()).filter(Boolean);
-    const traceSizes = traceLogs.map((log)=>{
-        const [gateType, gateSizeStr] = log.replace(/\n.*\)$/, '').replace(/bb - /, '').split(':').map((s)=>s.trim());
-        const gateSize = parseInt(gateSizeStr);
-        assert(GATE_TYPES.includes(gateType), `Gate type ${gateType} is not recognized`);
-        return {
-            [gateType]: gateSize
-        };
-    });
-    assert(traceSizes.length === GATE_TYPES.length, 'Decoded trace sizes do not match expected amount of gate types');
-    return traceSizes.reduce((acc, curr)=>({
-            ...acc,
-            ...curr
-        }), {});
-}
 async function main() {
     ProxyLogger.create();
     const proxyLogger = ProxyLogger.getInstance();
@@ -146,7 +55,7 @@ async function main() {
         const profileFile = await readFile(join(ivcFolder, flow, 'profile.json'));
         const profile = JSON.parse(profileFile.toString());
         const privateExecutionSteps = profile.steps.map((step, i)=>({
-                functionName: step.fnName,
+                functionName: step.functionName,
                 gateCount: step.gateCount,
                 bytecode: stepsFromFile[i].bytecode,
                 // TODO(AD) do we still want to take this from witness.json?
@@ -157,7 +66,6 @@ async function main() {
                     gateCount: step.timings.witgen
                 }
             }));
-        let stats;
         let error;
         let currentLogs = [];
         let provingTime;
@@ -172,35 +80,10 @@ async function main() {
         // Extract logs from this run from the proxy and write them to disk unconditionally
         currentLogs = proxyLogger.getLogs();
         await writeFile(join(ivcFolder, flow, 'logs.json'), JSON.stringify(currentLogs, null, 2));
-        if (!error) {
-            stats = currentLogs[0].data;
+        if (!profile.timings.proving) {
+            profile.timings.proving = provingTime;
         }
-        const minimumTrace = getMinimumTrace(currentLogs);
-        const steps = profile.steps.reduce((acc, step, i)=>{
-            const previousAccGateCount = i === 0 ? 0 : acc[i - 1].accGateCount;
-            return [
-                ...acc,
-                {
-                    fnName: step.fnName,
-                    gateCount: step.gateCount,
-                    accGateCount: previousAccGateCount + step.gateCount,
-                    timings: {
-                        witgen: step.timings.witgen
-                    }
-                }
-            ];
-        }, []);
-        const totalGateCount = steps[steps.length - 1].accGateCount;
-        const benchmark = {
-            syncTime: profile.syncTime,
-            provingTime,
-            proverType,
-            minimumTrace: minimumTrace,
-            totalGateCount,
-            stats,
-            steps,
-            error
-        };
+        const benchmark = generateBenchmark(flow, currentLogs, profile.timings, privateExecutionSteps, proverType, error);
         await writeFile(join(ivcFolder, flow, 'benchmark.json'), JSON.stringify(benchmark, null, 2));
         proxyLogger.flushLogs();
     }