feat: optimize zk honk solidity verifier

barretenberg/acir_tests/bootstrap.sh

@@ -150,10 +150,13 @@ function test_cmds {
     echo "$sol_prefix $scripts/bb_prove_sol_verify.sh $t --disable_zk"
     echo "$sol_prefix $scripts/bb_prove_sol_verify.sh $t"
     echo "$sol_prefix USE_OPTIMIZED_CONTRACT=true $scripts/bb_prove_sol_verify.sh $t --disable_zk"
+    echo "$sol_prefix USE_OPTIMIZED_CONTRACT=true $scripts/bb_prove_sol_verify.sh $t"
   done
-  # Just run this super large circuit for the optimized verifier - regression test for templating errors.
+  # Just run this super large circuit for the optimized verifier - regression test for templating errors
   # Needs extra memory beyond the default 8g to avoid OOM kills in CI.
   echo "$sol_prefix:MEM=16g USE_OPTIMIZED_CONTRACT=true $scripts/bb_prove_sol_verify.sh large_circuit_verifier_test --disable_zk"
+  echo "$sol_prefix:MEM=16g USE_OPTIMIZED_CONTRACT=true $scripts/bb_prove_sol_verify.sh large_circuit_verifier_test"
+
   # prove with bb cli and verify with bb.js classes
   echo "$sol_prefix $scripts/bb_prove_bbjs_verify.sh a_1_mul"
   echo "$sol_prefix $scripts/bb_prove_bbjs_verify.sh assert_statement"

barretenberg/cpp/src/barretenberg/bb/cli.cpp

@@ -865,11 +865,6 @@ int parse_and_run_cli_command(int argc, char* argv[])
                 throw_or_abort("write_solidity_verifier requires --verifier_target to be 'evm' or 'evm-no-zk', got '" +
                                flags.verifier_target + "'");
             }
-            if (flags.optimized_solidity_verifier && !flags.disable_zk) {
-                throw_or_abort(
-                    "An optimized ZK Solidity verifier is not currently available. "
-                    "Use --verifier_target evm-no-zk, or remove --optimized to use the non-optimized ZK verifier.");
-            }
             api.write_solidity_verifier(flags, output_path, vk_path);
             return 0;
         }

barretenberg/cpp/src/barretenberg/bbapi/bbapi_ultra_honk.cpp

@@ -6,6 +6,7 @@
 #include "barretenberg/dsl/acir_proofs/honk_contract.hpp"
 #include "barretenberg/dsl/acir_proofs/honk_optimized_contract.hpp"
 #include "barretenberg/dsl/acir_proofs/honk_zk_contract.hpp"
+#include "barretenberg/dsl/acir_proofs/honk_zk_optimized_contract.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
@@ -246,8 +247,9 @@ CircuitWriteSolidityVerifier::Response CircuitWriteSolidityVerifier::execute(BB_
 // If in wasm, we dont include the optimized solidity verifier - due to its large bundle size
 // This will run generate twice, but this should only be run before deployment and not frequently
 #ifndef __wasm__
-    if (settings.disable_zk && settings.optimized_solidity_verifier) {
-        contract = get_optimized_honk_solidity_verifier(vk);
+    if (settings.optimized_solidity_verifier) {
+        contract = settings.disable_zk ? get_optimized_honk_solidity_verifier(vk)
+                                       : get_optimized_honk_zk_solidity_verifier(vk);
     }
 #endif