Add timeboost-config.

twittner · twittner · commit 3ac7bd521762 · 2025-09-02T12:20:17.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,7 @@ members = [
     "tests",
     "timeboost",
     "timeboost-builder",
+    "timeboost-config",
     "timeboost-contract",
     "timeboost-crypto",
     "timeboost-proto",
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -23,10 +23,6 @@ sailfish = { path = "../sailfish", features = ["test"] }
 sailfish-types = { path = "../sailfish-types" }
 serde = { workspace = true }
 timeboost = { path = "../timeboost" }
-timeboost-builder = { path = "../timeboost-builder" }
-timeboost-crypto = { path = "../timeboost-crypto" }
-timeboost-sequencer = { path = "../timeboost-sequencer" }
-timeboost-types = { path = "../timeboost-types" }
 timeboost-utils = { path = "../timeboost-utils", features = ["test"] }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
diff --git a/tests/src/tests/timeboost.rs b/tests/src/tests/timeboost.rs
@@ -11,11 +11,12 @@ use cliquenet::{Address, AddressableCommittee};
 use multisig::Keypair;
 use multisig::{Committee, x25519};
 use sailfish_types::UNKNOWN_COMMITTEE_ID;
+use timeboost::builder::CertifierConfig;
+use timeboost::conf::{ChainConfig, ParentChain};
+use timeboost::crypto::prelude::DkgDecKey;
+use timeboost::sequencer::SequencerConfig;
 use timeboost::types::BundleVariant;
-use timeboost_builder::CertifierConfig;
-use timeboost_crypto::prelude::DkgDecKey;
-use timeboost_sequencer::SequencerConfig;
-use timeboost_types::{ChainConfig, DecryptionKeyCell, KeyStore, ParentChain};
+use timeboost::types::{DecryptionKeyCell, KeyStore};
 use timeboost_utils::load_generation::make_bundle;
 use tokio::sync::broadcast;
 use tokio::time::{Duration, sleep};
diff --git a/tests/src/tests/timeboost/handover.rs b/tests/src/tests/timeboost/handover.rs
@@ -14,9 +14,10 @@ use sailfish::consensus::Consensus;
 use sailfish::rbc::Rbc;
 use sailfish::types::{ConsensusTime, RoundNumber, Timestamp};
 use sailfish::{Coordinator, Event};
-use timeboost_crypto::prelude::DkgDecKey;
-use timeboost_sequencer::SequencerConfig;
-use timeboost_types::{ChainConfig, DecryptionKeyCell, KeyStore, ParentChain};
+use timeboost::conf::{ChainConfig, ParentChain};
+use timeboost::crypto::prelude::DkgDecKey;
+use timeboost::sequencer::SequencerConfig;
+use timeboost::types::{DecryptionKeyCell, KeyStore};
 use timeboost_utils::types::logging::init_logging;
 use tokio::select;
 use tokio::sync::{broadcast, mpsc};
diff --git a/tests/src/tests/timeboost/transaction_order.rs b/tests/src/tests/timeboost/transaction_order.rs
@@ -6,7 +6,7 @@ use std::time::Duration;
 use alloy::primitives::B256;
 use metrics::NoMetrics;
 use sailfish_types::RoundNumber;
-use timeboost_sequencer::{Output, Sequencer};
+use timeboost::sequencer::{Output, Sequencer};
 use timeboost_utils::types::logging::init_logging;
 use tokio::select;
 use tokio::sync::broadcast::error::RecvError;
diff --git a/timeboost-config/Cargo.toml b/timeboost-config/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "timeboost-config"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+alloy = { workspace = true }
+anyhow = { workspace = true }
+ark-std = { workspace = true }
+bon = { workspace = true }
+clap = { workspace = true }
+cliquenet = { path = "../cliquenet" }
+jiff = { workspace = true }
+multisig = { path = "../multisig" }
+rand = { workspace = true }
+secp256k1 = { workspace = true }
+serde = { workspace = true }
+thiserror = { workspace = true }
+timeboost-crypto = { path = "../timeboost-crypto" }
+tokio = { workspace = true }
+toml = { workspace = true }
+tracing = { workspace = true }
+url = { workspace = true }
+
+[[bin]]
+name = "mkconfig"
+path = "src/binaries/mkconfig.rs"
diff --git a/timeboost-config/src/binaries/mkconfig.rs b/timeboost-config/src/binaries/mkconfig.rs
@@ -11,13 +11,12 @@ use clap::{Parser, ValueEnum};
 use cliquenet::Address;
 use multisig::x25519;
 use secp256k1::rand::SeedableRng as _;
-use timeboost_crypto::prelude::{DkgDecKey, DkgEncKey};
-use timeboost_types::{ChainConfig, ParentChain};
-use timeboost_utils::config::{
+use timeboost_config::{ChainConfig, ParentChain};
+use timeboost_config::{
     CommitteeConfig, CommitteeMember, InternalNet, NodeConfig, NodeKeyConfig, NodeKeypairConfig,
     NodeNetConfig, PublicNet,
 };
-use timeboost_utils::types::logging;
+use timeboost_crypto::prelude::{DkgDecKey, DkgEncKey};
 use url::Url;
 
 #[derive(Clone, Debug, Parser)]
@@ -205,8 +204,6 @@ impl Args {
 }
 
 fn main() -> Result<()> {
-    logging::init_logging();
-
     let args = Args::parse();
     args.mk_config()?;
 
diff --git a/timeboost-config/src/chain.rs b/timeboost-config/src/chain.rs
@@ -1,13 +1,9 @@
 use alloy::eips::BlockNumberOrTag;
-use alloy::network::EthereumWallet;
 use alloy::primitives::Address;
-use alloy::providers::ProviderBuilder;
 use bon::Builder;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
-use crate::{HttpProvider, HttpProviderWithWallet};
-
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Builder)]
 pub struct ChainConfig {
     namespace: u64,
@@ -53,14 +49,4 @@ impl ParentChain {
     pub fn key_manager_contract(&self) -> &Address {
         &self.key_manager_contract
     }
-
-    pub fn provider(&self) -> HttpProvider {
-        ProviderBuilder::new().connect_http(self.rpc_url.clone())
-    }
-
-    pub fn provider_with_wallet(&self, wallet: EthereumWallet) -> HttpProviderWithWallet {
-        ProviderBuilder::new()
-            .wallet(wallet)
-            .connect_http(self.rpc_url.clone())
-    }
 }
diff --git a/timeboost-config/src/lib.rs b/timeboost-config/src/lib.rs
@@ -3,9 +3,12 @@ use cliquenet::Address;
 use multisig::x25519;
 use serde::{Deserialize, Serialize};
 use timeboost_crypto::prelude::{DkgDecKey, DkgEncKey};
-use timeboost_types::ChainConfig;
 use tracing::error;
 
+mod chain;
+
+pub use chain::{ChainConfig, ChainConfigBuilder, ParentChain, ParentChainBuilder};
+
 pub const DECRYPTER_PORT_OFFSET: u16 = 1;
 pub const CERTIFIER_PORT_OFFSET: u16 = 2;
 
diff --git a/timeboost-contract/Cargo.toml b/timeboost-contract/Cargo.toml
@@ -20,6 +20,7 @@ bincode = { workspace = true }
 clap = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true }
+timeboost-config = { path = "../timeboost-config" }
 timeboost-types = { path = "../timeboost-types" }
 timeboost-utils = { path = "../timeboost-utils" }
 tokio = { workspace = true }
diff --git a/timeboost-contract/src/binaries/register.rs b/timeboost-contract/src/binaries/register.rs
@@ -7,8 +7,9 @@ use alloy::{
 use anyhow::{Context, Result, bail};
 use clap::Parser;
 use std::path::PathBuf;
+use timeboost_config::CommitteeConfig;
 use timeboost_contract::{CommitteeMemberSol, KeyManager, provider::build_provider};
-use timeboost_utils::{config::CommitteeConfig, types::logging};
+use timeboost_utils::types::logging;
 use tracing::info;
 use url::Url;
 
diff --git a/timeboost-sequencer/Cargo.toml b/timeboost-sequencer/Cargo.toml
@@ -22,6 +22,7 @@ parking_lot = { workspace = true }
 sailfish = { path = "../sailfish" }
 serde = { workspace = true }
 thiserror = { workspace = true }
+timeboost-config = { path = "../timeboost-config" }
 timeboost-crypto = { path = "../timeboost-crypto" }
 timeboost-types = { path = "../timeboost-types" }
 timeboost-utils = { path = "../timeboost-utils" }
diff --git a/timeboost-sequencer/src/config.rs b/timeboost-sequencer/src/config.rs
@@ -4,8 +4,9 @@ use cliquenet::AddressableCommittee;
 use multisig::{Keypair, PublicKey, x25519};
 use sailfish::rbc::RbcConfig;
 use sailfish::types::CommitteeVec;
+use timeboost_config::ChainConfig;
 use timeboost_crypto::prelude::DkgDecKey;
-use timeboost_types::{Address, ChainConfig, DecryptionKeyCell, DelayedInboxIndex, KeyStore};
+use timeboost_types::{Address, DecryptionKeyCell, DelayedInboxIndex, KeyStore};
 
 #[derive(Debug, Clone, Builder)]
 pub struct SequencerConfig {
diff --git a/timeboost-sequencer/src/delayed_inbox.rs b/timeboost-sequencer/src/delayed_inbox.rs
@@ -8,7 +8,8 @@ use alloy::rpc::types::{BlockId, BlockNumberOrTag, Filter};
 use alloy::sol;
 use alloy::sol_types::SolEvent;
 use multisig::PublicKey;
-use timeboost_types::{ChainConfig, HttpProvider};
+use timeboost_config::ChainConfig;
+use timeboost_types::HttpProvider;
 use tokio::time::sleep;
 use tracing::{error, info, warn};
 
diff --git a/timeboost-types/src/lib.rs b/timeboost-types/src/lib.rs
@@ -2,7 +2,6 @@ mod block;
 mod bundle;
 mod bytes;
 mod candidate_list;
-mod chain_config;
 mod decryption;
 mod delayed_inbox;
 mod inclusion_list;
@@ -22,14 +21,14 @@ pub use bundle::{
 };
 pub use bytes::Bytes;
 pub use candidate_list::{CandidateList, CandidateListBytes};
-pub use chain_config::{ChainConfig, ChainConfigBuilder, ParentChain, ParentChainBuilder};
 pub use decryption::{
     AccumulatorMode, DecryptionKey, DecryptionKeyCell, DkgAccumulator, DkgSubset, KeyStore,
     KeyStoreVec, ResultIter,
 };
 pub use delayed_inbox::DelayedInboxIndex;
 pub use inclusion_list::InclusionList;
 pub use provider::{HttpProvider, HttpProviderWithWallet, TestProviderWithWallet};
+pub use provider::{provider, provider_with_wallet};
 pub use retry_list::RetryList;
 pub use seqno::SeqNo;
 pub use time::{ConsensusTime, Epoch, HasTime, Timestamp};
diff --git a/timeboost-types/src/provider.rs b/timeboost-types/src/provider.rs
@@ -1,12 +1,13 @@
 use alloy::{
     network::{Ethereum, EthereumWallet},
     providers::{
-        RootProvider,
+        ProviderBuilder, RootProvider,
         fillers::{FillProvider, JoinFill, WalletFiller},
         layers::AnvilProvider,
         utils::JoinedRecommendedFillers,
     },
 };
+use url::Url;
 
 /// Type alias that connects to providers with recommended fillers and wallet
 /// use `<HttpProviderWithWallet as WalletProvider>::wallet()` to access internal wallet
@@ -27,3 +28,13 @@ pub type TestProviderWithWallet = FillProvider<
     AnvilProvider<RootProvider>,
     Ethereum,
 >;
+
+pub fn provider(rpc: &Url) -> HttpProvider {
+    ProviderBuilder::new().connect_http(rpc.clone())
+}
+
+pub fn provider_with_wallet(rpc: &Url, wallet: EthereumWallet) -> HttpProviderWithWallet {
+    ProviderBuilder::new()
+        .wallet(wallet)
+        .connect_http(rpc.clone())
+}
diff --git a/timeboost-utils/Cargo.toml b/timeboost-utils/Cargo.toml
@@ -43,7 +43,3 @@ toml = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 url = { workspace = true }
-
-[[bin]]
-name = "mkconfig"
-path = "src/binaries/mkconfig.rs"
diff --git a/timeboost-utils/src/lib.rs b/timeboost-utils/src/lib.rs
@@ -1,4 +1,3 @@
-pub mod config;
 pub mod load_generation;
 pub mod types;
 pub mod until;
diff --git a/timeboost/Cargo.toml b/timeboost/Cargo.toml
@@ -37,6 +37,7 @@ serde_bytes = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 timeboost-builder = { path = "../timeboost-builder" }
+timeboost-config = { path = "../timeboost-config" }
 timeboost-contract = { path = "../timeboost-contract" }
 timeboost-crypto = { path = "../timeboost-crypto" }
 timeboost-proto = { path = "../timeboost-proto" }
diff --git a/timeboost/src/binaries/sailfish.rs b/timeboost/src/binaries/sailfish.rs
@@ -13,8 +13,9 @@ use sailfish::{
     types::{Action, HasTime, Timestamp, UNKNOWN_COMMITTEE_ID},
 };
 use serde::{Deserialize, Serialize};
+use timeboost::conf::NodeConfig;
 use timeboost_contract::{CommitteeMemberSol, KeyManager};
-use timeboost_utils::config::NodeConfig;
+use timeboost_types::provider;
 use timeboost_utils::types::logging;
 use tokio::{select, signal, time::sleep};
 use tracing::{error, info};
@@ -91,7 +92,7 @@ async fn main() -> Result<()> {
     let dh_keypair = x25519::Keypair::from(config.keys.dh.secret.clone());
 
     // syncing with contract to get peers keys and network addresses
-    let provider = config.chain.parent().provider();
+    let provider = provider(config.chain.parent().rpc_url());
     assert_eq!(
         provider.get_chain_id().await?,
         config.chain.parent().chain_id(),
diff --git a/timeboost/src/binaries/timeboost.rs b/timeboost/src/binaries/timeboost.rs
@@ -9,7 +9,7 @@ use timeboost::{Timeboost, TimeboostConfig};
 use timeboost_builder::robusta;
 use timeboost_contract::{CommitteeMemberSol, KeyManager};
 use timeboost_crypto::prelude::DkgEncKey;
-use timeboost_types::{DecryptionKeyCell, KeyStore};
+use timeboost_types::{DecryptionKeyCell, KeyStore, provider};
 use tokio::select;
 use tokio::signal;
 use tokio::task::spawn;
@@ -21,8 +21,8 @@ use anyhow::ensure;
 use timeboost_utils::until::run_until;
 
 use clap::Parser;
+use timeboost::conf::{CERTIFIER_PORT_OFFSET, DECRYPTER_PORT_OFFSET, NodeConfig};
 use timeboost::types::UNKNOWN_COMMITTEE_ID;
-use timeboost_utils::config::{CERTIFIER_PORT_OFFSET, DECRYPTER_PORT_OFFSET, NodeConfig};
 use timeboost_utils::types::logging;
 use timeboost_utils::wait_for_live_peer;
 use tracing::warn;
@@ -108,7 +108,7 @@ async fn main() -> Result<()> {
     let dh_keypair = x25519::Keypair::from(node_config.keys.dh.secret.clone());
 
     // syncing with contract to get peers keys and network addresses
-    let provider = node_config.chain.parent().provider();
+    let provider = provider(node_config.chain.parent().rpc_url());
     assert_eq!(
         provider.get_chain_id().await?,
         node_config.chain.parent().chain_id(),
diff --git a/timeboost/src/config.rs b/timeboost/src/config.rs
diff --git a/timeboost/src/lib.rs b/timeboost/src/lib.rs
diff --git a/yapper/src/main.rs b/yapper/src/main.rs
