chore: felt! macro cleanup (#396)

kariy · web-flow · commit c6ddca2ca024 · 2026-01-02T11:30:26.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -24,7 +24,6 @@ lazy_static.workspace = true
 metrics.workspace = true
 parking_lot.workspace = true
 rayon.workspace = true
-starknet.workspace = true
 starknet-types-core.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
diff --git a/crates/core/src/constants.rs b/crates/core/src/constants.rs
@@ -1,6 +1,6 @@
 use katana_primitives::contract::ContractAddress;
+use katana_primitives::felt;
 use lazy_static::lazy_static;
-use starknet::macros::felt;
 
 lazy_static! {
 
diff --git a/crates/executor/benches/utils.rs b/crates/executor/benches/utils.rs
@@ -2,8 +2,8 @@ use katana_genesis::constant::DEFAULT_ETH_FEE_TOKEN_ADDRESS;
 use katana_primitives::block::GasPrices;
 use katana_primitives::env::BlockEnv;
 use katana_primitives::transaction::{ExecutableTxWithHash, InvokeTx, InvokeTxV1};
-use katana_primitives::Felt;
-use starknet::macros::{felt, selector};
+use katana_primitives::{felt, Felt};
+use starknet::macros::selector;
 
 pub fn tx() -> ExecutableTxWithHash {
     let invoke = InvokeTx::V1(InvokeTxV1 {
diff --git a/crates/executor/tests/fixtures/mod.rs b/crates/executor/tests/fixtures/mod.rs
@@ -21,11 +21,10 @@ use katana_primitives::transaction::{
 };
 use katana_primitives::utils::class::{parse_compiled_class, parse_sierra_class};
 use katana_primitives::version::CURRENT_STARKNET_VERSION;
-use katana_primitives::{address, Felt};
+use katana_primitives::{address, felt, Felt};
 use katana_provider::api::block::BlockWriter;
 use katana_provider::api::state::{StateFactoryProvider, StateProvider};
 use katana_provider::{DbProviderFactory, MutableProvider, ProviderFactory};
-use starknet::macros::felt;
 
 // TODO: remove support for legacy contract declaration
 #[allow(unused)]
diff --git a/crates/executor/tests/fixtures/transaction.rs b/crates/executor/tests/fixtures/transaction.rs
@@ -7,12 +7,12 @@ use katana_primitives::da::DataAvailabilityMode;
 use katana_primitives::fee::{AllResourceBoundsMapping, ResourceBounds, ResourceBoundsMapping};
 use katana_primitives::transaction::ExecutableTxWithHash;
 use katana_primitives::utils::transaction::compute_invoke_v3_tx_hash;
-use katana_primitives::Felt;
+use katana_primitives::{felt, Felt};
 use katana_rpc_types::broadcasted::BroadcastedInvokeTx;
 use katana_rpc_types::{BroadcastedTx, BroadcastedTxWithChainId};
 use starknet::accounts::{Account, ExecutionEncoder, ExecutionEncoding, SingleOwnerAccount};
 use starknet::core::types::{BlockId, BlockTag, Call};
-use starknet::macros::{felt, selector};
+use starknet::macros::selector;
 use starknet::providers::jsonrpc::HttpTransport;
 use starknet::providers::{JsonRpcClient, Url};
 use starknet::signers::{LocalWallet, Signer, SigningKey};
diff --git a/crates/genesis/src/constant.rs b/crates/genesis/src/constant.rs
@@ -2,8 +2,7 @@ use katana_contracts::contracts::{Account, LegacyERC20, UniversalDeployer};
 use katana_primitives::class::ClassHash;
 use katana_primitives::contract::{ContractAddress, StorageKey};
 use katana_primitives::utils::get_storage_var_address;
-use katana_primitives::Felt;
-use starknet::macros::felt;
+use katana_primitives::{felt, Felt};
 
 /// The default universal deployer contract address.
 pub const DEFAULT_UDC_ADDRESS: ContractAddress =
diff --git a/crates/genesis/src/json.rs b/crates/genesis/src/json.rs
@@ -589,8 +589,7 @@ fn class_artifact_at_path(
 #[cfg(test)]
 mod tests {
     use katana_contracts::contracts::{Account, LegacyERC20, UniversalDeployer};
-    use katana_primitives::address;
-    use starknet::macros::felt;
+    use katana_primitives::{address, felt};
 
     use super::*;
     use crate::constant::{DEFAULT_LEGACY_ERC20_CLASS_HASH, DEFAULT_LEGACY_UDC_CLASS_HASH};
diff --git a/crates/messaging/src/ethereum.rs b/crates/messaging/src/ethereum.rs
@@ -215,8 +215,9 @@ mod tests {
 
     use alloy_primitives::{address, b256, LogData, U256};
     use katana_primitives::chain::{ChainId, NamedChainId};
+    use katana_primitives::felt;
     use katana_primitives::utils::transaction::compute_l1_to_l2_message_hash;
-    use starknet::macros::{felt, selector};
+    use starknet::macros::selector;
 
     use super::*;
 
diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -14,7 +14,6 @@ cairo-lang-sierra.workspace = true
 cairo-lang-utils.workspace = true
 cairo-lang-starknet-classes.workspace = true
 
-
 anyhow.workspace = true
 arbitrary = { workspace = true, optional = true }
 blockifier = { workspace = true, features = [ "testing" ] } # some Clone derives are gated behind 'testing' feature
diff --git a/crates/primitives/src/utils/transaction.rs b/crates/primitives/src/utils/transaction.rs
@@ -1,7 +1,6 @@
 use alloy_primitives::{Keccak256, B256};
-use starknet::core::crypto::compute_hash_on_elements;
 use starknet::core::types::MsgToL1;
-use starknet_types_core::hash::{Poseidon, StarkHash};
+use starknet_types_core::hash::{Pedersen, Poseidon, StarkHash};
 
 use crate::da::DataAvailabilityMode;
 use crate::eth::Address as EthAddress;
@@ -58,12 +57,12 @@ pub fn compute_deploy_account_v1_tx_hash(
 ) -> Felt {
     let calldata_to_hash = [&[class_hash, contract_address_salt], constructor_calldata].concat();
 
-    compute_hash_on_elements(&[
+    Pedersen::hash_array(&[
         PREFIX_DEPLOY_ACCOUNT,
         if is_query { QUERY_VERSION_OFFSET + Felt::ONE } else { Felt::ONE }, // version
         sender_address,
         Felt::ZERO, // entry_point_selector
-        compute_hash_on_elements(&calldata_to_hash),
+        Pedersen::hash_array(&calldata_to_hash),
         max_fee.into(),
         chain_id,
         nonce,
@@ -113,12 +112,12 @@ pub fn compute_declare_v0_tx_hash(
     chain_id: Felt,
     is_query: bool,
 ) -> Felt {
-    compute_hash_on_elements(&[
+    Pedersen::hash_array(&[
         PREFIX_DECLARE,
         if is_query { QUERY_VERSION_OFFSET + Felt::ZERO } else { Felt::ZERO }, // version
         sender_address,
         Felt::ZERO, // entry_point_selector
-        compute_hash_on_elements(&[]),
+        Pedersen::hash_array(&[]),
         max_fee.into(),
         chain_id,
         class_hash,
@@ -134,12 +133,12 @@ pub fn compute_declare_v1_tx_hash(
     nonce: Felt,
     is_query: bool,
 ) -> Felt {
-    compute_hash_on_elements(&[
+    Pedersen::hash_array(&[
         PREFIX_DECLARE,
         if is_query { QUERY_VERSION_OFFSET + Felt::ONE } else { Felt::ONE }, // version
         sender_address,
         Felt::ZERO, // entry_point_selector
-        compute_hash_on_elements(&[class_hash]),
+        Pedersen::hash_array(&[class_hash]),
         max_fee.into(),
         chain_id,
         nonce,
@@ -156,12 +155,12 @@ pub fn compute_declare_v2_tx_hash(
     compiled_class_hash: Felt,
     is_query: bool,
 ) -> Felt {
-    compute_hash_on_elements(&[
+    Pedersen::hash_array(&[
         PREFIX_DECLARE,
         if is_query { QUERY_VERSION_OFFSET + Felt::TWO } else { Felt::TWO }, // version
         sender_address,
         Felt::ZERO, // entry_point_selector
-        compute_hash_on_elements(&[class_hash]),
+        Pedersen::hash_array(&[class_hash]),
         max_fee.into(),
         chain_id,
         nonce,
@@ -211,12 +210,12 @@ pub fn compute_invoke_v1_tx_hash(
     nonce: Felt,
     is_query: bool,
 ) -> Felt {
-    compute_hash_on_elements(&[
+    Pedersen::hash_array(&[
         PREFIX_INVOKE,
         if is_query { QUERY_VERSION_OFFSET + Felt::ONE } else { Felt::ONE }, // version
         sender_address,
         Felt::ZERO, // entry_point_selector
-        compute_hash_on_elements(calldata),
+        Pedersen::hash_array(calldata),
         max_fee.into(),
         chain_id,
         nonce,
@@ -274,12 +273,12 @@ pub fn compute_l1_handler_tx_hash(
     chain_id: Felt,
     nonce: Felt,
 ) -> Felt {
-    compute_hash_on_elements(&[
+    Pedersen::hash_array(&[
         PREFIX_L1_HANDLER,
         version,
         contract_address.into(),
         entry_point_selector,
-        compute_hash_on_elements(calldata),
+        Pedersen::hash_array(calldata),
         Felt::ZERO, // No fee on L2 for L1 handler tx
         chain_id,
         nonce,
diff --git a/crates/storage/db/src/mdbx/mod.rs b/crates/storage/db/src/mdbx/mod.rs
@@ -272,8 +272,7 @@ pub mod test_utils {
 mod tests {
 
     use katana_primitives::contract::GenericContractInfo;
-    use katana_primitives::{address, Felt};
-    use starknet::macros::felt;
+    use katana_primitives::{address, felt, Felt};
 
     use super::*;
     use crate::abstraction::{DbCursor, DbCursorMut, DbDupSortCursor, DbTx, DbTxMut, Walker};
diff --git a/crates/storage/db/src/models/storage.rs b/crates/storage/db/src/models/storage.rs
@@ -88,7 +88,7 @@ impl Decompress for ContractStorageEntry {
 
 #[cfg(test)]
 mod tests {
-    use starknet::macros::felt;
+    use katana_primitives::felt;
 
     use crate::codecs::{Compress, Decompress};
 
diff --git a/crates/storage/db/src/tables.rs b/crates/storage/db/src/tables.rs
@@ -367,14 +367,13 @@ mod tests {
         assert_eq!(Tables::StoragesTrieChangeSet.table_type(), TableType::Table);
     }
 
-    use katana_primitives::address;
     use katana_primitives::block::{BlockHash, BlockNumber, FinalityStatus};
     use katana_primitives::class::{ClassHash, CompiledClass, CompiledClassHash};
     use katana_primitives::contract::{ContractAddress, GenericContractInfo};
     use katana_primitives::execution::TypedTransactionExecutionInfo;
     use katana_primitives::receipt::{InvokeTxReceipt, Receipt};
     use katana_primitives::transaction::{InvokeTx, Tx, TxHash, TxNumber};
-    use starknet::macros::felt;
+    use katana_primitives::{address, felt};
 
     use crate::codecs::{Compress, Decode, Decompress, Encode};
     use crate::models::block::StoredBlockBodyIndices;
diff --git a/crates/storage/fork/src/lib.rs b/crates/storage/fork/src/lib.rs
@@ -1140,7 +1140,7 @@ mod tests {
     use std::sync::Mutex;
     use std::time::Duration;
 
-    use starknet::macros::felt;
+    use katana_primitives::felt;
 
     use super::test_utils::*;
     use super::*;
diff --git a/crates/storage/provider/provider/src/providers/db/mod.rs b/crates/storage/provider/provider/src/providers/db/mod.rs
@@ -884,7 +884,6 @@ impl<Tx: DbTxMut> StageCheckpointProvider for DbProvider<Tx> {
 mod tests {
     use std::collections::BTreeMap;
 
-    use katana_primitives::address;
     use katana_primitives::block::{
         Block, BlockHashOrNumber, FinalityStatus, Header, SealedBlockWithStatus,
     };
@@ -894,12 +893,12 @@ mod tests {
     use katana_primitives::receipt::{InvokeTxReceipt, Receipt};
     use katana_primitives::state::{StateUpdates, StateUpdatesWithClasses};
     use katana_primitives::transaction::{InvokeTx, Tx, TxHash, TxWithHash};
+    use katana_primitives::{address, felt};
     use katana_provider_api::block::{
         BlockHashProvider, BlockNumberProvider, BlockProvider, BlockStatusProvider, BlockWriter,
     };
     use katana_provider_api::state::StateFactoryProvider;
     use katana_provider_api::transaction::TransactionProvider;
-    use starknet::macros::felt;
 
     use crate::{DbProviderFactory, ProviderFactory};
 
diff --git a/crates/storage/provider/provider/tests/class.rs b/crates/storage/provider/provider/tests/class.rs
@@ -3,10 +3,10 @@ mod fixtures;
 use anyhow::Result;
 use katana_primitives::block::{BlockHashOrNumber, BlockNumber};
 use katana_primitives::class::{ClassHash, CompiledClassHash, ContractClass};
+use katana_primitives::felt;
 use katana_provider::api::contract::ContractClassProviderExt;
 use katana_provider::api::state::{StateFactoryProvider, StateProvider};
 use rstest_reuse::{self, *};
-use starknet::macros::felt;
 
 use crate::fixtures::{db_provider_with_states, DOJO_WORLD_SIERRA_CLASS};
 
diff --git a/crates/utils/src/tx_waiter.rs b/crates/utils/src/tx_waiter.rs
@@ -308,12 +308,12 @@ mod tests {
     use assert_matches::assert_matches;
     use katana_primitives::block::FinalityStatus::{self, AcceptedOnL1, AcceptedOnL2};
     use katana_primitives::fee::PriceUnit;
+    use katana_primitives::felt;
     use katana_rpc_types::receipt::ExecutionResult::{Reverted, Succeeded};
     use katana_rpc_types::receipt::{
         ExecutionResult, ReceiptBlockInfo, RpcInvokeTxReceipt, RpcTxReceipt, TxReceiptWithBlockInfo,
     };
     use katana_rpc_types::{ExecutionResources, FeePayment};
-    use starknet::macros::felt;
 
     use super::{Duration, TxWaiter};
     use crate::{TestNode, TxWaitingError};
