chore: prep for switching AVM to checkpointed native trees - TS test cleanup and refactors

noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr

@@ -400,12 +400,6 @@ pub contract AvmTest {
         context.da_gas_left()
     }
 
-    #[public]
-    fn assert_timestamp(expected_timestamp: u64) {
-        let timestamp = context.timestamp();
-        assert(timestamp == expected_timestamp, "timestamp does not match");
-    }
-
     #[public]
     fn get_args_hash(_a: u8, _fields: [Field; 3]) -> Field {
         context.get_args_hash()

noir-projects/noir-contracts/contracts/benchmarking_contract/Nargo.toml

@@ -7,3 +7,4 @@ type = "contract"
 [dependencies]
 aztec = { path = "../../../aztec-nr/aztec" }
 value_note = { path = "../../../aztec-nr/value-note" }
+sha256 = { tag = "v0.1.2", git = "https://github.com/noir-lang/sha256" }

noir-projects/noir-contracts/contracts/benchmarking_contract/src/main.nr

@@ -56,6 +56,6 @@ pub contract Benchmarking {
     // Does a bunch of heavy compute
     #[public]
     fn sha256_hash_2048(data: [u8; 2048]) -> [u8; 32] {
-        std::hash::sha256(data)
+        sha256::sha256_var(data, data.len() as u64)
     }
 }

yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit1.test.ts

@@ -1,42 +1,30 @@
-import { type ContractClassPublic, type ContractInstanceWithAddress, FunctionSelector } from '@aztec/circuits.js';
-import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing';
+import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
 import {
   MAX_L2_TO_L1_MSGS_PER_TX,
   MAX_NOTE_HASHES_PER_TX,
   MAX_NULLIFIERS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MAX_PUBLIC_LOGS_PER_TX,
-  PUBLIC_DISPATCH_SELECTOR,
 } from '@aztec/constants';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
-import { getAvmTestContractBytecode } from '@aztec/simulator/public/fixtures';
 
 import { AvmProvingTester } from './avm_proving_tester.js';
 
 const TIMEOUT = 300_000;
-const DISPATCH_FN_NAME = 'public_dispatch';
-const DISPATCH_SELECTOR = new FunctionSelector(PUBLIC_DISPATCH_SELECTOR);
 
 describe('AVM WitGen & Circuit – check circuit', () => {
-  const avmTestContractClassSeed = 0;
-  const avmTestContractBytecode = getAvmTestContractBytecode(DISPATCH_FN_NAME);
-  let avmTestContractClass: ContractClassPublic;
   let avmTestContractInstance: ContractInstanceWithAddress;
   let tester: AvmProvingTester;
 
   beforeEach(async () => {
-    avmTestContractClass = await makeContractClassPublic(
-      /*seed=*/ avmTestContractClassSeed,
-      /*publicDispatchFunction=*/ { bytecode: avmTestContractBytecode, selector: DISPATCH_SELECTOR },
-    );
-    avmTestContractInstance = await makeContractInstanceFromClassId(
-      avmTestContractClass.id,
-      /*seed=*/ avmTestContractClassSeed,
-    );
     tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
-    await tester.addContractClass(avmTestContractClass, AvmTestContractArtifact);
-    await tester.addContractInstance(avmTestContractInstance);
+    avmTestContractInstance = await tester.registerAndDeployContract(
+      /*constructorArgs=*/ [],
+      /*deployer=*/ AztecAddress.fromNumber(420),
+      AvmTestContractArtifact,
+    );
   });
 
   it(

yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit2.test.ts

@@ -1,41 +1,24 @@
-import {
-  AztecAddress,
-  type ContractClassPublic,
-  type ContractInstanceWithAddress,
-  FunctionSelector,
-} from '@aztec/circuits.js';
-import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing';
-import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
+import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
-import { getAvmTestContractBytecode } from '@aztec/simulator/public/fixtures';
 
 import { AvmProvingTester } from './avm_proving_tester.js';
 
 const TIMEOUT = 300_000;
-const DISPATCH_FN_NAME = 'public_dispatch';
-const DISPATCH_SELECTOR = new FunctionSelector(PUBLIC_DISPATCH_SELECTOR);
 
 describe('AVM WitGen & Circuit – check circuit', () => {
   const sender = AztecAddress.fromNumber(42);
-  const avmTestContractClassSeed = 0;
-  const avmTestContractBytecode = getAvmTestContractBytecode(DISPATCH_FN_NAME);
-  let avmTestContractClass: ContractClassPublic;
   let avmTestContractInstance: ContractInstanceWithAddress;
   let tester: AvmProvingTester;
 
   beforeEach(async () => {
-    avmTestContractClass = await makeContractClassPublic(
-      /*seed=*/ avmTestContractClassSeed,
-      /*publicDispatchFunction=*/ { bytecode: avmTestContractBytecode, selector: DISPATCH_SELECTOR },
-    );
-    avmTestContractInstance = await makeContractInstanceFromClassId(
-      avmTestContractClass.id,
-      /*seed=*/ avmTestContractClassSeed,
-    );
     tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
-    await tester.addContractClass(avmTestContractClass, AvmTestContractArtifact);
-    await tester.addContractInstance(avmTestContractInstance);
+    avmTestContractInstance = await tester.registerAndDeployContract(
+      /*constructorArgs=*/ [],
+      /*deployer=*/ AztecAddress.fromNumber(420),
+      AvmTestContractArtifact,
+    );
   });
 
   it(
@@ -58,9 +41,10 @@ describe('AVM WitGen & Circuit – check circuit', () => {
     },
     TIMEOUT,
   );
+  // FIXME(dbanks12): fails with "Lookup PERM_MAIN_ALU failed."
   it.skip('top-level exceptional halts due to a non-existent contract in app-logic and teardown', async () => {
     // don't insert contracts into trees, and make sure retrieval fails
-    const tester = await AvmProvingTester.create(/*checkCircuitOnly=*/ true, /*skipContractDeployments=*/ true);
+    const tester = await AvmProvingTester.create(/*checkCircuitOnly=*/ true);
     await tester.simProveVerify(
       sender,
       /*setupCalls=*/ [],

yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit3.test.ts

@@ -1,41 +1,24 @@
-import {
-  AztecAddress,
-  type ContractClassPublic,
-  type ContractInstanceWithAddress,
-  FunctionSelector,
-} from '@aztec/circuits.js';
-import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing';
-import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
+import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
-import { getAvmTestContractBytecode } from '@aztec/simulator/public/fixtures';
 
 import { AvmProvingTester } from './avm_proving_tester.js';
 
 const TIMEOUT = 300_000;
-const DISPATCH_FN_NAME = 'public_dispatch';
-const DISPATCH_SELECTOR = new FunctionSelector(PUBLIC_DISPATCH_SELECTOR);
 
 describe('AVM WitGen & Circuit – check circuit', () => {
   const sender = AztecAddress.fromNumber(42);
-  const avmTestContractClassSeed = 0;
-  const avmTestContractBytecode = getAvmTestContractBytecode(DISPATCH_FN_NAME);
-  let avmTestContractClass: ContractClassPublic;
   let avmTestContractInstance: ContractInstanceWithAddress;
   let tester: AvmProvingTester;
 
   beforeEach(async () => {
-    avmTestContractClass = await makeContractClassPublic(
-      /*seed=*/ avmTestContractClassSeed,
-      /*publicDispatchFunction=*/ { bytecode: avmTestContractBytecode, selector: DISPATCH_SELECTOR },
-    );
-    avmTestContractInstance = await makeContractInstanceFromClassId(
-      avmTestContractClass.id,
-      /*seed=*/ avmTestContractClassSeed,
-    );
     tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
-    await tester.addContractClass(avmTestContractClass, AvmTestContractArtifact);
-    await tester.addContractInstance(avmTestContractInstance);
+    avmTestContractInstance = await tester.registerAndDeployContract(
+      /*constructorArgs=*/ [],
+      /*deployer=*/ AztecAddress.fromNumber(420),
+      AvmTestContractArtifact,
+    );
   });
 
   it(

yarn-project/bb-prover/src/avm_proving_tests/avm_contract_class_limits.test.ts

@@ -22,6 +22,7 @@ describe('AVM WitGen & Circuit – check circuit - contract class limits', () =>
         /*constructorArgs=*/ [],
         deployer,
         /*contractArtifact=*/ AvmTestContractArtifact,
+        /*skipNullifierInsertion=*/ false,
         /*seed=*/ i,
       );
       instances.push(instance);

yarn-project/bb-prover/src/avm_proving_tests/avm_contract_updates.test.ts

@@ -1,43 +1,29 @@
-import {
-  AztecAddress,
-  type ContractClassPublic,
-  type ContractInstanceWithAddress,
-  FunctionSelector,
-} from '@aztec/circuits.js';
+import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
 import { deriveStorageSlotInMap } from '@aztec/circuits.js/hash';
 import {
   ScheduledDelayChange,
   ScheduledValueChange,
   computeSharedMutableHashSlot,
 } from '@aztec/circuits.js/shared-mutable';
-import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing';
-import { PUBLIC_DISPATCH_SELECTOR, UPDATED_CLASS_IDS_SLOT, UPDATES_SCHEDULED_VALUE_CHANGE_LEN } from '@aztec/constants';
+import { UPDATED_CLASS_IDS_SLOT, UPDATES_SCHEDULED_VALUE_CHANGE_LEN } from '@aztec/constants';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { DEFAULT_BLOCK_NUMBER, getAvmTestContractBytecode } from '@aztec/simulator/public/fixtures';
+import { DEFAULT_BLOCK_NUMBER } from '@aztec/simulator/public/fixtures';
 
 import { AvmProvingTester } from './avm_proving_tester.js';
 
 const TIMEOUT = 300_000;
-const DISPATCH_FN_NAME = 'public_dispatch';
-const DISPATCH_SELECTOR = new FunctionSelector(PUBLIC_DISPATCH_SELECTOR);
 
 describe('AVM WitGen & Circuit - contract updates', () => {
   const sender = AztecAddress.fromNumber(42);
 
   const avmTestContractClassSeed = 0;
-  const avmTestContractBytecode = getAvmTestContractBytecode(DISPATCH_FN_NAME);
-  let avmTestContractClass: ContractClassPublic;
   let avmTestContractInstance: ContractInstanceWithAddress;
 
-  beforeEach(async () => {
-    avmTestContractClass = await makeContractClassPublic(
-      /*seed=*/ avmTestContractClassSeed,
-      /*publicDispatchFunction=*/ { bytecode: avmTestContractBytecode, selector: DISPATCH_SELECTOR },
-    );
-  });
+  beforeEach(async () => {});
 
   const writeContractUpdate = async (
     tester: AvmProvingTester,
@@ -69,16 +55,17 @@ describe('AVM WitGen & Circuit - contract updates', () => {
     async () => {
       // Contract was not originally the avmTestContract
       const originalClassId = new Fr(27);
-      avmTestContractInstance = await makeContractInstanceFromClassId(
-        originalClassId,
+      const tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
+
+      avmTestContractInstance = await tester.registerAndDeployContract(
+        /*constructorArgs=*/ [],
+        sender,
+        /*contractArtifact=*/ AvmTestContractArtifact,
+        /*skipNullifierInsertion=*/ false,
         /*seed=*/ avmTestContractClassSeed,
-        {
-          currentClassId: avmTestContractClass.id,
-        },
+        /*originalContractClassId=*/ originalClassId, // upgraded from
       );
-      const tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
-      await tester.addContractClass(avmTestContractClass, AvmTestContractArtifact);
-      await tester.addContractInstance(avmTestContractInstance);
+
       await writeContractUpdate(
         tester,
         avmTestContractInstance.address,
@@ -105,16 +92,17 @@ describe('AVM WitGen & Circuit - contract updates', () => {
     async () => {
       // Contract was not originally the avmTestContract
       const originalClassId = new Fr(27);
-      avmTestContractInstance = await makeContractInstanceFromClassId(
-        originalClassId,
+
+      const tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
+      avmTestContractInstance = await tester.registerAndDeployContract(
+        /*constructorArgs=*/ [],
+        sender,
+        /*contractArtifact=*/ AvmTestContractArtifact,
+        /*skipNullifierInsertion=*/ false,
         /*seed=*/ avmTestContractClassSeed,
-        {
-          currentClassId: avmTestContractClass.id,
-        },
+        /*originalContractClassId=*/ originalClassId, // upgraded from
       );
-      const tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
-      await tester.addContractClass(avmTestContractClass, AvmTestContractArtifact);
-      await tester.addContractInstance(avmTestContractInstance);
+
       await writeContractUpdate(
         tester,
         avmTestContractInstance.address,
@@ -143,13 +131,16 @@ describe('AVM WitGen & Circuit - contract updates', () => {
     async () => {
       // Contract was not originally the avmTestContract
       const newClassId = new Fr(27);
-      avmTestContractInstance = await makeContractInstanceFromClassId(
-        avmTestContractClass.id,
+
+      const tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
+      avmTestContractInstance = await tester.registerAndDeployContract(
+        /*constructorArgs=*/ [],
+        sender,
+        /*contractArtifact=*/ AvmTestContractArtifact,
+        /*skipNullifierInsertion=*/ false,
         /*seed=*/ avmTestContractClassSeed,
       );
-      const tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
-      await tester.addContractClass(avmTestContractClass, AvmTestContractArtifact);
-      await tester.addContractInstance(avmTestContractInstance);
+
       await writeContractUpdate(
         tester,
         avmTestContractInstance.address,
@@ -176,13 +167,16 @@ describe('AVM WitGen & Circuit - contract updates', () => {
     async () => {
       // Contract was not originally the avmTestContract
       const newClassId = new Fr(27);
-      avmTestContractInstance = await makeContractInstanceFromClassId(
-        avmTestContractClass.id,
+
+      const tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
+      avmTestContractInstance = await tester.registerAndDeployContract(
+        /*constructorArgs=*/ [],
+        sender,
+        /*contractArtifact=*/ AvmTestContractArtifact,
+        /*skipNullifierInsertion=*/ false,
         /*seed=*/ avmTestContractClassSeed,
       );
-      const tester = await AvmProvingTester.create(/*checkCircuitOnly*/ true);
-      await tester.addContractClass(avmTestContractClass, AvmTestContractArtifact);
-      await tester.addContractInstance(avmTestContractInstance);
+
       await writeContractUpdate(
         tester,
         avmTestContractInstance.address,

yarn-project/bb-prover/src/avm_proving_tests/avm_proven_amm.test.ts

@@ -1,4 +1,5 @@
-import { AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AMMContractArtifact } from '@aztec/noir-contracts.js/AMM';
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
@@ -72,6 +73,7 @@ describe('AVM Witgen & Circuit apps tests: AMM', () => {
       constructorArgs,
       /*deployer=*/ admin,
       TokenContractArtifact,
+      /*skipNullifierInsertion=*/ false,
       seed,
     );
 
@@ -93,7 +95,13 @@ describe('AVM Witgen & Circuit apps tests: AMM', () => {
 
   const deployAMM = async (seed = 0) => {
     const constructorArgs = [token0, token1, liquidityToken];
-    const amm = await tester.registerAndDeployContract(constructorArgs, /*deployer=*/ admin, AMMContractArtifact, seed);
+    const amm = await tester.registerAndDeployContract(
+      constructorArgs,
+      /*deployer=*/ admin,
+      AMMContractArtifact,
+      /*skipNullifierInsertion=*/ false,
+      seed,
+    );
 
     await tester.simProveVerify(
       /*sender=*/ admin,

yarn-project/bb-prover/src/avm_proving_tests/avm_proven_token.test.ts

@@ -1,4 +1,5 @@
-import { AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
 import { type PublicTxResult } from '@aztec/simulator/server';