From d12978e60619a303385cc5b20b262a04a130e395 Mon Sep 17 00:00:00 2001 From: avi-starkware Date: Thu, 18 Jul 2024 11:03:52 +0300 Subject: [PATCH] chore: rename segment arena flag in versioned constants (#2095) --- crates/blockifier/resources/versioned_constants.json | 2 +- crates/blockifier/resources/versioned_constants_13_0.json | 2 +- crates/blockifier/resources/versioned_constants_13_1.json | 2 +- crates/blockifier/resources/versioned_constants_13_1_1.json | 2 +- .../src/execution/deprecated_entry_point_execution.rs | 2 +- crates/blockifier/src/execution/entry_point_execution.rs | 2 +- crates/blockifier/src/versioned_constants.rs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/blockifier/resources/versioned_constants.json b/crates/blockifier/resources/versioned_constants.json index 46cfab6338..a0dd34a749 100644 --- a/crates/blockifier/resources/versioned_constants.json +++ b/crates/blockifier/resources/versioned_constants.json @@ -25,7 +25,7 @@ }, "disable_cairo0_redeclaration": true, "max_recursion_depth": 50, - "count_segment_arena_cells_not_instances": false, + "segment_arena_cells": false, "os_constants": { "block_hash_contract_address": 1, "call_contract_gas_cost": { diff --git a/crates/blockifier/resources/versioned_constants_13_0.json b/crates/blockifier/resources/versioned_constants_13_0.json index ff8f797307..103ea7fca0 100644 --- a/crates/blockifier/resources/versioned_constants_13_0.json +++ b/crates/blockifier/resources/versioned_constants_13_0.json @@ -5,7 +5,7 @@ }, "invoke_tx_max_n_steps": 3000000, "max_recursion_depth": 50, - "count_segment_arena_cells_not_instances": true, + "segment_arena_cells": true, "os_constants": { "nop_entry_point_offset": -1, "entry_point_type_external": 0, diff --git a/crates/blockifier/resources/versioned_constants_13_1.json b/crates/blockifier/resources/versioned_constants_13_1.json index 0b8de5265d..279612a501 100644 --- a/crates/blockifier/resources/versioned_constants_13_1.json +++ b/crates/blockifier/resources/versioned_constants_13_1.json @@ -24,7 +24,7 @@ ] }, "max_recursion_depth": 50, - "count_segment_arena_cells_not_instances": true, + "segment_arena_cells": true, "os_constants": { "nop_entry_point_offset": -1, "entry_point_type_external": 0, diff --git a/crates/blockifier/resources/versioned_constants_13_1_1.json b/crates/blockifier/resources/versioned_constants_13_1_1.json index 48832c863d..a80475fa16 100644 --- a/crates/blockifier/resources/versioned_constants_13_1_1.json +++ b/crates/blockifier/resources/versioned_constants_13_1_1.json @@ -24,7 +24,7 @@ ] }, "max_recursion_depth": 50, - "count_segment_arena_cells_not_instances": true, + "segment_arena_cells": true, "os_constants": { "nop_entry_point_offset": -1, "entry_point_type_external": 0, diff --git a/crates/blockifier/src/execution/deprecated_entry_point_execution.rs b/crates/blockifier/src/execution/deprecated_entry_point_execution.rs index 7442918ca4..4f84b19d03 100644 --- a/crates/blockifier/src/execution/deprecated_entry_point_execution.rs +++ b/crates/blockifier/src/execution/deprecated_entry_point_execution.rs @@ -234,7 +234,7 @@ pub fn finalize_execution( .map_err(VirtualMachineError::RunnerError)? .filter_unused_builtins(); let versioned_constants = syscall_handler.context.versioned_constants(); - if versioned_constants.count_segment_arena_cells_not_instances { + if versioned_constants.segment_arena_cells { vm_resources_without_inner_calls .builtin_instance_counter .get_mut(&BuiltinName::segment_arena) diff --git a/crates/blockifier/src/execution/entry_point_execution.rs b/crates/blockifier/src/execution/entry_point_execution.rs index d7deda0ee8..e63b4085d5 100644 --- a/crates/blockifier/src/execution/entry_point_execution.rs +++ b/crates/blockifier/src/execution/entry_point_execution.rs @@ -397,7 +397,7 @@ pub fn finalize_execution( .map_err(VirtualMachineError::RunnerError)? .filter_unused_builtins(); let versioned_constants = syscall_handler.context.versioned_constants(); - if versioned_constants.count_segment_arena_cells_not_instances { + if versioned_constants.segment_arena_cells { vm_resources_without_inner_calls .builtin_instance_counter .get_mut(&BuiltinName::segment_arena) diff --git a/crates/blockifier/src/versioned_constants.rs b/crates/blockifier/src/versioned_constants.rs index 699e17f886..b80c7a1670 100644 --- a/crates/blockifier/src/versioned_constants.rs +++ b/crates/blockifier/src/versioned_constants.rs @@ -52,7 +52,7 @@ pub struct VersionedConstants { // multiplied by 3. This offsets a bug in the old vm where the counter counted the number of // cells used by instances of the builtin, instead of the number of instances. #[serde(default)] - pub count_segment_arena_cells_not_instances: bool, + pub segment_arena_cells: bool, // Transactions settings. #[serde(default)]