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

Ep backport missing cumulus companions #14594

Merged
merged 4 commits into from
Jul 18, 2023
Merged

Ep backport missing cumulus companions #14594

merged 4 commits into from
Jul 18, 2023

Conversation

EgorPopelyaev
Copy link

This backport contains missing companion PR's needed for the cumulus release:

bkchr and others added 4 commits July 18, 2023 11:34
@bkchr @michalkucharczyk
@koute @skunert @EgorPopelyaev
Removal of execution strategies (#14387)
d8e48f4 
* Start

* More work!

* Moar

* More changes

* More fixes

* More worrk

* More fixes

* More fixes to make it compile

* Adds `NoOffchainStorage`

* Pass the extensions

* Small basti making small progress

* Fix merge errors and remove `ExecutionContext`

* Move registration of `ReadRuntimeVersionExt` to `ExecutionExtension`

Instead of registering `ReadRuntimeVersionExt` in `sp-state-machine` it is moved to
`ExecutionExtension` which provides the default extensions.

* Fix compilation

* Register the global extensions inside runtime api instance

* Fixes

* Fix `generate_initial_session_keys` by passing the keystore extension

* Fix the grandpa tests

* Fix more tests

* Fix more tests

* Don't set any heap pages if there isn't an override

* Fix small fallout

* FMT

* Fix tests

* More tests

* Offchain worker custom extensions

* More fixes

* Make offchain tx pool creation reusable

Introduces an `OffchainTransactionPoolFactory` for creating offchain transactions pools that can be
registered in the runtime externalities context. This factory will be required for a later pr to
make the creation of offchain transaction pools easier.

* Fixes

* Fixes

* Set offchain transaction pool in BABE before using it in the runtime

* Add the `offchain_tx_pool` to Grandpa as well

* Fix the nodes

* Print some error when using the old warnings

* Fix merge issues

* Fix compilation

* Rename `babe_link`

* Rename to `offchain_tx_pool_factory`

* Cleanup

* FMT

* Fix benchmark name

* Fix `try-runtime`

* Remove `--execution` CLI args

* Make clippy happy

* Forward bls functions

* Fix docs

* Update UI tests

* Update client/api/src/execution_extensions.rs

Co-authored-by: Michal Kucharczyk <[email protected]>

* Apply suggestions from code review

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

* Update client/cli/src/params/import_params.rs

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

* Update client/api/src/execution_extensions.rs

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

* Pass the offchain storage to the MMR RPC

* Update client/api/src/execution_extensions.rs

Co-authored-by: Sebastian Kunert <[email protected]>

* Review comments

* Fixes

---------

Co-authored-by: Michal Kucharczyk <[email protected]>
Co-authored-by: Koute <[email protected]>
Co-authored-by: Sebastian Kunert <[email protected]>
@michalkucharczyk @skunert
@davxy @bkchr @EgorPopelyaev
GenesisBuild<T,I> deprecated. BuildGenesisConfig added. (#14306)
022f15a 
* frame::support: GenesisConfig types for Runtime enabled

* frame::support: macro generating GenesisBuild::build for RuntimeGenesisConfig

* frame: ambiguity BuildStorage vs GenesisBuild fixed

* fix

* RuntimeGenesisBuild added

* Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed"

This reverts commit 6017dad.

* Revert "fix"

This reverts commit 477d7ad.

* Revert "RuntimeGenesisBuild added"

This reverts commit 3c131b6.

* Revert "Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed""

This reverts commit 2b1ecd4.

* Revert "Revert "fix""

This reverts commit fd7fa62.

* Code review suggestions

* frame: BuildGenesisConfig added, BuildGenesis deprecated

* frame: some pallets updated with BuildGenesisConfig

* constuct_runtime: support for BuildGenesisConfig

* frame::support: genesis_build macro supports BuildGenesisConfig

* frame: BuildGenesisConfig added, BuildGenesis deprecated

* Cargo.lock update

* test-runtime: fixes

* Revert "fix"

This reverts commit 477d7ad.

* Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed"

This reverts commit 6017dad.

* self review

* doc fixed

* ui tests fixed

* fmt

* tests fixed

* genesis_build macrto fixed for non-generic GenesisConfig

* BuildGenesisConfig constraints added

* warning fixed

* some duplication removed

* fmt

* fix

* doc tests fix

* doc fix

* cleanup: remove BuildModuleGenesisStorage

* self review comments

* fix

* Update frame/treasury/src/tests.rs

Co-authored-by: Sebastian Kunert <[email protected]>

* Update frame/support/src/traits/hooks.rs

Co-authored-by: Sebastian Kunert <[email protected]>

* doc fix: GenesisBuild exposed

* ".git/.scripts/commands/fmt/fmt.sh"

* frame: more serde(skip) + cleanup

* Update frame/support/src/traits/hooks.rs

Co-authored-by: Davide Galassi <[email protected]>

* frame: phantom fields moved to the end of structs

* chain-spec: Default::default cleanup

* test-runtime: phantom at the end

* merge master fixes

* fix

* fix

* fix

* fix

* fix (facepalm)

* Update frame/support/procedural/src/pallet/expand/genesis_build.rs

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

* fmt

* fix

* fix

---------

Co-authored-by: parity-processbot <>
Co-authored-by: Sebastian Kunert <[email protected]>
Co-authored-by: Davide Galassi <[email protected]>
Co-authored-by: Bastian Köcher <[email protected]>
@gupnik @juangirini
@ggwpez @bkchr @EgorPopelyaev
Moves Block to frame_system instead of construct_runtime and re…
e13ce1c 
…moves `Header` and `BlockNumber` (#14437)

* Initial setup

* Adds node block

* Uses UncheckedExtrinsic and removes Where section

* Updates frame_system to use Block

* Adds deprecation warning

* Fixes pallet-timestamp

* Removes Header and BlockNumber

* Addresses review comments

* Addresses review comments

* Adds comment about compiler bug

* Removes where clause

* Refactors code

* Fixes errors in cargo check

* Fixes errors in cargo check

* Fixes warnings in cargo check

* Formatting

* Fixes construct_runtime tests

* Uses import instead of full path for BlockNumber

* Uses import instead of full path for Header

* Formatting

* Fixes construct_runtime tests

* Fixes imports in benchmarks

* Formatting

* Fixes construct_runtime tests

* Formatting

* Minor updates

* Fixes construct_runtime ui tests

* Fixes construct_runtime ui tests with 1.70

* Fixes docs

* Fixes docs

* Adds u128 mock block type

* Fixes split example

* fixes for cumulus

* ".git/.scripts/commands/fmt/fmt.sh"

* Updates new tests

* Fixes fully-qualified path in few places

* Formatting

* Update frame/examples/default-config/src/lib.rs

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

* Update frame/support/procedural/src/construct_runtime/mod.rs

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

* ".git/.scripts/commands/fmt/fmt.sh"

* Addresses some review comments

* Fixes build

* ".git/.scripts/commands/fmt/fmt.sh"

* Update frame/democracy/src/lib.rs

Co-authored-by: Oliver Tale-Yazdi <[email protected]>

* Update frame/democracy/src/lib.rs

Co-authored-by: Oliver Tale-Yazdi <[email protected]>

* Update frame/support/procedural/src/construct_runtime/mod.rs

Co-authored-by: Oliver Tale-Yazdi <[email protected]>

* Update frame/support/procedural/src/construct_runtime/mod.rs

Co-authored-by: Oliver Tale-Yazdi <[email protected]>

* Addresses review comments

* Updates trait bounds

* Minor fix

* ".git/.scripts/commands/fmt/fmt.sh"

* Removes unnecessary bound

* ".git/.scripts/commands/fmt/fmt.sh"

* Updates test

* Fixes build

* Adds a bound for header

* ".git/.scripts/commands/fmt/fmt.sh"

* Removes where block

* Minor fix

* Minor fix

* Fixes tests

* ".git/.scripts/commands/update-ui/update-ui.sh" 1.70

* Updates test

* Update primitives/runtime/src/traits.rs

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

* Update primitives/runtime/src/traits.rs

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

* Updates doc

* Updates doc

---------

Co-authored-by: command-bot <>
Co-authored-by: Juan <[email protected]>
Co-authored-by: Oliver Tale-Yazdi <[email protected]>
Co-authored-by: Bastian Köcher <[email protected]>
@juangirini @EgorPopelyaev
Replace system config Index for Nonce (#14290)
6b5e144 
* replace Index by Nonce

* replace Index by Nonce

* replace Index by Nonce

* replace Index by Nonce

* replace Index by Nonce

* wip

* remove index in lieu of nonce

* wip

* remove accountnonce in lieu of nonce

* add minor improvement

* rebase and merge conflicts
@EgorPopelyaev EgorPopelyaev added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. A6-backport Pull request is already reviewed well in another branch. T9-release This PR/Issue is related to topics touching the release notes. labels Jul 18, 2023
@EgorPopelyaev EgorPopelyaev requested review from a team July 18, 2023 09:51
@EgorPopelyaev EgorPopelyaev requested a review from a team July 18, 2023 09:51
@EgorPopelyaev EgorPopelyaev requested review from cheme and a team as code owners July 18, 2023 09:51
@EgorPopelyaev EgorPopelyaev added the D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit label Jul 18, 2023
joepetrowski
joepetrowski approved these changes Jul 18, 2023
View reviewed changes
Copy link
Contributor

@joepetrowski joepetrowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compared with commits in https://github.com/ggwpez/runtimes/commits/oty-sync-up

@EgorPopelyaev EgorPopelyaev merged commit b8d485f into polkadot-v1.0.0 Jul 18, 2023
16 of 22 checks passed
@EgorPopelyaev EgorPopelyaev deleted the ep-backport-missiing-cumulus-companions branch July 18, 2023 12:29
@koushiro koushiro mentioned this pull request Jul 29, 2023
Merged
@sander2 sander2 mentioned this pull request Jul 31, 2023
Closed
@jasl jasl mentioned this pull request Aug 20, 2023
Merged
@koushiro koushiro mentioned this pull request Aug 21, 2023
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@NachoPal NachoPal NachoPal approved these changes

@joepetrowski joepetrowski joepetrowski approved these changes

@athei athei Awaiting requested review from athei athei is a code owner

@acatangiu acatangiu Awaiting requested review from acatangiu acatangiu is a code owner

@andresilva andresilva Awaiting requested review from andresilva

@sorpaas sorpaas Awaiting requested review from sorpaas sorpaas is a code owner

@jsidorenko jsidorenko Awaiting requested review from jsidorenko

@cheme cheme Awaiting requested review from cheme cheme is a code owner

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. A6-backport Pull request is already reviewed well in another branch. B0-silent Changes should not be mentioned in any release notes 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 T9-release This PR/Issue is related to topics touching the release notes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@EgorPopelyaev @NachoPal @joepetrowski @bkchr @michalkucharczyk @gupnik @juangirini