Release v0.11.0 (with New MMR)

node/service/src/chain_spec/crab.rs

@@ -187,8 +187,8 @@ pub fn crab_build_spec_genesis() -> GenesisConfig {
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: Default::default(),
 		darwinia_democracy: Default::default(),
-		pallet_collective_Instance2: Default::default(),
 		pallet_collective_Instance1: Default::default(),
+		pallet_collective_Instance2: Default::default(),
 		darwinia_elections_phragmen: Default::default(),
 		pallet_membership_Instance1: Default::default(),
 		darwinia_claims: ClaimsConfig {
@@ -296,8 +296,8 @@ pub fn crab_testnet_genesis(
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: Default::default(),
 		darwinia_democracy: Default::default(),
-		pallet_collective_Instance2: Default::default(),
 		pallet_collective_Instance1: Default::default(),
+		pallet_collective_Instance2: Default::default(),
 		darwinia_elections_phragmen: Default::default(),
 		pallet_membership_Instance1: Default::default(),
 		darwinia_claims: ClaimsConfig {

node/service/src/chain_spec/darwinia.rs

@@ -286,8 +286,8 @@ pub fn darwinia_build_spec_genesis() -> GenesisConfig {
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: Default::default(),
-		pallet_collective_Instance2: Default::default(),
 		pallet_collective_Instance1: Default::default(),
+		pallet_collective_Instance2: Default::default(),
 		darwinia_elections_phragmen: Default::default(),
 		pallet_membership_Instance1: Default::default(),
 		darwinia_vesting: VestingConfig {
@@ -425,8 +425,8 @@ pub fn darwinia_testnet_genesis(
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: Default::default(),
-		pallet_collective_Instance2: Default::default(),
 		pallet_collective_Instance1: Default::default(),
+		pallet_collective_Instance2: Default::default(),
 		darwinia_elections_phragmen: Default::default(),
 		pallet_membership_Instance1: Default::default(),
 		darwinia_vesting: Default::default(),

runtime/crab/src/lib.rs

@@ -204,11 +204,11 @@ frame_support::construct_runtime! {
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 11,
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Config<T>, Event<T>, ValidateUnsigned} = 12,
 		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config} = 13,
-		HeaderMMR: darwinia_header_mmr::{Pallet, Call, Storage} = 31,
+		DarwiniaHeaderMMR: darwinia_header_mmr::{Pallet, Call, Storage} = 31,
 
 		// Governance stuff; uncallable initially.
-		Council: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Config<T>, Event<T>} = 14,
-		TechnicalCommittee: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Config<T>, Event<T>} = 15,
+		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Config<T>, Event<T>} = 14,
+		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Config<T>, Event<T>} = 15,
 		PhragmenElection: darwinia_elections_phragmen::{Pallet, Call, Storage, Config<T>, Event<T>} = 26,
 		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Config<T>, Event<T>} = 16,
 		Treasury: darwinia_treasury::{Pallet, Call, Storage, Event<T>} = 32,
@@ -507,7 +507,7 @@ sp_api::impl_runtime_apis! {
 			block_number_of_member_leaf: u64,
 			block_number_of_last_leaf: u64
 		) -> HeaderMMRRuntimeDispatchInfo<Hash> {
-			HeaderMMR::gen_proof_rpc(block_number_of_member_leaf, block_number_of_last_leaf )
+			DarwiniaHeaderMMR::gen_proof_rpc(block_number_of_member_leaf, block_number_of_last_leaf )
 		}
 	}
 
@@ -663,25 +663,48 @@ pub struct CustomOnRuntimeUpgrade;
 impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	#[cfg(feature = "try-runtime")]
 	fn pre_upgrade() -> Result<(), &'static str> {
-		// --- substrate ---
-		// use frame_support::migration;
-
 		Ok(())
 	}
 
 	fn on_runtime_upgrade() -> Weight {
-		// --- substrate ---
-		use frame_support::migration;
+		migrate()
+	}
+}
 
-		migration::move_pallet(b"Instance0DarwiniaBalances", b"Balances");
-		migration::move_pallet(b"Instance1DarwiniaBalances", b"Kton");
+fn migrate() -> Weight {
+	// --- paritytech ---
+	use frame_support::{migration, storage::StorageMap};
 
-		migration::move_pallet(b"Instance0Collective", b"Instance2Collective");
+	const BAD_SCHEDULE_KEY: BlockNumber = 2332800;
 
-		migration::move_pallet(b"Instance0Membership", b"Instance1Membership");
+	log::info!("Moving storage `Instance0DarwiniaBalances` to `Balances`");
+	migration::move_pallet(b"Instance0DarwiniaBalances", b"Balances");
+	log::info!("Moving storage `Instance1DarwiniaBalances` to `Kton`");
+	migration::move_pallet(b"Instance1DarwiniaBalances", b"Kton");
 
-		migration::move_pallet(b"DarwiniaPhragmenElection", b"PhragmenElection");
+	// Tech.Comm to Instance2
+	log::info!("Moving storage `Instance1Collective` to `Instance2Collective`");
+	migration::move_pallet(b"Instance1Collective", b"Instance2Collective");
+	// Council to Instance1
+	log::info!("Moving storage `Instance0Collective` to `Instance1Collective`");
+	migration::move_pallet(b"Instance0Collective", b"Instance1Collective");
 
-		RuntimeBlockWeights::get().max_block
-	}
+	log::info!("Moving storage `Instance0Membership` to `Instance1Membership`");
+	migration::move_pallet(b"Instance0Membership", b"Instance1Membership");
+
+	log::info!("Moving storage `DarwiniaPhragmenElection` to `PhragmenElection`");
+	migration::move_pallet(b"DarwiniaPhragmenElection", b"PhragmenElection");
+
+	#[cfg(feature = "try-runtime")]
+	assert!(<pallet_scheduler::Agenda<Runtime>>::contains_key(
+		BAD_SCHEDULE_KEY
+	));
+	log::info!("Removing bad schedule");
+	<pallet_scheduler::Agenda<Runtime>>::remove(BAD_SCHEDULE_KEY);
+	#[cfg(feature = "try-runtime")]
+	assert!(!<pallet_scheduler::Agenda<Runtime>>::contains_key(
+		BAD_SCHEDULE_KEY
+	));
+
+	RuntimeBlockWeights::get().max_block
 }

runtime/crab/src/pallets/collective.rs

@@ -1,4 +1,4 @@
-pub use pallet_collective::{Instance1 as TechnicalCollective, Instance2 as CouncilCollective};
+pub use pallet_collective::{Instance1 as CouncilCollective, Instance2 as TechnicalCollective};
 
 // --- substrate ---
 use frame_system::{EnsureOneOf, EnsureRoot};

runtime/crab/src/pallets/header_mmr.rs

@@ -2,4 +2,8 @@
 use crate::*;
 use darwinia_header_mmr::Config;
 
-impl Config for Runtime {}
+impl Config for Runtime {
+	type WeightInfo = ();
+
+	const INDEXING_PREFIX: &'static [u8] = b"header-mmr-";
+}

runtime/crab/src/pallets/proxy.rs

@@ -62,7 +62,7 @@ impl InstanceFilter<Call> for ProxyType {
 				Call::Scheduler(..) |
 				Call::Proxy(..) |
 				Call::Multisig(..) |
-				Call::HeaderMMR(..) // Specifically omitting the entire CrabIssuing pallet
+				Call::DarwiniaHeaderMMR(..) // Specifically omitting the entire CrabIssuing pallet
 			),
 			ProxyType::Governance => matches!(
 				c,

runtime/darwinia/src/lib.rs

@@ -251,12 +251,12 @@ frame_support::construct_runtime! {
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 13,
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Config<T>, Event<T>, ValidateUnsigned} = 14,
 		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config} = 15,
-		HeaderMMR: darwinia_header_mmr::{Pallet, Call, Storage} = 35,
+		DarwiniaHeaderMMR: darwinia_header_mmr::{Pallet, Call, Storage} = 35,
 
 		// Governance stuff; uncallable initially.
 		Democracy: darwinia_democracy::{Pallet, Call, Storage, Config, Event<T>} = 37,
-		Council: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Config<T>, Event<T>} = 16,
-		TechnicalCommittee: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Config<T>, Event<T>} = 17,
+		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Config<T>, Event<T>} = 16,
+		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Config<T>, Event<T>} = 17,
 		PhragmenElection: darwinia_elections_phragmen::{Pallet, Call, Storage, Config<T>, Event<T>} = 18,
 		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Config<T>, Event<T>} = 19,
 		Treasury: darwinia_treasury::{Pallet, Call, Storage, Event<T>} = 20,
@@ -551,7 +551,7 @@ impl_runtime_apis! {
 			block_number_of_member_leaf: u64,
 			block_number_of_last_leaf: u64
 		) -> HeaderMMRRuntimeDispatchInfo<Hash> {
-			HeaderMMR::gen_proof_rpc(block_number_of_member_leaf, block_number_of_last_leaf )
+			DarwiniaHeaderMMR::gen_proof_rpc(block_number_of_member_leaf, block_number_of_last_leaf )
 		}
 	}
 
@@ -588,7 +588,10 @@ impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 		migration::move_pallet(b"Instance0DarwiniaBalances", b"Balances");
 		migration::move_pallet(b"Instance1DarwiniaBalances", b"Kton");
 
-		migration::move_pallet(b"Instance0Collective", b"Instance2Collective");
+		// Tech.Comm to Instance2
+		migration::move_pallet(b"Instance1Collective", b"Instance2Collective");
+		// Council to Instance1
+		migration::move_pallet(b"Instance0Collective", b"Instance1Collective");
 
 		migration::move_pallet(b"Instance0Membership", b"Instance1Membership");
 

runtime/darwinia/src/pallets/collective.rs

@@ -1,4 +1,4 @@
-pub use pallet_collective::{Instance1 as TechnicalCollective, Instance2 as CouncilCollective};
+pub use pallet_collective::{Instance1 as CouncilCollective, Instance2 as TechnicalCollective};
 
 // --- substrate ---
 use frame_system::{EnsureOneOf, EnsureRoot};

runtime/darwinia/src/pallets/header_mmr.rs

@@ -2,4 +2,8 @@
 use crate::*;
 use darwinia_header_mmr::Config;
 
-impl Config for Runtime {}
+impl Config for Runtime {
+	type WeightInfo = ();
+
+	const INDEXING_PREFIX: &'static [u8] = b"header-mmr-";
+}

runtime/darwinia/src/pallets/proxy.rs

@@ -64,7 +64,7 @@ impl InstanceFilter<Call> for ProxyType {
 				// Specifically omitting the entire EthereumBacking pallet
 				Call::EthereumRelay(..) |
 				// Specifically omitting the entire TronBacking pallet
-				Call::HeaderMMR(..) // Specifically omitting the entire EthereumRelayAuthorities pallet
+				Call::DarwiniaHeaderMMR(..) // Specifically omitting the entire EthereumRelayAuthorities pallet
 			),
 			ProxyType::Governance => matches!(
 				c,

runtime/darwinia/src/pallets/relay_authorities.rs

@@ -29,7 +29,7 @@ impl Config<EthereumRelayAuthoritiesInstance> for Runtime {
 	type AddOrigin = ApproveOrigin;
 	type RemoveOrigin = ApproveOrigin;
 	type ResetOrigin = ApproveOrigin;
-	type DarwiniaMMR = HeaderMMR;
+	type DarwiniaMMR = DarwiniaHeaderMMR;
 	type Sign = EthereumBacking;
 	type OpCodes = OpCodes;
 	type SignThreshold = SignThreshold;