Merge branch 'master' into lh/1281

AztecProtocol · Aug 2, 2023 · d935c36 · d935c36
2 parents 2a13836 + 7a1c4f7
commit d935c36
Show file tree

Hide file tree

Showing 125 changed files with 3,197 additions and 1,312 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -804,17 +804,18 @@ jobs:
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_pending_commitments_contract.test.ts
           working_directory: yarn-project/end-to-end
 
-  uniswap-trade-on-l1-from-l2:
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local uniswap_trade_on_l1_from_l2.test.ts
-          working_directory: yarn-project/end-to-end
+  # TODO(AD): Reenable after #1367
+  # uniswap-trade-on-l1-from-l2:
+  #   machine:
+  #     image: ubuntu-2004:202010-01
+  #   resource_class: large
+  #   steps:
+  #     - *checkout
+  #     - *setup_env
+  #     - run:
+  #         name: "Test"
+  #         command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local uniswap_trade_on_l1_from_l2.test.ts
+  #         working_directory: yarn-project/end-to-end
 
   integration-archiver-l1-to-l2:
     machine:
@@ -863,7 +864,19 @@ jobs:
           name: "Test"
           command: cond_spot_run_tests end-to-end e2e_p2p_network.test.ts
 
-  e2e-uniswap-sandbox:
+  # TODO(AD): Reenable after #1367
+  # e2e-uniswap-sandbox:
+  #   docker:
+  #     - image: aztecprotocol/alpine-build-image
+  #   resource_class: small
+  #   steps:
+  #     - *checkout
+  #     - *setup_env
+  #     - run:
+  #         name: "Test"
+  #         command: cond_spot_run_tests end-to-end uniswap_trade_on_l1_from_l2.test.ts docker-compose-e2e-sandbox.yml
+
+  e2e-browser-sandbox:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -872,7 +885,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests end-to-end uniswap_trade_on_l1_from_l2.test.ts docker-compose-e2e-sandbox.yml
+          command: cond_spot_run_tests end-to-end e2e_aztec_js_browser.test.ts docker-compose-e2e-sandbox.yml
 
   e2e-join:
     docker:
@@ -1146,11 +1159,14 @@ workflows:
       - e2e-account-contracts: *e2e_test
       - e2e-escrow-contract: *e2e_test
       - e2e-pending-commitments-contract: *e2e_test
-      - uniswap-trade-on-l1-from-l2: *e2e_test
+      # TODO(AD): Reenable after #1367
+      # - uniswap-trade-on-l1-from-l2: *e2e_test
       - integration-l1-publisher: *e2e_test
       - integration-archiver-l1-to-l2: *e2e_test
       - e2e-p2p: *e2e_test
-      - e2e-uniswap-sandbox: *e2e_test
+      # TODO(AD): Reenable after #1367
+      # - e2e-uniswap-sandbox: *e2e_test
+      - e2e-browser-sandbox: *e2e_test
 
       - e2e-end:
           requires:
@@ -1169,11 +1185,14 @@ workflows:
             - e2e-account-contracts
             - e2e-escrow-contract
             - e2e-pending-commitments-contract
-            - uniswap-trade-on-l1-from-l2
+            # TODO(AD): Reenable after #1367
+            # - uniswap-trade-on-l1-from-l2
             - integration-l1-publisher
             - integration-archiver-l1-to-l2
             - e2e-p2p
-            - e2e-uniswap-sandbox
+            # TODO(AD): Reenable after #1367
+            # - e2e-uniswap-sandbox
+            - e2e-browser-sandbox
           <<: *defaults
 
       - deploy-dockerhub:

diff --git a/circuits/cpp/src/aztec3/constants.hpp b/circuits/cpp/src/aztec3/constants.hpp
@@ -45,8 +45,8 @@ constexpr size_t MAX_NEW_NULLIFIERS_PER_CALL = 4;
 constexpr size_t MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL = 4;
 constexpr size_t MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL = 4;
 constexpr size_t MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
-constexpr size_t MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 4;
-constexpr size_t MAX_PUBLIC_DATA_READS_PER_CALL = 4;
+constexpr size_t MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 8;
+constexpr size_t MAX_PUBLIC_DATA_READS_PER_CALL = 8;
 constexpr size_t MAX_READ_REQUESTS_PER_CALL = 4;
 
 
@@ -56,8 +56,8 @@ constexpr size_t MAX_NEW_NULLIFIERS_PER_TX = MAX_PRIVATE_CALL_STACK_LENGTH_PER_C
 constexpr size_t MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX = 8;
 constexpr size_t MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX = 8;
 constexpr size_t MAX_NEW_L2_TO_L1_MSGS_PER_TX = 2;
-constexpr size_t MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 4;
-constexpr size_t MAX_PUBLIC_DATA_READS_PER_TX = 4;
+constexpr size_t MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 8;
+constexpr size_t MAX_PUBLIC_DATA_READS_PER_TX = 8;
 constexpr size_t MAX_NEW_CONTRACTS_PER_TX = 1;
 constexpr size_t MAX_OPTIONALLY_REVEALED_DATA_LENGTH_PER_TX = 4;
 constexpr size_t MAX_READ_REQUESTS_PER_TX = MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL * MAX_READ_REQUESTS_PER_CALL;
@@ -243,7 +243,7 @@ constexpr size_t PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH =
     2 + RETURN_VALUES_LENGTH +  // + 1 for args_hash + 1 call_context.hash
     MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL + MAX_PUBLIC_DATA_READS_PER_CALL + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
     MAX_NEW_COMMITMENTS_PER_CALL + MAX_NEW_NULLIFIERS_PER_CALL + MAX_NEW_L2_TO_L1_MSGS_PER_CALL +
-    NUM_FIELDS_PER_SHA256 +  // unencrypted_logs_hash
+    NUM_FIELDS_PER_SHA256 +  // unencrypted_logs_hash (being represented by NUM_FIELDS_PER_SHA256)
     3;                       // unencrypted_log_preimages_length + historic_public_data_tree_root + prover_address
 
 

diff --git a/docs/.gitrepo b/docs/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/docs
 	branch = main
-	commit = 94f3b72e41f70f795194224e98b6939483431bc8
-	parent = d70c45b9a27189258daf767f2860bfc3894783a1
+	commit = f109839e4698c38c8e37d630bdbebe1cb13c6973
+	parent = cb774405e89c71a622e32b51032aa761cd767959
 	method = merge
 	cmdver = 0.4.6
diff --git a/docs/docs/aztec/developer/wallet-providers/keys.md b/docs/docs/aztec/developer/wallet-providers/keys.md
@@ -107,7 +107,7 @@ An application in Noir can request a nullifier from the current user for computi
 
 ```noir
 fn compute_nullifier(self) -> Field {
-    let siloed_note_hash = compute_siloed_note_hash(ValueNoteInterface, self);
+    let siloed_note_hash = compute_siloed_note_hash(ValueNoteMethods, self);
     let secret = get_secret_key(self.owner);
     dep::std::hash::pedersen([siloed_note_hash, secret])[0]
 }

diff --git a/l1-contracts/src/core/libraries/Constants.sol b/l1-contracts/src/core/libraries/Constants.sol
@@ -17,7 +17,7 @@ library Constants {
   // TODO(962): Make this constant consistent across the codebase.
   uint256 internal constant COMMITMENTS_PER_TX = 16;
   uint256 internal constant NULLIFIERS_PER_TX = 16;
-  uint256 internal constant PUBLIC_DATA_WRITES_PER_TX = 4;
+  uint256 internal constant PUBLIC_DATA_WRITES_PER_TX = 8;
   uint256 internal constant CONTRACTS_PER_TX = 1;
   uint256 internal constant L2_TO_L1_MSGS_PER_TX = 2;
   uint256 internal constant L1_TO_L2_MSGS_PER_BASE_ROLLUP = 16;