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

stake: Remove v2 program references#19308

Merged
joncinque merged 2 commits intosolana-labs:masterfrom
joncinque:st-v2-bye
Aug 20, 2021
Merged

stake: Remove v2 program references#19308
joncinque merged 2 commits intosolana-labs:masterfrom
joncinque:st-v2-bye

Conversation

@joncinque
Copy link
Copy Markdown
Contributor

Problem

While doing work on credits_observed, it made sense to also eliminate the fix_stake_deactivate flag everywhere, enabled in slot 55728001. This will make it easier to read the other (coming) PR.

Summary of Changes

Remove references to stake program v2, but NOT the feature itself, so that it can still be queried with solana feature status. Let me know if it makes sense to remove that too.

Note that this PR makes no logic changes at all, for your reviewing pleasure.

@joncinque joncinque added the v1.7 label Aug 19, 2021
@joncinque joncinque requested review from ryoqun and t-nelson August 19, 2021 06:38
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 19, 2021

Codecov Report

Merging #19308 (ff6e1e7) into master (89a31ff) will decrease coverage by 0.0%.
The diff coverage is 92.4%.

@@            Coverage Diff            @@
##           master   #19308     +/-   ##
=========================================
- Coverage    82.8%    82.8%   -0.1%     
=========================================
  Files         458      458             
  Lines      130847   130646    -201     
=========================================
- Hits       108453   108225    -228     
- Misses      22394    22421     +27     

@mvines
Copy link
Copy Markdown
Contributor

mvines commented Aug 19, 2021

Remove references to stake program v2, but NOT the feature itself, so that it can still be queried with solana feature status. Let me know if it makes sense to remove that too.

Removing the feature flag itself is fine as well. Do you need the v1.7 backport on this PR though?

@joncinque
Copy link
Copy Markdown
Contributor Author

Removing the feature flag itself is fine as well.

Done, rewrite_stake went away with it

Do you need the v1.7 backport on this PR though?

Yes, since it's a prereq for #19309

Copy link
Copy Markdown
Contributor

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

lgtm!

@joncinque joncinque merged commit 73aa004 into solana-labs:master Aug 20, 2021
@joncinque joncinque deleted the st-v2-bye branch August 20, 2021 05:08
mergify Bot pushed a commit that referenced this pull request Aug 20, 2021
* stake: Remove v2 program references

* Remove stake v2 feature, along with stake rewrite

(cherry picked from commit 73aa004)

# Conflicts:
#	runtime/src/bank.rs
mergify Bot added a commit that referenced this pull request Aug 20, 2021
* stake: Remove v2 program references (#19308)

* stake: Remove v2 program references

* Remove stake v2 feature, along with stake rewrite

(cherry picked from commit 73aa004)

# Conflicts:
#	runtime/src/bank.rs

* Fix merge conflict

* Fix uses of old `stake` function

Co-authored-by: Jon Cinque <jon.cinque@gmail.com>
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants