runtime upgrade

Cargo.toml

@@ -3,6 +3,7 @@ members = [
 	"consensus",
 	"message-broker",
 	"network",
+	"parachain-upgrade",
 	"primitives",
 	"runtime",
 	"test/runtime",

collator/Cargo.toml

@@ -18,11 +18,14 @@ sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cumulus-br
 # Polkadot dependencies
 polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
 polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
 polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
+polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
 
 # Cumulus dependencies
 cumulus-consensus = { path = "../consensus" }
 cumulus-runtime = { path = "../runtime" }
+cumulus-primitives = { path = "../primitives" }
 
 # Other dependencies
 log = "0.4.8"

collator/src/lib.rs

@@ -16,13 +16,17 @@
 
 //! Cumulus Collator implementation for Substrate.
 
+use cumulus_primitives::{
+	inherents::VALIDATION_FUNCTION_PARAMS_IDENTIFIER as VFP_IDENT,
+	validation_function_params::ValidationFunctionParams,
+};
 use cumulus_runtime::ParachainBlockData;
 
 use sp_consensus::{
 	BlockImport, BlockImportParams, BlockOrigin, Environment, Error as ConsensusError,
 	ForkChoiceStrategy, Proposal, Proposer, RecordProof,
 };
-use sp_inherents::InherentDataProviders;
+use sp_inherents::{InherentData, InherentDataProviders};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, HashFor};
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sc_client_api::{StateBackend, UsageProvider, Finalizer, BlockchainEvents};
@@ -77,6 +81,38 @@ impl<Block, PF, BI> Collator<Block, PF, BI> {
 			block_import: Arc::new(Mutex::new(block_import)),
 		}
 	}
+
+	/// Get the inherent data with validation function parameters injected
+	fn inherent_data(
+		inherent_providers: InherentDataProviders,
+		global_validation: GlobalValidationSchedule,
+		local_validation: LocalValidationData,
+	) -> Result<InherentData, InvalidHead> {
+		let mut inherent_data = inherent_providers
+			.create_inherent_data()
+			.map_err(|e| {
+				error!(
+					target: "cumulus-collator",
+					"Failed to create inherent data: {:?}",
+					e,
+				);
+				InvalidHead
+			})?;
+
+		inherent_data.put_data(
+			VFP_IDENT,
+			&ValidationFunctionParams::from((global_validation, local_validation))
+		).map_err(|e| {
+			error!(
+				target: "cumulus-collator",
+				"Failed to inject validation function params into inherents: {:?}",
+				e,
+			);
+			InvalidHead
+		})?;
+
+		Ok(inherent_data)
+	}
 }
 
 impl<Block, PF, BI> Clone for Collator<Block, PF, BI> {
@@ -112,7 +148,7 @@ where
 	fn produce_candidate(
 		&mut self,
 		_relay_chain_parent: PHash,
-		_global_validation: GlobalValidationSchedule,
+		global_validation: GlobalValidationSchedule,
 		local_validation: LocalValidationData,
 	) -> Self::ProduceCandidate {
 		let factory = self.proposer_factory.clone();
@@ -147,16 +183,7 @@ where
 					InvalidHead
 				})?;
 
-			let inherent_data = inherent_providers
-				.create_inherent_data()
-				.map_err(|e| {
-					error!(
-						target: "cumulus-collator",
-						"Failed to create inherent data: {:?}",
-						e,
-					);
-					InvalidHead
-				})?;
+			let inherent_data = Self::inherent_data(inherent_providers, global_validation, local_validation)?;
 
 			let Proposal {
 				block,

parachain-upgrade/Cargo.toml

@@ -0,0 +1,47 @@
+[package]
+name = "cumulus-parachain-upgrade"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+description = "pallet to manage parachain upgrades"
+
+[features]
+default = ['std']
+std = [
+	'serde',
+	'codec/std',
+	'frame-support/std',
+	'pallet-balances/std',
+	'cumulus-runtime/std',
+	'sp-core/std',
+	'sp-runtime/std',
+	'sp-io/std',
+	'system/std',
+	'cumulus-primitives/std',
+]
+
+[dependencies]
+# Cumulus dependencies
+cumulus-primitives = { path = "../primitives", default-features = false }
+cumulus-runtime = { path = "../runtime", default-features = false }
+
+# Polkadot dependencies
+parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch", default-features = false }
+
+# Substrate dependencies
+frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", version = "2.0.0-dev", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }
+system = { package = "frame-system", git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }
+
+# Other Dependencies
+codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"]}
+serde = { version = "1.0.101", optional = true, features = ["derive"] }
+
+[dev-dependencies]
+sp-externalities = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }
+substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }