refactor(blockifier): rename versioned_constants file (#3934)

crates/blockifier/src/blockifier/block.rs

@@ -10,9 +10,9 @@ use starknet_api::block::{
 use starknet_api::state::StorageKey;
 
 use crate::abi::constants;
+use crate::blockifier_versioned_constants::{OsConstants, VersionedConstants};
 use crate::state::errors::StateError;
 use crate::state::state_api::{State, StateResult};
-use crate::versioned_constants::{OsConstants, VersionedConstants};
 
 #[cfg(test)]
 #[path = "block_test.rs"]

crates/blockifier/src/blockifier/block_test.rs

@@ -4,12 +4,12 @@ use starknet_api::state::StorageKey;
 
 use crate::abi::constants;
 use crate::blockifier::block::pre_process_block;
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::ChainInfo;
 use crate::state::state_api::StateReader;
 use crate::test_utils::contracts::FeatureContract;
 use crate::test_utils::initial_test_state::test_state;
 use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE};
-use crate::versioned_constants::VersionedConstants;
 
 #[test]
 fn test_pre_process_block() {

crates/blockifier/src/context.rs

@@ -12,6 +12,7 @@ use starknet_api::transaction::fields::{
     ValidResourceBounds,
 };
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::bouncer::BouncerConfig;
 use crate::execution::call_info::CallInfo;
 use crate::transaction::objects::{
@@ -20,7 +21,6 @@ use crate::transaction::objects::{
     TransactionInfo,
     TransactionInfoCreator,
 };
-use crate::versioned_constants::VersionedConstants;
 
 #[derive(Clone, Debug)]
 pub struct TransactionContext {

crates/blockifier/src/execution/call_info.rs

@@ -11,11 +11,11 @@ use starknet_api::state::StorageKey;
 use starknet_api::transaction::{EventContent, L2ToL1Payload};
 use starknet_types_core::felt::Felt;
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::execution::contract_class::TrackedResource;
 use crate::execution::entry_point::CallEntryPoint;
 use crate::state::cached_state::StorageEntry;
 use crate::utils::u64_from_usize;
-use crate::versioned_constants::VersionedConstants;
 
 #[cfg_attr(feature = "transaction_serde", derive(serde::Deserialize))]
 #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize)]

crates/blockifier/src/execution/contract_address_test.rs

@@ -4,6 +4,7 @@ use starknet_api::core::{calculate_contract_address, ClassHash, ContractAddress}
 use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
 use starknet_api::{calldata, felt};
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::ChainInfo;
 use crate::execution::call_info::CallExecution;
 use crate::execution::entry_point::CallEntryPoint;
@@ -13,7 +14,6 @@ use crate::test_utils::contracts::FeatureContract;
 use crate::test_utils::dict_state_reader::DictStateReader;
 use crate::test_utils::initial_test_state::test_state;
 use crate::test_utils::{CairoVersion, BALANCE};
-use crate::versioned_constants::VersionedConstants;
 
 #[rstest]
 fn test_calculate_contract_address() {

crates/blockifier/src/execution/deprecated_syscalls/deprecated_syscalls_test.rs

@@ -26,6 +26,7 @@ use starknet_api::{calldata, felt, nonce, storage_key, tx_hash};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::ChainInfo;
 use crate::execution::call_info::{CallExecution, CallInfo, OrderedEvent, StorageAccessTracker};
 use crate::execution::common_hints::ExecutionMode;
@@ -47,7 +48,6 @@ use crate::transaction::objects::{
     DeprecatedTransactionInfo,
     TransactionInfo,
 };
-use crate::versioned_constants::VersionedConstants;
 use crate::{check_entry_point_execution_error_for_custom_hint, retdata};
 
 #[test]

crates/blockifier/src/execution/entry_point.rs

@@ -21,6 +21,7 @@ use starknet_api::transaction::fields::{
 use starknet_api::transaction::TransactionVersion;
 use starknet_types_core::felt::Felt;
 
+use crate::blockifier_versioned_constants::{GasCosts, VersionedConstants};
 use crate::context::{BlockContext, TransactionContext};
 use crate::execution::call_info::CallInfo;
 use crate::execution::common_hints::ExecutionMode;
@@ -36,7 +37,6 @@ use crate::state::state_api::{State, StateResult};
 use crate::transaction::objects::{HasRelatedFeeType, TransactionInfo};
 use crate::transaction::transaction_types::TransactionType;
 use crate::utils::usize_from_u64;
-use crate::versioned_constants::{GasCosts, VersionedConstants};
 
 #[cfg(test)]
 #[path = "entry_point_test.rs"]

crates/blockifier/src/execution/entry_point_execution.rs

@@ -10,6 +10,7 @@ use cairo_vm::vm::security::verify_secure_runner;
 use num_traits::{ToPrimitive, Zero};
 use starknet_types_core::felt::Felt;
 
+use crate::blockifier_versioned_constants::GasCosts;
 use crate::execution::call_info::{CallExecution, CallInfo, Retdata};
 use crate::execution::contract_class::{CompiledClassV1, EntryPointV1, TrackedResource};
 use crate::execution::entry_point::{
@@ -28,7 +29,6 @@ use crate::execution::execution_utils::{
 };
 use crate::execution::syscalls::hint_processor::SyscallHintProcessor;
 use crate::state::state_api::State;
-use crate::versioned_constants::GasCosts;
 
 #[cfg(test)]
 #[path = "entry_point_execution_test.rs"]

crates/blockifier/src/execution/entry_point_test.rs

@@ -9,6 +9,7 @@ use starknet_api::execution_utils::format_panic_data;
 use starknet_api::transaction::fields::{Calldata, Fee};
 use starknet_api::{calldata, felt, storage_key};
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::ChainInfo;
 use crate::execution::call_info::{CallExecution, CallInfo};
 use crate::execution::entry_point::CallEntryPoint;
@@ -18,7 +19,6 @@ use crate::test_utils::contracts::FeatureContract;
 use crate::test_utils::dict_state_reader::DictStateReader;
 use crate::test_utils::initial_test_state::test_state;
 use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE};
-use crate::versioned_constants::VersionedConstants;
 
 #[test]
 fn test_call_info_iteration() {

crates/blockifier/src/execution/native/syscall_handler.rs

@@ -25,6 +25,7 @@ use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
 use starknet_api::transaction::{EventContent, EventData, EventKey, L2ToL1Payload};
 use starknet_types_core::felt::Felt;
 
+use crate::blockifier_versioned_constants::GasCosts;
 use crate::execution::call_info::{MessageToL1, Retdata};
 use crate::execution::common_hints::ExecutionMode;
 use crate::execution::entry_point::{
@@ -40,7 +41,6 @@ use crate::execution::syscalls::hint_processor::{SyscallExecutionError, OUT_OF_G
 use crate::execution::syscalls::syscall_base::SyscallHandlerBase;
 use crate::state::state_api::State;
 use crate::transaction::objects::TransactionInfo;
-use crate::versioned_constants::GasCosts;
 
 pub const CALL_CONTRACT_SELECTOR_NAME: &str = "call_contract";
 pub const LIBRARY_CALL_SELECTOR_NAME: &str = "library_call";

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

@@ -27,6 +27,7 @@ use starknet_types_core::felt::{Felt, FromStrError};
 use thiserror::Error;
 
 use crate::abi::sierra_types::SierraTypeError;
+use crate::blockifier_versioned_constants::GasCosts;
 use crate::execution::common_hints::{ExecutionMode, HintExecutionResult};
 use crate::execution::contract_class::TrackedResource;
 use crate::execution::entry_point::{
@@ -80,7 +81,6 @@ use crate::execution::syscalls::{
 use crate::state::errors::StateError;
 use crate::state::state_api::State;
 use crate::transaction::objects::{CurrentTransactionInfo, TransactionInfo};
-use crate::versioned_constants::GasCosts;
 
 pub type SyscallCounter = HashMap<SyscallSelector, usize>;
 

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

@@ -21,6 +21,7 @@ use self::hint_processor::{
     SyscallExecutionError,
     SyscallHintProcessor,
 };
+use crate::blockifier_versioned_constants::{EventLimits, VersionedConstants};
 use crate::execution::call_info::MessageToL1;
 use crate::execution::deprecated_syscalls::DeprecatedSyscallSelector;
 use crate::execution::entry_point::{CallEntryPoint, CallType};
@@ -31,7 +32,6 @@ use crate::execution::execution_utils::{
     ReadOnlySegment,
 };
 use crate::execution::syscalls::syscall_base::SyscallResult;
-use crate::versioned_constants::{EventLimits, VersionedConstants};
 
 pub mod hint_processor;
 mod secp;

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

@@ -8,6 +8,7 @@ use starknet_api::transaction::{EventContent, EventData, EventKey};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::ChainInfo;
 use crate::execution::call_info::{CallExecution, CallInfo, OrderedEvent};
 use crate::execution::entry_point::CallEntryPoint;
@@ -16,7 +17,6 @@ use crate::execution::syscalls::hint_processor::EmitEventError;
 use crate::test_utils::contracts::FeatureContract;
 use crate::test_utils::initial_test_state::test_state;
 use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE};
-use crate::versioned_constants::VersionedConstants;
 
 const KEYS: [Felt; 2] = [Felt::from_hex_unchecked("0x2019"), Felt::from_hex_unchecked("0x2020")];
 const DATA: [Felt; 3] = [

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

@@ -9,6 +9,7 @@ use starknet_types_core::felt::Felt;
 use test_case::test_case;
 
 use crate::abi::constants;
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::ChainInfo;
 use crate::execution::call_info::CallExecution;
 use crate::execution::entry_point::CallEntryPoint;
@@ -20,7 +21,6 @@ use crate::test_utils::contracts::FeatureContract;
 use crate::test_utils::dict_state_reader::DictStateReader;
 use crate::test_utils::initial_test_state::test_state;
 use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE};
-use crate::versioned_constants::VersionedConstants;
 
 pub fn initialize_state(
     test_contract: FeatureContract,

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

@@ -25,6 +25,7 @@ use starknet_api::{felt, nonce, tx_hash};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::ChainInfo;
 use crate::execution::common_hints::ExecutionMode;
 use crate::execution::entry_point::CallEntryPoint;
@@ -42,7 +43,6 @@ use crate::transaction::objects::{
     DeprecatedTransactionInfo,
     TransactionInfo,
 };
-use crate::versioned_constants::VersionedConstants;
 
 #[cfg_attr(
     feature = "cairo_native",

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

@@ -5,6 +5,7 @@ use starknet_api::abi::abi_utils::selector_from_name;
 use starknet_api::{calldata, felt, storage_key};
 use test_case::test_case;
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::ChainInfo;
 use crate::execution::call_info::{CallExecution, CallInfo, Retdata, StorageAccessTracker};
 use crate::execution::entry_point::{CallEntryPoint, CallType};
@@ -16,7 +17,6 @@ use crate::retdata;
 use crate::test_utils::contracts::FeatureContract;
 use crate::test_utils::initial_test_state::test_state;
 use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE};
-use crate::versioned_constants::VersionedConstants;
 
 #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))]
 #[test_case(RunnableCairo1::Casm; "VM")]

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

@@ -3,6 +3,7 @@ use starknet_api::{calldata, felt};
 use test_case::test_case;
 
 use crate::abi::constants::MAX_POSSIBLE_SIERRA_GAS;
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::execution::call_info::CallExecution;
 use crate::execution::entry_point::CallEntryPoint;
 use crate::execution::syscalls::syscall_tests::constants;
@@ -11,7 +12,6 @@ use crate::execution::syscalls::SyscallSelector;
 use crate::retdata;
 use crate::test_utils::contracts::FeatureContract;
 use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1};
-use crate::versioned_constants::VersionedConstants;
 
 #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))]
 #[test_case(RunnableCairo1::Casm; "VM")]

crates/blockifier/src/fee/fee_test.rs

@@ -22,6 +22,7 @@ use starknet_api::transaction::fields::{
 };
 
 use crate::blockifier::block::validated_gas_prices;
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::BlockContext;
 use crate::fee::fee_checks::{FeeCheckError, FeeCheckReportFields, PostExecutionReport};
 use crate::fee::fee_utils::{get_fee_by_gas_vector, get_vm_resources_cost};
@@ -36,7 +37,6 @@ use crate::transaction::test_utils::{
     l1_resource_bounds,
 };
 use crate::utils::u64_from_usize;
-use crate::versioned_constants::VersionedConstants;
 
 #[rstest]
 fn test_simple_get_vm_resource_usage(

crates/blockifier/src/fee/fee_utils.rs

@@ -12,13 +12,13 @@ use starknet_api::transaction::fields::ValidResourceBounds::{AllResources, L1Gas
 use starknet_api::transaction::fields::{Fee, GasVectorComputationMode, Resource};
 use starknet_types_core::felt::Felt;
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::{BlockContext, TransactionContext};
 use crate::fee::resources::TransactionFeeResult;
 use crate::state::state_api::StateReader;
 use crate::transaction::errors::TransactionFeeError;
 use crate::transaction::objects::{ExecutionResourcesTraits, TransactionInfo};
 use crate::utils::u64_from_usize;
-use crate::versioned_constants::VersionedConstants;
 
 #[cfg(test)]
 #[path = "fee_test.rs"]

crates/blockifier/src/fee/gas_usage_test.rs

@@ -12,6 +12,7 @@ use starknet_api::transaction::{EventContent, EventData, EventKey};
 use starknet_types_core::felt::Felt;
 
 use crate::abi::constants;
+use crate::blockifier_versioned_constants::{ResourceCost, VersionedConstants, VmResourceCosts};
 use crate::context::BlockContext;
 use crate::execution::call_info::{CallExecution, CallInfo, OrderedEvent};
 use crate::fee::eth_gas_constants;
@@ -27,7 +28,6 @@ use crate::state::cached_state::StateChangesCount;
 use crate::test_utils::get_vm_resource_usage;
 use crate::transaction::test_utils::invoke_tx_with_default_flags;
 use crate::utils::u64_from_usize;
-use crate::versioned_constants::{ResourceCost, VersionedConstants, VmResourceCosts};
 
 pub fn create_event_for_testing(keys_size: usize, data_size: usize) -> OrderedEvent {
     OrderedEvent {

crates/blockifier/src/fee/receipt_test.rs

@@ -5,6 +5,7 @@ use starknet_api::transaction::{constants, L2ToL1Payload};
 use starknet_api::{invoke_tx_args, nonce};
 use starknet_types_core::felt::Felt;
 
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::context::BlockContext;
 use crate::execution::call_info::{
     CallExecution,
@@ -38,7 +39,6 @@ use crate::transaction::test_utils::{
 };
 use crate::transaction::transactions::ExecutableTransaction;
 use crate::utils::{u64_from_usize, usize_from_u64};
-use crate::versioned_constants::VersionedConstants;
 
 #[fixture]
 fn versioned_constants() -> &'static VersionedConstants {

crates/blockifier/src/fee/resources.rs

@@ -3,6 +3,11 @@ use starknet_api::core::ContractAddress;
 use starknet_api::execution_resources::{GasAmount, GasVector};
 use starknet_api::transaction::fields::GasVectorComputationMode;
 
+use crate::blockifier_versioned_constants::{
+    AllocationCost,
+    ArchivalDataGasCosts,
+    VersionedConstants,
+};
 use crate::execution::call_info::{EventSummary, ExecutionSummary};
 #[cfg(test)]
 use crate::execution::contract_class::TrackedResource;
@@ -18,7 +23,6 @@ use crate::fee::gas_usage::{
 use crate::state::cached_state::{StateChanges, StateChangesCountForFee};
 use crate::transaction::errors::TransactionFeeError;
 use crate::utils::u64_from_usize;
-use crate::versioned_constants::{AllocationCost, ArchivalDataGasCosts, VersionedConstants};
 
 pub type TransactionFeeResult<T> = Result<T, TransactionFeeError>;
 

crates/blockifier/src/lib.rs

@@ -6,6 +6,7 @@
 
 pub mod abi;
 pub mod blockifier;
+pub mod blockifier_versioned_constants;
 pub mod bouncer;
 pub mod concurrency;
 pub mod context;
@@ -16,4 +17,3 @@ pub mod state;
 pub mod test_utils;
 pub mod transaction;
 pub mod utils;
-pub mod versioned_constants;

crates/blockifier/src/test_utils.rs

@@ -45,6 +45,7 @@ use strum::EnumCount;
 use strum_macros::EnumCount as EnumCountMacro;
 
 use crate::abi::constants;
+use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::execution::call_info::ExecutionSummary;
 use crate::execution::contract_class::TrackedResource;
 use crate::execution::deprecated_syscalls::hint_processor::SyscallCounter;
@@ -54,7 +55,6 @@ use crate::fee::resources::{StarknetResources, StateResources};
 use crate::test_utils::contracts::FeatureContract;
 use crate::transaction::transaction_types::TransactionType;
 use crate::utils::{const_max, u64_from_usize};
-use crate::versioned_constants::VersionedConstants;
 // Class hashes.
 // TODO(Adi, 15/01/2023): Remove and compute the class hash corresponding to the ERC20 contract in
 // starkgate once we use the real ERC20 contract.

crates/blockifier/src/test_utils/struct_impls.rs

@@ -20,6 +20,12 @@ use starknet_api::execution_resources::GasAmount;
 use starknet_api::test_utils::{TEST_ERC20_CONTRACT_ADDRESS, TEST_ERC20_CONTRACT_ADDRESS2};
 
 use crate::blockifier::config::{CairoNativeRunConfig, ContractClassManagerConfig};
+use crate::blockifier_versioned_constants::{
+    GasCosts,
+    OsConstants,
+    VersionedConstants,
+    VERSIONED_CONSTANTS_LATEST_JSON,
+};
 use crate::bouncer::{BouncerConfig, BouncerWeights, BuiltinCount};
 use crate::context::{BlockContext, ChainInfo, FeeTokenAddresses, TransactionContext};
 use crate::execution::call_info::{CallExecution, CallInfo, Retdata};
@@ -42,12 +48,6 @@ use crate::transaction::objects::{
     DeprecatedTransactionInfo,
     TransactionInfo,
 };
-use crate::versioned_constants::{
-    GasCosts,
-    OsConstants,
-    VersionedConstants,
-    VERSIONED_CONSTANTS_LATEST_JSON,
-};
 
 impl CallEntryPoint {
     /// Executes the call directly, without account context. Limits the number of steps by resource