Merge branch 'polkadot-cumulus-2022-05-11' into collator-rpc-poc

Cargo.toml

@@ -203,6 +203,7 @@ try-runtime = [ "polkadot-cli/try-runtime" ]
 fast-runtime = [ "polkadot-cli/fast-runtime" ]
 runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
 pyroscope = ["polkadot-cli/pyroscope"]
+staging-client = ["polkadot-cli/staging-client"]
 [patch."https://github.com/paritytech/substrate"]
 node-template ={path = "/Users/skunert/work/repos/substrate/bin/node-template/node" }
 frame-benchmarking ={path = "/Users/skunert/work/repos/substrate/frame/benchmarking" }
@@ -242,11 +243,11 @@ sc-executor ={path = "/Users/skunert/work/repos/substrate/client/executor" }
 sc-executor-common ={path = "/Users/skunert/work/repos/substrate/client/executor/common" }
 sc-allocator ={path = "/Users/skunert/work/repos/substrate/client/allocator" }
 sp-maybe-compressed-blob ={path = "/Users/skunert/work/repos/substrate/primitives/maybe-compressed-blob" }
+sp-sandbox ={path = "/Users/skunert/work/repos/substrate/primitives/sandbox" }
 sp-serializer ={path = "/Users/skunert/work/repos/substrate/primitives/serializer" }
 sc-executor-wasmi ={path = "/Users/skunert/work/repos/substrate/client/executor/wasmi" }
 sc-executor-wasmtime ={path = "/Users/skunert/work/repos/substrate/client/executor/wasmtime" }
 sc-runtime-test ={path = "/Users/skunert/work/repos/substrate/client/executor/runtime-test" }
-sp-sandbox ={path = "/Users/skunert/work/repos/substrate/primitives/sandbox" }
 sp-tasks ={path = "/Users/skunert/work/repos/substrate/primitives/tasks" }
 substrate-wasm-builder ={path = "/Users/skunert/work/repos/substrate/utils/wasm-builder" }
 sc-tracing ={path = "/Users/skunert/work/repos/substrate/client/tracing" }
@@ -284,7 +285,9 @@ sc-network ={path = "/Users/skunert/work/repos/substrate/client/network" }
 fork-tree ={path = "/Users/skunert/work/repos/substrate/utils/fork-tree" }
 sc-consensus ={path = "/Users/skunert/work/repos/substrate/client/consensus/common" }
 sc-utils ={path = "/Users/skunert/work/repos/substrate/client/utils" }
+sc-network-common ={path = "/Users/skunert/work/repos/substrate/client/network/common" }
 sc-peerset ={path = "/Users/skunert/work/repos/substrate/client/peerset" }
+sc-network-sync ={path = "/Users/skunert/work/repos/substrate/client/network/sync" }
 sp-finality-grandpa ={path = "/Users/skunert/work/repos/substrate/primitives/finality-grandpa" }
 sc-telemetry ={path = "/Users/skunert/work/repos/substrate/client/telemetry" }
 sc-client-db ={path = "/Users/skunert/work/repos/substrate/client/db" }
@@ -370,6 +373,8 @@ pallet-membership ={path = "/Users/skunert/work/repos/substrate/frame/membership
 pallet-mmr ={path = "/Users/skunert/work/repos/substrate/frame/merkle-mountain-range" }
 sp-mmr-primitives ={path = "/Users/skunert/work/repos/substrate/primitives/merkle-mountain-range" }
 pallet-multisig ={path = "/Users/skunert/work/repos/substrate/frame/multisig" }
+pallet-nomination-pools ={path = "/Users/skunert/work/repos/substrate/frame/nomination-pools" }
+pallet-nomination-pools-benchmarking ={path = "/Users/skunert/work/repos/substrate/frame/nomination-pools/benchmarking" }
 pallet-offences-benchmarking ={path = "/Users/skunert/work/repos/substrate/frame/offences/benchmarking" }
 pallet-proxy ={path = "/Users/skunert/work/repos/substrate/frame/proxy" }
 pallet-recovery ={path = "/Users/skunert/work/repos/substrate/frame/recovery" }

node/core/runtime-api/src/lib.rs

@@ -22,7 +22,7 @@
 #![deny(unused_crate_dependencies)]
 #![warn(missing_docs)]
 
-use polkadot_node_subsystem_util::metrics::{self, prometheus};
+use polkadot_node_subsystem_util::metrics::prometheus;
 use polkadot_overseer::OverseerRuntimeClient;
 use polkadot_primitives::{
 	runtime_api::ParachainHost,

node/overseer/src/lib.rs

@@ -74,8 +74,8 @@ use client::{BlockImportNotification, BlockchainEvents, FinalityNotification};
 use polkadot_primitives::{
 	runtime_api::ParachainHost,
 	v2::{
-		Block, BlockId, BlockNumber, CandidateCommitments, CandidateEvent,
-		CommittedCandidateReceipt, CoreState, GroupRotationInfo, Hash, Header, Id,
+		Block, BlockId, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
+		CommittedCandidateReceipt, CoreState, DisputeState, GroupRotationInfo, Hash, Header, Id,
 		InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption,
 		PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo,
 		ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature,
@@ -1047,6 +1047,11 @@ pub trait OverseerRuntimeClient {
 	) -> std::result::Result<Vec<sp_authority_discovery::AuthorityId>, ApiError>;
 
 	fn api_version_parachain_host(&self, at: &BlockId) -> Result<Option<u32>, ApiError>;
+
+	fn staging_get_disputes(
+		&self,
+		at: &BlockId,
+	) -> Result<Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)>, ApiError>;
 }
 
 impl<T> OverseerRuntimeClient for T
@@ -1244,4 +1249,11 @@ where
 		// self.runtime_api().session_info_before_version_2(at, index)
 		todo!()
 	}
+
+	fn staging_get_disputes(
+		&self,
+		at: &BlockId,
+	) -> Result<Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)>, ApiError> {
+		self.runtime_api().staging_get_disputes(at)
+	}
 }