Merge remote-tracking branch 'origin/master' into rococo-v1

Author: bkchr

Cargo.lock

@@ -18,6 +18,7 @@ members = [
 	"rococo-parachains/runtime",
 	"rococo-parachains/shell-runtime",
 	"test/runtime",
+	"test/runtime-upgrade",
 	"test/client",
 	"test/service",
 	"test/relay-sproof-builder",

Cargo.toml

@@ -196,6 +196,11 @@ where
 				Default::default(),
 				//TODO: Fix this.
 				Duration::from_millis(500),
+				// Set the block limit to 50% of the maximum PoV size.
+				//
+				// TODO: If we got benchmarking that includes that encapsulates the proof size,
+				// we should be able to use the maximum pov size.
+				Some((validation_data.max_pov_size / 2) as usize),
 			)
 			.await
 			.map_err(|e| tracing::error!(target: LOG_TARGET, error = ?e, "Proposing failed."))

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

@@ -258,14 +258,15 @@ decl_module! {
 		}
 
 		#[weight = 1_000_000]
-		fn enact_authorized_upgrade(origin, code: Vec<u8>) {
+		fn enact_authorized_upgrade(_origin, code: Vec<u8>) -> DispatchResultWithPostInfo {
 			// No ensure origin on purpose. We validate by checking the code vs hash in storage.
 			let required_hash = AuthorizedUpgrade::<T>::get()
 				.ok_or(Error::<T>::NothingAuthorized)?;
 			let actual_hash = T::Hashing::hash(&code[..]);
 			ensure!(actual_hash == required_hash, Error::<T>::Unauthorized);
 			Self::set_code_impl(code)?;
 			AuthorizedUpgrade::<T>::kill();
+			Ok(Pays::No.into())
 		}
 
 		fn on_finalize() {
@@ -336,9 +337,14 @@ decl_module! {
 				maximum_channels,
 			);
 
-			// Note conversion to the OutboundHrmpMessage isn't needed since the data that
+			// Note conversion to the `OutboundHrmpMessage` isn't needed since the data that
 			// `take_outbound_messages` returns encodes equivalently.
-			// If the following code breaks, then we'll need to revisit that assumption.
+			//
+			// The following code is a smoke test to check that the `OutboundHrmpMessage` type
+			// doesn't accidentally change (e.g. by having a field added to it). If the following
+			// line breaks, then we'll need to revisit the assumption that the result of
+			// `take_outbound_messages` can be placed into `HRMP_OUTBOUND_MESSAGES` directly without
+			// a decode/encode round-trip.
 			let _ = OutboundHrmpMessage { recipient: ParaId::from(0), data: vec![] };
 
 			storage::unhashed::put(well_known_keys::HRMP_OUTBOUND_MESSAGES, &outbound_messages);
@@ -777,6 +783,10 @@ impl<T: Config> ProvideInherent for Module<T> {
 
 		Some(Call::set_validation_data(data))
 	}
+
+	fn is_inherent(call: &Self::Call) -> bool {
+		matches!(call, Call::set_validation_data(_))
+	}
 }
 
 decl_event! {

pallets/parachain-system/src/lib.rs

@@ -406,6 +406,31 @@ impl<T: Config> Module<T> {
 
 	/// Service the incoming XCMP message queue attempting to execute up to `max_weight` execution
 	/// weight of messages.
+	///
+	/// Channels are first shuffled and then processed in this random one page at a time, order over
+	/// and over until either `max_weight` is exhausted or no channel has messages that can be
+	/// processed any more.
+	///
+	/// There are two obvious "modes" that we could apportion `max_weight`: one would be to attempt
+	/// to spend it all on the first channel's first page, then use the leftover (if any) for the
+	/// second channel's first page and so on until finally we cycle back and the process messages
+	/// on the first channel's second page &c. The other mode would be to apportion only `1/N` of
+	/// `max_weight` for the first page (where `N` could be, perhaps, the number of channels to
+	/// service, using the remainder plus the next `1/N` for the next channel's page &c.
+	///
+	/// Both modes have good qualities, the first ensures that a channel with a large message (over
+	/// `1/N` does not get indefinitely blocked if other channels have continuous, light traffic.
+	/// The second is fairer, and ensures that channels with continuous light messages don't suffer
+	/// high latency.
+	///
+	/// The following code is a hybrid solution; we have a concept of `weight_available` which
+	/// incrementally approaches `max_weight` as more channels are attempted to be processed. We use
+	/// the parameter `weight_restrict_decay` to control the speed with which `weight_available`
+	/// approaches `max_weight`, with `0` being strictly equivalent to the first aforementioned
+	/// mode, and `N` approximating the second. A reasonable parameter may be `1`, which makes
+	/// half of the `max_weight` available for the first page, then a quarter plus the remainder
+	/// for the second &c. though empirical and or practical factors may give rise to adjusting it
+	/// further.
 	fn service_xcmp_queue(max_weight: Weight) -> Weight {
 		let mut status = InboundXcmpStatus::get(); // <- sorted.
 		if status.len() == 0 {
@@ -441,7 +466,7 @@ impl<T: Config> Module<T> {
 				// first round. For the second round we unlock all weight. If we come close enough
 				// on the first round to unlocking everything, then we do so.
 				if shuffle_index < status.len() {
-					weight_available += (max_weight - weight_available) / weight_restrict_decay;
+					weight_available += (max_weight - weight_available) / (weight_restrict_decay + 1);
 					if weight_available + threshold_weight > max_weight {
 						weight_available = max_weight;
 					}

pallets/xcmp-queue/src/lib.rs

@@ -0,0 +1,69 @@
+[package]
+name = "cumulus-test-runtime-upgrade"
+version = "0.1.0"
+authors = ["Parity Technologies <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+serde = { version = "1.0.101", optional = true, features = ["derive"] }
+
+# Substrate dependencies
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+
+# Cumulus dependencies
+cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false }
+cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
+
+# Polkadot dependencies
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "rococo-v1" }
+
+[build-dependencies]
+substrate-wasm-builder = "3.0.0"
+
+[features]
+default = [ "std", "upgrade" ]
+std = [
+	"codec/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-primitives-core/std",
+	"frame-executive/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-randomness-collective-flip/std",
+	"pallet-sudo/std",
+	"pallet-timestamp/std",
+	"pallet-transaction-payment/std",
+	"serde",
+	"sp-api/std",
+	"sp-block-builder/std",
+	"sp-core/std",
+	"sp-inherents/std",
+	"sp-io/std",
+	"sp-offchain/std",
+	"sp-runtime/std",
+	"sp-session/std",
+	"sp-std/std",
+	"sp-transaction-pool/std",
+	"sp-version/std",
+]
+upgrade = []

test/runtime-upgrade/Cargo.toml

@@ -0,0 +1 @@
+../runtime/build.rs

test/runtime-upgrade/build.rs

@@ -0,0 +1 @@
+../runtime/src

test/runtime-upgrade/src

@@ -66,3 +66,4 @@ std = [
 	"sp-transaction-pool/std",
 	"sp-version/std",
 ]
+upgrade = []

test/runtime/Cargo.toml

@@ -47,6 +47,7 @@ pub use frame_support::{
 };
 use frame_system::limits::{BlockLength, BlockWeights};
 pub use pallet_balances::Call as BalancesCall;
+pub use pallet_sudo::Call as SudoCall;
 pub use pallet_timestamp::Call as TimestampCall;
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -58,12 +59,17 @@ impl_opaque_keys! {
 	pub struct SessionKeys {}
 }
 
+const SPEC_VERSION: u32 = 3;
+
 /// This runtime version.
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("cumulus-test-parachain"),
 	impl_name: create_runtime_str!("cumulus-test-parachain"),
 	authoring_version: 1,
-	spec_version: 3,
+	#[cfg(feature = "upgrade")]
+	spec_version: SPEC_VERSION + 1,
+	#[cfg(not(feature = "upgrade"))]
+	spec_version: SPEC_VERSION,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -220,6 +226,15 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 
 parameter_types! {
 	pub storage ParachainId: cumulus_primitives_core::ParaId = 100.into();
+	pub storage UpgradeDetection: bool = false;
+}
+
+pub struct UpgradeDetectionOnRuntimeUpgrade;
+impl frame_support::traits::OnRuntimeUpgrade for UpgradeDetectionOnRuntimeUpgrade {
+	fn on_runtime_upgrade() -> u64 {
+		UpgradeDetection::set(&true);
+		0
+	}
 }
 
 construct_runtime! {
@@ -284,6 +299,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPallets,
+	UpgradeDetectionOnRuntimeUpgrade,
 >;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -293,6 +309,10 @@ decl_runtime_apis! {
 		/// Returns the last timestamp of a runtime.
 		fn get_last_timestamp() -> u64;
 	}
+	pub trait GetUpgradeDetection {
+		/// Returns `true` if the runtime has been upgraded at least once.
+		fn has_upgraded() -> bool;
+	}
 }
 
 impl_runtime_apis! {
@@ -372,6 +392,12 @@ impl_runtime_apis! {
 			Timestamp::now()
 		}
 	}
+
+	impl crate::GetUpgradeDetection<Block> for Runtime {
+		fn has_upgraded() -> bool {
+			UpgradeDetection::get()
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block!(Runtime, Executive);