feat(blockifier): exclude l1_data_gas from accounts in VC

Author: nimrod-starkware

crates/blockifier/src/execution/syscalls/hint_processor.rs

@@ -280,11 +280,15 @@ impl ResourceAsFelts {
 
 pub fn valid_resource_bounds_as_felts(
     resource_bounds: &ValidResourceBounds,
+    exclude_l1_data_gas: bool,
 ) -> SyscallResult<Vec<ResourceAsFelts>> {
     let mut resource_bounds_vec: Vec<_> = vec![
         ResourceAsFelts::new(Resource::L1Gas, &resource_bounds.get_l1_bounds())?,
         ResourceAsFelts::new(Resource::L2Gas, &resource_bounds.get_l2_bounds())?,
     ];
+    if exclude_l1_data_gas {
+        return Ok(resource_bounds_vec);
+    }
     if let ValidResourceBounds::AllResources(AllResourceBounds { l1_data_gas, .. }) =
         resource_bounds
     {
@@ -461,17 +465,21 @@ impl<'a> SyscallHintProcessor<'a> {
     ) -> SyscallResult<Relocatable> {
         let returned_version = self.base.tx_version_for_get_execution_info();
         let original_version = self.base.context.tx_context.tx_info.signed_version();
+        let exclude_l1_data_gas = self.base.exclude_l1_data_gas();
 
         // If the transaction version was overridden, `self.execution_info_ptr` cannot be used.
         if returned_version != original_version {
-            return self.allocate_execution_info_segment(vm, returned_version);
+            return self.allocate_execution_info_segment(vm, returned_version, exclude_l1_data_gas);
         }
 
         match self.execution_info_ptr {
             Some(execution_info_ptr) => Ok(execution_info_ptr),
             None => {
-                let execution_info_ptr =
-                    self.allocate_execution_info_segment(vm, original_version)?;
+                let execution_info_ptr = self.allocate_execution_info_segment(
+                    vm,
+                    original_version,
+                    exclude_l1_data_gas,
+                )?;
                 self.execution_info_ptr = Some(execution_info_ptr);
                 Ok(execution_info_ptr)
             }
@@ -482,9 +490,10 @@ impl<'a> SyscallHintProcessor<'a> {
         &mut self,
         vm: &mut VirtualMachine,
         tx_info: &CurrentTransactionInfo,
+        exclude_l1_data_gas: bool,
     ) -> SyscallResult<(Relocatable, Relocatable)> {
         let flat_resource_bounds: Vec<_> =
-            valid_resource_bounds_as_felts(&tx_info.resource_bounds)?
+            valid_resource_bounds_as_felts(&tx_info.resource_bounds, exclude_l1_data_gas)?
                 .into_iter()
                 .flat_map(ResourceAsFelts::flatten)
                 .collect();
@@ -593,9 +602,11 @@ impl<'a> SyscallHintProcessor<'a> {
         &mut self,
         vm: &mut VirtualMachine,
         tx_version_override: TransactionVersion,
+        exclude_l1_data_gas: bool,
     ) -> SyscallResult<Relocatable> {
         let block_info_ptr = self.allocate_block_info_segment(vm)?;
-        let tx_info_ptr = self.allocate_tx_info_segment(vm, tx_version_override)?;
+        let tx_info_ptr =
+            self.allocate_tx_info_segment(vm, tx_version_override, exclude_l1_data_gas)?;
 
         let additional_info: Vec<MaybeRelocatable> = vec![
             block_info_ptr.into(),
@@ -645,6 +656,7 @@ impl<'a> SyscallHintProcessor<'a> {
         &mut self,
         vm: &mut VirtualMachine,
         tx_version_override: TransactionVersion,
+        exclude_l1_data_gas: bool,
     ) -> SyscallResult<Relocatable> {
         let tx_info = &self.base.context.tx_context.clone().tx_info;
         let (tx_signature_start_ptr, tx_signature_end_ptr) =
@@ -667,7 +679,7 @@ impl<'a> SyscallHintProcessor<'a> {
         match tx_info {
             TransactionInfo::Current(context) => {
                 let (tx_resource_bounds_start_ptr, tx_resource_bounds_end_ptr) =
-                    &self.allocate_tx_resource_bounds_segment(vm, context)?;
+                    &self.allocate_tx_resource_bounds_segment(vm, context, exclude_l1_data_gas)?;
 
                 let (tx_paymaster_data_start_ptr, tx_paymaster_data_end_ptr) =
                     &self.allocate_data_segment(vm, &context.paymaster_data.0)?;

crates/blockifier/src/execution/syscalls/syscall_base.rs

@@ -213,6 +213,13 @@ impl<'state> SyscallHandlerBase<'state> {
         tx_context.tx_info.signed_version()
     }
 
+    /// Return wether the class is in the data gas accounts set.
+    pub fn exclude_l1_data_gas(&self) -> bool {
+        let class_hash = self.call.class_hash;
+        let versioned_constants = &self.context.tx_context.block_context.versioned_constants;
+        versioned_constants.os_constants.data_gas_accounts.contains(&class_hash)
+    }
+
     pub fn emit_event(&mut self, event: EventContent) -> SyscallResult<()> {
         exceeds_event_size_limit(
             self.context.versioned_constants(),

crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs

@@ -51,6 +51,7 @@ use crate::transaction::objects::{
         TransactionVersion::ONE,
         false,
         false,
+        false,
         false;
         "Native: Validate execution mode: block info fields should be zeroed. Transaction V1."
     )
@@ -63,6 +64,7 @@ use crate::transaction::objects::{
         TransactionVersion::ONE,
         false,
         false,
+        false,
         false;
         "Native: Execute execution mode: block info should be as usual. Transaction V1."
     )
@@ -75,6 +77,7 @@ use crate::transaction::objects::{
         TransactionVersion::THREE,
         false,
         false,
+        false,
         false;
         "Native: Validate execution mode: block info fields should be zeroed. Transaction V3."
     )
@@ -87,6 +90,7 @@ use crate::transaction::objects::{
         TransactionVersion::THREE,
         false,
         false,
+        false,
         false;
         "Native: Execute execution mode: block info should be as usual. Transaction V3."
     )
@@ -99,6 +103,7 @@ use crate::transaction::objects::{
     TransactionVersion::ONE,
     false,
     false,
+    false,
     false;
     "Native: Legacy contract. Execute execution mode: block info should be as usual. Transaction
     V1."
@@ -112,6 +117,7 @@ use crate::transaction::objects::{
     TransactionVersion::THREE,
     false,
     false,
+    false,
     false;
     "Native: Legacy contract. Execute execution mode: block info should be as usual. Transaction
     V3."
@@ -125,6 +131,7 @@ use crate::transaction::objects::{
         TransactionVersion::THREE,
         true,
         false,
+        false,
         false;
         "Native: Execute execution mode: block info should be as usual. Transaction V3. Query"
     )
@@ -137,6 +144,7 @@ use crate::transaction::objects::{
         TransactionVersion::THREE,
         false,
         true,
+        false,
         false;
         "Native: V1 bound account: execute"
     )
@@ -149,6 +157,7 @@ use crate::transaction::objects::{
         TransactionVersion::THREE,
         true,
         true,
+        false,
         false;
         "Native: V1 bound account: query"
     )
@@ -159,6 +168,7 @@ use crate::transaction::objects::{
     TransactionVersion::ONE,
     false,
     false,
+    false,
     false;
     "Validate execution mode: block info fields should be zeroed. Transaction V1.")]
 #[test_case(
@@ -167,6 +177,7 @@ use crate::transaction::objects::{
     TransactionVersion::ONE,
     false,
     false,
+    false,
     false;
     "Execute execution mode: block info should be as usual. Transaction V1.")]
 #[test_case(
@@ -175,6 +186,7 @@ use crate::transaction::objects::{
     TransactionVersion::THREE,
     false,
     false,
+    false,
     false;
     "Validate execution mode: block info fields should be zeroed. Transaction V3.")]
 #[test_case(
@@ -183,6 +195,7 @@ use crate::transaction::objects::{
     TransactionVersion::THREE,
     false,
     false,
+    false,
     false;
     "Execute execution mode: block info should be as usual. Transaction V3.")]
 #[test_case(
@@ -191,6 +204,7 @@ use crate::transaction::objects::{
     TransactionVersion::ONE,
     false,
     false,
+    false,
     false;
     "Legacy contract. Execute execution mode: block info should be as usual. Transaction V1.")]
 #[test_case(
@@ -199,6 +213,7 @@ use crate::transaction::objects::{
     TransactionVersion::THREE,
     false,
     false,
+    false,
     false;
     "Legacy contract. Execute execution mode: block info should be as usual. Transaction V3.")]
 #[test_case(
@@ -207,6 +222,7 @@ use crate::transaction::objects::{
     TransactionVersion::THREE,
     true,
     false,
+    false,
     false;
     "Execute execution mode: block info should be as usual. Transaction V3. Query.")]
 #[test_case(
@@ -215,6 +231,7 @@ use crate::transaction::objects::{
     TransactionVersion::THREE,
     false,
     true,
+    false,
     false;
     "V1 bound account: execute")]
 #[test_case(
@@ -223,16 +240,36 @@ use crate::transaction::objects::{
     TransactionVersion::THREE,
     false,
     true,
-    true;
+    true,
+    false;
     "V1 bound account: execute, high tip")]
 #[test_case(
     FeatureContract::TestContract(CairoVersion::Cairo1(RunnableCairo1::Casm)),
     ExecutionMode::Execute,
     TransactionVersion::THREE,
     true,
     true,
+    false,
     false;
     "V1 bound account: query")]
+#[test_case(
+    FeatureContract::TestContract(CairoVersion::Cairo1(RunnableCairo1::Casm)),
+    ExecutionMode::Execute,
+    TransactionVersion::THREE,
+    false,
+    false,
+    false,
+    true;
+    "Exclude l1 data gas: execute")]
+#[test_case(
+    FeatureContract::TestContract(CairoVersion::Cairo1(RunnableCairo1::Casm)),
+    ExecutionMode::Execute,
+    TransactionVersion::THREE,
+    true,
+    false,
+    false,
+    true;
+    "Exclude l1 data gas: query")]
 fn test_get_execution_info(
     test_contract: FeatureContract,
     execution_mode: ExecutionMode,
@@ -241,13 +278,21 @@ fn test_get_execution_info(
     v1_bound_account: bool,
     // Whether the tip is larger than `v1_bound_accounts_max_tip`.
     high_tip: bool,
+    exclude_l1_data_gas: bool,
 ) {
     let mut test_contract_data: FeatureContractData = test_contract.into();
     if v1_bound_account {
+        assert!(
+            !exclude_l1_data_gas,
+            "Unable to set both exclude_l1_data_gas and v1_bound_account."
+        );
         let optional_class_hash =
             VersionedConstants::latest_constants().os_constants.v1_bound_accounts_cairo1.first();
         test_contract_data.class_hash =
             *optional_class_hash.expect("No v1 bound accounts found in versioned constants.");
+    } else if exclude_l1_data_gas {
+        test_contract_data.class_hash =
+            *VersionedConstants::latest_constants().os_constants.data_gas_accounts.first().unwrap();
     }
     let state =
         &mut test_state_ex(&ChainInfo::create_for_testing(), BALANCE, &[(test_contract_data, 1)]);
@@ -329,15 +374,17 @@ fn test_get_execution_info(
         (_, version) if version == TransactionVersion::ONE => vec![
             felt!(0_u16), // Length of resource bounds array.
         ],
-        (_, _) => vec![felt!(3_u8)] // Length of resource bounds array.
-            .into_iter()
-            .chain(
-                valid_resource_bounds_as_felts(&all_resource_bounds)
-                    .unwrap()
-                    .into_iter()
-                    .flat_map(|bounds| bounds.flatten()),
-            )
-            .collect(),
+        (_, _) => {
+            vec![felt!(if exclude_l1_data_gas { 2_u8 } else { 3 })] // Length of resource bounds array.
+                .into_iter()
+                .chain(
+                    valid_resource_bounds_as_felts(&all_resource_bounds, exclude_l1_data_gas)
+                        .unwrap()
+                        .into_iter()
+                        .flat_map(|bounds| bounds.flatten()),
+                )
+                .collect()
+        }
     };
 
     let expected_tx_info: Vec<Felt>;

crates/starknet_os/src/hints/hint_implementation/execution/utils.rs

@@ -50,11 +50,8 @@ impl<IG: IdentifierGetter> LoadCairoObject<IG> for ValidResourceBounds {
         address: Relocatable,
         constants: &HashMap<String, Felt>,
     ) -> OsHintResult {
-        valid_resource_bounds_as_felts(self).map_err(OsHintError::ResourceBoundsParsing)?.load_into(
-            vm,
-            identifier_getter,
-            address,
-            constants,
-        )
+        valid_resource_bounds_as_felts(self, false)
+            .map_err(OsHintError::ResourceBoundsParsing)?
+            .load_into(vm, identifier_getter, address, constants)
     }
 }