chore: remove public imports from starknet api transaction

crates/batcher/src/block_builder.rs

@@ -23,7 +23,7 @@ use serde::{Deserialize, Serialize};
 use starknet_api::block::{BlockNumber, BlockTimestamp, NonzeroGasPrice};
 use starknet_api::core::ContractAddress;
 use starknet_api::executable_transaction::Transaction;
-use starknet_api::transaction::TransactionHash;
+use starknet_api::transaction::fields::TransactionHash;
 use thiserror::Error;
 use tokio::sync::Mutex;
 

crates/batcher/src/test_utils.rs

@@ -3,7 +3,7 @@ use std::ops::Range;
 use starknet_api::executable_transaction::Transaction;
 use starknet_api::felt;
 use starknet_api::test_utils::invoke::{executable_invoke_tx, InvokeTxArgs};
-use starknet_api::transaction::TransactionHash;
+use starknet_api::transaction::fields::TransactionHash;
 
 pub fn test_txs(tx_hash_range: Range<usize>) -> Vec<Transaction> {
     tx_hash_range

crates/blockifier/src/abi/constants.rs

@@ -1,4 +1,4 @@
-use starknet_api::transaction::TransactionVersion;
+use starknet_api::transaction::fields::TransactionVersion;
 use starknet_types_core::felt::Felt;
 
 pub const CONSTRUCTOR_ENTRY_POINT_NAME: &str = "constructor";

crates/blockifier/src/blockifier/stateful_validator_test.rs

@@ -1,6 +1,6 @@
 use assert_matches::assert_matches;
 use rstest::rstest;
-use starknet_api::transaction::{TransactionVersion, ValidResourceBounds};
+use starknet_api::transaction::fields::{TransactionVersion, ValidResourceBounds};
 
 use crate::blockifier::stateful_validator::StatefulValidator;
 use crate::context::BlockContext;

crates/blockifier/src/blockifier/transaction_executor_test.rs

@@ -2,7 +2,7 @@ use assert_matches::assert_matches;
 use pretty_assertions::assert_eq;
 use rstest::rstest;
 use starknet_api::test_utils::NonceManager;
-use starknet_api::transaction::{Fee, TransactionVersion};
+use starknet_api::transaction::fields::{Fee, TransactionVersion};
 use starknet_api::{declare_tx_args, deploy_account_tx_args, felt, invoke_tx_args, nonce};
 use starknet_types_core::felt::Felt;
 

crates/blockifier/src/bouncer_test.rs

@@ -5,7 +5,7 @@ use cairo_vm::types::builtin_name::BuiltinName;
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use rstest::rstest;
 use starknet_api::core::{ClassHash, ContractAddress, PatriciaKey};
-use starknet_api::transaction::Fee;
+use starknet_api::transaction::fields::Fee;
 use starknet_api::{class_hash, contract_address, felt, patricia_key, storage_key};
 
 use super::BouncerConfig;

crates/blockifier/src/concurrency/fee_utils.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use num_traits::ToPrimitive;
 use starknet_api::core::ContractAddress;
-use starknet_api::transaction::Fee;
+use starknet_api::transaction::fields::Fee;
 use starknet_types_core::felt::Felt;
 
 use crate::context::{BlockContext, TransactionContext};

crates/blockifier/src/concurrency/fee_utils_test.rs

@@ -1,6 +1,6 @@
 use num_bigint::BigUint;
 use rstest::rstest;
-use starknet_api::transaction::{Fee, ValidResourceBounds};
+use starknet_api::transaction::fields::{Fee, ValidResourceBounds};
 use starknet_api::{felt, invoke_tx_args};
 use starknet_types_core::felt::Felt;
 
@@ -52,7 +52,7 @@ pub fn test_fill_sequencer_balance_reads(
 #[case::overflow(Fee(150_u128), felt!(u128::MAX), felt!(5_u128))]
 #[case::overflow_edge_case(Fee(500_u128), felt!(u128::MAX), felt!(u128::MAX-1))]
 pub fn test_add_fee_to_sequencer_balance(
-    #[case] actual_fee: starknet_api::transaction::Fee,
+    #[case] actual_fee: Fee,
     #[case] sequencer_balance_low: Felt,
     #[case] sequencer_balance_high: Felt,
 ) {

crates/blockifier/src/concurrency/versioned_state_test.rs

@@ -12,7 +12,7 @@ use starknet_api::core::{
     PatriciaKey,
 };
 use starknet_api::test_utils::NonceManager;
-use starknet_api::transaction::{Calldata, ContractAddressSalt, ValidResourceBounds};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt, ValidResourceBounds};
 use starknet_api::{
     calldata,
     class_hash,

crates/blockifier/src/concurrency/worker_logic_test.rs

@@ -4,7 +4,7 @@ use std::sync::Mutex;
 use rstest::rstest;
 use starknet_api::core::{ContractAddress, Nonce, PatriciaKey};
 use starknet_api::test_utils::NonceManager;
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     ContractAddressSalt,
     Fee,
     TransactionVersion,

crates/blockifier/src/context.rs

@@ -5,7 +5,7 @@ use papyrus_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use serde::{Deserialize, Serialize};
 use starknet_api::block::GasPriceVector;
 use starknet_api::core::{ChainId, ContractAddress};
-use starknet_api::transaction::GasVectorComputationMode;
+use starknet_api::transaction::fields::GasVectorComputationMode;
 
 use crate::blockifier::block::BlockInfo;
 use crate::bouncer::BouncerConfig;

crates/blockifier/src/execution/contract_address_test.rs

@@ -1,6 +1,6 @@
 use rstest::rstest;
 use starknet_api::core::{calculate_contract_address, ClassHash, ContractAddress};
-use starknet_api::transaction::{Calldata, ContractAddressSalt};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
 use starknet_api::{calldata, felt};
 
 use crate::abi::abi_utils::selector_from_name;

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

@@ -7,17 +7,15 @@ use pretty_assertions::assert_eq;
 use rstest::rstest;
 use starknet_api::core::{calculate_contract_address, ChainId, PatriciaKey};
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     Calldata,
     ContractAddressSalt,
-    EventContent,
-    EventData,
-    EventKey,
     Fee,
     TransactionHash,
     TransactionVersion,
     QUERY_VERSION_BASE_BIT,
 };
+use starknet_api::transaction::{EventContent, EventData, EventKey};
 use starknet_api::{calldata, felt, nonce, storage_key};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;

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

@@ -20,7 +20,7 @@ use num_bigint::{BigUint, TryFromBigIntError};
 use starknet_api::contract_class::EntryPointType;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector};
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_api::StarknetApiError;
 use starknet_types_core::felt::{Felt, FromStrError};
 use thiserror::Error;

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

@@ -11,14 +11,8 @@ use starknet_api::core::{
     EthAddress,
 };
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{
-    Calldata,
-    ContractAddressSalt,
-    EventContent,
-    EventData,
-    EventKey,
-    L2ToL1Payload,
-};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
+use starknet_api::transaction::{EventContent, EventData, EventKey, L2ToL1Payload};
 use starknet_types_core::felt::Felt;
 use strum_macros::EnumIter;
 

crates/blockifier/src/execution/entry_point.rs

@@ -9,7 +9,7 @@ use serde::Serialize;
 use starknet_api::contract_class::EntryPointType;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector};
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     AllResourceBounds,
     Calldata,
     ResourceBounds,

crates/blockifier/src/execution/entry_point_test.rs

@@ -4,7 +4,7 @@ use cairo_vm::types::builtin_name::BuiltinName;
 use num_bigint::BigInt;
 use pretty_assertions::assert_eq;
 use starknet_api::core::{EntryPointSelector, PatriciaKey};
-use starknet_api::transaction::{Calldata, Fee};
+use starknet_api::transaction::fields::{Calldata, Fee};
 use starknet_api::{calldata, felt, storage_key};
 
 use crate::abi::abi_utils::{get_storage_var_address, selector_from_name};

crates/blockifier/src/execution/execution_utils.rs

@@ -19,7 +19,7 @@ use cairo_vm::vm::vm_core::VirtualMachine;
 use num_bigint::BigUint;
 use starknet_api::core::ClassHash;
 use starknet_api::deprecated_contract_class::Program as DeprecatedProgram;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_types_core::felt::Felt;
 
 use super::entry_point::ConstructorEntryPointExecutionResult;

crates/blockifier/src/execution/stack_trace_test.rs

@@ -2,7 +2,7 @@ use pretty_assertions::assert_eq;
 use regex::Regex;
 use rstest::rstest;
 use starknet_api::core::{calculate_contract_address, Nonce};
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     Calldata,
     ContractAddressSalt,
     Fee,

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

@@ -16,7 +16,12 @@ use cairo_vm::vm::vm_core::VirtualMachine;
 use starknet_api::contract_class::EntryPointType;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector};
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{AllResourceBounds, Calldata, Resource, ValidResourceBounds};
+use starknet_api::transaction::fields::{
+    AllResourceBounds,
+    Calldata,
+    Resource,
+    ValidResourceBounds,
+};
 use starknet_api::StarknetApiError;
 use starknet_types_core::felt::{Felt, FromStrError};
 use thiserror::Error;

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

@@ -11,14 +11,8 @@ use starknet_api::core::{
     EthAddress,
 };
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{
-    Calldata,
-    ContractAddressSalt,
-    EventContent,
-    EventData,
-    EventKey,
-    L2ToL1Payload,
-};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
+use starknet_api::transaction::{EventContent, EventData, EventKey, L2ToL1Payload};
 use starknet_types_core::felt::Felt;
 
 use self::hint_processor::{

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

@@ -5,7 +5,7 @@ use itertools::Itertools;
 use pretty_assertions::assert_eq;
 use rstest::rstest;
 use starknet_api::felt;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use test_case::test_case;
 
 use super::constants::REQUIRED_GAS_CALL_CONTRACT_TEST;

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

@@ -1,6 +1,6 @@
 use pretty_assertions::assert_eq;
 use starknet_api::core::calculate_contract_address;
-use starknet_api::transaction::{Calldata, ContractAddressSalt, Fee};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt, Fee};
 use starknet_api::{calldata, felt};
 use test_case::test_case;
 

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

@@ -1,7 +1,8 @@
 use itertools::concat;
 use pretty_assertions::assert_eq;
 use starknet_api::felt;
-use starknet_api::transaction::{Calldata, EventContent, EventData, EventKey};
+use starknet_api::transaction::fields::Calldata;
+use starknet_api::transaction::{EventContent, EventData, EventKey};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;
 

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

@@ -1,7 +1,7 @@
 use pretty_assertions::assert_eq;
 use starknet_api::core::ContractAddress;
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_api::{calldata, felt};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;

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

@@ -4,7 +4,7 @@ use starknet_api::block::GasPrice;
 use starknet_api::core::ChainId;
 use starknet_api::data_availability::DataAvailabilityMode;
 use starknet_api::execution_resources::GasAmount;
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     AccountDeploymentData,
     Calldata,
     Fee,

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

@@ -1,4 +1,4 @@
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use test_case::test_case;
 
 use crate::abi::abi_utils::selector_from_name;

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

@@ -5,7 +5,7 @@ use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use pretty_assertions::assert_eq;
 use starknet_api::core::PatriciaKey;
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_api::{calldata, felt, patricia_key};
 use test_case::test_case;
 

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

@@ -1,4 +1,4 @@
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_api::{calldata, felt};
 use test_case::test_case;
 

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

@@ -1,4 +1,4 @@
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_api::{calldata, felt};
 use test_case::test_case;
 

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

@@ -1,4 +1,4 @@
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use test_case::test_case;
 
 use crate::abi::abi_utils::selector_from_name;

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

@@ -1,7 +1,8 @@
 use itertools::concat;
 use starknet_api::core::EthAddress;
 use starknet_api::felt;
-use starknet_api::transaction::{Calldata, L2ToL1Payload};
+use starknet_api::transaction::fields::Calldata;
+use starknet_api::transaction::L2ToL1Payload;
 use test_case::test_case;
 
 use crate::abi::abi_utils::selector_from_name;

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

@@ -1,4 +1,4 @@
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use test_case::test_case;
 
 use crate::abi::abi_utils::selector_from_name;

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

@@ -1,5 +1,5 @@
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_api::{calldata, felt};
 use test_case::test_case;
 

crates/blockifier/src/fee/fee_checks.rs

@@ -1,6 +1,11 @@
 use starknet_api::execution_resources::{GasAmount, GasVector};
-use starknet_api::transaction::Resource::{self, L1DataGas, L1Gas, L2Gas};
-use starknet_api::transaction::{AllResourceBounds, Fee, ResourceBounds, ValidResourceBounds};
+use starknet_api::transaction::fields::Resource::{self, L1DataGas, L1Gas, L2Gas};
+use starknet_api::transaction::fields::{
+    AllResourceBounds,
+    Fee,
+    ResourceBounds,
+    ValidResourceBounds,
+};
 use starknet_types_core::felt::Felt;
 use thiserror::Error;
 

crates/blockifier/src/fee/fee_test.rs

@@ -4,7 +4,12 @@ use rstest::rstest;
 use starknet_api::block::NonzeroGasPrice;
 use starknet_api::execution_resources::{GasAmount, GasVector};
 use starknet_api::invoke_tx_args;
-use starknet_api::transaction::{Fee, GasVectorComputationMode, Resource, ValidResourceBounds};
+use starknet_api::transaction::fields::{
+    Fee,
+    GasVectorComputationMode,
+    Resource,
+    ValidResourceBounds,
+};
 
 use crate::blockifier::block::GasPrices;
 use crate::context::BlockContext;

crates/blockifier/src/fee/fee_utils.rs

@@ -6,8 +6,13 @@ use num_bigint::BigUint;
 use starknet_api::core::ContractAddress;
 use starknet_api::execution_resources::GasVector;
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::ValidResourceBounds::{AllResources, L1Gas};
-use starknet_api::transaction::{AllResourceBounds, Fee, GasVectorComputationMode, Resource};
+use starknet_api::transaction::fields::ValidResourceBounds::{AllResources, L1Gas};
+use starknet_api::transaction::fields::{
+    AllResourceBounds,
+    Fee,
+    GasVectorComputationMode,
+    Resource,
+};
 use starknet_types_core::felt::Felt;
 
 use crate::abi::abi_utils::get_fee_token_var_address;

crates/blockifier/src/fee/gas_usage.rs

@@ -1,6 +1,6 @@
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use starknet_api::execution_resources::GasVector;
-use starknet_api::transaction::GasVectorComputationMode;
+use starknet_api::transaction::fields::GasVectorComputationMode;
 
 use super::fee_utils::get_vm_resources_cost;
 use crate::abi::constants;

crates/blockifier/src/fee/gas_usage_test.rs

@@ -5,7 +5,8 @@ use pretty_assertions::assert_eq;
 use rstest::{fixture, rstest};
 use starknet_api::execution_resources::{GasAmount, GasVector};
 use starknet_api::invoke_tx_args;
-use starknet_api::transaction::{EventContent, EventData, EventKey, GasVectorComputationMode};
+use starknet_api::transaction::fields::GasVectorComputationMode;
+use starknet_api::transaction::{EventContent, EventData, EventKey};
 use starknet_types_core::felt::Felt;
 
 use crate::abi::constants;

crates/blockifier/src/fee/receipt.rs

@@ -1,7 +1,7 @@
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use starknet_api::core::ContractAddress;
 use starknet_api::execution_resources::GasVector;
-use starknet_api::transaction::Fee;
+use starknet_api::transaction::fields::Fee;
 
 use crate::context::TransactionContext;
 use crate::execution::call_info::ExecutionSummary;