From 035a8a6191ea9b1d4fb5b8b4845d46f825e4cf23 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 18:32:20 -0500
Subject: [PATCH 01/14] add contract compilation and typescript generation to
 yarn build

---
 .../noir-protocol-circuits/.gitignore         |   1 +
 .../noir-protocol-circuits/package.json       |   2 +-
 .../src/types/private_kernel_init_types.ts    | 233 ----------------
 .../src/types/private_kernel_inner_types.ts   | 234 ----------------
 .../types/private_kernel_ordering_types.ts    | 187 -------------
 .../public_kernel_private_previous_types.ts   | 218 ---------------
 .../public_kernel_public_previous_types.ts    | 218 ---------------
 .../src/types/rollup_base_types.ts            | 255 ------------------
 .../src/types/rollup_merge_types.ts           |  74 -----
 .../src/types/rollup_root_types.ts            |  98 -------
 10 files changed, 2 insertions(+), 1518 deletions(-)
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/rollup_merge_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/rollup_root_types.ts

diff --git a/yarn-project/noir-protocol-circuits/.gitignore b/yarn-project/noir-protocol-circuits/.gitignore
index fef96f805be..bc5c9c9dc28 100644
--- a/yarn-project/noir-protocol-circuits/.gitignore
+++ b/yarn-project/noir-protocol-circuits/.gitignore
@@ -3,3 +3,4 @@ Prover.toml
 Verifier.toml
 src/target
 src/crs
+src/types
diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index d8217fd505e..edbd40df1c7 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -7,7 +7,7 @@
     "./types": "./dest/types/index.js"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
+    "build": "yarn clean && yarn noir:build && yarn noir:types && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts
deleted file mode 100644
index 7136810817f..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface TxRequest {
-  origin: AztecAddress;
-  args_hash: Field;
-  tx_context: TxContext;
-  function_data: FunctionData;
-}
-
-export interface CallContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_selector: FunctionSelector;
-  is_delegate_call: boolean;
-  is_static_call: boolean;
-  is_contract_deployment: boolean;
-  start_side_effect_counter: Field;
-}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_messages_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface PrivateCircuitPublicInputs {
-  call_context: CallContext;
-  args_hash: Field;
-  return_values: FixedLengthArray<Field, 4>;
-  read_requests: FixedLengthArray<SideEffect, 32>;
-  new_commitments: FixedLengthArray<SideEffect, 16>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 16>;
-  private_call_stack_hashes: FixedLengthArray<Field, 4>;
-  public_call_stack_hashes: FixedLengthArray<Field, 4>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  end_side_effect_counter: Field;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  block_header: BlockHeader;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface PrivateCallStackItem {
-  contract_address: AztecAddress;
-  public_inputs: PrivateCircuitPublicInputs;
-  function_data: FunctionData;
-  is_execution_request: boolean;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface FunctionLeafMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 5>;
-}
-
-export interface ContractLeafMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 16>;
-}
-
-export interface ReadRequestMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 32>;
-  is_transient: boolean;
-  hint_to_commitment: Field;
-}
-
-export interface PrivateCallData {
-  call_stack_item: PrivateCallStackItem;
-  private_call_stack: FixedLengthArray<CallRequest, 4>;
-  public_call_stack: FixedLengthArray<CallRequest, 4>;
-  proof: Proof;
-  vk: VerificationKey;
-  function_leaf_membership_witness: FunctionLeafMembershipWitness;
-  contract_leaf_membership_witness: ContractLeafMembershipWitness;
-  read_request_membership_witnesses: FixedLengthArray<ReadRequestMembershipWitness, 32>;
-  portal_contract_address: EthAddress;
-  acir_hash: Field;
-}
-
-export interface PrivateKernelInputsInit {
-  tx_request: TxRequest;
-  private_call: PrivateCallData;
-}
-
-export interface AggregationObject {}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export type ReturnType = KernelCircuitPublicInputs;
-
-export interface InputType {
-  input: PrivateKernelInputsInit;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts
deleted file mode 100644
index f7cc09a9a8a..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_messages_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface CallContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_selector: FunctionSelector;
-  is_delegate_call: boolean;
-  is_static_call: boolean;
-  is_contract_deployment: boolean;
-  start_side_effect_counter: Field;
-}
-
-export interface PrivateCircuitPublicInputs {
-  call_context: CallContext;
-  args_hash: Field;
-  return_values: FixedLengthArray<Field, 4>;
-  read_requests: FixedLengthArray<SideEffect, 32>;
-  new_commitments: FixedLengthArray<SideEffect, 16>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 16>;
-  private_call_stack_hashes: FixedLengthArray<Field, 4>;
-  public_call_stack_hashes: FixedLengthArray<Field, 4>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  end_side_effect_counter: Field;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  block_header: BlockHeader;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface PrivateCallStackItem {
-  contract_address: AztecAddress;
-  public_inputs: PrivateCircuitPublicInputs;
-  function_data: FunctionData;
-  is_execution_request: boolean;
-}
-
-export interface FunctionLeafMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 5>;
-}
-
-export interface ContractLeafMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 16>;
-}
-
-export interface ReadRequestMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 32>;
-  is_transient: boolean;
-  hint_to_commitment: Field;
-}
-
-export interface PrivateCallData {
-  call_stack_item: PrivateCallStackItem;
-  private_call_stack: FixedLengthArray<CallRequest, 4>;
-  public_call_stack: FixedLengthArray<CallRequest, 4>;
-  proof: Proof;
-  vk: VerificationKey;
-  function_leaf_membership_witness: FunctionLeafMembershipWitness;
-  contract_leaf_membership_witness: ContractLeafMembershipWitness;
-  read_request_membership_witnesses: FixedLengthArray<ReadRequestMembershipWitness, 32>;
-  portal_contract_address: EthAddress;
-  acir_hash: Field;
-}
-
-export interface PrivateKernelInputsInner {
-  previous_kernel: PreviousKernelData;
-  private_call: PrivateCallData;
-}
-
-export type ReturnType = KernelCircuitPublicInputs;
-
-export interface InputType {
-  input: PrivateKernelInputsInner;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts
deleted file mode 100644
index a8be9f52b73..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_messages_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface PrivateKernelInputsOrdering {
-  previous_kernel: PreviousKernelData;
-  read_commitment_hints: FixedLengthArray<Field, 128>;
-  nullifier_commitment_hints: FixedLengthArray<Field, 64>;
-}
-
-export interface FinalAccumulatedData {
-  aggregation_object: AggregationObject;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-}
-
-export interface KernelCircuitPublicInputsFinal {
-  end: FinalAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export type ReturnType = KernelCircuitPublicInputsFinal;
-
-export interface InputType {
-  input: PrivateKernelInputsOrdering;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts b/yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts
deleted file mode 100644
index e1d22f2a387..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_messages_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface CallContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_selector: FunctionSelector;
-  is_delegate_call: boolean;
-  is_static_call: boolean;
-  is_contract_deployment: boolean;
-  start_side_effect_counter: Field;
-}
-
-export interface StorageUpdateRequest {
-  storage_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface StorageRead {
-  storage_slot: Field;
-  current_value: Field;
-}
-
-export interface PublicCircuitPublicInputs {
-  call_context: CallContext;
-  args_hash: Field;
-  return_values: FixedLengthArray<Field, 4>;
-  contract_storage_update_requests: FixedLengthArray<StorageUpdateRequest, 16>;
-  contract_storage_reads: FixedLengthArray<StorageRead, 16>;
-  public_call_stack_hashes: FixedLengthArray<Field, 4>;
-  new_commitments: FixedLengthArray<SideEffect, 16>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 16>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_log_preimages_length: Field;
-  block_header: BlockHeader;
-  prover_address: AztecAddress;
-}
-
-export interface PublicCallStackItem {
-  contract_address: AztecAddress;
-  public_inputs: PublicCircuitPublicInputs;
-  function_data: FunctionData;
-  is_execution_request: boolean;
-}
-
-export interface PublicCallData {
-  call_stack_item: PublicCallStackItem;
-  public_call_stack: FixedLengthArray<CallRequest, 4>;
-  proof: Proof;
-  portal_contract_address: EthAddress;
-  bytecode_hash: Field;
-}
-
-export interface PublicKernelPrivatePreviousInputs {
-  previous_kernel: PreviousKernelData;
-  public_call: PublicCallData;
-}
-
-export type ReturnType = KernelCircuitPublicInputs;
-
-export interface InputType {
-  input: PublicKernelPrivatePreviousInputs;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts b/yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts
deleted file mode 100644
index 15846483a46..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_messages_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface CallContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_selector: FunctionSelector;
-  is_delegate_call: boolean;
-  is_static_call: boolean;
-  is_contract_deployment: boolean;
-  start_side_effect_counter: Field;
-}
-
-export interface StorageUpdateRequest {
-  storage_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface StorageRead {
-  storage_slot: Field;
-  current_value: Field;
-}
-
-export interface PublicCircuitPublicInputs {
-  call_context: CallContext;
-  args_hash: Field;
-  return_values: FixedLengthArray<Field, 4>;
-  contract_storage_update_requests: FixedLengthArray<StorageUpdateRequest, 16>;
-  contract_storage_reads: FixedLengthArray<StorageRead, 16>;
-  public_call_stack_hashes: FixedLengthArray<Field, 4>;
-  new_commitments: FixedLengthArray<SideEffect, 16>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 16>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_log_preimages_length: Field;
-  block_header: BlockHeader;
-  prover_address: AztecAddress;
-}
-
-export interface PublicCallStackItem {
-  contract_address: AztecAddress;
-  public_inputs: PublicCircuitPublicInputs;
-  function_data: FunctionData;
-  is_execution_request: boolean;
-}
-
-export interface PublicCallData {
-  call_stack_item: PublicCallStackItem;
-  public_call_stack: FixedLengthArray<CallRequest, 4>;
-  proof: Proof;
-  portal_contract_address: EthAddress;
-  bytecode_hash: Field;
-}
-
-export interface PublicKernelPublicPreviousInputs {
-  previous_kernel: PreviousKernelData;
-  public_call: PublicCallData;
-}
-
-export type ReturnType = KernelCircuitPublicInputs;
-
-export interface InputType {
-  input: PublicKernelPublicPreviousInputs;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts b/yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts
deleted file mode 100644
index 0bb0ed9ddec..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_messages_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface AppendOnlyTreeSnapshot {
-  root: Field;
-  next_available_leaf_index: u32;
-}
-
-export interface NullifierLeafPreimage {
-  nullifier: Field;
-  next_nullifier: Field;
-  next_index: u32;
-}
-
-export interface NullifierMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 20>;
-}
-
-export interface PublicDataTreeLeaf {
-  slot: Field;
-  value: Field;
-}
-
-export interface PublicDataTreeLeafPreimage {
-  slot: Field;
-  value: Field;
-  next_slot: Field;
-  next_index: u32;
-}
-
-export interface PublicDataMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 40>;
-}
-
-export interface ArchiveRootMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 16>;
-}
-
-export interface GlobalVariables {
-  chain_id: Field;
-  version: Field;
-  block_number: Field;
-  timestamp: Field;
-}
-
-export interface ConstantRollupData {
-  archive_snapshot: AppendOnlyTreeSnapshot;
-  private_kernel_vk_tree_root: Field;
-  public_kernel_vk_tree_root: Field;
-  base_rollup_vk_hash: Field;
-  merge_rollup_vk_hash: Field;
-  global_variables: GlobalVariables;
-}
-
-export interface BaseRollupInputs {
-  kernel_data: PreviousKernelData;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  archive_snapshot: AppendOnlyTreeSnapshot;
-  sorted_new_nullifiers: FixedLengthArray<Field, 64>;
-  sorted_new_nullifiers_indexes: FixedLengthArray<u32, 64>;
-  low_nullifier_leaf_preimages: FixedLengthArray<NullifierLeafPreimage, 64>;
-  low_nullifier_membership_witness: FixedLengthArray<NullifierMembershipWitness, 64>;
-  new_commitments_subtree_sibling_path: FixedLengthArray<Field, 26>;
-  new_nullifiers_subtree_sibling_path: FixedLengthArray<Field, 14>;
-  public_data_writes_subtree_sibling_path: FixedLengthArray<Field, 36>;
-  new_contracts_subtree_sibling_path: FixedLengthArray<Field, 16>;
-  sorted_public_data_writes: FixedLengthArray<PublicDataTreeLeaf, 16>;
-  sorted_public_data_writes_indexes: FixedLengthArray<u32, 16>;
-  low_public_data_writes_preimages: FixedLengthArray<PublicDataTreeLeafPreimage, 16>;
-  low_public_data_writes_witnesses: FixedLengthArray<PublicDataMembershipWitness, 16>;
-  public_data_reads_preimages: FixedLengthArray<PublicDataTreeLeafPreimage, 16>;
-  public_data_reads_witnesses: FixedLengthArray<PublicDataMembershipWitness, 16>;
-  archive_root_membership_witness: ArchiveRootMembershipWitness;
-  constants: ConstantRollupData;
-}
-
-export interface BaseOrMergeRollupPublicInputs {
-  rollup_type: u32;
-  rollup_subtree_height: Field;
-  end_aggregation_object: AggregationObject;
-  constants: ConstantRollupData;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  calldata_hash: FixedLengthArray<Field, 2>;
-}
-
-export type ReturnType = BaseOrMergeRollupPublicInputs;
-
-export interface InputType {
-  inputs: BaseRollupInputs;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/rollup_merge_types.ts b/yarn-project/noir-protocol-circuits/src/types/rollup_merge_types.ts
deleted file mode 100644
index 70023af4266..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/rollup_merge_types.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface AppendOnlyTreeSnapshot {
-  root: Field;
-  next_available_leaf_index: u32;
-}
-
-export interface GlobalVariables {
-  chain_id: Field;
-  version: Field;
-  block_number: Field;
-  timestamp: Field;
-}
-
-export interface ConstantRollupData {
-  archive_snapshot: AppendOnlyTreeSnapshot;
-  private_kernel_vk_tree_root: Field;
-  public_kernel_vk_tree_root: Field;
-  base_rollup_vk_hash: Field;
-  merge_rollup_vk_hash: Field;
-  global_variables: GlobalVariables;
-}
-
-export interface BaseOrMergeRollupPublicInputs {
-  rollup_type: u32;
-  rollup_subtree_height: Field;
-  end_aggregation_object: AggregationObject;
-  constants: ConstantRollupData;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  calldata_hash: FixedLengthArray<Field, 2>;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface VKMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 8>;
-}
-
-export interface PreviousRollupData {
-  base_or_merge_rollup_public_inputs: BaseOrMergeRollupPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_sibling_path: VKMembershipWitness;
-}
-
-export interface MergeRollupInputs {
-  previous_rollup_data: FixedLengthArray<PreviousRollupData, 2>;
-}
-
-export type ReturnType = BaseOrMergeRollupPublicInputs;
-
-export interface InputType {
-  inputs: MergeRollupInputs;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/rollup_root_types.ts b/yarn-project/noir-protocol-circuits/src/types/rollup_root_types.ts
deleted file mode 100644
index 550b57bc13e..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/rollup_root_types.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface AppendOnlyTreeSnapshot {
-  root: Field;
-  next_available_leaf_index: u32;
-}
-
-export interface GlobalVariables {
-  chain_id: Field;
-  version: Field;
-  block_number: Field;
-  timestamp: Field;
-}
-
-export interface ConstantRollupData {
-  archive_snapshot: AppendOnlyTreeSnapshot;
-  private_kernel_vk_tree_root: Field;
-  public_kernel_vk_tree_root: Field;
-  base_rollup_vk_hash: Field;
-  merge_rollup_vk_hash: Field;
-  global_variables: GlobalVariables;
-}
-
-export interface BaseOrMergeRollupPublicInputs {
-  rollup_type: u32;
-  rollup_subtree_height: Field;
-  end_aggregation_object: AggregationObject;
-  constants: ConstantRollupData;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  calldata_hash: FixedLengthArray<Field, 2>;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface VKMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 8>;
-}
-
-export interface PreviousRollupData {
-  base_or_merge_rollup_public_inputs: BaseOrMergeRollupPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_sibling_path: VKMembershipWitness;
-}
-
-export interface RootRollupInputs {
-  previous_rollup_data: FixedLengthArray<PreviousRollupData, 2>;
-  new_l1_to_l2_messages: FixedLengthArray<Field, 16>;
-  new_l1_to_l2_messages_tree_root_sibling_path: FixedLengthArray<Field, 12>;
-  start_l1_to_l2_messages_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_archive_snapshot: AppendOnlyTreeSnapshot;
-  new_archive_sibling_path: FixedLengthArray<Field, 16>;
-}
-
-export interface RootRollupPublicInputs {
-  end_aggregation_object: AggregationObject;
-  global_variables: GlobalVariables;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_l1_to_l2_messages_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_l1_to_l2_messages_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_archive_snapshot: AppendOnlyTreeSnapshot;
-  end_archive_snapshot: AppendOnlyTreeSnapshot;
-  calldata_hash: FixedLengthArray<Field, 2>;
-  l1_to_l2_messages_hash: FixedLengthArray<Field, 2>;
-}
-
-export type ReturnType = RootRollupPublicInputs;
-
-export interface InputType {
-  inputs: RootRollupInputs;
-}

From 1d2e663206136a919fc6a794d88eaf3f6fdf3c8d Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 18:49:23 -0500
Subject: [PATCH 02/14] also generate types on bootstrap

---
 yarn-project/bootstrap.sh                        | 2 +-
 yarn-project/noir-protocol-circuits/package.json | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/yarn-project/bootstrap.sh b/yarn-project/bootstrap.sh
index a8837f38b74..d368fc3b51b 100755
--- a/yarn-project/bootstrap.sh
+++ b/yarn-project/bootstrap.sh
@@ -37,7 +37,7 @@ yarn workspace @aztec/noir-contracts build:contracts
 # TODO: Contracts should not be baked into aztec.js.
 yarn workspace @aztec/aztec.js build:copy-contracts
 # Build protocol circuits. TODO: move pre yarn-project.
-yarn workspace @aztec/noir-protocol-circuits noir:build
+yarn workspace @aztec/noir-protocol-circuits build:noir
 
 yarn build
 
diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index edbd40df1c7..95a2dc963b0 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -7,8 +7,9 @@
     "./types": "./dest/types/index.js"
   },
   "scripts": {
-    "build": "yarn clean && yarn noir:build && yarn noir:types && tsc -b",
+    "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
+    "build:noir": "yarn noir:build && yarn noir:types",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",

From f2913c2c24a21af5b80bba0a335e69a0c2021f35 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 19:01:00 -0500
Subject: [PATCH 03/14] also do tsc -b to generate JS files

---
 yarn-project/noir-protocol-circuits/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index 95a2dc963b0..a50652ef50a 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
-    "build:noir": "yarn noir:build && yarn noir:types",
+    "build:noir": "yarn noir:build && yarn noir:types && tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",

From 144af27abd7d6187254e101c4bba696db5aef0ea Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 19:16:33 -0500
Subject: [PATCH 04/14] update point to grumpkin point

---
 yarn-project/noir-protocol-circuits/src/type_conversion.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/noir-protocol-circuits/src/type_conversion.ts b/yarn-project/noir-protocol-circuits/src/type_conversion.ts
index ae18fef11c1..75984465a29 100644
--- a/yarn-project/noir-protocol-circuits/src/type_conversion.ts
+++ b/yarn-project/noir-protocol-circuits/src/type_conversion.ts
@@ -87,7 +87,7 @@ import {
   AztecAddress as NoirAztecAddress,
   EthAddress as NoirEthAddress,
   Field as NoirField,
-  Point as NoirPoint,
+  GrumpkinPoint as NoirPoint,
   OptionallyRevealedData as OptionallyRevealedDataNoir,
   PrivateCallData as PrivateCallDataNoir,
   PrivateCallStackItem as PrivateCallStackItemNoir,

From 4fa2c2966d64f8d465677c53a26b65c21a2fd793 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 19:23:56 -0500
Subject: [PATCH 05/14] update dockerfile to match bootstrap.sh change

---
 yarn-project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/Dockerfile b/yarn-project/Dockerfile
index 324ea28a435..602a26e110a 100644
--- a/yarn-project/Dockerfile
+++ b/yarn-project/Dockerfile
@@ -16,7 +16,7 @@ RUN yarn workspace @aztec/noir-contracts build:contracts
 # We need to build aztec.js as it needs to copy in account contracts from noir-contracts.
 # TODO: Contracts should not be baked into aztec.js.
 RUN yarn workspace @aztec/aztec.js build
-RUN yarn workspace @aztec/noir-protocol-circuits noir:build
+RUN yarn workspace @aztec/noir-protocol-circuits build:noir
 RUN yarn tsc -b
 
 ENTRYPOINT ["yarn"]

From 6ab13de362ce6c3c575cdc5632cc8446b96c9628 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 19:49:14 -0500
Subject: [PATCH 06/14] make directory in noir:types

---
 yarn-project/noir-protocol-circuits/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index a50652ef50a..f604cf5207f 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -9,12 +9,12 @@
   "scripts": {
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
-    "build:noir": "yarn noir:build && yarn noir:types && tsc -b",
+    "build:noir": "yarn noir:build && yarn noir:types",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",
     "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings && rm -rf ./target/debug_*",
-    "noir:types": "node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix",
+    "noir:types": "mkdir src/types && node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix",
     "noir:test": "cd src && ../../../noir/target/release/nargo test",
     "test": "yarn test:js && yarn noir:test",
     "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"

From b0d20d117a5ad6b34d17d94e057e5efab95a944f Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 20:26:49 -0500
Subject: [PATCH 07/14] move mkdir to ts script, not sure why merkle tree dep
 issue though

---
 yarn-project/noir-protocol-circuits/package.json            | 2 +-
 .../src/scripts/generate_ts_from_abi.ts                     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index f604cf5207f..95a2dc963b0 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -14,7 +14,7 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",
     "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings && rm -rf ./target/debug_*",
-    "noir:types": "mkdir src/types && node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix",
+    "noir:types": "node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix",
     "noir:test": "cd src && ../../../noir/target/release/nargo test",
     "test": "yarn test:js && yarn noir:test",
     "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
diff --git a/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts b/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
index bce893dba8b..136391ab536 100644
--- a/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
+++ b/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
@@ -209,6 +209,12 @@ const circuits = [
 ];
 
 const main = async () => {
+  try {
+    await fs.access('./src/types/');
+  } catch (error) {
+    await fs.mkdir('./src/types', { recursive: true });
+  }
+
   for (const circuit of circuits) {
     const rawData = await fs.readFile(`./src/target/${circuit}.json`, 'utf-8');
     const abiObj: NoirCompiledCircuit = JSON.parse(rawData);

From 935c50fd04caebd1873c156251dcc0c74f6b0d24 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 20:30:52 -0500
Subject: [PATCH 08/14] try without formatting:fix

---
 yarn-project/noir-protocol-circuits/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index 95a2dc963b0..222b7a8b573 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
-    "build:noir": "yarn noir:build && yarn noir:types",
+    "build:noir": "yarn noir:build && node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",

From f449ccf7137e0d86cd3beb979d05645d237cd7c6 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 20:43:18 -0500
Subject: [PATCH 09/14] just format src/types

---
 yarn-project/noir-protocol-circuits/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index 222b7a8b573..27d008dd8e0 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
-    "build:noir": "yarn noir:build && node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts",
+    "build:noir": "yarn noir:build && node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",

From b88e2d1f4c7e8ca39d30ef6d84c90b64a91fda5f Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Wed, 3 Jan 2024 20:46:51 -0500
Subject: [PATCH 10/14] format inside the typescript generator

---
 .../noir-protocol-circuits/package.json       |  4 ++--
 .../src/scripts/generate_ts_from_abi.ts       | 22 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index 27d008dd8e0..b614cffc1d8 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -9,12 +9,12 @@
   "scripts": {
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
-    "build:noir": "yarn noir:build && node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types",
+    "build:noir": "yarn noir:build && yarn noir:types",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",
     "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings && rm -rf ./target/debug_*",
-    "noir:types": "node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix",
+    "noir:types": "node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts",
     "noir:test": "cd src && ../../../noir/target/release/nargo test",
     "test": "yarn test:js && yarn noir:test",
     "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
diff --git a/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts b/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
index 136391ab536..5d209d4565e 100644
--- a/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
+++ b/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
@@ -2,6 +2,7 @@ import { ABIType } from '@aztec/foundation/abi';
 import { createConsoleLogger } from '@aztec/foundation/log';
 import { NoirCompiledCircuit, NoirFunctionAbi } from '@aztec/noir-compiler';
 
+import { exec } from 'child_process';
 import fs from 'fs/promises';
 
 const log = createConsoleLogger('aztec:noir-contracts');
@@ -197,6 +198,22 @@ function generateTsInterface(abiObj: NoirFunctionAbi): string {
   );
 }
 
+/**
+ * Format the generated files
+ */
+function runLintAndFormat(filePath: string) {
+  const command = `NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ${filePath} && run -T prettier -w ${filePath}`;
+
+  exec(command, (error, stdout, stderr) => {
+    if (error) {
+      throw error;
+    }
+    if (stderr) {
+      throw Error(stderr);
+    }
+  });
+}
+
 const circuits = [
   'private_kernel_init',
   'private_kernel_inner',
@@ -219,7 +236,10 @@ const main = async () => {
     const rawData = await fs.readFile(`./src/target/${circuit}.json`, 'utf-8');
     const abiObj: NoirCompiledCircuit = JSON.parse(rawData);
     const generatedInterface = generateTsInterface(abiObj.abi);
-    await fs.writeFile(`./src/types/${circuit}_types.ts`, generatedInterface);
+
+    const outputFile = `./src/types/${circuit}_types.ts`;
+    await fs.writeFile(outputFile, generatedInterface);
+    runLintAndFormat(outputFile);
   }
 };
 

From 4296afa7e50885c0975c9c35864bbcb904ec4775 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Thu, 4 Jan 2024 11:03:46 -0500
Subject: [PATCH 11/14] pr feedback

---
 yarn-project/Dockerfile                          | 2 +-
 yarn-project/bootstrap.sh                        | 2 +-
 yarn-project/noir-protocol-circuits/package.json | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/yarn-project/Dockerfile b/yarn-project/Dockerfile
index 602a26e110a..0de1df8387e 100644
--- a/yarn-project/Dockerfile
+++ b/yarn-project/Dockerfile
@@ -16,7 +16,7 @@ RUN yarn workspace @aztec/noir-contracts build:contracts
 # We need to build aztec.js as it needs to copy in account contracts from noir-contracts.
 # TODO: Contracts should not be baked into aztec.js.
 RUN yarn workspace @aztec/aztec.js build
-RUN yarn workspace @aztec/noir-protocol-circuits build:noir
+RUN yarn workspace @aztec/noir-protocol-circuits build
 RUN yarn tsc -b
 
 ENTRYPOINT ["yarn"]
diff --git a/yarn-project/bootstrap.sh b/yarn-project/bootstrap.sh
index d368fc3b51b..e04a85e8af0 100755
--- a/yarn-project/bootstrap.sh
+++ b/yarn-project/bootstrap.sh
@@ -37,7 +37,7 @@ yarn workspace @aztec/noir-contracts build:contracts
 # TODO: Contracts should not be baked into aztec.js.
 yarn workspace @aztec/aztec.js build:copy-contracts
 # Build protocol circuits. TODO: move pre yarn-project.
-yarn workspace @aztec/noir-protocol-circuits build:noir
+yarn workspace @aztec/noir-protocol-circuits build
 
 yarn build
 
diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index b614cffc1d8..3fa58499982 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -7,10 +7,8 @@
     "./types": "./dest/types/index.js"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
-    "build:noir": "yarn noir:build && yarn noir:types",
-    "clean": "rm -rf ./dest .tsbuildinfo",
+    "build": "yarn clean && yarn noir:build && yarn noir:types",
+    "clean": "rm -rf ./dest .tsbuildinfo src/types src/target",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",
     "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings && rm -rf ./target/debug_*",

From 1548a578371f75289700d72db819d996adb729e8 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Thu, 4 Jan 2024 11:29:56 -0500
Subject: [PATCH 12/14] move formatting out of typescript back into yarn
 command

---
 .../noir-protocol-circuits/package.json         |  3 ++-
 .../src/scripts/generate_ts_from_abi.ts         | 17 -----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json
index 3fa58499982..2839c24f3bc 100644
--- a/yarn-project/noir-protocol-circuits/package.json
+++ b/yarn-project/noir-protocol-circuits/package.json
@@ -11,8 +11,9 @@
     "clean": "rm -rf ./dest .tsbuildinfo src/types src/target",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",
+    "formatting:fix:types": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types",
     "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings && rm -rf ./target/debug_*",
-    "noir:types": "node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts",
+    "noir:types": "node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix:types",
     "noir:test": "cd src && ../../../noir/target/release/nargo test",
     "test": "yarn test:js && yarn noir:test",
     "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
diff --git a/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts b/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
index 5d209d4565e..fcb52d551d1 100644
--- a/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
+++ b/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
@@ -198,22 +198,6 @@ function generateTsInterface(abiObj: NoirFunctionAbi): string {
   );
 }
 
-/**
- * Format the generated files
- */
-function runLintAndFormat(filePath: string) {
-  const command = `NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ${filePath} && run -T prettier -w ${filePath}`;
-
-  exec(command, (error, stdout, stderr) => {
-    if (error) {
-      throw error;
-    }
-    if (stderr) {
-      throw Error(stderr);
-    }
-  });
-}
-
 const circuits = [
   'private_kernel_init',
   'private_kernel_inner',
@@ -239,7 +223,6 @@ const main = async () => {
 
     const outputFile = `./src/types/${circuit}_types.ts`;
     await fs.writeFile(outputFile, generatedInterface);
-    runLintAndFormat(outputFile);
   }
 };
 

From 9d79c0c4f2fe9f3397b9cd029aeb7918baa8e7cf Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Thu, 4 Jan 2024 11:39:29 -0500
Subject: [PATCH 13/14] unused import

---
 .../noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts b/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
index fcb52d551d1..b3c5d16482a 100644
--- a/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
+++ b/yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts
@@ -2,7 +2,6 @@ import { ABIType } from '@aztec/foundation/abi';
 import { createConsoleLogger } from '@aztec/foundation/log';
 import { NoirCompiledCircuit, NoirFunctionAbi } from '@aztec/noir-compiler';
 
-import { exec } from 'child_process';
 import fs from 'fs/promises';
 
 const log = createConsoleLogger('aztec:noir-contracts');

From cdc1089026681e73c36b94a888baf347d8f05058 Mon Sep 17 00:00:00 2001
From: Dan Lee <dan@aztecprotocol.com>
Date: Fri, 5 Jan 2024 09:28:11 -0500
Subject: [PATCH 14/14] hmm didnt actually delete the files on last merge
 conflict

---
 .../src/types/private_kernel_init_types.ts    | 233 ----------------
 .../src/types/private_kernel_inner_types.ts   | 234 ----------------
 .../types/private_kernel_ordering_types.ts    | 187 -------------
 .../public_kernel_private_previous_types.ts   | 218 ---------------
 .../public_kernel_public_previous_types.ts    | 218 ---------------
 .../src/types/rollup_base_types.ts            | 255 ------------------
 .../src/types/rollup_root_types.ts            |  98 -------
 7 files changed, 1443 deletions(-)
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts
 delete mode 100644 yarn-project/noir-protocol-circuits/src/types/rollup_root_types.ts

diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts
deleted file mode 100644
index 014514bdbd2..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface TxRequest {
-  origin: AztecAddress;
-  args_hash: Field;
-  tx_context: TxContext;
-  function_data: FunctionData;
-}
-
-export interface CallContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_selector: FunctionSelector;
-  is_delegate_call: boolean;
-  is_static_call: boolean;
-  is_contract_deployment: boolean;
-  start_side_effect_counter: Field;
-}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_message_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface PrivateCircuitPublicInputs {
-  call_context: CallContext;
-  args_hash: Field;
-  return_values: FixedLengthArray<Field, 4>;
-  read_requests: FixedLengthArray<SideEffect, 32>;
-  new_commitments: FixedLengthArray<SideEffect, 16>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 16>;
-  private_call_stack_hashes: FixedLengthArray<Field, 4>;
-  public_call_stack_hashes: FixedLengthArray<Field, 4>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  end_side_effect_counter: Field;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  block_header: BlockHeader;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface PrivateCallStackItem {
-  contract_address: AztecAddress;
-  public_inputs: PrivateCircuitPublicInputs;
-  function_data: FunctionData;
-  is_execution_request: boolean;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface FunctionLeafMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 5>;
-}
-
-export interface ContractLeafMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 16>;
-}
-
-export interface ReadRequestMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 32>;
-  is_transient: boolean;
-  hint_to_commitment: Field;
-}
-
-export interface PrivateCallData {
-  call_stack_item: PrivateCallStackItem;
-  private_call_stack: FixedLengthArray<CallRequest, 4>;
-  public_call_stack: FixedLengthArray<CallRequest, 4>;
-  proof: Proof;
-  vk: VerificationKey;
-  function_leaf_membership_witness: FunctionLeafMembershipWitness;
-  contract_leaf_membership_witness: ContractLeafMembershipWitness;
-  read_request_membership_witnesses: FixedLengthArray<ReadRequestMembershipWitness, 32>;
-  portal_contract_address: EthAddress;
-  acir_hash: Field;
-}
-
-export interface PrivateKernelInputsInit {
-  tx_request: TxRequest;
-  private_call: PrivateCallData;
-}
-
-export interface AggregationObject {}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export type ReturnType = KernelCircuitPublicInputs;
-
-export interface InputType {
-  input: PrivateKernelInputsInit;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts
deleted file mode 100644
index 3305c67df49..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_message_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface CallContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_selector: FunctionSelector;
-  is_delegate_call: boolean;
-  is_static_call: boolean;
-  is_contract_deployment: boolean;
-  start_side_effect_counter: Field;
-}
-
-export interface PrivateCircuitPublicInputs {
-  call_context: CallContext;
-  args_hash: Field;
-  return_values: FixedLengthArray<Field, 4>;
-  read_requests: FixedLengthArray<SideEffect, 32>;
-  new_commitments: FixedLengthArray<SideEffect, 16>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 16>;
-  private_call_stack_hashes: FixedLengthArray<Field, 4>;
-  public_call_stack_hashes: FixedLengthArray<Field, 4>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  end_side_effect_counter: Field;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  block_header: BlockHeader;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface PrivateCallStackItem {
-  contract_address: AztecAddress;
-  public_inputs: PrivateCircuitPublicInputs;
-  function_data: FunctionData;
-  is_execution_request: boolean;
-}
-
-export interface FunctionLeafMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 5>;
-}
-
-export interface ContractLeafMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 16>;
-}
-
-export interface ReadRequestMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 32>;
-  is_transient: boolean;
-  hint_to_commitment: Field;
-}
-
-export interface PrivateCallData {
-  call_stack_item: PrivateCallStackItem;
-  private_call_stack: FixedLengthArray<CallRequest, 4>;
-  public_call_stack: FixedLengthArray<CallRequest, 4>;
-  proof: Proof;
-  vk: VerificationKey;
-  function_leaf_membership_witness: FunctionLeafMembershipWitness;
-  contract_leaf_membership_witness: ContractLeafMembershipWitness;
-  read_request_membership_witnesses: FixedLengthArray<ReadRequestMembershipWitness, 32>;
-  portal_contract_address: EthAddress;
-  acir_hash: Field;
-}
-
-export interface PrivateKernelInputsInner {
-  previous_kernel: PreviousKernelData;
-  private_call: PrivateCallData;
-}
-
-export type ReturnType = KernelCircuitPublicInputs;
-
-export interface InputType {
-  input: PrivateKernelInputsInner;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts
deleted file mode 100644
index b26501d646b..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_message_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface PrivateKernelInputsOrdering {
-  previous_kernel: PreviousKernelData;
-  read_commitment_hints: FixedLengthArray<Field, 128>;
-  nullifier_commitment_hints: FixedLengthArray<Field, 64>;
-}
-
-export interface FinalAccumulatedData {
-  aggregation_object: AggregationObject;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-}
-
-export interface KernelCircuitPublicInputsFinal {
-  end: FinalAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export type ReturnType = KernelCircuitPublicInputsFinal;
-
-export interface InputType {
-  input: PrivateKernelInputsOrdering;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts b/yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts
deleted file mode 100644
index 9b5836579b1..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_message_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface CallContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_selector: FunctionSelector;
-  is_delegate_call: boolean;
-  is_static_call: boolean;
-  is_contract_deployment: boolean;
-  start_side_effect_counter: Field;
-}
-
-export interface StorageUpdateRequest {
-  storage_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface StorageRead {
-  storage_slot: Field;
-  current_value: Field;
-}
-
-export interface PublicCircuitPublicInputs {
-  call_context: CallContext;
-  args_hash: Field;
-  return_values: FixedLengthArray<Field, 4>;
-  contract_storage_update_requests: FixedLengthArray<StorageUpdateRequest, 16>;
-  contract_storage_reads: FixedLengthArray<StorageRead, 16>;
-  public_call_stack_hashes: FixedLengthArray<Field, 4>;
-  new_commitments: FixedLengthArray<SideEffect, 16>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 16>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_log_preimages_length: Field;
-  block_header: BlockHeader;
-  prover_address: AztecAddress;
-}
-
-export interface PublicCallStackItem {
-  contract_address: AztecAddress;
-  public_inputs: PublicCircuitPublicInputs;
-  function_data: FunctionData;
-  is_execution_request: boolean;
-}
-
-export interface PublicCallData {
-  call_stack_item: PublicCallStackItem;
-  public_call_stack: FixedLengthArray<CallRequest, 4>;
-  proof: Proof;
-  portal_contract_address: EthAddress;
-  bytecode_hash: Field;
-}
-
-export interface PublicKernelPrivatePreviousInputs {
-  previous_kernel: PreviousKernelData;
-  public_call: PublicCallData;
-}
-
-export type ReturnType = KernelCircuitPublicInputs;
-
-export interface InputType {
-  input: PublicKernelPrivatePreviousInputs;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts b/yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts
deleted file mode 100644
index 3be8bcf5fa4..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_message_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface CallContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_selector: FunctionSelector;
-  is_delegate_call: boolean;
-  is_static_call: boolean;
-  is_contract_deployment: boolean;
-  start_side_effect_counter: Field;
-}
-
-export interface StorageUpdateRequest {
-  storage_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface StorageRead {
-  storage_slot: Field;
-  current_value: Field;
-}
-
-export interface PublicCircuitPublicInputs {
-  call_context: CallContext;
-  args_hash: Field;
-  return_values: FixedLengthArray<Field, 4>;
-  contract_storage_update_requests: FixedLengthArray<StorageUpdateRequest, 16>;
-  contract_storage_reads: FixedLengthArray<StorageRead, 16>;
-  public_call_stack_hashes: FixedLengthArray<Field, 4>;
-  new_commitments: FixedLengthArray<SideEffect, 16>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 16>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_log_preimages_length: Field;
-  block_header: BlockHeader;
-  prover_address: AztecAddress;
-}
-
-export interface PublicCallStackItem {
-  contract_address: AztecAddress;
-  public_inputs: PublicCircuitPublicInputs;
-  function_data: FunctionData;
-  is_execution_request: boolean;
-}
-
-export interface PublicCallData {
-  call_stack_item: PublicCallStackItem;
-  public_call_stack: FixedLengthArray<CallRequest, 4>;
-  proof: Proof;
-  portal_contract_address: EthAddress;
-  bytecode_hash: Field;
-}
-
-export interface PublicKernelPublicPreviousInputs {
-  previous_kernel: PreviousKernelData;
-  public_call: PublicCallData;
-}
-
-export type ReturnType = KernelCircuitPublicInputs;
-
-export interface InputType {
-  input: PublicKernelPublicPreviousInputs;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts b/yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts
deleted file mode 100644
index 5958cb3e182..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface SideEffect {
-  value: Field;
-  counter: Field;
-}
-
-export interface SideEffectLinkedToNoteHash {
-  value: Field;
-  note_hash: Field;
-  counter: Field;
-}
-
-export interface AztecAddress {
-  inner: Field;
-}
-
-export interface CallerContext {
-  msg_sender: AztecAddress;
-  storage_contract_address: AztecAddress;
-}
-
-export interface CallRequest {
-  hash: Field;
-  caller_contract_address: AztecAddress;
-  caller_context: CallerContext;
-  start_side_effect_counter: Field;
-  end_side_effect_counter: Field;
-}
-
-export interface EthAddress {
-  inner: Field;
-}
-
-export interface NewContractData {
-  contract_address: AztecAddress;
-  portal_contract_address: EthAddress;
-  function_tree_root: Field;
-}
-
-export interface FunctionSelector {
-  inner: u32;
-}
-
-export interface FunctionData {
-  selector: FunctionSelector;
-  is_internal: boolean;
-  is_private: boolean;
-  is_constructor: boolean;
-}
-
-export interface OptionallyRevealedData {
-  call_stack_item_hash: Field;
-  function_data: FunctionData;
-  vk_hash: Field;
-  portal_contract_address: EthAddress;
-  pay_fee_from_l1: boolean;
-  pay_fee_from_public_l2: boolean;
-  called_from_l1: boolean;
-  called_from_public_l2: boolean;
-}
-
-export interface PublicDataUpdateRequest {
-  leaf_slot: Field;
-  old_value: Field;
-  new_value: Field;
-}
-
-export interface PublicDataRead {
-  leaf_slot: Field;
-  value: Field;
-}
-
-export interface CombinedAccumulatedData {
-  aggregation_object: AggregationObject;
-  read_requests: FixedLengthArray<SideEffect, 128>;
-  new_commitments: FixedLengthArray<SideEffect, 64>;
-  new_nullifiers: FixedLengthArray<SideEffectLinkedToNoteHash, 64>;
-  private_call_stack: FixedLengthArray<CallRequest, 8>;
-  public_call_stack: FixedLengthArray<CallRequest, 8>;
-  new_l2_to_l1_msgs: FixedLengthArray<Field, 2>;
-  encrypted_logs_hash: FixedLengthArray<Field, 2>;
-  unencrypted_logs_hash: FixedLengthArray<Field, 2>;
-  encrypted_log_preimages_length: Field;
-  unencrypted_log_preimages_length: Field;
-  new_contracts: FixedLengthArray<NewContractData, 1>;
-  optionally_revealed_data: FixedLengthArray<OptionallyRevealedData, 4>;
-  public_data_update_requests: FixedLengthArray<PublicDataUpdateRequest, 16>;
-  public_data_reads: FixedLengthArray<PublicDataRead, 16>;
-}
-
-export interface BlockHeader {
-  note_hash_tree_root: Field;
-  nullifier_tree_root: Field;
-  contract_tree_root: Field;
-  l1_to_l2_message_tree_root: Field;
-  archive_root: Field;
-  public_data_tree_root: Field;
-  global_variables_hash: Field;
-}
-
-export interface Point {
-  x: Field;
-  y: Field;
-}
-
-export interface ContractDeploymentData {
-  deployer_public_key: Point;
-  constructor_vk_hash: Field;
-  function_tree_root: Field;
-  contract_address_salt: Field;
-  portal_contract_address: EthAddress;
-}
-
-export interface TxContext {
-  is_fee_payment_tx: boolean;
-  is_rebate_payment_tx: boolean;
-  is_contract_deployment_tx: boolean;
-  contract_deployment_data: ContractDeploymentData;
-  chain_id: Field;
-  version: Field;
-}
-
-export interface CombinedConstantData {
-  block_header: BlockHeader;
-  tx_context: TxContext;
-}
-
-export interface KernelCircuitPublicInputs {
-  end: CombinedAccumulatedData;
-  constants: CombinedConstantData;
-  is_private: boolean;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface PreviousKernelData {
-  public_inputs: KernelCircuitPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_path: FixedLengthArray<Field, 3>;
-}
-
-export interface AppendOnlyTreeSnapshot {
-  root: Field;
-  next_available_leaf_index: u32;
-}
-
-export interface NullifierLeafPreimage {
-  nullifier: Field;
-  next_nullifier: Field;
-  next_index: u32;
-}
-
-export interface NullifierMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 20>;
-}
-
-export interface PublicDataTreeLeaf {
-  slot: Field;
-  value: Field;
-}
-
-export interface PublicDataTreeLeafPreimage {
-  slot: Field;
-  value: Field;
-  next_slot: Field;
-  next_index: u32;
-}
-
-export interface PublicDataMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 40>;
-}
-
-export interface ArchiveRootMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 16>;
-}
-
-export interface GlobalVariables {
-  chain_id: Field;
-  version: Field;
-  block_number: Field;
-  timestamp: Field;
-}
-
-export interface ConstantRollupData {
-  archive_snapshot: AppendOnlyTreeSnapshot;
-  private_kernel_vk_tree_root: Field;
-  public_kernel_vk_tree_root: Field;
-  base_rollup_vk_hash: Field;
-  merge_rollup_vk_hash: Field;
-  global_variables: GlobalVariables;
-}
-
-export interface BaseRollupInputs {
-  kernel_data: PreviousKernelData;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  archive_snapshot: AppendOnlyTreeSnapshot;
-  sorted_new_nullifiers: FixedLengthArray<Field, 64>;
-  sorted_new_nullifiers_indexes: FixedLengthArray<u32, 64>;
-  low_nullifier_leaf_preimages: FixedLengthArray<NullifierLeafPreimage, 64>;
-  low_nullifier_membership_witness: FixedLengthArray<NullifierMembershipWitness, 64>;
-  new_commitments_subtree_sibling_path: FixedLengthArray<Field, 26>;
-  new_nullifiers_subtree_sibling_path: FixedLengthArray<Field, 14>;
-  public_data_writes_subtree_sibling_path: FixedLengthArray<Field, 36>;
-  new_contracts_subtree_sibling_path: FixedLengthArray<Field, 16>;
-  sorted_public_data_writes: FixedLengthArray<PublicDataTreeLeaf, 16>;
-  sorted_public_data_writes_indexes: FixedLengthArray<u32, 16>;
-  low_public_data_writes_preimages: FixedLengthArray<PublicDataTreeLeafPreimage, 16>;
-  low_public_data_writes_witnesses: FixedLengthArray<PublicDataMembershipWitness, 16>;
-  public_data_reads_preimages: FixedLengthArray<PublicDataTreeLeafPreimage, 16>;
-  public_data_reads_witnesses: FixedLengthArray<PublicDataMembershipWitness, 16>;
-  archive_root_membership_witness: ArchiveRootMembershipWitness;
-  constants: ConstantRollupData;
-}
-
-export interface BaseOrMergeRollupPublicInputs {
-  rollup_type: u32;
-  rollup_subtree_height: Field;
-  end_aggregation_object: AggregationObject;
-  constants: ConstantRollupData;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  calldata_hash: FixedLengthArray<Field, 2>;
-}
-
-export type ReturnType = BaseOrMergeRollupPublicInputs;
-
-export interface InputType {
-  inputs: BaseRollupInputs;
-}
diff --git a/yarn-project/noir-protocol-circuits/src/types/rollup_root_types.ts b/yarn-project/noir-protocol-circuits/src/types/rollup_root_types.ts
deleted file mode 100644
index ef8427a33e6..00000000000
--- a/yarn-project/noir-protocol-circuits/src/types/rollup_root_types.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-
-export type FixedLengthArray<T, L extends number> = L extends 0 ? never[] : T[] & { length: L };
-
-export type Field = string;
-export type u32 = string;
-
-export interface AggregationObject {}
-
-export interface AppendOnlyTreeSnapshot {
-  root: Field;
-  next_available_leaf_index: u32;
-}
-
-export interface GlobalVariables {
-  chain_id: Field;
-  version: Field;
-  block_number: Field;
-  timestamp: Field;
-}
-
-export interface ConstantRollupData {
-  archive_snapshot: AppendOnlyTreeSnapshot;
-  private_kernel_vk_tree_root: Field;
-  public_kernel_vk_tree_root: Field;
-  base_rollup_vk_hash: Field;
-  merge_rollup_vk_hash: Field;
-  global_variables: GlobalVariables;
-}
-
-export interface BaseOrMergeRollupPublicInputs {
-  rollup_type: u32;
-  rollup_subtree_height: Field;
-  end_aggregation_object: AggregationObject;
-  constants: ConstantRollupData;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  calldata_hash: FixedLengthArray<Field, 2>;
-}
-
-export interface Proof {}
-
-export interface VerificationKey {}
-
-export interface VKMembershipWitness {
-  leaf_index: Field;
-  sibling_path: FixedLengthArray<Field, 8>;
-}
-
-export interface PreviousRollupData {
-  base_or_merge_rollup_public_inputs: BaseOrMergeRollupPublicInputs;
-  proof: Proof;
-  vk: VerificationKey;
-  vk_index: u32;
-  vk_sibling_path: VKMembershipWitness;
-}
-
-export interface RootRollupInputs {
-  previous_rollup_data: FixedLengthArray<PreviousRollupData, 2>;
-  new_l1_to_l2_messages: FixedLengthArray<Field, 16>;
-  new_l1_to_l2_message_tree_root_sibling_path: FixedLengthArray<Field, 12>;
-  start_l1_to_l2_message_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_archive_snapshot: AppendOnlyTreeSnapshot;
-  new_archive_sibling_path: FixedLengthArray<Field, 16>;
-}
-
-export interface RootRollupPublicInputs {
-  end_aggregation_object: AggregationObject;
-  global_variables: GlobalVariables;
-  start_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_note_hash_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_nullifier_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_contract_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_public_data_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_l1_to_l2_message_tree_snapshot: AppendOnlyTreeSnapshot;
-  end_l1_to_l2_message_tree_snapshot: AppendOnlyTreeSnapshot;
-  start_archive_snapshot: AppendOnlyTreeSnapshot;
-  end_archive_snapshot: AppendOnlyTreeSnapshot;
-  calldata_hash: FixedLengthArray<Field, 2>;
-  l1_to_l2_messages_hash: FixedLengthArray<Field, 2>;
-}
-
-export type ReturnType = RootRollupPublicInputs;
-
-export interface InputType {
-  inputs: RootRollupInputs;
-}