diff --git a/Cargo.lock b/Cargo.lock index 9614501e4..e37c1ebd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1884,7 +1884,6 @@ dependencies = [ "lru", "sov-db", "sov-rollup-interface", - "sov-stf-runner", "tokio", ] @@ -8082,6 +8081,7 @@ name = "sequencer-client" version = "0.4.0-rc.3" dependencies = [ "anyhow", + "citrea-primitives", "hex", "jsonrpsee", "reth-primitives", diff --git a/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock b/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock index 285fa8f59..a1836e856 100644 --- a/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock +++ b/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock @@ -902,7 +902,6 @@ version = "0.4.0-rc.3" dependencies = [ "anyhow", "sov-rollup-interface", - "sov-stf-runner", ] [[package]] diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index a4c92d945..10b31e0c1 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -10,7 +10,6 @@ publish = false # Sov SDK deps sov-db = { path = "../sovereign-sdk/full-node/db/sov-db", optional = true } sov-rollup-interface = { path = "../sovereign-sdk/rollup-interface" } -sov-stf-runner = { path = "../sovereign-sdk/full-node/sov-stf-runner" } # 3rd-party deps anyhow = { workspace = true } diff --git a/crates/primitives/src/error.rs b/crates/primitives/src/error.rs index cb5225b3f..9b9635e83 100644 --- a/crates/primitives/src/error.rs +++ b/crates/primitives/src/error.rs @@ -1,5 +1,4 @@ use sov_db::schema::types::BatchNumber; -use sov_stf_runner::ProverServiceError; #[derive(Debug)] pub enum SyncError { @@ -12,9 +11,3 @@ impl From for SyncError { Self::Error(e) } } - -impl From for SyncError { - fn from(e: ProverServiceError) -> Self { - Self::Error(e.into()) - } -} diff --git a/crates/sequencer-client/Cargo.toml b/crates/sequencer-client/Cargo.toml index f27c7a270..17b3a973e 100644 --- a/crates/sequencer-client/Cargo.toml +++ b/crates/sequencer-client/Cargo.toml @@ -12,21 +12,25 @@ readme = "README.md" resolver = "2" [dependencies] -sov-rollup-interface = { path = "../sovereign-sdk/rollup-interface" } - +# 3rd-party dependencies anyhow = { workspace = true } -jsonrpsee = { workspace = true, features = ["http-client"] } -tracing = { workspace = true } - hex = { workspace = true } +jsonrpsee = { workspace = true, features = ["http-client"] } serde = { workspace = true } serde_json = { workspace = true } - tokio = { workspace = true } +tracing = { workspace = true } +# Reth Deps reth-primitives = { workspace = true } reth-rpc-types = { workspace = true } +# Sovereign-SDK deps +sov-rollup-interface = { path = "../sovereign-sdk/rollup-interface" } + +# Citrea Deps +citrea-primitives = { path = "../primitives" } + [dev-dependencies] tokio = { workspace = true } diff --git a/crates/sequencer-client/src/lib.rs b/crates/sequencer-client/src/lib.rs index 4cbeac425..81d342da3 100644 --- a/crates/sequencer-client/src/lib.rs +++ b/crates/sequencer-client/src/lib.rs @@ -1,5 +1,6 @@ use std::ops::Range; +use citrea_primitives::types::SoftConfirmationHash; use jsonrpsee::core::client::{ClientT, Error}; use jsonrpsee::http_client::{HttpClient, HttpClientBuilder}; use jsonrpsee::rpc_params; @@ -104,9 +105,9 @@ impl SequencerClient { #[serde(rename_all = "camelCase")] pub struct GetSoftBatchResponse { #[serde(with = "hex::serde")] - pub hash: [u8; 32], + pub hash: SoftConfirmationHash, #[serde(with = "hex::serde")] - pub prev_hash: [u8; 32], + pub prev_hash: SoftConfirmationHash, pub da_slot_height: u64, #[serde(with = "hex::serde")] pub da_slot_hash: [u8; 32],