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 latest polkadot-sdk@1.6 release #159

Merged
merged 137 commits into from
Feb 27, 2024

Conversation

bkontur
Copy link
Contributor

@bkontur bkontur commented Jan 24, 2024

Based on bump to polkadot-sdk@1.5.0.

Attached result of cargo upgrade -v --pinned --incompatible cargo-upgrade-version-bump.log

Note: Encointer was not upgraded (because its pallet references polkadot@1.3.0 release).

For reviewers

This PR is against polkadot-fellows's main to bring it to the fellows repo, but if you want to see a real diff relevant to the polkadot-sdk@1.6.0 update please check: bkontur/runtimes@bko-bump-to-1.5...bkontur:runtimes:bko-bump-to-1.6.

TODO

[pallet_identity] removed `FieldDeposit`, `MaxAdditionalFields`, added `ByteDeposit`
fix import `simple` -> `legacy`
…: `common` to `common` and `chains`

chore: remove unneeded deps with `cargo machete` for integration tests
@bkontur
Copy link
Contributor Author

bkontur commented Feb 26, 2024

Anything missing apart from changes from Encointer update to 1.6 to dedup deps?

@ordian not really, we just want to merge this update to the xcm emulator tests here. The Encointer bump from @brenzi is ready here: bkontur#4, can be merged, but check-migrations for Encointer now fails - more investigation here: #200

Xcm emulator tests are merged.
The Encointer bump will be merged here bkontur#4 when CI passes (except check-migration #200).

And I will merge this PR to main when Encointer bump is merged.

@bkontur
Copy link
Contributor Author

bkontur commented Feb 26, 2024

Encointer is also merged, so this PR is ready to be merged to the main finally

@ggwpez ggwpez mentioned this pull request Feb 26, 2024
1 task
CHANGELOG.md Outdated
@@ -22,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Upgrade dependencies to the `polkadot-sdk@1.5.0` release ([polkadot-fellows/runtimes#137](https://github.com/polkadot-fellows/runtimes/pull/137))
- Deprecate the `xcm::body::TREASURER_INDEX` constant and use the standard `Treasury` variant from the `xcm::BodyId` type instead ([polkadot-fellows/runtimes#149](https://github.com/polkadot-fellows/runtimes/pull/149))
- Bump parachains runtime API to v9 in Kusama to enable the `node_features` function [polkadot-fellows/runtimes#194](https://github.com/polkadot-fellows/runtimes/pull/194)
- Upgrade dependencies to the `polkadot-sdk@1.6.0` release ([polkadot-fellows/runtimes#159](https://github.com/polkadot-fellows/runtimes/pull/159))
Copy link
Contributor

Choose a reason for hiding this comment

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

In the light of #157

Can we make an extra heading below Removed, Based on Polkadot-SDK (heading name is total shitty, please propose better if you have any idea). And then mention the version with a link to the prs or something like this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bkchr what about this: 5e336f6 ?

@@ -816,6 +816,12 @@ impl pallet_identity::Config for Runtime {
type Slashed = Treasury;
type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
type RegistrarOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
type OffchainSignature = Signature;
type SigningPublicKey = <Signature as Verify>::Signer;
type UsernameAuthorityOrigin = EnsureRoot<Self::AccountId>;
Copy link
Contributor

Choose a reason for hiding this comment

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

So we should use an easier origin here @joepetrowski?

@bkontur
Copy link
Contributor Author

bkontur commented Feb 27, 2024

/merge

@fellowship-merge-bot fellowship-merge-bot bot enabled auto-merge (squash) February 27, 2024 15:05
@fellowship-merge-bot
Copy link
Contributor

Enabled auto-merge in Pull Request

Available commands
  • /merge: Enables auto-merge for Pull Request
  • /merge cancel: Cancels auto-merge for Pull Request
  • /merge help: Shows this menu

For more information see the documentation

@bkontur
Copy link
Contributor Author

bkontur commented Feb 27, 2024

looks like we should temporary skip Required for Encointer's check-migrations according to the #200 (comment), until it is enacted live (or fix here with some migration)

@bkchr bkchr disabled auto-merge February 27, 2024 19:17
@bkchr bkchr merged commit 59172d5 into polkadot-fellows:main Feb 27, 2024
8 checks passed
@bkontur bkontur deleted the bko-bump-to-1.6 branch February 27, 2024 21:09
fellowship-merge-bot bot pushed a commit that referenced this pull request Mar 5, 2024
Based on bump to
[`polkadot-sdk@1.6.0`](#159).

Attached result of `cargo upgrade -v --pinned --incompatible`
[cargo-upgrade-version-bump.log](https://github.com/polkadot-fellows/runtimes/files/14281072/cargo-upgrade-version-bump.log)

~~## For reviewers~~

~~This PR is against `polkadot-fellows`'s main to bring it to the
fellows repo, but if you want to see a real diff relevant to the
`polkadot-sdk@1.7.0` update please check:
bkontur/runtimes@bko-bump-to-1.6...bkontur:runtimes:bko-bump-to-1.7.~~


## TODO

- [x] fix compilation
- [x] apply patch for AssetHub tests:
paritytech/polkadot-sdk#3404
- [x] apply patch for `coretime`
paritytech/polkadot-sdk#3497 see
[comment](#187 (comment))
- [x] fix integration tests - fix after
#185
- [x] fix benchmarks (also try them)
- [x] apply patch for `pallet-xcm` benchmarks
paritytech/polkadot-sdk#3465
- [x] check ranked collectives:
- [x] `ExchangeOrigin` see
[comment](#187 (comment))
- [x] `MemberSwappedHandler` / `BenchmarkSetup` see
[comment](#187 (comment))

---------

Signed-off-by: Adrian Catangiu <adrian@parity.io>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com>
Co-authored-by: Ross Bulat <ross@parity.io>
Co-authored-by: Alain Brenzikofer <alain@integritee.network>
Co-authored-by: eskimor <eskimor@no-such-url.com>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
Co-authored-by: brenzi <brenzi@users.noreply.github.com>
bgallois pushed a commit to duniter/duniter-polkadot-sdk that referenced this pull request Mar 25, 2024
paritytech#3287)

I found out during the cleanup of this deprecation message in the
`polkadot-fellows` repository that we deprecated `CurrencyAdapter`
without making the recommended changes.


## TODO
- [ ] fix `polkadot-fellows` bump to 1.6.0
polkadot-fellows/runtimes#159

---------

Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.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.