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

[Backport] Add missing companions #7571

Merged
merged 6 commits into from
Aug 2, 2023

Conversation

EgorPopelyaev
Copy link
Contributor

This PR adds missing companions on the polkadot side to fix compilation errors in the 1.0.0 branches

EgorPopelyaev and others added 5 commits August 2, 2023 10:07
* Companion for removal of execution strategies

paritytech/substrate#14387

* Fix some tests

* 🤦

* Adapt to latest changes

* Start supporting the offchain transaction pool

* Fix tests

* FMT

* Remove patches

* Update Substrate

* update lockfile for {"substrate"}

* Fix parachain upgrade smoke test

* Fix test

* Rewrite all tests to use `MockSubstemClient`

---------

Co-authored-by: parity-processbot <>
* GenesisBuild<T,I> deprecated. BuildGenesisConfig added

* fmt

* fixes

* more fixes

* more fixes

* fixes

* update lockfile for {"substrate"}

* fix

---------

Co-authored-by: parity-processbot <>
…moves `Header` and `BlockNumber` (#7431)

* Companion for substrate

* Minor update

* Formatting

* Fixes for cumulus

* Fixes tests in polkadot-runtime-parachains

* Minor update

* Removes unused import

* Fixes tests in polkadot-runtime-common

* Minor fix

* Update roadmap/implementers-guide/src/runtime/configuration.md

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

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

* update lockfile for {"substrate"}

---------

Co-authored-by: ordian <[email protected]>
Co-authored-by: command-bot <>
* replace Index for Nonce

* remove extra Nonce

* update lockfile for {"substrate"}

---------

Co-authored-by: parity-processbot <>
@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. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. A6-backport Pull request is already reviewed well in another branch. labels Aug 2, 2023
@EgorPopelyaev EgorPopelyaev requested review from chevdor and a team as code owners August 2, 2023 09:04
Copy link
Member

@ggwpez ggwpez left a comment

Choose a reason for hiding this comment

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

Muchos gracias!

Did you encounter any merge conflicts while merging those?

@paritytech-ci paritytech-ci requested review from a team August 2, 2023 09:22
@EgorPopelyaev
Copy link
Contributor Author

@ggwpez yep, there were some, but trivial ones, due to changes of the branch name and commit hash in the dependencies

@coderobe coderobe merged commit c9ec8c5 into release-v1.0.0 Aug 2, 2023
5 checks passed
@coderobe coderobe deleted the ep-add-missinig-companions branch August 2, 2023 10:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants