@aztec/end-to-end 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/bench/client_flows/client_flows_benchmark.js

@@ -0,0 +1,315 @@
+import { EcdsaRAccountContractArtifact, getEcdsaRAccount } from '@aztec/accounts/ecdsa';
+import { SchnorrAccountContractArtifact, getSchnorrAccount, getSchnorrWallet } from '@aztec/accounts/schnorr';
+import { AccountWalletWithSecretKey, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, createLogger } from '@aztec/aztec.js';
+import { CheatCodes } from '@aztec/aztec/testing';
+import { RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
+import { ChainMonitor } from '@aztec/ethereum/test';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
+import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode';
+import { AMMContract } from '@aztec/noir-contracts.js/AMM';
+import { FPCContract } from '@aztec/noir-contracts.js/FPC';
+import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
+import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
+import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contracts.js/Token';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
+import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { MNEMONIC } from '../../fixtures/fixtures.js';
+import { createSnapshotManager, deployAccounts } from '../../fixtures/snapshot_manager.js';
+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 {
+    snapshotManager;
+    logger;
+    pxe;
+    aztecNode;
+    cheatCodes;
+    context;
+    chainMonitor;
+    feeJuiceBridgeTestHarness;
+    // The admin that aids in the setup of the test
+    adminWallet;
+    adminAddress;
+    // Aztec Node config
+    sequencerAddress;
+    coinbase;
+    // Contracts
+    feeJuiceContract;
+    // Asset in which fees are paid via FPC
+    bananaCoin;
+    bananaFPC;
+    // Random asset we want to trade
+    candyBarCoin;
+    // AMM contract
+    amm;
+    // Liquidity token for AMM
+    liquidityToken;
+    // Sponsored FPC contract
+    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: {
+            forWallet: this.getBridgedFeeJuicePaymentMethodForWallet.bind(this),
+            circuits: 2
+        },
+        // eslint-disable-next-line camelcase
+        private_fpc: {
+            forWallet: this.getPrivateFPCPaymentMethodForWallet.bind(this),
+            circuits: 2 + // FPC entrypoint + kernel inner
+            2 + // BananaCoin transfer_to_public + kernel inner
+            2 + // Account verify_private_authwit + kernel inner
+            2
+        },
+        // eslint-disable-next-line camelcase
+        sponsored_fpc: {
+            forWallet: this.getSponsoredFPCPaymentMethodForWallet.bind(this),
+            circuits: 2
+        },
+        // eslint-disable-next-line camelcase
+        fee_juice: {
+            forWallet: this.getFeeJuicePaymentMethodForWallet.bind(this),
+            circuits: 0
+        }
+    };
+    config;
+    proxyLogger;
+    constructor(testName, setupOptions = {}){
+        this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
+        this.snapshotManager = createSnapshotManager(`bench_client_flows${testName ? `/${testName}` : ''}`, dataPath, {
+            startProverNode: true,
+            ...setupOptions
+        }, {
+            ...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();
+        await context.aztecNode.setConfig({
+            feeRecipient: this.sequencerAddress,
+            coinbase: this.coinbase
+        });
+        const rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
+        this.chainMonitor = new ChainMonitor(rollupContract, context.dateProvider, this.logger, 200).start();
+        return this;
+    }
+    async teardown() {
+        await this.chainMonitor.stop();
+        await this.snapshotManager.teardown();
+    }
+    async mintAndBridgeFeeJuice(address) {
+        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(address);
+        const { claimSecret: secret, messageLeafIndex: index } = claim;
+        await this.feeJuiceContract.methods.claim(address, claim.claimAmount, secret, index).send({
+            from: this.adminAddress
+        }).wait();
+    }
+    /** Admin mints bananaCoin tokens privately to the target address and redeems them. */ async mintPrivateBananas(amount, address) {
+        const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate({
+            from: this.adminAddress
+        });
+        await mintTokensToPrivate(this.bananaCoin, this.adminAddress, this.adminWallet, address, amount);
+        const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate({
+            from: this.adminAddress
+        });
+        expect(balanceAfter).toEqual(balanceBefore + amount);
+    }
+    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(pxe, benchysSecretKey, benchysPrivateSigningKey, salt);
+        } else if (type === 'ecdsar1') {
+            benchysPrivateSigningKey = randomBytes(32);
+            benchysAccountManager = await getEcdsaRAccount(pxe, benchysSecretKey, benchysPrivateSigningKey, salt);
+        } else {
+            throw new Error(`Unknown account type: ${type}`);
+        }
+        await benchysAccountManager.register();
+        return benchysAccountManager;
+    }
+    async applyBaseSnapshots() {
+        await this.applyInitialAccountsSnapshot();
+        await this.applySetupFeeJuiceSnapshot();
+    }
+    async applyInitialAccountsSnapshot() {
+        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(2, this.logger), async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig })=>{
+            this.pxe = pxe;
+            this.aztecNode = aztecNode;
+            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+            const deployedWallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
+            [this.adminWallet] = deployedWallets;
+            this.adminAddress = this.adminWallet.getAddress();
+            this.sequencerAddress = deployedWallets[1].getAddress();
+            const canonicalFeeJuice = await getCanonicalFeeJuice();
+            this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
+            this.coinbase = EthAddress.random();
+            const userPXEConfig = getPXEServiceConfig();
+            const l1Contracts = await aztecNode.getL1ContractAddresses();
+            const userPXEConfigWithContracts = {
+                ...userPXEConfig,
+                proverEnabled: this.realProofs,
+                l1Contracts
+            };
+            this.userPXE = await createPXEService(this.aztecNode, userPXEConfigWithContracts, {
+                loggers: {
+                    prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied')
+                }
+            });
+        });
+    }
+    async applySetupFeeJuiceSnapshot() {
+        await this.snapshotManager.snapshot('setup_fee_juice', async ()=>{}, async (_data, context)=>{
+            this.context = context;
+            this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
+            this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
+                aztecNode: context.aztecNode,
+                aztecNodeAdmin: context.aztecNode,
+                pxeService: context.pxe,
+                l1Client: context.deployL1ContractsValues.l1Client,
+                wallet: this.adminWallet,
+                logger: this.logger
+            });
+        });
+    }
+    async applyDeployBananaTokenSnapshot() {
+        await this.snapshotManager.snapshot('deploy_banana_token', async ()=>{
+            const bananaCoin = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n).send({
+                from: this.adminAddress
+            }).deployed();
+            this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
+            return {
+                bananaCoinAddress: bananaCoin.address
+            };
+        }, async ({ bananaCoinAddress })=>{
+            this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.adminWallet);
+        });
+    }
+    async applyDeployCandyBarTokenSnapshot() {
+        await this.snapshotManager.snapshot('deploy_candy_bar_token', async ()=>{
+            const candyBarCoin = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n).send({
+                from: this.adminAddress
+            }).deployed();
+            this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
+            return {
+                candyBarCoinAddress: candyBarCoin.address
+            };
+        }, async ({ candyBarCoinAddress })=>{
+            this.candyBarCoin = await TokenContract.at(candyBarCoinAddress, this.adminWallet);
+        });
+    }
+    async applyFPCSetupSnapshot() {
+        await this.snapshotManager.snapshot('fpc_setup', async (context)=>{
+            const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
+            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+            const bananaCoin = this.bananaCoin;
+            const bananaFPC = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress).send({
+                from: this.adminAddress
+            }).deployed();
+            this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
+            await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.adminAddress);
+            return {
+                bananaFPCAddress: bananaFPC.address
+            };
+        }, async (data)=>{
+            this.bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.adminWallet);
+        });
+    }
+    async applyDeploySponsoredFPCSnapshot() {
+        await this.snapshotManager.snapshot('deploy_sponsored_fpc', async ()=>{
+            const sponsoredFPC = await setupSponsoredFPC(this.pxe);
+            this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
+            return {
+                sponsoredFPCAddress: sponsoredFPC.address
+            };
+        }, async ({ sponsoredFPCAddress })=>{
+            this.sponsoredFPC = await SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
+        });
+    }
+    async createCrossChainTestHarness(owner) {
+        const l1Client = createExtendedL1Client(this.context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+        const underlyingERC20Address = await deployL1Contract(l1Client, TestERC20Abi, TestERC20Bytecode, [
+            'Underlying',
+            'UND',
+            l1Client.account.address
+        ]).then(({ address })=>address);
+        this.logger.verbose(`Setting up cross chain harness...`);
+        const crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.pxe, l1Client, owner, owner.getAddress(), this.logger, underlyingERC20Address);
+        this.logger.verbose(`L2 token deployed to: ${crossChainTestHarness.l2Token.address}`);
+        return crossChainTestHarness;
+    }
+    async createAndFundBenchmarkingWallet(accountType) {
+        const benchysAccountManager = await this.createBenchmarkingAccountManager(this.pxe, accountType);
+        const benchysWallet = await benchysAccountManager.getWallet();
+        const benchysAddress = benchysAccountManager.getAddress();
+        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
+        const paymentMethod = new FeeJuicePaymentMethodWithClaim(benchysWallet, claim);
+        await benchysAccountManager.deploy({
+            fee: {
+                paymentMethod
+            }
+        }).wait();
+        // 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.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 ()=>{
+            const liquidityToken = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n).send({
+                from: this.adminAddress
+            }).deployed();
+            const amm = await AMMContract.deploy(this.adminWallet, this.bananaCoin.address, this.candyBarCoin.address, liquidityToken.address).send({
+                from: this.adminAddress
+            }).deployed();
+            this.logger.info(`AMM deployed at ${amm.address}`);
+            await liquidityToken.methods.set_minter(amm.address, true).send({
+                from: this.adminAddress
+            }).wait();
+            return {
+                ammAddress: amm.address,
+                liquidityTokenAddress: liquidityToken.address
+            };
+        }, async ({ ammAddress, liquidityTokenAddress })=>{
+            this.liquidityToken = await TokenContract.at(liquidityTokenAddress, this.adminWallet);
+            this.amm = await AMMContract.at(ammAddress, this.adminWallet);
+        });
+    }
+    async getBridgedFeeJuicePaymentMethodForWallet(wallet) {
+        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(wallet.getAddress());
+        return new FeeJuicePaymentMethodWithClaim(wallet, claim);
+    }
+    getPrivateFPCPaymentMethodForWallet(wallet) {
+        return Promise.resolve(new PrivateFeePaymentMethod(this.bananaFPC.address, wallet));
+    }
+    getSponsoredFPCPaymentMethodForWallet(_wallet) {
+        return Promise.resolve(new SponsoredFeePaymentMethod(this.sponsoredFPC.address));
+    }
+    getFeeJuicePaymentMethodForWallet(wallet) {
+        return Promise.resolve(new FeeJuicePaymentMethod(wallet.getAddress()));
+    }
+}

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

@@ -0,0 +1,14 @@
+import type { AccountType, BenchmarkingFeePaymentMethod } from './client_flows_benchmark.js';
+export type ClientFlowConfig = {
+    accounts: AccountType[];
+    feePaymentMethods: BenchmarkingFeePaymentMethod[];
+    recursions?: number[];
+};
+type ClientFlows = 'accountDeployments' | 'deployments' | 'transfers' | 'bridging' | 'amm';
+export type ClientFlowsConfig = {
+    [key in ClientFlows]: ClientFlowConfig;
+};
+export declare const KEY_FLOWS_CONFIG: ClientFlowsConfig;
+export declare const FULL_FLOWS_CONFIG: ClientFlowsConfig;
+export {};
+//# sourceMappingURL=config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAE7F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,iBAAiB,EAAE,4BAA4B,EAAE,CAAC;IAClD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,KAAK,WAAW,GAAG,oBAAoB,GAAG,aAAa,GAAG,WAAW,GAAG,UAAU,GAAG,KAAK,CAAC;AAE3F,MAAM,MAAM,iBAAiB,GAAG;KAC7B,GAAG,IAAI,WAAW,GAAG,gBAAgB;CACvC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,iBAsB9B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,iBAsB/B,CAAC"}

package/dest/bench/client_flows/config.js

@@ -0,0 +1,106 @@
+export const KEY_FLOWS_CONFIG = {
+    accountDeployments: {
+        accounts: [
+            'ecdsar1',
+            'schnorr'
+        ],
+        feePaymentMethods: [
+            'sponsored_fpc'
+        ]
+    },
+    deployments: {
+        accounts: [
+            'ecdsar1',
+            'schnorr'
+        ],
+        feePaymentMethods: [
+            'sponsored_fpc'
+        ]
+    },
+    amm: {
+        accounts: [
+            'ecdsar1'
+        ],
+        feePaymentMethods: [
+            'sponsored_fpc'
+        ]
+    },
+    bridging: {
+        accounts: [
+            'ecdsar1'
+        ],
+        feePaymentMethods: [
+            'sponsored_fpc'
+        ]
+    },
+    transfers: {
+        accounts: [
+            'ecdsar1'
+        ],
+        feePaymentMethods: [
+            'sponsored_fpc',
+            'private_fpc'
+        ],
+        recursions: [
+            0,
+            1
+        ]
+    }
+};
+export const FULL_FLOWS_CONFIG = {
+    accountDeployments: {
+        accounts: [
+            'ecdsar1',
+            'schnorr'
+        ],
+        feePaymentMethods: [
+            'bridged_fee_juice',
+            'sponsored_fpc'
+        ]
+    },
+    deployments: {
+        accounts: [
+            'ecdsar1',
+            'schnorr'
+        ],
+        feePaymentMethods: [
+            'bridged_fee_juice',
+            'sponsored_fpc'
+        ]
+    },
+    amm: {
+        accounts: [
+            'ecdsar1',
+            'schnorr'
+        ],
+        feePaymentMethods: [
+            'sponsored_fpc',
+            'private_fpc'
+        ]
+    },
+    bridging: {
+        accounts: [
+            'ecdsar1',
+            'schnorr'
+        ],
+        feePaymentMethods: [
+            'sponsored_fpc',
+            'private_fpc'
+        ]
+    },
+    transfers: {
+        accounts: [
+            'ecdsar1',
+            'schnorr'
+        ],
+        feePaymentMethods: [
+            'sponsored_fpc',
+            'private_fpc'
+        ],
+        recursions: [
+            0,
+            1,
+            2
+        ]
+    }
+};

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data_extractor.d.ts.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,99 @@
+import { BBNativePrivateKernelProver } from '@aztec/bb-prover/client/native';
+import { BBWASMBundlePrivateKernelProver } from '@aztec/bb-prover/client/wasm/bundle';
+import { createLogger, logger } from '@aztec/foundation/log';
+import { Timer } from '@aztec/foundation/timer';
+import { WASMSimulator } from '@aztec/simulator/client';
+import { Decoder } from 'msgpackr';
+import { readFile, readdir, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { ProxyLogger, generateBenchmark } from './benchmark.js';
+async function createProver(config = {}, log) {
+    const simulator = new WASMSimulator();
+    if (!config.bbBinaryPath || !config.bbWorkingDirectory) {
+        return {
+            prover: new BBWASMBundlePrivateKernelProver(simulator, 16, log),
+            type: 'wasm'
+        };
+    } else {
+        const bbConfig = config;
+        return {
+            prover: await BBNativePrivateKernelProver.new({
+                bbSkipCleanup: false,
+                numConcurrentIVCVerifiers: 1,
+                bbIVCConcurrency: 1,
+                ...bbConfig
+            }, simulator, log),
+            type: 'native'
+        };
+    }
+}
+async function main() {
+    ProxyLogger.create();
+    const proxyLogger = ProxyLogger.getInstance();
+    const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
+    if (!ivcFolder) {
+        throw new Error('CAPTURE_IVC_FOLDER is not set');
+    }
+    const flows = await readdir(ivcFolder);
+    logger.info(`Flows in ${ivcFolder}: \n${flows.map((flowName)=>`\t- ${flowName}`).join('\n')}`);
+    const { prover, type: proverType } = await createProver({
+        bbBinaryPath: process.env.BB_BINARY_PATH,
+        bbWorkingDirectory: process.env.BB_WORKING_DIRECTORY
+    }, proxyLogger.createLogger('bb:prover'));
+    const userLog = createLogger('client_ivc_flows:data_processor');
+    for (const flow of flows){
+        userLog.info(`Processing flow ${flow}`);
+        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])=>[
+                    Number(k),
+                    v
+                ]));
+        });
+        const profileFile = await readFile(join(ivcFolder, flow, 'profile.json'));
+        const profile = JSON.parse(profileFile.toString());
+        const privateExecutionSteps = profile.steps.map((step, i)=>({
+                functionName: step.functionName,
+                gateCount: step.gateCount,
+                bytecode: stepsFromFile[i].bytecode,
+                // TODO(AD) do we still want to take this from witness.json?
+                witness: witnessStack[i],
+                vk: stepsFromFile[i].vk,
+                timings: {
+                    witgen: step.timings.witgen,
+                    gateCount: step.timings.gateCount
+                }
+            }));
+        let error;
+        let currentLogs = [];
+        let provingTime;
+        try {
+            const provingTimer = new Timer();
+            await prover.createClientIvcProof(privateExecutionSteps);
+            provingTime = provingTimer.ms();
+        } catch (e) {
+            userLog.error(`Failed to generate client ivc proof for ${flow}`, e);
+            error = e.message;
+        }
+        // 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 (!profile.stats.timings.proving) {
+            profile.stats.timings.proving = provingTime;
+        }
+        const benchmark = generateBenchmark(flow, currentLogs, profile.stats, privateExecutionSteps, proverType, error);
+        await writeFile(join(ivcFolder, flow, 'benchmark.json'), JSON.stringify(benchmark, null, 2));
+        proxyLogger.flushLogs();
+    }
+}
+try {
+    await main();
+} catch (e) {
+    // eslint-disable-next-line no-console
+    console.error(e);
+    process.exit(1);
+}

package/dest/bench/utils.d.ts

@@ -1,5 +1,5 @@
-import { type AztecNode, BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js';
-import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking';
+import { type AztecNode, type SentTx, type WaitOpts } from '@aztec/aztec.js';
+import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
 import { type PXEService } from '@aztec/pxe/server';
 import type { MetricsType } from '@aztec/telemetry-client';
 import type { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
@@ -23,30 +23,13 @@ type MetricFilter = {
     name: string;
     unit?: string;
 };
-/**
- * Creates and returns a directory with the current job name and a random number.
- * @param index - Index to merge into the dir path.
- * @returns A path to a created dir.
- */
-export declare function makeDataDirectory(index: number): string;
-/**
- * Returns the size in disk of a folder.
- * @param path - Path to the folder.
- * @returns Size in bytes.
- */
-export declare function getFolderSize(path: string): number;
-/**
- * Returns a call to the benchmark contract. Each call has a private execution (account entrypoint),
- * a nested private call (create_note), a public call (increment_balance), and a nested public
- * call (broadcast). These include emitting one private note and one public log, two storage
- * reads and one write.
- * @param index - Index of the call within a block.
- * @param context - End to end context.
- * @param contract - Benchmarking contract.
- * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
- * @returns A BatchCall instance.
- */
-export declare function makeCall(index: number, context: EndToEndContext, contract: BenchmarkingContract, heavyPublicCompute: boolean): Promise<BatchCall>;
+export type GithubActionBenchmarkResult = {
+    name: string;
+    value: number;
+    range?: string;
+    unit: string;
+    extra?: string;
+};
 /**
  * Assembles and sends multiple transactions simultaneously to the node in context.
  * Each tx is the result of calling makeCall.
@@ -65,6 +48,6 @@ export declare function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitO
  * @param startingBlock - First l2 block to process.
  * @returns The new PXE.
  */
-export declare function createNewPXE(node: AztecNode, contract: BenchmarkingContract, startingBlock?: number): Promise<PXEService>;
+export declare function createNewPXE(node: AztecNode, contract: BenchmarkingContract): Promise<PXEService>;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/dest/bench/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,SAAS,EAAwB,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG9G,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAOxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAoBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AA0CF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,UAK9C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKlD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,EAAE,OAAO,sBAc5B;AAED;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,oBAAoB,EAC9B,aAAa,GAAE,MAA6B,GAC3C,OAAO,CAAC,UAAU,CAAC,CAerB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAKxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GA0BF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AA6DF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiBvG"}