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

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

Merged
merged 4 commits into from
Feb 6, 2024

Conversation

bkontur
Copy link
Contributor

@bkontur bkontur commented Jan 26, 2024

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

Relates to: polkadot-fellows/runtimes#137

@bkontur bkontur added R0-silent Changes should not be mentioned in any release notes 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
@ggwpez
Copy link
Member

ggwpez commented Feb 1, 2024

I think the issue is that the CI not runs with 1.75 but originally this was merged with 1.74. Maybe you can just merge that 1.75 update to make it green.

@bkontur bkontur requested review from athei and a team as code owners February 1, 2024 13:48
@paritytech-cicd-pr
Copy link

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: test-linux-stable 1/3
Logs: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/5098456

cc paritytech/ci_cd#900

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Dónal Murray <donal.murray@parity.io>
Co-authored-by: Bastian Köcher <info@kchr.de>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: command-bot <>
@bkontur bkontur force-pushed the bko-pools-migration-fix-to-1.5 branch from eff6512 to 353a7b2 Compare February 1, 2024 15:51
@bkontur bkontur requested review from andresilva and a team as code owners February 1, 2024 15:51
@bkontur
Copy link
Contributor Author

bkontur commented Feb 1, 2024

I think the issue is that the CI not runs with 1.75 but originally this was merged with 1.74. Maybe you can just merge that 1.75 update to make it green.

ehm, thank you, I missed your comment :D, so I reverted all the mess and cherry-picked commit with 1.74 for CI and it looks like at least clippy is ok now

For some reason original PR passed CI - when it shouldn't have. Fix
`pallet-xcm` test benchmarks.
@bkontur
Copy link
Contributor Author

bkontur commented Feb 2, 2024

@ggwpez do you have another tips for the failed jobs? or we are good to go without them?

@acatangiu acatangiu merged commit af5beb7 into release-polkadot-v1.5.0 Feb 6, 2024
111 of 115 checks passed
@acatangiu acatangiu deleted the bko-pools-migration-fix-to-1.5 branch February 6, 2024 08:46
@acatangiu
Copy link
Contributor

We now need to do the same for 1.6.0, right?

@bkontur
Copy link
Contributor Author

bkontur commented Feb 6, 2024

We now need to do the same for 1.6.0, right?

yes, but this #3093 has been already merged last week

bkontur added a commit that referenced this pull request Feb 6, 2024
This should result as a patched `24.0.1` version for
https://crates.io/crates/pallet-nomination-pools/24.0.0.

Relates to: polkadot-fellows/runtimes#137

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Co-authored-by: Dónal Murray <donal.murray@parity.io>
Co-authored-by: Bastian Köcher <info@kchr.de>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
Co-authored-by: PG Herveou <pgherveou@gmail.com>
acatangiu added a commit that referenced this pull request Feb 12, 2024
This is a cherry-pick of
#3094 (patch to
`release-polkadot-v1.5.0`).

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

Relates to: polkadot-fellows/runtimes#137

---------

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Co-authored-by: Dónal Murray <donal.murray@parity.io>
Co-authored-by: Bastian Köcher <info@kchr.de>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
Co-authored-by: PG Herveou <pgherveou@gmail.com>
Co-authored-by: command-bot <>
bkchr pushed a commit to polkadot-fellows/runtimes that referenced this pull request Feb 14, 2024
Attached result of `cargo upgrade -v --pinned --incompatible`
[cargo-upgrade-version-bump.log](https://github.com/polkadot-fellows/runtimes/files/13873056/cargo-upgrade-version-bump.log)

E.g.: `frame-support` from `25.0.0` to `27.0.0`

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

## TODO

- [x] fix compilation
- [x] fix integration tests
- [x] fix benchmarks (also try them)
- [ ] patch for `pallet-nomination-pools` migration fix
paritytech/polkadot-sdk#3094
- [x] patch for `xcm-executor` fix
paritytech/polkadot-sdk#3174
- [x] search for `TODO:(PR#137) - wait for xcm-executor patch` (missing
`FrameTransactionalProcessor`)
- [x] check/verify `MaxExposurePageSize = 512` / `MaxNominators = 512`
for Kusama/Polkadot
- [x] check with SRLabs (Jakob)
paritytech-secops/srlabs_findings#327


Closes: #113

---------

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
R0-silent Changes should not be mentioned in any release notes 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.

8 participants