Skip to content

Commit 1b28084

Browse files
committed
Update revert gas in execute_syscall
Related #3681 commit-id:b4e3cde3
1 parent be1890a commit 1b28084

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::{
@@ -194,6 +195,9 @@ fn execute_syscall<Request: ExecuteCall + SyscallRequest>(
194195

195196
let mut remaining_gas = gas_counter - required_gas;
196197

198+
// TODO(#3681)
199+
syscall_handler.update_revert_gas_with_next_remaining_gas(GasAmount(remaining_gas));
200+
197201
// region: Modified blockifier code
198202
let call_result = request.execute_call(syscall_handler, cheatnet_state, &mut remaining_gas);
199203
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> {
@@ -196,6 +197,10 @@ impl CheatableStarknetRuntimeExtension<'_> {
196197

197198
// Execute.
198199
let mut remaining_gas = gas_counter - required_gas;
200+
201+
// TODO(#3681)
202+
syscall_handler.update_revert_gas_with_next_remaining_gas(GasAmount(remaining_gas));
203+
199204
let original_response = execute_callback(
200205
request,
201206
vm,

crates/forge-runner/src/gas.rs

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

5555
let transaction_resources = TransactionResources {

0 commit comments

Comments
 (0)