Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Upgrade to latest polkadot-sdk@1.6 release #159

Merged
merged 137 commits into from
Feb 27, 2024
Merged

Upgrade to latest polkadot-sdk@1.6 release #159

merged 137 commits into from
Feb 27, 2024

Conversation

bkontur
Copy link
Contributor

@bkontur bkontur commented Jan 24, 2024 •
edited
Loading

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

bkontur added 30 commits January 23, 2024 12:03
@bkontur
Upgrade to latest: cargo upgrade -v --pinned --incompatible
c1cec95
@bkontur
[FeeManager] fix for XcmFeesToAccount
93f136b
@bkontur
[pallet_identity] adapt paritytech/polkadot-sdk#2048
3c88719 
[pallet_identity] removed `FieldDeposit`, `MaxAdditionalFields`, added `ByteDeposit`
fix import `simple` -> `legacy`
@bkontur
[pallet_staking] removed benchmark payout_stakers_dead_controller
fd6bffa
@bkontur
[pallet_nomination_pools] change import versioned_migrations to `ve…
41fd521 
…rsioned`
@bkontur
[pallet_staking] adapt paritytech/polkadot-sdk#1189
aef83c9
@bkontur
[pallet-staking] adapt paritytech/polkadot-sdk#2380
53f6f9e
@bkontur
[runtime_api::ParachainHost] removed Hash, BlockNumber types
68f77f8
@bkontur
[pallet_nomination_pools] adapt paritytech/polkadot-sdk#2474 (missing…
e23218f 
… `set_commission_claim_permission`)
@bkontur
[pallet-vesting] adapt paritytech/polkadot-sdk#1982
045deca
@bkontur
[ParachainHost] adapt paritytech/polkadot-sdk#2177
0e32f9f
@bkontur
[pallet_xcm] adapt paritytech/polkadot-sdk#2086 (weights: new_query…
3e19b99 
… / `take_response`)
@bkontur
[pallet_xcm] adapt paritytech/polkadot-sdk#1672 (new `reserve_transfe…
a78ffe8 
…r_assets`)
@bkontur
[pallet_xcm] adapt paritytech/polkadot-sdk#2388 (new transfer_assets)
3449ef8
@bkontur
[pallet_collator_selection] adapt paritytech/polkadot-sdk#1340
739170a
@bkontur
[dmp,xcmp,message_queue] adapt paritytech/polkadot-sdk#1246
a7a1cfc
@bkontur
[simple-mermaid] bump
f7a557e
@bkontur
[bridges] adapt paritytech/polkadot-sdk#2602
cb24674
@bkontur
[integration-tests] align integration tests with latest vogue + split…
ee13de8 
…: `common` to `common` and `chains`

chore: remove unneeded deps with `cargo machete` for integration tests
@bkontur
chore: fmt for all
1ccd0f7
@bkontur
fix: "Warning: Error parsing Cargo.toml manifest, fallback to caching…
ca13c92 
… entire file: Error: Invalid TOML document: expected key-value, found comma"

https://github.com/polkadot-fellows/runtimes/actions/runs/7507624988/job/20441549625?pr=137#step:9:1
@bkontur
fix: added rust-src to the stable toolchain components
4b496df
@bkontur
fix: added rust-src to check-migrations
e2564af
@bkontur
[migrations] added `cumulus_pallet_xcmp_queue::migration::v4::Migrati…
e7c1da1 
…onToV4` to SP
@bkontur
[migrations] pallet_nomination_pools::migration::versioned::V7ToV8 …
200f154 
…to relays
@bkontur
WIP: (DNM) Oliver's migration fix for pallet-nominations-pools (fix…
5a13a8c 
… from paritytech/polkadot-sdk#2942)
@bkontur
[migrations] added `pallet_grandpa::migrations::MigrateV4ToV5<Runtime…
58e3ad8 
…>,` to Kusama/Polkadot
@bkontur
fix Cargo.lock after rebase
ab047b0
@bkontur
[chain-specs] Updated relay+paras (except encointer)
ce7edfa
@bkontur
[chain-specs] Updated encointer to polkadot-sdk@1.5
dcee99c
@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 bkontur mentioned this pull request Feb 26, 2024
Closed
@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
Merged
1 task
bkchr
bkchr approved these changes Feb 27, 2024
View reviewed changes
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 ?

relay/polkadot/src/lib.rs
@@ -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
This was referenced Feb 28, 2024
Merged
Merged
Closed
Closed
fellowship-merge-bot bot pushed a commit that referenced this pull request Mar 5, 2024
@bkontur @joepetrowski
@franciscoaguirre @brenzi @acatangiu
Upgrade to latest polkadot-sdk@1.7 release (#187)
ba359a4 
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
@bkontur @franciscoaguirre
[xcm-builder] Replaced deprecated CurrencyAdapter with FungibleAdapter (
3e65142 
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>
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@bkchr bkchr bkchr approved these changes

@brenzi brenzi brenzi left review comments

@rossbulat rossbulat rossbulat left review comments

@joepetrowski joepetrowski joepetrowski left review comments

@ordian ordian ordian approved these changes

@muharem muharem muharem approved these changes

@Ank4n Ank4n Ank4n approved these changes

@ggwpez ggwpez ggwpez approved these changes

@acatangiu acatangiu acatangiu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.