Merge pull request #25 from srlabs/upgrade-runtimes-v1.7.0

Upgrade runtimes to v1.7.0

Author: louismerlin

runtimes/Cargo.lock

@@ -10,4 +10,5 @@ members = [
     "kusama",
     "asset-hub-kusama",
     "coretime-kusama",
+    "polkadot",
 ]

runtimes/Cargo.toml

@@ -7,37 +7,37 @@ publish = false
 [dependencies]
 ziggy = { version = "1.3.2", default-features = false }
 
-asset-hub-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.6.1", default-features = false }
-staging-xcm = { default-features = false , version = "16.2.0" }
+asset-hub-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.7.0", default-features = false }
+staging-xcm = { default-features = false , version = "18.0.0" }
 
-parachains-common = { default-features = false , version = "21.0.0" }
+parachains-common = { default-features = false , version = "24.0.0" }
 
 codec = { package = "parity-scale-codec", version = "3.7.5", default-features = false, features = ["derive", "max-encoded-len"] }
 
-frame-support = { default-features = false, version = "40.1.0" }
-frame-system = { default-features = false, version = "40.1.0" }
+frame-support = { default-features = false, version = "42.0.0" }
+frame-system = { default-features = false, version = "42.0.0" }
 
-sp-runtime = { default-features = false, version = "41.1.0" }
-sp-state-machine = { default-features = false, version = "0.45.0" }
-sp-consensus-aura = { default-features = false, version = "0.42.0" }
-sp-trie = { default-features = false, version = "39.1.0" }
-sp-core = { default-features = false, version = "36.1.0" }
+sp-runtime = { default-features = false, version = "43.0.0" }
+sp-state-machine = { default-features = false, version = "0.47.0" }
+sp-consensus-aura = { default-features = false, version = "0.44.0" }
+sp-trie = { default-features = false, version = "41.0.0" }
+sp-core = { default-features = false, version = "38.0.0" }
 
-pallet-timestamp = { default-features = false, version = "39.0.0" }
-pallet-balances = { default-features = false, version = "41.1.0" }
-pallet-xcm = { default-features = false, version = "19.1.2" }
-pallet-utility = { default-features = false, version = "40.0.0" }
-pallet-proxy = { default-features = false, version = "40.1.0" }
-pallet-multisig = { default-features = false, version = "40.1.0" }
-pallet-vesting = { default-features = false, version = "40.1.0" }
+pallet-timestamp = { default-features = false, version = "41.0.0" }
+pallet-balances = { default-features = false, version = "43.0.0" }
+pallet-xcm = { default-features = false, version = "22.0.0" }
+pallet-utility = { default-features = false, version = "42.0.0" }
+pallet-proxy = { default-features = false, version = "42.0.0" }
+pallet-multisig = { default-features = false, version = "42.0.0" }
+pallet-vesting = { default-features = false, version = "42.0.0" }
 
-cumulus-primitives-core = { default-features = false , version = "0.18.1" }
-cumulus-primitives-parachain-inherent = { default-features = false , version = "0.18.1" }
-cumulus-pallet-parachain-system = { default-features = false, version = "0.20.0" }
-cumulus-test-relay-sproof-builder = { default-features = false , version = "0.19.0" }
+cumulus-primitives-core = { default-features = false , version = "0.20.0" }
+cumulus-primitives-parachain-inherent = { default-features = false , version = "0.20.0" }
+cumulus-pallet-parachain-system = { default-features = false, version = "0.22.0" }
+cumulus-test-relay-sproof-builder = { default-features = false , version = "0.21.0" }
 
-polkadot-parachain-primitives = { default-features = false, version = "16.1.0" }
-polkadot-primitives = { default-features = false, version = "18.2.0" }
+polkadot-parachain-primitives = { default-features = false, version = "18.0.0" }
+polkadot-primitives = { default-features = false, version = "20.0.0" }
 
 [features]
 default = ["std", "try-runtime"]

runtimes/asset-hub-kusama/Cargo.toml

@@ -0,0 +1 @@
+*pallet_*

runtimes/asset-hub-kusama/allowlist.txt

@@ -22,7 +22,6 @@ use sp_runtime::{
 };
 use sp_state_machine::BasicExternalities;
 use std::{
-    collections::BTreeMap,
     iter,
     time::{Duration, Instant},
 };
@@ -40,8 +39,8 @@ fn generate_genesis(accounts: &[AccountId]) -> Storage {
     use asset_hub_kusama_runtime::{
         AssetsConfig, AuraConfig, AuraExtConfig, BalancesConfig, CollatorSelectionConfig,
         ForeignAssetsConfig, ParachainInfoConfig, ParachainSystemConfig, PolkadotXcmConfig,
-        PoolAssetsConfig, RuntimeGenesisConfig, SessionConfig, SessionKeys, SystemConfig,
-        TransactionPaymentConfig, VestingConfig,
+        PoolAssetsConfig, ReviveConfig, RuntimeGenesisConfig, SessionConfig, SessionKeys,
+        SystemConfig, TransactionPaymentConfig, VestingConfig,
     };
     use sp_consensus_aura::sr25519::AuthorityId as AuraId;
     use sp_runtime::app_crypto::ByteArray;
@@ -79,6 +78,7 @@ fn generate_genesis(accounts: &[AccountId]) -> Storage {
         pool_assets: PoolAssetsConfig::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         vesting: VestingConfig::default(),
+        revive: ReviveConfig::default(),
     }
     .build_storage()
     .unwrap()
@@ -212,7 +212,8 @@ fn initialize_block(block: u32, prev_header: Option<&Header>) {
     println!("  setting parachain validation data");
     let parachain_validation_data = {
         use cumulus_primitives_core::relay_chain::HeadData;
-        use cumulus_primitives_parachain_inherent::ParachainInherentData;
+        // use cumulus_primitives_parachain_inherent::ParachainInherentData;
+        use cumulus_pallet_parachain_system::parachain_inherent::BasicParachainInherentData;
         use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 
         let parent_head = HeadData(prev_header.unwrap_or(parent_header).encode());
@@ -225,19 +226,33 @@ fn initialize_block(block: u32, prev_header: Option<&Header>) {
 
         let (relay_parent_storage_root, relay_chain_state) =
             sproof_builder.into_state_root_and_proof();
-        ParachainInherentData {
+        BasicParachainInherentData {
             validation_data: polkadot_primitives::PersistedValidationData {
                 parent_head,
                 relay_parent_number: block,
                 relay_parent_storage_root,
                 max_pov_size: 1000,
             },
             relay_chain_state,
-            downward_messages: Vec::default(),
-            horizontal_messages: BTreeMap::default(),
+            collator_peer_id: None,
+            relay_parent_descendants: vec![],
         }
     };
-    ParachainSystem::set_validation_data(RuntimeOrigin::none(), parachain_validation_data).unwrap();
+    let inbound_message_data = {
+        use cumulus_pallet_parachain_system::parachain_inherent::{
+            AbridgedInboundMessagesCollection, InboundMessagesData,
+        };
+        InboundMessagesData::new(
+            AbridgedInboundMessagesCollection::default(),
+            AbridgedInboundMessagesCollection::default(),
+        )
+    };
+    ParachainSystem::set_validation_data(
+        RuntimeOrigin::none(),
+        parachain_validation_data,
+        inbound_message_data,
+    )
+    .unwrap();
 }
 
 fn finalize_block(elapsed: Duration) -> Header {

runtimes/asset-hub-kusama/src/main.rs

@@ -7,33 +7,33 @@ publish = false
 [dependencies]
 ziggy = { version = "1.3.2", default-features = false }
 
-coretime-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.6.1", default-features = false }
-system-parachains-constants = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.6.1", default-features = false }
+coretime-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.7.0", default-features = false }
+system-parachains-constants = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.7.0", default-features = false }
 
-parachains-common = { default-features = false , version = "21.0.0" }
+parachains-common = { default-features = false , version = "24.0.0" }
 
 codec = { package = "parity-scale-codec", version = "3.7.5", default-features = false, features = ["derive", "max-encoded-len"] }
 
-frame-support = { default-features = false, version = "40.1.0" }
-frame-system = { default-features = false, version = "40.1.0" }
-
-sp-runtime = { default-features = false, version = "41.1.0" }
-sp-state-machine = { default-features = false, version = "0.45.0" }
-sp-consensus-aura = { default-features = false, version = "0.42.0" }
-sp-application-crypto = { default-features = false , version = "40.1.0" }
-
-pallet-timestamp = { default-features = false, version = "39.0.0" }
-pallet-balances = { default-features = false, version = "41.1.0" }
-pallet-utility = { default-features = false, version = "40.0.0" }
-pallet-multisig = { default-features = false, version = "40.1.0" }
-pallet-proxy = { default-features = false, version = "40.1.0" }
-pallet-broker = { default-features = false, version = "0.19.2" }
-pallet-xcm = { default-features = false , version = "19.1.2" }
-
-cumulus-primitives-core = { default-features = false , version = "0.18.1" }
-cumulus-primitives-parachain-inherent = { default-features = false , version = "0.18.1" }
-cumulus-pallet-parachain-system = { default-features = false, version = "0.20.0" }
-cumulus-test-relay-sproof-builder = { default-features = false , version = "0.19.0" }
+frame-support = { default-features = false, version = "42.0.0" }
+frame-system = { default-features = false, version = "42.0.0" }
+
+sp-runtime = { default-features = false, version = "43.0.0" }
+sp-state-machine = { default-features = false, version = "0.47.0" }
+sp-consensus-aura = { default-features = false, version = "0.44.0" }
+sp-application-crypto = { default-features = false , version = "42.0.0" }
+
+pallet-timestamp = { default-features = false, version = "41.0.0" }
+pallet-balances = { default-features = false, version = "43.0.0" }
+pallet-utility = { default-features = false, version = "42.0.0" }
+pallet-multisig = { default-features = false, version = "42.0.0" }
+pallet-proxy = { default-features = false, version = "42.0.0" }
+pallet-broker = { default-features = false, version = "0.21.0" }
+pallet-xcm = { default-features = false , version = "22.0.0" }
+
+cumulus-primitives-core = { default-features = false , version = "0.20.0" }
+cumulus-primitives-parachain-inherent = { default-features = false , version = "0.20.0" }
+cumulus-pallet-parachain-system = { default-features = false, version = "0.22.0" }
+cumulus-test-relay-sproof-builder = { default-features = false , version = "0.21.0" }
 
 [features]
 default = ["std", "try-runtime"]

runtimes/coretime-kusama/Cargo.toml

@@ -0,0 +1 @@
+*pallet_*

runtimes/coretime-kusama/allowlist.txt

@@ -23,7 +23,7 @@ use sp_runtime::{
 };
 use sp_state_machine::BasicExternalities;
 use std::{
-    collections::{BTreeMap, HashMap},
+    collections::HashMap,
     iter,
     time::{Duration, Instant},
 };
@@ -222,7 +222,8 @@ fn initialize_block(block: u32, prev_header: Option<&Header>) {
     println!("  setting parachain validation data");
     let parachain_validation_data = {
         use cumulus_primitives_core::{relay_chain::HeadData, PersistedValidationData};
-        use cumulus_primitives_parachain_inherent::ParachainInherentData;
+        // use cumulus_primitives_parachain_inherent::BasicParachainInherentData;
+        use cumulus_pallet_parachain_system::parachain_inherent::BasicParachainInherentData;
         use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 
         let parent_head = HeadData(prev_header.unwrap_or(&parent_header).encode());
@@ -235,19 +236,33 @@ fn initialize_block(block: u32, prev_header: Option<&Header>) {
 
         let (relay_parent_storage_root, relay_chain_state) =
             sproof_builder.into_state_root_and_proof();
-        ParachainInherentData {
+        BasicParachainInherentData {
             validation_data: PersistedValidationData {
                 parent_head,
                 relay_parent_number: block,
                 relay_parent_storage_root,
                 max_pov_size: 1000,
             },
             relay_chain_state,
-            downward_messages: Vec::default(),
-            horizontal_messages: BTreeMap::default(),
+            collator_peer_id: None,
+            relay_parent_descendants: vec![],
         }
     };
-    ParachainSystem::set_validation_data(RuntimeOrigin::none(), parachain_validation_data).unwrap();
+    let inbound_message_data = {
+        use cumulus_pallet_parachain_system::parachain_inherent::{
+            AbridgedInboundMessagesCollection, InboundMessagesData,
+        };
+        InboundMessagesData::new(
+            AbridgedInboundMessagesCollection::default(),
+            AbridgedInboundMessagesCollection::default(),
+        )
+    };
+    ParachainSystem::set_validation_data(
+        RuntimeOrigin::none(),
+        parachain_validation_data,
+        inbound_message_data,
+    )
+    .unwrap();
 
     // We have to send 1 DOT to the coretime burn address because of a defensive assertion that cannot be
     // reached in a real-world environment.

runtimes/coretime-kusama/src/main.rs

@@ -7,39 +7,43 @@ publish = false
 [dependencies]
 ziggy = { version = "1.3.2", default-features = false }
 
-staging-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.6.1", default-features = false }
-staging-xcm = { default-features = false , version = "16.2.0" }
+staging-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.7.0", default-features = false }
+staging-xcm = { default-features = false , version = "18.0.0" }
 
-kusama-runtime-constants = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.6.1", default-features = false }
+kusama-runtime-constants = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.7.0", default-features = false }
 
-polkadot-primitives = { version = "18.2.0", default-features = false }
-polkadot-runtime-parachains = { version = "19.2.0", default-features = false }
+polkadot-primitives = { version = "20.0.0", default-features = false }
+polkadot-runtime-parachains = { version = "21.0.0", default-features = false }
+polkadot-runtime-common = { version = "21.0.0", default-features = false }
 
 codec = { version = "3.7.5", features = ["derive", "max-encoded-len"], default-features = false, package = "parity-scale-codec" }
 
-frame-support = { default-features = false , version = "40.1.0" }
-frame-system = { default-features = false , version = "40.1.0" }
+frame-support = { default-features = false , version = "42.0.0" }
+frame-system = { default-features = false , version = "42.0.0" }
 
-sp-application-crypto = { default-features = false , version = "40.1.0" }
-sp-runtime = { default-features = false , version = "41.1.0" }
-sp-state-machine = { default-features = false , version = "0.45.0" }
-sp-consensus-babe = { default-features = false , version = "0.42.1" }
-sp-consensus-beefy = { default-features = false , version = "24.1.0" }
-sp-authority-discovery = { default-features = false , version = "36.0.0" }
-sp-core = { default-features = false, version = "35.0.0" }
+sp-application-crypto = { default-features = false , version = "42.0.0" }
+sp-runtime = { default-features = false , version = "43.0.0" }
+sp-state-machine = { default-features = false , version = "0.47.0" }
+sp-consensus-babe = { default-features = false , version = "0.44.0" }
+sp-consensus-beefy = { default-features = false , version = "26.0.0" }
+sp-authority-discovery = { default-features = false , version = "38.0.0" }
+sp-core = { default-features = false, version = "38.0.0" }
 
-pallet-balances = { default-features = false , version = "41.1.0" }
-pallet-grandpa = { default-features = false , version = "40.0.0" }
-pallet-society = { default-features = false, version = "40.1.0" }
-pallet-utility = { default-features = false , version = "40.0.0" }
-pallet-multisig = { default-features = false , version = "40.1.0" }
-pallet-proxy = { default-features = false , version = "40.1.0" }
-pallet-identity = { default-features = false , version = "40.1.0" }
-pallet-bounties = { default-features = false , version = "39.0.0" }
-pallet-staking = { default-features = false , version = "40.1.1" }
-pallet-timestamp = { default-features = false , version = "39.0.0" }
-pallet-xcm = { default-features = false , version = "19.1.2" }
-pallet-referenda = { default-features = false , version = "40.1.0" }
+pallet-balances = { default-features = false , version = "43.0.0" }
+pallet-grandpa = { default-features = false , version = "42.0.0" }
+pallet-society = { default-features = false, version = "42.0.0" }
+pallet-utility = { default-features = false , version = "42.0.0" }
+pallet-multisig = { default-features = false , version = "42.0.0" }
+pallet-proxy = { default-features = false , version = "42.0.0" }
+pallet-identity = { default-features = false , version = "42.0.0" }
+pallet-bounties = { default-features = false , version = "41.0.0" }
+pallet-staking = { default-features = false , version = "42.0.0" }
+pallet-timestamp = { default-features = false , version = "41.0.0" }
+pallet-xcm = { default-features = false , version = "22.0.0" }
+pallet-referenda = { default-features = false , version = "42.0.0" }
+pallet-bags-list = { default-features = false , version = "41.0.0" }
+pallet-treasury = { default-features = false , version = "41.0.0" }
+pallet-vesting = { default-features = false , version = "42.0.0" }
 
 [features]
 default = ["std", "try-runtime"]

runtimes/kusama/Cargo.toml

@@ -0,0 +1 @@
+*pallet_*