Add some important events to batch & staking to ensure ease of analysis #9462

gavofyork · 2021-07-29T16:46:52Z

Allow events from batched items to be separated. Also ensure the validator stash and era index from which the rewards are derived is always recorded. Also rename the events which do not respect the past-participle naming convention.

frame/utility/src/lib.rs

emostov

Looks good modulo I don't understand the justification for the ItemCompleted event and

Also include the era index in the Rewarded event

The code doesn't have it included, but maybe you meant too since it was added to the Rewarded event doc comment?

For users tracking events this could be a breaking change, heres a tl;dr:

EraPayout => EraPaid
Reward => Rewarded
Slash => Slashed
StakingElection => StakersElected

Also not sure if this affects @jacogr

frame/staking/src/pallet/mod.rs

Co-authored-by: Zeke Mostov <[email protected]>

gavofyork · 2021-07-29T17:47:37Z

bot merge

ghost · 2021-07-29T17:47:41Z

Waiting for commit status.

ghost · 2021-07-29T17:49:15Z

Merge aborted: Head SHA changed from a0759e0 to d67232c

shawntabrizi · 2021-07-29T17:49:23Z

bot merge

ghost · 2021-07-29T17:49:27Z

Waiting for commit status.

ghost · 2021-07-29T18:09:41Z

Merge aborted: Checks failed for d67232c

shawntabrizi · 2021-07-29T20:02:24Z

bot merge

ghost · 2021-07-29T20:02:28Z

Trying merge.

xlc · 2021-07-29T21:51:13Z

Need a rebenchmark?

…is (paritytech#9462) * Add some important events to batch & staking to ensure ease of analysis * Update frame/staking/src/pallet/mod.rs Co-authored-by: Zeke Mostov <[email protected]> * Update lib.rs * fix test Co-authored-by: Zeke Mostov <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]>

* copying rustfmt from root to node-template build. Also, running rustfmt on this. * Update .maintain/node-template-release/src/main.rs Co-authored-by: Bastian Köcher <[email protected]> * Add some important events to batch & staking to ensure ease of analysis (#9462) * Add some important events to batch & staking to ensure ease of analysis * Update frame/staking/src/pallet/mod.rs Co-authored-by: Zeke Mostov <[email protected]> * Update lib.rs * fix test Co-authored-by: Zeke Mostov <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]> * Move client consensus parts out of primitives and into client/consensus/api (#9319) * moved client code out of primitives * bump ci * Fixup from merge. * Removed unused deps thanks to review feedback * Removing unneeded deps * updating lock file * note about rustfmt * fixed typo to bump ci * Move lonely CacheKeyId to parent * cargo fmt * updating import style * Update docs/STYLE_GUIDE.md Co-authored-by: André Silva <[email protected]> Co-authored-by: André Silva <[email protected]> * Refactor Benchmarks for Less Wasm Memory Usage (#9373) * extract repeat out of benchmark * remove r * unused * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * use linked map to keep order * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * Delete pallet_balances.rs * Delete out * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * steps and repeat to tuple (current_*, total_*) * idea for list command * fmt * use benchmark list in cli * handle steps in cli * move log update to cli * fmt * remove old todo * line width * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * benchmark metadata function * don't need this warm up * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * fix warnings * fix node-template * fix * fmt * line width * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * improve docs * improve cli * fix format * fix bug? * Revert "fix bug?" This reverts commit 8051bf1. * skip frame-metadata * extract repeat out of benchmark * remove r * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * use linked map to keep order * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * Delete pallet_balances.rs * Delete out * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * steps and repeat to tuple (current_*, total_*) * idea for list command * fmt * use benchmark list in cli * handle steps in cli * move log update to cli * remove old todo * line width * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * benchmark metadata function * don't need this warm up * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * fix warnings * fix node-template * fix * fmt * line width * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * improve docs * improve cli * fix format * fix bug? * Revert "fix bug?" This reverts commit 8051bf1. * skip frame-metadata * Update .gitlab-ci.yml * fix import * Update .gitlab-ci.yml Co-authored-by: Parity Benchmarking Bot <[email protected]> * Warp sync part I (#9227) * Started warp sync * BABE & GRANDPA recovery * Warp sync protocol * Sync warp proofs first * Added basic documentation * Apply suggestions from code review Co-authored-by: André Silva <[email protected]> * Style changes * Apply suggestions from code review Co-authored-by: André Silva <[email protected]> * fmt * Apply suggestions from code review Co-authored-by: André Silva <[email protected]> * Fixed chage trie pruning wrt missing blocks * Restore parent finalization * fmt * fmt * Revert pwasm-utils bump * Change error type & check API version * Apply suggestions from code review Co-authored-by: Bastian Köcher <[email protected]> * Build fix * Fixed target block check * Formatting Co-authored-by: André Silva <[email protected]> Co-authored-by: Bastian Köcher <[email protected]> * Add rustfmt skip to default frame benchmarking template (#9473) This was missed in the introduction pr of rustfmt. There we only had updated the Substrate local template. * CI: stop publishing to crates.io until unleash is fixed (#9474) * CI: stop publishing to crates.io until unleash is fixed; allow restarting k8s runners * CI: fix CI if ci-release tag is pushed Co-authored-by: Eric Miller <[email protected]> Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: Gavin Wood <[email protected]> Co-authored-by: Zeke Mostov <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]> Co-authored-by: Squirrel <[email protected]> Co-authored-by: André Silva <[email protected]> Co-authored-by: Parity Benchmarking Bot <[email protected]> Co-authored-by: Arkadiy Paronyan <[email protected]> Co-authored-by: Denis Pisarev <[email protected]>

antonkhvorov · 2021-08-19T10:24:40Z

Looks good modulo I don't understand the justification for the ItemCompleted event and

Also include the era index in the Rewarded event

The code doesn't have it included, but maybe you meant too since it was added to the Rewarded event doc comment?

For users tracking events this could be a breaking change, heres a tl;dr:

EraPayout => EraPaid
Reward => Rewarded
Slash => Slashed
StakingElection => StakersElected

Also not sure if this affects @jacogr

@emostov indeed this is a breaking change, so we will adapt Fearless Wallet for it, thank you.
Most likely Subscan team should be notified as well, I will reach them out

* prune nimbus-primitives * update branches and toolchain * reflect new events from paritytech/substrate#9462 * update cargo.lock * Adapt benchmarking tests to latest substrate version Co-authored-by: gorka <[email protected]>

Add some important events to batch & staking to ensure ease of analysis

e37002f

gavofyork requested a review from kianenigma as a code owner July 29, 2021 16:46

gavofyork added A0-please_review Pull request needs code review. B7-runtimenoteworthy C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit labels Jul 29, 2021

emostov reviewed Jul 29, 2021

View reviewed changes

frame/utility/src/lib.rs Show resolved Hide resolved

emostov approved these changes Jul 29, 2021

View reviewed changes

emostov reviewed Jul 29, 2021

View reviewed changes

frame/staking/src/pallet/mod.rs Outdated Show resolved Hide resolved

kianenigma approved these changes Jul 29, 2021

View reviewed changes

Update frame/staking/src/pallet/mod.rs

a0759e0

Co-authored-by: Zeke Mostov <[email protected]>

gavofyork added A8-mergeoncegreen and removed A0-please_review Pull request needs code review. labels Jul 29, 2021

Update lib.rs

d67232c

fix test

32c97c6

gavofyork requested a review from athei as a code owner July 29, 2021 18:20

ghost merged commit 3478e0f into master Jul 29, 2021

ghost deleted the gav-improve-staking-events branch July 29, 2021 20:02

xlc mentioned this pull request Jul 29, 2021

It is hard to distinguish events from a utility.batch call #5639

Closed

JoshOrndorff added a commit to moonbeam-foundation/crowdloan-rewards that referenced this pull request Aug 23, 2021

reflect new events from paritytech/substrate#9462

6238fc7

github-actions bot mentioned this pull request Aug 24, 2021

Update substrate/polkadot/cumulus from v0.9.8 to v0.9.9 moonbeam-foundation/moonbeam#729

Closed

ERussel mentioned this pull request Aug 25, 2021

Handle new staking events naming subquery/subql-examples#31

Merged

apopiak mentioned this pull request Oct 5, 2021

Update weights for Statemine, Statemint and Westmint paritytech/cumulus#643

Merged

AurevoirXavier mentioned this pull request Dec 5, 2021

Refactor Staking darwinia-network/darwinia-common#976

Closed

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add some important events to batch & staking to ensure ease of analysis #9462

Add some important events to batch & staking to ensure ease of analysis #9462

gavofyork commented Jul 29, 2021 •

edited

Loading

emostov left a comment •

edited

Loading

gavofyork commented Jul 29, 2021

ghost commented Jul 29, 2021

ghost commented Jul 29, 2021

shawntabrizi commented Jul 29, 2021

ghost commented Jul 29, 2021

ghost commented Jul 29, 2021

shawntabrizi commented Jul 29, 2021

ghost commented Jul 29, 2021

xlc commented Jul 29, 2021

antonkhvorov commented Aug 19, 2021

Add some important events to batch & staking to ensure ease of analysis #9462

Add some important events to batch & staking to ensure ease of analysis #9462

Conversation

gavofyork commented Jul 29, 2021 • edited Loading

emostov left a comment • edited Loading

Choose a reason for hiding this comment

gavofyork commented Jul 29, 2021

ghost commented Jul 29, 2021

ghost commented Jul 29, 2021

shawntabrizi commented Jul 29, 2021

ghost commented Jul 29, 2021

ghost commented Jul 29, 2021

shawntabrizi commented Jul 29, 2021

ghost commented Jul 29, 2021

xlc commented Jul 29, 2021

antonkhvorov commented Aug 19, 2021

gavofyork commented Jul 29, 2021 •

edited

Loading

emostov left a comment •

edited

Loading