import rollup-boost-types instead of redefining types (#46)

* get flashblocks types from rollup boost repo

* make fbutil inherit dependencies from the workspace

Author: akundaz

Cargo.toml

@@ -16,25 +16,9 @@ homepage = "https://github.com/flashbots/unichain-builder"
 authors = ["Flashbots <[email protected]>"]
 exclude = [".github/"]
 
-[package]
-name = "unichain-builder"
-description = "Next-Gen Optimism L2 Block Builder"
-version.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-license.workspace = true
-homepage.workspace = true
-repository.workspace = true
-authors.workspace = true
-exclude.workspace = true
-
-[features]
-default = ["jemalloc"]
-jemalloc = ["rblib/jemalloc"]
-debug = ["tokio/full", "tokio/tracing", "dep:console-subscriber"]
-
-[dependencies]
+[workspace.dependencies]
 rblib = { git = "https://github.com/flashbots/rblib", rev = "9eccd22047c3f8978ae022d575dca749a81684a8" }
+rollup-boost-types = { git = "https://github.com/flashbots/rollup-boost", rev = "b282527e5f46d0915d1e5bdf44338593bc8beb2d" }
 
 futures = "0.3"
 tokio = "1.46"
@@ -59,19 +43,62 @@ atomic-time = "0.1"
 
 secp256k1 = "0.30"
 jsonrpsee = "0.26.0"
-
-# debug flag
-console-subscriber = { version = "0.4", optional = true }
+console-subscriber = "0.4"
 tracing-subscriber = "0.3.20"
+dashmap = "6.1"
+orx-concurrent-vec = "3.7.0"
+
+[package]
+name = "unichain-builder"
+description = "Next-Gen Optimism L2 Block Builder"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+authors.workspace = true
+exclude.workspace = true
+
+[features]
+default = ["jemalloc"]
+jemalloc = ["rblib/jemalloc"]
+debug = ["tokio/full", "tokio/tracing", "dep:console-subscriber"]
+
+[dependencies]
+rblib = { workspace = true }
+rollup-boost-types = { workspace = true }
+
+futures = { workspace = true }
+tokio = { workspace = true }
+tokio-tungstenite = { workspace = true }
+parking_lot = { workspace = true }
+eyre = { workspace = true }
+moka = { workspace = true }
+tracing = { workspace = true }
+clap = { workspace = true }
+reqwest = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+itertools = { workspace = true }
+url = { workspace = true }
+rand = { workspace = true }
+derive_more = { workspace = true }
+shellexpand = { workspace = true }
+humantime = { workspace = true }
+atomic-time = { workspace = true }
+secp256k1 = { workspace = true }
+jsonrpsee = { workspace = true }
+console-subscriber = { workspace = true, optional = true }
+tracing-subscriber = { workspace = true }
 
 [dev-dependencies]
-rblib = { git = "https://github.com/flashbots/rblib", rev = "9eccd22047c3f8978ae022d575dca749a81684a8", features = [
-    "test-utils",
-] }
+rblib = { workspace = true, features = ["test-utils"] }
 
-dashmap = "6.1"
-orx-concurrent-vec = "3.7.0"
-itertools = "0.14"
+dashmap = { workspace = true }
+orx-concurrent-vec = { workspace = true }
+itertools = { workspace = true }
 
 [lints.rust]
 type_alias_bounds = "allow"

src/lib.rs

@@ -1,6 +1,5 @@
 mod bundle;
 mod platform;
-mod primitives;
 mod state;
 
-pub use {bundle::*, platform::*, primitives::*, state::*};
+pub use {bundle::*, platform::*, state::*};

src/main.rs

@@ -29,7 +29,6 @@ mod flashtestations;
 mod limits;
 mod platform;
 mod playground;
-mod primitives;
 mod publish;
 mod rpc;
 mod signer;

src/primitives.rs

@@ -10,7 +10,7 @@
 //!   building jobs.
 
 use {
-	crate::{Flashblocks, primitives::*},
+	crate::Flashblocks,
 	atomic_time::AtomicOptionInstant,
 	core::{net::SocketAddr, sync::atomic::Ordering},
 	futures::{SinkExt, StreamExt},
@@ -20,6 +20,11 @@ use {
 		prelude::{ext::CheckpointOpExt, *},
 		reth::node::builder::PayloadBuilderAttributes,
 	},
+	rollup_boost_types::flashblocks::{
+		ExecutionPayloadBaseV1,
+		ExecutionPayloadFlashblockDeltaV1,
+		FlashblocksPayloadV1,
+	},
 	std::{io, net::TcpListener, sync::Arc, time::Instant},
 	tokio::{
 		net::TcpStream,

src/publish.rs

@@ -1,5 +1,4 @@
 use {
-	crate::primitives::FlashblocksPayloadV1,
 	core::{
 		net::{IpAddr, Ipv4Addr, SocketAddr},
 		ops::Deref,
@@ -8,6 +7,7 @@ use {
 	futures::{FutureExt, StreamExt},
 	itertools::Itertools,
 	orx_concurrent_vec::ConcurrentVec,
+	rollup_boost_types::flashblocks::FlashblocksPayloadV1,
 	std::{sync::Arc, time::Instant},
 	tokio::{net::TcpStream, sync::oneshot, task::JoinHandle},
 	tokio_tungstenite::{

src/tests/utils/ws.rs

@@ -13,19 +13,21 @@ exclude.workspace = true
 [dependencies]
 unichain-builder = { path = "../.." }
 
-futures = "0.3"
-tokio = "1.46"
-tokio-tungstenite = "0.27"
-clap = { version = "4.4", features = ["derive", "env", "string"] }
-tracing = "0.1"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-eyre = "0.6"
-url = "2.5.2"
-rand = "0.9"
-humantime = "2.2"
-# alloy = { version = "1.0.25", features = ["full"] }
-# op-alloy = { version = "0.19", features = ["full"] }
+rollup-boost-types = { workspace = true }
+
+futures = { workspace = true }
+tokio = { workspace = true }
+tokio-tungstenite = { workspace = true }
+clap = { workspace = true }
+tracing = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+eyre = { workspace = true }
+url = { workspace = true }
+rand = { workspace = true }
+humantime = { workspace = true }
+
+# fbutil-specific dependencies
 human_format = "1.1.0"
 color-eyre = "0.6"
 chrono = "0.4.41"

tools/fbutil/Cargo.toml

@@ -5,9 +5,9 @@ use {
 	colored::Colorize,
 	futures::StreamExt,
 	human_format::Formatter,
+	rollup_boost_types::flashblocks::FlashblocksPayloadV1,
 	std::time::Instant,
 	tokio_tungstenite::{connect_async, tungstenite::Message},
-	unichain_builder::FlashblocksPayloadV1,
 };
 
 #[derive(Debug, Clone, Args)]