* master:
  Companion for substrate#12530: Consolidate and deduplicate MMR API methods (#6167)
  Companion for substrate#12560 (#6226)
  [Companion] Bound Election and Staking by MaxActiveValidators (#6157)
  Retry failed PVF execution (AmbiguousWorkerDeath) (#6235)
  Make rolling session more resilient in case of long finality stalls (#6106)
  companion for fast unstake batching (#6253)
  staking miner: remove needless queue check (#6221)
  Retry failed PVF prepare jobs (#6213)
  Add a `last change` footer to the implementers guide (#6216)
  Update polkadot inflation to take into account auctions (#5872)
  Increase max rewardable nominators (#6230)
  BlockId removal: &Hash to Hash (#6246)

* master:
  State trie migration rococo runtime changes. (#6127)
  Add a few staking params to fast-runtime build (#5424)

* Add disputes subsystems fix

* Updated dispute approval vote import reasoning

* Improved wording of my changes

* Resolving issues brought up in comments

* Scraper processes CandidateBacked events

* Change definition of best-effort

* Fix `dispute-coordinator` tests

* Unit test for dispute filtering

* Clarification comment

* Add tests

* Fix logic

If a dispute is not backed, not included and not confirmed we
don't participate but we do import votes.

* Add metrics for refrained participations

* Revert "Add tests"

This reverts commit 7b8391a.

* Revert "Unit test for dispute filtering"

This reverts commit 92ba5fe.

* fix dispute-coordinator tests

* Fix scraping

* new tests

* Small fixes in guide

* Apply suggestions from code review

Co-authored-by: Andrei Sandu <[email protected]>

* Fix some comments and remove a pointless test

* Code review feedback

* Clarification comment in tests

* Some tests

* Reference counted `CandidateHash` in scraper

* Proper handling for Backed and Included candidates in scraper

Backed candidates which are not included should be kept for a
predetermined window of finalized blocks. E.g. if a candidate is backed
but not included in block 2, and the window size is 2, the same
candidate should be cleaned after block 4 is finalized.

Add reference counting for candidates in scraper. A candidate can be
added on multiple block heights so we have to make sure we don't clean
it prematurely from the scraper.

Add tests.

* Update comments in tests

* Guide update

* Fix cleanup logic for `backed_candidates_by_block_number`

* Simplify cleanup

* Make spellcheck happy

* Update tests

* Extract candidate backing logic in separate struct

* Code review feedback

* Treat  backed and included candidates in the same fashion

* Update some comments

* Small improvements in test

* spell check

* Fix some more comments

* clean -> prune

* Code review feedback

* Reword comment

* spelling

Co-authored-by: Andrei Sandu <[email protected]>

* approval-voting: remove a redundant check

* candidate-validation: remove unreachable check

Co-authored-by: parity-processbot <>

Fixes #6277.

* Only report concluded if there is an actual dispute.

Hence no "non"-disputes will be added to disputes anymore.

* Fix redundant check.

* Test for no onesided disputes.

Co-authored-by: eskimor <[email protected]>

Co-authored-by: eskimor <[email protected]>

Was seeing these warnings when running `cargo check --all`:

```
warning: for loop over an `Option`. This is more readably written as an `if let` statement
    --> node/core/approval-voting/src/lib.rs:1147:21
     |
1147 |             for activated in update.activated {
     |                              ^^^^^^^^^^^^^^^^
     |
     = note: `#[warn(for_loops_over_fallibles)]` on by default
help: to check pattern in a loop use `while let`
     |
1147 |             while let Some(activated) = update.activated {
     |             ~~~~~~~~~~~~~~~         ~~~
help: consider using `if let` to clear intent
     |
1147 |             if let Some(activated) = update.activated {
     |             ~~~~~~~~~~~~         ~~~
```

My guess is that `activated` used to be a SmallVec or similar, as is
`deactivated`. It was changed to an `Option`, the `for` still compiled (it's
technically correct, just weird), and the compiler didn't catch it until now.

* companion for #12599

* update Cargo.lock

* use cargo path instead of diener

* update lockfile for {"substrate"}

Co-authored-by: parity-processbot <>

* master:
  Revert special casing of Kusama for grandpa rounds. (#6217)
  [ci] fix buildah image (#6281)
  Only report concluded if there is an actual dispute. (#6270)
  fix a compilation warning (#6279)
  remove fill_block (#6200)
  approval-voting: remove redundant validation check (#6266)
  Update disputes prioritisation in `dispute-coordinator` (#6130)
  Brad implementers guide revisions 2 (#6239)

* master:
  companion for #12599 (#6290)
  Fixes "for loop over an `Option`" warnings (#6291)

* master:
  [ci] fix build-implementers-guide (#6335)
  Rate limit improvements (#6315)
  Add PVF module documentation (#6293)
  Update async-trait version to v0.1.58 (#6319)
  Extend lower bound of `manage_lease_period_start` from `runtime_common::slots` (#6318)
  Add `starts_with` to v0 and v1 MultiLocation (#6311)
  Remove the `wasmtime` feature flag (companion for substrate#12684) (#6268)
  [ci] fix build implementers guide (#6306)
  Change best effort queue behaviour in `dispute-coordinator` (#6275)
  Dedup subsystem name (#6305)
  Add Helikon boot nodes for Polkadot, Kusama and Westend. (#6240)
  Provisioner should ignore unconfirmed disputes (#6294)
  [ci] Improve pipeline stopper (#6300)

* master:
  ig: Fix description of execution retry delay (#6342)
  Added Amforc bootnodes for Polkadot and Kusama (#6077)

This reverts commit 7c4c3f5.

This reverts commit a5bff0c.

* master:
  guide: remove refences to outdated secondary checkers (#6309)
  Use CPU clock timeout for PVF jobs (#6282)
  support opengov calls in proxy definitions (#6366)
  Companion for: MMR: move RPC code from frame/ to client/ (#6369)
  Clippyfy (#6341)
  sync versions with current release (0.9.33) (#6363)
  Add Collectives as Trusted Teleporter (#6326)
  Remove `parity-util-mem` from `runtime-api` cache (#6367)
  Companion for: pallet-mmr: move offchain logic to client-side gadget (#6321)
  remove executed migrations (0.9.33) (#6364)
  dispute-coordinator: fix earliest session checks for pruning and import (#6358)
  [ci] fix implementer guide job (#6357)
  Provide some more granular metrics for polkadot_pvf_execution_time (#6346)
  Add more granularity to prometheus histogram buckets (#6348)
  cargo update -p sp-io (#6351)
  Add support for outbound only configs on request/response protocols (#6343)

* master:
  Bump (#6404)
  kusama whitelist pallet preimage dep upgrade (#6392)
  Make submission deposit reasonable (#6402)
  Companion of Substrate PR 12837 (#6385)
  crowdloan: Fix migration. (#6397)
  Bump Substrate (#6394)
  allow root with gov2 origins (#6390)
  Tweak some NIS params (#6393)
  OpenGov improvements for Kusama (#6372)
  Introduce NIS functionality into Kusama/Rococo (#6352)
  Set polkadot version in one place (#6095)
  Upgrade tokio to 1.22.0 (#6262)
  update deprecated alias `--all` (#6383)
  Reduce provisioner work (#6328)
  Add buckets on lower end of distribution to network bridge latency metrics (#6359)
  Kusama: approve/reject treasury prop by treasurer (#6354)

* master: (39 commits)
  Update dispute participation on active leaves update (#6303)
  Update disputes subsytems section. (#6329)
  Runtime diagnostics for leaked messages in unbounded channels (part 2) (#6481)
  Added comment describing satisfied invariant (#6460)
  [Companion] Allow StakingAdmin to set min_commission (#6444)
  Bump secp256k1 from 0.24.0 to 0.24.2 (#6411)
  Fix runtime-migration label detection (#6469)
  fix dependabot labels (#6468)
  cargo update -p libp2p-yamux (#6464)
  BlockId removal: refactor: HeaderBackend::status (#6459)
  Kusama origins as xcm multi_location (#6273)
  [ci] New try-runtime command (#6445)
  PVF preparation: do not conflate errors (#6384)
  BlockId removal: refactor: HeaderBackend::header (#6418)
  Update Substrate (#6457)
  Use explicit call indices (#6449)
  [bump] orchestra v0.0.4 (#6413)
  Adding some more logs (#6455)
  Make sure errors get logged (#6451)
  Fix wrong rate limit + add a few logs. (#6440)
  ...

…o ao-5535-followup

* 'ao-5535-followup' of github.com:paritytech/polkadot:
  typo

* master:
  Log PVF retries (#6504)
  Issue 6274: keeping all backing votes in provisioner vote set (#6494)
  Fix `polkadot-runtime-constants` std build (#6503)
  Add `try-runtime` to Rococo runtime (#6501)
  Co #13045: Selectable on-runtime-upgrade checks (#6498)
  Migrate Staking pallet to v13 (#6365)
  Deploy scheduler agenda cleanup migration (#6465)
  BlockId removal: refactor: BlockBackend::block|block_status (#6477)

* master:
  disputes pallet: Remove spam slots (#6345)
  Use `polkadot-node-metrics` where possible (#6484)
  Unlimited Proof size per block (#6085)
  [ci] Remove check-transaction-versions job (#6509)
  Update serde because substrate->trybuild needs a newer version (#6505)
  upgrade libp2p to 0.50.0 (#6500)
  av-store: write meta for unknown finalized blocks (#6452)

* master:
  Fix cycle dispute-coordinator <-> dispute-distribution  (#6489)
  Replace async-std with tokio in PVF subsystem (#6419)
  Guide changes 3 (#6520)
  Bump tokio from 1.22.0 to 1.24.1 (#6523)
  Fix flaky test in `dispute-coordinator` (#6524)
  Remove unused code (#6525)

* master:
  add erasure-coding benches (#6308)
  Fix set-output deprecation (#6554)
  pre-checking: Reject failed PVFs (#6492)
  pvf: Fix missing execution request when retrying preparation (#6537)
  Updated Dwellir bootnodes. Now using wss. (#6534)
  handle substrate-node-template and substrate-parachain-template (#6541)
  Westend state trie to version 1 (#6336)
  Add a paragraph about slashing in runtime disputes section from the guide (#6531)
  Re-export current primitives in crate root (#6487)
  Improve inactive fund tracking (#6471)
  Bump JasonEtco/create-an-issue from 2.6.0 to 2.9.1 (#6473)
  ci: mark update-weights non-interruptible (#6539)
  Trigger update-node-template when a final release tag is created (#6522)
  Minor fixes (#6533)
  Update the GHA srtool-actions to the latest version (#6532)

* master: (42 commits)
  Bump docker/build-push-action from 3 to 4 (#6651)
  ignore fast-unstake remote test (#6641)
  companion for substrate #13237 (#6626)
  Update benchmark's successful origin api (#6598)
  Companion: Remove `uncles` related code (#6615)
  Make zombienet tests native friendly (#6588)
  Storage monitor added to polkadot node (#6619)
  13110 Companion: Add WeightToFee and LengthToFee Runtime API (#6536)
  Co reducing fast-unstake bench time and more (#6552)
  clear migrations included in 0.9.37 (#6630)
  Fix XCM transact bench (#6635)
  Enable `try-runtime` flag in CI (#6587)
  Add pov_size and code_size histograms (#6633)
  nix upgrade to 0.26.1 (#6622)
  New runners for weights and new weights (#6508)
  Bump parity-db (#6617)
  libc crate update (#6616)
  XCM: Add HRMP to SafeCallFilter (#6606)
  [ci] Change check-labels GHA (#6594)
  Bump lru from 0.8.1 to 0.9.0 (#6538)
  ...