just use one type of public inputs for base/merge (#168)

AztecProtocol · Apr 6, 2023 · 51e4aca · 51e4aca
1 parent b6a3bb2
commit 51e4aca
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp b/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp
@@ -27,9 +27,6 @@ template <typename NCT> struct BaseOrMergeRollupPublicInputs {
 
     AggregationObject end_aggregation_object;
     ConstantRollupData<NCT> constants;
-    // subtree  height is always 0 for base.
-    // so that we always pass-in two base/merge circuits of the same height into the next level of recursion
-    fr rollup_subtree_height;
 
     AppendOnlyTreeSnapshot<NCT> start_private_data_tree_snapshot;
     AppendOnlyTreeSnapshot<NCT> end_private_data_tree_snapshot;
@@ -55,7 +52,6 @@ template <typename NCT> void read(uint8_t const*& it, BaseOrMergeRollupPublicInp
     read(it, obj.rollup_subtree_height);
     read(it, obj.end_aggregation_object);
     read(it, obj.constants);
-    read(it, obj.rollup_subtree_height);
     read(it, obj.start_private_data_tree_snapshot);
     read(it, obj.end_private_data_tree_snapshot);
     read(it, obj.start_nullifier_tree_snapshot);
@@ -73,7 +69,6 @@ template <typename NCT> void write(std::vector<uint8_t>& buf, BaseOrMergeRollupP
     write(buf, obj.rollup_subtree_height);
     write(buf, obj.end_aggregation_object);
     write(buf, obj.constants);
-    write(buf, obj.rollup_subtree_height);
     write(buf, obj.start_private_data_tree_snapshot);
     write(buf, obj.end_private_data_tree_snapshot);
     write(buf, obj.start_nullifier_tree_snapshot);
@@ -94,9 +89,6 @@ template <typename NCT> std::ostream& operator<<(std::ostream& os, BaseOrMergeRo
               << "\n"
                  "constants:\n"
               << obj.constants
-              << "\n"
-                 "rollup_subtree_height:\n"
-              << obj.rollup_subtree_height
               << "\n"
                  "start_private_data_tree_snapshot:\n"
               << obj.start_private_data_tree_snapshot

diff --git a/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp b/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
@@ -509,7 +509,6 @@ BaseOrMergeRollupPublicInputs base_rollup_circuit(BaseRollupInputs baseRollupInp
         .rollup_subtree_height = fr(0),
         .end_aggregation_object = aggregation_object,
         .constants = baseRollupInputs.constants,
-        .rollup_subtree_height = fr(0),
         .start_private_data_tree_snapshot = baseRollupInputs.start_private_data_tree_snapshot,
         .end_private_data_tree_snapshot = end_private_data_tree_snapshot,
         .start_nullifier_tree_snapshot = baseRollupInputs.start_nullifier_tree_snapshot,