Merge f37692d into 8e74cd0

AztecProtocol · Nov 19, 2024 · 61b1803 · 61b1803
2 parents 8e74cd0 + f37692d
commit 61b1803
Show file tree

Hide file tree

Showing 127 changed files with 171 additions and 9,069 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp b/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp
@@ -34,7 +34,6 @@
 #define TOTAL_FEES_LENGTH 1
 #define HEADER_LENGTH 24
 #define PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH 866
-#define PUBLIC_CONTEXT_INPUTS_LENGTH 41
 #define AVM_ACCUMULATED_DATA_LENGTH 318
 #define AVM_CIRCUIT_PUBLIC_INPUTS_LENGTH 1006
 #define AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS 86

diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol
@@ -72,7 +72,6 @@ library Constants {
   uint256 internal constant MAX_ENCRYPTED_LOGS_PER_TX = 8;
   uint256 internal constant MAX_UNENCRYPTED_LOGS_PER_TX = 8;
   uint256 internal constant MAX_CONTRACT_CLASS_LOGS_PER_TX = 1;
-  uint256 internal constant MAX_PUBLIC_DATA_HINTS = 128;
   uint256 internal constant NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP = 16;
   uint256 internal constant EMPTY_NESTED_INDEX = 0;
   uint256 internal constant PRIVATE_KERNEL_EMPTY_INDEX = 1;
@@ -207,28 +206,20 @@ library Constants {
   uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 490;
   uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 866;
   uint256 internal constant PRIVATE_CONTEXT_INPUTS_LENGTH = 37;
-  uint256 internal constant PUBLIC_CONTEXT_INPUTS_LENGTH = 41;
   uint256 internal constant FEE_RECIPIENT_LENGTH = 2;
   uint256 internal constant AGGREGATION_OBJECT_LENGTH = 16;
   uint256 internal constant SCOPED_READ_REQUEST_LEN = 3;
   uint256 internal constant PUBLIC_DATA_READ_LENGTH = 3;
   uint256 internal constant PRIVATE_VALIDATION_REQUESTS_LENGTH = 772;
-  uint256 internal constant NUM_PUBLIC_VALIDATION_REQUEST_ARRAYS = 5;
-  uint256 internal constant PUBLIC_VALIDATION_REQUESTS_LENGTH = 834;
-  uint256 internal constant PUBLIC_DATA_UPDATE_REQUEST_LENGTH = 3;
   uint256 internal constant COMBINED_ACCUMULATED_DATA_LENGTH = 550;
   uint256 internal constant TX_CONSTANT_DATA_LENGTH = 34;
   uint256 internal constant COMBINED_CONSTANT_DATA_LENGTH = 43;
   uint256 internal constant PRIVATE_ACCUMULATED_DATA_LENGTH = 1036;
   uint256 internal constant PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 1849;
-  uint256 internal constant PUBLIC_ACCUMULATED_DATA_LENGTH = 1023;
-  uint256 internal constant NUM_PUBLIC_ACCUMULATED_DATA_ARRAYS = 8;
   uint256 internal constant PRIVATE_TO_PUBLIC_ACCUMULATED_DATA_LENGTH = 548;
   uint256 internal constant PRIVATE_TO_AVM_ACCUMULATED_DATA_LENGTH = 160;
   uint256 internal constant NUM_PRIVATE_TO_AVM_ACCUMULATED_DATA_ARRAYS = 3;
   uint256 internal constant PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 1140;
-  uint256 internal constant PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2931;
-  uint256 internal constant VM_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2340;
   uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 605;
   uint256 internal constant CONSTANT_ROLLUP_DATA_LENGTH = 13;
   uint256 internal constant BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 30;

diff --git a/noir-projects/mock-protocol-circuits/Nargo.toml b/noir-projects/mock-protocol-circuits/Nargo.toml
@@ -7,5 +7,5 @@ members = [
   "crates/mock-private-kernel-inner",
   "crates/mock-private-kernel-reset",
   "crates/mock-private-kernel-tail",
-  "crates/mock-public-kernel",
+  "crates/mock-public-base",
 ]
diff --git a/...uits/crates/mock-public-kernel/Nargo.toml → ...rcuits/crates/mock-public-base/Nargo.toml b/...uits/crates/mock-public-kernel/Nargo.toml → ...rcuits/crates/mock-public-base/Nargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mock_public_kernel"
+name = "mock_public_base"
 type = "bin"
 authors = [""]
 compiler_version = ">=0.32.0"

diff --git a/...its/crates/mock-public-kernel/src/main.nr → ...cuits/crates/mock-public-base/src/main.nr b/...its/crates/mock-public-kernel/src/main.nr → ...cuits/crates/mock-public-base/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/Nargo.template.toml b/noir-projects/noir-protocol-circuits/Nargo.template.toml
@@ -20,9 +20,6 @@ members = [
     "crates/private-kernel-empty-simulated",
     "crates/empty-nested",
     "crates/empty-nested-simulated",
-    "crates/public-kernel-lib",
-    "crates/public-kernel-merge-simulated",
-    "crates/public-kernel-tail-simulated",
     "crates/reset-kernel-lib",
     "crates/rollup-lib",
     "crates/rollup-merge",

diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/components/mod.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/components/mod.nr
diff --git a/...rotocol-circuits/crates/public-kernel-lib/src/components/public_kernel_output_composer.nr b/...rotocol-circuits/crates/public-kernel-lib/src/components/public_kernel_output_composer.nr
diff --git a/...lic-kernel-lib/src/components/public_kernel_output_composer/propagate_accumulated_data.nr b/...lic-kernel-lib/src/components/public_kernel_output_composer/propagate_accumulated_data.nr
diff --git a/...-protocol-circuits/crates/public-kernel-lib/src/components/public_tail_output_composer.nr b/...-protocol-circuits/crates/public-kernel-lib/src/components/public_tail_output_composer.nr