Update polkadot-sdk to stable2407

client/consensus/Cargo.toml

@@ -33,6 +33,7 @@ sp-runtime = { workspace = true }
 sp-state-machine = { workspace = true }
 sp-timestamp = { workspace = true }
 sp-transaction-pool = { workspace = true }
+sp-version = { workspace = true }
 substrate-prometheus-endpoint = { workspace = true }
 
 # Own

client/consensus/src/tests.rs

@@ -26,7 +26,10 @@ use {
     async_trait::async_trait,
     cumulus_client_collator::service::CollatorService,
     cumulus_client_consensus_proposer::Proposer as ConsensusProposer,
-    cumulus_primitives_core::{relay_chain::BlockId, CollationInfo, CollectCollationInfo, ParaId},
+    cumulus_primitives_core::{
+        relay_chain::{BlockId, BlockNumber, CoreState},
+        CollationInfo, CollectCollationInfo, ParaId,
+    },
     cumulus_relay_chain_interface::{
         CommittedCandidateReceipt, OverseerHandle, RelayChainInterface, RelayChainResult,
         StorageValue,
@@ -64,6 +67,7 @@ use {
         Digest, DigestItem,
     },
     sp_timestamp::Timestamp,
+    sp_version::RuntimeVersion,
     std::{
         collections::{BTreeMap, BTreeSet},
         pin::Pin,
@@ -259,6 +263,25 @@ impl RelayChainInterface for RelayChain {
     ) -> RelayChainResult<Option<polkadot_primitives::ValidationCodeHash>> {
         unimplemented!("Not needed for test")
     }
+
+    async fn candidates_pending_availability(
+        &self,
+        _: PHash,
+        _: ParaId,
+    ) -> RelayChainResult<Vec<CommittedCandidateReceipt>> {
+        unimplemented!("Not needed for test")
+    }
+
+    async fn availability_cores(
+        &self,
+        _relay_parent: PHash,
+    ) -> RelayChainResult<Vec<CoreState<PHash, BlockNumber>>> {
+        unimplemented!("Not needed for test");
+    }
+
+    async fn version(&self, _: PHash) -> RelayChainResult<RuntimeVersion> {
+        unimplemented!("Not needed for test")
+    }
 }
 
 #[derive(Clone)]
@@ -303,7 +326,7 @@ impl SealExtractorVerfier {
 #[async_trait::async_trait]
 impl<B: BlockT> sc_consensus::Verifier<B> for SealExtractorVerfier {
     async fn verify(
-        &mut self,
+        &self,
         mut block: sc_consensus::BlockImportParams<B>,
     ) -> Result<sc_consensus::BlockImportParams<B>, String> {
         if block.fork_choice.is_none() {

client/node-common/src/service.rs

@@ -37,8 +37,8 @@ use {
     },
     sc_executor::{
         sp_wasm_interface::{ExtendedHostFunctions, HostFunctions},
-        HeapAllocStrategy, NativeElseWasmExecutor, NativeExecutionDispatch, RuntimeVersionOf,
-        WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY,
+        HeapAllocStrategy, NativeExecutionDispatch, RuntimeVersionOf, WasmExecutor,
+        DEFAULT_HEAP_ALLOC_STRATEGY,
     },
     sc_network::{config::FullNetworkConfiguration, NetworkBlock},
     sc_network_sync::SyncingService,
@@ -62,6 +62,9 @@ use {
     std::{str::FromStr, sync::Arc},
 };
 
+#[allow(deprecated)]
+use sc_executor::NativeElseWasmExecutor;
+
 /// Trait to configure the main types the builder rely on, bundled in a single
 /// type to reduce verbosity and the amount of type parameters.
 pub trait NodeBuilderConfig {
@@ -174,13 +177,15 @@ impl TanssiExecutorExt for WasmExecutor<ParachainHostFunctions> {
     }
 }
 
+#[allow(deprecated)]
 impl<D> TanssiExecutorExt for NativeElseWasmExecutor<D>
 where
     D: NativeExecutionDispatch,
 {
     type HostFun = ExtendedHostFunctions<sp_io::SubstrateHostFunctions, D::ExtendHostFunctions>;
 
     fn new_with_wasm_executor(wasm_executor: WasmExecutor<Self::HostFun>) -> Self {
+        #[allow(deprecated)]
         NativeElseWasmExecutor::new_with_wasm_executor(wasm_executor)
     }
 }

client/service-container-chain/src/chain_spec.rs

@@ -21,7 +21,7 @@ use {
 };
 
 /// Specialized `ChainSpec` for container chains that only allows raw genesis format.
-pub type RawChainSpec = sc_service::GenericChainSpec<RawGenesisConfig, Extensions>;
+pub type RawChainSpec = sc_service::GenericChainSpec<Extensions>;
 
 /// Helper type that implements the traits needed to be used as a "GenesisConfig",
 /// but whose implementation panics because we only expect it to be used with raw ChainSpecs,

client/service-container-chain/src/service.rs

@@ -35,7 +35,7 @@ use {
     polkadot_primitives::CollatorPair,
     sc_basic_authorship::ProposerFactory,
     sc_consensus::{BasicQueue, BlockImport},
-    sc_executor::{NativeElseWasmExecutor, WasmExecutor},
+    sc_executor::WasmExecutor,
     sc_network::NetworkBlock,
     sc_network_sync::SyncingService,
     sc_service::{
@@ -58,6 +58,9 @@ use {
     tokio_util::sync::CancellationToken,
 };
 
+#[allow(deprecated)]
+use sc_executor::NativeElseWasmExecutor;
+
 type FullBackend = TFullBackend<Block>;
 
 /// Native executor type.
@@ -102,12 +105,12 @@ impl<BI> OrchestratorParachainBlockImport<BI> {
 #[async_trait::async_trait]
 impl<BI> BlockImport<Block> for OrchestratorParachainBlockImport<BI>
 where
-    BI: BlockImport<Block> + Send,
+    BI: BlockImport<Block> + Send + Sync,
 {
     type Error = BI::Error;
 
     async fn check_block(
-        &mut self,
+        &self,
         block: sc_consensus::BlockCheckParams<Block>,
     ) -> Result<sc_consensus::ImportResult, Self::Error> {
         self.inner.check_block(block).await
@@ -127,6 +130,7 @@ where
 impl<BI> ParachainBlockImportMarker for OrchestratorParachainBlockImport<BI> {}
 
 // Orchestrator chain types
+#[allow(deprecated)]
 pub type ParachainExecutor = NativeElseWasmExecutor<ParachainNativeExecutor>;
 pub type ParachainClient = TFullClient<Block, RuntimeApi, ParachainExecutor>;
 pub type ParachainBackend = TFullBackend<Block>;

container-chains/nodes/frontier/src/chain_spec.rs

@@ -29,10 +29,7 @@ use {
 };
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = sc_service::GenericChainSpec<
-    container_chain_template_frontier_runtime::RuntimeGenesisConfig,
-    Extensions,
->;
+pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;
 
 /// Orcherstrator's parachain id
 pub const ORCHESTRATOR: ParaId = ParaId::new(1000);

container-chains/nodes/frontier/src/service.rs

@@ -438,6 +438,7 @@ pub async fn start_dev_node(
                     let time = MockTimestampInherentDataProvider;
                     let mocked_parachain = MockValidationDataInherentDataProvider {
                         current_para_block,
+                        current_para_block_head: None,
                         relay_offset: 1000,
                         relay_blocks_per_para_block: 2,
                         // TODO: Recheck
@@ -446,12 +447,12 @@ pub async fn start_dev_node(
                         xcm_config: MockXcmConfig::new(
                             &*client_for_xcm,
                             block,
-                            para_id,
                             Default::default(),
                         ),
                         raw_downward_messages: downward_xcm_receiver.drain().collect(),
                         raw_horizontal_messages: hrmp_xcm_receiver.drain().collect(),
                         additional_key_values: Some(additional_keys),
+                        para_id,
                     };
 
                     Ok((time, mocked_parachain, mocked_authorities_noting))

container-chains/nodes/simple/src/chain_spec.rs

@@ -28,10 +28,7 @@ use {
 };
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = sc_service::GenericChainSpec<
-    container_chain_template_simple_runtime::RuntimeGenesisConfig,
-    Extensions,
->;
+pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;
 
 /// Helper function to generate a crypto pair from seed
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {

container-chains/nodes/simple/src/service.rs

@@ -283,6 +283,7 @@ pub async fn start_dev_node(
                     let time = MockTimestampInherentDataProvider;
                     let mocked_parachain = MockValidationDataInherentDataProvider {
                         current_para_block,
+                        current_para_block_head: None,
                         relay_offset: 1000,
                         relay_blocks_per_para_block: 2,
                         // TODO: Recheck
@@ -291,12 +292,12 @@ pub async fn start_dev_node(
                         xcm_config: MockXcmConfig::new(
                             &*client_for_xcm,
                             block,
-                            para_id,
                             Default::default(),
                         ),
                         raw_downward_messages: downward_xcm_receiver.drain().collect(),
                         raw_horizontal_messages: hrmp_xcm_receiver.drain().collect(),
                         additional_key_values: Some(additional_keys),
+                        para_id,
                     };
 
                     Ok((time, mocked_parachain, mocked_authorities_noting))

container-chains/runtime-templates/frontier/Cargo.toml

@@ -97,7 +97,6 @@ staging-xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
-cumulus-pallet-dmp-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
@@ -135,7 +134,6 @@ default = [ "std" ]
 std = [
 	"async-backing-primitives/std",
 	"ccp-xcm/std",
-	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
@@ -234,7 +232,6 @@ std = [
 force-debug = [ "sp-debug-derive/force-debug" ]
 
 runtime-benchmarks = [
-	"cumulus-pallet-dmp-queue/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
@@ -281,7 +278,6 @@ runtime-benchmarks = [
 ]
 
 try-runtime = [
-	"cumulus-pallet-dmp-queue/try-runtime",
 	"cumulus-pallet-parachain-system/try-runtime",
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",

container-chains/runtime-templates/frontier/src/lib.rs

@@ -995,7 +995,6 @@ construct_runtime!(
         // XCM
         XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Storage, Event<T>} = 70,
         CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 71,
-        DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 72,
         PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 73,
         MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 74,
         ForeignAssets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>} = 75,
@@ -1024,7 +1023,6 @@ mod benches {
         [pallet_cc_authorities_noting, AuthoritiesNoting]
         [pallet_author_inherent, AuthorInherent]
         [cumulus_pallet_xcmp_queue, XcmpQueue]
-        [cumulus_pallet_dmp_queue, DmpQueue]
         [pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
         [pallet_xcm_benchmarks::generic, pallet_xcm_benchmarks::generic::Pallet::<Runtime>]
         [pallet_message_queue, MessageQueue]
@@ -1619,7 +1617,11 @@ impl_runtime_apis! {
                 pallet_ethereum::CurrentBlock::<Runtime>::get(),
                 pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
             )
-         }
+        }
+
+        fn initialize_pending_block(header: &<Block as BlockT>::Header) {
+            Executive::initialize_block(header);
+        }
     }
 
     impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {