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

Audit fixes for election/staking decoupling part 2 #8167

Merged
merged 79 commits into from
Mar 16, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
d998b12
Base features and traits.
kianenigma Jan 15, 2021
5aea9cc
pallet and unsigned phase
kianenigma Jan 15, 2021
632e107
Undo bad formattings.
kianenigma Jan 15, 2021
c52e65d
Master.into()
kianenigma Jan 18, 2021
b4fc5e1
some formatting cleanup.
kianenigma Jan 18, 2021
cc26881
Small self-cleanup.
kianenigma Jan 18, 2021
67a9fae
Master.into()
kianenigma Jan 27, 2021
75eca3f
Make it all build
kianenigma Jan 27, 2021
8daec3a
self-review
kianenigma Jan 27, 2021
49613ed
Some doc tests.
kianenigma Jan 27, 2021
35f1faf
Some changes from other PR
kianenigma Jan 27, 2021
e01cacc
Fix session test
kianenigma Jan 27, 2021
6278150
Merge branch 'master' into kiz-election-provider-2-two-phase-unsigned
shawntabrizi Feb 4, 2021
4c516cb
Update Cargo.lock
shawntabrizi Feb 4, 2021
8c8d1e6
Update frame/election-provider-multi-phase/src/lib.rs
kianenigma Feb 11, 2021
4b58c91
Some review comments
kianenigma Feb 11, 2021
f4029aa
Merge branch 'kiz-election-provider-2-two-phase-unsigned' of github.c…
kianenigma Feb 11, 2021
f16ac88
Master.into()
kianenigma Feb 11, 2021
528917e
Rename + make encode/decode
kianenigma Feb 12, 2021
1a5794a
Do an assert as well, just in case.
kianenigma Feb 12, 2021
01e63ed
Fix build
kianenigma Feb 12, 2021
4ccecdf
Update frame/election-provider-multi-phase/src/unsigned.rs
kianenigma Feb 12, 2021
83a789e
Las comment
kianenigma Feb 12, 2021
adb3618
Merge branch 'kiz-election-provider-2-two-phase-unsigned' of github.c…
kianenigma Feb 12, 2021
7c71df0
fix staking fuzzer.
kianenigma Feb 12, 2021
12b1640
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Feb 12, 2021
6397d4a
Add one last layer of feasibility check as well.
kianenigma Feb 12, 2021
80d3c31
Merge branch 'kiz-election-provider-2-two-phase-unsigned' of github.c…
kianenigma Feb 12, 2021
7d6f6ad
Last fixes to benchmarks
kianenigma Feb 12, 2021
2e28437
Some more docs.
kianenigma Feb 12, 2021
5fda744
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Feb 12, 2021
1ce6c8e
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Feb 12, 2021
f63c5b8
Some nits
kianenigma Feb 12, 2021
8029c01
Merge branch 'kiz-election-provider-2-two-phase-unsigned' of github.c…
kianenigma Feb 12, 2021
70f4191
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
Feb 13, 2021
701e4a2
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Feb 13, 2021
ea531e1
Fix doc
kianenigma Feb 17, 2021
c2a3286
Upstream.into()
kianenigma Feb 17, 2021
16fe4f7
Master.into()
kianenigma Feb 17, 2021
2c6ac80
Mkae ci green
kianenigma Feb 17, 2021
0bcc776
Merge branch 'master' of github.com:paritytech/substrate into kiz-ele…
kianenigma Feb 18, 2021
6caf093
Audit fixes for election-provider: part 2 signed phase.
kianenigma Feb 21, 2021
fc1095a
Master.into()
kianenigma Feb 25, 2021
d5012d5
Master.into()
kianenigma Mar 2, 2021
044f71f
Fix weight
kianenigma Mar 2, 2021
e090f23
Some grumbles.
kianenigma Mar 2, 2021
d37f770
Try and weigh to get_npos_voters
kianenigma Mar 3, 2021
924d114
Fix build
kianenigma Mar 3, 2021
6441891
Fix line width
kianenigma Mar 3, 2021
f0bb1a5
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
Mar 3, 2021
1f24f6d
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Mar 3, 2021
b23781f
Fix tests.
kianenigma Mar 3, 2021
4cec55e
Merge branch 'master' of github.com:paritytech/substrate into kiz-ele…
kianenigma Mar 5, 2021
2bb4ed9
Fix build
kianenigma Mar 5, 2021
f5100f3
Reorg some stuff
kianenigma Mar 5, 2021
96bce0e
More reorg.
kianenigma Mar 5, 2021
d5a35e3
Reorg done.
kianenigma Mar 5, 2021
14c7d4c
Master.into()
kianenigma Mar 5, 2021
745b76f
Fix build
kianenigma Mar 5, 2021
deeda2d
Another rename
kianenigma Mar 8, 2021
75f0931
Merge branch 'master' of github.com:paritytech/substrate into kiz-ele…
kianenigma Mar 8, 2021
5c429b8
Fix build
kianenigma Mar 8, 2021
47a8ab3
Update frame/election-provider-multi-phase/src/mock.rs
kianenigma Mar 9, 2021
1a85cc9
nit
kianenigma Mar 9, 2021
4ecaeeb
Merge branch 'kiz-election-provider-2-audit' of github.com:paritytech…
kianenigma Mar 9, 2021
0d76b7a
better doc
kianenigma Mar 9, 2021
9143981
Line width
kianenigma Mar 9, 2021
30af70e
Fix build
kianenigma Mar 9, 2021
c6ee113
Master.into()
kianenigma Mar 14, 2021
4ea6371
Self-review
kianenigma Mar 14, 2021
d3d5957
Self-review
kianenigma Mar 14, 2021
f3e5397
Fix wan
kianenigma Mar 14, 2021
e3dafc2
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Mar 14, 2021
7ddb4c5
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Mar 14, 2021
062342b
Master.into()
kianenigma Mar 15, 2021
7cf67c6
fix build and review comments.
kianenigma Mar 15, 2021
1c7b20e
Update frame/election-provider-multi-phase/src/lib.rs
kianenigma Mar 16, 2021
13daa47
add comment
kianenigma Mar 16, 2021
0807ac0
Merge branch 'kiz-election-provider-2-audit' of github.com:paritytech…
kianenigma Mar 16, 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
Prev Previous commit
Next Next commit
Fix build
  • Loading branch information
kianenigma committed Mar 5, 2021
commit 2bb4ed99abf3ac4a13eca2bb156959c2280409a2
11 changes: 5 additions & 6 deletions frame/election-provider-multi-phase/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -581,16 +581,15 @@ pub mod pallet {
// not much we can do about this at this point.
log!(warn, "failed to open signed phase due to {:?}", why);
T::WeightInfo::on_initialize_nothing()
// NOTE: ^^ this is a bit influenced by the fact that we know the
// implementation of the data provider does not consume much resources
// in case of error. Could be made more generalized.
// NOTE: ^^ The trait specifies that this is a noop in terms of weight
// in case of error.
}
}
}
Phase::Signed | Phase::Off
if remaining <= unsigned_deadline && remaining > Zero::zero() =>
{
// Decide on the state of the phase: followed by signed or not?
// followed by signed or not?
let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed {
// followed by a signed phase: close the signed phase, no need for snapshot.
// TWO_PHASE_NOTE: later on once we have signed phase, this should return
Expand Down Expand Up @@ -877,7 +876,7 @@ impl<T: Config> Pallet<T> {
let weight = Self::create_snapshot()?;
<CurrentPhase<T>>::put(Phase::Signed);
Self::deposit_event(Event::SignedPhaseStarted(Self::round()));
Ok(weight)
Ok(weight.saturating_add(T::DbWeight::get().writes(1)))
}

/// Logic for [`<Pallet as Hooks<T>>::on_initialize`] when unsigned phase is being opened.
Expand Down Expand Up @@ -936,7 +935,7 @@ impl<T: Config> Pallet<T> {
});
<DesiredTargets<T>>::put(desired_targets);
<Snapshot<T>>::put(RoundSnapshot { voters, targets });
Ok(w1.saturating_add(w2).saturating_add(w3))
Ok(w1.saturating_add(w2).saturating_add(w3).saturating_add(T::DbWeight::get().writes(3)))
}

/// Kill everything created by [`Pallet::create_snapshot`].
Expand Down
12 changes: 6 additions & 6 deletions primitives/election-providers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
//! type Balance = u64;
//! type BlockNumber = u32;
//!
//! mod data_provider {
//! mod data_provider_mod {
//! use super::*;
//!
//! pub trait Config: Sized {
Expand All @@ -99,14 +99,14 @@
//! pub struct Module<T: Config>(std::marker::PhantomData<T>);
//!
//! impl<T: Config> ElectionDataProvider<AccountId, BlockNumber> for Module<T> {
//! type Additional = ();
//! type Additional = ();
//! fn desired_targets() -> data_provider::Result<(u32, Self::Additional)> {
//! Ok((1, ()))
//! }
//! fn voters(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Self::Additional)> {
//! Ok((Default::default(), ()))
//! }
//! fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Self::Additional).> {
//! fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Self::Additional)> {
//! Ok((vec![10, 20, 30], ()))
//! }
//! fn next_election_prediction(now: BlockNumber) -> BlockNumber {
Expand Down Expand Up @@ -142,15 +142,15 @@
//!
//! mod runtime {
//! use super::generic_election_provider;
//! use super::data_provider;
//! use super::data_provider_mod;
//! use super::AccountId;
//!
//! struct Runtime;
//! impl generic_election_provider::Config for Runtime {
//! type DataProvider = data_provider::Module<Runtime>;
//! type DataProvider = data_provider_mod::Module<Runtime>;
//! }
//!
//! impl data_provider::Config for Runtime {
//! impl data_provider_mod::Config for Runtime {
//! type ElectionProvider = generic_election_provider::GenericElectionProvider<Runtime>;
//! }
//!
Expand Down