Merge pull request paritytech#286 from subspace/prepare-fraud-proof

Prepare the fraud proof implementation

Author: liuchengxu

cumulus/client/cirrus-executor/src/bundler.rs

@@ -17,8 +17,8 @@ use subspace_runtime_primitives::Hash as PHash;
 
 use super::{Executor, LOG_TARGET};
 
-impl<Block, Client, TransactionPool, Backend, CIDP>
-	Executor<Block, Client, TransactionPool, Backend, CIDP>
+impl<Block, Client, TransactionPool, Backend, CIDP, E>
+	Executor<Block, Client, TransactionPool, Backend, CIDP, E>
 where
 	Block: BlockT,
 	Client: sp_blockchain::HeaderBackend<Block> + BlockBackend<Block> + ProvideRuntimeApi<Block>,

cumulus/client/cirrus-executor/src/lib.rs

@@ -29,7 +29,7 @@ use sc_utils::mpsc::TracingUnboundedSender;
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_consensus::BlockStatus;
-use sp_core::traits::SpawnNamed;
+use sp_core::traits::{CodeExecutor, SpawnNamed};
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{
 	generic::BlockId,
@@ -62,22 +62,23 @@ use tracing::Instrument;
 const LOG_TARGET: &str = "cirrus::executor";
 
 /// The implementation of the Cirrus `Executor`.
-pub struct Executor<Block: BlockT, Client, TransactionPool, Backend, CIDP> {
+pub struct Executor<Block: BlockT, Client, TransactionPool, Backend, CIDP, E> {
 	// TODO: no longer used in executor, revisit this with ParachainBlockImport together.
 	parachain_consensus: Box<dyn ParachainConsensus<Block>>,
 	client: Arc<Client>,
-	spawner: Arc<dyn SpawnNamed + Send + Sync>,
+	spawner: Box<dyn SpawnNamed + Send + Sync>,
 	overseer_handle: OverseerHandle,
 	transaction_pool: Arc<TransactionPool>,
 	bundle_sender: Arc<TracingUnboundedSender<Bundle<Block::Extrinsic>>>,
 	execution_receipt_sender: Arc<TracingUnboundedSender<ExecutionReceipt<Block::Hash>>>,
 	backend: Arc<Backend>,
 	create_inherent_data_providers: Arc<CIDP>,
+	code_executor: Arc<E>,
 	is_authority: bool,
 }
 
-impl<Block: BlockT, Client, TransactionPool, Backend, CIDP> Clone
-	for Executor<Block, Client, TransactionPool, Backend, CIDP>
+impl<Block: BlockT, Client, TransactionPool, Backend, CIDP, E> Clone
+	for Executor<Block, Client, TransactionPool, Backend, CIDP, E>
 {
 	fn clone(&self) -> Self {
 		Self {
@@ -90,13 +91,14 @@ impl<Block: BlockT, Client, TransactionPool, Backend, CIDP> Clone
 			execution_receipt_sender: self.execution_receipt_sender.clone(),
 			backend: self.backend.clone(),
 			create_inherent_data_providers: self.create_inherent_data_providers.clone(),
+			code_executor: self.code_executor.clone(),
 			is_authority: self.is_authority,
 		}
 	}
 }
 
-impl<Block, Client, TransactionPool, Backend, CIDP>
-	Executor<Block, Client, TransactionPool, Backend, CIDP>
+impl<Block, Client, TransactionPool, Backend, CIDP, E>
+	Executor<Block, Client, TransactionPool, Backend, CIDP, E>
 where
 	Block: BlockT,
 	Client: HeaderBackend<Block> + BlockBackend<Block> + AuxStore + ProvideRuntimeApi<Block>,
@@ -114,18 +116,20 @@ where
 	Backend: sc_client_api::Backend<Block> + Send + Sync + 'static,
 	TransactionPool: sc_transaction_pool_api::TransactionPool<Block = Block> + 'static,
 	CIDP: CreateInherentDataProviders<Block, Hash> + 'static,
+	E: CodeExecutor,
 {
 	/// Create a new instance.
 	fn new(
 		parachain_consensus: Box<dyn ParachainConsensus<Block>>,
 		client: Arc<Client>,
-		spawner: Arc<dyn SpawnNamed + Send + Sync>,
+		spawner: Box<dyn SpawnNamed + Send + Sync>,
 		overseer_handle: OverseerHandle,
 		transaction_pool: Arc<TransactionPool>,
 		bundle_sender: Arc<TracingUnboundedSender<Bundle<Block::Extrinsic>>>,
 		execution_receipt_sender: Arc<TracingUnboundedSender<ExecutionReceipt<Block::Hash>>>,
 		backend: Arc<Backend>,
 		create_inherent_data_providers: Arc<CIDP>,
+		code_executor: Arc<E>,
 		is_authority: bool,
 	) -> Self {
 		Self {
@@ -138,6 +142,7 @@ where
 			execution_receipt_sender,
 			backend,
 			create_inherent_data_providers,
+			code_executor,
 			is_authority,
 		}
 	}
@@ -364,8 +369,8 @@ pub enum GossipMessageError {
 	SendError,
 }
 
-impl<Block, Client, TransactionPool, Backend, CIDP> GossipMessageHandler<Block>
-	for Executor<Block, Client, TransactionPool, Backend, CIDP>
+impl<Block, Client, TransactionPool, Backend, CIDP, E> GossipMessageHandler<Block>
+	for Executor<Block, Client, TransactionPool, Backend, CIDP, E>
 where
 	Block: BlockT,
 	Client: HeaderBackend<Block>
@@ -389,6 +394,7 @@ where
 	Backend: sc_client_api::Backend<Block> + Send + Sync + 'static,
 	TransactionPool: sc_transaction_pool_api::TransactionPool<Block = Block> + 'static,
 	CIDP: CreateInherentDataProviders<Block, Hash> + 'static,
+	E: CodeExecutor,
 {
 	type Error = GossipMessageError;
 
@@ -525,22 +531,23 @@ where
 }
 
 /// Parameters for [`start_executor`].
-pub struct StartExecutorParams<Block: BlockT, Spawner, Client, TransactionPool, Backend, CIDP> {
+pub struct StartExecutorParams<Block: BlockT, Spawner, Client, TransactionPool, Backend, CIDP, E> {
 	pub client: Arc<Client>,
 	pub announce_block: Arc<dyn Fn(Block::Hash, Option<Vec<u8>>) + Send + Sync>,
 	pub overseer_handle: OverseerHandle,
-	pub spawner: Spawner,
+	pub spawner: Box<Spawner>,
 	pub parachain_consensus: Box<dyn ParachainConsensus<Block>>,
 	pub transaction_pool: Arc<TransactionPool>,
 	pub bundle_sender: TracingUnboundedSender<Bundle<Block::Extrinsic>>,
 	pub execution_receipt_sender: TracingUnboundedSender<ExecutionReceipt<Block::Hash>>,
 	pub backend: Arc<Backend>,
 	pub create_inherent_data_providers: Arc<CIDP>,
+	pub code_executor: Arc<E>,
 	pub is_authority: bool,
 }
 
 /// Start the executor.
-pub async fn start_executor<Block, Spawner, Client, TransactionPool, Backend, CIDP>(
+pub async fn start_executor<Block, Spawner, Client, TransactionPool, Backend, CIDP, E>(
 	StartExecutorParams {
 		client,
 		announce_block: _,
@@ -552,9 +559,10 @@ pub async fn start_executor<Block, Spawner, Client, TransactionPool, Backend, CI
 		execution_receipt_sender,
 		backend,
 		create_inherent_data_providers,
+		code_executor,
 		is_authority,
-	}: StartExecutorParams<Block, Spawner, Client, TransactionPool, Backend, CIDP>,
-) -> Executor<Block, Client, TransactionPool, Backend, CIDP>
+	}: StartExecutorParams<Block, Spawner, Client, TransactionPool, Backend, CIDP, E>,
+) -> Executor<Block, Client, TransactionPool, Backend, CIDP, E>
 where
 	Block: BlockT,
 	Backend: sc_client_api::Backend<Block> + Send + Sync + 'static,
@@ -580,17 +588,19 @@ where
 	TransactionPool:
 		sc_transaction_pool_api::TransactionPool<Block = Block> + Send + Sync + 'static,
 	CIDP: CreateInherentDataProviders<Block, Hash> + 'static,
+	E: CodeExecutor,
 {
 	let executor = Executor::new(
 		parachain_consensus,
 		client,
-		Arc::new(spawner),
+		spawner,
 		overseer_handle.clone(),
 		transaction_pool,
 		Arc::new(bundle_sender),
 		Arc::new(execution_receipt_sender),
 		backend,
 		create_inherent_data_providers,
+		code_executor,
 		is_authority,
 	);
 

cumulus/client/cirrus-executor/src/processor.rs

@@ -69,8 +69,8 @@ fn shuffle_extrinsics<Extrinsic: Debug>(
 	shuffled_extrinsics
 }
 
-impl<Block, Client, TransactionPool, Backend, CIDP>
-	Executor<Block, Client, TransactionPool, Backend, CIDP>
+impl<Block, Client, TransactionPool, Backend, CIDP, E>
+	Executor<Block, Client, TransactionPool, Backend, CIDP, E>
 where
 	Block: BlockT,
 	Client: sp_blockchain::HeaderBackend<Block>

cumulus/client/cirrus-service/src/lib.rs

@@ -36,7 +36,7 @@ use sc_utils::mpsc::tracing_unbounded;
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_consensus::BlockOrigin;
-use sp_core::traits::SpawnNamed;
+use sp_core::traits::{CodeExecutor, SpawnNamed};
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{
 	traits::{Block as BlockT, NumberFor},
@@ -49,10 +49,21 @@ use cumulus_client_consensus_common::RelaychainClient;
 pub mod genesis;
 
 /// Parameters given to [`start_executor`].
-pub struct StartExecutorParams<'a, Block: BlockT, Client, Spawner, RClient, IQ, TP, Backend, CIDP> {
+pub struct StartExecutorParams<
+	'a,
+	Block: BlockT,
+	Client,
+	Spawner,
+	RClient,
+	IQ,
+	TP,
+	Backend,
+	CIDP,
+	E,
+> {
 	pub client: Arc<Client>,
 	pub announce_block: Arc<dyn Fn(Block::Hash, Option<Vec<u8>>) + Send + Sync>,
-	pub spawner: Spawner,
+	pub spawner: Box<Spawner>,
 	pub primary_chain_full_node: subspace_service::NewFull<RClient>,
 	pub task_manager: &'a mut TaskManager,
 	pub parachain_consensus: Box<dyn ParachainConsensus<Block>>,
@@ -61,11 +72,12 @@ pub struct StartExecutorParams<'a, Block: BlockT, Client, Spawner, RClient, IQ,
 	pub network: Arc<NetworkService<Block, Block::Hash>>,
 	pub backend: Arc<Backend>,
 	pub create_inherent_data_providers: Arc<CIDP>,
+	pub code_executor: Arc<E>,
 	pub is_authority: bool,
 }
 
 /// Start an executor node.
-pub async fn start_executor<'a, Block, Client, Backend, Spawner, RClient, IQ, TP, CIDP>(
+pub async fn start_executor<'a, Block, Client, Backend, Spawner, RClient, IQ, TP, CIDP, E>(
 	StartExecutorParams {
 		client,
 		announce_block,
@@ -78,8 +90,9 @@ pub async fn start_executor<'a, Block, Client, Backend, Spawner, RClient, IQ, TP
 		network,
 		backend,
 		create_inherent_data_providers,
+		code_executor,
 		is_authority,
-	}: StartExecutorParams<'a, Block, Client, Spawner, RClient, IQ, TP, Backend, CIDP>,
+	}: StartExecutorParams<'a, Block, Client, Spawner, RClient, IQ, TP, Backend, CIDP, E>,
 ) -> sc_service::error::Result<()>
 where
 	Block: BlockT,
@@ -110,6 +123,7 @@ where
 	IQ: ImportQueue<Block> + 'static,
 	TP: TransactionPool<Block = Block> + 'static,
 	CIDP: CreateInherentDataProviders<Block, cirrus_primitives::Hash> + 'static,
+	E: CodeExecutor,
 {
 	let consensus = cumulus_client_consensus_common::run_parachain_consensus(
 		client.clone(),
@@ -141,6 +155,7 @@ where
 			execution_receipt_sender,
 			backend,
 			create_inherent_data_providers,
+			code_executor,
 			is_authority,
 		})
 		.await;

cumulus/pallets/executive/src/lib.rs

@@ -184,7 +184,7 @@ impl<
 	UnsignedValidator: ValidateUnsigned<Call = CallOf<Block::Extrinsic, Context>>,
 {
 	/// Returns the latest storage root.
-	fn storage_root() -> Vec<u8> {
+	pub fn storage_root() -> Vec<u8> {
 		let version = System::Version::get().state_version();
 		sp_io::storage::root(version)
 	}
@@ -239,7 +239,6 @@ impl<
 			AllPalletsWithSystem,
 			COnRuntimeUpgrade,
 		>::initialize_block(header);
-		Pallet::<ExecutiveConfig>::push_root(Self::storage_root());
 	}
 
 	// TODO: https://github.com/paritytech/substrate/issues/10711
@@ -307,6 +306,7 @@ impl<
 
 	/// Wrapped `frame_executive::Executive::finalize_block`.
 	pub fn finalize_block() -> System::Header {
+		Pallet::<ExecutiveConfig>::push_root(Self::storage_root());
 		frame_executive::Executive::<
 			System,
 			Block,
@@ -347,6 +347,7 @@ impl<
 	///
 	/// Note the storage root in the end.
 	pub fn apply_extrinsic(uxt: Block::Extrinsic) -> ApplyExtrinsicResult {
+		Pallet::<ExecutiveConfig>::push_root(Self::storage_root());
 		let res = frame_executive::Executive::<
 			System,
 			Block,
@@ -355,8 +356,15 @@ impl<
 			AllPalletsWithSystem,
 			COnRuntimeUpgrade,
 		>::apply_extrinsic(uxt);
-		// TODO: when the extrinsic fails, the storage root does not change, thus skip it?
-		Pallet::<ExecutiveConfig>::push_root(Self::storage_root());
+		// TODO: Critical!!! https://github.com/paritytech/substrate/pull/10922#issuecomment-1068997467
+		frame_support::log::info!(
+			target: "cirrus::runtime::executive",
+			"[apply_extrinsic] after: {:?}",
+			{
+				use codec::Decode;
+				Block::Hash::decode(&mut Self::storage_root().as_slice()).unwrap()
+			}
+		);
 		res
 	}
 

cumulus/parachain-template/node/src/service.rs

@@ -55,7 +55,7 @@ pub fn new_partial<RuntimeApi, Executor, BIQ>(
 			Block,
 			TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>,
 		>,
-		(Option<Telemetry>, Option<TelemetryWorkerHandle>),
+		(Option<Telemetry>, Option<TelemetryWorkerHandle>, NativeElseWasmExecutor<Executor>),
 	>,
 	sc_service::Error,
 >
@@ -98,7 +98,7 @@ where
 		})
 		.transpose()?;
 
-	let executor = sc_executor::NativeElseWasmExecutor::<Executor>::new(
+	let executor = NativeElseWasmExecutor::<Executor>::new(
 		config.wasm_method,
 		config.default_heap_pages,
 		config.max_runtime_instances,
@@ -109,7 +109,7 @@ where
 		sc_service::new_full_parts::<Block, RuntimeApi, _>(
 			config,
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
-			executor,
+			executor.clone(),
 		)?;
 	let client = Arc::new(client);
 
@@ -143,7 +143,7 @@ where
 		task_manager,
 		transaction_pool,
 		select_chain: (),
-		other: (telemetry, telemetry_worker_handle),
+		other: (telemetry, telemetry_worker_handle, executor),
 	};
 
 	Ok(params)
@@ -211,7 +211,7 @@ where
 
 	let params = new_partial::<RuntimeApi, Executor, BIQ>(&parachain_config, build_import_queue)?;
 
-	let (mut telemetry, _telemetry_worker_handle) = params.other;
+	let (mut telemetry, _telemetry_worker_handle, code_executor) = params.other;
 
 	let primary_chain_full_node = {
 		let span = tracing::info_span!(sc_tracing::logging::PREFIX_LOG_SPAN, name = "Primarychain");
@@ -306,13 +306,14 @@ where
 		client: client.clone(),
 		task_manager: &mut task_manager,
 		primary_chain_full_node,
-		spawner,
+		spawner: Box::new(spawner),
 		parachain_consensus,
 		import_queue,
 		transaction_pool,
 		network,
 		backend,
 		create_inherent_data_providers: Arc::new(move |_, _relay_parent| async move { Ok(()) }),
+		code_executor: Arc::new(code_executor),
 		is_authority: validator,
 	};
 

cumulus/parachain-template/runtime/src/lib.rs

@@ -432,6 +432,11 @@ impl_runtime_apis! {
 		fn intermediate_roots() -> Vec<[u8; 32]> {
 			ExecutivePallet::intermediate_roots()
 		}
+
+		fn apply_extrinsic_with_post_state_root(extrinsic: <Block as BlockT>::Extrinsic) -> Vec<u8> {
+			let _ = Executive::apply_extrinsic(extrinsic);
+			Executive::storage_root()
+		}
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]

cumulus/primitives/src/lib.rs

@@ -79,5 +79,8 @@ sp_api::decl_runtime_apis! {
 
 		/// Returns the intermediate storage roots in an encoded form.
 		fn intermediate_roots() -> Vec<[u8; 32]>;
+
+		/// Returns the storage root after applying the extrinsic.
+		fn apply_extrinsic_with_post_state_root(extrinsic: <Block as BlockT>::Extrinsic) -> Vec<u8>;
 	}
 }