Upgrade to latest polkadot-sdk@1.6 release by bkontur · Pull Request #159 · polkadot-fellows/runtimes

bkontur · 2024-01-24T22:14:02Z

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`

…rsioned`

… `set_commission_claim_permission`)

… / `take_response`)

…r_assets`)

…: `common` to `common` and `chains` chore: remove unneeded deps with `cargo machete` for integration tests

… 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

…onToV4` to SP

…to relays

… from paritytech/polkadot-sdk#2942)

…>,` to Kusama/Polkadot

bkontur · 2024-02-26T14:38:33Z

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.

Accomodate encointer to 1.6

bkontur · 2024-02-26T16:01:20Z

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

bkchr · 2024-02-27T08:48:18Z

 - 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))


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?

@bkchr what about this: 5e336f6 ?

bkchr · 2024-02-27T09:17:18Z

 	type RegistrarOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
+	type OffchainSignature = Signature;
+	type SigningPublicKey = <Signature as Verify>::Signer;
+	type UsernameAuthorityOrigin = EnsureRoot<Self::AccountId>;


So we should use an easier origin here @joepetrowski?

… by different versions of crates

bkontur · 2024-02-27T15:04:46Z

/merge

fellowship-merge-bot · 2024-02-27T15:05:25Z

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 · 2024-02-27T15:36:29Z

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)

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>

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>

bkontur added 30 commits January 23, 2024 12:03

Upgrade to latest: cargo upgrade -v --pinned --incompatible

c1cec95

[FeeManager] fix for XcmFeesToAccount

93f136b

[pallet_identity] adapt paritytech/polkadot-sdk#2048

3c88719

[pallet_identity] removed `FieldDeposit`, `MaxAdditionalFields`, added `ByteDeposit` fix import `simple` -> `legacy`

[pallet_staking] removed benchmark payout_stakers_dead_controller

fd6bffa

[pallet_nomination_pools] change import versioned_migrations to `ve…

41fd521

…rsioned`

[pallet_staking] adapt paritytech/polkadot-sdk#1189

aef83c9

[pallet-staking] adapt paritytech/polkadot-sdk#2380

53f6f9e

[runtime_api::ParachainHost] removed Hash, BlockNumber types

68f77f8

[pallet_nomination_pools] adapt paritytech/polkadot-sdk#2474 (missing…

e23218f

… `set_commission_claim_permission`)

[pallet-vesting] adapt paritytech/polkadot-sdk#1982

045deca

[ParachainHost] adapt paritytech/polkadot-sdk#2177

0e32f9f

[pallet_xcm] adapt paritytech/polkadot-sdk#2086 (weights: new_query…

3e19b99

… / `take_response`)

[pallet_xcm] adapt paritytech/polkadot-sdk#1672 (new `reserve_transfe…

a78ffe8

…r_assets`)

[pallet_xcm] adapt paritytech/polkadot-sdk#2388 (new transfer_assets)

3449ef8

[pallet_collator_selection] adapt paritytech/polkadot-sdk#1340

739170a

[dmp,xcmp,message_queue] adapt paritytech/polkadot-sdk#1246

a7a1cfc

[simple-mermaid] bump

f7a557e

[bridges] adapt paritytech/polkadot-sdk#2602

cb24674

[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

chore: fmt for all

1ccd0f7

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

fix: added rust-src to the stable toolchain components

4b496df

fix: added rust-src to check-migrations

e2564af

[migrations] added `cumulus_pallet_xcmp_queue::migration::v4::Migrati…

e7c1da1

…onToV4` to SP

[migrations] pallet_nomination_pools::migration::versioned::V7ToV8 …

200f154

…to relays

WIP: (DNM) Oliver's migration fix for pallet-nominations-pools (fix…

5a13a8c

… from paritytech/polkadot-sdk#2942)

[migrations] added `pallet_grandpa::migrations::MigrateV4ToV5<Runtime…

58e3ad8

…>,` to Kusama/Polkadot

fix Cargo.lock after rebase

ab047b0

[chain-specs] Updated relay+paras (except encointer)

ce7edfa

[chain-specs] Updated encointer to polkadot-sdk@1.5

dcee99c

Forgotten new integration tests to the matrix

ee69480

bkontur mentioned this pull request Feb 26, 2024

Add integration xcm-emulator tests for bridge-hubs to K/P bridging in fellows repo paritytech/parity-bridges-common#2791

Closed

Merge pull request #4 from bkontur/bko-bump-to-1.6-encointer

3319aba

Accomodate encointer to 1.6

ggwpez reviewed Feb 26, 2024

View reviewed changes

Comment thread chain-spec-generator/Cargo.toml Outdated

ggwpez reviewed Feb 26, 2024

View reviewed changes

Comment thread relay/polkadot/src/governance/old.rs

ggwpez reviewed Feb 26, 2024

View reviewed changes

Comment thread system-parachains/encointer/src/weights/pallet_message_queue.rs

ggwpez approved these changes Feb 26, 2024

View reviewed changes

ggwpez mentioned this pull request Feb 26, 2024

Lift external deps to the workspace #201

Merged

1 task

bkchr approved these changes Feb 27, 2024

View reviewed changes

muharem approved these changes Feb 27, 2024

View reviewed changes

bkontur added 3 commits February 27, 2024 13:51

Replaced Encointer hack with fix to avoid potential collisions caused…

bbf7c5b

… by different versions of crates

CI fix compilation for encointer?

157788c

Added Based on Polkadot-SDK to Changelog.md

5e336f6

Ank4n approved these changes Feb 27, 2024

View reviewed changes

fellowship-merge-bot Bot enabled auto-merge (squash) February 27, 2024 15:05

Merge branch 'main' into bko-bump-to-1.6

359b9f8

bkchr disabled auto-merge February 27, 2024 19:17

bkchr merged commit 59172d5 into polkadot-fellows:main Feb 27, 2024

bkontur deleted the bko-bump-to-1.6 branch February 27, 2024 21:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to latest polkadot-sdk@1.6 release#159

Upgrade to latest polkadot-sdk@1.6 release#159
bkchr merged 137 commits into
polkadot-fellows:mainfrom
bkontur:bko-bump-to-1.6

bkontur commented Jan 24, 2024 •

edited

Loading

Uh oh!

bkontur commented Feb 26, 2024

Uh oh!

bkontur commented Feb 26, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bkchr Feb 27, 2024

Uh oh!

bkontur Feb 27, 2024

Uh oh!

Uh oh!

Uh oh!

bkchr Feb 27, 2024

Uh oh!

bkontur commented Feb 27, 2024

Uh oh!

fellowship-merge-bot Bot commented Feb 27, 2024

Uh oh!

bkontur commented Feb 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Conversation

bkontur commented Jan 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

For reviewers

TODO

Uh oh!

bkontur commented Feb 26, 2024

Uh oh!

bkontur commented Feb 26, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bkchr Feb 27, 2024

Choose a reason for hiding this comment

Uh oh!

bkontur Feb 27, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bkchr Feb 27, 2024

Choose a reason for hiding this comment

Uh oh!

bkontur commented Feb 27, 2024

Uh oh!

fellowship-merge-bot Bot commented Feb 27, 2024

Uh oh!

bkontur commented Feb 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

bkontur commented Jan 24, 2024 •

edited

Loading