Same procedure as every day (#345)

cumulus/client/consensus/relay-chain/src/lib.rs

@@ -45,8 +45,8 @@ use polkadot_service::ClientHandle;
 use sc_client_api::Backend;
 use sp_api::ProvideRuntimeApi;
 use sp_consensus::{
-	BlockImport, BlockImportParams, BlockOrigin, Environment, ForkChoiceStrategy, Proposal,
+	BlockImport, BlockImportParams, BlockOrigin, EnableProofRecording, Environment,
-	Proposer, RecordProof,
+	ForkChoiceStrategy, ProofRecording, Proposal, Proposer,
 };
 use sp_inherents::{InherentData, InherentDataProviders};
 use sp_runtime::traits::{Block as BlockT, HashFor, Header as HeaderT};
@@ -162,7 +162,12 @@ where
 	RBackend: Backend<PBlock>,
 	BI: BlockImport<B> + Send + Sync,
 	PF: Environment<B> + Send + Sync,
-	PF::Proposer: Proposer<B, Transaction = BI::Transaction>,
+	PF::Proposer: Proposer<
+		B,
+		Transaction = BI::Transaction,
+		ProofRecording = EnableProofRecording,
+		Proof = <EnableProofRecording as ProofRecording>::Proof,
+	>,
 {
 	async fn produce_candidate(
 		&mut self,
@@ -191,24 +196,11 @@ where
 				Default::default(),
 				//TODO: Fix this.
 				Duration::from_millis(500),
-				RecordProof::Yes,
 			)
 			.await
 			.map_err(|e| tracing::error!(target: LOG_TARGET, error = ?e, "Proposing failed."))
 			.ok()?;
 
-		let proof = match proof {
-			Some(proof) => proof,
-			None => {
-				tracing::error!(
-					target: LOG_TARGET,
-					"Proposer did not return the requested proof.",
-				);
-
-				return None;
-			}
-		};
-
 		let (header, extrinsics) = block.clone().deconstruct();
 
 		let mut block_import_params = BlockImportParams::new(BlockOrigin::Own, header);
@@ -262,7 +254,12 @@ pub fn build_relay_chain_consensus<Block, PF, BI, RBackend>(
 where
 	Block: BlockT,
 	PF: Environment<Block> + Send + Sync + 'static,
-	PF::Proposer: Proposer<Block, Transaction = BI::Transaction>,
+	PF::Proposer: Proposer<
+		Block,
+		Transaction = BI::Transaction,
+		ProofRecording = EnableProofRecording,
+		Proof = <EnableProofRecording as ProofRecording>::Proof,
+	>,
 	BI: BlockImport<Block> + Send + Sync + 'static,
 	RBackend: Backend<PBlock> + 'static,
 	// Rust bug: https://github.com/rust-lang/rust/issues/24159
@@ -301,7 +298,12 @@ where
 	// Rust bug: https://github.com/rust-lang/rust/issues/24159
 	sc_client_api::StateBackendFor<RBackend, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 	PF: Environment<Block> + Send + Sync + 'static,
-	PF::Proposer: Proposer<Block, Transaction = BI::Transaction>,
+	PF::Proposer: Proposer<
+		Block,
+		Transaction = BI::Transaction,
+		ProofRecording = EnableProofRecording,
+		Proof = <EnableProofRecording as ProofRecording>::Proof,
+	>,
 	BI: BlockImport<Block> + Send + Sync + 'static,
 	RBackend: Backend<PBlock> + 'static,
 {
@@ -338,7 +340,12 @@ where
 	// Rust bug: https://github.com/rust-lang/rust/issues/24159
 	sc_client_api::StateBackendFor<RBackend, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 	PF: Environment<Block> + Send + Sync + 'static,
-	PF::Proposer: Proposer<Block, Transaction = BI::Transaction>,
+	PF::Proposer: Proposer<
+		Block,
+		Transaction = BI::Transaction,
+		ProofRecording = EnableProofRecording,
+		Proof = <EnableProofRecording as ProofRecording>::Proof,
+	>,
 	BI: BlockImport<Block> + Send + Sync + 'static,
 	RBackend: Backend<PBlock> + 'static,
 {

cumulus/rococo-parachains/src/service.rs

@@ -187,7 +187,7 @@ where
 	};
 
 	if validator {
-		let proposer_factory = sc_basic_authorship::ProposerFactory::new(
+		let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
 			task_manager.spawn_handle(),
 			client.clone(),
 			transaction_pool,

cumulus/test/service/src/lib.rs

@@ -216,7 +216,7 @@ where
 	};
 
 	if is_collator {
-		let proposer_factory = sc_basic_authorship::ProposerFactory::new(
+		let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
 			task_manager.spawn_handle(),
 			client.clone(),
 			transaction_pool,