Merge branch 'master' into mm/pg-refactor-new

avm-transpiler/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:bookworm
+FROM rust:bullseye
 
 WORKDIR /usr/src
 COPY ./avm-transpiler ./avm-transpiler
@@ -8,6 +8,6 @@ WORKDIR /usr/src/avm-transpiler
 RUN apt-get update && apt-get install -y git
 RUN ./scripts/bootstrap_native.sh
 
-FROM ubuntu:lunar
+FROM ubuntu:focal
 COPY --from=0 /usr/src/avm-transpiler/target/release/avm-transpiler /usr/src/avm-transpiler/target/release/avm-transpiler
-ENTRYPOINT ["sh", "-c"]
+ENTRYPOINT ["sh", "-c"]

avm-transpiler/bootstrap.sh

@@ -16,4 +16,7 @@ if [ -n "$CMD" ]; then
   fi
 fi
 
+# Attempt to just pull artefacts from CI and exit on success.
+./bootstrap_cache.sh && exit
+
 ./scripts/bootstrap_native.sh

avm-transpiler/bootstrap_cache.sh

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
 set -eu
 
+[ -z "${NO_CACHE:-}" ] && type docker &> /dev/null && [ -f ~/.aws/credentials ] || exit 1
+
 cd "$(dirname "$0")"
 source ../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
 
 echo -e "\033[1mRetrieving avm-transpiler from remote cache...\033[0m"
 extract_repo avm-transpiler \
   /usr/src/avm-transpiler/target/release/avm-transpiler ./target/release/
+
+remove_old_images avm-transpiler

barretenberg/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 3eac14010f3f355109e8c85d7dbffdf1bc7a1eca
-	parent = a2c0caed4c48ce2d37d2370040ea059d80d93bfe
+	commit = e68cec277e733e01f19b3fa61a307b4b8c49f6fa
+	parent = 842ba7a720d075632ad2c4b948f874a12cfa3ecd
 	method = merge
 	cmdver = 0.4.6

barretenberg/cpp/bootstrap.sh

@@ -31,6 +31,9 @@ fi
 # Download ignition transcripts.
 (cd ./srs_db && ./download_ignition.sh 0)
 
+# Attempt to just pull artefacts from CI and exit on success.
+./bootstrap_cache.sh && exit
+
 # Pick native toolchain file.
 ARCH=$(uname -m)
 if [ "$OS" == "macos" ]; then

barretenberg/cpp/bootstrap_cache.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -eu
+
+[ -z "${NO_CACHE:-}" ] && type docker &> /dev/null && [ -f ~/.aws/credentials ] || exit 1
+
+cd "$(dirname "$0")"
+source ../../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
+
+echo -e "\033[1mRetrieving bb.wasm from remote cache...\033[0m"
+extract_repo barretenberg-wasm-linux-clang \
+  /usr/src/barretenberg/cpp/build-wasm/bin ./cpp/build-wasm \
+  /usr/src/barretenberg/cpp/build-wasm-threads/bin ./cpp/build-wasm-threads
+
+remove_old_images barretenberg-wasm-linux-clang

barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/ivc.bench.cpp

@@ -127,13 +127,6 @@ BENCHMARK_DEFINE_F(IvcBench, Accumulate)(benchmark::State& state)
 BENCHMARK_DEFINE_F(IvcBench, Decide)(benchmark::State& state)
 {
     ClientIVC ivc;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> master
-=======
->>>>>>> 26118e61dc6183b907f5718a24d3dcfb1e036361
     // Perform a specified number of iterations of function/kernel accumulation
     perform_ivc_accumulation_rounds(state, ivc);
 

barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp

@@ -49,12 +49,24 @@ TEST_F(GoblinTranslatorComposerTests, Basic)
     using Fr = fr;
     using Fq = fq;
 
+    // Add an element and scalar the accumulation of which leaves no Point-at-Infinity commitments
+    const auto x = uint256_t(0xd3c208c16d87cfd3, 0xd97816a916871ca8, 0x9b85045b68181585, 0x30644e72e131a02);
+    const auto y = uint256_t(0x3ce1cc9c7e645a83, 0x2edac647851e3ac5, 0xd0cbe61fced2bc53, 0x1a76dae6d3272396);
+    auto padding_element = G1(x, y);
+    auto padding_scalar = -Fr::one();
+
     auto P1 = G1::random_element();
     auto P2 = G1::random_element();
     auto z = Fr::random_element();
 
     // Add the same operations to the ECC op queue; the native computation is performed under the hood.
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
+
+    // Accumulate padding so that we don't produce Point-at-Infinity commitments. Currently our transcript can't handle
+    // them
+    op_queue->mul_accumulate(padding_element, padding_scalar);
+
+    // Push everything else
     for (size_t i = 0; i < 500; i++) {
         op_queue->add_accumulate(P1);
         op_queue->mul_accumulate(P2, z);

barretenberg/ts/bootstrap.sh

@@ -18,10 +18,13 @@ if [ -n "$CMD" ]; then
   fi
 fi
 
+# Attempt to just pull artefacts from CI and exit on success.
+./bootstrap_cache.sh && exit
+
 yarn install --immutable
 echo "Building with command 'yarn $BUILD_CMD'..."
 yarn $BUILD_CMD
 
 # Make bin globally available.
 npm link
-echo "Barretenberg ts build successful"
+echo "Barretenberg ts build successful"

barretenberg/ts/bootstrap_cache.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -eu
+
+[ -z "${NO_CACHE:-}" ] && type docker &> /dev/null && [ -f ~/.aws/credentials ] || exit 1
+
+cd "$(dirname "$0")"
+source ../../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
+
+echo -e "\033[1mRetrieving bb.js from remote cache...\033[0m"
+extract_repo bb.js /usr/src/barretenberg/ts/dest .
+# Annoyingly we still need to install modules, so they can be found as part of module resolution when portalled.
+yarn install
+
+remove_old_images bb.js

bootstrap.sh

@@ -32,6 +32,8 @@ if [ -n "$CMD" ]; then
     git clean -ffdx
 
     exit 0
+  elif [ "$CMD" = "full" ]; then
+    export NO_CACHE=1
   else
     echo "Unknown command: $CMD"
     exit 1
@@ -61,19 +63,11 @@ PROJECTS=(
 
 # Build projects locally
 for P in "${PROJECTS[@]}"; do
-  if [ -n "${BOOTSTRAP_USE_REMOTE_CACHE:-}" ] && [ -f "$P/bootstrap_cache.sh" ]; then
-    echo "**************************************"
-    echo -e "\033[1mBootstrapping $P from remote cache...\033[0m"
-    echo "**************************************"
-    echo
-    $P/bootstrap_cache.sh
-  else
-    echo "**************************************"
-    echo -e "\033[1mBootstrapping $P...\033[0m"
-    echo "**************************************"
-    echo
-    $P/bootstrap.sh
-  fi
+  echo "**************************************"
+  echo -e "\033[1mBootstrapping $P...\033[0m"
+  echo "**************************************"
+  echo
+  (cd $P && ./bootstrap.sh)
   echo
   echo
 done

boxes/README.md

@@ -1,5 +1,28 @@
-# Aztec Starter Kits
+# Aztec Boxes
 
-A collection of projects that act as starter kits for Aztec.
-These depend on accounts, aztec.js and aztec.nr, and point to the monorepos local development versions.
-These projects depend on the sandbox. They're built and tested after the sandbox by docker compose files.
+Aztec Boxes are the one-stop-shop for developing on Aztec. They often include a combination of:
+
+- Fully tested contracts
+- Frontend boilerplates
+- General tests
+
+Boxes include the sandbox installation script and its start command. By choosing the appropriate box, you can get started working on Aztec in a minimal amount of time.
+
+## Getting started
+
+If you have [node](https://nodejs.org/en/download) installed, you can open a terminal in any folder and run:
+
+`npx create-aztec-app`
+
+The script will install the sandbox, run it, and clone the boilerplate you chose. If at any time you encounter problems, refer to the guides at [docs.aztec.network](https://docs.aztec.network) for more information.
+
+## Templates
+
+Currently there are two boxes:
+
+- React - A React boilerplate with a minimal UI.
+- Vanilla JS and HTML - Some say if you get something working in vanilla JS and HTML, you can make it work on any framework. If you can't find the box you need, this could be a good starting point.
+
+## Support
+
+Need any support? Reach out on [discord](https://discord.gg/DgWG2DBMyB), [discourse](https://discourse.aztec.network/) or [twitter](https://twitter.com/aztecnetwork).

boxes/docker-compose.yml

@@ -25,4 +25,4 @@ services:
       ETHEREUM_HOST: http://ethereum:8545
       CHAIN_ID: 31337
       PXE_URL: http://aztec:8080
-      BOX: ${BOX:-box-blank}
+      BOX: ${BOX:-box-vanilla}