refactor(sol): generate & compile verifier contract in bootstrap

Earthfile

@@ -47,29 +47,21 @@ bootstrap:
   ARG EARTHLY_GIT_HASH
   LET bootstrap='rm -rf $(ls -A) &&
     mv $(find /usr/src -mindepth 1 -maxdepth 1) . &&
-    DENOISE=1 CI=1 ./l1-contracts/bootstrap.sh fast &&
     DENOISE=1 CI=1 ./avm-transpiler/bootstrap.sh fast &&
     DENOISE=1 CI=1 ./noir-projects/bootstrap.sh fast &&
+    DENOISE=1 CI=1 ./l1-contracts/bootstrap.sh fast &&
     DENOISE=1 CI=1 ./yarn-project/bootstrap.sh fast &&
     mv $(ls -A) /usr/src'
   # Use a mounted volume for performance.
-  # TODO don't retry noir projects. It seems to have been flakey.
   RUN --raw-output --mount type=cache,id=bootstrap-$EARTHLY_GIT_HASH,target=/build-volume \
     bash -c "$bootstrap"
 
   SAVE ARTIFACT /usr/src /usr/src
   WORKDIR /usr/src
 
-bootstrap-with-verifier:
-  # TODO(ci3) roll this into normal bootstrap
-  FROM +bootstrap
-  WORKDIR /usr/src/yarn-project
-  ENV DENOISE=1
-  COPY --dir +rollup-verifier-contract-with-cache/usr/src/bb /usr/src
-
 # Locally downloaded aztec image contents.
 bootstrap-aztec:
-  FROM +bootstrap-with-verifier
+  FROM +bootstrap
   WORKDIR /usr/src/yarn-project
   ENV DENOISE=1
   RUN yarn workspaces focus @aztec/aztec --production && yarn cache clean
@@ -92,7 +84,7 @@ bootstrap-aztec:
 
 # Locally downloaded end-to-end image contents.
 bootstrap-end-to-end:
-  FROM +bootstrap-with-verifier
+  FROM +bootstrap
   WORKDIR /usr/src/yarn-project
   RUN yarn workspaces focus @aztec/end-to-end @aztec/cli-wallet --production && yarn cache clean
   WORKDIR /usr/src
@@ -261,19 +253,6 @@ noir-projects-with-cache:
     RUN ci3/cache_upload_flag $artifact
   END
 
-rollup-verifier-contract-with-cache:
-  FROM +bootstrap
-  ENV CI=1
-  ENV USE_CACHE=1
-  LET artifact=rollup-verifier-contract-$(./noir-projects/bootstrap.sh hash).tar.gz
-  # Running this directly in the 'if' means files are not permanent
-  RUN ci3/cache_download rollup-verifier-contract-3e3a78f9a68f1f1e04240acf0728522d87a313ac-linux-gnu-x86_64 || true
-  IF ! [ -d /usr/src/bb ]
-    COPY --dir +rollup-verifier-contract/usr/src/bb /usr/src
-    RUN ci3/cache_upload $artifact bb
-  END
-  SAVE ARTIFACT /usr/src/bb /usr/src/bb
-
 bb-cli:
     FROM +bootstrap
     ENV BB_WORKING_DIRECTORY=/usr/src/bb
@@ -287,42 +266,6 @@ bb-cli:
     # yarn symlinks the binary to node_modules/.bin
     ENTRYPOINT ["/usr/src/yarn-project/node_modules/.bin/bb-cli"]
 
-# helper target to generate vks in parallel
-verification-key:
-    ARG circuit="RootRollupArtifact"
-    FROM +bb-cli
-
-    # this needs to be exported as an env var for RUN to pick it up
-    ENV CIRCUIT=$circuit
-    RUN --entrypoint write-vk -c $CIRCUIT
-
-    SAVE ARTIFACT /usr/src/bb /usr/src/bb
-
-protocol-verification-keys:
-    LOCALLY
-    LET circuits = "RootRollupArtifact PrivateKernelTailArtifact PrivateKernelTailToPublicArtifact"
-
-    FOR circuit IN $circuits
-        BUILD +verification-key --circuit=$circuit
-    END
-
-    # this could be FROM scratch
-    # but FOR doesn't work without /bin/sh
-    FROM ubuntu:noble
-    WORKDIR /usr/src/bb
-
-    FOR circuit IN $circuits
-        COPY (+verification-key/usr/src/bb --circuit=$circuit) .
-    END
-
-    SAVE ARTIFACT /usr/src/bb /usr/src/bb
-
-# TODO(ci3): we either don't need this or should be in bootstrap
-rollup-verifier-contract:
-    FROM +bb-cli
-    COPY --dir +protocol-verification-keys/usr/src/bb /usr/src
-    RUN --entrypoint write-contract -c RootRollupArtifact -n UltraHonkVerifier.sol
-    SAVE ARTIFACT /usr/src/bb /usr/src/bb
 ########################################################################################################################
 # File-copying boilerplate
 ########################################################################################################################

barretenberg/cpp/src/barretenberg/bb/main.cpp

@@ -590,7 +590,7 @@ void contract_honk(const std::string& output_path, const std::string& vk_path)
     auto vk = std::make_shared<VerificationKey>(from_buffer<VerificationKey>(read_file(vk_path)));
     vk->pcs_verification_key = std::make_shared<VerifierCommitmentKey>();
 
-    std::string contract = get_honk_solidity_verifier(std::move(vk));
+    std::string contract = get_honk_solidity_verifier(vk);
 
     if (output_path == "-") {
         writeStringToStdout(contract);

barretenberg/cpp/src/barretenberg/dsl/acir_proofs/honk_contract.hpp

@@ -4,6 +4,7 @@
 
 // Source code for the Ultrahonk Solidity verifier.
 // It's expected that the AcirComposer will inject a library which will load the verification key into memory.
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays)
 static const char HONK_CONTRACT_SOURCE[] = R"(
 pragma solidity ^0.8.27;
 
@@ -1448,12 +1449,12 @@ interface IVerifier {
 abstract contract BaseHonkVerifier is IVerifier {
     using FrLib for Fr;
 
-    uint256 immutable N;
+    uint256 immutable n;
     uint256 immutable logN;
     uint256 immutable numPublicInputs;
 
-    constructor(uint256 _N, uint256 _logN, uint256 _numPublicInputs) {
-        N = _N;
+    constructor(uint256 _n, uint256 _logN, uint256 _numPublicInputs) {
+        n = _n;
         logN = _logN;
         numPublicInputs = _numPublicInputs;
     }
@@ -1498,7 +1499,7 @@ abstract contract BaseHonkVerifier is IVerifier {
         Fr numerator = Fr.wrap(1);
         Fr denominator = Fr.wrap(1);
 
-        Fr numeratorAcc = gamma + (beta * FrLib.from(N + offset));
+        Fr numeratorAcc = gamma + (beta * FrLib.from(n + offset));
         Fr denominatorAcc = gamma - (beta * FrLib.from(offset + 1));
 
         {
@@ -1801,4 +1802,4 @@ inline std::string get_honk_solidity_verifier(auto const& verification_key)
     std::ostringstream stream;
     output_vk_sol_ultra_honk(stream, verification_key, "HonkVerificationKey");
     return stream.str() + HONK_CONTRACT_SOURCE;
-}
+}

l1-contracts/.gitignore

@@ -10,6 +10,7 @@ out/
 # Dotenv file
 .env
 
+generated
 lcov.info
 
 # Local foundry env

l1-contracts/bootstrap.sh

@@ -3,23 +3,40 @@ source $(git rev-parse --show-toplevel)/ci3/source_bootstrap
 
 cmd=${1:-}
 
-export hash=$(cache_content_hash .rebuild_patterns)
+# We rely on noir-projects for the verifier contract.
+export hash=$(cache_content_hash .rebuild_patterns ../noir-projects/.rebuild_patterns)
 
 function build {
   github_group "l1-contracts build"
   local artifact=l1-contracts-$hash.tar.gz
   if ! cache_download $artifact; then
     # Clean
-    rm -rf broadcast cache out serve
+    rm -rf broadcast cache out serve generated
 
     # Install
     forge install --no-commit
 
     # Ensure libraries are at the correct version
     git submodule update --init --recursive ./lib
 
+    mkdir -p generated
+    # Copy from noir-projects. Bootstrap must hav
+    local rollup_verifier_path=../noir-projects/noir-protocol-circuits/target/keys/rollup_root_verifier.sol
+    if [ -f "$rollup_verifier_path" ]; then
+      cp "$rollup_verifier_path" generated/HonkVerifier.sol
+    else
+      echo_stderr "You may need to run ./bootstrap.sh in the noir-projects folder. Could not find the rollup verifier at $rollup_verifier_path."
+      exit 1
+    fi
+
     # Compile contracts
-    forge build
+    # Step 1: Build everything in src.
+    forge build $(find src test -name '*.sol')
+
+    # Step 2: Build the the generated verifier contract with optimization.
+    forge build $(find generated -name '*.sol') \
+      --optimize \
+      --optimizer-runs 200
 
     cache_upload $artifact out
   fi

l1-contracts/foundry.toml

@@ -29,5 +29,4 @@ tab_width = 2
 variable_override_spacing=false
 
 [rpc_endpoints]
-mainnet_fork="https://mainnet.infura.io/v3/9928b52099854248b3a096be07a6b23c"
-
+mainnet_fork="https://mainnet.infura.io/v3/9928b52099854248b3a096be07a6b23c"

noir-projects/bootstrap.sh

@@ -50,6 +50,6 @@ case "$cmd" in
     exit
     ;;
   *)
-    echo_stderr "Unknown command: $CMD"
+    echo_stderr "Unknown command: $cmd"
     exit 1
 esac

noir-projects/noir-protocol-circuits/bootstrap.sh

@@ -41,9 +41,10 @@ rollup_honk_patterns=(
   "rollup_merge"
 )
 
-
 ivc_regex=$(IFS="|"; echo "${ivc_patterns[*]}")
 rollup_honk_regex=$(IFS="|"; echo "${rollup_honk_patterns[*]}")
+# We do this for the rollup root only.
+verifier_generate_regex=rollup_root
 
 function on_exit() {
   rm -rf $tmp_dir
@@ -102,7 +103,8 @@ function compile {
   # Change this to add verification_key to original json, like contracts does.
   # Will require changing TS code downstream.
   bytecode_hash=$(jq -r '.bytecode' $json_path | sha256sum | tr -d ' -')
-  hash=$(hash_str "$BB_HASH-$bytecode_hash-$proto")
+  # TODO(AD) remove the -2 after this lands on master, needed to disambiguate
+  hash=$(hash_str "$BB_HASH-$bytecode_hash-$proto-3")
   if ! cache_download vk-$hash.tar.gz 1>&2; then
     local key_path="$key_dir/$name.vk.data.json"
     echo_stderr "Generating vk for function: $name..."
@@ -113,9 +115,20 @@ function compile {
     local vkf_cmd="echo '$vk' | xxd -r -p | $BB $vk_as_fields_cmd -k - -o -"
     # echo_stderrr $vkf_cmd
     vk_fields=$(dump_fail "$vkf_cmd")
+
     jq -n --arg vk "$vk" --argjson vkf "$vk_fields" '{keyAsBytes: $vk, keyAsFields: $vkf}' > $key_path
     echo_stderr "Key output at: $key_path (${SECONDS}s)"
-    cache_upload vk-$hash.tar.gz $key_path &> /dev/null
+    if echo "$name" | grep -qE "${verifier_generate_regex}"; then
+      local verifier_path="$key_dir/${name}_verifier.sol"
+      SECONDS=0
+      # Generate solidity verifier for this contract.
+      echo "$vk" | xxd -r -p | $BB contract_ultra_honk -k - -o $verifier_path
+      echo_stderr "VK output at: $verifier_path (${SECONDS}s)"
+      # Include the verifier path if we create it.
+      cache_upload vk-$hash.tar.gz $key_path $verifier_path &> /dev/null
+    else
+      cache_upload vk-$hash.tar.gz $key_path &> /dev/null
+    fi
   fi
 }
 
@@ -162,7 +175,7 @@ case "$CMD" in
     git clean -fdx
     ;;
   "clean-keys")
-    rm -rf target/keys
+    rm -rf $key_dir
     ;;
   ""|"fast"|"full")
     build