refactor: move CSM state/status types to a new crate

Author: krsnapaudel

Cargo.lock

@@ -28,6 +28,7 @@ members = [
   "crates/config",
   "crates/consensus-logic",
   "crates/crypto",
+  "crates/csm-types",
   "crates/da-framework",
   "crates/db",
   "crates/db-store-sled",
@@ -154,6 +155,7 @@ strata-common = { path = "crates/common" }
 strata-config = { path = "crates/config" }
 strata-consensus-logic = { path = "crates/consensus-logic" }
 strata-crypto = { path = "crates/crypto", default-features = false }
+strata-csm-types = { path = "crates/csm-types" }
 strata-da-framework = { path = "crates/da-framework" }
 strata-db = { path = "crates/db" }
 strata-db-store-rocksdb = { path = "crates/db-store-rocksdb" }

Cargo.toml

@@ -17,6 +17,7 @@ strata-checkpoint-types.workspace = true
 strata-common = { workspace = true, default-features = true }
 strata-config.workspace = true
 strata-consensus-logic = { workspace = true, default-features = true }
+strata-csm-types.workspace = true
 strata-db.workspace = true
 strata-db-store-rocksdb = { workspace = true, optional = true }
 strata-db-store-sled = { workspace = true, optional = true }

bin/strata-client/Cargo.toml

@@ -5,11 +5,9 @@ use bitcoin::{Address, Network};
 use bitcoind_async_client::{traits::Wallet, Client};
 use format_serde_error::SerdeError;
 use strata_config::{BitcoindConfig, Config};
+use strata_csm_types::L1Status;
 use strata_evmexec::{engine::RpcExecEngineCtl, fetch_init_fork_choice_state, EngineRpcClient};
-use strata_primitives::{
-    l1::L1Status,
-    params::{Params, RollupParams, SyncParams},
-};
+use strata_primitives::params::{Params, RollupParams, SyncParams};
 use strata_status::StatusChannel;
 use strata_storage::NodeStorage;
 use tokio::runtime::Handle;

bin/strata-client/src/helpers.rs

@@ -17,17 +17,15 @@ use strata_checkpoint_types::{Checkpoint, EpochSummary, SignedCheckpoint};
 use strata_common::BAIL_SENDER;
 use strata_common::{send_action_to_worker, Action, WorkerType};
 use strata_consensus_logic::{checkpoint_verification::verify_proof, sync_manager::SyncManager};
+use strata_csm_types::{ClientState, ClientUpdateOutput, L1Payload, PayloadDest, PayloadIntent};
 use strata_db::types::{CheckpointConfStatus, CheckpointProvingStatus, L1TxEntry, L1TxStatus};
 use strata_ol_chain_types::{L2Block, L2BlockBundle, L2BlockId, L2Header};
 use strata_ol_chainstate_types::Chainstate;
 use strata_primitives::{
     buf::Buf32,
     epoch::EpochCommitment,
     hash,
-    l1::{
-        payload::{L1Payload, PayloadDest, PayloadIntent},
-        L1BlockCommitment, L1BlockId,
-    },
+    l1::{L1BlockCommitment, L1BlockId},
     operator::OperatorIdx,
     params::Params,
 };
@@ -47,7 +45,6 @@ use strata_sequencer::{
     checkpoint::{verify_checkpoint_sig, CheckpointHandle},
     duty::{extractor::extract_duties, types::Duty},
 };
-use strata_state::{client_state::ClientState, operation::ClientUpdateOutput};
 use strata_status::StatusChannel;
 use strata_storage::NodeStorage;
 use tokio::sync::{oneshot, Mutex};

bin/strata-client/src/rpc_server.rs

@@ -21,13 +21,13 @@ strata-asm-types.workspace = true
 strata-checkpoint-types.workspace = true
 strata-cli-common.workspace = true
 strata-consensus-logic.workspace = true
+strata-csm-types.workspace = true
 strata-db.workspace = true
 strata-db-store-rocksdb = { workspace = true, optional = true }
 strata-db-store-sled = { workspace = true, optional = true }
 strata-ol-chain-types.workspace = true
 strata-ol-chainstate-types.workspace = true
 strata-primitives.workspace = true
-strata-state.workspace = true
 
 [features]
 default = ["sled"]

bin/strata-dbtool/Cargo.toml

@@ -1,8 +1,8 @@
 use argh::FromArgs;
 use strata_cli_common::errors::{DisplayableError, DisplayedError};
+use strata_csm_types::ClientUpdateOutput;
 use strata_db::traits::{ClientStateDatabase, DatabaseBackend};
 use strata_primitives::l1::L1BlockCommitment;
-use strata_state::operation::ClientUpdateOutput;
 
 use crate::{
     cli::OutputFormat,

bin/strata-dbtool/src/cmd/client_state.rs

@@ -3,8 +3,8 @@
 use strata_checkpoint_types::{
     BatchInfo, BatchTransition, Checkpoint, EpochSummary, SignedCheckpoint,
 };
+use strata_csm_types::CheckpointL1Ref;
 use strata_db::types::{CheckpointConfStatus, CheckpointProvingStatus};
-use strata_state::client_state::CheckpointL1Ref;
 
 use super::{helpers::porcelain_field, traits::Formattable};
 

bin/strata-dbtool/src/output/checkpoint.rs

@@ -1,7 +1,7 @@
 //! Client state formatting implementations
 
+use strata_csm_types::{ClientState, SyncAction};
 use strata_primitives::prelude::L1BlockCommitment;
-use strata_state::{client_state::ClientState, operation::SyncAction};
 
 use super::{helpers::porcelain_field, traits::Formattable};
 use crate::output::helpers::porcelain_optional;

bin/strata-dbtool/src/output/client_state.rs

@@ -1,6 +1,7 @@
 use serde::Serialize;
+use strata_csm_types::L1Payload;
 use strata_db::types::L1BundleStatus;
-use strata_primitives::{buf::Buf32, l1::payload::L1Payload};
+use strata_primitives::buf::Buf32;
 
 use super::{helpers::porcelain_field, traits::Formattable};