chore!: split base rollup and remove public kernel proving

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -78,18 +78,16 @@ library Constants {
   uint256 internal constant PRIVATE_KERNEL_INNER_INDEX = 3;
   uint256 internal constant PRIVATE_KERNEL_TAIL_INDEX = 4;
   uint256 internal constant PRIVATE_KERNEL_TAIL_TO_PUBLIC_INDEX = 5;
-  uint256 internal constant PUBLIC_KERNEL_MERGE_INDEX = 6;
-  uint256 internal constant PUBLIC_KERNEL_TAIL_INDEX = 7;
-  uint256 internal constant PUBLIC_KERNEL_INNER_INDEX = 8;
+  uint256 internal constant TUBE_VK_INDEX = 6;
+  uint256 internal constant PRIVATE_BASE_ROLLUP_VK_INDEX = 8;
+  uint256 internal constant PUBLIC_BASE_ROLLUP_VK_INDEX = 9;
   uint256 internal constant BASE_PARITY_INDEX = 10;
   uint256 internal constant ROOT_PARITY_INDEX = 11;
-  uint256 internal constant BASE_ROLLUP_INDEX = 12;
-  uint256 internal constant MERGE_ROLLUP_INDEX = 13;
-  uint256 internal constant BLOCK_ROOT_ROLLUP_INDEX = 14;
-  uint256 internal constant BLOCK_MERGE_ROLLUP_INDEX = 15;
-  uint256 internal constant ROOT_ROLLUP_INDEX = 16;
-  uint256 internal constant BLOCK_ROOT_ROLLUP_EMPTY_INDEX = 17;
-  uint256 internal constant TUBE_INDEX = 18;
+  uint256 internal constant MERGE_ROLLUP_INDEX = 12;
+  uint256 internal constant BLOCK_ROOT_ROLLUP_INDEX = 13;
+  uint256 internal constant BLOCK_MERGE_ROLLUP_INDEX = 14;
+  uint256 internal constant ROOT_ROLLUP_INDEX = 15;
+  uint256 internal constant BLOCK_ROOT_ROLLUP_EMPTY_INDEX = 16;
   uint256 internal constant PRIVATE_KERNEL_RESET_INDEX = 20;
   uint256 internal constant FUNCTION_SELECTOR_NUM_BYTES = 4;
   uint256 internal constant INITIALIZATION_SLOT_SEPARATOR = 1000000000;

noir-projects/noir-protocol-circuits/Nargo.template.toml

@@ -21,17 +21,16 @@ members = [
     "crates/empty-nested",
     "crates/empty-nested-simulated",
     "crates/public-kernel-lib",
-    "crates/public-kernel-inner",
     "crates/public-kernel-inner-simulated",
-    "crates/public-kernel-merge",
     "crates/public-kernel-merge-simulated",
-    "crates/public-kernel-tail",
     "crates/public-kernel-tail-simulated",
     "crates/reset-kernel-lib",
     "crates/rollup-lib",
     "crates/rollup-merge",
-    "crates/rollup-base",
-    "crates/rollup-base-simulated",
+    "crates/rollup-base-private",
+    "crates/rollup-base-private-simulated",
+    "crates/rollup-base-public",
+    "crates/rollup-base-public-simulated",
     "crates/rollup-block-merge",
     "crates/rollup-block-root",
     "crates/rollup-block-root-empty",

noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_parity_input.nr

@@ -2,8 +2,8 @@ use crate::parity_public_inputs::ParityPublicInputs;
 use dep::types::{
     constants::{BASE_PARITY_INDEX, VK_TREE_HEIGHT},
     merkle_tree::membership::assert_check_membership,
-    recursion::{
-        proof::RecursiveProof,
+    proof::{
+        recursive_proof::RecursiveProof,
         traits::Verifiable,
         verification_key::{HonkVerificationKey, VerificationKey},
     },

noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_parity_inputs.nr

@@ -60,7 +60,7 @@ mod tests {
         root::{root_parity_input::RootParityInput, root_parity_inputs::RootParityInputs},
     };
     use dep::types::constants::BASE_PARITY_INDEX;
-    use dep::types::recursion::{proof::RecursiveProof, verification_key::VerificationKey};
+    use dep::types::proof::{recursive_proof::RecursiveProof, verification_key::VerificationKey};
     use dep::types::tests::fixtures;
 
     use super::NUM_BASE_PARITY_PER_ROOT_PARITY;

noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_rollup_parity_input.nr

@@ -2,8 +2,8 @@ use crate::parity_public_inputs::ParityPublicInputs;
 use dep::types::{
     constants::{ROOT_PARITY_INDEX, VK_TREE_HEIGHT},
     merkle_tree::membership::assert_check_membership,
-    recursion::{
-        proof::NestedRecursiveProof,
+    proof::{
+        recursive_proof::NestedRecursiveProof,
         traits::Verifiable,
         verification_key::{HonkVerificationKey, VerificationKey},
     },

noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_empty.nr

@@ -1,8 +1,8 @@
 use dep::types::{
     header::Header,
     KernelCircuitPublicInputs,
-    recursion::{
-        proof::RecursiveProof,
+    proof::{
+        recursive_proof::RecursiveProof,
         traits::Verifiable,
         verification_key::{HonkVerificationKey, VerificationKey},
     },

noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner.nr

@@ -88,7 +88,7 @@ mod tests {
     };
     use dep::types::{
         abis::kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputs,
-        constants::{BASE_ROLLUP_INDEX, PRIVATE_KERNEL_INIT_INDEX},
+        constants::{EMPTY_NESTED_INDEX, PRIVATE_KERNEL_INIT_INDEX},
         tests::{fixture_builder::FixtureBuilder, utils::assert_array_eq},
     };
 
@@ -170,7 +170,7 @@ mod tests {
     #[test(should_fail_with = "Invalid vk index")]
     fn invalid_previous_kernel() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
-        builder.previous_kernel = builder.previous_kernel.in_vk_tree(BASE_ROLLUP_INDEX);
+        builder.previous_kernel = builder.previous_kernel.in_vk_tree(EMPTY_NESTED_INDEX);
         let _res = builder.execute();
     }
 }

noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_reset.nr

@@ -154,7 +154,7 @@ mod tests {
         utils::arrays::find_index_hint,
     };
     use dep::types::constants::{
-        BASE_ROLLUP_INDEX, GENERATOR_INDEX__OVSK_M, MAX_KEY_VALIDATION_REQUESTS_PER_TX,
+        EMPTY_NESTED_INDEX, GENERATOR_INDEX__OVSK_M, MAX_KEY_VALIDATION_REQUESTS_PER_TX,
         MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, PRIVATE_KERNEL_INNER_INDEX,
     };
 
@@ -672,7 +672,7 @@ mod tests {
     #[test(should_fail_with = "Invalid vk index")]
     fn invalid_previous_kernel() {
         let mut builder = PrivateKernelResetInputsBuilder::new();
-        builder.previous_kernel = builder.previous_kernel.in_vk_tree(BASE_ROLLUP_INDEX);
+        builder.previous_kernel = builder.previous_kernel.in_vk_tree(EMPTY_NESTED_INDEX);
         let _res = builder.execute();
     }
 }

noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr

@@ -65,7 +65,7 @@ mod tests {
         traits::is_empty,
     };
     use dep::types::constants::{
-        BASE_ROLLUP_INDEX, DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE, GENERATOR_INDEX__IVSK_M,
+        DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE, EMPTY_NESTED_INDEX, GENERATOR_INDEX__IVSK_M,
         L2_GAS_PER_LOG_BYTE, L2_GAS_PER_NULLIFIER, PRIVATE_KERNEL_INNER_INDEX,
     };
 
@@ -333,7 +333,7 @@ mod tests {
     #[test(should_fail_with = "Invalid vk index")]
     fn invalid_previous_kernel() {
         let mut builder = PrivateKernelTailInputsBuilder::new();
-        builder.previous_kernel = builder.previous_kernel.in_vk_tree(BASE_ROLLUP_INDEX);
+        builder.previous_kernel = builder.previous_kernel.in_vk_tree(EMPTY_NESTED_INDEX);
         let _res = builder.execute();
     }
 }

noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr

@@ -64,13 +64,13 @@ mod tests {
             nullifier::{Nullifier, ScopedNullifier},
         },
         address::{AztecAddress, EthAddress},
-        constants::PRIVATE_KERNEL_INNER_INDEX,
         point::Point,
         tests::{fixture_builder::FixtureBuilder, utils::assert_array_eq},
     };
     use dep::types::constants::{
-        DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE, FIXED_AVM_STARTUP_L2_GAS, GENERATOR_INDEX__TSK_M,
-        L2_GAS_PER_LOG_BYTE, L2_GAS_PER_NOTE_HASH, L2_GAS_PER_NULLIFIER,
+        DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE, EMPTY_NESTED_INDEX, FIXED_AVM_STARTUP_L2_GAS,
+        GENERATOR_INDEX__TSK_M, L2_GAS_PER_LOG_BYTE, L2_GAS_PER_NOTE_HASH, L2_GAS_PER_NULLIFIER,
+        PRIVATE_KERNEL_INNER_INDEX,
     };
 
     // TODO: Reduce the duplicated code/tests for PrivateKernelTailToPublicInputs and PrivateKernelTailInputs.
@@ -420,10 +420,11 @@ mod tests {
             let _res = builder.execute();
         }
     }
-    // #[test(should_fail_with = "Invalid vk index")]
-    // fn invalid_previous_kernel() {
-    //     let mut builder = PrivateKernelTailToPublicInputsBuilder::new();
-    //     builder.previous_kernel = builder.previous_kernel.in_vk_tree(BASE_ROLLUP_INDEX);
-    //     let _res = builder.execute();
-    // }
+
+    #[test(should_fail_with = "Invalid vk index")]
+    fn invalid_previous_kernel() {
+        let mut builder = PrivateKernelTailToPublicInputsBuilder::new();
+        builder.previous_kernel = builder.previous_kernel.in_vk_tree(EMPTY_NESTED_INDEX);
+        let _res = builder.execute();
+    }
 }

noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_merge.nr

@@ -7,16 +7,13 @@ use crate::{
     },
     public_kernel_phase::PublicKernelPhase,
 };
-use dep::types::{
-    abis::{
-        enqueued_call_data::EnqueuedCallData,
-        kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs,
-        public_kernel_data::PublicKernelData,
-    },
-    constants::{PUBLIC_KERNEL_MERGE_INDEX, TUBE_INDEX},
+use dep::types::abis::{
+    enqueued_call_data::EnqueuedCallData,
+    kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs,
+    public_kernel_data::PublicKernelData,
 };
 
-global ALLOWED_PREVIOUS_CIRCUITS = [TUBE_INDEX, PUBLIC_KERNEL_MERGE_INDEX];
+global ALLOWED_PREVIOUS_CIRCUITS = [];
 
 pub struct PublicKernelMergeCircuitPrivateInputs {
     previous_kernel: PublicKernelData,
@@ -61,12 +58,11 @@ impl PublicKernelMergeCircuitPrivateInputs {
             phase,
         );
 
-        let previous_kernel_validator = PreviousKernelValidator::new(self.previous_kernel);
-        previous_kernel_validator.validate_proof(ALLOWED_PREVIOUS_CIRCUITS);
-
+        // let previous_kernel_validator = PreviousKernelValidator::new(self.previous_kernel);
+        // previous_kernel_validator.validate_proof(ALLOWED_PREVIOUS_CIRCUITS);
         let enqueued_call_data_validator =
             EnqueuedCallDataValidator::new(self.enqueued_call, phase);
-        enqueued_call_data_validator.validate_proof();
+        // enqueued_call_data_validator.validate_proof();
         enqueued_call_data_validator.validate_against_previous_kernel(
             self.previous_kernel.public_inputs,
             output_validator.previous_validation_request_array_lengths,
@@ -92,7 +88,6 @@ mod tests {
             max_block_number::MaxBlockNumber,
             validation_requests::PublicValidationRequestArrayLengths,
         },
-        constants::{BASE_ROLLUP_INDEX, PRIVATE_KERNEL_TAIL_TO_PUBLIC_INDEX},
         tests::{fixture_builder::FixtureBuilder, utils::assert_array_eq},
     };
 
@@ -105,9 +100,7 @@ mod tests {
 
     impl PublicKernelMergeCircuitPrivateInputsBuilder {
         pub fn new() -> Self {
-            let previous_kernel = FixtureBuilder::new().as_parent_contract().in_vk_tree(
-                PRIVATE_KERNEL_TAIL_TO_PUBLIC_INDEX,
-            );
+            let previous_kernel = FixtureBuilder::new().as_parent_contract();
             let mut previous_revertible = FixtureBuilder::new();
             let mut enqueued_call = FixtureBuilder::new().is_public_function();
             // Add an offset so that the mock data won't be the same as the values in previous_kernel.
@@ -253,21 +246,4 @@ mod tests {
         assert_eq(output.end_non_revertible.gas_used, Gas::new(200, 200));
         assert_eq(output.end.gas_used, Gas::new(350, 350));
     }
-
-    #[test]
-    fn valid_previous_kernel() {
-        for i in 0..ALLOWED_PREVIOUS_CIRCUITS.len() {
-            let mut builder = PublicKernelMergeCircuitPrivateInputsBuilder::new();
-            builder.previous_kernel =
-                builder.previous_kernel.in_vk_tree(ALLOWED_PREVIOUS_CIRCUITS[i]);
-            builder.succeeded();
-        }
-    }
-
-    #[test(should_fail_with = "Invalid vk index")]
-    fn invalid_previous_kernel() {
-        let mut builder = PublicKernelMergeCircuitPrivateInputsBuilder::new();
-        builder.previous_kernel = builder.previous_kernel.in_vk_tree(BASE_ROLLUP_INDEX);
-        let _res = builder.execute();
-    }
 }

noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_tail.nr

@@ -24,13 +24,12 @@ use dep::types::{
         L1_TO_L2_MSG_TREE_HEIGHT, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX,
         MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX,
         MAX_PUBLIC_DATA_HINTS, MAX_PUBLIC_DATA_READS_PER_TX, NOTE_HASH_TREE_HEIGHT,
-        PUBLIC_KERNEL_MERGE_INDEX,
     },
     data::PublicDataLeafHint,
     partial_state_reference::PartialStateReference,
 };
 
-global ALLOWED_PREVIOUS_CIRCUITS = [PUBLIC_KERNEL_MERGE_INDEX];
+global ALLOWED_PREVIOUS_CIRCUITS = [];
 
 pub struct PublicKernelTailCircuitPrivateInputs {
     previous_kernel: PublicKernelData,
@@ -65,8 +64,7 @@ impl PublicKernelTailCircuitPrivateInputs {
     pub fn execute(self) -> KernelCircuitPublicInputs {
         let previous_kernel_validator = PreviousKernelValidator::new(self.previous_kernel);
         previous_kernel_validator.validate_phase(PublicKernelPhase.TAIL);
-        previous_kernel_validator.validate_proof(ALLOWED_PREVIOUS_CIRCUITS);
-
+        // previous_kernel_validator.validate_proof(ALLOWED_PREVIOUS_CIRCUITS);
         let (output, output_hints, public_data_read_request_hints) =
             unsafe { self.generate_output_and_hints() };
 
@@ -114,14 +112,14 @@ mod tests {
         },
         address::AztecAddress,
         constants::{
-            BASE_ROLLUP_INDEX, L1_TO_L2_MSG_TREE_HEIGHT, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX,
+            L1_TO_L2_MSG_TREE_HEIGHT, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX,
             MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NOTE_HASHES_PER_TX,
             MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_HINTS,
             MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_SUBTREE_HEIGHT,
             NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT,
             NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT,
             PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH,
-            PUBLIC_DATA_TREE_HEIGHT, PUBLIC_KERNEL_MERGE_INDEX,
+            PUBLIC_DATA_TREE_HEIGHT,
         },
         data::{PublicDataLeafHint, PublicDataTreeLeafPreimage},
         hash::{compute_siloed_nullifier, silo_note_hash},
@@ -191,7 +189,7 @@ mod tests {
 
     impl PublicKernelTailCircuitPrivateInputsBuilder {
         pub fn new() -> PublicKernelTailCircuitPrivateInputsBuilder {
-            let previous_kernel = FixtureBuilder::new().in_vk_tree(PUBLIC_KERNEL_MERGE_INDEX);
+            let previous_kernel = FixtureBuilder::new();
             let previous_revertible = FixtureBuilder::new();
             let nullifier_non_existent_read_request_hints_builder =
                 NullifierNonExistentReadRequestHintsBuilder::new();
@@ -703,19 +701,4 @@ mod tests {
             .map(|n: ScopedNullifier| n.nullifier.value);
         assert_array_eq(public_inputs.end.nullifiers, expected);
     }
-
-    #[test]
-    fn valid_previous_kernel_merge() {
-        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new();
-        builder.previous_kernel = builder.previous_kernel.in_vk_tree(PUBLIC_KERNEL_MERGE_INDEX);
-
-        let _res = builder.execute();
-    }
-
-    #[test(should_fail_with = "Invalid vk index")]
-    fn invalid_previous_kernel() {
-        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new();
-        builder.previous_kernel = builder.previous_kernel.in_vk_tree(BASE_ROLLUP_INDEX);
-        let _res = builder.execute();
-    }
 }

noir-projects/noir-protocol-circuits/crates/public-kernel-tail/Nargo.toml → noir-projects/noir-protocol-circuits/crates/rollup-base-private-simulated/Nargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "public_kernel_tail"
+name = "rollup_base_private_simulated"
 type = "bin"
 authors = [""]
 compiler_version = ">=0.18.0"
 
 [dependencies]
+rollup_lib = { path = "../rollup-lib" }
 types = { path = "../types" }
-public_kernel_lib = { path = "../public-kernel-lib" }

noir-projects/noir-protocol-circuits/crates/rollup-base-private-simulated/src/main.nr

@@ -0,0 +1,6 @@
+use dep::rollup_lib::base::{BaseOrMergeRollupPublicInputs, PrivateBaseRollupInputs};
+
+#[recursive]
+unconstrained fn main(inputs: PrivateBaseRollupInputs) -> pub BaseOrMergeRollupPublicInputs {
+    inputs.execute()
+}

noir-projects/noir-protocol-circuits/crates/rollup-base-simulated/Nargo.toml → noir-projects/noir-protocol-circuits/crates/rollup-base-private/Nargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "rollup_base_simulated"
+name = "rollup_base_private"
 type = "bin"
 authors = [""]
 compiler_version = ">=0.18.0"

noir-projects/noir-protocol-circuits/crates/rollup-base-private/src/main.nr

@@ -0,0 +1,6 @@
+use dep::rollup_lib::base::{BaseOrMergeRollupPublicInputs, PrivateBaseRollupInputs};
+
+#[recursive]
+fn main(inputs: PrivateBaseRollupInputs) -> pub BaseOrMergeRollupPublicInputs {
+    inputs.execute()
+}