Merge pull request #531 from AztecProtocol/cb/merge-public-next-raw

chore: merge public-next into next (raw, conflict committed) [PR 1/2]

Author: PhilWindle

Makefile

@@ -47,7 +47,7 @@ endef
 # PHONY TARGETS - List every target that has a file/dir of the same name.
 #==============================================================================
 
-.PHONY: noir barretenberg noir-projects l1-contracts release-image boxes playground docs aztec-up spartan wsdb
+.PHONY: noir barretenberg noir-projects l1-contracts release-image boxes playground docs aztec-up spartan wsdb bb-avm-sim
 
 #==============================================================================
 # BOOTSTRAP TARGETS
@@ -69,7 +69,7 @@ full: fast bb-full-tests bb-cpp-full yarn-project-benches
 bench: yarn-project-benches bb-sol bb-acir
 
 # Release. Everything plus copy bb cross compiles to ts projects.
-release: fast bb-cpp-release-dir bb-ts-cross-copy ipc-runtime-cross
+release: fast bb-cpp-release-dir bb-ts-cross-copy bb-avm-sim-cross-copy ipc-runtime-cross
 
 #==============================================================================
 # Noir
@@ -104,7 +104,7 @@ avm-transpiler-cross: avm-transpiler-cross-amd64-macos avm-transpiler-cross-arm6
 #==============================================================================
 
 # Barretenberg - Aggregate target for all barretenberg sub-projects.
-barretenberg: bb-cpp bb-ts bb-rs bb-acir bb-docs bb-sol bb-bbup bb-crs
+barretenberg: bb-cpp bb-ts bb-avm-sim bb-rs bb-acir bb-docs bb-sol bb-bbup bb-crs
 
 # BB C++ - Main aggregate target.
 bb-cpp: bb-cpp-native bb-cpp-wasm bb-cpp-wasm-threads
@@ -225,11 +225,17 @@ bb-cpp-full: bb-cpp bb-cpp-gcc bb-cpp-fuzzing bb-cpp-windows bb-cpp-asan bb-cpp-
 
 # BB TypeScript - TypeScript bindings
 bb-ts: bb-cpp-wasm bb-cpp-wasm-threads bb-cpp-native ipc-runtime
-	$(call build,$@,barretenberg/ts)
+	$(call build,$@,barretenberg/ts,build_bb_js)
 
 # Copies the cross-compiles into bb.js.
 bb-ts-cross-copy: bb-ts bb-cpp-cross
-	$(call build,$@,barretenberg/ts,cross_copy)
+	$(call build,$@,barretenberg/ts,cross_copy_bb_js)
+
+bb-avm-sim: ipc-codegen ipc-runtime bb-cpp-native
+	$(call build,$@,barretenberg/ts,build_bb_avm_sim)
+
+bb-avm-sim-cross-copy: bb-avm-sim bb-cpp-cross
+	$(call build,$@,barretenberg/ts,cross_copy_bb_avm_sim)
 
 # BB Rust - barretenberg-rs FFI crate
 bb-rs: bb-ts bb-cpp-native
@@ -415,7 +421,7 @@ l1-contracts-tests: l1-contracts-verifier
 # Yarn Project - TypeScript monorepo with all TS packages
 #==============================================================================
 
-yarn-project: bb-ts noir-projects l1-contracts wsdb
+yarn-project: bb-ts noir-projects l1-contracts wsdb bb-avm-sim
 	$(call build,$@,yarn-project)
 
 yarn-project-tests: yarn-project

aztec-up/bootstrap.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 source $(git rev-parse --show-toplevel)/ci3/source_bootstrap
 
-hash=$(hash_str $(cache_content_hash ^aztec-up/) $(../ipc-runtime/bootstrap.sh hash) $(../wsdb/bootstrap.sh hash) $(../yarn-project/bootstrap.sh hash))
+hash=$(hash_str $(cache_content_hash ^aztec-up/) $(../ipc-runtime/bootstrap.sh hash) $(../wsdb/bootstrap.sh hash) $(../barretenberg/ts/bootstrap.sh hash) $(../yarn-project/bootstrap.sh hash))
 
 # Bare aliases ("nightly", "latest") resolve to this major version.
 DEFAULT_MAJOR_VERSION=${AZTEC_TOOLCHAIN_DEFAULT_MAJOR_VERSION:-4}
@@ -13,6 +13,10 @@ function wsdb_package_dirs {
   echo "$root/wsdb/ts"
 }
 
+function barretenberg_ts_package_dirs {
+  "$root"/barretenberg/ts/bootstrap.sh get_projects
+}
+
 function build {
   # Noop if user doesn't have docker.
   if ! command -v docker &>/dev/null; then
@@ -111,7 +115,7 @@ EOF
     echo "Deploying packages to local npm registry (version: $version)..."
     {
       echo $root/ipc-runtime/ts
-      echo $root/barretenberg/ts
+      barretenberg_ts_package_dirs
       wsdb_package_dirs
       # l1-artifacts lives under l1-contracts, so it isn't enumerated by yarn-project's get_projects;
       # publish it explicitly or @aztec/aztec's portal dependency can't resolve from the local registry.
@@ -190,7 +194,8 @@ function prep_test_mac {
 
   # Ensure we've cross-compiled bb for macos. Normally this is only done on releases.
   ../barretenberg/cpp/bootstrap.sh build_cross amd64-macos true
-  ../barretenberg/ts/bootstrap.sh cross_copy amd64-macos
+  ../barretenberg/ts/bootstrap.sh cross_copy_bb_js amd64-macos
+  ../barretenberg/ts/bootstrap.sh cross_copy_bb_avm_sim amd64-macos
 
   # Ensure build artifacts exist.
   if [ ! -f ./bin/0.0.1/versions ] || [ ! -d ./verdaccio-storage ]; then

barretenberg/acir_tests/bbjs-test/package.json

@@ -6,7 +6,7 @@
     "build": "yarn tsgo"
   },
   "dependencies": {
-    "@aztec/bb.js": "portal:../../ts",
+    "@aztec/bb.js": "portal:../../ts/bb.js",
     "commander": "^12.1.0"
   },
   "devDependencies": {

barretenberg/acir_tests/browser-test-app/package.json

@@ -9,7 +9,7 @@
     "serve": "serve -n -L -p ${PORT:-8080} -c ../serve.json dest"
   },
   "devDependencies": {
-    "@aztec/bb.js": "portal:../../ts",
+    "@aztec/bb.js": "portal:../../ts/bb.js",
     "@types/pako": "^2.0.3",
     "html-webpack-plugin": "^5.6.0",
     "pako": "^2.1.0",

barretenberg/acir_tests/scripts/bbjs_legacy_cli_prove.sh

@@ -6,7 +6,7 @@ export HARDWARE_CONCURRENCY=8
 cd ../acir_tests/$1
 
 # NOTE The bb.js main file is deprecated!
-bbjs_bin="../../../ts/dest/node/main.js"
+bbjs_bin="../../../ts/bb.js/dest/node/main.js"
 
 output_dir=$(mktemp -d ./output-XXXXXX)
 trap "rm -rf $output_dir" EXIT

barretenberg/acir_tests/yarn.lock

@@ -20,9 +20,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aztec/bb.js@portal:../../ts::locator=bbjs-test%40workspace%3Abbjs-test":
+"@aztec/bb.js@portal:../../ts/bb.js::locator=bbjs-test%40workspace%3Abbjs-test":
   version: 0.0.0-use.local
-  resolution: "@aztec/bb.js@portal:../../ts::locator=bbjs-test%40workspace%3Abbjs-test"
+  resolution: "@aztec/bb.js@portal:../../ts/bb.js::locator=bbjs-test%40workspace%3Abbjs-test"
   dependencies:
     comlink: "npm:^4.4.1"
     commander: "npm:^12.1.0"
@@ -35,9 +35,9 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@aztec/bb.js@portal:../../ts::locator=browser-test-app%40workspace%3Abrowser-test-app":
+"@aztec/bb.js@portal:../../ts/bb.js::locator=browser-test-app%40workspace%3Abrowser-test-app":
   version: 0.0.0-use.local
-  resolution: "@aztec/bb.js@portal:../../ts::locator=browser-test-app%40workspace%3Abrowser-test-app"
+  resolution: "@aztec/bb.js@portal:../../ts/bb.js::locator=browser-test-app%40workspace%3Abrowser-test-app"
   dependencies:
     comlink: "npm:^4.4.1"
     commander: "npm:^12.1.0"
@@ -1201,7 +1201,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "bbjs-test@workspace:bbjs-test"
   dependencies:
-    "@aztec/bb.js": "portal:../../ts"
+    "@aztec/bb.js": "portal:../../ts/bb.js"
     "@typescript/native-preview": "npm:7.0.0-dev.20251126.1"
     commander: "npm:^12.1.0"
   languageName: unknown
@@ -1308,7 +1308,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "browser-test-app@workspace:browser-test-app"
   dependencies:
-    "@aztec/bb.js": "portal:../../ts"
+    "@aztec/bb.js": "portal:../../ts/bb.js"
     "@types/pako": "npm:^2.0.3"
     html-webpack-plugin: "npm:^5.6.0"
     pako: "npm:^2.1.0"

barretenberg/cpp/.gitignore

@@ -15,6 +15,8 @@ go*.tar.gz
 barretenberg_modules.dot
 barretenberg_modules.png
 src/barretenberg/bb/config.hpp
+src/barretenberg/avm/generated/
+src/barretenberg/cdb/generated/
 bench-out
 *.bak
 src/barretenberg/avm_fuzzer/corpus/**

barretenberg/cpp/.rebuild_patterns

@@ -1,6 +1,8 @@
 ^barretenberg/cpp/.*\.(cpp|cc|cxx|c\+\+|h|hpp|hxx|h\+\+|c|h|inl|inc|ipp|tpp|cmake)$
 ^barretenberg/cpp/.*CMakeLists\.txt$
 ^barretenberg/cpp/.*Dockerfile.*$
+^barretenberg/cpp/src/barretenberg/avm/avm_schema\.json$
+^barretenberg/cpp/src/barretenberg/cdb/cdb_schema\.json$
 ^barretenberg/cpp/scripts/
 ^barretenberg/cpp/bootstrap.sh
 ^barretenberg/cpp/CMakePresets.json

barretenberg/cpp/CLAUDE.md

@@ -196,7 +196,7 @@ For bb.js, run:
 
 ```bash
 barretenberg/cpp/scripts/chonk_inputs.sh download
-barretenberg/ts/scripts/run_test.sh bbapi/chonk_pinned_inputs.test.js
+barretenberg/ts/bb.js/scripts/run_test.sh bbapi/chonk_pinned_inputs.test.js
 ```
 
 Typical workflow

barretenberg/cpp/CMakePresets.json

@@ -409,6 +409,7 @@
         "CC": "$env{WASI_SDK_PREFIX}/bin/clang",
         "CXX": "$env{WASI_SDK_PREFIX}/bin/clang++",
         "CXXFLAGS": "-DBB_VERBOSE -fvisibility=hidden",
+        "LDFLAGS": "--no-wasm-opt",
         "AR": "$env{WASI_SDK_PREFIX}/bin/llvm-ar",
         "RANLIB": "$env{WASI_SDK_PREFIX}/bin/llvm-ranlib"
       },
@@ -800,25 +801,25 @@
       "name": "amd64-linux",
       "configurePreset": "amd64-linux",
       "inheritConfigureEnvironment": true,
-      "targets": ["bb", "nodejs_module", "bb-external", "aztec-wsdb"]
+      "targets": ["bb", "nodejs_module", "bb-external", "aztec-wsdb", "bb-avm-sim"]
     },
     {
       "name": "arm64-linux",
       "configurePreset": "arm64-linux",
       "inheritConfigureEnvironment": true,
-      "targets": ["bb", "nodejs_module", "bb-external", "aztec-wsdb"]
+      "targets": ["bb", "nodejs_module", "bb-external", "aztec-wsdb", "bb-avm-sim"]
     },
     {
       "name": "amd64-macos",
       "configurePreset": "amd64-macos",
       "inheritConfigureEnvironment": true,
-      "targets": ["bb", "nodejs_module", "bb-external", "aztec-wsdb"]
+      "targets": ["bb", "nodejs_module", "bb-external", "aztec-wsdb", "bb-avm-sim"]
     },
     {
       "name": "arm64-macos",
       "configurePreset": "arm64-macos",
       "inheritConfigureEnvironment": true,
-      "targets": ["bb", "nodejs_module", "bb-external", "aztec-wsdb"]
+      "targets": ["bb", "nodejs_module", "bb-external", "aztec-wsdb", "bb-avm-sim"]
     },
     {
       "name": "amd64-windows",