From d3cfc4cb5eae3a65a394af48c75c3ba271939baa Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Fri, 24 May 2024 15:20:57 -0400
Subject: [PATCH] chore(bb): better AVM disable in WASM (#6683)

---
 barretenberg/cpp/src/CMakeLists.txt | 60 ++++-------------------------
 1 file changed, 8 insertions(+), 52 deletions(-)

diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt
index dfdb1eb2678..98ee7ac0a24 100644
--- a/barretenberg/cpp/src/CMakeLists.txt
+++ b/barretenberg/cpp/src/CMakeLists.txt
@@ -102,10 +102,11 @@ include(GNUInstallDirs)
 # libbarretenberg + libwasi = a wasi "reactor" that implements it's own env (e.g. logstr), e.g. barretenberg.wasm.
 # libbarretenberg + env = a wasi "command" that expects a full wasi runtime (e.g. wasmtime), e.g. test binaries.
 message(STATUS "Compiling all-in-one barretenberg archive")
-if(NOT WASM)
+
 set(BARRETENBERG_TARGET_OBJECTS
     $<TARGET_OBJECTS:commitment_schemes_objects>
     $<TARGET_OBJECTS:common_objects>
+    $<TARGET_OBJECTS:client_ivc_objects>
     $<TARGET_OBJECTS:crypto_aes128_objects>
     $<TARGET_OBJECTS:crypto_blake2s_objects>
     $<TARGET_OBJECTS:crypto_blake3s_objects>
@@ -149,57 +150,12 @@ set(BARRETENBERG_TARGET_OBJECTS
     $<TARGET_OBJECTS:transcript_objects>
     $<TARGET_OBJECTS:translator_vm_objects>
     $<TARGET_OBJECTS:translator_vm_recursion_objects>
-    $<TARGET_OBJECTS:ultra_honk_objects>
-    $<TARGET_OBJECTS:vm_objects>)
-    else()
-set(BARRETENBERG_TARGET_OBJECTS
-    $<TARGET_OBJECTS:commitment_schemes_objects>
-    $<TARGET_OBJECTS:common_objects>
-    $<TARGET_OBJECTS:crypto_aes128_objects>
-    $<TARGET_OBJECTS:crypto_blake2s_objects>
-    $<TARGET_OBJECTS:crypto_blake3s_objects>
-    $<TARGET_OBJECTS:crypto_ecdsa_objects>
-    $<TARGET_OBJECTS:crypto_keccak_objects>
-    $<TARGET_OBJECTS:crypto_pedersen_commitment_objects>
-    $<TARGET_OBJECTS:crypto_pedersen_hash_objects>
-    $<TARGET_OBJECTS:crypto_poseidon2_objects>
-    $<TARGET_OBJECTS:crypto_schnorr_objects>
-    $<TARGET_OBJECTS:crypto_sha256_objects>
-    $<TARGET_OBJECTS:dsl_objects>
-    $<TARGET_OBJECTS:ecc_objects>
-    $<TARGET_OBJECTS:eccvm_objects>
-    $<TARGET_OBJECTS:execution_trace_objects>
-    $<TARGET_OBJECTS:simple_example_objects>
-    $<TARGET_OBJECTS:flavor_objects>
-    $<TARGET_OBJECTS:goblin_objects>
-    $<TARGET_OBJECTS:honk_objects>
-    $<TARGET_OBJECTS:numeric_objects>
-    $<TARGET_OBJECTS:plonk_objects>
-    $<TARGET_OBJECTS:plonk_honk_shared_objects>
-    $<TARGET_OBJECTS:polynomials_objects>
-    $<TARGET_OBJECTS:protogalaxy_objects>
-    $<TARGET_OBJECTS:relations_objects>
-    $<TARGET_OBJECTS:srs_objects>
-    $<TARGET_OBJECTS:stdlib_aes128_objects>
-    $<TARGET_OBJECTS:stdlib_blake2s_objects>
-    $<TARGET_OBJECTS:stdlib_blake3s_objects>
-    $<TARGET_OBJECTS:stdlib_circuit_builders_objects>
-    $<TARGET_OBJECTS:stdlib_keccak_objects>
-    $<TARGET_OBJECTS:crypto_merkle_tree_objects>
-    $<TARGET_OBJECTS:stdlib_pedersen_commitment_objects>
-    $<TARGET_OBJECTS:stdlib_pedersen_hash_objects>
-    $<TARGET_OBJECTS:stdlib_poseidon2_objects>
-    $<TARGET_OBJECTS:stdlib_primitives_objects>
-    $<TARGET_OBJECTS:stdlib_honk_recursion_objects>
-    $<TARGET_OBJECTS:stdlib_plonk_recursion_objects>
-    $<TARGET_OBJECTS:stdlib_schnorr_objects>
-    $<TARGET_OBJECTS:stdlib_sha256_objects>
-    $<TARGET_OBJECTS:sumcheck_objects>
-    $<TARGET_OBJECTS:transcript_objects>
-    $<TARGET_OBJECTS:translator_vm_objects>
-    $<TARGET_OBJECTS:ultra_honk_objects>    )
-    endif()
-    
+    $<TARGET_OBJECTS:ultra_honk_objects>)
+
+if(NOT WASM)
+    # enable AVM
+    list(APPEND BARRETENBERG_TARGET_OBJECTS $<TARGET_OBJECTS:vm_objects>)
+endif()
 
 add_library(
     barretenberg