Implement granpda setting extrinsic

Author: ales-otf

Cargo.lock

@@ -40,6 +40,7 @@ sp-tracing = { workspace = true }
 sp-consensus-aura = { workspace = true }
 pallet-balances = { workspace = true, features = ["std"] }
 pallet-scheduler = { workspace = true }
+pallet-grandpa = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
@@ -53,6 +54,7 @@ std = [
 	"pallet-balances/std",
 	"pallet-drand/std",
 	"pallet-evm-chain-id/std",
+	"pallet-grandpa/std",
 	"pallet-scheduler/std",
 	"pallet-subtensor/std",
 	"scale-info/std",
@@ -71,18 +73,20 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"pallet-subtensor/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks",
 	"pallet-drand/runtime-benchmarks",
+	"pallet-grandpa/runtime-benchmarks",
+	"pallet-scheduler/runtime-benchmarks",
+	"pallet-subtensor/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-drand/try-runtime",
 	"pallet-evm-chain-id/try-runtime",
+	"pallet-grandpa/try-runtime",
 	"pallet-scheduler/try-runtime",
-	"sp-runtime/try-runtime",
 	"pallet-subtensor/try-runtime",
-	"pallet-drand/try-runtime",
+	"sp-runtime/try-runtime",
 ]

pallets/admin-utils/Cargo.toml

@@ -1244,6 +1244,20 @@ pub mod pallet {
         }
 
         /// A public interface for `pallet_grandpa::Pallet::schedule_grandpa_change`.
+		///
+		/// Schedule a change in the authorities.
+		///
+		/// The change will be applied at the end of execution of the block `in_blocks` after the
+		/// current block. This value may be 0, in which case the change is applied at the end of
+		/// the current block.
+		///
+		/// If the `forced` parameter is defined, this indicates that the current set has been
+		/// synchronously determined to be offline and that after `in_blocks` the given change
+		/// should be applied. The given block number indicates the median last finalized block
+		/// number and it should be used as the canon block when starting the new grandpa voter.
+		///
+		/// No change should be signaled while any change is pending. Returns an error if a change
+		/// is already pending.
         #[pallet::call_index(59)]
         #[pallet::weight(<T as Config>::WeightInfo::swap_authorities(next_authorities.len() as u32))]
         pub fn schedule_grandpa_change(

pallets/admin-utils/src/lib.rs

@@ -6,7 +6,7 @@ use frame_support::{
     weights,
 };
 use frame_system as system;
-use frame_system::{limits, EnsureNever, EnsureRoot};
+use frame_system::{limits, pallet_prelude::BlockNumberFor, EnsureNever, EnsureRoot};
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::U256;
 use sp_core::{ConstU64, H256};
@@ -29,7 +29,8 @@ frame_support::construct_runtime!(
         SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>, Error<T>} = 4,
         Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 5,
         Drand: pallet_drand::{Pallet, Call, Storage, Event<T>} = 6,
-        EVMChainId: pallet_evm_chain_id = 7,
+        Grandpa: pallet_grandpa = 7,
+        EVMChainId: pallet_evm_chain_id = 8,
     }
 );
 
@@ -225,6 +226,19 @@ impl system::Config for Test {
     type Nonce = u64;
 }
 
+impl pallet_grandpa::Config for Test {
+    type RuntimeEvent = RuntimeEvent;
+
+    type KeyOwnerProof = sp_core::Void;
+
+    type WeightInfo = ();
+    type MaxAuthorities = ConstU32<32>;
+    type MaxSetIdSessionEntries = ConstU64<0>;
+    type MaxNominators = ConstU32<20>;
+
+    type EquivocationReportSystem = ();
+}
+
 #[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
 impl pallet_balances::Config for Test {
     type MaxLocks = ();
@@ -249,11 +263,23 @@ impl PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
     }
 }
 
+pub struct GrandpaInterfaceImpl;
+impl crate::GrandpaInterface<Test> for GrandpaInterfaceImpl {
+    fn schedule_change(
+        next_authorities: Vec<(pallet_grandpa::AuthorityId, u64)>,
+        in_blocks: BlockNumberFor<Test>,
+        forced: Option<BlockNumberFor<Test>>,
+    ) -> sp_runtime::DispatchResult {
+        Grandpa::schedule_change(next_authorities, in_blocks, forced)
+    }
+}
+
 impl crate::Config for Test {
     type RuntimeEvent = RuntimeEvent;
     type AuthorityId = AuraId;
     type MaxAuthorities = ConstU32<32>;
     type Aura = ();
+    type Grandpa = GrandpaInterfaceImpl;
     type Balance = Balance;
     type WeightInfo = ();
 }

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

@@ -2,11 +2,13 @@ use frame_support::sp_runtime::DispatchError;
 use frame_support::{
     assert_err, assert_noop, assert_ok,
     dispatch::{DispatchClass, GetDispatchInfo, Pays},
+    traits::Hooks,
 };
 use frame_system::Config;
 use pallet_subtensor::Error as SubtensorError;
 use pallet_subtensor::{migrations, Event};
-use sp_core::U256;
+use sp_consensus_grandpa::AuthorityId as GrandpaId;
+use sp_core::{ed25519, Pair, U256};
 
 use crate::Error;
 use mock::*;
@@ -1466,3 +1468,25 @@ fn test_sudo_non_root_cannot_set_evm_chain_id() {
         assert_eq!(pallet_evm_chain_id::ChainId::<Test>::get(), 0);
     });
 }
+
+#[test]
+fn test_schedule_grandpa_change() {
+    new_test_ext().execute_with(|| {
+        assert_eq!(Grandpa::grandpa_authorities(), vec![]);
+
+        let bob: GrandpaId = ed25519::Pair::from_legacy_string("//Bob", None)
+            .public()
+            .into();
+
+        assert_ok!(AdminUtils::schedule_grandpa_change(
+            RuntimeOrigin::root(),
+            vec![(bob.clone(), 1)],
+            41,
+            None
+        ));
+
+        Grandpa::on_finalize(42);
+
+        assert_eq!(Grandpa::grandpa_authorities(), vec![(bob, 1)]);
+    });
+}

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

@@ -63,6 +63,7 @@ pub trait WeightInfo {
 	fn sudo_set_commit_reveal_weights_interval() -> Weight;
 	fn sudo_set_commit_reveal_weights_enabled() -> Weight;
 	fn sudo_set_evm_chain_id() -> Weight;
+	fn schedule_grandpa_change(a: u32) -> Weight;
 }
 
 /// Weights for `pallet_admin_utils` using the Substrate node and recommended hardware.
@@ -436,6 +437,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		Weight::from_parts(20_200_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
+
+	fn schedule_grandpa_change(_a: u32) -> Weight {
+		// TODO should be replaced by benchmared weights
+		10_000.into()
+	}
 }
 
 // For backwards compatibility and tests.
@@ -814,4 +820,8 @@ impl WeightInfo for () {
 		Weight::from_parts(20_200_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-}
+	fn schedule_grandpa_change(_a: u32) -> Weight {
+		// TODO should be replaced by benchmared weights
+		10_000.into()
+	}
+}