Skip to content

Commit 7e0e1a0

Browse files
authored
Update revert gas in execute_syscall (#3682)
Related #3681
1 parent 63d431e commit 7e0e1a0

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use cairo_vm::vm::{errors::hint_errors::HintError, vm_core::VirtualMachine};
1818
use runtime::{ExtendedRuntime, ExtensionLogic, SyscallHandlingResult};
1919
use starknet_api::contract_class::EntryPointType;
2020
use starknet_api::core::ContractAddress;
21+
use starknet_api::execution_resources::GasAmount;
2122
use starknet_types_core::felt::Felt;
2223

2324
use crate::runtime_extensions::call_to_blockifier_runtime_extension::rpc::{
@@ -229,6 +230,9 @@ fn execute_syscall<Request: ExecuteCall + SyscallRequest>(
229230

230231
let mut remaining_gas = gas_counter - required_gas;
231232

233+
// TODO(#3681)
234+
syscall_handler.update_revert_gas_with_next_remaining_gas(GasAmount(remaining_gas));
235+
232236
// region: Modified blockifier code
233237
let call_result = request.execute_call(syscall_handler, cheatnet_state, &mut remaining_gas);
234238
write_call_response(syscall_handler, vm, remaining_gas, call_result)?;

crates/cheatnet/src/runtime_extensions/cheatable_starknet_runtime_extension.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use cairo_vm::{
2323
},
2424
};
2525
use runtime::{ExtendedRuntime, ExtensionLogic, StarknetRuntime, SyscallHandlingResult};
26+
use starknet_api::execution_resources::GasAmount;
2627
use starknet_types_core::felt::Felt;
2728

2829
pub struct CheatableStarknetRuntimeExtension<'a> {
@@ -232,6 +233,10 @@ impl CheatableStarknetRuntimeExtension<'_> {
232233

233234
// Execute.
234235
let mut remaining_gas = gas_counter - required_gas;
236+
237+
// TODO(#3681)
238+
syscall_handler.update_revert_gas_with_next_remaining_gas(GasAmount(remaining_gas));
239+
235240
let original_response = execute_callback(
236241
request,
237242
vm,

crates/forge-runner/src/gas.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ pub fn calculate_used_gas(
4545
// as they are not relevant for test execution (see documentation for details):
4646
// https://github.com/foundry-rs/starknet-foundry/blob/979caf23c5d1085349e253d75682dd0e2527e321/docs/src/testing/gas-and-resource-estimation.md?plain=1#L75
4747
os_vm_resources: ExecutionResources::default(),
48-
n_reverted_steps: 0,
48+
n_reverted_steps: 0, // TODO(#3681)
4949
sierra_gas: resources.gas_consumed,
50-
reverted_sierra_gas: GasAmount::ZERO,
50+
reverted_sierra_gas: GasAmount::ZERO, // TODO(#3681)
5151
};
5252

5353
let transaction_resources = TransactionResources {

0 commit comments

Comments
 (0)