From e97d2d43aec608b3b10368c300021fa0dfef2dc8 Mon Sep 17 00:00:00 2001 From: ShahakShama <70578257+ShahakShama@users.noreply.github.com> Date: Sun, 17 Nov 2024 16:15:20 +0200 Subject: [PATCH] feat(sync): add StateSync that sends requests to StateSyncRunner (#2072) --- Cargo.lock | 11 ++++++ Cargo.toml | 3 ++ crates/starknet_state_sync/Cargo.toml | 15 ++++++++ crates/starknet_state_sync/src/lib.rs | 37 +++++++++++++++++++ crates/starknet_state_sync/src/runner/mod.rs | 16 ++++++++ .../starknet_state_sync_types/src/errors.rs | 6 ++- 6 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 crates/starknet_state_sync/Cargo.toml create mode 100644 crates/starknet_state_sync/src/lib.rs create mode 100644 crates/starknet_state_sync/src/runner/mod.rs diff --git a/Cargo.lock b/Cargo.lock index b7fd64aabe..7e9e0338b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10522,6 +10522,17 @@ dependencies = [ "validator", ] +[[package]] +name = "starknet_state_sync" +version = "0.0.0" +dependencies = [ + "async-trait", + "futures", + "serde", + "starknet_sequencer_infra", + "starknet_state_sync_types", +] + [[package]] name = "starknet_state_sync_types" version = "0.0.0" diff --git a/Cargo.toml b/Cargo.toml index 58f0bf0967..cac5e602ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,6 +48,7 @@ members = [ "crates/starknet_sequencer_infra", "crates/starknet_sequencer_node", "crates/starknet_sierra_compile", + "crates/starknet_state_sync", "crates/starknet_state_sync_types", "crates/starknet_task_executor", "workspace_tests", @@ -228,6 +229,8 @@ starknet_patricia = { path = "crates/starknet_patricia", version = "0.0.0" } starknet_sequencer_infra = { path = "crates/starknet_sequencer_infra", version = "0.0.0" } starknet_sequencer_node = { path = "crates/starknet_sequencer_node", version = "0.0.0" } starknet_sierra_compile = { path = "crates/starknet_sierra_compile", version = "0.0.0" } +starknet_state_sync = { path = "crates/starknet_state_sync", version = "0.0.0" } +starknet_state_sync_types = { path = "crates/starknet_state_sync_types", version = "0.0.0" } starknet_task_executor = { path = "crates/starknet_task_executor", version = "0.0.0" } static_assertions = "1.1.0" statistical = "1.0.0" diff --git a/crates/starknet_state_sync/Cargo.toml b/crates/starknet_state_sync/Cargo.toml new file mode 100644 index 0000000000..a1959fc06a --- /dev/null +++ b/crates/starknet_state_sync/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "starknet_state_sync" +version.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true + +[lints] +workspace = true + +[dependencies] +async-trait.workspace = true +futures.workspace = true +starknet_sequencer_infra.workspace = true +starknet_state_sync_types.workspace = true diff --git a/crates/starknet_state_sync/src/lib.rs b/crates/starknet_state_sync/src/lib.rs new file mode 100644 index 0000000000..bfee2cb31c --- /dev/null +++ b/crates/starknet_state_sync/src/lib.rs @@ -0,0 +1,37 @@ +pub mod runner; + +use async_trait::async_trait; +use futures::channel::{mpsc, oneshot}; +use futures::SinkExt; +use starknet_sequencer_infra::component_definitions::ComponentRequestHandler; +use starknet_state_sync_types::communication::{StateSyncRequest, StateSyncResponse}; +use starknet_state_sync_types::errors::StateSyncError; + +use crate::runner::StateSyncRunner; + +// TODO(shahak): consider adding to config +const BUFFER_SIZE: usize = 100000; + +pub fn create_state_sync_and_runner() -> (StateSync, StateSyncRunner) { + let (request_sender, request_receiver) = mpsc::channel(BUFFER_SIZE); + (StateSync { request_sender }, StateSyncRunner { request_receiver }) +} + +pub struct StateSync { + pub request_sender: mpsc::Sender<(StateSyncRequest, oneshot::Sender)>, +} + +// TODO(shahak): Have StateSyncRunner call StateSync instead of the opposite once we stop supporting +// papyrus executable and can move the storage into StateSync. +#[async_trait] +impl ComponentRequestHandler for StateSync { + async fn handle_request(&mut self, request: StateSyncRequest) -> StateSyncResponse { + let (response_sender, response_receiver) = oneshot::channel(); + if self.request_sender.send((request, response_sender)).await.is_err() { + return StateSyncResponse::GetBlock(Err(StateSyncError::RunnerCommunicationError)); + } + response_receiver.await.unwrap_or_else(|_| { + StateSyncResponse::GetBlock(Err(StateSyncError::RunnerCommunicationError)) + }) + } +} diff --git a/crates/starknet_state_sync/src/runner/mod.rs b/crates/starknet_state_sync/src/runner/mod.rs new file mode 100644 index 0000000000..027e5c3d7c --- /dev/null +++ b/crates/starknet_state_sync/src/runner/mod.rs @@ -0,0 +1,16 @@ +use async_trait::async_trait; +use futures::channel::{mpsc, oneshot}; +use starknet_sequencer_infra::component_definitions::ComponentStarter; +use starknet_sequencer_infra::errors::ComponentError; +use starknet_state_sync_types::communication::{StateSyncRequest, StateSyncResponse}; + +pub struct StateSyncRunner { + pub request_receiver: mpsc::Receiver<(StateSyncRequest, oneshot::Sender)>, +} + +#[async_trait] +impl ComponentStarter for StateSyncRunner { + async fn start(&mut self) -> Result<(), ComponentError> { + unimplemented!() + } +} diff --git a/crates/starknet_state_sync_types/src/errors.rs b/crates/starknet_state_sync_types/src/errors.rs index 956fe539cb..264912b44c 100644 --- a/crates/starknet_state_sync_types/src/errors.rs +++ b/crates/starknet_state_sync_types/src/errors.rs @@ -1,6 +1,8 @@ use serde::{Deserialize, Serialize}; use thiserror::Error; -// This error is defined even though it's empty to be compatible with the other components. #[derive(Debug, Error, Serialize, Deserialize, Clone)] -pub enum StateSyncError {} +pub enum StateSyncError { + #[error("Communication error between StateSync and StateSyncRunner")] + RunnerCommunicationError, +}