Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Display Reward amount #9245

Merged
kianenigma merged 2 commits into from
Jul 1, 2021
Merged

Display Reward amount #9245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d815566
name reward amount
kianenigma Jul 1, 2021
bc68796
Fix
kianenigma Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions frame/election-provider-multi-phase/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,10 @@ pub mod pallet {
}

#[pallet::event]
#[pallet::metadata(<T as frame_system::Config>::AccountId = "AccountId")]
#[pallet::metadata(
<T as frame_system::Config>::AccountId = "AccountId",
BalanceOf<T> = "Balance"
)]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
/// A solution was stored with the given compute.
Expand All @@ -996,9 +999,9 @@ pub mod pallet {
/// election failed, `None`.
ElectionFinalized(Option<ElectionCompute>),
/// An account has been rewarded for their signed submission being finalized.
Rewarded(<T as frame_system::Config>::AccountId),
Rewarded(<T as frame_system::Config>::AccountId, BalanceOf<T>),
/// An account has been slashed for submitting an invalid signed submission.
Slashed(<T as frame_system::Config>::AccountId),
Slashed(<T as frame_system::Config>::AccountId, BalanceOf<T>),
/// The signed phase of the given round has started.
SignedPhaseStarted(u32),
/// The unsigned phase of the given round has started.
Expand Down
4 changes: 2 additions & 2 deletions frame/election-provider-multi-phase/src/signed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ impl<T: Config> Pallet<T> {
<QueuedSolution<T>>::put(ready_solution);

// emit reward event
Self::deposit_event(crate::Event::Rewarded(who.clone()));
Self::deposit_event(crate::Event::Rewarded(who.clone(), reward));

// unreserve deposit.
let _remaining = T::Currency::unreserve(who, deposit);
Expand All @@ -434,7 +434,7 @@ impl<T: Config> Pallet<T> {
///
/// Infallible
pub fn finalize_signed_phase_reject_solution(who: &T::AccountId, deposit: BalanceOf<T>) {
Self::deposit_event(crate::Event::Slashed(who.clone()));
Self::deposit_event(crate::Event::Slashed(who.clone(), deposit));
let (negative_imbalance, _remaining) = T::Currency::slash_reserved(who, deposit);
debug_assert!(_remaining.is_zero());
T::SlashHandler::on_unbalanced(negative_imbalance);
Expand Down