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

upgrade to v1.2 #56

Merged
merged 16 commits into from
Nov 20, 2023
Merged

Conversation

muharem
Copy link
Contributor

@muharem muharem commented Oct 4, 2023

In the PR we bump versions for all dependacy crates from polkadot-sdk and apply all required changes

Changes:

TODO:

muharem and others added 6 commits October 4, 2023 12:33
@bkchr bkchr mentioned this pull request Nov 6, 2023
@@ -1573,7 +1578,7 @@ pub mod migrations {
pub type Unreleased = (
pallet_im_online::migration::v1::Migration<Runtime>,
parachains_configuration::migration::v7::MigrateToV7<Runtime>,
crate::paras_scheduler_migration::v1::MigrateToV1<Runtime>,
//crate::paras_scheduler_migration::v1::MigrateToV1<Runtime>, // TODO
Copy link
Contributor

Choose a reason for hiding this comment

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

We should be able to remove all of the migrations. Or we keep them here longer until the next release.

Copy link
Contributor

@acatangiu acatangiu Nov 6, 2023

Choose a reason for hiding this comment

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

I would remove migrations only after we see them enacted on-chain - just because we released them is no guarantee they will also run (maybe that runtime release gets skipped on-chain)..

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah for the CI we need to keep them any way.

Copy link
Member

Choose a reason for hiding this comment

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

We can re-add that migration, but it but it is a slightly different version from the SDK. The version that was commented here was a copy&paste version that does not compile anymore.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ahh it doesn't compile. Yeah then let's remove it. I think my fixed version should be in 1.3.0

@muharem muharem mentioned this pull request Nov 8, 2023
@acatangiu
Copy link
Contributor

@muharem is this PR ready? I am confused by TODO in description..

@ggwpez
Copy link
Member

ggwpez commented Nov 9, 2023

@muharem is this PR ready? I am confused by TODO in description..

Sorry i added it.

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
relay/kusama/src/lib.rs Outdated Show resolved Hide resolved
relay/polkadot/src/lib.rs Outdated Show resolved Hide resolved
relay/kusama/src/lib.rs Outdated Show resolved Hide resolved
Co-authored-by: Bastian Köcher <git@kchr.de>
@bkchr bkchr requested a review from ggwpez November 20, 2023 16:24
Copy link

There was a problem running the action.

❌😵❌

Please find more information in the logs.

@bkchr
Copy link
Contributor

bkchr commented Nov 20, 2023

We are missing an entry to CHANGELOG.md 🙈

@muharem
Copy link
Contributor Author

muharem commented Nov 20, 2023

We are missing an entry to CHANGELOG.md 🙈

added, please review. feel free to commit the suggestions.

CHANGELOG.md Outdated Show resolved Hide resolved
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
CHANGELOG.md Outdated
Comment on lines 12 to 19
- Upgrade parachains runtime API from v5 to v7 in Polkadot and Kusama ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
- Upgrade Preimage pallet's config implementations to adapt the new `Consideration` API ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
- Remove `experimental` feature flag for `pallet-society`, `pallet-xcm`, and `runtime-common` crates imports ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
- Election provider: use a geometric deposit base calculation for EPM signed submissions in Polkadot and Kusama ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))

### Added

- Add missing weight functions for `runtime_parachains_hrmp` and `preimage` pallets ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
Copy link
Contributor

Choose a reason for hiding this comment

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

This should go into a new [Unreleased] header.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

@bkchr
Copy link
Contributor

bkchr commented Nov 20, 2023

/merge

Copy link

There was a problem running the action.

❌😵❌

Please find more information in the logs.

@bkchr bkchr merged commit bdcd039 into polkadot-fellows:main Nov 20, 2023
6 checks passed
fellowship-merge-bot bot pushed a commit that referenced this pull request Nov 30, 2023
Opening PR mostly for visibility - I expect #56 to be finished before,
which would bump everything to v1.2 and then I'll convert this PR to
v1.2 -> v1.3. In its current state, this PR does v1.0 -> v1.3 bump,
although I've only been looking at [v1.2 -> v1.3
changelog](https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-v1.3.0),
so everything else just compiles.

TODOs left in this PR (which I'd like to address after #56 is finished):
- [x] revert `[cargo upgrade --pinned
--incompatible](https://github.com/polkadot-fellows/runtimes/commit/8df27a586b598d2f783b53cd62b127b8f8ac846a)`
and only leave sdk crates bump;
- [x] rebase on top of #56;
- [x] ensure that remaining PRs from v1.2 -> v1.3 are either not
required for P/K or shall be added later
(paritytech/polkadot-sdk#1344,
paritytech/polkadot-sdk#1333);
- [x] update weights
- [x] ~(maybe worth a separate PR) there's a lot of unused weight files
in this repo - I'd like to remove it~ will do it in a separate PR -
tracked here:
https://github.com/svyatonik/runtimes/tree/remove-unused-weight-files

@liamaharon Can you, please, confirm that the
paritytech/polkadot-sdk#1344 was necessary only
for sdk CI fixes - that PR caught my eye when I was looking at 1.3
CHANGELOG and I was wondering if we need to do the same for Polkadot,
Kusama and system parachains?

---------

Co-authored-by: Branislav Kontur <bkontur@gmail.com>
Co-authored-by: muharem <ismailov.m.h@gmail.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
fellowship-merge-bot bot added a commit that referenced this pull request Feb 2, 2024
We imported the runtimes into this repo at tag
[`v1.1.0-rc2`](https://github.com/paritytech/polkadot-sdk/commits/v1.1.0-rc2/)
but still merged stuff until they got removed in
[#1731](paritytech/polkadot-sdk#1731).
This re-applies all changes in that commit range
[`v1.1.0-rc2..bf90cb0b`](paritytech/polkadot-sdk@v1.1.0-rc2...bf90cb0)
checked in the SDK with
`git log v1.1.0-rc2..bf90cb0b -- polkadot/runtime/`. Closes
#112

Most changes got applied as part of
#56, but two were
missing:
- paritytech/polkadot-sdk#1303
- <s>https://github.com/paritytech/polkadot-sdk/pull/1476</s> (reverted)

<s>One [open
Q](#67 (comment))
since there was a difference between
[#1291](paritytech/polkadot-sdk#1291) and
#67.</s>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: fellowship-merge-bot[bot] <151052383+fellowship-merge-bot[bot]@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
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.

8 participants