wip merge babe in runtime

Author: orriin

pallets/admin-utils/src/lib.rs

@@ -12,7 +12,7 @@ use frame_system::pallet_prelude::BlockNumberFor;
 // - 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};
+use sp_runtime::DispatchResult;
 
 mod benchmarking;
 
@@ -28,7 +28,6 @@ pub mod pallet {
     use frame_support::traits::tokens::Balance;
     use frame_system::pallet_prelude::*;
     use pallet_evm_chain_id::{self, ChainId};
-    use sp_runtime::BoundedVec;
 
     /// The main data structure of the module.
     #[pallet::pallet]
@@ -45,22 +44,9 @@ pub mod pallet {
         /// Because this pallet emits events, it depends on the runtime's definition of an event.
         type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
-        /// Implementation of the AuraInterface
-        type Aura: crate::AuraInterface<<Self as Config>::AuthorityId, Self::MaxAuthorities>;
-
         /// Implementation of [`GrandpaInterface`]
         type Grandpa: crate::GrandpaInterface<Self>;
 
-        /// The identifier type for an authority.
-        type AuthorityId: Member
-            + Parameter
-            + RuntimeAppPublic
-            + MaybeSerializeDeserialize
-            + MaxEncodedLen;
-
-        /// The maximum number of authorities that the pallet can hold.
-        type MaxAuthorities: Get<u32>;
-
         /// Weight information for extrinsics in this pallet.
         type WeightInfo: WeightInfo;
 
@@ -85,25 +71,6 @@ pub mod pallet {
     /// Dispatchable functions allows users to interact with the pallet and invoke state changes.
     #[pallet::call]
     impl<T: Config> Pallet<T> {
-        /// The extrinsic sets the new authorities for Aura consensus.
-        /// It is only callable by the root account.
-        /// The extrinsic will call the Aura pallet to change the authorities.
-        #[pallet::call_index(0)]
-        #[pallet::weight(<T as Config>::WeightInfo::swap_authorities(new_authorities.len() as u32))]
-        pub fn swap_authorities(
-            origin: OriginFor<T>,
-            new_authorities: BoundedVec<<T as Config>::AuthorityId, T::MaxAuthorities>,
-        ) -> DispatchResult {
-            ensure_root(origin)?;
-
-            T::Aura::change_authorities(new_authorities.clone());
-
-            log::debug!("Aura authorities changed: {:?}", new_authorities);
-
-            // Return a successful DispatchResultWithPostInfo
-            Ok(())
-        }
-
         /// The extrinsic sets the default take for the network.
         /// It is only callable by the root account.
         /// The extrinsic will call the Subtensor pallet to set the default take.
@@ -1281,21 +1248,6 @@ pub mod pallet {
     }
 }
 
-impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
-    type Public = <T as Config>::AuthorityId;
-}
-
-// Interfaces to interact with other pallets
-use sp_runtime::BoundedVec;
-
-pub trait AuraInterface<AuthorityId, MaxAuthorities> {
-    fn change_authorities(new: BoundedVec<AuthorityId, MaxAuthorities>);
-}
-
-impl<A, M> AuraInterface<A, M> for () {
-    fn change_authorities(_: BoundedVec<A, M>) {}
-}
-
 pub trait GrandpaInterface<Runtime>
 where
     Runtime: frame_system::Config,

runtime/src/lib.rs

@@ -371,14 +371,6 @@ impl frame_system::Config for Runtime {
     type PostTransactions = ();
 }
 
-impl pallet_aura::Config for Runtime {
-    type AuthorityId = AuraId;
-    type DisabledValidators = ();
-    type MaxAuthorities = ConstU32<32>;
-    type AllowMultipleBlocksPerSlot = ConstBool<false>;
-    type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Runtime>;
-}
-
 parameter_types! {
     pub EpochDuration: u64 = prod_or_fast!(
         EPOCH_DURATION_IN_SLOTS as u64,
@@ -1541,13 +1533,6 @@ impl pallet_subtensor::Config for Runtime {
 
 use sp_runtime::BoundedVec;
 
-pub struct AuraPalletIntrf;
-impl pallet_admin_utils::AuraInterface<AuraId, ConstU32<32>> for AuraPalletIntrf {
-    fn change_authorities(new: BoundedVec<AuraId, ConstU32<32>>) {
-        Aura::change_authorities(new);
-    }
-}
-
 pub struct GrandpaInterfaceImpl;
 impl pallet_admin_utils::GrandpaInterface<Runtime> for GrandpaInterfaceImpl {
     fn schedule_change(
@@ -1561,9 +1546,6 @@ impl pallet_admin_utils::GrandpaInterface<Runtime> for GrandpaInterfaceImpl {
 
 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>;
@@ -1590,10 +1572,10 @@ impl<F: FindAuthor<u32>> FindAuthor<H160> for FindAuthorTruncated<F> {
         I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
     {
         if let Some(author_index) = F::find_author(digests) {
-            pallet_aura::Authorities::<Runtime>::get()
+            pallet_babe::Authorities::<Runtime>::get()
                 .get(author_index as usize)
                 .and_then(|authority_id| {
-                    let raw_vec = authority_id.to_raw_vec();
+                    let raw_vec = authority_id.0.to_raw_vec();
                     raw_vec.get(4..24).map(H160::from_slice)
                 })
         } else {
@@ -1672,7 +1654,7 @@ impl pallet_evm::Config for Runtime {
     type Runner = pallet_evm::runner::stack::Runner<Self>;
     type OnChargeTransaction = ();
     type OnCreate = ();
-    type FindAuthor = FindAuthorTruncated<Aura>;
+    type FindAuthor = FindAuthorTruncated<Babe>;
     type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
     type SuicideQuickClearLimit = SuicideQuickClearLimit;
     type Timestamp = Timestamp;
@@ -1810,7 +1792,7 @@ construct_runtime!(
         System: frame_system = 0,
         RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip = 1,
         Timestamp: pallet_timestamp = 2,
-        Aura: pallet_aura = 3,
+        // Aura: pallet_aura = 3,
         Grandpa: pallet_grandpa = 4,
         Balances: pallet_balances = 5,
         TransactionPayment: pallet_transaction_payment = 6,
@@ -2521,11 +2503,13 @@ impl_runtime_apis! {
 
     impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
         fn slot_duration() -> sp_consensus_aura::SlotDuration {
-            sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
+            unimplemented!()
+            // sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
         }
 
         fn authorities() -> Vec<AuraId> {
-            pallet_aura::Authorities::<Runtime>::get().into_inner()
+            unimplemented!()
+            // pallet_aura::Authorities::<Runtime>::get().into_inner()
         }
     }