Fix witness generator

matter-labs · Sep 27, 2024 · 41fa851 · 41fa851
1 parent 1828756
commit 41fa851
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/prover/crates/bin/witness_generator/src/rounds/basic_circuits/utils.rs b/prover/crates/bin/witness_generator/src/rounds/basic_circuits/utils.rs
@@ -114,14 +114,18 @@ pub(super) async fn generate_witness(
             }
         };
 
+        let evm_simulator_code_hash = input.vm_run_data.evm_simulator_code_hash;
+        // By convention, default AA is used instead of the EVM simulator if the latter is disabled.
+        let evm_simulator_code_hash =
+            evm_simulator_code_hash.unwrap_or(input.vm_run_data.default_account_code_hash);
         let (scheduler_witness, block_witness) = zkevm_test_harness::external_calls::run(
             Address::zero(),
             BOOTLOADER_ADDRESS,
             input.vm_run_data.bootloader_code,
             bootloader_contents,
             false,
             input.vm_run_data.default_account_code_hash,
-            input.vm_run_data.evm_simulator_code_hash,
+            evm_simulator_code_hash,
             input.vm_run_data.used_bytecodes,
             Vec::default(),
             MAX_CYCLES_FOR_TX as usize,