@aztec/bb-prover 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/wasm/bb_wasm_private_kernel_prover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bb_wasm_private_kernel_prover.d.ts","sourceRoot":"","sources":["../../src/wasm/bb_wasm_private_kernel_prover.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAGlE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,8BAAsB,yBAA0B,SAAQ,qBAAqB;cAEtD,gBAAgB,EAAE,gBAAgB;cAClC,kBAAkB,EAAE,kBAAkB;IACzD,OAAO,CAAC,OAAO;cACI,GAAG;gBAHH,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,EAAE,kBAAkB,EACjD,OAAO,GAAE,MAAU,EACR,GAAG,yCAAiC;IAKnC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;CAkBjH"}
+{"version":3,"file":"bb_wasm_private_kernel_prover.d.ts","sourceRoot":"","sources":["../../src/wasm/bb_wasm_private_kernel_prover.ts"],"names":[],"mappings":";;AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,8BAAsB,yBAA0B,SAAQ,qBAAqB;cAEtD,gBAAgB,EAAE,gBAAgB;cAClC,kBAAkB,EAAE,kBAAkB;IACzD,OAAO,CAAC,OAAO;cACI,GAAG;gBAHH,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,EAAE,kBAAkB,EACjD,OAAO,GAAE,MAAU,EACR,GAAG,yCAAiC;IAKnC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAmB1F,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAY3G"}

package/dest/wasm/bb_wasm_private_kernel_prover.js

@@ -1,31 +1,46 @@
 import { AztecClientBackend } from '@aztec/bb.js';
-import { ClientIvcProof } from '@aztec/circuits.js';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
+import { ClientIvcProof } from '@aztec/stdlib/proofs';
 import { serializeWitness } from '@noir-lang/noirc_abi';
 import { ungzip } from 'pako';
 import { BBPrivateKernelProver } from '../prover/bb_private_kernel_prover.js';
 export class BBWASMPrivateKernelProver extends BBPrivateKernelProver {
-    constructor(artifactProvider, simulationProvider, threads = 1, log = createLogger('bb-prover:wasm')) {
-        super(artifactProvider, simulationProvider, log);
-        this.artifactProvider = artifactProvider;
-        this.simulationProvider = simulationProvider;
-        this.threads = threads;
-        this.log = log;
+    artifactProvider;
+    simulationProvider;
+    threads;
+    log;
+    constructor(artifactProvider, simulationProvider, threads = 1, log = createLogger('bb-prover:wasm')){
+        super(artifactProvider, simulationProvider, log), this.artifactProvider = artifactProvider, this.simulationProvider = simulationProvider, this.threads = threads, this.log = log;
     }
     async createClientIvcProof(acirs, witnessStack) {
         const timer = new Timer();
         this.log.info(`Generating ClientIVC proof...`);
-        const backend = new AztecClientBackend(acirs.map(acir => ungzip(acir)), { threads: this.threads });
-        const [proof, vk] = await backend.prove(witnessStack.map(witnessMap => ungzip(serializeWitness(witnessMap))));
+        const backend = new AztecClientBackend(acirs.map((acir)=>ungzip(acir)), {
+            threads: this.threads,
+            logger: this.log.verbose,
+            wasmPath: process.env.BB_WASM_PATH
+        });
+        const [proof, vk] = await backend.prove(witnessStack.map((witnessMap)=>ungzip(serializeWitness(witnessMap))));
         await backend.destroy();
         this.log.info(`Generated ClientIVC proof`, {
             eventName: 'client-ivc-proof-generation',
             duration: timer.ms(),
             proofSize: proof.length,
-            vkSize: vk.length,
+            vkSize: vk.length
         });
         return new ClientIvcProof(Buffer.from(proof), Buffer.from(vk));
     }
+    async computeGateCountForCircuit(_bytecode, _circuitName) {
+        const backend = new AztecClientBackend([
+            ungzip(_bytecode)
+        ], {
+            threads: this.threads,
+            logger: this.log.verbose,
+            wasmPath: process.env.BB_WASM_PATH
+        });
+        const gateCount = await backend.gates();
+        await backend.destroy();
+        return gateCount[0];
+    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmJfd2FzbV9wcml2YXRlX2tlcm5lbF9wcm92ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FzbS9iYl93YXNtX3ByaXZhdGVfa2VybmVsX3Byb3Zlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFJaEQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFeEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU5QixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUU5RSxNQUFNLE9BQWdCLHlCQUEwQixTQUFRLHFCQUFxQjtJQUMzRSxZQUNxQixnQkFBa0MsRUFDbEMsa0JBQXNDLEVBQ2pELFVBQWtCLENBQUMsRUFDUixNQUFNLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQztRQUV2RCxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFMOUIscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFrQjtRQUNsQyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ2pELFlBQU8sR0FBUCxPQUFPLENBQVk7UUFDUixRQUFHLEdBQUgsR0FBRyxDQUFpQztJQUd6RCxDQUFDO0lBRWUsS0FBSyxDQUFDLG9CQUFvQixDQUFDLEtBQWUsRUFBRSxZQUEwQjtRQUNwRixNQUFNLEtBQUssR0FBRyxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQzFCLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLCtCQUErQixDQUFDLENBQUM7UUFDL0MsTUFBTSxPQUFPLEdBQUcsSUFBSSxrQkFBa0IsQ0FDcEMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUMvQixFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQzFCLENBQUM7UUFFRixNQUFNLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlHLE1BQU0sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLDJCQUEyQixFQUFFO1lBQ3pDLFNBQVMsRUFBRSw2QkFBNkI7WUFDeEMsUUFBUSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDcEIsU0FBUyxFQUFFLEtBQUssQ0FBQyxNQUFNO1lBQ3ZCLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTTtTQUNsQixDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksY0FBYyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7Q0FDRiJ9

package/dest/wasm/bundle.d.ts

@@ -1,4 +1,4 @@
-import { type SimulationProvider } from '@aztec/simulator/client';
+import type { SimulationProvider } from '@aztec/simulator/client';
 import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
 export declare class BBWASMBundlePrivateKernelProver extends BBWASMPrivateKernelProver {
     constructor(simulationProvider: SimulationProvider, threads?: number, log?: import("@aztec/foundation/log").Logger);

package/dest/wasm/bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/wasm/bundle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,qBAAa,+BAAgC,SAAQ,yBAAyB;gBAChE,kBAAkB,EAAE,kBAAkB,EAAE,OAAO,SAAI,EAAE,GAAG,yCAAwC;CAG7G"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/wasm/bundle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,qBAAa,+BAAgC,SAAQ,yBAAyB;gBAChE,kBAAkB,EAAE,kBAAkB,EAAE,OAAO,SAAI,EAAE,GAAG,yCAAwC;CAG7G"}

package/dest/wasm/bundle.js

@@ -2,8 +2,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { BundleArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/bundle';
 import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
 export class BBWASMBundlePrivateKernelProver extends BBWASMPrivateKernelProver {
-    constructor(simulationProvider, threads = 1, log = createLogger('bb-prover:wasm:bundle')) {
+    constructor(simulationProvider, threads = 1, log = createLogger('bb-prover:wasm:bundle')){
         super(new BundleArtifactProvider(), simulationProvider, threads, log);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVuZGxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3dhc20vYnVuZGxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxtREFBbUQsQ0FBQztBQUczRixPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUUvRSxNQUFNLE9BQU8sK0JBQWdDLFNBQVEseUJBQXlCO0lBQzVFLFlBQVksa0JBQXNDLEVBQUUsT0FBTyxHQUFHLENBQUMsRUFBRSxHQUFHLEdBQUcsWUFBWSxDQUFDLHVCQUF1QixDQUFDO1FBQzFHLEtBQUssQ0FBQyxJQUFJLHNCQUFzQixFQUFFLEVBQUUsa0JBQWtCLEVBQUUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7Q0FDRiJ9

package/dest/wasm/lazy.d.ts

@@ -1,4 +1,4 @@
-import { type SimulationProvider } from '@aztec/simulator/client';
+import type { SimulationProvider } from '@aztec/simulator/client';
 import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
 export declare class BBWASMLazyPrivateKernelProver extends BBWASMPrivateKernelProver {
     constructor(simulationProvider: SimulationProvider, threads?: number, log?: import("@aztec/foundation/log").Logger);

package/dest/wasm/lazy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/wasm/lazy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,qBAAa,6BAA8B,SAAQ,yBAAyB;gBAC9D,kBAAkB,EAAE,kBAAkB,EAAE,OAAO,SAAI,EAAE,GAAG,yCAAsC;CAG3G"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/wasm/lazy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,qBAAa,6BAA8B,SAAQ,yBAAyB;gBAC9D,kBAAkB,EAAE,kBAAkB,EAAE,OAAO,SAAI,EAAE,GAAG,yCAAsC;CAG3G"}

package/dest/wasm/lazy.js

@@ -2,8 +2,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { LazyArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/lazy';
 import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
 export class BBWASMLazyPrivateKernelProver extends BBWASMPrivateKernelProver {
-    constructor(simulationProvider, threads = 1, log = createLogger('bb-prover:wasm:lazy')) {
+    constructor(simulationProvider, threads = 1, log = createLogger('bb-prover:wasm:lazy')){
         super(new LazyArtifactProvider(), simulationProvider, threads, log);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YXNtL2xhenkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGlEQUFpRCxDQUFDO0FBR3ZGLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRS9FLE1BQU0sT0FBTyw2QkFBOEIsU0FBUSx5QkFBeUI7SUFDMUUsWUFBWSxrQkFBc0MsRUFBRSxPQUFPLEdBQUcsQ0FBQyxFQUFFLEdBQUcsR0FBRyxZQUFZLENBQUMscUJBQXFCLENBQUM7UUFDeEcsS0FBSyxDQUFDLElBQUksb0JBQW9CLEVBQUUsRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDdEUsQ0FBQztDQUNGIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.76.4",
+  "version": "0.77.0-testnet-ignition.21",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -31,7 +31,7 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "bb": "node --no-warnings ./dest/bb/index.js",
-    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "jest": {
     "moduleNameMapper": {
@@ -61,34 +61,33 @@
     "reporters": [
       "default"
     ],
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.76.4",
-    "@aztec/circuit-types": "0.76.4",
-    "@aztec/circuits.js": "0.76.4",
-    "@aztec/foundation": "0.76.4",
-    "@aztec/noir-protocol-circuits-types": "0.76.4",
-    "@aztec/simulator": "0.76.4",
-    "@aztec/telemetry-client": "0.76.4",
-    "@aztec/world-state": "0.76.4",
+    "@aztec/bb.js": "0.77.0-testnet-ignition.21",
+    "@aztec/constants": "0.77.0-testnet-ignition.21",
+    "@aztec/foundation": "0.77.0-testnet-ignition.21",
+    "@aztec/noir-protocol-circuits-types": "0.77.0-testnet-ignition.21",
+    "@aztec/simulator": "0.77.0-testnet-ignition.21",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.21",
+    "@aztec/telemetry-client": "0.77.0-testnet-ignition.21",
+    "@aztec/world-state": "0.77.0-testnet-ignition.21",
     "@msgpack/msgpack": "^3.0.0-beta2",
-    "@noir-lang/noirc_abi": "1.0.0-beta.1",
-    "@noir-lang/types": "1.0.0-beta.1",
     "commander": "^12.1.0",
     "pako": "^2.1.0",
     "source-map-support": "^0.5.21",
-    "tslib": "^2.4.0"
+    "tslib": "^2.4.0",
+    "@aztec/noir-noirc_abi": "0.77.0-testnet-ignition.21",
+    "@aztec/noir-types": "0.77.0-testnet-ignition.21"
   },
   "devDependencies": {
-    "@aztec/ethereum": "workspace:^",
-    "@aztec/kv-store": "workspace:^",
-    "@aztec/noir-contracts.js": "workspace:^",
-    "@aztec/protocol-contracts": "workspace:^",
-    "@aztec/types": "workspace:^",
+    "@aztec/ethereum": "0.77.0-testnet-ignition.21",
+    "@aztec/kv-store": "0.77.0-testnet-ignition.21",
+    "@aztec/noir-contracts.js": "0.77.0-testnet-ignition.21",
+    "@aztec/protocol-contracts": "0.77.0-testnet-ignition.21",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/memdown": "^3.0.0",

package/src/avm_proving_tests/avm_proving_tester.ts

@@ -1,14 +1,16 @@
-import { type MerkleTreeWriteOperations } from '@aztec/circuit-types';
-import { type AvmCircuitInputs, AztecAddress, VerificationKeyData } from '@aztec/circuits.js';
 import { PublicTxSimulationTester, type TestEnqueuedCall } from '@aztec/simulator/public/fixtures';
-import { WorldStateDB } from '@aztec/simulator/server';
+import { SimpleContractDataSource, WorldStateDB } from '@aztec/simulator/server';
+import type { AvmCircuitInputs } from '@aztec/stdlib/avm';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import { makeAvmCircuitInputs } from '@aztec/stdlib/testing';
+import { VerificationKeyData } from '@aztec/stdlib/vks';
 import { NativeWorldStateService } from '@aztec/world-state';
 
 import fs from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'path';
 
-import { SimpleContractDataSource } from '../../../simulator/src/avm/fixtures/simple_contract_data_source.js';
 import {
   type BBResult,
   type BBSuccess,
@@ -29,25 +31,17 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     worldStateDB: WorldStateDB,
     contractDataSource: SimpleContractDataSource,
     merkleTrees: MerkleTreeWriteOperations,
-    skipContractDeployments: boolean,
   ) {
-    super(worldStateDB, contractDataSource, merkleTrees, skipContractDeployments);
+    super(worldStateDB, contractDataSource, merkleTrees);
   }
 
-  static override async create(checkCircuitOnly: boolean = false, skipContractDeployments: boolean = false) {
+  static override async create(checkCircuitOnly: boolean = false) {
     const bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
 
     const contractDataSource = new SimpleContractDataSource();
     const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
     const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
-    return new AvmProvingTester(
-      bbWorkingDirectory,
-      checkCircuitOnly,
-      worldStateDB,
-      contractDataSource,
-      merkleTrees,
-      skipContractDeployments,
-    );
+    return new AvmProvingTester(bbWorkingDirectory, checkCircuitOnly, worldStateDB, contractDataSource, merkleTrees);
   }
 
   async prove(avmCircuitInputs: AvmCircuitInputs): Promise<BBResult> {
@@ -87,7 +81,7 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     appCalls: TestEnqueuedCall[],
     teardownCall: TestEnqueuedCall | undefined,
     expectRevert: boolean | undefined,
-    feePayer?: AztecAddress,
+    feePayer = sender,
   ) {
     const simRes = await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer);
     expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);
@@ -117,24 +111,17 @@ export class AvmProvingTesterV2 extends PublicTxSimulationTester {
     worldStateDB: WorldStateDB,
     contractDataSource: SimpleContractDataSource,
     merkleTrees: MerkleTreeWriteOperations,
-    skipContractDeployments: boolean,
   ) {
-    super(worldStateDB, contractDataSource, merkleTrees, skipContractDeployments);
+    super(worldStateDB, contractDataSource, merkleTrees);
   }
 
-  static override async create(skipContractDeployments: boolean = false) {
+  static override async create() {
     const bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
 
     const contractDataSource = new SimpleContractDataSource();
     const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
     const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
-    return new AvmProvingTesterV2(
-      bbWorkingDirectory,
-      worldStateDB,
-      contractDataSource,
-      merkleTrees,
-      skipContractDeployments,
-    );
+    return new AvmProvingTesterV2(bbWorkingDirectory, worldStateDB, contractDataSource, merkleTrees);
   }
 
   async proveV2(avmCircuitInputs: AvmCircuitInputs): Promise<BBResult> {
@@ -148,18 +135,15 @@ export class AvmProvingTesterV2 extends PublicTxSimulationTester {
   }
 
   async verifyV2(proofRes: BBSuccess): Promise<BBResult> {
-    // Then we verify.
-    // Placeholder for now.
-    const publicInputs = {
-      dummy: [] as any[],
-    };
+    // TODO: Placeholder for now. They get ignored in C++.
+    const inputs = await makeAvmCircuitInputs();
 
     const rawVkPath = path.join(proofRes.vkPath!, 'vk');
     return await verifyAvmProofV2(
       BB_PATH,
       this.bbWorkingDirectory,
       proofRes.proofPath!,
-      publicInputs,
+      inputs.publicInputs,
       rawVkPath,
       this.logger,
     );
@@ -171,7 +155,7 @@ export class AvmProvingTesterV2 extends PublicTxSimulationTester {
     appCalls: TestEnqueuedCall[],
     teardownCall: TestEnqueuedCall | undefined,
     expectRevert: boolean | undefined,
-    feePayer?: AztecAddress,
+    feePayer = sender,
   ) {
     const simRes = await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer);
     expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);

package/src/bb/cli.ts

@@ -1,8 +1,8 @@
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 import { ClientCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/client/bundle';
 import { ServerCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/server';
-import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
-import { type NoirCompiledCircuit } from '@aztec/types/noir';
+import type { ProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
+import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 
 import { Command } from 'commander';