25 changed files with 1227 additions and 1679 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1186,7 +1186,7 @@ dependencies = [

 [[package]]
 name = "casper-runtime"
-version = "3.5.34"
+version = "3.5.33"
 dependencies = [
 "casper-runtime-constants",
 "frame-benchmarking",
@ -1204,7 +1204,6 @@ dependencies = [
 "ghost-runtime-common",
 "ghost-slow-clap",
 "ghost-sudo",
- "ghost-traits",
 "log",
 "pallet-alliance",
 "pallet-authority-discovery",
@ -3650,7 +3649,7 @@ dependencies = [

 [[package]]
 name = "ghost-networks"
-version = "0.1.19"
+version = "0.1.16"
 dependencies = [
 "frame-benchmarking",
 "frame-support",
@ -3837,13 +3836,12 @@ dependencies = [

 [[package]]
 name = "ghost-slow-clap"
-version = "0.4.1"
+version = "0.3.47"
 dependencies = [
 "frame-benchmarking",
 "frame-support",
 "frame-system",
 "ghost-networks",
- "ghost-traits",
 "log",
 "pallet-balances",
 "pallet-session",
@ -3889,7 +3887,7 @@ dependencies = [

 [[package]]
 name = "ghost-traits"
-version = "0.3.25"
+version = "0.3.23"
 dependencies = [
 "frame-support",
 "sp-runtime 31.0.1",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -17,7 +17,7 @@ homepage.workspace = true
 [workspace.package]
 license = "GPL-3.0-only"
 authors = ["571nky", "57r37ch", "f4750"]
-version = "0.8.3"
+version = "0.8.2"
 edition = "2021"
 homepage = "https://ghostchain.io"
 repository = "https://git.ghostchain.io/ghostchain/ghost-node"
--- a/pallets/networks/Cargo.toml
+++ b/pallets/networks/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "ghost-networks"
-version = "0.1.19"
+version = "0.1.16"
 license.workspace = true
 authors.workspace = true
 edition.workspace = true
--- a/pallets/networks/src/benchmarking.rs
+++ b/pallets/networks/src/benchmarking.rs
@ -43,7 +43,6 @@ fn prepare_network<T: Config>(
        gatekeeper,
        topic_name,
        network_type: NetworkType::Evm,
-        avg_block_speed: 12,
        finality_delay: 69,
        rate_limit_delay: 69,
        block_distance: 69,
@ -240,20 +239,6 @@ benchmarks! {
        assert_ne!(GhostNetworks::<T>::networks(chain_id.clone()), prev_network);
    }

-    update_avg_block_speed {
-        let avg_block_speed = 420;
-        let (chain_id, network) = prepare_network::<T>(1, 1, 1);
-        let authority = T::UpdateOrigin::try_successful_origin()
-            .map_err(|_| BenchmarkError::Weightless)?;
-        let prev_network = create_network::<T>(chain_id.clone(), network.clone())?;
-    }: _<T::RuntimeOrigin>(authority, chain_id.clone(), avg_block_speed)
-    verify {
-        assert_last_event::<T>(Event::NetworkAvgBlockSpeedUpdated {
-            chain_id: chain_id.clone(), avg_block_speed,
-        }.into());
-        assert_ne!(GhostNetworks::<T>::networks(chain_id.clone()), prev_network);
-    }
-
    remove_network {
        let (chain_id, network) = prepare_network::<T>(1, 1, 1);
        let authority = T::RemoveOrigin::try_successful_origin()
--- a/pallets/networks/src/lib.rs
+++ b/pallets/networks/src/lib.rs
@ -38,7 +38,7 @@ mod tests;
 pub type BalanceOf<T> =
    <<T as Config>::Currency as Inspect<<T as frame_system::Config>::AccountId>>::Balance;

-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub enum NetworkType {
    Evm = 0,
    Utxo = 1,
@ -61,7 +61,6 @@ pub struct NetworkData {
    pub finality_delay: u64,
    pub rate_limit_delay: u64,
    pub block_distance: u64,
-    pub avg_block_speed: u64,
    pub incoming_fee: u32,
    pub outgoing_fee: u32,
 }
@ -221,10 +220,6 @@ pub mod module {
            chain_id: T::NetworkId,
            outgoing_fee: u32,
        },
-        NetworkAvgBlockSpeedUpdated {
-            chain_id: T::NetworkId,
-            avg_block_speed: u64,
-        },
        NetworkRemoved {
            chain_id: T::NetworkId,
        },
@ -438,17 +433,6 @@ pub mod module {
        }

        #[pallet::call_index(11)]
-        #[pallet::weight(T::WeightInfo::update_avg_block_speed())]
-        pub fn update_avg_block_speed(
-            origin: OriginFor<T>,
-            chain_id: T::NetworkId,
-            avg_block_speed: u64,
-        ) -> DispatchResult {
-            T::UpdateOrigin::ensure_origin_or_root(origin)?;
-            Self::do_update_avg_block_speed(chain_id, avg_block_speed)
-        }
-
-        #[pallet::call_index(12)]
        #[pallet::weight(T::WeightInfo::remove_network())]
        pub fn remove_network(origin: OriginFor<T>, chain_id: T::NetworkId) -> DispatchResult {
            T::RemoveOrigin::ensure_origin_or_root(origin)?;
@ -605,7 +589,7 @@ impl<T: Config> Pallet<T> {
        Networks::<T>::try_mutate(&chain_id, |maybe_network| -> DispatchResult {
            ensure!(maybe_network.is_some(), Error::<T>::NetworkDoesNotExist);
            let net = maybe_network.as_mut().unwrap();
-            net.network_type = network_type;
+            net.network_type = network_type.clone();
            *maybe_network = Some(net.clone());
            Ok(())
        })?;
@ -669,7 +653,7 @@ impl<T: Config> Pallet<T> {
        Networks::<T>::try_mutate(&chain_id, |maybe_network| -> DispatchResult {
            ensure!(maybe_network.is_some(), Error::<T>::NetworkDoesNotExist);
            let net = maybe_network.as_mut().unwrap();
-            net.incoming_fee = incoming_fee;
+            net.incoming_fee = incoming_fee.clone();
            *maybe_network = Some(net.clone());
            Ok(())
        })?;
@ -687,7 +671,7 @@ impl<T: Config> Pallet<T> {
        Networks::<T>::try_mutate(&chain_id, |maybe_network| -> DispatchResult {
            ensure!(maybe_network.is_some(), Error::<T>::NetworkDoesNotExist);
            let net = maybe_network.as_mut().unwrap();
-            net.outgoing_fee = outgoing_fee;
+            net.outgoing_fee = outgoing_fee.clone();
            *maybe_network = Some(net.clone());
            Ok(())
        })?;
@ -697,24 +681,6 @@ impl<T: Config> Pallet<T> {
        });
        Ok(())
    }
-
-    pub fn do_update_avg_block_speed(
-        chain_id: T::NetworkId,
-        avg_block_speed: u64,
-    ) -> DispatchResult {
-        Networks::<T>::try_mutate(&chain_id, |maybe_network| -> DispatchResult {
-            ensure!(maybe_network.is_some(), Error::<T>::NetworkDoesNotExist);
-            let net = maybe_network.as_mut().unwrap();
-            net.avg_block_speed = avg_block_speed;
-            *maybe_network = Some(net.clone());
-            Ok(())
-        })?;
-        Self::deposit_event(Event::<T>::NetworkAvgBlockSpeedUpdated {
-            chain_id,
-            avg_block_speed,
-        });
-        Ok(())
-    }
 }

 impl<T: Config> NetworkDataBasicHandler for Pallet<T> {
--- a/pallets/networks/src/math.rs
+++ b/pallets/networks/src/math.rs
@ -13,6 +13,7 @@ where
        + sp_std::ops::Shr<Output = Balance>
        + sp_std::ops::BitAnd<Balance, Output = Balance>,
 {
+
    fn zero(&self) -> Balance {
        0u32.into()
    }
--- a/pallets/networks/src/mock.rs
+++ b/pallets/networks/src/mock.rs
@ -98,7 +98,7 @@ impl ghost_networks::Config for Test {
    type RegisterOrigin = EnsureSignedBy<RegistererAccount, AccountId>;
    type UpdateOrigin = EnsureSignedBy<UpdaterAccount, AccountId>;
    type RemoveOrigin = EnsureSignedBy<RemoverAccount, AccountId>;
-    type WeightInfo = ();
+    type WeightInfo = crate::weights::SubstrateWeight<Test>;
 }

 type Block = frame_system::mocking::MockBlock<Test>;
--- a/pallets/networks/src/tests.rs
+++ b/pallets/networks/src/tests.rs
@ -19,7 +19,6 @@ fn prepare_network_data() -> (u32, NetworkData) {
            finality_delay: 69,
            rate_limit_delay: 69,
            block_distance: 69,
-            avg_block_speed: 12_000,
            network_type: NetworkType::Evm,
            gatekeeper: b"0x1234567891234567891234567891234567891234".to_vec(),
            topic_name: b"0x12345678912345678912345678912345678912345678912345678912345678"
@ -1883,7 +1882,7 @@ fn check_bridged_inflation_curve_for_big_commissions() {
            let (payout, rest) = BridgedInflationCurve::<RewardCurve, Test>::era_payout(
                total_staked_gt_ideal,
                total_issuance + amount,
-                0,
+                0
            );
            assert!(payout < commission);
            assert!(rest < commission);
@ -1891,7 +1890,7 @@ fn check_bridged_inflation_curve_for_big_commissions() {
            let (payout, rest) = BridgedInflationCurve::<RewardCurve, Test>::era_payout(
                total_staked_lt_ideal,
                total_issuance + amount,
-                0,
+                0
            );
            assert!(payout < commission);
            assert!(rest < commission);
--- a/pallets/networks/src/weights.rs
+++ b/pallets/networks/src/weights.rs
@ -60,7 +60,6 @@ pub trait WeightInfo {
 	fn update_network_topic_name() -> Weight;
 	fn update_incoming_network_fee() -> Weight;
 	fn update_outgoing_network_fee() -> Weight;
-	fn update_avg_block_speed() -> Weight;
 	fn remove_network() -> Weight;
 }

@ -210,18 +209,6 @@ impl WeightInfo for () {
 	}
 	/// Storage: `GhostNetworks::Networks` (r:1 w:1)
 	/// Proof: `GhostNetworks::Networks` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn update_avg_block_speed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `302`
-		//  Estimated: `3767`
-		// Minimum execution time: 49_579_000 picoseconds.
-		Weight::from_parts(51_126_000, 0)
-			.saturating_add(Weight::from_parts(0, 3767))
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
-	}
-	/// Storage: `GhostNetworks::Networks` (r:1 w:1)
-	/// Proof: `GhostNetworks::Networks` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn remove_network() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `302`
--- a/pallets/slow-clap/Cargo.toml
+++ b/pallets/slow-clap/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "ghost-slow-clap"
-version = "0.4.4"
+version = "0.3.56"
 description = "Applause protocol for the EVM bridge"
 license.workspace = true
 authors.workspace = true
@ -28,7 +28,6 @@ sp-io = { workspace = true }
 sp-std = { workspace = true }

 ghost-networks = { workspace = true }
-ghost-traits = { workspace = true }

 [dev-dependencies]
 pallet-balances = { workspace = true }
--- a/pallets/slow-clap/src/benchmarking.rs
+++ b/pallets/slow-clap/src/benchmarking.rs
@ -3,6 +3,7 @@
 use super::*;
 use frame_benchmarking::v1::*;

+use frame_support::traits::fungible::Inspect;
 use frame_system::RawOrigin;

 pub fn create_account<T: Config>() -> T::AccountId {
@ -11,35 +12,16 @@ pub fn create_account<T: Config>() -> T::AccountId {
        .expect("32 bytes always construct an AccountId32")
 }

-pub fn prepare_evm_network<T: Config>(network_id: NetworkIdOf<T>) {
-    let network_data = NetworkData {
-        chain_name: "Ethereum".into(),
-        default_endpoints: vec![b"https://other.endpoint.network.com".to_vec()],
-        finality_delay: 69,
-        avg_block_speed: 69,
-        rate_limit_delay: 69,
-        block_distance: 69,
-        network_type: ghost_networks::NetworkType::Evm,
-        gatekeeper: b"0x4d224452801ACEd8B2F0aebE155379bb5D594381".to_vec(),
-        topic_name: b"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef".to_vec(),
-        incoming_fee: 0,
-        outgoing_fee: 0,
-    };
-
-    let _ = T::NetworkDataHandler::register(network_id, network_data.clone());
-}
-
 benchmarks! {
    slow_clap {
-        let network_id = NetworkIdOf::<T>::default();
-        prepare_evm_network::<T>(network_id);
-
        let minimum_balance = <<T as pallet::Config>::Currency>::minimum_balance();
        let receiver = create_account::<T>();
        let amount = minimum_balance + minimum_balance;

+        let network_id = NetworkIdOf::<T>::default();
        let session_index = T::ValidatorSet::session_index();
        let transaction_hash = H256::repeat_byte(1u8);
+        let args_hash = Pallet::<T>::generate_unique_hash(&receiver, &amount, &network_id);

        let authorities = vec![T::AuthorityId::generate_pair(None)];
        let bounded_authorities = WeakBoundedVec::<_, T::MaxAuthorities>::try_from(authorities.clone())
@ -57,7 +39,6 @@ benchmarks! {
            receiver: receiver.clone(),
            amount,
        };
-        let args_hash = Pallet::<T>::generate_unique_hash(&clap);

        let authority_id = authorities
            .get(authority_index as usize)
@ -65,20 +46,16 @@ benchmarks! {
        let signature = authority_id.sign(&clap.encode())
            .ok_or("couldn't make signature")?;

-        let empty_bitmap = BitMap::new(1);
-        DisabledAuthorityIndexes::<T>::insert(session_index, empty_bitmap);
-
-        assert_eq!(ApplauseDetails::<T>::get(&session_index, &args_hash).is_none(), true);
    }: _(RawOrigin::None, clap, signature)
    verify {
-        assert_eq!(ApplauseDetails::<T>::get(&session_index, &args_hash).is_some(), true);
+        let clap_key = (session_index, transaction_hash, args_hash);
+        assert_eq!(ReceivedClaps::<T>::get(&clap_key).get(&authority_index).is_some(), true);
        assert_eq!(<<T as pallet::Config>::Currency>::total_balance(&receiver), amount);
    }

    commit_block {
        let session_index = T::ValidatorSet::session_index();
        let network_id = NetworkIdOf::<T>::default();
-        prepare_evm_network::<T>(network_id);

        let authorities = vec![T::AuthorityId::generate_pair(None)];
        let bounded_authorities = WeakBoundedVec::<_, T::MaxAuthorities>::try_from(authorities.clone())
@ -91,8 +68,8 @@ benchmarks! {
            authority_index,
            network_id,
            commitment: CommitmentDetails {
-                last_stored_block: 69,
-                commits: 420,
+                last_registered_block: 69,
+                last_seen_block: 420,
                last_updated: 1337,
            }
        };
@ -109,8 +86,8 @@ benchmarks! {
            .get(&authority_index)
            .cloned()
            .unwrap_or_default();
-        assert_eq!(stored_commitment.last_stored_block, 69);
-        assert_eq!(stored_commitment.commits, 1);
+        assert_eq!(stored_commitment.last_registered_block, 69);
+        assert_eq!(stored_commitment.last_seen_block, 420);
        assert_eq!(stored_commitment.last_updated, 1337);
    }

--- a/pallets/slow-clap/src/bitmap.rs
+++ b/pallets/slow-clap/src/bitmap.rs
@ -1,117 +0,0 @@
-use codec::{Decode, Encode};
-use scale_info::TypeInfo;
-use sp_core::RuntimeDebug;
-use sp_std::collections::btree_map::BTreeMap;
-
-use crate::AuthIndex;
-
-pub type BucketId = u32;
-pub type Bucket = u64;
-
-#[derive(Clone, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
-pub struct BitMap {
-    buckets: BTreeMap<BucketId, Bucket>,
-    max_length: u32,
-    max_value: u32,
-}
-
-impl BitMap {
-    pub fn new(max_value: u32) -> Self {
-        let mut buckets: BTreeMap<BucketId, Bucket> = Default::default();
-        let max_length = (max_value >> Self::size_of_bucket()) + 1;
-
-        for bucket_id in 0..(max_length) {
-            buckets.insert(bucket_id, 0);
-        }
-
-        BitMap {
-            buckets,
-            max_length,
-            max_value,
-        }
-    }
-
-    pub fn size_of_bucket() -> u32 {
-        (core::mem::size_of::<Bucket>() * 8).trailing_zeros()
-    }
-
-    pub fn iter_buckets(&self) -> impl Iterator<Item = (&BucketId, &Bucket)> {
-        self.buckets.iter()
-    }
-
-    pub fn exists(&self, index: &AuthIndex) -> bool {
-        let (bucket_id, bit_position) = self.bitmap_positions(index);
-        self.buckets
-            .get(&bucket_id)
-            .map(|bucket| (bucket >> bit_position) & 1 == 1)
-            .unwrap_or_default()
-    }
-
-    pub fn set(&mut self, index: AuthIndex) {
-        let (bucket_id, bit_position) = self.bitmap_positions(&index);
-        if bucket_id < self.max_length {
-            let bucket = self.buckets.entry(bucket_id).or_insert(0);
-            *bucket |= 1 << bit_position;
-        }
-    }
-
-    pub fn unset(&mut self, index: AuthIndex) {
-        let (bucket_id, bit_position) = self.bitmap_positions(&index);
-        if let Some(bucket) = self.buckets.get_mut(&bucket_id) {
-            *bucket &= !(1 << bit_position);
-            if *bucket == 0 {
-                self.buckets.remove(&bucket_id);
-            }
-        }
-    }
-
-    pub fn get_bucket(&self, bucket_id: &BucketId) -> Bucket {
-        self.buckets.get(bucket_id).copied().unwrap_or_default()
-    }
-
-    pub fn count_ones(&self) -> u32 {
-        let zeros: u32 = self
-            .iter_buckets()
-            .map(|(_, bucket)| bucket.count_zeros())
-            .sum();
-        let total_bits = self.total_bits();
-        total_bits.saturating_sub(zeros)
-    }
-
-    pub fn bitor(self, rhs: Self) -> Self {
-        let (mut base, to_merge) = if self.buckets.len() < rhs.buckets.len() {
-            (rhs, self)
-        } else {
-            (self, rhs)
-        };
-
-        for (key, rhs_value) in to_merge.buckets {
-            base.buckets
-                .entry(key)
-                .and_modify(|lhs_value| *lhs_value |= rhs_value)
-                .or_insert(rhs_value);
-        }
-
-        base
-    }
-
-    pub fn max_value(&self) -> u32 {
-        self.max_value
-    }
-
-    fn total_bits(&self) -> u32 {
-        let size_of_bucket = Self::size_of_bucket();
-        let bucket_length: u32 = 1 << size_of_bucket;
-        self.max_length.saturating_mul(bucket_length)
-    }
-
-    fn bitmap_positions(&self, index: &AuthIndex) -> (u32, u32) {
-        let size_of_bucket = Self::size_of_bucket();
-        let bucket_length = 1 << size_of_bucket;
-
-        let bucket_id = index >> size_of_bucket;
-        let bit_position = index % bucket_length;
-
-        (bucket_id, bit_position)
-    }
-}
--- a/pallets/slow-clap/src/evm_types.rs
+++ b/pallets/slow-clap/src/evm_types.rs
@ -54,14 +54,19 @@ impl EvmResponseType {
        network_id: NetworkIdOf<T>,
    ) -> BlockCommitment<NetworkIdOf<T>> {
        let last_updated = sp_io::offchain::timestamp().unix_millis();
+        let current_block = match self {
+            EvmResponseType::BlockNumber(block_number) => *block_number,
+            EvmResponseType::TransactionLogs(_) => Default::default(),
+        };
+
        BlockCommitment {
            session_index,
            authority_index,
            network_id,
            commitment: CommitmentDetails {
-                last_stored_block: from_block,
+                last_registered_block: from_block,
+                last_seen_block: current_block,
                last_updated,
-                commits: 420,
            },
        }
    }
@ -122,7 +127,7 @@ impl EvmResponseType {

        log::info!(
            target: LOG_TARGET,
-            "👻 Found {:?} claps for network {:?}",
+            "🧐 Found {:?} claps for network {:?}",
            claps_len,
            network_id,
        );
@ -133,7 +138,7 @@ impl EvmResponseType {
                None => {
                    log::info!(
                        target: LOG_TARGET,
-                        "👻 Clap #{} signing failed from authority #{:?} for network {:?}",
+                        "🧐 Clap #{} signing failed from authority #{:?} for network {:?}",
                        clap_index,
                        authority_index,
                        network_id,
@ -152,7 +157,7 @@ impl EvmResponseType {
            {
                log::info!(
                    target: LOG_TARGET,
-                    "👻 Failed to submit clap #{} from authority #{:?} for network {:?}: {:?}",
+                    "🧐 Failed to submit clap #{} from authority #{:?} for network {:?}: {:?}",
                    clap_index,
                    authority_index,
                    network_id,
@ -193,7 +198,7 @@ impl EvmResponseType {

        log::info!(
            target: LOG_TARGET,
-            "👻 New block commitment from authority #{:?} for network {:?}",
+            "🧐 New block commitment from authority #{:?} for network {:?}",
            authority_index,
            network_id,
        );
@ -203,7 +208,7 @@ impl EvmResponseType {
            None => {
                log::info!(
                    target: LOG_TARGET,
-                    "👻 Block commitment signing failed from authority #{:?} for network {:?}",
+                    "🧐 Block commitment signing failed from authority #{:?} for network {:?}",
                    authority_index,
                    network_id,
                );
@ -219,7 +224,7 @@ impl EvmResponseType {
        if let Err(e) = SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
            log::info!(
                target: LOG_TARGET,
-                "👻 Failed to submit block commitment from authority #{:?} for network {:?}: {:?}",
+                "🧐 Failed to submit block commitment from authority #{:?} for network {:?}: {:?}",
                authority_index,
                network_id,
                e,
--- a/pallets/slow-clap/src/lib.rs
+++ b/pallets/slow-clap/src/lib.rs
--- a/pallets/slow-clap/src/mock.rs
+++ b/pallets/slow-clap/src/mock.rs
@ -19,8 +19,8 @@ use sp_staking::{

 use sp_runtime::BuildStorage;

-use crate::{self as slow_clap};
-use crate::{Config, ExposureListener};
+use crate as slow_clap;
+use crate::{ApplauseListener, Config, EraIndex};

 type Block = frame_system::mocking::MockBlock<Runtime>;

@ -36,13 +36,17 @@ frame_support::construct_runtime!(
 );

 parameter_types! {
-    pub static FixedValidators: Vec<u64> = vec![0, 1, 2, 3];
+    pub static Validators: Option<Vec<u64>> = Some(vec![
+        1,
+        2,
+        3,
+    ]);
 }

 pub struct TestSessionManager;
 impl pallet_session::SessionManager<u64> for TestSessionManager {
    fn new_session(_new_index: SessionIndex) -> Option<Vec<u64>> {
-        Some(FixedValidators::get())
+        Validators::mutate(|l| l.take())
    }
    fn end_session(_: SessionIndex) {}
    fn start_session(_: SessionIndex) {}
@ -50,14 +54,17 @@ impl pallet_session::SessionManager<u64> for TestSessionManager {

 impl pallet_session::historical::SessionManager<u64, u64> for TestSessionManager {
    fn new_session(_new_index: SessionIndex) -> Option<Vec<(u64, u64)>> {
-        Some(FixedValidators::get().iter().map(|l| (*l, *l)).collect())
+        Validators::mutate(|l| {
+            l.take()
+                .map(|validators| validators.iter().map(|v| (*v, *v)).collect())
+        })
    }
    fn end_session(_: SessionIndex) {}
    fn start_session(_: SessionIndex) {}
 }

 type IdentificationTuple = (u64, u64);
-type Offence = crate::SlowClapOffence<IdentificationTuple>;
+type Offence = crate::ThrottlingOffence<IdentificationTuple>;

 parameter_types! {
    pub static Offences: Vec<(Vec<u64>, Offence)> = vec![];
@ -83,7 +90,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
    let mut result = sp_io::TestExternalities::new(t);

    result.execute_with(|| {
-        for i in 0..=3 {
+        for i in 1..=3 {
            System::inc_providers(&i);
            assert_eq!(
                Session::set_keys(RuntimeOrigin::signed(i), i.into(), vec![],),
@ -169,25 +176,24 @@ impl pallet_balances::Config for Runtime {

 type Balance = u64;

-pub struct TestExposureListener;
-impl ExposureListener<Balance, u64> for TestExposureListener
+pub struct TestSomeCoolTrait;
+impl ApplauseListener<Balance> for TestSomeCoolTrait
 where
    Balance: AtLeast32BitUnsigned + From<u64>,
 {
-    fn get_account_by_index(index: usize) -> Option<u64> {
-        FixedValidators::get().get(index).copied()
+    fn get_current_era() -> EraIndex {
+        1
    }

-    fn get_total_exposure() -> Balance {
-        1_000_000_000u64.into()
+    fn get_threshold_amount(_era: EraIndex) -> Balance {
+        666_666_667u64.into()
    }

-    fn get_validator_exposure(validator: &u64) -> Balance {
-        match validator {
-            0 => 250_000_000u64,
-            1 => 200_000_000u64,
-            2 => 250_000_000u64,
-            3 => 300_000_000u64,
+    fn get_validator_total_exposure(_era: EraIndex, index: usize) -> Balance {
+        match index {
+            0 => 500_000_000u64,
+            1 => 300_000_000u64,
+            2 => 200_000_000u64,
            _ => 0,
        }
        .into()
@ -204,13 +210,14 @@ impl Config for Runtime {
    type BlockNumberProvider = System;
    type ReportUnresponsiveness = OffenceHandler;
    type DisabledValidators = Session;
-    type ExposureListener = TestExposureListener;
+    type ApplauseListener = TestSomeCoolTrait;

    type MaxAuthorities = ConstU32<5>;
-    type ApplauseThreshold = ConstU32<500_000_000>;
+    type ApplauseThreshold = ConstU32<50>;
+    type OffenceThreshold = ConstU32<0>;
    type UnsignedPriority = ConstU64<{ 1 << 20 }>;
    type HistoryDepth = HistoryDepth;
-    type MinAuthoritiesNumber = ConstU32<1>;
+    type MinAuthoritiesNumber = ConstU32<2>;

    type WeightInfo = ();
 }
@ -229,7 +236,32 @@ pub fn advance_session() {
    let now = System::block_number().max(1);
    System::set_block_number(now + 1);
    Session::rotate_session();
-
    let session_index = Session::current_index();
+
+    let authorities = Session::validators()
+        .into_iter()
+        .map(UintAuthorityId)
+        .collect();
+
+    SlowClap::set_test_authorities(session_index, authorities);
+    assert_eq!(session_index, (now / Period::get()) as u32);
+}
+
+pub fn advance_session_with_authority(authority: u64) {
+    let now = System::block_number().max(1);
+    System::set_block_number(now + 1);
+    Session::rotate_session();
+
+    let session_index = Session::current_index();
+
+    SlowClap::set_test_authorities(
+        session_index,
+        vec![
+            UintAuthorityId::from(authority),
+            UintAuthorityId::from(69),
+            UintAuthorityId::from(420),
+            UintAuthorityId::from(1337),
+        ],
+    );
    assert_eq!(session_index, (now / Period::get()) as u32);
 }
--- a/pallets/slow-clap/src/tests.rs
+++ b/pallets/slow-clap/src/tests.rs
--- a/pallets/traits/Cargo.toml
+++ b/pallets/traits/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "ghost-traits"
-version = "0.3.26"
+version = "0.3.23"
 license.workspace = true
 authors.workspace = true
 edition.workspace = true
--- a/pallets/traits/src/exposure.rs
+++ b/pallets/traits/src/exposure.rs
@ -1,7 +0,0 @@
-use sp_runtime::traits::AtLeast32BitUnsigned;
-
-pub trait ExposureListener<Balance: AtLeast32BitUnsigned, AccountId> {
-    fn get_account_by_index(index: usize) -> Option<AccountId>;
-    fn get_total_exposure() -> Balance;
-    fn get_validator_exposure(index: &AccountId) -> Balance;
-}
--- a/pallets/traits/src/lib.rs
+++ b/pallets/traits/src/lib.rs
@ -1,4 +1,3 @@
 #![cfg_attr(not(feature = "std"), no_std)]

-pub mod exposure;
 pub mod networks;
--- a/runtime/casper/Cargo.toml
+++ b/runtime/casper/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "casper-runtime"
-version = "3.5.34"
+version = "3.5.33"
 build = "build.rs"
 description = "Runtime of the Casper Network"
 edition.workspace = true
@ -88,7 +88,6 @@ ghost-networks = { workspace = true }
 ghost-claims = { workspace = true }
 ghost-slow-clap = { workspace = true }
 ghost-sudo = { workspace = true }
-ghost-traits = { workspace = true }
 casper-runtime-constants = { workspace = true }
 runtime-common = { workspace = true }
 primitives = { workspace = true }
--- a/runtime/casper/src/impls.rs
+++ b/runtime/casper/src/impls.rs
@ -1,8 +1,6 @@
 use super::*;
 use frame_support::{dispatch::DispatchResultWithPostInfo, traits::PrivilegeCmp};
-use ghost_traits::exposure::ExposureListener;
 use pallet_alliance::{ProposalIndex, ProposalProvider};
-use primitives::Balance;
 use sp_runtime::DispatchError;
 use sp_std::{cmp::Ordering, marker::PhantomData};

@ -78,36 +76,6 @@ impl PrivilegeCmp<OriginCaller> for EqualOrGreatestRootCmp {
    }
 }

-/// Used to get the exposure information out of staking pallet directly.
-pub struct StakingExposureListener<T>(PhantomData<T>);
-impl<T> ExposureListener<Balance, AccountIdOf<T>> for StakingExposureListener<T>
-where
-    T: pallet_session::Config + pallet_staking::Config + frame_system::Config,
-    u128: From<T::CurrencyBalance>,
-    AccountIdOf<T>: From<<T as pallet_session::Config>::ValidatorId>,
-{
-    fn get_account_by_index(index: usize) -> Option<AccountIdOf<T>> {
-        pallet_session::Pallet::<T>::validators()
-            .get(index)
-            .map(|validator| {
-                let account_id: AccountIdOf<T> = validator.clone().into();
-                account_id
-            })
-    }
-
-    fn get_total_exposure() -> Balance {
-        let era = pallet_staking::Pallet::<T>::current_era().unwrap_or_default();
-        pallet_staking::Pallet::<T>::eras_total_stake(era).into()
-    }
-
-    fn get_validator_exposure(validator: &AccountIdOf<T>) -> Balance {
-        let era = pallet_staking::Pallet::<T>::current_era().unwrap_or_default();
-        pallet_staking::EraInfo::<T>::get_full_exposure(era, validator)
-            .total
-            .into()
-    }
-}
-
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarks {
    use super::*;
--- a/runtime/casper/src/lib.rs
+++ b/runtime/casper/src/lib.rs
@ -78,7 +78,7 @@ mod genesis_config_presets;
 mod impls;
 mod weights;

-pub use impls::{AllianceProposalProvider, EqualOrGreatestRootCmp, StakingExposureListener};
+pub use impls::{AllianceProposalProvider, EqualOrGreatestRootCmp};

 // Governance configuration.
 pub mod cult;
@ -1058,9 +1058,10 @@ impl ghost_claims::Config<CultCollectiveInstance> for Runtime {
 }

 parameter_types! {
-    // will be used in `Perbill::from_parts()`
-    pub const ApplauseThreshold: u32 = 500_000_000;
-    pub const MinAuthoritiesNumber: u32 = 5;
+    // will be used in `Perbill::from_percent()`
+    pub const ApplauseThreshold: u32 = 70;
+    // will be used in `Perbill::from_percent()`
+    pub const OffenceThreshold: u32 = 40;
    pub const SlowClapUnsignedPriority: TransactionPriority = TransactionPriority::MAX;
    pub const SlowClapHistoryDepth: sp_staking::SessionIndex =
        StakingHistoryDepth::get() * SessionsPerEra::get();
@ -1070,19 +1071,18 @@ impl ghost_slow_clap::Config for Runtime {
    type RuntimeEvent = RuntimeEvent;
    type AuthorityId = SlowClapId;

+    type NextSessionRotation = Babe;
    type ValidatorSet = Historical;
    type Currency = Balances;
    type NetworkDataHandler = GhostNetworks;
    type BlockNumberProvider = System;
    type ReportUnresponsiveness = Offences;
-    type DisabledValidators = Session;
-    type ExposureListener = StakingExposureListener<Runtime>;

    type MaxAuthorities = MaxAuthorities;
    type ApplauseThreshold = ApplauseThreshold;
+    type OffenceThreshold = OffenceThreshold;
    type UnsignedPriority = SlowClapUnsignedPriority;
    type HistoryDepth = SlowClapHistoryDepth;
-    type MinAuthoritiesNumber = MinAuthoritiesNumber;

    type WeightInfo = weights::ghost_slow_clap::WeightInfo<Runtime>;
 }
--- a/runtime/casper/src/weights/ghost_networks.rs
+++ b/runtime/casper/src/weights/ghost_networks.rs
@ -191,18 +191,6 @@ impl<T: frame_system::Config> ghost_networks::WeightInfo for WeightInfo<T> {
 	}
 	/// Storage: `GhostNetworks::Networks` (r:1 w:1)
 	/// Proof: `GhostNetworks::Networks` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn update_avg_block_speed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `302`
-		//  Estimated: `3767`
-		// Minimum execution time: 49_579_000 picoseconds.
-		Weight::from_parts(51_126_000, 0)
-			.saturating_add(Weight::from_parts(0, 3767))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `GhostNetworks::Networks` (r:1 w:1)
-	/// Proof: `GhostNetworks::Networks` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn remove_network() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `302`
--- a/runtime/casper/src/weights/ghost_slow_clap.rs
+++ b/runtime/casper/src/weights/ghost_slow_clap.rs
@ -76,7 +76,34 @@ impl<T: frame_system::Config> ghost_slow_clap::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	fn commit_block()-> Weight {
-        Default::default()
+	/// Storage: `GhostSlowClaps::Authorities` (r:2 w:0)
+	/// Proof: `GhostSlowClaps::Authorities` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `GhostSlowClaps::ReceivedClaps` (r:2 w:0)
+	/// Proof: `GhostSlowClaps::ReceivedClaps` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `GhostSlowClaps::ClapsInSession` (r:1 w:0)
+	/// Proof: `GhostSlowClaps::ClapsInSession` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `GhostSlowClaps::ApplausesForTransaction` (r:1 w:1)
+	/// Proof: `GhostSlowClaps::ApplausesForTransaction` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `GhostNetworks::NullifyNeeded` (r:1 w:0)
+	/// Proof: `GhostNetworks::NullifyNeeded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `GhostNetworks::Networks` (r:1 w:0)
+	/// Proof: `GhostNetworks::Networks` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `GhostNetworks::GatekeeperAmount` (r:1 w:1)
+	/// Proof: `GhostNetworks::GatekeeperAmount` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `GhostNetworks::BridgedImbalance` (r:1 w:1)
+	/// Proof: `GhostNetworks::BridgedImbalance` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `GhostNetworks::AccumulatedCommission` (r:1 w:1)
+	/// Proof: `GhostNetworks::AccumulatedCommission` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	fn self_applause() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `861`
+		//  Estimated: `6801`
+		// Minimum execution time: 258_510_000 picoseconds.
+		Weight::from_parts(262_353_000, 0)
+			.saturating_add(Weight::from_parts(0, 6801))
+			.saturating_add(T::DbWeight::get().reads(12))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
 }
--- a/service/src/chain_spec.rs
+++ b/service/src/chain_spec.rs
@ -205,7 +205,6 @@ fn casper_testnet_evm_networks() -> Vec<(u32, Vec<u8>)> {
            finality_delay: 69u64,
            rate_limit_delay: 5_000u64,
            block_distance: 20u64,
-            avg_block_speed: 12_000,
            network_type: ghost_networks::NetworkType::Evm,
            gatekeeper: "0xc85129A097773B7F8970a7364c928C05f265E6A1".into(),
            topic_name: "0x7ab52ec05c331e6257a3d705d6bea6e4c27277351764ad139209e06b203811a6".into(),