Merge branch 'master' into polkadot-v0.9.42

crates/humanode-runtime/src/deauthentication_reason.rs

@@ -0,0 +1,13 @@
+//! `DeauthenticationReason` implementation to define reasons by which authentication is removed
+//! before expected time expiration.
+
+use codec::{Decode, Encode};
+use scale_info::TypeInfo;
+use sp_std::prelude::*;
+
+/// Define a possible deauthentication reason.
+#[derive(Clone, PartialEq, Debug, Encode, Decode, TypeInfo)]
+pub enum DeauthenticationReason {
+    /// Some offence has been recevied.
+    Offence,
+}

crates/humanode-runtime/src/lib.rs

@@ -86,6 +86,7 @@ use frontier_precompiles::{precompiles_constants, FrontierPrecompiles};
 mod benchmarking;
 pub mod constants;
 mod currency_swap;
+mod deauthentication_reason;
 #[cfg(test)]
 mod dev_utils;
 mod display_moment;
@@ -107,6 +108,7 @@ pub use constants::{
     ethereum::EXTRA_DATA_LENGTH,
     im_online::{MAX_KEYS, MAX_PEER_DATA_ENCODING_SIZE, MAX_PEER_IN_HEARTBEATS},
 };
+use deauthentication_reason::DeauthenticationReason;
 use static_assertions::const_assert;
 
 /// An index to a block.
@@ -539,6 +541,7 @@ impl pallet_bioauth::Config for Runtime {
     type MaxNonces = ConstU32<MAX_NONCES>;
     type BeforeAuthHook = ();
     type AfterAuthHook = ();
+    type DeauthenticationReason = DeauthenticationReason;
 }
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -589,19 +592,31 @@ impl
         }
         let mut weight: Weight = Weight::zero();
         let weights = <Runtime as frame_system::Config>::DbWeight::get();
+        let mut should_be_deauthenticated = Vec::with_capacity(offenders.len());
         for details in offenders {
             let (_offender, identity) = &details.offender;
             match identity {
                 pallet_humanode_session::Identification::Bioauth(authentication) => {
-                    let has_deauthenticated = Bioauth::deauthenticate(&authentication.public_key);
-                    weight = weight
-                        .saturating_add(weights.reads_writes(1, u64::from(has_deauthenticated)));
+                    should_be_deauthenticated.push(authentication.public_key.clone());
                 }
                 pallet_humanode_session::Identification::Bootnode(..) => {
                     // Never slash the bootnodes.
                 }
             }
         }
+        if !should_be_deauthenticated.is_empty() {
+            let deauthenticated_public_keys =
+                Bioauth::deauthenticate(should_be_deauthenticated, DeauthenticationReason::Offence);
+            weight = weight.saturating_add(
+                weights.reads_writes(
+                    1,
+                    deauthenticated_public_keys
+                        .len()
+                        .try_into()
+                        .expect("casting usize to u64 never fails in 64bit and 32bit word cpus"),
+                ),
+            );
+        }
         weight
     }
 }