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

Decouple Staking and Election - Part 3: Signed Phase #7910

Merged
103 commits merged into from
Jun 28, 2021
Merged

Decouple Staking and Election - Part 3: Signed Phase #7910

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
103 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
8607d3d
add signed phase.
kianenigma Jan 15, 2021
6523f5b
remove comments
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
15cdb28
Add todo
kianenigma Jan 19, 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
eae69b0
Upstream.into()
kianenigma Jan 27, 2021
35f1faf
Some changes from other PR
kianenigma Jan 27, 2021
6c82d9f
Upstream.into()
kianenigma Jan 27, 2021
e6ffc4d
Fix session test
kianenigma Jan 27, 2021
483018c
Master.into()
kianenigma Mar 3, 2021
54460eb
Update bin/node/runtime/src/lib.rs
kianenigma Mar 3, 2021
33b8e69
Fix name.
kianenigma Mar 3, 2021
be89dc5
Merge branch 'kiz-election-provider-3-signed-phase' of github.com:par…
kianenigma Mar 3, 2021
62f8ce4
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Mar 3, 2021
dff422a
typos and verbiage
coriolinus Mar 30, 2021
5f1637e
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
coriolinus Mar 30, 2021
c58b2f9
no glob imports in signed.rs
coriolinus Mar 30, 2021
76c3387
meaningful generic type parameters for SignedSubmission
coriolinus Mar 30, 2021
872a3c8
dedup feasibility check weight calculation
coriolinus Mar 30, 2021
f5f4605
simplify/optimize fn insert_submission
coriolinus Mar 30, 2021
859f594
tests: remove glob, cause to build without error
coriolinus Mar 30, 2021
0fc7a58
use sp_std::vec::Vec
coriolinus Mar 31, 2021
1137698
maintain invariant within fn insert_submission
coriolinus Mar 31, 2021
8c26900
fix accidentally ordering the list backward
coriolinus Mar 31, 2021
a882ff5
intentionally order the list in reverse
coriolinus Mar 31, 2021
d5fe671
get rid of unused import
coriolinus Mar 31, 2021
75ddba9
ensure signed submissions are cleared in early elect
coriolinus Mar 31, 2021
abae602
finalize the signed phase when appropriate
coriolinus Mar 31, 2021
f4aea1d
resolve dispatch error todo
coriolinus Mar 31, 2021
ebface4
update assumptions in submit benchmark
coriolinus Mar 31, 2021
151e880
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
Mar 31, 2021
189a870
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
Apr 12, 2021
8d95722
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Apr 12, 2021
edfb376
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
coriolinus May 25, 2021
a3574d5
line length
coriolinus May 25, 2021
5ecd6b5
Master.into()
kianenigma May 26, 2021
ee66c84
make a few more things pub
kianenigma May 26, 2021
17faa86
restore missing import
coriolinus May 26, 2021
94314bf
update ui test output
coriolinus May 26, 2021
9e6b559
update tests from master branch
coriolinus May 26, 2021
10cfdee
Merge branch 'master' of https://github.com/paritytech/substrate into…
May 27, 2021
6f9cf10
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
May 27, 2021
134ab4f
remove duplicate definitions
coriolinus May 27, 2021
61b7680
remove signed reward factor due to its attack potential
coriolinus May 28, 2021
b06f3a8
Update frame/election-provider-multi-phase/src/signed.rs
coriolinus May 28, 2021
ca97603
remove SignedRewardMax; no longer necessary
coriolinus May 28, 2021
7ce5afb
compute the encoded size without actually encoding
coriolinus May 28, 2021
bdf45ba
remove unused PostInfo
coriolinus May 28, 2021
87b7ff1
pub use some stuff
coriolinus May 28, 2021
308b522
ensure `pub use` things are in fact `pub`
coriolinus May 28, 2021
0d892f4
add event information: was another solution ejected to make room
coriolinus May 28, 2021
ea2b1ab
unconditionally run the unsigned phase even if signed was successful
coriolinus May 28, 2021
22248e1
remove dead test code
coriolinus May 28, 2021
c651962
meaningful witness data name
coriolinus May 31, 2021
29d9242
use errors instead of defensive `unwrap_or_default`
coriolinus May 31, 2021
fd38356
get rid of a log message redundant with an event
coriolinus May 31, 2021
c503fa7
saturating math
coriolinus May 31, 2021
252f310
import Saturating
coriolinus May 31, 2021
725cadf
mv `fn submit` to end of call
coriolinus May 31, 2021
88f856a
add log line
kianenigma Jun 1, 2021
ce0974f
Use a better data structure for SignedSubmissions instead of Vec (#8933)
coriolinus Jun 18, 2021
c1a4f1e
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
coriolinus Jun 18, 2021
75e6637
Merge branch 'master' of https://github.com/paritytech/substrate into…
Jun 20, 2021
2f26f16
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Jun 20, 2021
eb07d0b
remove duplicate weight definitions injected by benchmark bot
coriolinus Jun 21, 2021
18f4aaa
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
coriolinus Jun 21, 2021
a6b3770
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
coriolinus Jun 21, 2021
fb187fc
check deletion overlay before getting
coriolinus Jun 21, 2021
2ed81bc
clarify non-conflict between delete, insert overlays
coriolinus Jun 21, 2021
8f0c16e
drain can be used wrong so is private
coriolinus Jun 21, 2021
0b0abb8
update take_submission docs
coriolinus Jun 21, 2021
73071aa
more drain improvements
coriolinus Jun 22, 2021
955f5bc
more take_submission docs
coriolinus Jun 22, 2021
65b6926
debug assertion helps prove expectation is valid
coriolinus Jun 22, 2021
7b673d1
doc on changing SignedMaxSubmissions
coriolinus Jun 22, 2021
300c5f6
take_submission inner doc on system properties
coriolinus Jun 22, 2021
f84093b
Apply suggestions from code review
coriolinus Jun 22, 2021
2355a78
get SolutionOrSnapshotSize out of the loop
coriolinus Jun 22, 2021
e4e9eda
doc which items comprise `SignedSubmissions`
coriolinus Jun 22, 2021
65d7af6
add doc about index as unique identifier
coriolinus Jun 22, 2021
2c61152
Add debug assertions to prove drain worked properly
coriolinus Jun 22, 2021
368e97b
replace take_submission with swap_out_submission
coriolinus Jun 23, 2021
2491916
use a match to demonstrate all cases from signed_submissions.insert
coriolinus Jun 23, 2021
e12e542
refactor signed_submissions.insert return type
coriolinus Jun 23, 2021
a195ed8
prettify test assertion
coriolinus Jun 23, 2021
b0a57da
improve docs
coriolinus Jun 23, 2021
3325691
add tests that finalize_signed_phase is idempotent
coriolinus Jun 23, 2021
e0b3a52
add some debug assertions to guard against misuse of storage
coriolinus Jun 23, 2021
ad9d095
log internal logic errors instead of panicing
coriolinus Jun 23, 2021
3a46890
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
coriolinus Jun 23, 2021
0ddfeda
don't store the reward with each signed submission
coriolinus Jun 28, 2021
bf4572c
emit Rewarded, Slashed events as appropriate
coriolinus Jun 28, 2021
dfd0bf1
update docs
coriolinus Jun 28, 2021
786898d
use a custom enum to be explicit about the outcome of insertion
coriolinus Jun 28, 2021
9e6e75f
remove outdated docs
coriolinus Jun 28, 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
Master.into()
  • Loading branch information
@kianenigma
kianenigma committed Mar 3, 2021
commit 483018c869b70694ed70e424af9bb391b8b8d506
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 28 additions & 28 deletions bin/node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,34 +58,34 @@ pallet-contracts-rpc-runtime-api = { version = "3.0.0", default-features = false
pallet-democracy = { version = "3.0.0", default-features = false, path = "../../../frame/democracy" }
pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../../frame/grandpa" }
pallet-im-online = { version = "2.0.0", default-features = false, path = "../../../frame/im-online" }
pallet-indices = { version = "2.0.0", default-features = false, path = "../../../frame/indices" }
pallet-identity = { version = "2.0.0", default-features = false, path = "../../../frame/identity" }
pallet-lottery = { version = "2.0.0", default-features = false, path = "../../../frame/lottery" }
pallet-membership = { version = "2.0.0", default-features = false, path = "../../../frame/membership" }
pallet-mmr = { version = "2.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
pallet-multisig = { version = "2.0.0", default-features = false, path = "../../../frame/multisig" }
pallet-offences = { version = "2.0.0", default-features = false, path = "../../../frame/offences" }
pallet-offences-benchmarking = { version = "2.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
pallet-proxy = { version = "2.0.0", default-features = false, path = "../../../frame/proxy" }
pallet-randomness-collective-flip = { version = "2.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
pallet-recovery = { version = "2.0.0", default-features = false, path = "../../../frame/recovery" }
pallet-session = { version = "2.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
pallet-session-benchmarking = { version = "2.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
pallet-staking = { version = "2.0.0", default-features = false, path = "../../../frame/staking" }
pallet-election-provider-multi-phase = { version = "2.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
pallet-staking-reward-curve = { version = "2.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
pallet-scheduler = { version = "2.0.0", default-features = false, path = "../../../frame/scheduler" }
pallet-society = { version = "2.0.0", default-features = false, path = "../../../frame/society" }
pallet-sudo = { version = "2.0.0", default-features = false, path = "../../../frame/sudo" }
pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
pallet-tips = { version = "2.0.0", default-features = false, path = "../../../frame/tips" }
pallet-treasury = { version = "2.0.0", default-features = false, path = "../../../frame/treasury" }
pallet-utility = { version = "2.0.0", default-features = false, path = "../../../frame/utility" }
pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment" }
pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
pallet-vesting = { version = "2.0.0", default-features = false, path = "../../../frame/vesting" }
pallet-gilt = { version = "3.0.0", default-features = false, path = "../../../frame/gilt" }
pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
pallet-indices = { version = "3.0.0", default-features = false, path = "../../../frame/indices" }
pallet-identity = { version = "3.0.0", default-features = false, path = "../../../frame/identity" }
pallet-lottery = { version = "3.0.0", default-features = false, path = "../../../frame/lottery" }
pallet-membership = { version = "3.0.0", default-features = false, path = "../../../frame/membership" }
pallet-mmr = { version = "3.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
pallet-multisig = { version = "3.0.0", default-features = false, path = "../../../frame/multisig" }
pallet-offences = { version = "3.0.0", default-features = false, path = "../../../frame/offences" }
pallet-offences-benchmarking = { version = "3.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
pallet-proxy = { version = "3.0.0", default-features = false, path = "../../../frame/proxy" }
pallet-randomness-collective-flip = { version = "3.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
pallet-recovery = { version = "3.0.0", default-features = false, path = "../../../frame/recovery" }
pallet-session = { version = "3.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
pallet-session-benchmarking = { version = "3.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
pallet-staking = { version = "3.0.0", default-features = false, path = "../../../frame/staking" }
pallet-staking-reward-curve = { version = "3.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
pallet-scheduler = { version = "3.0.0", default-features = false, path = "../../../frame/scheduler" }
pallet-society = { version = "3.0.0", default-features = false, path = "../../../frame/society" }
pallet-sudo = { version = "3.0.0", default-features = false, path = "../../../frame/sudo" }
pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
pallet-tips = { version = "3.0.0", default-features = false, path = "../../../frame/tips" }
pallet-treasury = { version = "3.0.0", default-features = false, path = "../../../frame/treasury" }
pallet-utility = { version = "3.0.0", default-features = false, path = "../../../frame/utility" }
pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }

[build-dependencies]
substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
Expand Down
37 changes: 0 additions & 37 deletions bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,43 +557,6 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type BenchmarkingConfig = ();
}

parameter_types! {
// phase durations. 1/4 of the last session for each.
pub const SignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;

// fallback: no need to do on-chain phragmen initially.
pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
pallet_election_provider_multi_phase::FallbackStrategy::Nothing;

pub SolutionImprovementThreshold: Perbill = Perbill::from_rational_approximation(1u32, 10_000);

// miner configs
pub const MultiPhaseUnsignedPriority: TransactionPriority = StakingUnsignedPriority::get() - 1u64;
pub const MinerMaxIterations: u32 = 10;
pub MinerMaxWeight: Weight = RuntimeBlockWeights::get()
.get(DispatchClass::Normal)
.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
.saturating_sub(BlockExecutionWeight::get());
}

impl pallet_election_provider_multi_phase::Config for Runtime {
type Event = Event;
type Currency = Balances;
type SignedPhase = SignedPhase;
type UnsignedPhase = UnsignedPhase;
type SolutionImprovementThreshold = MinSolutionScoreBump;
type MinerMaxIterations = MinerMaxIterations;
type MinerMaxWeight = MinerMaxWeight;
type MinerTxPriority = MultiPhaseUnsignedPriority;
type DataProvider = Staking;
type OnChainAccuracy = Perbill;
type CompactSolution = pallet_staking::CompactAssignments;
type Fallback = Fallback;
type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Runtime>;
type BenchmarkingConfig = ();
}

parameter_types! {
pub const LaunchPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
pub const VotingPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
Expand Down
13 changes: 6 additions & 7 deletions frame/babe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@ sp-timestamp = { version = "3.0.0", default-features = false, path = "../../prim
log = { version = "0.4.14", default-features = false }

[dev-dependencies]
frame-benchmarking = { version = "2.0.0", path = "../benchmarking" }
pallet-balances = { version = "2.0.0", path = "../balances" }
pallet-offences = { version = "2.0.0", path = "../offences" }
pallet-staking = { version = "2.0.0", path = "../staking" }
pallet-staking-reward-curve = { version = "2.0.0", path = "../staking/reward-curve" }
sp-core = { version = "2.0.0", path = "../../primitives/core" }
sp-election-providers = { version = "2.0.0", path = "../../primitives/election-providers" }
pallet-balances = { version = "3.0.0", path = "../balances" }
pallet-offences = { version = "3.0.0", path = "../offences" }
pallet-staking = { version = "3.0.0", path = "../staking" }
pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
sp-core = { version = "3.0.0", path = "../../primitives/core" }
sp-election-providers = { version = "3.0.0", path = "../../primitives/election-providers" }

[features]
default = ["std"]
Expand Down
43 changes: 23 additions & 20 deletions frame/election-provider-multi-phase/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-election-provider-multi-phase"
version = "2.0.0"
version = "3.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -15,41 +15,42 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
static_assertions = "1.1.0"
serde = { version = "1.0.101", optional = true }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.14", default-features = false }

frame-support = { version = "2.0.0", default-features = false, path = "../support" }
frame-system = { version = "2.0.0", default-features = false, path = "../system" }
frame-support = { version = "3.0.0", default-features = false, path = "../support" }
frame-system = { version = "3.0.0", default-features = false, path = "../system" }

sp-io ={ version = "2.0.0", default-features = false, path = "../../primitives/io" }
sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
sp-npos-elections = { version = "2.0.0", default-features = false, path = "../../primitives/npos-elections" }
sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../primitives/arithmetic" }
sp-election-providers = { version = "2.0.0", default-features = false, path = "../../primitives/election-providers" }
sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }

# Optional imports for benchmarking
frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
rand = { version = "0.7.3", default-features = false, optional = true, features = ["alloc", "small_rng"] }

[dev-dependencies]
sp-io = { version = "2.0.0", path = "../../primitives/io" }
hex-literal = "0.3.1"
pallet-balances = { version = "2.0.0", path = "../balances" }
sp-core = { version = "2.0.0", path = "../../primitives/core" }
paste = "1.0.3"
substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
parking_lot = "0.11.0"
sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
rand = { version = "0.7.3" }
frame-benchmarking = { path = "../benchmarking" }
sp-election-providers = { version = "2.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }

hex-literal = "0.3.1"
substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
sp-io = { version = "3.0.0", path = "../../primitives/io" }
sp-core = { version = "3.0.0", path = "../../primitives/core" }
sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
sp-election-providers = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }
pallet-balances = { version = "3.0.0", path = "../balances" }
frame-benchmarking = { path = "../benchmarking" , version = "3.1.0"}

[features]
default = ["std"]
std = [
"serde",
"codec/std",
"log/std",

"frame-support/std",
"frame-system/std",
Expand All @@ -60,8 +61,10 @@ std = [
"sp-npos-elections/std",
"sp-arithmetic/std",
"sp-election-providers/std",
"log/std",
]
runtime-benchmarks = [
"frame-benchmarking",
"rand",
]
try-runtime = ["frame-support/try-runtime"]
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.