Move Address to transaction module + add utility impls (#1227)

* Move Address to transaction module

* Fix imports + Implement conversions to and from Felt

* Impl from_hex_string

* Fix

* Fix

Author: fmoletta

bench/internals.rs

@@ -14,13 +14,12 @@ use starknet_in_rust::{
     services::api::contract_classes::{
         compiled_class::CompiledClass, deprecated_contract_class::ContractClass,
     },
-    state::{cached_state::CachedState, state_api::State},
     state::{
-        contract_class_cache::PermanentContractClassCache,
-        in_memory_state_reader::InMemoryStateReader,
+        cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
+        in_memory_state_reader::InMemoryStateReader, state_api::State,
     },
-    transaction::{declare::Declare, Deploy, DeployAccount, InvokeFunction},
-    utils::{Address, ClassHash},
+    transaction::{declare::Declare, Address, Deploy, DeployAccount, InvokeFunction},
+    utils::ClassHash,
 };
 use std::{hint::black_box, sync::Arc};
 

bench/yas.rs

@@ -23,8 +23,8 @@ use starknet_in_rust::{
     state::{
         cached_state::CachedState, contract_class_cache::ContractClassCache, state_api::StateReader,
     },
+    transaction::Address,
     transaction::{DeclareV2, InvokeFunction},
-    utils::Address,
 };
 use std::time::{Duration, Instant};
 use tracing::{debug, info};
@@ -988,7 +988,8 @@ mod utils {
             cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
             in_memory_state_reader::InMemoryStateReader, state_api::State,
         },
-        utils::{Address, ClassHash},
+        transaction::Address,
+        utils::ClassHash,
         CasmContractClass, ContractClass as SierraContractClass,
     };
     use std::{fs, path::Path, sync::Arc};

examples/contract_execution/src/main.rs

@@ -20,8 +20,8 @@ use starknet_in_rust::{
         cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
         in_memory_state_reader::InMemoryStateReader, state_api::State,
     },
-    transaction::{DeclareV2, DeployAccount, InvokeFunction},
-    utils::{calculate_sn_keccak, felt_to_hash, Address},
+    transaction::{Address, DeclareV2, DeployAccount, InvokeFunction},
+    utils::{calculate_sn_keccak, felt_to_hash},
     CasmContractClass, SierraContractClass,
 };
 use std::{fs::File, io::BufReader, path::Path, str::FromStr, 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::{Declare, Deploy, InvokeFunction},
-    utils::{calculate_sn_keccak, Address, ClassHash},
+    transaction::{Address, Declare, Deploy, InvokeFunction},
+    utils::{calculate_sn_keccak, ClassHash},
 };
 use std::{
     num::NonZeroUsize,

fuzzer/src/main.rs

@@ -21,7 +21,8 @@ use starknet_in_rust::{
         in_memory_state_reader::InMemoryStateReader,
         ExecutionResourcesManager,
     },
-    utils::{calculate_sn_keccak, Address},
+    transaction::Address,
+    utils::calculate_sn_keccak,
 };
 use std::{
     collections::HashSet, fs, path::PathBuf, process::Command, sync::Arc, thread, time::Duration,

replay/src/main.rs

@@ -23,7 +23,7 @@ use starknet_in_rust::{
     state::{
         cached_state::CachedState, contract_class_cache::PermanentContractClassCache, BlockInfo,
     },
-    utils::Address,
+    transaction::Address,
     Felt252,
 };
 #[cfg(feature = "benchmark")]

rpc_state_reader/src/sir_state_reader.rs

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

src/bin/deploy_invoke.rs

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

src/bin/fibonacci.rs

@@ -15,7 +15,7 @@ use starknet_in_rust::{
         contract_class_cache::PermanentContractClassCache,
         in_memory_state_reader::InMemoryStateReader, ExecutionResourcesManager,
     },
-    utils::Address,
+    transaction::Address,
     EntryPointType,
 };
 use std::{path::PathBuf, sync::Arc};

src/bin/invoke.rs

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

src/bin/invoke_with_cachedstate.rs

@@ -13,8 +13,9 @@ use starknet_in_rust::{
     state::{
         cached_state::CachedState, contract_class_cache::PermanentContractClassCache, BlockInfo,
     },
+    transaction::Address,
     transaction::{InvokeFunction, VersionSpecificAccountTxFields},
-    utils::{Address, ClassHash},
+    utils::ClassHash,
 };
 use std::{collections::HashMap, path::PathBuf, sync::Arc};
 

src/bin/native_bench.rs

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

src/core/errors/state_errors.rs

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

src/core/transaction_hash/current.rs

@@ -1,9 +1,6 @@
 use std::str::FromStr;
 
-use crate::{
-    transaction::{DataAvailabilityMode, ResourceBounds},
-    utils::Address,
-};
+use crate::transaction::{Address, DataAvailabilityMode, ResourceBounds};
 use cairo_vm::Felt252;
 use lazy_static::lazy_static;
 use num_bigint::BigUint;

src/core/transaction_hash/deprecated.rs

@@ -3,7 +3,8 @@ use crate::transaction::error::TransactionError;
 use crate::{
     core::contract_address::compute_deprecated_class_hash,
     definitions::constants::CONSTRUCTOR_ENTRY_POINT_SELECTOR, hash_utils::compute_hash_on_elements,
-    services::api::contract_classes::deprecated_contract_class::ContractClass, utils::Address,
+    services::api::contract_classes::deprecated_contract_class::ContractClass,
+    transaction::Address,
 };
 use cairo_vm::Felt252;
 use num_traits::Zero;

src/core/transaction_hash/mod.rs

@@ -4,8 +4,8 @@ use cairo_vm::Felt252;
 use lazy_static::lazy_static;
 
 use crate::{
+    transaction::Address,
     transaction::{error::TransactionError, VersionSpecificAccountTxFields},
-    utils::Address,
 };
 
 use super::errors::hash_errors::HashError;

src/definitions/block_context.rs

@@ -2,7 +2,7 @@
 //!
 //! This module contains structs representing the context of a specific Starknet block.
 
-use crate::{state::BlockInfo, utils::Address};
+use crate::{state::BlockInfo, transaction::Address};
 use cairo_vm::Felt252;
 use core::fmt;
 use getset::{CopyGetters, Getters, MutGetters};

src/definitions/constants.rs

@@ -1,5 +1,5 @@
 use super::block_context::{StarknetChainId, StarknetOsConfig};
-use crate::utils::Address;
+use crate::transaction::Address;
 use cairo_vm::Felt252;
 use lazy_static::lazy_static;
 

src/execution/execution_entry_point.rs

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

src/execution/gas_usage.rs

@@ -172,7 +172,7 @@ pub const fn get_event_emission_cost(topics: usize, l1_handler_payload_size: usi
 mod test {
     use super::get_event_emission_cost;
     use super::*;
-    use crate::{execution::OrderedL2ToL1Message, utils::Address};
+    use crate::{execution::OrderedL2ToL1Message, transaction::Address};
     use coverage_helper::test;
 
     #[test]

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,
-    utils::{get_big_int, get_integer, get_relocatable, Address, ClassHash},
+    transaction::{error::TransactionError, Address},
+    utils::{get_big_int, get_integer, get_relocatable, ClassHash},
 };
 use cairo_vm::Felt252;
 use cairo_vm::{
@@ -689,7 +689,7 @@ impl L2toL1MessageInfo {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::utils::{string_to_hash, Address};
+    use crate::utils::string_to_hash;
 
     #[test]
     fn test_get_sorted_single_event() {

src/hash_utils.rs

@@ -1,5 +1,5 @@
 use crate::core::errors::hash_errors::HashError;
-use crate::{syscalls::syscall_handler_errors::SyscallHandlerError, utils::Address};
+use crate::{syscalls::syscall_handler_errors::SyscallHandlerError, transaction::Address};
 use cairo_vm::Felt252;
 use starknet_crypto::{pedersen_hash, FieldElement};
 use std::vec;
@@ -32,7 +32,7 @@ use std::vec;
 /// # Examples
 ///
 /// ```
-/// use starknet_in_rust::{hash_utils::calculate_contract_address, utils::Address, Felt252};
+/// use starknet_in_rust::{hash_utils::calculate_contract_address, transaction::Address, Felt252};
 ///
 /// let salt = Felt252::from(123_u16);
 /// let class_hash = Felt252::from(456_u16);

src/lib.rs

@@ -14,8 +14,8 @@ use crate::{
         state_api::{State, StateReader},
         ExecutionResourcesManager,
     },
+    transaction::Address,
     transaction::{error::TransactionError, fee::calculate_tx_fee, L1Handler, Transaction},
-    utils::Address,
 };
 pub use cairo_vm::Felt252;
 use definitions::block_context::FeeType;
@@ -273,16 +273,16 @@ mod test {
             ExecutionResourcesManager,
         },
         transaction::{
-            Declare, DeclareV2, Deploy, DeployAccount, InvokeFunction, L1Handler, Transaction,
-            VersionSpecificAccountTxFields,
+            Address, 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,
             },
-            Address, ClassHash,
+            ClassHash,
         },
     };
     use cairo_lang_starknet::{

src/services/api/messages.rs

@@ -2,7 +2,7 @@ use cairo_vm::Felt252;
 use num_traits::ToPrimitive;
 use sha3::{Digest, Keccak256};
 
-use crate::utils::Address;
+use crate::transaction::Address;
 
 /// A StarkNet Message from L2 to L1.
 #[derive(Debug, Clone)]

src/state/cached_state.rs

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

src/state/contract_storage_state.rs

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

src/state/in_memory_state_reader.rs

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

src/state/mod.rs

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

src/state/state_api.rs

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

src/state/state_cache.rs

@@ -1,6 +1,7 @@
 use crate::{
     core::errors::state_errors::StateError,
-    utils::{Address, ClassHash, CompiledClassHash},
+    transaction::Address,
+    utils::{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,
-    utils::{calculate_sn_keccak, felt_to_hash, get_big_int, get_felt_range, Address, ClassHash},
+    transaction::{error::TransactionError, Address},
+    utils::{calculate_sn_keccak, felt_to_hash, get_big_int, get_felt_range, ClassHash},
 };
 use cairo_vm::Felt252;
 use cairo_vm::{