Skip to content

Backport of fix Pools 6->7 migration (#2942)#3093

Merged
acatangiu merged 1 commit intorelease-polkadot-v1.6.0from
bko-pools-migration-fix-to-1.6
Feb 1, 2024
Merged

Backport of fix Pools 6->7 migration (#2942)#3093
acatangiu merged 1 commit intorelease-polkadot-v1.6.0from
bko-pools-migration-fix-to-1.6

Conversation

@bkontur
Copy link
Copy Markdown
Contributor

@bkontur bkontur commented Jan 26, 2024

This should result as a patched 25.0.1 version for https://crates.io/crates/pallet-nomination-pools/25.0.0.

Relates to: polkadot-fellows/runtimes#159

@bkontur bkontur added R0-no-crate-publish-required The change does not require any crates to be re-published. T1-FRAME This PR/Issue is related to core FRAME, the framework. labels Jan 26, 2024
@bkontur bkontur requested review from a team January 26, 2024 21:35
@acatangiu acatangiu merged commit 61801ce into release-polkadot-v1.6.0 Feb 1, 2024
@acatangiu acatangiu deleted the bko-pools-migration-fix-to-1.6 branch February 1, 2024 12:07
bkontur added a commit that referenced this pull request Feb 6, 2024
This should result as a patched `25.0.1` version for
https://crates.io/crates/pallet-nomination-pools/25.0.0.

Relates to: polkadot-fellows/runtimes#159

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
acatangiu pushed a commit that referenced this pull request Feb 12, 2024
This is a cherry-pick of
#3093 (patch to
`release-polkadot-v1.6.0`).

This should result as a patched `25.0.1` version for
https://crates.io/crates/pallet-nomination-pools/25.0.0.

Relates to: polkadot-fellows/runtimes#159

---------

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: PG Herveou <pgherveou@gmail.com>
bkchr pushed a commit to polkadot-fellows/runtimes that referenced this pull request Feb 27, 2024
Based on bump to
[`polkadot-sdk@1.5.0`](#137).

Attached result of `cargo upgrade -v --pinned --incompatible`
[cargo-upgrade-version-bump.log](https://github.com/polkadot-fellows/runtimes/files/14044160/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

- [x] fix compilation
- [x] fix integration tests
- [x] fix benchmarks (also try them) - `collectives-polkadot` `payout`
- [ ] ~~Does not require a CHANGELOG entry~~
- [x] `warning: use of deprecated struct
`staging_xcm_builder::CurrencyAdapter`: Use `FungibleAdapter` instead`
- [ ] search for `TODO:(PR#159) change to FungibleAdapter` and/or wait
for paritytech/polkadot-sdk#3287
- [x] patch for `pallet-nomination-pools` migration fix
paritytech/polkadot-sdk#3093
- will be fixed here
#188 (comment)
- [x] patch for `xcm-executor` fix (for 1.6.0) e.g.
paritytech/polkadot-sdk#3174
- [x] check/fix coretime stuff for Kusama/Polkadot - search for `//
TODO:(PR#159)(PR#1694)` - see
[comment](#159 (comment))
- fixed by bkontur#3
- [x] check the
`MaxControllersInDeprecationBatch`https://github.com/polkadot-fellows/runtimes/pull/159/files#r1492361038
- [x] check `pallet_identity::Config` for Kusama and Polkadot
https://github.com/polkadot-fellows/runtimes/pull/159/files#r1492363866

---------

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: fellowship-merge-bot[bot] <151052383+fellowship-merge-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

R0-no-crate-publish-required The change does not require any crates to be re-published. T1-FRAME This PR/Issue is related to core FRAME, the framework.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants