refactor: remove common as dep of consensus-core (#367)

* refactor: remove common as dep of consensus-core

* fix imports

common/src/lib.rs

@@ -1,6 +1,2 @@
 pub mod errors;
 pub mod types;
-
-pub mod config {
-    pub mod types;
-}

config/src/base.rs

@@ -6,7 +6,7 @@ use alloy::primitives::B256;
 use serde::Serialize;
 
 use crate::types::ChainConfig;
-use common::config::types::Forks;
+use consensus_core::types::Forks;
 
 /// The base configuration for a network.
 #[derive(Serialize)]

config/src/config.rs

@@ -9,7 +9,7 @@ use figment::{
 };
 use serde::Deserialize;
 
-use common::config::types::Forks;
+use consensus_core::types::Forks;
 
 use crate::base::BaseConfig;
 use crate::cli::CliConfig;

config/src/networks.rs

@@ -10,7 +10,7 @@ use eyre::Result;
 use serde::{Deserialize, Serialize};
 use strum::EnumIter;
 
-use common::config::types::{Fork, Forks};
+use consensus_core::types::{Fork, Forks};
 
 use crate::base::BaseConfig;
 use crate::types::ChainConfig;

consensus-core/Cargo.toml

@@ -19,5 +19,3 @@ superstruct.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 zduny-wasm-timer.workspace = true
-
-common = { path = "../common" }

consensus-core/src/consensus_core.rs

@@ -7,15 +7,14 @@ use tracing::{info, warn};
 use tree_hash::TreeHash;
 use zduny_wasm_timer::{SystemTime, UNIX_EPOCH};
 
-use common::config::types::Forks;
-
 use crate::errors::ConsensusError;
 use crate::proof::{
     is_current_committee_proof_valid, is_finality_proof_valid, is_next_committee_proof_valid,
 };
 use crate::types::bls::{PublicKey, Signature};
 use crate::types::{
-    Bootstrap, FinalityUpdate, GenericUpdate, Header, LightClientStore, OptimisticUpdate, Update,
+    Bootstrap, FinalityUpdate, Forks, GenericUpdate, Header, LightClientStore, OptimisticUpdate,
+    Update,
 };
 use crate::utils::{
     calculate_fork_version, compute_committee_sign_root, compute_fork_data_root,

consensus-core/src/types/mod.rs

@@ -1,4 +1,4 @@
-use alloy::primitives::{Address, B256, U256};
+use alloy::primitives::{Address, FixedBytes, B256, U256};
 use eyre::Result;
 use serde::{Deserialize, Serialize};
 use ssz_derive::Encode;
@@ -14,7 +14,6 @@ use self::{
 pub mod bls;
 pub mod bytes;
 mod serde_utils;
-mod utils;
 
 pub type LogsBloom = ByteVector<typenum::U256>;
 pub type KZGCommitment = ByteVector<typenum::U48>;
@@ -312,6 +311,21 @@ pub struct SyncAggregate {
     pub sync_committee_signature: Signature,
 }
 
+#[derive(Serialize, Deserialize, Debug, Default, Clone)]
+pub struct Forks {
+    pub genesis: Fork,
+    pub altair: Fork,
+    pub bellatrix: Fork,
+    pub capella: Fork,
+    pub deneb: Fork,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone)]
+pub struct Fork {
+    pub epoch: u64,
+    pub fork_version: FixedBytes<4>,
+}
+
 pub struct GenericUpdate {
     pub attested_header: Header,
     pub sync_aggregate: SyncAggregate,

consensus-core/src/utils.rs

@@ -1,11 +1,10 @@
 use alloy::primitives::B256;
-use common::config::types::Forks;
 use eyre::Result;
 use ssz_types::{BitVector, FixedVector};
 use tree_hash::TreeHash;
 use tree_hash_derive::TreeHash;
 
-use crate::types::{bls::PublicKey, SyncCommittee};
+use crate::types::{bls::PublicKey, Forks, SyncCommittee};
 
 pub fn compute_committee_sign_root(header: B256, fork_data_root: B256) -> B256 {
     let domain_type = [7, 00, 00, 00];