Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Staking] Adds a round check at signed solution submission #2690

Merged
merged 2 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions substrate/frame/election-provider-multi-phase/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,7 @@ pub mod pallet {

// ensure solution is timely.
ensure!(Self::current_phase().is_signed(), Error::<T>::PreDispatchEarlySubmission);
ensure!(raw_solution.round == Self::round(), Error::<T>::PreDispatchDifferentRound);

// NOTE: this is the only case where having separate snapshot would have been better
// because could do just decode_len. But we can create abstractions to do this.
Expand Down Expand Up @@ -1197,6 +1198,8 @@ pub mod pallet {
BoundNotMet,
/// Submitted solution has too many winners
TooManyWinners,
/// Sumission was prepared for a different round.
PreDispatchDifferentRound,
}

#[pallet::validate_unsigned]
Expand Down
9 changes: 9 additions & 0 deletions substrate/frame/election-provider-multi-phase/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ pub fn roll_to_with_ocw(n: BlockNumber) {
}
}

pub fn roll_to_round(n: u32) {
assert!(MultiPhase::round() <= n);

while MultiPhase::round() != n {
roll_to_signed();
assert_ok!(MultiPhase::elect());
}
}

pub struct TrimHelpers {
pub voters: Vec<VoterOf<Runtime>>,
pub assignments: Vec<IndexAssignmentOf<Runtime>>,
Expand Down
34 changes: 34 additions & 0 deletions substrate/frame/election-provider-multi-phase/src/signed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,40 @@ mod tests {
use frame_support::{assert_noop, assert_ok, assert_storage_noop};
use sp_runtime::Percent;

#[test]
fn cannot_submit_on_different_round() {
ExtBuilder::default().build_and_execute(|| {
// roll to a few rounds ahead.
roll_to_round(5);
assert_eq!(MultiPhase::round(), 5);

roll_to_signed();
assert_eq!(MultiPhase::current_phase(), Phase::Signed);

// create a temp snapshot only for this test.
MultiPhase::create_snapshot().unwrap();
let mut solution = raw_solution();

// try a solution prepared in a previous round.
solution.round = MultiPhase::round() - 1;

assert_noop!(
MultiPhase::submit(RuntimeOrigin::signed(10), Box::new(solution)),
Error::<Runtime>::PreDispatchDifferentRound,
);

// try a solution prepared in a later round (not expected to happen, but in any case).
MultiPhase::create_snapshot().unwrap();
let mut solution = raw_solution();
solution.round = MultiPhase::round() + 1;

assert_noop!(
MultiPhase::submit(RuntimeOrigin::signed(10), Box::new(solution)),
Error::<Runtime>::PreDispatchDifferentRound,
);
})
}

#[test]
fn cannot_submit_too_early() {
ExtBuilder::default().build_and_execute(|| {
Expand Down