* master:
  Make collation an optional return (#1787)
  XCM: Land xcm-handler and xcm-executor (#1771)
  v0.8.25 (#1785)
  add two node local net script (#1781)
  Adjust max nominators down to 128 (from 256) (#1782)
  Companion for substrate/pull/7215 (#1768)
  Remove Stale Upgrades (#1780)
  Update Polkadot Weights for Substrate 2.0 (#1761)
  Parachains v1 registrar module. (#1559)
  Derive `From` for `AllMessages` and simplify `send_msg` (#1774)
  implement remaining subsystem metrics (#1770)
  Companion for https://github.com/paritytech/substrate/pull/7236 (#1773)
  WIP: remove deprecated only/except clauses, build is now manual on PRs (#1769)
  Increase Westend `spec_version` (#1766)
  move Metrics to utils (#1765)

This pr changes the collator interface function to return an optional
collation instead of a collation. This is required as the parachain
itself can fail to generate a valid collation for various reason. Now if
the collation fails it will return `None`.

Besides that the pr adds some `RuntimeDebug` derive for `ValidationData`
and removes some whitespaces.

Co-authored-by: Gavin Wood <[email protected]>

* Bump version

* Update RELEASE.md

Co-authored-by: Shawn Tabrizi <[email protected]>

* initial work running a two node local net

* use the right incantations so the nodes produce blocks together

* improve internal documentation

* Companion for substrate/pull/7215

* More fixes

* Fix build

* fix

* Fix again with normal

* Fix build

* Latest changes

* "Update Substrate"

Co-authored-by: parity-processbot <>

* Remove stale upgrades

* add back origin migration

* remove unused

* Update benchmark list

* copy weights from substrate

* Run benchmarks on Polkadot

* Update kusama benchmark list

* update westend benchmark list

* Run benchmarks on Kusama

* update payout staking weights

* cargo update -p sp-io

* remove babe and grandpa from benchmark list

* remove babe and grandpa weights

* re-run staking weights

* update staking weights

* copy weights from Polkadot into Westend

* Update Cargo.lock

* Initial commit.

* Fix build

* Add comments, remove Event

* Dont expose calls

* Remove TODO and origins

* Fix merge

* Enable or disable parathread registration

* overseer metrics: messages relayed

* provisioner metrics: cosmetic changes

* candidate selection metrics: cosmetic changes

* availability bitfields metrics

* availability distribution metrics

* PoV distribution metrics

* statement-distribution: small simplification

* statement-distribution: extract log target into a const

* statement-distribution: metrics

* address review nits

* Companion for https://github.com/paritytech/substrate/pull/7236

* "Update Substrate"

Co-authored-by: parity-processbot <>

* change (CI): soon to be deprecated only changed to rules, build is now manual on PRs

* change (CI): add workflow to avoid doubled pipelines, remove second job

* debug (CI): unblock pipeline from waiting a manual action

This is required to ensure that on chain isn't seen as compatible to
current master.

* master:
  Add the XCM primitives crate. (#1760)
  Register listeners in statement distribution (#1759)

* master:
  Collator protocol followup (#1741)
  Revert "Remove Old Service, 2nd try (#1732)" (#1758)
  Remove Old Service, 2nd try (#1732)
  collation-generation: guide and tidying (#1753)
  Companion for #7111 (Introduce `cancel_proposal` and `blacklist`) (#1728)
  Parachains: Introduce a dummy module to include the Origin. (#1749)
  provisioner tests: remove tokio from dev-dependencies (#1745)

Co-authored-by: Gavin Wood <[email protected]>

Co-authored-by: Gavin Wood <[email protected]>

* Register listeners in statement distribution

* Review fixes

* Metrics

* Dont punish late collations

* Fix metrics

* Update node/network/collator-protocol/src/lib.rs

Co-authored-by: Andronik Ordian <[email protected]>

* Change on_request arg to Result

Co-authored-by: Andronik Ordian <[email protected]>

This reverts commit 42fbca6e.

* Restore "Remove service, migrate all to service-new (#1630)"

i.e.
Revert "Revert "Remove service, migrate all to service-new (#1630)" (#1731)"

This reverts commit c68aee35

.

This allows us to get the changeset from #1630 into a new branch
which can be merged sometime in the future after appropriate burnin
tests have completed.

* remove ',)' from codebase outside of macros

* restore bdfl-preferred formatting

* attempt to improve destructuring formatting

* rename polkadot-service-new -> polkadot-service

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <[email protected]>

* remove unused import

* Update runtime/rococo-v1/README.md

Co-authored-by: Bastian Köcher <[email protected]>

Co-authored-by: Andronik Ordian <[email protected]>
Co-authored-by: Bastian Köcher <[email protected]>

* Guide: Change for {Global,Local}ValidationData to ValidationData

Seems like that was missed during the transition from notions of global and local validation data to persistent and transient

* collation-generation: a small drive-by fix of line length

* collation-generation: extract an error module

this allows us to avoid piling Error and Result types from different contexts, specifically std vs. module-local

* collation-generation: extract LOG_TARGET from log statements

* Fixes

* update weights

* Fixes

* Fixes

* Fixes

* update weights

* "Update Substrate"

Co-authored-by: Shawn Tabrizi <[email protected]>
Co-authored-by: parity-processbot <>

That's because `construct_runtime` doesn't support a free-standing Origin. See the comment in parachains/src/origin.rs

* provisioner: remove tokio from dev-dependencies

* provisioner: use futures_timer instead

This reverts commit ae7f529d.

* master:
  Update to substrate 2.0 (#1744)
  Companion: Handle construct_runtime breaking change. (#1692)
  Companion for `ModuleToIndex` to `PalletInfo` rename (#1743)
  Companion for substrate/pull/7161 (#1739)

Co-authored-by: Fedor Sakharov <[email protected]>