Realtime Subscription RPCs

bin/citrea/src/eth.rs

@@ -6,13 +6,15 @@ use sov_modules_api::default_context::DefaultContext;
 use sov_prover_storage_manager::SnapshotManager;
 use sov_rollup_interface::services::da::DaService;
 use sov_state::ProverStorage;
+use tokio::sync::broadcast;
 
 // register ethereum methods.
 pub(crate) fn register_ethereum<Da: DaService>(
     da_service: Da,
     storage: ProverStorage<sov_state::DefaultStorageSpec, SnapshotManager>,
     methods: &mut jsonrpsee::RpcModule<()>,
     sequencer_client_url: Option<String>,
+    soft_confirmation_rx: Option<broadcast::Receiver<u64>>,
 ) -> Result<(), anyhow::Error> {
     let eth_rpc_config = {
         let eth_signer = eth_dev_signer();
@@ -28,6 +30,7 @@ pub(crate) fn register_ethereum<Da: DaService>(
         eth_rpc_config,
         storage,
         sequencer_client_url,
+        soft_confirmation_rx,
     );
     methods
         .merge(ethereum_rpc)

bin/citrea/src/rollup/bitcoin.rs

@@ -18,6 +18,7 @@ use sov_rollup_interface::da::DaVerifier;
 use sov_rollup_interface::zk::{Zkvm, ZkvmHost};
 use sov_state::{DefaultStorageSpec, Storage, ZkStorage};
 use sov_stf_runner::{FullNodeConfig, ProverConfig};
+use tokio::sync::broadcast;
 use tracing::instrument;
 
 use crate::CitreaRollupBlueprint;
@@ -61,6 +62,7 @@ impl RollupBlueprint for BitcoinRollup {
         ledger_db: &LedgerDB,
         da_service: &Self::DaService,
         sequencer_client_url: Option<String>,
+        soft_confirmation_rx: Option<broadcast::Receiver<u64>>,
     ) -> Result<jsonrpsee::RpcModule<()>, anyhow::Error> {
         // unused inside register RPC
         let sov_sequencer = Address::new([0; 32]);
@@ -77,6 +79,7 @@ impl RollupBlueprint for BitcoinRollup {
             storage.clone(),
             &mut rpc_methods,
             sequencer_client_url,
+            soft_confirmation_rx,
         )?;
 
         Ok(rpc_methods)

bin/citrea/src/rollup/mock.rs

@@ -14,6 +14,7 @@ use sov_prover_storage_manager::ProverStorageManager;
 use sov_rollup_interface::zk::{Zkvm, ZkvmHost};
 use sov_state::{DefaultStorageSpec, Storage, ZkStorage};
 use sov_stf_runner::{FullNodeConfig, ProverConfig};
+use tokio::sync::broadcast;
 
 use crate::CitreaRollupBlueprint;
 
@@ -55,6 +56,7 @@ impl RollupBlueprint for MockDemoRollup {
         ledger_db: &LedgerDB,
         da_service: &Self::DaService,
         sequencer_client_url: Option<String>,
+        soft_confirmation_rx: Option<broadcast::Receiver<u64>>,
     ) -> Result<jsonrpsee::RpcModule<()>, anyhow::Error> {
         // TODO set the sequencer address
         let sequencer = Address::new([0; 32]);
@@ -71,6 +73,7 @@ impl RollupBlueprint for MockDemoRollup {
             storage.clone(),
             &mut rpc_methods,
             sequencer_client_url,
+            soft_confirmation_rx,
         )?;
 
         Ok(rpc_methods)

bin/citrea/src/rollup/mod.rs

@@ -10,6 +10,7 @@ use sov_modules_rollup_blueprint::RollupBlueprint;
 use sov_modules_stf_blueprint::{Runtime as RuntimeTrait, StfBlueprint};
 use sov_state::storage::NativeStorage;
 use sov_stf_runner::{FullNodeConfig, InitVariant, ProverConfig};
+use tokio::sync::broadcast;
 use tracing::instrument;
 mod bitcoin;
 mod mock;
@@ -43,9 +44,21 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {
         let mut storage_manager = self.create_storage_manager(&rollup_config)?;
         let prover_storage = storage_manager.create_finalized_storage()?;
 
+        let (soft_confirmation_tx, soft_confirmation_rx) = broadcast::channel(10);
+        // If subscriptions disabled, pass None
+        let soft_confirmation_rx = if rollup_config.rpc.enable_subscriptions {
+            Some(soft_confirmation_rx)
+        } else {
+            None
+        };
         // TODO(https://github.com/Sovereign-Labs/sovereign-sdk/issues/1218)
-        let rpc_methods =
-            self.create_rpc_methods(&prover_storage, &ledger_db, &da_service, None)?;
+        let rpc_methods = self.create_rpc_methods(
+            &prover_storage,
+            &ledger_db,
+            &da_service,
+            None,
+            soft_confirmation_rx,
+        )?;
 
         let native_stf = StfBlueprint::new();
 
@@ -75,6 +88,7 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {
             rollup_config.public_keys,
             ledger_db,
             rollup_config.rpc,
+            soft_confirmation_tx,
         )
         .unwrap();
 
@@ -110,12 +124,20 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {
         let prover_storage = storage_manager.create_finalized_storage()?;
 
         let runner_config = rollup_config.runner.expect("Runner config is missing");
+        let (soft_confirmation_tx, soft_confirmation_rx) = broadcast::channel(10);
+        // If subscriptions disabled, pass None
+        let soft_confirmation_rx = if rollup_config.rpc.enable_subscriptions {
+            Some(soft_confirmation_rx)
+        } else {
+            None
+        };
         // TODO(https://github.com/Sovereign-Labs/sovereign-sdk/issues/1218)
         let rpc_methods = self.create_rpc_methods(
             &prover_storage,
             &ledger_db,
             &da_service,
             Some(runner_config.sequencer_client_url.clone()),
+            soft_confirmation_rx,
         )?;
 
         let native_stf = StfBlueprint::new();
@@ -149,6 +171,7 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {
             init_variant,
             code_commitment,
             rollup_config.sync_blocks_count,
+            soft_confirmation_tx,
         )?;
 
         Ok(FullNode {
@@ -187,13 +210,21 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {
         let mut storage_manager = self.create_storage_manager(&rollup_config)?;
         let prover_storage = storage_manager.create_finalized_storage()?;
 
+        let (soft_confirmation_tx, soft_confirmation_rx) = broadcast::channel(10);
+        // If subscriptions disabled, pass None
+        let soft_confirmation_rx = if rollup_config.rpc.enable_subscriptions {
+            Some(soft_confirmation_rx)
+        } else {
+            None
+        };
         let runner_config = rollup_config.runner.expect("Runner config is missing");
         // TODO(https://github.com/Sovereign-Labs/sovereign-sdk/issues/1218)
         let rpc_methods = self.create_rpc_methods(
             &prover_storage,
             &ledger_db,
             &da_service,
             Some(runner_config.sequencer_client_url.clone()),
+            soft_confirmation_rx,
         )?;
 
         let native_stf = StfBlueprint::new();
@@ -229,6 +260,7 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {
             Some(prover_config),
             code_commitment,
             rollup_config.sync_blocks_count,
+            soft_confirmation_tx,
         )?;
 
         Ok(Prover {

bin/citrea/src/test_rpc.rs

@@ -99,6 +99,8 @@ fn test_helper(
             max_request_body_size: 10 * 1024 * 1024,
             max_response_body_size: 10 * 1024 * 1024,
             batch_requests_limit: 50,
+            enable_subscriptions: true,
+            max_subscriptions_per_connection: 100,
         };
 
         queries_test_runner(test_queries, rpc_config).await;

bin/citrea/tests/evm/mod.rs

@@ -20,6 +20,7 @@ use crate::{
 
 mod archival_state;
 mod gas_price;
+mod subscription;
 mod tracing;
 
 #[tokio::test(flavor = "multi_thread")]