Implement grandpa interface from admin-utils for runtime

Author: ales-otf

Cargo.toml

@@ -138,7 +138,7 @@ sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag
 sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409" }
 sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
-sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409" }
+sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }

pallets/admin-utils/Cargo.toml

@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-subtensor-macros.workspace = true
+subtensor-macros = { workspace = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
 	"derive",
 ] }

pallets/admin-utils/src/lib.rs

@@ -1,11 +1,17 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
+// extern crate alloc;
+
 pub use pallet::*;
 pub mod weights;
 pub use weights::WeightInfo;
 
 use frame_system::pallet_prelude::BlockNumberFor;
-use sp_consensus_grandpa::AuthorityId as GrandpaId;
+// - we could replace it with Vec<(AuthorityId, u64)>, but we would need
+//   `sp_consensus_grandpa` for `AuthorityId` anyway
+// - we could use a type parameter for `AuthorityId`, but there is
+//   no sense for this as GRANDPA's `AuthorityId` is not a parameter -- it's always the same
+use sp_consensus_grandpa::AuthorityList;
 use sp_runtime::{traits::Member, DispatchResult, RuntimeAppPublic};
 
 mod benchmarking;
@@ -1263,7 +1269,7 @@ pub mod pallet {
         pub fn schedule_grandpa_change(
             origin: OriginFor<T>,
             // grandpa ID is always the same type, so we don't need to parametrize it via `Config`
-            next_authorities: Vec<(GrandpaId, u64)>,
+            next_authorities: AuthorityList,
             in_blocks: BlockNumberFor<T>,
             forced: Option<BlockNumberFor<T>>,
         ) -> DispatchResult {
@@ -1288,12 +1294,14 @@ impl<A, M> AuraInterface<A, M> for () {
     fn change_authorities(_: BoundedVec<A, M>) {}
 }
 
+
+
 pub trait GrandpaInterface<Runtime>
 where
     Runtime: frame_system::Config,
 {
     fn schedule_change(
-        next_authorities: Vec<(GrandpaId, u64)>,
+        next_authorities: AuthorityList,
         in_blocks: BlockNumberFor<Runtime>,
         forced: Option<BlockNumberFor<Runtime>>,
     ) -> DispatchResult;
@@ -1304,7 +1312,7 @@ where
     R: frame_system::Config,
 {
     fn schedule_change(
-        _next_authorities: Vec<(GrandpaId, u64)>,
+        _next_authorities: AuthorityList,
         _in_blocks: BlockNumberFor<R>,
         _forced: Option<BlockNumberFor<R>>,
     ) -> DispatchResult {

pallets/admin-utils/src/tests/mock.rs

@@ -8,6 +8,7 @@ use frame_support::{
 use frame_system as system;
 use frame_system::{limits, pallet_prelude::BlockNumberFor, EnsureNever, EnsureRoot};
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
+use sp_consensus_grandpa::AuthorityList as GrandpaAuthorityList;
 use sp_core::U256;
 use sp_core::{ConstU64, H256};
 use sp_runtime::{
@@ -266,7 +267,7 @@ impl PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
 pub struct GrandpaInterfaceImpl;
 impl crate::GrandpaInterface<Test> for GrandpaInterfaceImpl {
     fn schedule_change(
-        next_authorities: Vec<(pallet_grandpa::AuthorityId, u64)>,
+        next_authorities: GrandpaAuthorityList,
         in_blocks: BlockNumberFor<Test>,
         forced: Option<BlockNumberFor<Test>>,
     ) -> sp_runtime::DispatchResult {

pallets/admin-utils/src/weights.rs

@@ -439,8 +439,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 
 	fn schedule_grandpa_change(_a: u32) -> Weight {
-		// TODO should be replaced by benchmared weights
-		10_000.into()
+		// TODO should be replaced by benchmarked weights
+		Weight::default()
 	}
 }
 
@@ -821,7 +821,7 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	fn schedule_grandpa_change(_a: u32) -> Weight {
-		// TODO should be replaced by benchmared weights
-		10_000.into()
+		// TODO should be replaced by benchmarked weights
+		Weight::default()
 	}
 }

runtime/src/lib.rs

@@ -1121,11 +1121,23 @@ impl pallet_admin_utils::AuraInterface<AuraId, ConstU32<32>> for AuraPalletIntrf
     }
 }
 
+pub struct GrandpaInterfaceImpl;
+impl pallet_admin_utils::GrandpaInterface<Runtime> for GrandpaInterfaceImpl {
+    fn schedule_change(
+        next_authorities: Vec<(pallet_grandpa::AuthorityId, u64)>,
+        in_blocks: BlockNumber,
+        forced: Option<BlockNumber>,
+    ) -> sp_runtime::DispatchResult {
+        Grandpa::schedule_change(next_authorities, in_blocks, forced)
+    }
+}
+
 impl pallet_admin_utils::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type AuthorityId = AuraId;
     type MaxAuthorities = ConstU32<32>;
     type Aura = AuraPalletIntrf;
+	type Grandpa = GrandpaInterfaceImpl;
     type Balance = Balance;
     type WeightInfo = pallet_admin_utils::weights::SubstrateWeight<Runtime>;
 }