From 51e4acae52f41f704d39c1d003f8e0d41aeb8b10 Mon Sep 17 00:00:00 2001 From: Rahul Kothari Date: Wed, 5 Apr 2023 16:36:33 +0100 Subject: [PATCH] just use one type of public inputs for base/merge (#168) --- .../rollup/base/base_or_merge_rollup_public_inputs.hpp | 8 -------- .../circuits/rollup/base/native_base_rollup_circuit.cpp | 1 - 2 files changed, 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 index e5a1042b..88923618 100644 --- 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 struct BaseOrMergeRollupPublicInputs { AggregationObject end_aggregation_object; ConstantRollupData 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 start_private_data_tree_snapshot; AppendOnlyTreeSnapshot end_private_data_tree_snapshot; @@ -55,7 +52,6 @@ template 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 void write(std::vector& 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 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 index 9e56bc08..38e3ac3f 100644 --- 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,