Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync up with latest master #14

Closed
wants to merge 12 commits into from
Closed

Conversation

ggwpez
Copy link
Member

@ggwpez ggwpez commented Jul 14, 2023

Status: Unsure if this is the latest version that we want to migrate. Maybe needs a further force-push. Currently waiting for #9 and internal discussions to resolve.

Syncing up with Cumulus branch oty-update-sub-and-dot which just uses latest Polkadot and Substrate master.

Commits (S, P, C): 5a7003b5bafb1343adaa47fc1d25ab1097b92836 f900dede87efcfd91eb5656ed78077ed3877f323 3b2e317f6bd7bee63083da99553ea4972b31a675.

@ggwpez ggwpez force-pushed the oty-sync-up branch 2 times, most recently from 22609cd to 907647f Compare July 14, 2023 16:01
@ggwpez ggwpez changed the title [DNM] Sync up test Sync up with latest master Jul 16, 2023
gavofyork and others added 12 commits July 17, 2023 10:24
* fix migrations

* use society versioned runtime upgrade

* simplify usage of versionedruntimeupgrade

* use society experimental feature

* improve usage of experimental flag

* doc comment

* Merge branch 'master' of github.com:paritytech/polkadot into liam-fix-migrations

* Revert "Merge branch 'master' of github.com:paritytech/polkadot into liam-fix-migrations"

This reverts commit 41ab0621811ead11b0a7f91338b0895208feef77.

* doc comment

* westend experimental feature

* Revert "westend experimental feature"

This reverts commit 42f4f1b76655ef509a92c324d18d635a1b913dcb.

* feature gate experimental xcm migration

* update lockfile for {"substrate"}

---------

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 <>
* create ManagerOrigin for HRMP

* missed one

* fix mock

* update GeneralAdmin docs
…moves `Header` and `BlockNumber` (#2790)

* Fixes

* Removes unused import

* Uses Block and removes BlockNumber/Header from Chain

* Fixes bridges

* Fixes

* Removes unused import

* Fixes build

* Uses correct RelayBlock

* Minor fix

* Fixes glutton-kusama

* Uses correct RelayBlock

* Minor fix

* Fixes benchmark for pallet-bridge-parachains

* Adds appropriate constraints

* Minor fixes

* Removes unused import

* Fixes integrity tests

* Minor fixes

* Updates trait bounds

* Uses custom bound for AsPrimitive

* Fixes trait bounds

* Revert "Fixes trait bounds"

This reverts commit 0b0f42f583f3a616a88afe45fcd06d31e7d9a06f.

* Revert "Uses custom bound for AsPrimitive"

This reverts commit 838e5281adf8b6e9632a2abb9cd550db4ae24126.

* No AsPrimitive trait bound for now

* Removes bounds on Number

* update lockfile for {"substrate", "polkadot"}

* Formatting

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

* Minor fix

---------

Co-authored-by: parity-processbot <>
* replace Index for Nonce

* update lockfile for {"substrate", "polkadot"}

---------

Co-authored-by: parity-processbot <>
Bumps [clap](https://github.com/clap-rs/clap) from 4.3.11 to 4.3.12.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](clap-rs/clap@v4.3.11...v4.3.12)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Oliver Tale-Yazdi <[email protected]>
rebases tmp-init onto origin/main

[detached HEAD 0224f53] Replace Index for Nonce (#2740)
 Author: Juan <[email protected]>
 6 files changed, 24 insertions(+), 24 deletions(-)
dropping a096256e71bf37b44c6e2bdd30e9fcd73538c66d Bump assert_cmd from 2.0.11 to 2.0.12 (#2872) -- patch contents already upstream
dropping 2ccec7ea3845ebdbf6053dbc4546c02db541b1d2 Update Substrate and Polkadot -- patch contents already upstream
dropping e15f7ad5db6da81c36982136fa0fee3d175b4a8b Remove trash -- patch contents already upstream
dropping ec6a57adb5f11f88606388ead1d04a4c047f4d98 Diener workspacify -- patch contents already upstream
Successfully rebased and updated refs/heads/tmp-init.
Signed-off-by: Oliver Tale-Yazdi <[email protected]>
Signed-off-by: Oliver Tale-Yazdi <[email protected]>
@ggwpez ggwpez marked this pull request as ready for review July 17, 2023 14:28
@ggwpez ggwpez marked this pull request as draft August 29, 2023 17:23
@ggwpez
Copy link
Member Author

ggwpez commented Sep 13, 2023

close in favour of #28

@ggwpez ggwpez closed this Sep 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants