fix: no exports of simulator should depend on jest-mock-extended (#13694)

Fixes #13655

Other components (tests in `bb-prover`, `prover-client`) use
`SimpleContractDataSource` and `PublicTxSimulationTester`. These are NOT
meant to depend on `jest-mock-extended`, but `SimpleContractDataSource`
imported `avm/fixtures/index.ts` for `getFunctionSelector`. And that
`index.ts` imported `jest-mock-extended`.

Instead of having a bunch of utilities into `avm/fixtures/index.ts`, I
moved them into `initializers.ts` (needs jest) and `utils.ts` (pure
utils, doesn't need jest). And then `SimpleContractDataSource` imports
`utils.ts` and has no dependency on `jest-mock-extended`.

Other components that depend on `SimpleContractDataSource` or
`PublicTxSimulationTester` now explicitly import them from
`simulator/public/fixtures` since they're no longer in
`simulator/server`.

Removed dependency of `ivc-integration/src/witgen.ts` on
`PublicTxSimulationTester` at the cost of small code-duplication.

---------

Co-authored-by: dbanks12 <[email protected]>

Author: dbanks12

yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts

@@ -1,5 +1,8 @@
-import { PublicTxSimulationTester, type TestEnqueuedCall } from '@aztec/simulator/public/fixtures';
-import { SimpleContractDataSource } from '@aztec/simulator/server';
+import {
+  PublicTxSimulationTester,
+  SimpleContractDataSource,
+  type TestEnqueuedCall,
+} from '@aztec/simulator/public/fixtures';
 import type { AvmCircuitInputs } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';

yarn-project/ivc-integration/src/avm_integration.test.ts

@@ -1,5 +1,6 @@
 import { BB_RESULT, verifyClientIvcProof, writeClientIVCProofToOutputDirectory } from '@aztec/bb-prover';
 import { ROLLUP_HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS, TUBE_PROOF_LENGTH } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 import { PublicTxSimulationTester } from '@aztec/simulator/public/fixtures';
@@ -20,7 +21,6 @@ import {
   mapAvmVerificationKeyToNoir,
   mapRecursiveProofToNoir,
   mapVerificationKeyToNoir,
-  simulateAvmBulkTesting,
   witnessGenMockPublicBaseCircuit,
 } from './index.js';
 import { proveAvm, proveClientIVC, proveRollupHonk, proveTube } from './prove_native.js';
@@ -77,7 +77,23 @@ describe('AVM Integration', () => {
     // for it to use as "expected" values when testing contract instance retrieval.
     const expectContractInstance = avmTestContractInstance;
 
-    const simRes = await simulateAvmBulkTesting(simTester, expectContractInstance);
+    const argsField = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
+    const argsU8 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
+    const args = [
+      argsField,
+      argsU8,
+      /*getInstanceForAddress=*/ expectContractInstance.address.toField(),
+      /*expectedDeployer=*/ expectContractInstance.deployer.toField(),
+      /*expectedClassId=*/ expectContractInstance.currentContractClassId.toField(),
+      /*expectedInitializationHash=*/ expectContractInstance.initializationHash.toField(),
+    ];
+
+    const simRes = await simTester.simulateTx(
+      /*sender=*/ AztecAddress.fromNumber(42),
+      /*setupCalls=*/ [],
+      /*appCalls=*/ [{ address: expectContractInstance.address, fnName: 'bulk_testing', args }],
+      /*teardownCall=*/ undefined,
+    );
 
     const avmCircuitInputs = simRes.avmProvingRequest.inputs;
     const { vk, proof, publicInputs } = await proveAvm(avmCircuitInputs, bbWorkingDirectory, logger);

yarn-project/ivc-integration/src/rollup_ivc_integration.test.ts

@@ -1,9 +1,9 @@
 import { BB_RESULT, verifyClientIvcProof, writeClientIVCProofToOutputDirectory } from '@aztec/bb-prover';
 import { ROLLUP_HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS, TUBE_PROOF_LENGTH } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
-import { PublicTxSimulationTester } from '@aztec/simulator/server';
+import { PublicTxSimulationTester } from '@aztec/simulator/public/fixtures';
 import type { AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ProofAndVerificationKey } from '@aztec/stdlib/interfaces/server';
@@ -23,7 +23,6 @@ import {
   mapAvmVerificationKeyToNoir,
   mapRecursiveProofToNoir,
   mapVerificationKeyToNoir,
-  simulateAvmBulkTesting,
   witnessGenMockPublicBaseCircuit,
   witnessGenMockRollupBasePrivateCircuit,
   witnessGenMockRollupMergeCircuit,
@@ -77,7 +76,24 @@ describe('Rollup IVC Integration', () => {
       /*deployer=*/ AztecAddress.fromNumber(420),
       AvmTestContractArtifact,
     );
-    const avmSimulationResult = await simulateAvmBulkTesting(simTester, avmTestContractInstance);
+    const argsField = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
+    const argsU8 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
+    const args = [
+      argsField,
+      argsU8,
+      /*getInstanceForAddress=*/ avmTestContractInstance.address.toField(),
+      /*expectedDeployer=*/ avmTestContractInstance.deployer.toField(),
+      /*expectedClassId=*/ avmTestContractInstance.currentContractClassId.toField(),
+      /*expectedInitializationHash=*/ avmTestContractInstance.initializationHash.toField(),
+    ];
+
+    const avmSimulationResult = await simTester.simulateTx(
+      /*sender=*/ AztecAddress.fromNumber(42),
+      /*setupCalls=*/ [],
+      /*appCalls=*/ [{ address: avmTestContractInstance.address, fnName: 'bulk_testing', args }],
+      /*teardownCall=*/ undefined,
+    );
+
     const avmCircuitInputs = avmSimulationResult.avmProvingRequest.inputs;
 
     ({

yarn-project/ivc-integration/src/witgen.ts

@@ -6,10 +6,7 @@ import {
 } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { type ForeignCallOutput, Noir } from '@aztec/noir-noir_js';
-import type { PublicTxSimulationTester } from '@aztec/simulator/server';
 import type { AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { RecursiveProof } from '@aztec/stdlib/proofs';
 import type { VerificationKeyAsFields } from '@aztec/stdlib/vks';
 
@@ -348,26 +345,3 @@ export function mapAvmPublicInputsToNoir(
   }
   return serialized.map(x => x.toString()) as FixedLengthArray<string, typeof AVM_V2_PUBLIC_INPUTS_FLATTENED_SIZE>;
 }
-
-export async function simulateAvmBulkTesting(
-  simTester: PublicTxSimulationTester,
-  contractInstance: ContractInstanceWithAddress,
-) {
-  const argsField = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
-  const argsU8 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
-  const args = [
-    argsField,
-    argsU8,
-    /*getInstanceForAddress=*/ contractInstance.address.toField(),
-    /*expectedDeployer=*/ contractInstance.deployer.toField(),
-    /*expectedClassId=*/ contractInstance.currentContractClassId.toField(),
-    /*expectedInitializationHash=*/ contractInstance.initializationHash.toField(),
-  ];
-
-  return await simTester.simulateTx(
-    /*sender=*/ AztecAddress.fromNumber(42),
-    /*setupCalls=*/ [],
-    /*appCalls=*/ [{ address: contractInstance.address, fnName: 'bulk_testing', args }],
-    /*teardownCall=*/ undefined,
-  );
-}

yarn-project/prover-client/src/mocks/test_context.ts

@@ -6,12 +6,8 @@ import { TestDateProvider } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
-import {
-  PublicProcessor,
-  PublicProcessorFactory,
-  PublicTxSimulationTester,
-  SimpleContractDataSource,
-} from '@aztec/simulator/server';
+import { PublicTxSimulationTester, SimpleContractDataSource } from '@aztec/simulator/public/fixtures';
+import { PublicProcessor, PublicProcessorFactory } from '@aztec/simulator/server';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { L2Block } from '@aztec/stdlib/block';