Bump executor params to API v4 (backport from #6698)

node/subsystem-types/src/messages.rs

@@ -612,7 +612,7 @@ impl RuntimeApiRequest {
 	pub const DISPUTES_RUNTIME_REQUIREMENT: u32 = 3;
 
 	/// `ExecutorParams`
-	pub const EXECUTOR_PARAMS_RUNTIME_REQUIREMENT: u32 = 3;
+	pub const EXECUTOR_PARAMS_RUNTIME_REQUIREMENT: u32 = 4;
 }
 
 /// A message to the Runtime API subsystem.

node/subsystem-util/src/lib.rs

@@ -244,11 +244,15 @@ pub async fn executor_params_at_relay_parent(
 					// Failed to communicate with the runtime
 					Err(Error::Oneshot(err))
 				},
-				Ok(Err(_)) => {
+				Ok(Err(RuntimeApiError::NotSupported { .. })) => {
 					// Runtime doesn't yet support the api requested, should execute anyway
 					// with default set of parameters
 					Ok(ExecutorParams::default())
 				},
+				Ok(Err(err)) => {
+					// Runtime failed to execute the request
+					Err(Error::RuntimeApi(err))
+				},
 				Ok(Ok(None)) => {
 					// Storage doesn't contain a parameter set for the given session; should
 					// never happen

primitives/src/runtime_api.rs

@@ -226,7 +226,7 @@ sp_api::decl_runtime_apis! {
 		fn disputes() -> Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)>;
 
 		/// Returns execution parameters for the session.
-		#[api_version(3)]
+		#[api_version(4)]
 		fn session_executor_params(session_index: SessionIndex) -> Option<vstaging::ExecutorParams>;
 	}
 }

runtime/rococo/src/lib.rs

@@ -1650,7 +1650,7 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
-	#[api_version(3)]
+	#[api_version(4)]
 	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			parachains_runtime_api_impl::validators::<Runtime>()

runtime/westend/src/lib.rs

@@ -1379,7 +1379,7 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
-	#[api_version(3)]
+	#[api_version(4)]
 	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			parachains_runtime_api_impl::validators::<Runtime>()