apollo_transaction_converter: move transaction converter to its own crate

Cargo.toml

@@ -91,6 +91,7 @@ members = [
   "crates/apollo_task_executor",
   "crates/apollo_test_utils",
   "crates/apollo_time",
+  "crates/apollo_transaction_converter",
   "crates/bench_tools",
   "crates/blockifier",
   "crates/blockifier_reexecution",
@@ -213,6 +214,7 @@ apollo_storage.path = "crates/apollo_storage"
 apollo_task_executor.path = "crates/apollo_task_executor"
 apollo_test_utils.path = "crates/apollo_test_utils"
 apollo_time.path = "crates/apollo_time"
+apollo_transaction_converter.path = "crates/apollo_transaction_converter"
 ark-bls12-381 = "0.5.0"
 ark-ec = "0.5.0"
 ark-ff = "0.5.0"

commitlint.config.js

@@ -82,6 +82,7 @@ const AllowedScopes = ['apollo_base_layer_tests',
     'apollo_task_executor',
     'apollo_test_utils',
     'apollo_time',
+    'apollo_transaction_converter',
     'batcher',
     'bench_tools',
     'blockifier',

crates/apollo_batcher/Cargo.toml

@@ -29,6 +29,7 @@ apollo_starknet_client.workspace = true
 apollo_state_reader.workspace = true
 apollo_state_sync_types.workspace = true
 apollo_storage.workspace = true
+apollo_transaction_converter.workspace = true
 async-trait.workspace = true
 blockifier.workspace = true
 cairo-vm.workspace = true
@@ -56,6 +57,7 @@ apollo_metrics = { workspace = true, features = ["testing"] }
 apollo_proof_manager_types = { workspace = true, features = ["testing"] }
 apollo_state_sync_types = { workspace = true, features = ["testing"] }
 apollo_storage = { workspace = true, features = ["testing"] }
+apollo_transaction_converter = { workspace = true, features = ["testing"] }
 assert_matches.workspace = true
 blockifier = { workspace = true, features = ["testing"] }
 cairo-lang-starknet-classes.workspace = true

crates/apollo_batcher/src/block_builder.rs

@@ -5,17 +5,17 @@ use std::time::Duration;
 
 use apollo_batcher_config::config::BlockBuilderConfig;
 use apollo_batcher_types::batcher_types::ProposalCommitment;
-use apollo_class_manager_types::transaction_converter::{
-    TransactionConverter,
-    TransactionConverterError,
-    TransactionConverterResult,
-    TransactionConverterTrait,
-};
 use apollo_class_manager_types::SharedClassManagerClient;
 use apollo_infra_utils::tracing::LogCompatibleToStringExt;
 use apollo_proof_manager_types::SharedProofManagerClient;
 use apollo_state_reader::apollo_state::{ApolloReader, ClassReader};
 use apollo_storage::StorageReader;
+use apollo_transaction_converter::{
+    TransactionConverter,
+    TransactionConverterError,
+    TransactionConverterResult,
+    TransactionConverterTrait,
+};
 use async_trait::async_trait;
 use blockifier::blockifier::concurrent_transaction_executor::ConcurrentTransactionExecutor;
 use blockifier::blockifier::transaction_executor::{

crates/apollo_batcher/src/block_builder_test.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use apollo_class_manager_types::transaction_converter::TransactionConverter;
 use apollo_class_manager_types::MockClassManagerClient;
 use apollo_l1_provider_types::InvalidValidationStatus;
 use apollo_l1_provider_types::InvalidValidationStatus::{
@@ -11,6 +10,7 @@ use apollo_l1_provider_types::InvalidValidationStatus::{
     NotFound,
 };
 use apollo_proof_manager_types::MockProofManagerClient;
+use apollo_transaction_converter::TransactionConverter;
 use assert_matches::assert_matches;
 use blockifier::blockifier::transaction_executor::{
     BlockExecutionSummary,

crates/apollo_class_manager_types/Cargo.toml

@@ -16,7 +16,6 @@ workspace = true
 apollo_compile_to_casm_types.workspace = true
 apollo_infra.workspace = true
 apollo_proc_macros.workspace = true
-apollo_proof_manager_types.workspace = true
 async-trait.workspace = true
 mockall = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive"] }
@@ -25,11 +24,8 @@ starknet_api.workspace = true
 strum = { workspace = true, features = ["derive"] }
 strum_macros.workspace = true
 thiserror.workspace = true
-tokio.workspace = true
-tracing.workspace = true
 
 [dev-dependencies]
-apollo_proof_manager_types = { workspace = true, features = ["testing"] }
 assert_matches.workspace = true
 blockifier = { workspace = true, features = ["testing"] }
 blockifier_test_utils.workspace = true

crates/apollo_class_manager_types/src/lib.rs

@@ -1,5 +1,3 @@
-pub mod transaction_converter;
-
 use std::error::Error;
 use std::sync::Arc;
 

crates/apollo_consensus_manager/Cargo.toml

@@ -30,6 +30,7 @@ apollo_reverts.workspace = true
 apollo_signature_manager_types.workspace = true
 apollo_state_sync_types.workspace = true
 apollo_time.workspace = true
+apollo_transaction_converter.workspace = true
 async-trait.workspace = true
 futures.workspace = true
 starknet_api.workspace = true
@@ -47,6 +48,7 @@ apollo_proof_manager_types = { workspace = true, features = ["testing"] }
 apollo_signature_manager_types = { workspace = true, features = ["testing"] }
 apollo_state_sync_types = { workspace = true, features = ["testing"] }
 apollo_storage = { workspace = true }
+apollo_transaction_converter = { workspace = true, features = ["testing"] }
 mockall.workspace = true
 rstest.workspace = true
 tempfile.workspace = true

crates/apollo_consensus_manager/src/consensus_manager.rs

@@ -7,7 +7,6 @@ use std::sync::{Arc, Mutex};
 
 use apollo_batcher_types::batcher_types::RevertBlockInput;
 use apollo_batcher_types::communication::SharedBatcherClient;
-use apollo_class_manager_types::transaction_converter::TransactionConverter;
 use apollo_class_manager_types::SharedClassManagerClient;
 use apollo_config_manager_types::communication::SharedConfigManagerClient;
 use apollo_consensus::storage::{get_voted_height_storage, HeightVotedStorageTrait};
@@ -43,6 +42,7 @@ use apollo_reverts::{revert_blocks_and_eternal_pending, RevertComponentData};
 use apollo_signature_manager_types::SharedSignatureManagerClient;
 use apollo_state_sync_types::communication::SharedStateSyncClient;
 use apollo_time::time::DefaultClock;
+use apollo_transaction_converter::TransactionConverter;
 use async_trait::async_trait;
 use futures::channel::mpsc;
 use starknet_api::block::BlockNumber;

crates/apollo_consensus_orchestrator/Cargo.toml

@@ -23,6 +23,7 @@ apollo_protobuf.workspace = true
 apollo_sizeof.workspace = true
 apollo_state_sync_types.workspace = true
 apollo_time = { workspace = true, features = ["tokio"] }
+apollo_transaction_converter.workspace = true
 async-trait.workspace = true
 blockifier.workspace = true
 cairo-lang-starknet-classes.workspace = true
@@ -64,6 +65,7 @@ apollo_state_sync_types = { workspace = true, features = ["testing"] }
 apollo_storage = { workspace = true, features = ["testing"] }
 apollo_test_utils.workspace = true
 apollo_time = { workspace = true, features = ["testing", "tokio"] }
+apollo_transaction_converter = { workspace = true, features = ["testing"] }
 assert_matches.workspace = true
 blockifier = { workspace = true, features = ["testing"] }
 blockifier_test_utils = { workspace = true }

crates/apollo_consensus_orchestrator/src/build_proposal.rs

@@ -13,7 +13,6 @@ use apollo_batcher_types::batcher_types::{
     ProposeBlockInput,
 };
 use apollo_batcher_types::communication::BatcherClientError;
-use apollo_class_manager_types::transaction_converter::TransactionConverterError;
 use apollo_consensus::types::{ProposalCommitment, Round};
 use apollo_l1_gas_price_types::errors::{EthToStrkOracleClientError, L1GasPriceClientError};
 use apollo_protobuf::consensus::{
@@ -25,6 +24,7 @@ use apollo_protobuf::consensus::{
 };
 use apollo_state_sync_types::communication::SharedStateSyncClient;
 use apollo_time::time::{Clock, DateTime};
+use apollo_transaction_converter::TransactionConverterError;
 use starknet_api::block::GasPrice;
 use starknet_api::consensus_transaction::InternalConsensusTransaction;
 use starknet_api::core::ContractAddress;

crates/apollo_consensus_orchestrator/src/build_proposal_test.rs

@@ -6,12 +6,14 @@ use apollo_batcher_types::batcher_types::{
     ProposalCommitment,
 };
 use apollo_batcher_types::communication::BatcherClientError;
-use apollo_class_manager_types::transaction_converter::{
-    MockTransactionConverterTrait,
-    TransactionConverterError,
-};
-use apollo_consensus::types::ProposalCommitment as ConsensusProposalCommitment;
+use apollo_consensus::types::{ProposalCommitment as ConsensusProposalCommitment, Round};
+use apollo_consensus_orchestrator_config::config::ContextConfig;
 use apollo_infra::component_client::ClientError;
+use apollo_protobuf::consensus::{ConsensusBlockInfo, ProposalInit, ProposalPart};
+use apollo_state_sync_types::communication::StateSyncClientError;
+use apollo_state_sync_types::errors::StateSyncError;
+use apollo_time::time::DateTime;
+use apollo_transaction_converter::{MockTransactionConverterTrait, TransactionConverterError};
 use assert_matches::assert_matches;
 use starknet_api::core::ClassHash;
 use tokio_util::task::AbortOnDropHandle;

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -17,10 +17,6 @@ use apollo_batcher_types::batcher_types::{
     StartHeightInput,
 };
 use apollo_batcher_types::communication::BatcherClient;
-use apollo_class_manager_types::transaction_converter::{
-    TransactionConverterError,
-    TransactionConverterTrait,
-};
 use apollo_config_manager_types::communication::SharedConfigManagerClient;
 use apollo_consensus::types::{
     ConsensusContext,
@@ -46,6 +42,11 @@ use apollo_state_sync_types::communication::{StateSyncClient, StateSyncClientErr
 use apollo_state_sync_types::errors::StateSyncError;
 use apollo_state_sync_types::state_sync_types::SyncBlock;
 use apollo_time::time::Clock;
+use apollo_transaction_converter::transaction_converter::{
+    TransactionConverterError,
+    TransactionConverterTrait,
+};
+use apollo_transaction_converter::{TransactionConverterError, TransactionConverterTrait};
 use async_trait::async_trait;
 use futures::channel::mpsc::SendError;
 use futures::channel::{mpsc, oneshot};

crates/apollo_consensus_orchestrator/src/test_utils.rs

@@ -15,11 +15,6 @@ use apollo_batcher_types::batcher_types::{
     ValidateBlockInput,
 };
 use apollo_batcher_types::communication::MockBatcherClient;
-use apollo_class_manager_types::transaction_converter::{
-    MockTransactionConverterTrait,
-    TransactionConverter,
-    TransactionConverterTrait,
-};
 use apollo_class_manager_types::EmptyClassManagerClient;
 use apollo_consensus::types::Round;
 use apollo_consensus_orchestrator_config::config::{ContextConfig, ContextStaticConfig};
@@ -43,6 +38,11 @@ use apollo_protobuf::consensus::{
 };
 use apollo_state_sync_types::communication::MockStateSyncClient;
 use apollo_time::time::{Clock, DateTime, DefaultClock};
+use apollo_transaction_converter::{
+    MockTransactionConverterTrait,
+    TransactionConverter,
+    TransactionConverterTrait,
+};
 use futures::channel::mpsc;
 use futures::executor::block_on;
 use futures::SinkExt;

crates/apollo_consensus_orchestrator/src/validate_proposal.rs

@@ -14,13 +14,13 @@ use apollo_batcher_types::batcher_types::{
 };
 use apollo_batcher_types::communication::{BatcherClient, BatcherClientError};
 use apollo_batcher_types::errors::BatcherError;
-use apollo_class_manager_types::transaction_converter::TransactionConverterTrait;
 use apollo_consensus::types::ProposalCommitment;
 use apollo_l1_gas_price_types::errors::{EthToStrkOracleClientError, L1GasPriceClientError};
 use apollo_l1_gas_price_types::L1GasPriceProviderClient;
 use apollo_protobuf::consensus::{ConsensusBlockInfo, ProposalFin, ProposalPart, TransactionBatch};
 use apollo_state_sync_types::communication::StateSyncClient;
 use apollo_time::time::{Clock, ClockExt, DateTime};
+use apollo_transaction_converter::TransactionConverterTrait;
 use futures::channel::mpsc;
 use futures::StreamExt;
 use starknet_api::block::{BlockNumber, GasPrice};

crates/apollo_gateway/Cargo.toml

@@ -15,6 +15,7 @@ testing = [
   "apollo_gateway_config/testing",
   "apollo_mempool_types/testing",
   "apollo_proof_manager_types/testing",
+  "apollo_transaction_converter/testing",
   "blockifier/testing",
   "blockifier_test_utils",
 ]
@@ -31,6 +32,7 @@ apollo_network_types.workspace = true
 apollo_proc_macros.workspace = true
 apollo_proof_manager_types.workspace = true
 apollo_state_sync_types.workspace = true
+apollo_transaction_converter.workspace = true
 async-trait.workspace = true
 axum.workspace = true
 blockifier.workspace = true
@@ -60,6 +62,7 @@ apollo_network_types = { workspace = true, features = ["testing"] }
 apollo_proof_manager_types = { workspace = true, features = ["testing"] }
 apollo_state_sync_types = { workspace = true, features = ["testing"] }
 apollo_test_utils.workspace = true
+apollo_transaction_converter = { workspace = true, features = ["testing"] }
 assert_matches.workspace = true
 blockifier = { workspace = true, features = ["mocks", "testing"] }
 blockifier_test_utils.workspace = true

crates/apollo_gateway/src/errors.rs

@@ -1,4 +1,3 @@
-use apollo_class_manager_types::transaction_converter::TransactionConverterError;
 use apollo_class_manager_types::{ClassManagerClientError, ClassManagerError};
 use apollo_gateway_config::compiler_version::{VersionId, VersionIdError};
 use apollo_gateway_types::deprecated_gateway_error::{
@@ -10,6 +9,7 @@ use apollo_gateway_types::errors::GatewaySpecError;
 use apollo_gateway_types::gateway_types::SUPPORTED_TRANSACTION_VERSIONS;
 use apollo_mempool_types::communication::{MempoolClientError, MempoolClientResult};
 use apollo_mempool_types::errors::MempoolError;
+use apollo_transaction_converter::TransactionConverterError;
 use starknet_api::block::GasPrice;
 use starknet_api::executable_transaction::ValidateCompiledClassHashError;
 use starknet_api::execution_resources::GasAmount;