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

package/dest/{e2e_prover → fixtures}/e2e_prover_test.js

@@ -1,20 +1,21 @@
-import { SchnorrAccountContractArtifact, getSchnorrAccount, getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
 import { createArchiver } from '@aztec/archiver';
-import { EthAddress, createLogger, deployL1Contract } from '@aztec/aztec.js';
-import { BBCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { createLogger } from '@aztec/aztec.js/log';
+import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { HonkVerifierAbi, HonkVerifierBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
+import { SecretValue } from '@aztec/foundation/config';
+import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { createProverNode } from '@aztec/prover-node';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { getContract } from 'viem';
 import { privateKeyToAddress } from 'viem/accounts';
-import { getACVMConfig } from '../fixtures/get_acvm_config.js';
-import { getBBConfig } from '../fixtures/get_bb_config.js';
-import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
-import { getPrivateKeyFromIndex, setupPXEService } from '../fixtures/utils.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
+import { getACVMConfig } from './get_acvm_config.js';
+import { getBBConfig } from './get_bb_config.js';
+import { createSnapshotManager, deployAccounts, publicDeployAccounts } from './snapshot_manager.js';
+import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEAndGetWallet } from './utils.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 /**
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
@@ -29,20 +30,21 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     static TOKEN_DECIMALS = 18n;
     snapshotManager;
     logger;
-    deployedAccounts;
-    wallets;
+    wallet;
+    provenWallet;
     accounts;
+    deployedAccounts;
     fakeProofsAsset;
     tokenSim;
     aztecNode;
-    pxe;
+    aztecNodeAdmin;
     cheatCodes;
     blobSink;
     provenComponents;
     bbConfigCleanup;
     acvmConfigCleanup;
     circuitProofVerifier;
-    provenAssets;
+    provenAsset;
     context;
     proverNode;
     simulatedProverNode;
@@ -51,47 +53,50 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
         this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
         this.realProofs = realProofs;
-        this.deployedAccounts = [];
-        this.wallets = [];
         this.accounts = [];
         this.provenComponents = [];
-        this.provenAssets = [];
         this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
         this.logger = createLogger(`e2e:full_prover_test:${testName}`);
         this.snapshotManager = createSnapshotManager(`full_prover_integration/${testName}`, dataPath, {
             startProverNode: true,
             fundRewardDistributor: true,
             coinbase
-        }, {});
+        }, {
+            realVerifier: realProofs
+        });
     }
     /**
    * Adds two state shifts to snapshot manager.
    * 1. Add 2 accounts.
    * 2. Publicly deploy accounts, deploy token contract
    */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('2_accounts', deployAccounts(2, this.logger), async ({ deployedAccounts }, { pxe })=>{
+        await this.snapshotManager.snapshot('2_accounts', deployAccounts(2, this.logger), ({ deployedAccounts }, { wallet })=>{
             this.deployedAccounts = deployedAccounts;
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWalletWithSecretKey(pxe, a.secret, a.signingKey, a.salt)));
-            this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
-            this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
+            this.accounts = deployedAccounts.map((a)=>a.address);
+            this.wallet = wallet;
+            return Promise.resolve();
         });
         await this.snapshotManager.snapshot('client_prover_integration', async ()=>{
             // Create the token contract state.
             // Move this account thing to addAccounts above?
             this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 2), false);
+            await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
             this.logger.verbose(`Deploying TokenContract...`);
-            const asset = await TokenContract.deploy(this.wallets[0], this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send().deployed();
+            const asset = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
+                from: this.accounts[0]
+            }).deployed();
             this.logger.verbose(`Token deployed to ${asset.address}`);
             return {
                 tokenContractAddress: asset.address
             };
         }, async ({ tokenContractAddress })=>{
             // Restore the token contract state.
-            this.fakeProofsAsset = await TokenContract.at(tokenContractAddress, this.wallets[0]);
+            this.fakeProofsAsset = await TokenContract.at(tokenContractAddress, this.wallet);
             this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
-            this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
-            expect(await this.fakeProofsAsset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());
+            this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
+            expect(await this.fakeProofsAsset.methods.get_admin().simulate({
+                from: this.accounts[0]
+            })).toBe(this.accounts[0].toBigInt());
         });
     }
     async setup() {
@@ -99,7 +104,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         // We don't wish to mark as proven automatically, so we set the flag to false
         this.context.watcher.setIsMarkingAsProven(false);
         this.simulatedProverNode = this.context.proverNode;
-        ({ pxe: this.pxe, aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes, blobSink: this.blobSink } = this.context);
+        ({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes, blobSink: this.blobSink } = this.context);
+        this.aztecNodeAdmin = this.context.aztecNode;
         const blobSinkClient = createBlobSinkClient({
             blobSinkUrl: `http://localhost:${this.blobSink.port}`
         });
@@ -119,16 +125,17 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             if (!bbConfig?.bbWorkingDirectory || !bbConfig?.bbBinaryPath) {
                 throw new Error(`Test must be run with BB native configuration`);
             }
-            this.circuitProofVerifier = await BBCircuitVerifier.new(bbConfig);
+            const verifier = await BBCircuitVerifier.new(bbConfig);
+            this.circuitProofVerifier = new QueuedIVCVerifier(bbConfig, verifier);
             this.logger.debug(`Configuring the node for real proofs...`);
-            await this.aztecNode.setConfig({
+            await this.aztecNodeAdmin.setConfig({
                 realProofs: true,
                 minTxsPerBlock: this.minNumberOfTxsPerBlock
             });
         } else {
             this.logger.debug(`Configuring the node min txs per block ${this.minNumberOfTxsPerBlock}...`);
             this.circuitProofVerifier = new TestCircuitVerifier();
-            await this.aztecNode.setConfig({
+            await this.aztecNodeAdmin.setConfig({
                 minTxsPerBlock: this.minNumberOfTxsPerBlock
             });
         }
@@ -137,31 +144,24 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         this.logger.verbose(`Marking current block as proven`);
         await this.context.cheatCodes.rollup.markAsProven();
         this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
+        const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, {
+            proverEnabled: this.realProofs,
+            bbBinaryPath: bbConfig?.bbBinaryPath,
+            bbWorkingDirectory: bbConfig?.bbWorkingDirectory
+        }, undefined, true);
+        this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
+        await provenWallet.registerContract(this.fakeProofsAsset);
         for(let i = 0; i < 2; i++){
-            const result = await setupPXEService(this.aztecNode, {
-                proverEnabled: this.realProofs,
-                bbBinaryPath: bbConfig?.bbBinaryPath,
-                bbWorkingDirectory: bbConfig?.bbWorkingDirectory
-            }, undefined, true);
-            this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
-            await result.pxe.registerContract(this.fakeProofsAsset);
-            for(let i = 0; i < 2; i++){
-                await result.pxe.registerAccount(this.deployedAccounts[i].secret, this.wallets[i].getCompleteAddress().partialAddress);
-                await this.pxe.registerAccount(this.deployedAccounts[i].secret, this.wallets[i].getCompleteAddress().partialAddress);
-            }
-            const account = await getSchnorrAccount(result.pxe, this.deployedAccounts[0].secret, this.deployedAccounts[0].signingKey, this.deployedAccounts[0].salt);
-            await result.pxe.registerContract({
-                instance: account.getInstance(),
-                artifact: SchnorrAccountContractArtifact
-            });
-            const provenWallet = await account.getWallet();
-            const asset = await TokenContract.at(this.fakeProofsAsset.address, provenWallet);
-            this.provenComponents.push({
-                pxe: result.pxe,
-                teardown: result.teardown
-            });
-            this.provenAssets.push(asset);
+            await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
+            await this.wallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
         }
+        const asset = await TokenContract.at(this.fakeProofsAsset.address, provenWallet);
+        this.provenComponents.push({
+            wallet: provenWallet,
+            teardown: provenTeardown
+        });
+        this.provenAsset = asset;
+        this.provenWallet = provenWallet;
         this.logger.info(`Full prover PXE started`);
         // Shutdown the current, simulated prover node
         this.logger.verbose('Shutting down simulated prover node');
@@ -171,7 +171,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         const archiver = await createArchiver({
             ...this.context.aztecNodeConfig,
             dataDirectory: undefined
-        }, blobSinkClient, {
+        }, {
+            blobSinkClient
+        }, {
             blockUntilSync: true
         });
         // The simulated prover node (now shutdown) used private key index 2
@@ -179,24 +181,30 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         const proverNodeSenderAddress = privateKeyToAddress(new Buffer32(proverNodePrivateKey).toString());
         this.proverAddress = EthAddress.fromString(proverNodeSenderAddress);
         this.logger.verbose(`Funding prover node at ${proverNodeSenderAddress}`);
-        await this.mintL1ERC20(proverNodeSenderAddress, 100_000_000n);
+        await this.mintFeeJuice(proverNodeSenderAddress);
         this.logger.verbose('Starting prover node');
         const proverConfig = {
             ...this.context.aztecNodeConfig,
-            proverCoordinationNodeUrl: undefined,
+            txCollectionNodeRpcUrls: [],
             dataDirectory: undefined,
-            proverId: this.proverAddress.toField(),
+            proverId: this.proverAddress,
             realProofs: this.realProofs,
             proverAgentCount: 2,
-            publisherPrivateKey: `0x${proverNodePrivateKey.toString('hex')}`,
+            publisherPrivateKeys: [
+                new SecretValue(`0x${proverNodePrivateKey.toString('hex')}`)
+            ],
             proverNodeMaxPendingJobs: 100,
             proverNodeMaxParallelBlocksPerEpoch: 32,
             proverNodePollingIntervalMs: 100,
-            txGatheringTimeoutMs: 60000,
             txGatheringIntervalMs: 1000,
-            txGatheringMaxParallelRequests: 100
+            txGatheringBatchSize: 10,
+            txGatheringMaxParallelRequestsPerNode: 100,
+            txGatheringTimeoutMs: 24_000,
+            proverNodeFailedEpochStore: undefined,
+            proverNodeEpochProvingDelayMs: undefined
         };
-        const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address));
+        const sponsoredFPCAddress = await getSponsoredFPCAddress();
+        const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));
         this.proverNode = await createProverNode(proverConfig, {
             aztecNodeTxProvider: this.aztecNode,
             archiver: archiver,
@@ -204,23 +212,23 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }, {
             prefilledPublicData
         });
-        this.proverNode.start();
+        await this.proverNode.start();
         this.logger.warn(`Proofs are now enabled`);
         return this;
     }
-    async mintL1ERC20(recipient, amount) {
-        const erc20Address = this.context.deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress;
-        const client = this.context.deployL1ContractsValues.walletClient;
-        const erc20 = getContract({
-            abi: TestERC20Abi,
-            address: erc20Address.toString(),
+    async mintFeeJuice(recipient) {
+        const handlerAddress = this.context.deployL1ContractsValues.l1ContractAddresses.feeAssetHandlerAddress;
+        this.logger.verbose(`Minting fee juice to ${recipient} using handler at ${handlerAddress}`);
+        const client = this.context.deployL1ContractsValues.l1Client;
+        const handler = getContract({
+            abi: FeeAssetHandlerAbi,
+            address: handlerAddress.toString(),
             client
         });
-        const hash = await erc20.write.mint([
-            recipient,
-            amount
+        const hash = await handler.write.mint([
+            recipient
         ]);
-        await this.context.deployL1ContractsValues.publicClient.waitForTransactionReceipt({
+        await this.context.deployL1ContractsValues.l1Client.waitForTransactionReceipt({
             hash
         });
     }
@@ -241,51 +249,38 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             const { fakeProofsAsset: asset, accounts } = this;
             const privateAmount = 10000n;
             const publicAmount = 10000n;
-            const waitOpts = {
-                proven: false
-            };
             this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
-            await asset.methods.mint_to_public(accounts[0].address, privateAmount + publicAmount).send().wait(waitOpts);
+            await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({
+                from: accounts[0]
+            }).wait();
             this.logger.verbose(`Transferring ${privateAmount} to private...`);
-            await asset.methods.transfer_to_private(accounts[0].address, privateAmount).send().wait(waitOpts);
+            await asset.methods.transfer_to_private(accounts[0], privateAmount).send({
+                from: accounts[0]
+            }).wait();
             this.logger.verbose(`Minting complete.`);
             return {
                 amount: publicAmount
             };
         }, async ({ amount })=>{
-            const { fakeProofsAsset: asset, accounts: [{ address }], tokenSim } = this;
+            const { fakeProofsAsset: asset, accounts: [address], tokenSim } = this;
             tokenSim.mintPublic(address, amount);
-            const publicBalance = await asset.methods.balance_of_public(address).simulate();
+            const publicBalance = await asset.methods.balance_of_public(address).simulate({
+                from: address
+            });
             this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
             expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
             tokenSim.mintPrivate(address, amount);
-            const privateBalance = await asset.methods.balance_of_private(address).simulate();
+            const privateBalance = await asset.methods.balance_of_private(address).simulate({
+                from: address
+            });
             this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
             expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
-            const totalSupply = await asset.methods.total_supply().simulate();
+            const totalSupply = await asset.methods.total_supply().simulate({
+                from: address
+            });
             this.logger.verbose(`Total supply: ${totalSupply}`);
             expect(totalSupply).toEqual(tokenSim.totalSupply);
             return Promise.resolve();
         });
     }
-    async deployVerifier() {
-        if (!this.realProofs) {
-            return;
-        }
-        if (!this.circuitProofVerifier) {
-            throw new Error('No verifier');
-        }
-        const { walletClient, publicClient, l1ContractAddresses } = this.context.deployL1ContractsValues;
-        const rollup = getContract({
-            abi: RollupAbi,
-            address: l1ContractAddresses.rollupAddress.toString(),
-            client: walletClient
-        });
-        const { address: verifierAddress } = await deployL1Contract(walletClient, publicClient, HonkVerifierAbi, HonkVerifierBytecode);
-        this.logger.info(`Deployed honk verifier at ${verifierAddress}`);
-        await rollup.write.setEpochVerifier([
-            verifierAddress.toString()
-        ]);
-        this.logger.info('Rollup only accepts valid proofs now');
-    }
 }

package/dest/fixtures/fixtures.d.ts

@@ -1,13 +1,12 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 export declare const METRICS_PORT = 4318;
 export declare const shouldCollectMetrics: () => 4318 | undefined;
 export declare const TEST_PEER_CHECK_INTERVAL_MS = 1000;
+export declare const TEST_MAX_TX_POOL_SIZE: number;
 export declare const MNEMONIC = "test test test test test test test test test test test junk";
-export declare const privateKey: Buffer;
-export declare const privateKey2: Buffer;
-export declare const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow 'self - other'";
-export declare const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'self + other'";
+export declare const privateKey: Buffer<ArrayBuffer>;
+export declare const privateKey2: Buffer<ArrayBuffer>;
+export declare const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow";
+export declare const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow";
 export declare const BITSIZE_TOO_BIG_ERROR = "Assertion failed: call to assert_max_bit_size 'self.__assert_max_bit_size'";
 export declare const DUPLICATE_NULLIFIER_ERROR: RegExp;
 export declare const NO_L1_TO_L2_MSG_ERROR: RegExp;

package/dest/fixtures/fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":";;AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAEhD,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,QAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,QAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,uEAAuE,CAAC;AACzG,eAAO,MAAM,mBAAmB,kEAAkE,CAAC;AACnG,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAA6D,CAAC;AACpG,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAC+B,CAAC;AACjF,eAAO,MAAM,8BAA8B,QAAkE,CAAC;AAE9G,eAAO,MAAM,sBAAsB,SAAS,CAAC"}
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,eAAO,MAAM,qBAAqB,QAAyB,CAAC;AAE5D,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,qBAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,qBAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,wDAAwD,CAAC;AAC1F,eAAO,MAAM,mBAAmB,mDAAmD,CAAC;AACpF,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AACvE,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAC+B,CAAC;AACjF,eAAO,MAAM,8BAA8B,QAAkE,CAAC;AAE9G,eAAO,MAAM,sBAAsB,SAAS,CAAC"}

package/dest/fixtures/fixtures.js

@@ -6,15 +6,16 @@ export const shouldCollectMetrics = ()=>{
     return undefined;
 };
 export const TEST_PEER_CHECK_INTERVAL_MS = 1000;
+export const TEST_MAX_TX_POOL_SIZE = 2 * 1024 * 1024 * 1024; // 2GB
 export const MNEMONIC = 'test test test test test test test test test test test junk';
 export const privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex');
 export const privateKey2 = Buffer.from('59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex');
 /// Common errors
-export const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow 'self - other'";
-export const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'self + other'";
+export const U128_UNDERFLOW_ERROR = 'Assertion failed: attempt to subtract with overflow';
+export const U128_OVERFLOW_ERROR = 'Assertion failed: attempt to add with overflow';
 export const BITSIZE_TOO_BIG_ERROR = "Assertion failed: call to assert_max_bit_size 'self.__assert_max_bit_size'";
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/5818): Make these a fixed error after transition.
-export const DUPLICATE_NULLIFIER_ERROR = /dropped|duplicate nullifier|reverted|Nullifier collision/;
+export const DUPLICATE_NULLIFIER_ERROR = /dropped|nullifier|reverted/i;
 export const NO_L1_TO_L2_MSG_ERROR = /No non-nullified L1 to L2 message found for message hash|Tried to consume nonexistent L1-to-L2 message/;
 export const STATIC_CALL_STATE_MODIFICATION_ERROR = /Static call cannot update the state, emit L2->L1 messages or generate logs.*/;
 export const STATIC_CONTEXT_ASSERTION_ERROR = /Assertion failed: Function .* can only be called statically.*/;

package/dest/fixtures/get_acvm_config.d.ts

@@ -1,4 +1,4 @@
-import type { Logger } from '@aztec/aztec.js';
+import type { Logger } from '@aztec/aztec.js/log';
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 export declare function getACVMConfig(logger: Logger): Promise<{
     acvmWorkingDirectory: string;

package/dest/fixtures/get_acvm_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_acvm_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_acvm_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAM9C,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;AAWnG,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CACxD;IACE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,GACD,SAAS,CACZ,CAkCA"}
+{"version":3,"file":"get_acvm_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_acvm_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAOlD,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;AAWnG,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CACxD;IACE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,GACD,SAAS,CACZ,CAyBA"}

package/dest/fixtures/get_acvm_config.js

@@ -1,5 +1,6 @@
 import { parseBooleanEnv } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
+import { tryRmDir } from '@aztec/foundation/fs';
 import { promises as fs } from 'fs';
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 const { NOIR_RELEASE_DIR = 'noir-repo/target/release', TEMP_DIR = '/tmp', ACVM_BINARY_PATH = '', ACVM_WORKING_DIRECTORY = '', ACVM_FORCE_WASM = '' } = process.env;
@@ -18,20 +19,7 @@ export async function getACVMConfig(logger) {
         });
         logger.verbose(`Using native ACVM binary at ${acvmBinaryPath} with working directory ${acvmWorkingDirectory}`);
         const directoryToCleanup = ACVM_WORKING_DIRECTORY ? undefined : tempWorkingDirectory;
-        const cleanup = async ()=>{
-            if (directoryToCleanup) {
-                try {
-                    logger.info(`Cleaning up ACVM temp directory ${directoryToCleanup}`);
-                    await fs.rm(directoryToCleanup, {
-                        recursive: true,
-                        force: true,
-                        maxRetries: 3
-                    });
-                } catch (err) {
-                    logger.warn(`Failed to delete ACVM temp directory at ${directoryToCleanup}: ${err}`);
-                }
-            }
-        };
+        const cleanup = ()=>tryRmDir(directoryToCleanup, logger);
         return {
             acvmWorkingDirectory,
             acvmBinaryPath,

package/dest/fixtures/get_bb_config.d.ts

@@ -1,4 +1,4 @@
-import { type Logger } from '@aztec/aztec.js';
+import type { Logger } from '@aztec/aztec.js/log';
 import type { BBConfig } from '@aztec/bb-prover';
 export declare const getBBConfig: (logger: Logger) => Promise<(BBConfig & {
     cleanup: () => Promise<void>;

package/dest/fixtures/get_bb_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_bb_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_bb_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAcjD,eAAO,MAAM,WAAW,WACd,MAAM,KACb,QAAQ,CAAC,QAAQ,GAAG;IAAE,OAAO,EAAE,MAAM,QAAQ,IAAI,CAAC,CAAA;CAAE,CAAC,GAAG,SAAS,CAoCnE,CAAC"}
+{"version":3,"file":"get_bb_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_bb_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAkBjD,eAAO,MAAM,WAAW,GACtB,QAAQ,MAAM,KACb,OAAO,CAAC,CAAC,QAAQ,GAAG;IAAE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,GAAG,SAAS,CAqCnE,CAAC"}

package/dest/fixtures/get_bb_config.js

@@ -1,11 +1,12 @@
-import { fileURLToPath } from '@aztec/aztec.js';
+import { tryRmDir } from '@aztec/foundation/fs';
 import fs from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'path';
-const { BB_RELEASE_DIR = 'barretenberg/cpp/build/bin', BB_BINARY_PATH, BB_SKIP_CLEANUP = '', TEMP_DIR = tmpdir(), BB_WORKING_DIRECTORY = '' } = process.env;
+import { fileURLToPath } from 'url';
+const { BB_RELEASE_DIR = 'barretenberg/cpp/build/bin', BB_BINARY_PATH, BB_SKIP_CLEANUP = '', TEMP_DIR = tmpdir(), BB_WORKING_DIRECTORY = '', BB_NUM_IVC_VERIFIERS = '1', BB_IVC_CONCURRENCY = '1' } = process.env;
 export const getBBConfig = async (logger)=>{
     try {
-        const bbBinaryPath = BB_BINARY_PATH ?? path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../', BB_RELEASE_DIR, 'bb');
+        const bbBinaryPath = BB_BINARY_PATH ?? path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../', BB_RELEASE_DIR, 'bb-avm');
         await fs.access(bbBinaryPath, fs.constants.R_OK);
         let bbWorkingDirectory;
         let directoryToCleanup;
@@ -22,24 +23,16 @@ export const getBBConfig = async (logger)=>{
             '1',
             'true'
         ].includes(BB_SKIP_CLEANUP);
-        const cleanup = async ()=>{
-            if (directoryToCleanup && !bbSkipCleanup) {
-                try {
-                    await fs.rm(directoryToCleanup, {
-                        recursive: true,
-                        force: true,
-                        maxRetries: 3
-                    });
-                } catch (err) {
-                    logger.warn(`Failed to delete bb working directory at ${directoryToCleanup}: ${err}`);
-                }
-            }
-        };
+        const cleanup = bbSkipCleanup ? ()=>Promise.resolve() : ()=>tryRmDir(directoryToCleanup);
+        const numIvcVerifiers = Number(BB_NUM_IVC_VERIFIERS);
+        const ivcConcurrency = Number(BB_IVC_CONCURRENCY);
         return {
             bbSkipCleanup,
             bbBinaryPath,
             bbWorkingDirectory,
-            cleanup
+            cleanup,
+            numConcurrentIVCVerifiers: numIvcVerifiers,
+            bbIVCConcurrency: ivcConcurrency
         };
     } catch (err) {
         logger.error(`Native BB not available, error: ${err}`);

package/dest/fixtures/l1_to_l2_messaging.d.ts

@@ -1,4 +1,4 @@
-import type { L1ContractAddresses, ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import { type ExtendedViemWalletClient, type L1ContractAddresses } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 export declare function sendL1ToL2Message(message: {
@@ -6,8 +6,11 @@ export declare function sendL1ToL2Message(message: {
     content: Fr;
     secretHash: Fr;
 }, ctx: {
-    walletClient: ViemWalletClient;
-    publicClient: ViemPublicClient;
-    l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress'>;
-}): Promise<Fr[]>;
+    l1Client: ExtendedViemWalletClient;
+    l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress' | 'rollupAddress'>;
+}): Promise<{
+    msgHash: Fr;
+    globalLeafIndex: Fr;
+    txReceipt: import("viem").TransactionReceipt;
+}>;
 //# sourceMappingURL=l1_to_l2_messaging.d.ts.map

package/dest/fixtures/l1_to_l2_messaging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_to_l2_messaging.d.ts","sourceRoot":"","sources":["../../src/fixtures/l1_to_l2_messaging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC/F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,SAAS,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAA;CAAE,EACjE,GAAG,EAAE;IACH,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;CAChE,iBAmCF"}
+{"version":3,"file":"l1_to_l2_messaging.d.ts","sourceRoot":"","sources":["../../src/fixtures/l1_to_l2_messaging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,mBAAmB,EAAkB,MAAM,iBAAiB,CAAC;AAC1G,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAMhE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,SAAS,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAA;CAAE,EACjE,GAAG,EAAE;IACH,QAAQ,EAAE,wBAAwB,CAAC;IACnC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,GAAG,eAAe,CAAC,CAAC;CAClF;;;;GAgEF"}

package/dest/fixtures/l1_to_l2_messaging.js

@@ -1,15 +1,18 @@
+import { RollupContract } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
+import { tryJsonStringify } from '@aztec/foundation/json-rpc';
 import { InboxAbi } from '@aztec/l1-artifacts';
-import { expect } from '@jest/globals';
 import { decodeEventLog, getContract } from 'viem';
+import { getLogger } from './utils.js';
 export async function sendL1ToL2Message(message, ctx) {
+    const logger = getLogger();
     const inbox = getContract({
         address: ctx.l1ContractAddresses.inboxAddress.toString(),
         abi: InboxAbi,
-        client: ctx.walletClient
+        client: ctx.l1Client
     });
     const { recipient, content, secretHash } = message;
-    const version = 1;
+    const version = await new RollupContract(ctx.l1Client, ctx.l1ContractAddresses.rollupAddress.toString()).getVersion();
     // We inject the message to Inbox
     const txHash = await inbox.write.sendL2Message([
         {
@@ -18,24 +21,47 @@ export async function sendL1ToL2Message(message, ctx) {
         },
         content.toString(),
         secretHash.toString()
-    ]);
+    ], {
+        gas: 1_000_000n
+    });
+    logger.info(`L1 to L2 message sent in tx ${txHash}`);
     // We check that the message was correctly injected by checking the emitted event
-    const txReceipt = await ctx.publicClient.waitForTransactionReceipt({
+    const txReceipt = await ctx.l1Client.waitForTransactionReceipt({
         hash: txHash
     });
-    // Exactly 1 event should be emitted in the transaction
-    expect(txReceipt.logs.length).toBe(1);
-    // We decode the event and get leaf out of it
-    const messageSentLog = txReceipt.logs[0];
-    const topics = decodeEventLog({
-        abi: InboxAbi,
-        data: messageSentLog.data,
-        topics: messageSentLog.topics
-    });
+    if (txReceipt.status !== 'success') {
+        throw new Error(`L1 to L2 message failed to be sent in tx ${txHash}. Status: ${txReceipt.status}`);
+    }
+    logger.info(`L1 to L2 message receipt retrieved for tx ${txReceipt.transactionHash}`, txReceipt);
+    if (txReceipt.transactionHash !== txHash) {
+        throw new Error(`Receipt transaction hash mismatch: ${txReceipt.transactionHash} !== ${txHash}`);
+    }
+    // Filter for MessageSent events from the Inbox contract by trying to decode each log
+    const messageSentLogs = txReceipt.logs.filter((log)=>log.address.toLowerCase() === ctx.l1ContractAddresses.inboxAddress.toString().toLowerCase()).map((log)=>{
+        try {
+            const decoded = decodeEventLog({
+                abi: InboxAbi,
+                data: log.data,
+                topics: log.topics
+            });
+            return {
+                log,
+                decoded
+            };
+        } catch  {
+            return null; // Not a decodable event from this ABI
+        }
+    }).filter((item)=>item !== null && item.decoded.eventName === 'MessageSent');
+    if (messageSentLogs.length !== 1) {
+        throw new Error(`Wrong number of MessageSent logs found in ${txHash} transaction (got ${messageSentLogs.length} expected 1)\n${tryJsonStringify(messageSentLogs.map((item)=>item.log))}`);
+    }
+    // We already have the decoded event
+    const topics = messageSentLogs[0].decoded;
     const receivedMsgHash = topics.args.hash;
     const receivedGlobalLeafIndex = topics.args.index;
-    return [
-        Fr.fromHexString(receivedMsgHash),
-        new Fr(receivedGlobalLeafIndex)
-    ];
+    return {
+        msgHash: Fr.fromHexString(receivedMsgHash),
+        globalLeafIndex: new Fr(receivedGlobalLeafIndex),
+        txReceipt
+    };
 }

package/dest/fixtures/setup_l1_contracts.d.ts

@@ -1,6 +1,6 @@
-import { type Logger } from '@aztec/aztec.js';
-import type { DeployL1ContractsArgs, L1ContractsConfig } from '@aztec/ethereum';
+import type { Logger } from '@aztec/aztec.js/log';
+import { type DeployL1ContractsArgs, type L1ContractsConfig } from '@aztec/ethereum';
 import type { HDAccount, PrivateKeyAccount } from 'viem';
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
-export declare const setupL1Contracts: (l1RpcUrl: string, account: HDAccount | PrivateKeyAccount, logger: Logger, args: Pick<DeployL1ContractsArgs, 'genesisArchiveRoot' | 'genesisBlockHash' | 'initialValidators'> & L1ContractsConfig) => Promise<import("@aztec/aztec.js").DeployL1ContractsReturnType>;
+export declare const setupL1Contracts: (l1RpcUrl: string, account: HDAccount | PrivateKeyAccount, logger: Logger, args: Pick<DeployL1ContractsArgs, "genesisArchiveRoot" | "initialValidators"> & L1ContractsConfig) => Promise<import("@aztec/ethereum").DeployL1ContractsReturnType>;
 //# sourceMappingURL=setup_l1_contracts.d.ts.map

package/dest/fixtures/setup_l1_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_l1_contracts.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_l1_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIhF,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAGzD,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;AAEnG,eAAO,MAAM,gBAAgB,aACjB,MAAM,WACP,SAAS,GAAG,iBAAiB,UAC9B,MAAM,QACR,KAAK,qBAAqB,EAAE,oBAAoB,GAAG,kBAAkB,GAAG,mBAAmB,CAAC,GAChG,iBAAiB,mEAWpB,CAAC"}
+{"version":3,"file":"setup_l1_contracts.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_l1_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,iBAAiB,EAAqB,MAAM,iBAAiB,CAAC;AAIxG,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAGzD,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;AAEnG,eAAO,MAAM,gBAAgB,GAC3B,UAAU,MAAM,EAChB,SAAS,SAAS,GAAG,iBAAiB,EACtC,QAAQ,MAAM,EACd,MAAM,IAAI,CAAC,qBAAqB,EAAE,oBAAoB,GAAG,mBAAmB,CAAC,GAAG,iBAAiB,mEAWlG,CAAC"}