Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Nomination Pools migration v5: RewardPool fix#6957

Merged
paritytech-processbot[bot] merged 9 commits intomasterfrom
rb-pools-migration-v5
Mar 27, 2023
Merged

Nomination Pools migration v5: RewardPool fix#6957
paritytech-processbot[bot] merged 9 commits intomasterfrom
rb-pools-migration-v5

Conversation

@rossbulat
Copy link
Copy Markdown

@rossbulat rossbulat commented Mar 26, 2023

@paritytech-ci paritytech-ci requested review from a team March 26, 2023 16:35
This was referenced Mar 26, 2023
Merged
Merged
@rossbulat rossbulat marked this pull request as draft March 26, 2023 16:41
@rossbulat rossbulat changed the title Nomination Pools migration v5 Nomination Pools migration v5: RewardPool fix Mar 26, 2023
@rossbulat rossbulat marked this pull request as ready for review March 27, 2023 01:51
@rossbulat rossbulat requested a review from ggwpez March 27, 2023 01:51
@rossbulat rossbulat added I3-bug Fails to follow expected behavior. A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes E0-runtime_migration PR introduces code that might require downstream chains to run a runtime upgrade. C9-critical PR touches the given topic and has a critical impact on builders. T1-runtime This PR/Issue is related to the topic “runtime”. D9-needsaudit 👮 PR contains changes to fund-managing logic that should be properly reviewed and externally audited. labels Mar 27, 2023
kianenigma
kianenigma reviewed Mar 27, 2023
View reviewed changes
@kianenigma kianenigma removed T1-runtime This PR/Issue is related to the topic “runtime”. I3-bug Fails to follow expected behavior. labels Mar 27, 2023
ggwpez added 2 commits March 27, 2023 12:53
@ggwpez
Allow deprecated
d76a744 
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
@ggwpez
Keep old migrations around
5ab15fb 
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
ggwpez
ggwpez approved these changes Mar 27, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@ggwpez ggwpez left a comment

Choose a reason for hiding this comment

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

I added some comments to the Migrations struct since we skip 0.9.40 in governance to keep the old ones around.
Discussion in the FRAME chat.

@paritytech-processbot
Copy link
Copy Markdown

paritytech-processbot bot commented Mar 27, 2023

Merge cancelled due to error. Error: Head SHA changed from f72d4bf to 5ab15fb

@ggwpez
Copy link
Copy Markdown
Member

ggwpez commented Mar 27, 2023

bot merge

@paritytech-processbot
Copy link
Copy Markdown

paritytech-processbot bot commented Mar 27, 2023

Waiting for commit status.

@paritytech-processbot
Copy link
Copy Markdown

paritytech-processbot bot commented Mar 27, 2023

Merge cancelled due to error. Error: Statuses failed for f72d4bf

@rossbulat
Copy link
Copy Markdown
Author

rossbulat commented Mar 27, 2023

bot rebase

@paritytech-processbot
Copy link
Copy Markdown

paritytech-processbot bot commented Mar 27, 2023

Branch is already up-to-date

@rossbulat
Copy link
Copy Markdown
Author

rossbulat commented Mar 27, 2023

bot merge

@paritytech-processbot
Copy link
Copy Markdown

paritytech-processbot bot commented Mar 27, 2023

Waiting for commit status.

@paritytech-processbot
Copy link
Copy Markdown

paritytech-processbot bot commented Mar 27, 2023

Merge cancelled due to error. Error: Statuses failed for 27fd2dc

@rossbulat
Copy link
Copy Markdown
Author

rossbulat commented Mar 27, 2023

bot fmt

@command-bot
Copy link
Copy Markdown

command-bot bot commented Mar 27, 2023 •
edited
Loading

"$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh" was queued.

Comment bot cancel 59-e49a3e57-3f65-4fcd-850c-eac0ab2e2966 to cancel this command or bot cancel to cancel all commands in this pull request.

@command-bot
Copy link
Copy Markdown

command-bot bot commented Mar 27, 2023

@rossbulat Command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh" has finished. Result:

ValidationError: "id" is required
ValidationError: "id" is required
{"message":{"base":["Reference not found"]}}

Ross Bulat and others added 4 commits March 27, 2023 22:40
revert Cargo.lock master
76f4a37
@ggwpez
clippy: remove unused parentheses
33d1a3c 
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
@ggwpez
Fix parachain config migration
22ddc1c 
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
@ggwpez
Make tests work
c724a75 
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
@ggwpez ggwpez mentioned this pull request Mar 27, 2023
Closed
@ggwpez
Copy link
Copy Markdown
Member

ggwpez commented Mar 27, 2023

bot merge

@paritytech-processbot
Copy link
Copy Markdown

paritytech-processbot bot commented Mar 27, 2023

Waiting for commit status.

@paritytech-processbot paritytech-processbot bot merged commit cfc9c83 into master Mar 27, 2023
@paritytech-processbot paritytech-processbot bot deleted the rb-pools-migration-v5 branch March 27, 2023 18:03
coderobe pushed a commit that referenced this pull request Mar 27, 2023
@ggwpez @coderobe
Nomination Pools migration v5: RewardPool fix (#6957)
9dd4633 
* pools migration v5

* Allow deprecated

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Keep old migrations around

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* update lockfile for {"substrate"}

* use master Cargo.lock

* revert Cargo.lock master

* clippy: remove unused parentheses

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Fix parachain config migration

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Make tests work

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

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: parity-processbot <>
ordian added a commit that referenced this pull request Mar 29, 2023
@ordian
Merge branch 'master' into ao-past-session-slashing-runtime
2ba635b 
* master:
  Companion: wasm-builder support stable Rust (#6967)
  Fix feature (#6966)
  configuration: backport async backing parameters from the feature branch (#6961)
  Histogram support in runtime metrics (#6935)
  Bump openssl from 0.10.38 to 0.10.48 (#6955)
  Proxy for Nomination Pools (#6846)
  Nomination Pools migration v5: RewardPool fix (#6957)
  bump timestamp script to v0.2 (#6954)
  Subsystem channel tweaks (#6905)
  Companion for #13683 (#6944)
  inherent disputes: remove per block initializer and disputes timeout event (#6937)
ordian added a commit that referenced this pull request Mar 29, 2023
@ordian
Merge branch 'ao-past-session-slashing-runtime' into ao-past-session-…
55c7947 
…slashing-client

* ao-past-session-slashing-runtime:
  Companion: wasm-builder support stable Rust (#6967)
  Fix feature (#6966)
  configuration: backport async backing parameters from the feature branch (#6961)
  Histogram support in runtime metrics (#6935)
  Bump openssl from 0.10.38 to 0.10.48 (#6955)
  Proxy for Nomination Pools (#6846)
  Nomination Pools migration v5: RewardPool fix (#6957)
@librelois librelois mentioned this pull request Apr 6, 2023
Closed
@github-actions github-actions bot mentioned this pull request Jun 15, 2023
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers

@kianenigma kianenigma kianenigma approved these changes

@bkchr bkchr bkchr approved these changes

@ggwpez ggwpez ggwpez approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C9-critical PR touches the given topic and has a critical impact on builders. D9-needsaudit 👮 PR contains changes to fund-managing logic that should be properly reviewed and externally audited. E0-runtime_migration PR introduces code that might require downstream chains to run a runtime upgrade.

Projects

(Nominated) Proof of Stake
Status: ✅ Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@rossbulat @ggwpez @kianenigma @bkchr