Merge branch 'master' into lde/reenable_ultra_tests

.circleci/config.yml

@@ -671,17 +671,6 @@ jobs:
           name: "Build"
           command: build ethereum
 
-  rollup-provider:
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build"
-          command: build rollup-provider
-
   e2e-2-rpc-servers:
     machine:
       image: ubuntu-2004:202010-01
@@ -1024,6 +1013,16 @@ jobs:
           name: "Test"
           command: cond_run_script end-to-end ./scripts/run_tests_local sample-dapp ./scripts/docker-compose-e2e-sandbox.yml
 
+  guides-up-quick-start:
+    machine:
+      image: ubuntu-2004:202010-01
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_run_script end-to-end ./scripts/run_tests_local guides/up_quick_start.test.ts ./scripts/docker-compose-e2e-sandbox.yml
+
   e2e-canary-test:
     machine:
       image: ubuntu-2004:202010-01
@@ -1229,37 +1228,37 @@ jobs:
           command: build canary true
 
   run-deployment-canary-uniswap:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary docker-compose.yml
+          command: run_script canary ./scripts/run_tests ./src/uniswap_trade_on_l1_from_l2.test.ts canary ./scripts/docker-compose.yml
 
   run-deployment-canary-browser:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary docker-compose.yml
+          command: run_script canary ./scripts/run_tests ./src/aztec_js_browser.test.ts canary ./scripts/docker-compose.yml
 
   run-deployment-canary-cli:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary docker-compose.yml
+          command: run_script canary ./scripts/run_tests ./src/cli.test.ts canary ./scripts/docker-compose.yml
 
 # Repeatable config for defining the workflow below.
 tag_regex: &tag_regex /^aztec-packages-v.*/
@@ -1305,8 +1304,6 @@ workflows:
     when:
       equal: [system, << pipeline.parameters.workflow >>]
     jobs:
-      - build-docs: *defaults
-
       # Barretenberg
       - barretenberg-x86_64-linux-gcc: *defaults
       - barretenberg-x86_64-linux-clang: *defaults
@@ -1399,7 +1396,8 @@ workflows:
             - l1-contracts
             - noir-contracts-build
           <<: *defaults
-
+
+      - build-docs: *yarn_project
       - aztec-js: *yarn_project
       - end-to-end: *yarn_project
       - ethereum: *yarn_project
@@ -1420,7 +1418,6 @@ workflows:
       - sequencer-client: *yarn_project
       - types: *yarn_project
       - circuits-js: *yarn_project
-      - rollup-provider: *yarn_project
       - aztec-sandbox-base: *yarn_project
       - canary: *yarn_project
 
@@ -1461,7 +1458,6 @@ workflows:
             - sequencer-client
             - types
             - circuits-js
-            - rollup-provider
             - aztec-sandbox-ecr-manifest
             - canary
           <<: *defaults
@@ -1499,6 +1495,7 @@ workflows:
       - guides-writing-an-account-contract: *e2e_test
       - guides-dapp-testing: *e2e_test
       - guides-sample-dapp: *e2e_test
+      - guides-up-quick-start: *e2e_test
 
       - e2e-end:
           requires:
@@ -1535,6 +1532,7 @@ workflows:
             - guides-writing-an-account-contract
             - guides-dapp-testing
             - guides-sample-dapp
+            - guides-up-quick-start
           <<: *defaults
 
         # Deployment and Canary tests

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  ".": "0.7.9",
-  "barretenberg": "0.7.9",
-  "barretenberg/ts": "0.7.9"
+  ".": "0.7.10",
+  "barretenberg": "0.7.10",
+  "barretenberg/ts": "0.7.10"
 }

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.7.10](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.7.9...aztec-packages-v0.7.10) (2023-09-20)
+
+
+### Features
+
+* Aztec-cli unbox "really empty box" ([#2388](https://github.com/AztecProtocol/aztec-packages/issues/2388)) ([b57182d](https://github.com/AztecProtocol/aztec-packages/commit/b57182d6dff9fc27d5fb555a4c4cb948d9e5cc55))
+* **docs:** Document noir macros  ([#2016](https://github.com/AztecProtocol/aztec-packages/issues/2016)) ([1f1a17f](https://github.com/AztecProtocol/aztec-packages/commit/1f1a17fe056d8898c4c065fb6244e53da04800cb))
+* **docs:** Include aztec rpc interface typedoc output in docs ([#2255](https://github.com/AztecProtocol/aztec-packages/issues/2255)) ([62c9e9b](https://github.com/AztecProtocol/aztec-packages/commit/62c9e9bfdc9535ccfc6bd76782971e22478a7784))
+* **token portal standard:** Create a token portal standard ([#2351](https://github.com/AztecProtocol/aztec-packages/issues/2351)) ([426a3ea](https://github.com/AztecProtocol/aztec-packages/commit/426a3ea6a5c3529b4edaea94affaece97d39a35b))
+
+
+### Bug Fixes
+
+* **build:** Fix build system post deployment tests ([#2420](https://github.com/AztecProtocol/aztec-packages/issues/2420)) ([d509dc3](https://github.com/AztecProtocol/aztec-packages/commit/d509dc359c4cd9dc37492a434a1eb3813c002839))
+* CLI encoding for arrays and structs ([#2407](https://github.com/AztecProtocol/aztec-packages/issues/2407)) ([85283bd](https://github.com/AztecProtocol/aztec-packages/commit/85283bdd5b0916c207dca11ad17338f524ae18f6))
+* Correct sandbox addresses in up-quick-start test ([#2412](https://github.com/AztecProtocol/aztec-packages/issues/2412)) ([974d859](https://github.com/AztecProtocol/aztec-packages/commit/974d85922fc11734c543e7ce9fe7edaad527bd69))
+* **docs:** Revert include aztec rpc interface typedoc output in docs ([#2255](https://github.com/AztecProtocol/aztec-packages/issues/2255)) ([f852432](https://github.com/AztecProtocol/aztec-packages/commit/f85243298ef2a5c01764e592c6f6ea50d835bf07))
+* Handle falsy bigints in json-rpc ([#2403](https://github.com/AztecProtocol/aztec-packages/issues/2403)) ([d100650](https://github.com/AztecProtocol/aztec-packages/commit/d100650d107b6685e17fcdbbf68363505c5ed0ed)), closes [#2402](https://github.com/AztecProtocol/aztec-packages/issues/2402)
+* **nargo_check.sh:** UNIX standard grep ([#2396](https://github.com/AztecProtocol/aztec-packages/issues/2396)) ([02e788a](https://github.com/AztecProtocol/aztec-packages/commit/02e788a8e39c7fcb5c75a6aaf4ceb705a8ebaa4a))
+
+
+### Miscellaneous
+
+* **docs:** Note getter options ([#2411](https://github.com/AztecProtocol/aztec-packages/issues/2411)) ([8a95d8c](https://github.com/AztecProtocol/aztec-packages/commit/8a95d8cb6287689b90149b44968cab4ba3e13e28))
+* Update docs url in config  ([#2386](https://github.com/AztecProtocol/aztec-packages/issues/2386)) ([e44066d](https://github.com/AztecProtocol/aztec-packages/commit/e44066da3cca70a8494c6822b3bc231679acaf16))
+
 ## [0.7.9](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.7.8...aztec-packages-v0.7.9) (2023-09-19)
 
 

VERSION

@@ -1 +1 @@
-v0.7.9 x-release-please-version
+v0.7.10 x-release-please-version

barretenberg/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.7.10](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.7.9...barretenberg-v0.7.10) (2023-09-20)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
 ## [0.7.9](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.7.8...barretenberg-v0.7.9) (2023-09-19)
 
 

barretenberg/VERSION

@@ -1 +1 @@
-v0.7.9 x-release-please-version
+v0.7.10 x-release-please-version

barretenberg/barretenberg-wasm.nix

@@ -6,7 +6,7 @@ in
 stdenv.mkDerivation
 {
   pname = "barretenberg.wasm";
-  version = "0.7.9"; # x-release-please-version
+  version = "0.7.10"; # x-release-please-version
 
   src = ./cpp;
 

barretenberg/barretenberg.nix

@@ -14,7 +14,7 @@ in
 buildEnv.mkDerivation
 {
   pname = "libbarretenberg";
-  version = "0.7.9"; # x-release-please-version
+  version = "0.7.10"; # x-release-please-version
 
   src = ./cpp;
 

barretenberg/cpp/CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     Barretenberg
     DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover"
-    VERSION 0.7.9 # x-release-please-version
+    VERSION 0.7.10 # x-release-please-version
     LANGUAGES CXX C
 )
 

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

@@ -332,6 +332,14 @@ int main(int argc, char* argv[])
         std::string vk_path = getOption(args, "-k", "./target/vk");
         CRS_PATH = getOption(args, "-c", "./crs");
         bool recursive = flagPresent(args, "-r") || flagPresent(args, "--recursive");
+
+        // Skip CRS initialization for any command which doesn't require the CRS.
+        if (command == "info") {
+            std::string output_path = getOption(args, "-o", "info.json");
+            acvmInfo(output_path);
+            return 0;
+        }
+
         init();
 
         if (command == "prove_and_verify") {
@@ -355,9 +363,6 @@ int main(int argc, char* argv[])
         } else if (command == "vk_as_fields") {
             std::string output_path = getOption(args, "-o", vk_path + "_fields.json");
             vkAsFields(vk_path, output_path);
-        } else if (command == "info") {
-            std::string output_path = getOption(args, "-o", "info.json");
-            acvmInfo(output_path);
         } else {
             std::cerr << "Unknown command: " << command << "\n";
             return 1;

barretenberg/ts/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.7.10](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.7.9...barretenberg.js-v0.7.10) (2023-09-20)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
 ## [0.7.9](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.7.8...barretenberg.js-v0.7.9) (2023-09-19)
 
 

barretenberg/ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb.js",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
   "license": "MIT",
   "type": "module",

build-system/scripts/run_script

@@ -0,0 +1,13 @@
+#!/bin/bash
+# Runs a script from within the provided repository project directory
+#
+# Arguments are:
+# 1. REPOSITORY: The project repository name in ECR.
+# 2... ARGS: Script and arguments to run.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
+
+REPOSITORY=$1
+shift
+cd $(query_manifest projectDir $REPOSITORY)
+$@

build_manifest.json

@@ -90,7 +90,9 @@
     "rebuildPatterns": [
       "^docs/",
       "^.*.cpp$",
-      "^.*.ts$"
+      "^.*.ts$",
+      "^.release-please-manifest.json$",
+      "^.*/noir-version.json$"
     ]
   },
   "l1-contracts": {
@@ -218,10 +220,6 @@
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/prover-client"
   },
-  "rollup-provider": {
-    "buildDir": "yarn-project",
-    "projectDir": "yarn-project/rollup-provider"
-  },
   "aztec-node": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/aztec-node"
@@ -238,4 +236,4 @@
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/world-state"
   }
-}
+}

circuits/cpp/src/aztec3/circuits/apps/.test.cpp

@@ -208,7 +208,7 @@ TEST_F(state_var_tests, circuit_utxo_of_default_private_note_fr)
                      .creator_address = msg_sender,
                      .memo = 1234 });
 
-    exec_ctx.finalise();
+    exec_ctx.finalize();
 
     // Here, we test that the shared_ptr of a note, stored within the exec_ctx, works. TODO: put this in its own little
     // test, instead of this ever-growing beast test.
@@ -270,7 +270,7 @@ TEST_F(state_var_tests, circuit_utxo_set_of_default_private_notes_fr)
         .memo = 1234,
     });
 
-    exec_ctx.finalise();
+    exec_ctx.finalize();
 
     // Here, we test that the shared_ptr of a note, stored within the exec_ctx, works. TODO: put this in its own little
     // test, instead of this ever-growing beast test.
@@ -318,7 +318,7 @@ TEST_F(state_var_tests, circuit_initialise_utxo_of_default_singleton_private_not
 
     my_utxo.initialise({ .value = 100, .owner = owner_of_initialised_note });
 
-    exec_ctx.finalise();
+    exec_ctx.finalize();
 
     // Here, we test that the shared_ptr of a note, stored within the exec_ctx, works. TODO: put this in its own little
     // test, instead of this ever-growing beast test.
@@ -367,7 +367,7 @@ TEST_F(state_var_tests, circuit_modify_utxo_of_default_singleton_private_note_fr
         .owner = msg_sender,
     });
 
-    exec_ctx.finalise();
+    exec_ctx.finalize();
 
     // Here, we test that the shared_ptr of a note, stored within the exec_ctx, works. TODO: put this in its own little
     // test, instead of this ever-growing beast test.

circuits/cpp/src/aztec3/circuits/apps/function_execution_context.hpp

@@ -67,7 +67,7 @@ template <typename Builder> class FunctionExecutionContext {
 
     PrivateCircuitPublicInputs<NT> final_private_circuit_public_inputs{};
 
-    bool is_finalised = false;
+    bool is_finalized = false;
 
   public:
     FunctionExecutionContext(Builder& builder, OracleWrapperInterface<Builder>& oracle)
@@ -101,8 +101,8 @@ template <typename Builder> class FunctionExecutionContext {
     PrivateCircuitPublicInputs<NT> get_final_private_circuit_public_inputs()
     {
         // For safety, only return this if the circuit is complete.
-        if (!is_finalised) {
-            throw_or_abort("You need to call exec_ctx.finalise() in your circuit first.");
+        if (!is_finalized) {
+            throw_or_abort("You need to call exec_ctx.finalize() in your circuit first.");
         }
         return final_private_circuit_public_inputs;
     }
@@ -287,7 +287,7 @@ template <typename Builder> class FunctionExecutionContext {
      * TODO: Might need some refactoring. Roles between: Opcodes modifying exec_ctx members; and the exec_ctx directly
      * modifying its members, are somewhat blurred at the moment.
      */
-    void finalise_utxos()
+    void finalize_utxos()
     {
         // Copy some vectors, as we can't control whether they'll be pushed-to further, when we call Note methods.
         auto new_nullifiers_copy = new_nullifiers;
@@ -319,16 +319,16 @@ template <typename Builder> class FunctionExecutionContext {
         std::copy(new_nonces.begin(), new_nonces.end(), std::back_inserter(new_nullifiers));
     }
 
-    void finalise()
+    void finalize()
     {
-        finalise_utxos();
+        finalize_utxos();
         private_circuit_public_inputs.set_commitments(new_commitments);
         private_circuit_public_inputs.set_nullifiers(new_nullifiers);
         private_circuit_public_inputs.set_nullified_commitments(nullified_commitments);
         private_circuit_public_inputs.set_public(builder);
         final_private_circuit_public_inputs =
             private_circuit_public_inputs.remove_optionality().template to_native_type<Builder>();
-        is_finalised = true;
+        is_finalized = true;
     }
 };