AztecProtocol · PhilWindle · May 25, 2023 · Apr 30, 2023 · May 2, 2023 · May 2, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -286,6 +286,17 @@ jobs:
           name: "Build and test"
           command: build p2p
 
+  p2p-bootstrap:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build p2p-bootstrap
+
   acir-simulator:
     machine:
       image: ubuntu-2004:202010-01
@@ -352,6 +363,28 @@ jobs:
           name: "Build"
           command: build end-to-end
 
+  blockchain:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: build blockchain
+
+  rollup-provider:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: build rollup-provider
+
   e2e-deploy-contract:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -429,6 +462,17 @@ jobs:
           name: "Test"
           command: cond_spot_run_tests end-to-end e2e_public_token_contract.test.ts
 
+  e2e-p2p:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_tests end-to-end e2e_p2p_network.test.ts
+
   e2e-join:
     docker:
       - image: cimg/base:current
@@ -512,6 +556,7 @@ workflows:
 
       - aztec-js: *yarn_project
       - end-to-end: *yarn_project
+      - blockchain: *yarn_project
       - foundation: *yarn_project
       - world-state: *yarn_project
       - acir-simulator: *yarn_project
@@ -520,16 +565,19 @@ workflows:
       - barretenberg-js: *yarn_project
       - merkle-tree: *yarn_project
       - p2p: *yarn_project
+      - p2p-bootstrap: *yarn_project
       - noir-contracts: *yarn_project
       - noir-compiler: *yarn_project
       - sequencer-client: *yarn_project
       - types: *yarn_project
       - circuits-js: *yarn_project
+      - rollup-provider: *yarn_project
 
       - e2e-join:
           requires:
             - aztec-js
             - end-to-end
+            - blockchain
             - foundation
             - world-state
             - acir-simulator
@@ -538,11 +586,13 @@ workflows:
             - barretenberg-js
             - merkle-tree
             - p2p
+            - p2p-bootstrap
             - noir-contracts
             - noir-compiler
             - sequencer-client
             - types
             - circuits-js
+            - rollup-provider
           <<: *defaults
 
       - e2e-deploy-contract: *e2e_test
@@ -552,6 +602,7 @@ workflows:
       - e2e-public-token-contract: *e2e_test
       - e2e-l2-to-l1-messaging: *e2e_test
       - integration-l1-publisher: *e2e_test
+      - e2e-p2p: *e2e_test
 
       - e2e-end:
           requires:
@@ -562,4 +613,5 @@ workflows:
             - e2e-public-token-contract
             - e2e-l2-to-l1-messaging
             - integration-l1-publisher
+            - e2e-p2p
           <<: *defaults
diff --git a/build_manifest.json b/build_manifest.json
@@ -104,6 +104,7 @@
       "^yarn-project/archiver/"
     ],
     "dependencies": [
+      "blockchain",
       "foundation",
       "l1-artifacts",
       "types"
@@ -117,7 +118,12 @@
       "^yarn-project/aztec-cli/"
     ],
     "dependencies": [
-      "foundation"
+      "aztec-node",
+      "aztec.js",
+      "blockchain",
+      "foundation",
+      "l1-artifacts",
+      "noir-contracts"
     ]
   },
   "aztec-rpc": {
@@ -188,14 +194,28 @@
     "dependencies": [
       "aztec-node",
       "aztec.js",
+      "blockchain",
       "circuits.js",
       "foundation",
       "l1-artifacts",
       "noir-contracts",
+      "p2p",
       "sequencer-client",
       "world-state"
     ]
   },
+  "blockchain": {
+    "buildDir": "yarn-project",
+    "projectDir": "yarn-project/blockchain",
+    "dockerfile": "blockchain/Dockerfile",
+    "rebuildPatterns": [
+      "^yarn-project/blockchain/"
+    ],
+    "dependencies": [
+      "foundation",
+      "l1-artifacts"
+    ]
+  },
   "foundation": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/foundation",
@@ -265,6 +285,17 @@
       "types"
     ]
   },
+  "p2p-bootstrap": {
+    "buildDir": "yarn-project",
+    "projectDir": "yarn-project/p2p-bootstrap",
+    "dockerfile": "p2p/Dockerfile",
+    "rebuildPatterns": [
+      "^yarn-project/p2p-bootstrap/"
+    ],
+    "dependencies": [
+      "p2p"
+    ]
+  },
   "prover-client": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/prover-client",
@@ -276,6 +307,17 @@
       "foundation"
     ]
   },
+  "rollup-provider": {
+    "buildDir": "yarn-project",
+    "projectDir": "yarn-project/rollup-provider",
+    "dockerfile": "rollup-provider/Dockerfile",
+    "rebuildPatterns": [
+      "^yarn-project/rollup-provider/"
+    ],
+    "dependencies": [
+      "aztec-node"
+    ]
+  },
   "aztec-node": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/aztec-node",
@@ -304,6 +346,7 @@
     ],
     "dependencies": [
       "acir-simulator",
+      "blockchain",
       "circuits.js",
       "foundation",
       "l1-artifacts",

diff --git a/circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp b/circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp
@@ -1,5 +1,4 @@
 #include "c_bind.h"
-
 #include "function_leaf_preimage.hpp"
 #include "tx_request.hpp"
 

diff --git a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp
@@ -134,7 +134,7 @@ template <typename NCT> std::ostream& operator<<(std::ostream& os, PrivateCallDa
 // specialize the name in msgpack schema generation
 // consumed by the typescript schema compiler, helps disambiguate templates
 template <typename NCT> inline std::string msgpack_schema_name(
-    aztec3::circuits::abis::CallStackItem<NCT, aztec3::circuits::abis::PrivateTypes> const&) // NOLINT
+    aztec3::circuits::abis::CallStackItem<NCT, aztec3::circuits::abis::PrivateTypes> const&)  // NOLINT
 {
     return "PrivateCallStackItem";
 }
diff --git a/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_call_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_call_data.hpp
@@ -114,7 +114,7 @@ template <typename NCT> std::ostream& operator<<(std::ostream& os, PublicCallDat
 // specialize the name in msgpack schema generation
 // consumed by the typescript schema compiler, helps disambiguate templates
 template <typename NCT> inline std::string msgpack_schema_name(
-    aztec3::circuits::abis::CallStackItem<NCT, aztec3::circuits::abis::PublicTypes> const&) // NOLINT
+    aztec3::circuits::abis::CallStackItem<NCT, aztec3::circuits::abis::PublicTypes> const&)  // NOLINT
 {
     return "PublicCallStackItem";
 }
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp b/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
@@ -161,7 +161,7 @@ void perform_historical_contract_data_tree_membership_checks(DummyComposer& comp
         NT::fr const leaf =
             baseRollupInputs.kernel_data[i]
                 .public_inputs.constants.historic_tree_roots.private_historic_tree_roots.contract_tree_root;
-        abis::MembershipWitness<NT, PRIVATE_DATA_TREE_ROOTS_TREE_HEIGHT> const historic_root_witness =
+        abis::MembershipWitness<NT, CONTRACT_TREE_ROOTS_TREE_HEIGHT> const historic_root_witness =
             baseRollupInputs.historic_contract_tree_root_membership_witnesses[i];
 
         check_membership<NT>(composer,
@@ -182,7 +182,7 @@ void perform_historical_l1_to_l2_message_tree_membership_checks(DummyComposer& c
         NT::fr const leaf =
             baseRollupInputs.kernel_data[i]
                 .public_inputs.constants.historic_tree_roots.private_historic_tree_roots.l1_to_l2_messages_tree_root;
-        abis::MembershipWitness<NT, PRIVATE_DATA_TREE_ROOTS_TREE_HEIGHT> const historic_root_witness =
+        abis::MembershipWitness<NT, L1_TO_L2_MSG_TREE_ROOTS_TREE_HEIGHT> const historic_root_witness =
             baseRollupInputs.historic_l1_to_l2_msg_tree_root_membership_witnesses[i];
 
         check_membership<NT>(composer,

diff --git a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.cpp b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.cpp
@@ -327,14 +327,16 @@ RootRollupInputs get_root_rollup_inputs(utils::DummyComposer& composer,
     historic_contract_tree.update_element(0, contract_tree.root());
     historic_l1_to_l2_msg_tree.update_element(0, l1_to_l2_msg_tree.root());
 
+    // Historic trees sibling paths
     auto historic_data_sibling_path =
         get_sibling_path<PRIVATE_DATA_TREE_ROOTS_TREE_HEIGHT>(historic_private_data_tree, 1, 0);
     auto historic_contract_sibling_path =
         get_sibling_path<CONTRACT_TREE_ROOTS_TREE_HEIGHT>(historic_contract_tree, 1, 0);
     auto historic_l1_to_l2_msg_sibling_path =
         get_sibling_path<L1_TO_L2_MSG_TREE_ROOTS_TREE_HEIGHT>(historic_l1_to_l2_msg_tree, 1, 0);
-    auto l1_to_l2_tree_sibling_path = get_sibling_path<L1_TO_L2_MSG_SUBTREE_INCLUSION_CHECK_DEPTH>(
-        l1_to_l2_msg_tree, 0, L1_TO_L2_MSG_SUBTREE_INCLUSION_CHECK_DEPTH);
+    // l1 to l2 tree
+    auto l1_to_l2_tree_sibling_path =
+        get_sibling_path<L1_TO_L2_MSG_SUBTREE_INCLUSION_CHECK_DEPTH>(l1_to_l2_msg_tree, 0, L1_TO_L2_MSG_SUBTREE_DEPTH);
 
     // l1_to_l2_message tree snapshots
     AppendOnlyTreeSnapshot const start_l1_to_l2_msg_tree_snapshot = {

diff --git a/circuits/cpp/src/aztec3/constants.hpp b/circuits/cpp/src/aztec3/constants.hpp
@@ -27,7 +27,7 @@ constexpr size_t KERNEL_PUBLIC_DATA_READS_LENGTH = 4;
 
 constexpr size_t VK_TREE_HEIGHT = 3;
 constexpr size_t FUNCTION_TREE_HEIGHT = 4;
-constexpr size_t CONTRACT_TREE_HEIGHT = 4;
+constexpr size_t CONTRACT_TREE_HEIGHT = 8;
 constexpr size_t PRIVATE_DATA_TREE_HEIGHT = 8;
 constexpr size_t NULLIFIER_TREE_HEIGHT = 8;
 constexpr size_t PUBLIC_DATA_TREE_HEIGHT = 254;

diff --git a/circuits/cpp/src/aztec3/utils/msgpack_derived_equals.hpp b/circuits/cpp/src/aztec3/utils/msgpack_derived_equals.hpp
@@ -4,7 +4,7 @@
 namespace aztec3::utils {
 // Auxiliary function for comparison of elements from tuples
 template <typename Tuple1, typename Tuple2, std::size_t... I>
-auto _compare_msgpack_tuples(const Tuple1& t1, const Tuple2& t2, std::index_sequence<I...>) // NOLINT
+auto _compare_msgpack_tuples(const Tuple1& t1, const Tuple2& t2, std::index_sequence<I...>)  // NOLINT
 {
     // Compare every 2nd value from our key1, value1, key2, value2 list
     return ((std::get<I * 2 + 1>(t1) == std::get<I * 2 + 1>(t2)) && ...);
@@ -17,8 +17,8 @@ template <typename BoolLike, typename T> BoolLike msgpack_derived_equals(const T
 {
     BoolLike are_equal;
     // De-serialize objects to alternating key-value tuples and compare the values
-    const_cast<T&>(obj1).msgpack([&](auto&... args1) { // NOLINT
-        const_cast<T&>(obj2).msgpack([&](auto&... args2) { // NOLINT
+    const_cast<T&>(obj1).msgpack([&](auto&... args1) {      // NOLINT
+        const_cast<T&>(obj2).msgpack([&](auto&... args2) {  // NOLINT
             auto tuple1 = std::tie(args1...);
             auto tuple2 = std::tie(args2...);
             are_equal = _compare_msgpack_tuples(tuple1, tuple2, std::make_index_sequence<sizeof...(args1) / 2>{});

diff --git a/circuits/cpp/src/aztec3/utils/msgpack_derived_output.hpp b/circuits/cpp/src/aztec3/utils/msgpack_derived_output.hpp
@@ -22,12 +22,12 @@ inline void _msgpack_derived_output_helper(std::ostream& os,
     os << key << ": ";
     msgpack_derived_output(os, value);
     os << '\n';
-    _msgpack_derived_output_helper(os, rest...); // NOLINT
+    _msgpack_derived_output_helper(os, rest...);  // NOLINT
 }
 // Specialization if we have msgpack
 template <msgpack_concepts::HasMsgPack T> void msgpack_derived_output(std::ostream& os, const T& value)
 {
-    const_cast<T&>(value).msgpack([&](auto&... args) { _msgpack_derived_output_helper(os, args...); }); // NOLINT
+    const_cast<T&>(value).msgpack([&](auto&... args) { _msgpack_derived_output_helper(os, args...); });  // NOLINT
 }
 
 // Otherwise

diff --git a/l1-contracts/src/periphery/UnverifiedDataEmitter.sol b/l1-contracts/src/periphery/UnverifiedDataEmitter.sol
@@ -15,13 +15,14 @@ contract UnverifiedDataEmitter is IUnverifiedDataEmitter {
    * @notice Logs data on chain
    * @dev Emits an `UnverifiedData` event
    * @param _l2BlockNum - The l2 block number that the unverified data is related to
+   * @param _l2BlockHash - The hash of the L2 block that this is related to
    * @param _data - Raw data to share
    */
-  function emitUnverifiedData(uint256 _l2BlockNum, bytes calldata _data)
+  function emitUnverifiedData(uint256 _l2BlockNum, bytes32 _l2BlockHash, bytes calldata _data)
     external
     override(IUnverifiedDataEmitter)
   {
-    emit UnverifiedData(_l2BlockNum, msg.sender, _data);
+    emit UnverifiedData(_l2BlockNum, msg.sender, _l2BlockHash, _data);
   }
 
   /**
@@ -31,14 +32,16 @@ contract UnverifiedDataEmitter is IUnverifiedDataEmitter {
    * @param _l2BlockNum - The L2 block number that the contract deployment is related to
    * @param _aztecAddress - The address of the L2 counterparty
    * @param _portalAddress - The address of the L1 counterparty
+   * @param _l2BlockHash - The hash of the L2 block that this is related to
    * @param _acir - The acir bytecode of the L2 contract
    */
   function emitContractDeployment(
     uint256 _l2BlockNum,
     bytes32 _aztecAddress,
     address _portalAddress,
+    bytes32 _l2BlockHash,
     bytes calldata _acir
   ) external override(IUnverifiedDataEmitter) {
-    emit ContractDeployment(_l2BlockNum, _aztecAddress, _portalAddress, _acir);
+    emit ContractDeployment(_l2BlockNum, _aztecAddress, _portalAddress, _l2BlockHash, _acir);
   }
 }
diff --git a/l1-contracts/src/periphery/interfaces/IUnverifiedDataEmitter.sol b/l1-contracts/src/periphery/interfaces/IUnverifiedDataEmitter.sol
@@ -15,30 +15,37 @@ interface IUnverifiedDataEmitter {
    * @param l2BlockNum - The L2 block number that the information is related to
    * @param aztecAddress - The address of the L2 counterparty
    * @param portalAddress - The address of the L1 counterparty
+   * @param l2BlockHash - The hash of the L2 block that this is related to
    * @param acir - The acir bytecode of the L2 contract
    */
   event ContractDeployment(
     uint256 indexed l2BlockNum,
     bytes32 indexed aztecAddress,
     address indexed portalAddress,
+    bytes32 l2BlockHash,
     bytes acir
   );
 
   /**
    * @notice Used to share data which are not required to advance the state but are needed for other purposes
    * @param l2BlockNum - The L2 block number that the information is related to
    * @param sender - The address of the account sharing the information
+   * @param l2BlockHash - The hash of the L2 block that this is related to.
    * @param data - The information represented as raw bytes
    * @dev Typically contains `TxAuxData` (preimage, contract address and contract slot)
    */
-  event UnverifiedData(uint256 indexed l2BlockNum, address indexed sender, bytes data);
+  event UnverifiedData(
+    uint256 indexed l2BlockNum, address indexed sender, bytes32 indexed l2BlockHash, bytes data
+  );
 
-  function emitUnverifiedData(uint256 _l2BlockNum, bytes calldata _data) external;
+  function emitUnverifiedData(uint256 _l2BlockNum, bytes32 _l2BlockHash, bytes calldata _data)
+    external;
 
   function emitContractDeployment(
     uint256 _l2BlockNum,
     bytes32 _aztecAddress,
     address _portalAddress,
+    bytes32 _l2BlockHash,
     bytes calldata _acir
   ) external;
 }