Merge branch 'master' into aleks-container-chains-disabled-offchain-w…

…orkers-check

Cargo.toml

@@ -142,6 +142,7 @@ xcm-primitives = { git = "https://github.com/moondance-labs/moonkit", branch = "
 
 frame-benchmarking = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-stable2407", default-features = false }
 frame-executive = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-stable2407", default-features = false }
+frame-metadata-hash-extension = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-stable2407", default-features = false }
 frame-support = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-stable2407", default-features = false }
 frame-system = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-stable2407", default-features = false }
 frame-system-benchmarking = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-stable2407", default-features = false }

runtime/common/Cargo.toml

@@ -37,6 +37,7 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-try-runtime = { workspace = true, optional = true }
 pallet-balances = { workspace = true }
+pallet-beefy-mmr = { workspace = true }
 
 # Cumulus
 cumulus-pallet-xcmp-queue = { workspace = true }
@@ -64,6 +65,7 @@ std = [
 	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-balances/std",
+	"pallet-beefy-mmr/std",
 	"pallet-configuration/std",
 	"pallet-data-preservers/std",
 	"pallet-foreign-asset-creator/std",
@@ -107,6 +109,7 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-beefy-mmr/try-runtime",
 	"pallet-configuration/try-runtime",
 	"pallet-data-preservers/try-runtime",
 	"pallet-foreign-asset-creator/try-runtime",

runtime/common/src/migrations.rs

@@ -36,6 +36,7 @@
 
 #[cfg(feature = "try-runtime")]
 use frame_support::ensure;
+use frame_support::migration::move_pallet;
 use {
     cumulus_primitives_core::ParaId,
     frame_support::{
@@ -1030,10 +1031,48 @@ where
     }
 }
 
+pub struct MigrateMMRLeafPallet<T>(pub PhantomData<T>);
+
+impl<T: frame_system::Config> Migration for MigrateMMRLeafPallet<T> {
+    fn friendly_name(&self) -> &str {
+        "SM_MigrateMMRLeafPallet"
+    }
+
+    fn migrate(&self, available_weight: Weight) -> Weight {
+        let new_name =
+            <<T as frame_system::Config>::PalletInfo as frame_support::traits::PalletInfo>::name::<
+                pallet_beefy_mmr::Pallet<T>,
+            >()
+            .expect("pallet_beefy_mmr must be part of dancelight before this migration");
+        move_pallet(Self::old_pallet_name().as_bytes(), new_name.as_bytes());
+        available_weight
+    }
+
+    #[cfg(feature = "try-runtime")]
+    fn pre_upgrade(&self) -> Result<Vec<u8>, sp_runtime::DispatchError> {
+        Ok(vec![])
+    }
+
+    #[cfg(feature = "try-runtime")]
+    fn post_upgrade(&self, _state: Vec<u8>) -> Result<(), sp_runtime::DispatchError> {
+        Ok(())
+    }
+}
+
+impl<T> MigrateMMRLeafPallet<T> {
+    pub fn old_pallet_name() -> &'static str {
+        "MMRLeaf"
+    }
+}
+
 pub struct DancelightMigrations<Runtime>(PhantomData<Runtime>);
 
-impl<Runtime> GetMigrations for DancelightMigrations<Runtime> {
+impl<Runtime> GetMigrations for DancelightMigrations<Runtime>
+where
+    Runtime: frame_system::Config,
+{
     fn get_migrations() -> Vec<Box<dyn Migration>> {
-        vec![]
+        let migrate_mmr_leaf_pallet = MigrateMMRLeafPallet::<Runtime>(Default::default());
+        vec![Box::new(migrate_mmr_leaf_pallet)]
     }
 }

solo-chains/runtime/dancelight/Cargo.toml

@@ -52,6 +52,7 @@ sp-version = { workspace = true }
 tx-pool-api = { workspace = true }
 
 frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true, features = [ "tuples-96" ] }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
@@ -175,6 +176,7 @@ std = [
 	"dp-container-chain-genesis-data/std",
 	"frame-benchmarking?/std",
 	"frame-executive/std",
+	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",

solo-chains/runtime/dancelight/src/lib.rs

@@ -187,7 +187,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_version: 1000,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 25,
+    transaction_version: 26,
     state_version: 1,
 };
 
@@ -631,6 +631,7 @@ where
             frame_system::CheckNonce::<Runtime>::from(nonce),
             frame_system::CheckWeight::<Runtime>::new(),
             pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
+            frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(false),
         );
         let raw_payload = SignedPayload::new(call, extra)
             .map_err(|e| {
@@ -1152,12 +1153,12 @@ impl pallet_beefy::Config for Runtime {
     // weight computation.
     type MaxNominators = ConstU32<0>;
     type MaxSetIdSessionEntries = BeefySetIdSessionEntries;
-    type OnNewValidatorSet = MmrLeaf;
+    type OnNewValidatorSet = BeefyMmrLeaf;
     type WeightInfo = ();
     type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, BeefyId)>>::Proof;
     type EquivocationReportSystem =
         pallet_beefy::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
-    type AncestryHelper = MmrLeaf;
+    type AncestryHelper = BeefyMmrLeaf;
 }
 
 /// MMR helper types.
@@ -1597,7 +1598,7 @@ construct_runtime! {
         // MMR leaf construction must be after session in order to have a leaf's next_auth_set
         // refer to block<N>.
         Mmr: pallet_mmr = 241,
-        MmrLeaf: pallet_beefy_mmr = 242,
+        BeefyMmrLeaf: pallet_beefy_mmr = 242,
         EthereumBeaconClient: snowbridge_pallet_ethereum_client = 243,
 
         ParasSudoWrapper: paras_sudo_wrapper = 250,
@@ -1633,6 +1634,7 @@ pub type SignedExtra = (
     frame_system::CheckNonce<Runtime>,
     frame_system::CheckWeight<Runtime>,
     pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+    frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.
@@ -2408,11 +2410,11 @@ sp_api::impl_runtime_apis! {
 
     impl pallet_beefy_mmr::BeefyMmrApi<Block, Hash> for RuntimeApi {
         fn authority_set_proof() -> beefy_primitives::mmr::BeefyAuthoritySet<Hash> {
-            MmrLeaf::authority_set_proof()
+            BeefyMmrLeaf::authority_set_proof()
         }
 
         fn next_authority_set_proof() -> beefy_primitives::mmr::BeefyNextAuthoritySet<Hash> {
-            MmrLeaf::next_authority_set_proof()
+            BeefyMmrLeaf::next_authority_set_proof()
         }
     }
 

solo-chains/runtime/dancelight/src/tests/common/mod.rs

@@ -59,8 +59,8 @@ use {
 
 pub use crate::{
     genesis_config_presets::get_authority_keys_from_seed, AccountId, AuthorNoting, Babe, Balance,
-    Balances, Beefy, ContainerRegistrar, DataPreservers, Grandpa, InflationRewards, Initializer,
-    Mmr, MmrLeaf, Runtime, RuntimeOrigin, Session, System, TanssiAuthorityAssignment,
+    Balances, Beefy, BeefyMmrLeaf, ContainerRegistrar, DataPreservers, Grandpa, InflationRewards,
+    Initializer, Mmr, Runtime, RuntimeOrigin, Session, System, TanssiAuthorityAssignment,
     TanssiCollatorAssignment, TransactionPayment,
 };
 
@@ -250,7 +250,7 @@ pub fn start_block() -> RunSummary {
 
     Beefy::on_initialize(System::block_number());
     Mmr::on_initialize(System::block_number());
-    MmrLeaf::on_initialize(System::block_number());
+    BeefyMmrLeaf::on_initialize(System::block_number());
 
     RunSummary {
         inflation: new_issuance - current_issuance,
@@ -270,7 +270,7 @@ pub fn end_block() {
     TanssiCollatorAssignment::on_finalize(System::block_number());
     Beefy::on_finalize(System::block_number());
     Mmr::on_finalize(System::block_number());
-    MmrLeaf::on_finalize(System::block_number());
+    BeefyMmrLeaf::on_finalize(System::block_number());
 }
 
 pub fn run_block() -> RunSummary {

solo-chains/runtime/dancelight/src/tests/migrations_test.rs

@@ -0,0 +1,74 @@
+// Copyright (C) Moondance Labs Ltd.
+// This file is part of Tanssi.
+
+// Tanssi is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Tanssi is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
+
+use crate::tests::common::ExtBuilder;
+use crate::{BeefyMmrLeaf, PalletInfo, Runtime};
+use beefy_primitives::mmr::BeefyAuthoritySet;
+use frame_support::storage::unhashed;
+use frame_support::traits::PalletInfo as _;
+use pallet_migrations::Migration;
+use tanssi_runtime_common::migrations::MigrateMMRLeafPallet;
+use xcm::v3::Weight;
+
+#[test]
+fn test_migration_mmr_leaf_pallet_renaming() {
+    ExtBuilder::default().build().execute_with(|| {
+        let migrate_mmr_leaf_pallet = MigrateMMRLeafPallet::<Runtime>(Default::default());
+        let old_pallet_name = MigrateMMRLeafPallet::<Runtime>::old_pallet_name();
+        let old_storage_1 = frame_support::storage::storage_prefix(
+            old_pallet_name.as_bytes(),
+            b"example_storage_1",
+        );
+        let new_storage_1 = frame_support::storage::storage_prefix(
+            PalletInfo::name::<BeefyMmrLeaf>()
+                .expect("BeefyMMRLeaf pallet must be part of the runtime")
+                .as_bytes(),
+            b"example_storage_1",
+        );
+        unhashed::put(&old_storage_1, &1u64);
+
+        let beefy_authority_set: BeefyAuthoritySet<()> = BeefyAuthoritySet {
+            len: 5,
+            ..Default::default()
+        };
+        let old_storage_2 = frame_support::storage::storage_prefix(
+            old_pallet_name.as_bytes(),
+            b"example_storage_2",
+        );
+        let new_storage_2 = frame_support::storage::storage_prefix(
+            PalletInfo::name::<BeefyMmrLeaf>()
+                .expect("BeefyMMRLeaf pallet must be part of the runtime")
+                .as_bytes(),
+            b"example_storage_2",
+        );
+        unhashed::put(&old_storage_2, &beefy_authority_set);
+
+        let used_weight = migrate_mmr_leaf_pallet.migrate(Weight::MAX);
+        assert_eq!(used_weight, Weight::MAX);
+
+        assert_eq!(unhashed::get::<u64>(&old_storage_1), None);
+        assert_eq!(unhashed::get::<BeefyAuthoritySet<()>>(&old_storage_2), None);
+
+        assert_eq!(unhashed::get::<u64>(&new_storage_1), Some(1u64));
+        assert_eq!(
+            unhashed::get::<BeefyAuthoritySet<()>>(&new_storage_2),
+            Some(BeefyAuthoritySet {
+                len: 5,
+                ..Default::default()
+            })
+        );
+    });
+}

solo-chains/runtime/dancelight/src/tests/mod.rs

@@ -28,6 +28,7 @@ mod core_scheduling_tests;
 mod ethereum_client;
 mod inflation_rewards;
 mod integration_test;
+mod migrations_test;
 mod relay_configuration;
 mod relay_registrar;
 mod services_payment;

test/suites/dev-tanssi-relay/chain-spec/test_chain_spec.ts

@@ -29,7 +29,7 @@ describeSuite({
                 expect(implVersion, "Relay API incorrect").to.toBe(0);
 
                 const transactionVersion = polkadotJs.consts.system.version.transactionVersion.toNumber();
-                expect(transactionVersion, "Relay API incorrect").to.toBe(25);
+                expect(transactionVersion, "Relay API incorrect").to.toBe(26);
 
                 const stateVersion = polkadotJs.consts.system.version.stateVersion.toNumber();
                 expect(stateVersion, "Relay API incorrect").to.toBe(1);