Call update_remaining_gas only once (#3735)

Closes #3701

commit-id:a7f9412c

---

**Stack**:
- #3736
- #3735 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

Author: ddoktorski

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/calls.rs

@@ -1,15 +1,12 @@
 use crate::runtime_extensions::call_to_blockifier_runtime_extension::CheatnetState;
 use blockifier::execution::call_info::CallInfo;
 use blockifier::execution::syscalls::hint_processor::ENTRYPOINT_FAILED_ERROR;
-use blockifier::{
-    execution::execution_utils::update_remaining_gas,
-    execution::{
-        entry_point::{CallEntryPoint, CallType},
-        execution_utils::ReadOnlySegment,
-        syscalls::{
-            hint_processor::{SyscallExecutionError, SyscallHintProcessor, create_retdata_segment},
-            syscall_base::SyscallResult,
-        },
+use blockifier::execution::{
+    entry_point::{CallEntryPoint, CallType},
+    execution_utils::ReadOnlySegment,
+    syscalls::{
+        hint_processor::{SyscallExecutionError, SyscallHintProcessor, create_retdata_segment},
+        syscall_base::SyscallResult,
     },
 };
 use cairo_vm::vm::vm_core::VirtualMachine;
@@ -40,8 +37,8 @@ pub fn execute_inner_call(
         cheatnet_state,
         syscall_handler.base.context,
         true,
+        remaining_gas,
     )?;
-    update_remaining_gas(remaining_gas, &call_info);
     // endregion
 
     let mut raw_retdata = call_info.execution.retdata.0.clone();

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/cheated_syscalls.rs

@@ -5,6 +5,7 @@ use crate::runtime_extensions::call_to_blockifier_runtime_extension::execution::
 use blockifier::context::TransactionContext;
 use blockifier::execution::common_hints::ExecutionMode;
 use blockifier::execution::execution_utils::ReadOnlySegment;
+use blockifier::execution::syscalls::hint_processor::create_retdata_segment;
 use blockifier::execution::syscalls::hint_processor::{
     INVALID_ARGUMENT, SyscallExecutionError, SyscallHintProcessor,
 };
@@ -27,10 +28,6 @@ use blockifier::{
     },
     state::state_api::State,
 };
-use blockifier::{
-    execution::execution_utils::update_remaining_gas,
-    execution::syscalls::hint_processor::create_retdata_segment,
-};
 use cairo_vm::Felt252;
 use cairo_vm::vm::vm_core::VirtualMachine;
 use conversions::string::TryFromHexStr;
@@ -118,12 +115,11 @@ pub fn deploy_syscall(
         syscall_handler.base.context,
         &ctor_context,
         request.constructor_calldata,
-        *remaining_gas,
+        remaining_gas,
     )?;
 
     let constructor_retdata =
         create_retdata_segment(vm, syscall_handler, &call_info.execution.retdata.0)?;
-    update_remaining_gas(remaining_gas, &call_info);
 
     syscall_handler.base.inner_calls.push(call_info);
 
@@ -141,7 +137,7 @@ pub fn execute_deployment(
     context: &mut EntryPointExecutionContext,
     ctor_context: &ConstructorContext,
     constructor_calldata: Calldata,
-    remaining_gas: u64,
+    remaining_gas: &mut u64,
 ) -> EntryPointExecutionResult<CallInfo> {
     // Address allocation in the state is done before calling the constructor, so that it is
     // visible from it.

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/entry_point.rs

@@ -9,6 +9,7 @@ use crate::runtime_extensions::forge_runtime_extension::{get_nested_calls_syscal
 use blockifier::execution::contract_class::{RunnableCompiledClass, TrackedResource};
 
 use blockifier::execution::entry_point::{EntryPointRevertInfo, ExecutableCallEntryPoint};
+use blockifier::execution::execution_utils::update_remaining_gas;
 use blockifier::execution::stack_trace::{
     Cairo1RevertHeader, extract_trailing_cairo1_revert_trace,
 };
@@ -59,6 +60,7 @@ pub fn execute_call_entry_point(
     cheatnet_state: &mut CheatnetState,
     context: &mut EntryPointExecutionContext,
     is_revertable: bool,
+    remaining_gas: &mut u64,
 ) -> EntryPointExecutionResult<CallInfo> {
     let cheated_data = if let CallType::Delegate = entry_point.call_type {
         cheatnet_state
@@ -203,6 +205,7 @@ pub fn execute_call_entry_point(
                 vm_trace,
                 cheated_data.tx_info.signature.unwrap_or_default(),
             );
+            update_remaining_gas(remaining_gas, &call_info);
             Ok(call_info)
         }
         Err(EntryPointExecutionErrorWithTrace { source: err, trace }) => {
@@ -381,7 +384,7 @@ pub fn execute_constructor_entry_point(
     context: &mut EntryPointExecutionContext,
     ctor_context: &ConstructorContext,
     calldata: Calldata,
-    remaining_gas: u64,
+    remaining_gas: &mut u64,
 ) -> EntryPointExecutionResult<CallInfo> {
     // Ensure the class is declared (by reading it).
     let contract_class = state.get_compiled_class(ctor_context.class_hash)?;
@@ -395,7 +398,7 @@ pub fn execute_constructor_entry_point(
             context,
             ctor_context,
             calldata,
-            remaining_gas,
+            *remaining_gas,
         );
     };
 
@@ -408,10 +411,17 @@ pub fn execute_constructor_entry_point(
         storage_address: ctor_context.storage_address,
         caller_address: ctor_context.caller_address,
         call_type: CallType::Call,
-        initial_gas: remaining_gas,
+        initial_gas: *remaining_gas,
     };
     // region: Modified blockifier code
-    execute_call_entry_point(&mut constructor_call, state, cheatnet_state, context, false)
+    execute_call_entry_point(
+        &mut constructor_call,
+        state,
+        cheatnet_state,
+        context,
+        false,
+        remaining_gas,
+    )
     // endregion
 }
 

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/mod.rs

@@ -143,6 +143,7 @@ impl ExecuteCall for CallContractRequest {
             cheatnet_state,
             entry_point,
             &AddressOrClassHash::ContractAddress(contract_address),
+            remaining_gas,
         )
     }
 }
@@ -173,6 +174,7 @@ impl ExecuteCall for LibraryCallRequest {
             cheatnet_state,
             entry_point,
             &AddressOrClassHash::ClassHash(class_hash),
+            remaining_gas,
         )
     }
 }

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/rpc.rs

@@ -178,7 +178,7 @@ pub fn call_l1_handler(
     calldata: &[Felt],
 ) -> CallResult {
     let calldata = create_execute_calldata(calldata);
-
+    let mut remaining_gas = i64::MAX as u64;
     let entry_point = CallEntryPoint {
         class_hash: None,
         code_address: Some(*contract_address),
@@ -188,14 +188,15 @@ pub fn call_l1_handler(
         storage_address: *contract_address,
         caller_address: ContractAddress::default(),
         call_type: CallType::Call,
-        initial_gas: i64::MAX as u64,
+        initial_gas: remaining_gas,
     };
 
     call_entry_point(
         syscall_handler,
         cheatnet_state,
         entry_point,
         &AddressOrClassHash::ContractAddress(*contract_address),
+        &mut remaining_gas,
     )
 }
 
@@ -204,13 +205,15 @@ pub fn call_entry_point(
     cheatnet_state: &mut CheatnetState,
     mut entry_point: CallEntryPoint,
     starknet_identifier: &AddressOrClassHash,
+    remaining_gas: &mut u64,
 ) -> CallResult {
     let exec_result = execute_call_entry_point(
         &mut entry_point,
         syscall_handler.base.state,
         cheatnet_state,
         syscall_handler.base.context,
         false,
+        remaining_gas,
     );
 
     let result = CallResult::from_execution_result(&exec_result, starknet_identifier);

crates/cheatnet/src/runtime_extensions/deprecated_cheatable_starknet_extension/mod.rs

@@ -426,13 +426,15 @@ fn execute_inner_call(
     syscall_handler: &mut DeprecatedSyscallHintProcessor<'_>,
     cheatnet_state: &mut CheatnetState,
 ) -> DeprecatedSyscallResult<ReadOnlySegment> {
+    let mut remaining_gas = call.initial_gas;
     // region: Modified blockifier code
     let call_info = execute_call_entry_point(
         call,
         syscall_handler.state,
         cheatnet_state,
         syscall_handler.context,
         false,
+        &mut remaining_gas,
     )?;
     // endregion
 

crates/cheatnet/tests/common/mod.rs

@@ -182,7 +182,7 @@ fn deploy_helper(
         syscall_handler.base.context,
         &ctor_context,
         calldata,
-        i64::MAX as u64,
+        &mut (i64::MAX as u64),
     )
     .unwrap();
     cheatnet_state.increment_deploy_salt_base();
@@ -235,6 +235,7 @@ pub fn call_contract(
         cheatnet_state,
         entry_point,
         &AddressOrClassHash::ContractAddress(*contract_address),
+        &mut (i64::MAX as u64),
     )
 }
 
@@ -278,6 +279,7 @@ pub fn call_contract_raw(
         cheatnet_state,
         syscall_hint_processor.base.context,
         false,
+        &mut (i64::MAX as u64),
     )
 }