feat(AVM): Implement l2 gas limit maximum and remove clamping (#16500)

 - Removes gas limit clamping
 - Reworks the gas limit constants
 - Improves gas estimation
- Adds a transaction validator to check that l2 gas limit is within AVM
provable bounds
- Adds l2 gas limit check to public base, pending move to private
kernels
- Adds a check in the avm simulator that the actual **consumed** gas is
not more than the provable gas.

Author: sirasistant

barretenberg/cpp/src/barretenberg/vm2/common/aztec_constants.hpp

@@ -169,7 +169,7 @@
 #define AVM_V2_PUBLIC_INPUTS_FLATTENED_SIZE 1
 #define AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED 20000
 #define AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED 1000
-#define MAX_L2_GAS_PER_TX_PUBLIC_PORTION 6000000
+#define AVM_MAX_PROCESSABLE_L2_GAS 6000000
 #define AVM_GAS_PER_ROW 3
 #define AVM_MERKLE_CHECK_ROWS_PUBLIC_WRITE 80
 #define AVM_MERKLE_CHECK_ROWS_PUBLIC_READ 40

barretenberg/cpp/src/barretenberg/vm2/testing/avm_inputs.testdata.bin

@@ -11,7 +11,10 @@ use dep::types::{
         gas::Gas, gas_fees::GasFees, gas_settings::GasSettings,
         kernel_circuit_public_inputs::PrivateToRollupKernelCircuitPublicInputs,
     },
-    constants::{DEFAULT_GAS_LIMIT, DEFAULT_TEARDOWN_GAS_LIMIT},
+    constants::{
+        DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT, DEFAULT_TEARDOWN_DA_GAS_LIMIT,
+        DEFAULT_TEARDOWN_L2_GAS_LIMIT,
+    },
     tests::fixture_builder::FixtureBuilder,
 };
 
@@ -24,8 +27,8 @@ pub struct TailOutputValidatorBuilder {
 impl TailOutputValidatorBuilder {
     pub fn new() -> Self {
         let gas_settings = GasSettings::new(
-            Gas::new(DEFAULT_GAS_LIMIT, DEFAULT_GAS_LIMIT),
-            Gas::new(DEFAULT_TEARDOWN_GAS_LIMIT, DEFAULT_TEARDOWN_GAS_LIMIT),
+            Gas::new(DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT),
+            Gas::new(DEFAULT_TEARDOWN_DA_GAS_LIMIT, DEFAULT_TEARDOWN_L2_GAS_LIMIT),
             GasFees::new(10, 10),
             GasFees::new(3, 3),
         );

barretenberg/cpp/src/barretenberg/vm2/testing/minimal_tx.testdata.bin

@@ -1,7 +1,6 @@
 pub(crate) mod archive;
 pub(crate) mod constants;
 pub(crate) mod fees;
-pub(crate) mod gas;
 pub(crate) mod include_by_timestamp;
 pub(crate) mod nullifier_tree;
 pub(crate) mod public_data_tree;

noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/tail_output_validator_builder/mod.nr

@@ -3,7 +3,7 @@ use crate::base::components::{
 };
 use dep::types::{
     abis::{block_constant_data::BlockConstantData, tube::PrivateTubeData},
-    constants::ARCHIVE_HEIGHT,
+    constants::{ARCHIVE_HEIGHT, AVM_MAX_PROCESSABLE_L2_GAS},
     merkle_tree::MembershipWitness,
     proof::traits::Verifiable,
 };
@@ -17,6 +17,15 @@ impl PrivateTubeDataValidator {
         PrivateTubeDataValidator { data }
     }
 
+    // TODO: This should be moved to the private kernels once they are not used for gas estimation anymore.
+    pub fn validate_gas_settings(self) {
+        let gas_settings = self.data.public_inputs.constants.tx_context.gas_settings;
+        assert(
+            gas_settings.gas_limits.l2_gas <= AVM_MAX_PROCESSABLE_L2_GAS,
+            "l2 gas limit exceeds max processable l2 gas",
+        );
+    }
+
     pub fn validate_proof_and_vk(self) {
         if !dep::std::runtime::is_unconstrained() {
             self.data.verify();

noir-projects/noir-protocol-circuits/crates/rollup-base-private/Prover.toml

@@ -1,14 +1,13 @@
 use crate::base::components::{
-    constants::validate_tx_constant_data, gas::clamp_gas_settings_for_avm,
-    include_by_timestamp::validate_include_by_timestamp,
+    constants::validate_tx_constant_data, include_by_timestamp::validate_include_by_timestamp,
 };
 use super::fees::compute_effective_gas_fees;
 use dep::types::{
     abis::{
         avm_circuit_public_inputs::AvmCircuitPublicInputs, block_constant_data::BlockConstantData,
         tube::PublicTubeData,
     },
-    constants::ARCHIVE_HEIGHT,
+    constants::{ARCHIVE_HEIGHT, AVM_MAX_PROCESSABLE_L2_GAS},
     merkle_tree::MembershipWitness,
     proof::traits::Verifiable,
     traits::Empty,
@@ -39,6 +38,15 @@ impl PublicTubeDataValidator {
         PublicTubeDataValidator { data }
     }
 
+    // TODO: This should be moved to the private kernels once they are not used for gas estimation anymore.
+    pub fn validate_gas_settings(self) {
+        let gas_settings = self.data.public_inputs.constants.tx_context.gas_settings;
+        assert(
+            gas_settings.gas_limits.l2_gas <= AVM_MAX_PROCESSABLE_L2_GAS,
+            "l2 gas limit exceeds max processable l2 gas",
+        );
+    }
+
     pub fn validate_proof_and_vk(self) {
         if !dep::std::runtime::is_unconstrained() {
             self.data.verify();
@@ -84,10 +92,7 @@ impl PublicTubeDataValidator {
         );
 
         assert_eq(
-            clamp_gas_settings_for_avm(
-                tube_data.constants.tx_context.gas_settings,
-                tube_data.gas_used,
-            ),
+            tube_data.constants.tx_context.gas_settings,
             avm_data.gas_settings,
             "unexpected gas settings used in the AVM",
         );