Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Award one credit per dequeued vote when processing VoteStateUpdate in… (backport #25743) #25808

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2022

This is an automatic backport of pull request #25743 done by Mergify.
Cherry-pick of cbb0f07 has failed:

On branch mergify/bp/v1.10/pr-25743
Your branch is up to date with 'origin/v1.10'.

You are currently cherry-picking commit cbb0f07d5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   program-test/src/lib.rs
	modified:   programs/stake/src/stake_state.rs
	modified:   programs/vote/src/vote_processor.rs
	modified:   programs/vote/src/vote_state/mod.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/stake/src/stake_instruction.rs
	both modified:   sdk/src/feature_set.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

#25743)

* Award one credit per dequeued vote when processing VoteStateUpdate instruction,
to match vote rewards of Vote instruction.

* Update feature pubkey to one owned by cc (ashwin)

Co-authored-by: Ashwin Sekar <[email protected]>
(cherry picked from commit cbb0f07)

# Conflicts:
#	programs/stake/src/stake_instruction.rs
#	sdk/src/feature_set.rs
@mergify mergify bot added the conflicts label Jun 6, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 6, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jun 6, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jun 6, 2022
@mvines
Copy link
Contributor

mvines commented Jun 7, 2022

Do we really want to backport this? Better to let it soak on testnet through the 1.11 stabilization cycle

@AshwinSekar
Copy link
Contributor

sounds good

@AshwinSekar AshwinSekar closed this Jun 7, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-25743 branch June 7, 2022 01:17
@bji
Copy link
Contributor

bji commented Jun 29, 2022

Do we really want to backport this? Better to let it soak on testnet through the 1.11 stabilization cycle

In my opinion you cannot enable the VoteStateUpdate feature on mainline without this feature also. Because you'll be altering the way vote credits are awarded if VoteStateUpdate is enabled without this change.

If you're OK with not turning on VoteStateUpdate until at least 1.11, then it would be fine to not backport to 1.10.

@mvines
Copy link
Contributor

mvines commented Jun 29, 2022

VoteStateUpdate certainly cannot be enabled on mainnet without this feature

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants