Move ClassHash into transaction module (#1232)

* Move ClassHash into transaction module

* fmt

Author: fmoletta

bench/internals.rs

@@ -18,8 +18,8 @@ use starknet_in_rust::{
         cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
         in_memory_state_reader::InMemoryStateReader, state_api::State,
     },
+    transaction::ClassHash,
     transaction::{declare::Declare, Address, Deploy, DeployAccount, InvokeFunction},
-    utils::ClassHash,
 };
 use std::{hint::black_box, sync::Arc};
 

bench/yas.rs

@@ -33,7 +33,8 @@ use tracing_subscriber::{EnvFilter, FmtSubscriber};
 #[cfg(feature = "cairo-native")]
 use {
     cairo_native::cache::{AotProgramCache, JitProgramCache, ProgramCache},
-    starknet_in_rust::utils::{get_native_context, ClassHash},
+    starknet_in_rust::transaction::ClassHash,
+    starknet_in_rust::utils::get_native_context,
     std::{cell::RefCell, rc::Rc},
 };
 
@@ -989,7 +990,7 @@ mod utils {
             in_memory_state_reader::InMemoryStateReader, state_api::State,
         },
         transaction::Address,
-        utils::ClassHash,
+        transaction::ClassHash,
         CasmContractClass, ContractClass as SierraContractClass,
     };
     use std::{fs, path::Path, sync::Arc};

examples/lru_cache/main.rs

@@ -12,8 +12,8 @@ use starknet_in_rust::{
         contract_class_cache::{ContractClassCache, PermanentContractClassCache},
         in_memory_state_reader::InMemoryStateReader,
     },
-    transaction::{Address, Declare, Deploy, InvokeFunction},
-    utils::{calculate_sn_keccak, ClassHash},
+    transaction::{Address, ClassHash, Declare, Deploy, InvokeFunction},
+    utils::calculate_sn_keccak,
 };
 use std::{
     num::NonZeroUsize,

fuzzer/src/main.rs

@@ -5,7 +5,7 @@ extern crate honggfuzz;
 
 use cairo_vm::{vm::runners::cairo_runner::ExecutionResources, Felt252};
 use starknet_in_rust::execution::execution_entry_point::ExecutionResult;
-use starknet_in_rust::utils::ClassHash;
+use starknet_in_rust::transaction::ClassHash;
 use starknet_in_rust::EntryPointType;
 use starknet_in_rust::{
     definitions::{block_context::BlockContext, constants::TRANSACTION_VERSION},

rpc_state_reader/src/sir_state_reader.rs

@@ -28,10 +28,9 @@ use starknet_in_rust::{
         BlockInfo,
     },
     transaction::{
-        declare_tx_from_sn_api_transaction, error::TransactionError, Address, DeployAccount,
-        InvokeFunction, L1Handler,
+        declare_tx_from_sn_api_transaction, error::TransactionError, Address, ClassHash,
+        DeployAccount, InvokeFunction, L1Handler,
     },
-    utils::ClassHash,
 };
 
 use crate::{

src/bin/fibonacci.rs

@@ -1,7 +1,7 @@
 use cairo_vm::Felt252;
 use lazy_static::lazy_static;
 
-use starknet_in_rust::utils::ClassHash;
+use starknet_in_rust::transaction::ClassHash;
 use starknet_in_rust::{
     definitions::{block_context::BlockContext, constants::TRANSACTION_VERSION},
     execution::{

src/bin/invoke.rs

@@ -10,8 +10,7 @@ use starknet_in_rust::{
         cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
         in_memory_state_reader::InMemoryStateReader,
     },
-    transaction::{Address, InvokeFunction, Transaction},
-    utils::ClassHash,
+    transaction::{Address, ClassHash, InvokeFunction, Transaction},
 };
 use std::{path::PathBuf, sync::Arc};
 

src/bin/invoke_with_cachedstate.rs

@@ -9,13 +9,11 @@ use starknet_in_rust::{
     services::api::contract_classes::{
         compiled_class::CompiledClass, deprecated_contract_class::ContractClass,
     },
-    state::in_memory_state_reader::InMemoryStateReader,
     state::{
-        cached_state::CachedState, contract_class_cache::PermanentContractClassCache, BlockInfo,
+        cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
+        in_memory_state_reader::InMemoryStateReader, BlockInfo,
     },
-    transaction::Address,
-    transaction::{InvokeFunction, VersionSpecificAccountTxFields},
-    utils::ClassHash,
+    transaction::{Address, ClassHash, InvokeFunction, VersionSpecificAccountTxFields},
 };
 use std::{collections::HashMap, path::PathBuf, sync::Arc};
 

src/bin/native_bench.rs

@@ -32,8 +32,7 @@ use starknet_in_rust::{
     },
     state::cached_state::CachedState,
     state::{in_memory_state_reader::InMemoryStateReader, ExecutionResourcesManager},
-    transaction::Address,
-    utils::ClassHash,
+    transaction::{Address, ClassHash},
 };
 use std::cell::RefCell;
 use std::rc::Rc;

src/core/errors/state_errors.rs

@@ -1,6 +1,7 @@
 use crate::{
-    services::api::contract_class_errors::ContractClassError, state::state_cache::StorageEntry,
-    transaction::Address, utils::ClassHash,
+    services::api::contract_class_errors::ContractClassError,
+    state::state_cache::StorageEntry,
+    transaction::{Address, ClassHash},
 };
 use starknet::core::types::FromByteArrayError;
 use thiserror::Error;

src/execution/execution_entry_point.rs

@@ -21,10 +21,9 @@ use crate::{
         deprecated_syscall_handler::DeprecatedSyscallHintProcessor,
         syscall_handler::SyscallHintProcessor,
     },
-    transaction::{error::TransactionError, Address},
+    transaction::{error::TransactionError, Address, ClassHash},
     utils::{
-        get_deployed_address_class_hash_at_address, parse_builtin_names,
-        validate_contract_deployed, ClassHash,
+        get_deployed_address_class_hash_at_address, parse_builtin_names, validate_contract_deployed,
     },
 };
 use cairo_lang_sierra::program::Program as SierraProgram;

src/execution/mod.rs

@@ -8,8 +8,8 @@ use crate::{
     definitions::{constants::CONSTRUCTOR_ENTRY_POINT_SELECTOR, transaction_type::TransactionType},
     state::state_cache::StorageEntry,
     syscalls::syscall_handler_errors::SyscallHandlerError,
-    transaction::{error::TransactionError, Address},
-    utils::{get_big_int, get_integer, get_relocatable, ClassHash},
+    transaction::{error::TransactionError, Address, ClassHash},
+    utils::{get_big_int, get_integer, get_relocatable},
 };
 use cairo_vm::Felt252;
 use cairo_vm::{

src/lib.rs

@@ -37,7 +37,7 @@ pub use cairo_lang_starknet::{
 
 #[cfg(feature = "cairo-native")]
 use {
-    crate::utils::ClassHash,
+    crate::transaction::ClassHash,
     cairo_native::cache::ProgramCache,
     std::{cell::RefCell, rc::Rc},
 };
@@ -273,16 +273,15 @@ mod test {
             ExecutionResourcesManager,
         },
         transaction::{
-            Address, Declare, DeclareV2, Deploy, DeployAccount, InvokeFunction, L1Handler,
-            Transaction, VersionSpecificAccountTxFields,
+            Address, ClassHash, Declare, DeclareV2, Deploy, DeployAccount, InvokeFunction,
+            L1Handler, Transaction, VersionSpecificAccountTxFields,
         },
         utils::{
             felt_to_hash,
             test_utils::{
                 create_account_tx_test_state, TEST_ACCOUNT_CONTRACT_ADDRESS,
                 TEST_FIB_COMPILED_CONTRACT_CLASS_HASH,
             },
-            ClassHash,
         },
     };
     use cairo_lang_starknet::{

src/state/cached_state.rs

@@ -7,10 +7,10 @@ use crate::{
     core::errors::state_errors::StateError,
     services::api::contract_classes::compiled_class::CompiledClass,
     state::StateDiff,
-    transaction::Address,
+    transaction::{Address, ClassHash},
     utils::{
         get_erc20_balance_var_addresses, subtract_mappings, subtract_mappings_keys,
-        to_cache_state_storage_mapping, ClassHash,
+        to_cache_state_storage_mapping,
     },
 };
 use cairo_vm::Felt252;

src/state/contract_class_cache.rs

@@ -7,7 +7,9 @@
 //! cache. It also contains a method to extend the shared cache from an iterator so that it can be
 //! used with the private caches.
 
-use crate::{services::api::contract_classes::compiled_class::CompiledClass, utils::ClassHash};
+use crate::{
+    services::api::contract_classes::compiled_class::CompiledClass, transaction::ClassHash,
+};
 use std::{collections::HashMap, sync::RwLock};
 
 /// The contract class cache trait, which must be implemented by all caches.

src/state/contract_storage_state.rs

@@ -3,7 +3,10 @@ use super::{
     contract_class_cache::ContractClassCache,
     state_api::{State, StateReader},
 };
-use crate::{core::errors::state_errors::StateError, transaction::Address, utils::ClassHash};
+use crate::{
+    core::errors::state_errors::StateError,
+    transaction::{Address, ClassHash},
+};
 use cairo_vm::Felt252;
 use std::collections::HashSet;
 

src/state/in_memory_state_reader.rs

@@ -4,8 +4,7 @@ use crate::{
     state::{
         cached_state::UNINITIALIZED_CLASS_HASH, state_api::StateReader, state_cache::StorageEntry,
     },
-    transaction::Address,
-    utils::{ClassHash, CompiledClassHash},
+    transaction::{Address, ClassHash, CompiledClassHash},
 };
 use cairo_vm::Felt252;
 use getset::{Getters, MutGetters};

src/state/mod.rs

@@ -5,11 +5,8 @@ use self::{
 use crate::{
     core::errors::state_errors::StateError,
     definitions::block_context::GasPrices,
-    transaction::{error::TransactionError, Address},
-    utils::{
-        get_keys, to_cache_state_storage_mapping, to_state_diff_storage_mapping, ClassHash,
-        CompiledClassHash,
-    },
+    transaction::{error::TransactionError, Address, ClassHash, CompiledClassHash},
+    utils::{get_keys, to_cache_state_storage_mapping, to_state_diff_storage_mapping},
 };
 use cairo_vm::{vm::runners::cairo_runner::ExecutionResources, Felt252};
 use getset::Getters;
@@ -250,8 +247,7 @@ mod test {
             state_api::StateReader,
             state_cache::{StateCache, StorageEntry},
         },
-        transaction::Address,
-        utils::ClassHash,
+        transaction::{Address, ClassHash},
     };
     use cairo_vm::Felt252;
     use std::{collections::HashMap, sync::Arc};

src/state/state_api.rs

@@ -4,8 +4,8 @@ use crate::{
     definitions::block_context::{BlockContext, FeeType},
     services::api::contract_classes::compiled_class::CompiledClass,
     state::StateDiff,
-    transaction::Address,
-    utils::{get_erc20_balance_var_addresses, ClassHash, CompiledClassHash},
+    transaction::{Address, ClassHash, CompiledClassHash},
+    utils::get_erc20_balance_var_addresses,
 };
 use cairo_lang_utils::bigint::BigUintAsHex;
 use cairo_vm::Felt252;

src/state/state_cache.rs

@@ -1,7 +1,6 @@
 use crate::{
     core::errors::state_errors::StateError,
-    transaction::Address,
-    utils::{ClassHash, CompiledClassHash},
+    transaction::{Address, ClassHash, CompiledClassHash},
 };
 use cairo_vm::Felt252;
 use getset::{Getters, MutGetters};

src/syscalls/business_logic_syscall_handler.rs

@@ -36,8 +36,8 @@ use crate::{
         state_api::{State, StateReader},
         BlockInfo, ExecutionResourcesManager,
     },
-    transaction::{error::TransactionError, Address},
-    utils::{calculate_sn_keccak, felt_to_hash, get_big_int, get_felt_range, ClassHash},
+    transaction::{error::TransactionError, Address, ClassHash},
+    utils::{calculate_sn_keccak, felt_to_hash, get_big_int, get_felt_range},
 };
 use cairo_vm::Felt252;
 use cairo_vm::{

src/syscalls/deprecated_business_logic_syscall_handler.rs

@@ -30,7 +30,7 @@ use crate::{
         state_api::{State, StateReader},
         BlockInfo, ExecutionResourcesManager,
     },
-    transaction::{error::TransactionError, Address},
+    transaction::{error::TransactionError, Address, ClassHash},
     utils::*,
 };
 use crate::{

src/syscalls/deprecated_syscall_handler.rs

@@ -269,26 +269,24 @@ fn get_syscall_ptr(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::services::api::contract_classes::compiled_class::CompiledClass;
-    use crate::services::api::contract_classes::deprecated_contract_class::EntryPointType;
-    use crate::state::StateDiff;
-    use crate::transaction::VersionSpecificAccountTxFields;
-    use crate::utils::ClassHash;
     use crate::{
         add_segments, allocate_selector, any_box,
         definitions::{block_context::BlockContext, transaction_type::TransactionType},
         execution::{OrderedEvent, OrderedL2ToL1Message, TransactionExecutionContext},
         memory_insert,
-        services::api::contract_classes::deprecated_contract_class::ContractClass,
+        services::api::contract_classes::{
+            compiled_class::CompiledClass,
+            deprecated_contract_class::{ContractClass, EntryPointType},
+        },
         state::{
             cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
-            in_memory_state_reader::InMemoryStateReader, state_api::State,
+            in_memory_state_reader::InMemoryStateReader, state_api::State, StateDiff,
         },
         syscalls::deprecated_syscall_request::{
             DeprecatedDeployRequest, DeprecatedSendMessageToL1SysCallRequest,
             DeprecatedSyscallRequest,
         },
-        transaction::{Address, InvokeFunction},
+        transaction::{Address, ClassHash, InvokeFunction, VersionSpecificAccountTxFields},
         utils::{
             get_big_int, get_integer, get_relocatable,
             test_utils::{ids_data, vm},

src/syscalls/native_syscall_handler.rs

@@ -20,8 +20,8 @@ use crate::{
         business_logic_syscall_handler::{KECCAK_ROUND_COST, SYSCALL_BASE, SYSCALL_GAS_COST},
         syscall_handler_errors::SyscallHandlerError,
     },
-    transaction::{error::TransactionError, Address},
-    utils::{felt_to_hash, ClassHash},
+    transaction::{error::TransactionError, Address, ClassHash},
+    utils::felt_to_hash,
     ContractClassCache, EntryPointType,
 };
 use cairo_native::starknet::{ResourceBounds, TxV2Info};

src/transaction/declare.rs

@@ -17,15 +17,15 @@ use crate::{
     },
     state::ExecutionResourcesManager,
     transaction::error::TransactionError,
-    utils::{calculate_tx_resources, felt_to_hash, verify_no_calls_to_other_contracts, ClassHash},
+    utils::{calculate_tx_resources, felt_to_hash, verify_no_calls_to_other_contracts},
 };
 use cairo_vm::Felt252;
 use num_traits::Zero;
 
 use super::fee::{
     calculate_tx_fee, charge_fee, estimate_minimal_l1_gas, run_post_execution_fee_checks,
 };
-use super::{get_tx_version, Address, Transaction};
+use super::{get_tx_version, Address, ClassHash, Transaction};
 use std::fmt::Debug;
 use std::sync::Arc;
 

src/transaction/declare_v2.rs

@@ -11,7 +11,6 @@ use crate::services::api::contract_classes::deprecated_contract_class::EntryPoin
 use crate::services::api::contract_classes::compiled_class::CompiledClass;
 use crate::state::cached_state::CachedState;
 use crate::state::contract_class_cache::ContractClassCache;
-use crate::utils::ClassHash;
 use crate::{
     core::transaction_hash::calculate_declare_v2_transaction_hash,
     definitions::{
@@ -23,9 +22,13 @@ use crate::{
         execution_entry_point::ExecutionEntryPoint, CallType, TransactionExecutionContext,
         TransactionExecutionInfo,
     },
-    state::state_api::{State, StateReader},
-    state::ExecutionResourcesManager,
-    transaction::{error::TransactionError, invoke_function::verify_no_calls_to_other_contracts},
+    state::{
+        state_api::{State, StateReader},
+        ExecutionResourcesManager,
+    },
+    transaction::{
+        error::TransactionError, invoke_function::verify_no_calls_to_other_contracts, ClassHash,
+    },
     utils::calculate_tx_resources,
 };
 use cairo_lang_starknet::casm_contract_class::CasmContractClass;
@@ -601,13 +604,12 @@ mod tests {
     use crate::services::api::contract_classes::compiled_class::CompiledClass;
     use crate::state::state_api::StateReader;
     use crate::transaction::error::TransactionError;
-    use crate::utils::ClassHash;
     use crate::{
         state::{
             cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
             in_memory_state_reader::InMemoryStateReader,
         },
-        transaction::Address,
+        transaction::{Address, ClassHash},
     };
     use cairo_lang_starknet::casm_contract_class::CasmContractClass;
     use cairo_vm::Felt252;

src/transaction/deploy.rs

@@ -1,4 +1,4 @@
-use super::{Address, Transaction, VersionSpecificAccountTxFields};
+use super::{Address, ClassHash, Transaction, VersionSpecificAccountTxFields};
 use crate::{
     core::{
         contract_address::compute_deprecated_class_hash, errors::hash_errors::HashError,
@@ -29,7 +29,7 @@ use crate::{
     },
     syscalls::syscall_handler_errors::SyscallHandlerError,
     transaction::error::TransactionError,
-    utils::{calculate_tx_resources, felt_to_hash, ClassHash},
+    utils::{calculate_tx_resources, felt_to_hash},
 };
 use cairo_vm::Felt252;