apollo_transaction_converter: move transaction converter to its own crate

Author: einat-starkware

Cargo.lock

@@ -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",
@@ -212,6 +213,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.4.0"
 ark-ec = "0.4.2"
 ark-ff = "0.4.0-alpha.7"

Cargo.toml

@@ -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',

commitlint.config.js

@@ -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/Cargo.toml

@@ -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.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_batcher/src/block_builder_test.rs

@@ -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/Cargo.toml

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

crates/apollo_class_manager_types/src/lib.rs

@@ -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/Cargo.toml

@@ -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;