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

Reject faked stake/vote accounts in stake mgmt. (bp #13615)#13620

Merged
mergify[bot] merged 2 commits intov1.3from
mergify/bp/v1.3/pr-13615
Nov 16, 2020
Merged

Reject faked stake/vote accounts in stake mgmt. (bp #13615)#13620
mergify[bot] merged 2 commits intov1.3from
mergify/bp/v1.3/pr-13615

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 16, 2020

This is an automated backport of pull request #13615 done by Mergify

Cherry-pick of 2b3faa1 has failed:

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

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

Changes to be committed:

	modified:   programs/stake/src/stake_state.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   programs/stake/src/stake_instruction.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

* Reject faked stake/vote accounts in stake mgmt.

* Use clearer name

(cherry picked from commit 2b3faa1)

# Conflicts:
#	programs/stake/src/stake_instruction.rs
@mergify mergify Bot added the conflicts label Nov 16, 2020
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Nov 16, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 16, 2020

Codecov Report

Merging #13620 (d4baae2) into v1.3 (29ac8f5) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@          Coverage Diff           @@
##            v1.3   #13620   +/-   ##
======================================
  Coverage   82.4%    82.4%           
======================================
  Files        368      368           
  Lines      87684    87745   +61     
======================================
+ Hits       72287    72352   +65     
+ Misses     15397    15393    -4     

@mergify mergify Bot merged commit e12cb45 into v1.3 Nov 16, 2020
@mergify mergify Bot deleted the mergify/bp/v1.3/pr-13615 branch November 16, 2020 22:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant