[DNM] SSS: w/o runtime + sub api #10948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

AndreiEres wants to merge 94 commits into master from ae-wo-runtime+sub-api

+3,342 −1,261

Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

cumulus/parachains/runtimes/people/people-westend/src/lib.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -65,10 +65,6 @@ use sp_runtime::{ @@
     	ApplyExtrinsicResult,
     };
     pub use sp_runtime::{MultiAddress, Perbill, Permill};
-    use sp_statement_store::{
-    	runtime_api::{InvalidStatement, StatementSource, ValidStatement},
-    	SignatureVerificationResult, Statement,
-    };
     #[cfg(feature = "std")]
     use sp_version::NativeVersion;
     use sp_version::RuntimeVersion;
@@ Expand Down Expand Up / @@ -1146,18 +1142,6 @@ impl_runtime_apis! { @@
     		}
     	}
-    	impl sp_statement_store::runtime_api::ValidateStatement<Block> for Runtime {
-    		fn validate_statement(
-    			_source: StatementSource,
-    			statement: Statement,
-    		) -> Result<ValidStatement, InvalidStatement> {
-    			match statement.verify_signature() {
-    				SignatureVerificationResult::Invalid => Err(InvalidStatement::BadProof),
-    				_ => Ok(ValidStatement { max_count: 100_000, max_size: 1_000_000 }),
-    			}
-    		}
-    	}
     }
     cumulus_pallet_parachain_system::register_validate_block! {
@@ Expand Down @@

cumulus/polkadot-omni-node/lib/src/cli.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -218,8 +218,8 @@ pub struct Cli<Config: CliConfig> {
  
    	/// Enable the statement store.

    	///

    	/// The statement store is a store for statements validated using the runtime API

    	/// `validate_statement`. It should be enabled for chains that provide this runtime API.

    	/// The statement store reads the storage of the chain to determine if users are allowed to

    	/// store statements or not.

    	#[arg(long)]

    	pub enable_statement_store: bool,

cumulus/polkadot-omni-node/lib/src/common/mod.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,6 @@ use sp_runtime::{ @@
     	OpaqueExtrinsic,
     };
     use sp_session::SessionKeys;
-    use sp_statement_store::runtime_api::ValidateStatement;
     use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
     use sp_transaction_storage_proof::runtime_api::TransactionStorageApi;
     use std::{fmt::Debug, path::PathBuf, str::FromStr};
@@ Expand Down Expand Up / @@ -73,7 +72,6 @@ pub trait NodeRuntimeApi<Block: BlockT>: @@
     	+ TaggedTransactionQueue<Block>
     	+ OffchainWorkerApi<Block>
     	+ CollectCollationInfo<Block>
-    	+ ValidateStatement<Block>
     	+ GetParachainInfo<Block>
     	+ TransactionStorageApi<Block>
     	+ RelayParentOffsetApi<Block>
@@ Expand All / @@ -90,7 +88,6 @@ impl<T, Block: BlockT> NodeRuntimeApi<Block> for T where @@
     		+ OffchainWorkerApi<Block>
     		+ RelayParentOffsetApi<Block>
     		+ CollectCollationInfo<Block>
-    		+ ValidateStatement<Block>
     		+ GetParachainInfo<Block>
     		+ TransactionStorageApi<Block>
     {
@@ Expand Down @@

cumulus/polkadot-omni-node/lib/src/common/rpc.rs

-Original file line number
+Diff line change
@@ Expand Up @@
     		backend: Arc<Backend>,
     		pool: Arc<Pool>,
     		statement_store: Option<Arc<StatementStore>>,
+    		spawn_handle: Arc<dyn sp_core::traits::SpawnNamed>,
     	) -> sc_service::error::Result<RpcExtension>;
     }
@@ Expand All / @@ -66,6 +67,7 @@ where @@
     			sc_transaction_pool::TransactionPoolHandle<Block, ParachainClient<Block, RuntimeApi>>,
     		>,
     		statement_store: Option<Arc<sc_statement_store::Store>>,
+    		spawn_handle: Arc<dyn sp_core::traits::SpawnNamed>,
     	) -> sc_service::error::Result<RpcExtension> {
     		let build = || -> Result<RpcExtension, Box<dyn std::error::Error + Send + Sync>> {
     			let mut module = RpcExtension::new(());
@@ Expand All / @@ -74,7 +76,7 @@ where @@
     			module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
     			module.merge(StateMigration::new(client.clone(), backend).into_rpc())?;
     			if let Some(statement_store) = statement_store {
-    				module.merge(StatementStore::new(statement_store).into_rpc())?;
+    				module.merge(StatementStore::new(statement_store, spawn_handle).into_rpc())?;
     			}
     			module.merge(Dev::new(client).into_rpc())?;
@@ Expand Down @@

cumulus/polkadot-omni-node/lib/src/common/spec.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -451,18 +451,20 @@ pub(crate) trait NodeSpec: BaseNodeSpec { @@
     				);
     			}
+    			let spawn_handle = Arc::new(task_manager.spawn_handle());
     			let rpc_builder = {
     				let client = client.clone();
     				let transaction_pool = transaction_pool.clone();
     				let backend_for_rpc = backend.clone();
     				let statement_store = statement_store.clone();
     				Box::new(move |_| {
     					Self::BuildRpcExtensions::build_rpc_extensions(
     						client.clone(),
     						backend_for_rpc.clone(),
     						transaction_pool.clone(),
     						statement_store.clone(),
+    						spawn_handle.clone(),
     					)
     				})
     			};
@@ Expand Down @@

cumulus/polkadot-omni-node/lib/src/common/statement_store.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -71,7 +71,7 @@ pub(crate) fn build_statement_store<
  
    		client,

    		local_keystore,

    		parachain_config.prometheus_registry(),

    		&task_manager.spawn_handle(),

    		Box::new(task_manager.spawn_handle()),

    	)

    	.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;

    	let statement_protocol_executor = {

cumulus/polkadot-omni-node/lib/src/fake_runtime_api/utils.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -234,15 +234,6 @@ macro_rules! impl_node_runtime_apis { @@
     				}
     			}
-    			impl sp_statement_store::runtime_api::ValidateStatement<$block> for $runtime {
-    				fn validate_statement(
-    					_source: sp_statement_store::runtime_api::StatementSource,
-    					_statement: sp_statement_store::Statement,
-    				) -> Result<sp_statement_store::runtime_api::ValidStatement, sp_statement_store::runtime_api::InvalidStatement> {
-    					unimplemented!()
-    				}
-    			}
     			impl cumulus_primitives_core::TargetBlockRate<$block> for $runtime {
     				fn target_block_rate() -> u32 {
     					unimplemented!()
@@ Expand Down @@

cumulus/polkadot-omni-node/lib/src/nodes/aura.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -352,7 +352,7 @@ where @@
     				);
     			},
     		}
+    		let spawn_handle = Arc::new(task_manager.spawn_handle());
     		let rpc_extensions_builder = {
     			let client = client.clone();
     			let transaction_pool = transaction_pool.clone();
@@ Expand All / @@ -364,6 +364,7 @@ where @@
     					backend_for_rpc.clone(),
     					transaction_pool.clone(),
     					None,
+    					spawn_handle.clone(),
     				)?;
     				Ok(module)
     			})
@@ Expand Down @@

cumulus/zombienet/zombienet-sdk/tests/zombie_ci/people-westend-local-spec.json

Large diffs are not rendered by default.

cumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,11 @@ @@
     // Test that people-westend enables the statement store in the node and that statements are
     // propagated to peers.
+    use std::time::Duration;
     use anyhow::anyhow;
     use sp_core::{Bytes, Encode};
+    use sp_statement_store::{SubmitResult, TopicFilter};
     use zombienet_sdk::{subxt::ext::subxt_rpcs::rpc_params, NetworkConfigBuilder};
     #[tokio::test(flavor = "multi_thread")]
@@ Expand Down Expand Up / @@ -36,7 +39,7 @@ async fn statement_store() -> Result<(), anyhow::Error> { @@
     				.with_chain("people-westend-local")
     				.with_default_args(vec![
     					"--force-authoring".into(),
-    					"-lparachain=debug".into(),
+    					"-linfo,statement-gossip=debug,statement-store=debug".into(),
     					"--enable-statement-store".into(),
     				])
     				.with_collator(|n| n.with_name("charlie"))
@@ Expand Down Expand Up / @@ -64,40 +67,44 @@ async fn statement_store() -> Result<(), anyhow::Error> { @@
     	// Create the statement "1,2,3" signed by dave.
     	let mut statement = sp_statement_store::Statement::new();
+    	let topic = [0u8; 32]; // just a dummy topic
     	statement.set_plain_data(vec![1, 2, 3]);
+    	statement.set_topic(0, topic);
+    	statement.set_expiry_from_parts(u32::MAX, 0);
     	let dave = sp_keyring::Sr25519Keyring::Dave;
     	statement.sign_sr25519_private(&dave.pair());
     	let statement: Bytes = statement.encode().into();
+    	// Subscribe to statements with topic "topic" to dave.
+    	let stop_after_secs = 20;
+    	let mut subscription = dave_rpc
+    		.subscribe::<Bytes>(
+    			"statement_subscribeStatement",
+    			rpc_params![TopicFilter::MatchAll(
+    				vec![topic.to_vec().into()].try_into().expect("Single topic")
+    			)],
+    			"statement_unsubscribeStatement",
+    		)
+    		.await?;
     	// Submit the statement to charlie.
-    	let _: () = charlie_rpc.request("statement_submit", rpc_params![statement.clone()]).await?;
-    	// Ensure that charlie stored the statement.
-    	let charlie_dump: Vec<Bytes> = charlie_rpc.request("statement_dump", rpc_params![]).await?;
-    	if charlie_dump != vec![statement.clone()] {
-    		return Err(anyhow!("Charlie did not store the statement"));
-    	}
-    	// Query dave until it receives the statement, stop if 20 seconds passed.
-    	let query_start_time = std::time::SystemTime::now();
-    	let stop_after_secs = 20;
-    	loop {
-    		let dave_dump: Vec<Bytes> = dave_rpc.request("statement_dump", rpc_params![]).await?;
-    		if !dave_dump.is_empty() {
-    			if dave_dump != vec![statement.clone()] {
-    				return Err(anyhow!("Dave statement store is not the expected one"));
-    			}
-    			break;
-    		}
+    	let _: SubmitResult =
+    		charlie_rpc.request("statement_submit", rpc_params![statement.clone()]).await?;
-    		let elapsed =
-    			query_start_time.elapsed().map_err(|_| anyhow!("Failed to get elapsed time"))?;
-    		if elapsed.as_secs() > stop_after_secs {
-    			return Err(anyhow!("Dave did not receive the statement in time"));
-    		}
+    	let statement_bytes =
+    		tokio::time::timeout(Duration::from_secs(stop_after_secs), subscription.next())
+    			.await
+    			.expect("Should not timeout")
+    			.expect("Should receive")
+    			.expect("Should not error");
-    		tokio::time::sleep(core::time::Duration::from_secs(1)).await;
-    	}
+    	assert_eq!(statement_bytes, statement);
+    	// Now make sure no more statements are received.
+    	assert!(tokio::time::timeout(Duration::from_secs(stop_after_secs), subscription.next())
+    		.await
+    		.is_err());
+    	log::info!("Statement store test passed");
+    	log::info!("Keeping network alive");
+    	tokio::time::sleep(Duration::from_secs(24 * 60 * 60)).await;
     	Ok(())
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DNM] SSS: w/o runtime + sub api #10948

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

[DNM] SSS: w/o runtime + sub api #10948

Are you sure you want to change the base?

[DNM] SSS: w/o runtime + sub api #10948

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!