versioning

.cargo/config

@@ -1,2 +1,2 @@
 [net]
-git-fetch-with-cli = true
+git-fetch-with-cli = true

Cargo.toml

@@ -15,6 +15,7 @@ members = [
   "contracts/rust/gen-vk-contract",
   "hotshot-state-prover",
   "sequencer",
+  "types",
   "utils",
 ]
 
@@ -106,14 +107,14 @@ surf-disco = "0.8"
 tagged-base64 = "0.4"
 tide-disco = "0.8"
 thiserror = "1.0.61"
-time = "0.3"
 tracing = "0.1"
 bytesize = "1.3"
 itertools = "0.12"
 rand_chacha = "0.3"
 rand_distr = "0.4"
 reqwest = "0.12"
 serde = { version = "1.0.195", features = ["derive"] }
+serde_json = "^1.0.113"
 toml = "0.8"
 url = "2.3"
 vbs = "0.1"
@@ -123,3 +124,10 @@ zeroize = "1.7"
 committable = "0.2"
 portpicker = "0.1.1"
 pretty_assertions = "1.4"
+static_assertions = "1.1"
+num-traits = "0.2"
+derivative = "2.2"
+paste = "1.0"
+rand = "0.8.5"
+time = "0.3"
+trait-set = "0.3.0"

builder/Cargo.toml

@@ -21,6 +21,7 @@ cld = { workspace = true }
 committable = { workspace = true }
 dotenvy = { workspace = true }
 es-version = { workspace = true }
+espresso-types = { path = "../types", features = ["testing"] }
 ethers = { workspace = true }
 futures = { workspace = true }
 hotshot = { workspace = true }

builder/src/bin/permissioned-builder.rs

@@ -1,23 +1,24 @@
+use std::{
+    collections::HashMap, net::ToSocketAddrs, num::NonZeroUsize, path::PathBuf, time::Duration,
+};
+
 use anyhow::{bail, Context};
 use async_compatibility_layer::logging::{setup_backtrace, setup_logging};
 use builder::permissioned::init_node;
 use clap::Parser;
-use cld::ClDuration;
 use es_version::SEQUENCER_VERSION;
+use espresso_types::eth_signature_key::EthKeyPair;
 use ethers::types::Address;
-use hotshot_types::data::ViewNumber;
-use hotshot_types::light_client::StateSignKey;
-use hotshot_types::signature_key::BLSPrivKey;
-use hotshot_types::traits::metrics::NoMetrics;
-use hotshot_types::traits::node_implementation::ConsensusTime;
+use hotshot_types::{
+    data::ViewNumber,
+    light_client::StateSignKey,
+    signature_key::BLSPrivKey,
+    traits::{metrics::NoMetrics, node_implementation::ConsensusTime},
+};
 use libp2p::Multiaddr;
-use sequencer::persistence::no_storage::NoStorage;
-use sequencer::{eth_signature_key::EthKeyPair, Genesis};
-use sequencer::{L1Params, NetworkParams};
-use snafu::Snafu;
-use std::net::ToSocketAddrs;
-use std::num::NonZeroUsize;
-use std::{collections::HashMap, path::PathBuf, str::FromStr, time::Duration};
+use sequencer::{
+    options::parse_duration, persistence::no_storage::NoStorage, Genesis, L1Params, NetworkParams,
+};
 use url::Url;
 
 #[derive(Parser, Clone, Debug)]
@@ -189,18 +190,6 @@ pub struct PermissionedBuilderOptions {
     pub is_da: bool,
 }
 
-#[derive(Clone, Debug, Snafu)]
-pub struct ParseDurationError {
-    reason: String,
-}
-
-pub fn parse_duration(s: &str) -> Result<Duration, ParseDurationError> {
-    ClDuration::from_str(s)
-        .map(Duration::from)
-        .map_err(|err| ParseDurationError {
-            reason: err.to_string(),
-        })
-}
 impl PermissionedBuilderOptions {
     pub fn private_keys(&self) -> anyhow::Result<(BLSPrivKey, StateSignKey)> {
         if let Some(path) = &self.key_file {

builder/src/bin/permissionless-builder.rs

@@ -1,15 +1,15 @@
+use std::{num::NonZeroUsize, path::PathBuf, str::FromStr, time::Duration};
+
 use async_compatibility_layer::logging::{setup_backtrace, setup_logging};
 use builder::non_permissioned::{build_instance_state, BuilderConfig};
 use clap::Parser;
 use cld::ClDuration;
 use es_version::SEQUENCER_VERSION;
+use espresso_types::eth_signature_key::EthKeyPair;
 use hotshot::traits::ValidatedState;
-use hotshot_types::data::ViewNumber;
-use hotshot_types::traits::node_implementation::ConsensusTime;
-use sequencer::{eth_signature_key::EthKeyPair, Genesis, L1Params};
+use hotshot_types::{data::ViewNumber, traits::node_implementation::ConsensusTime};
+use sequencer::{Genesis, L1Params};
 use snafu::Snafu;
-use std::num::NonZeroUsize;
-use std::{path::PathBuf, str::FromStr, time::Duration};
 use url::Url;
 
 #[derive(Parser, Clone, Debug)]