rent-collector: Inline struct and const, remove dep#7297
Merged
joncinque merged 5 commits intoanza-xyz:masterfrom Aug 12, 2025
Merged
rent-collector: Inline struct and const, remove dep#7297joncinque merged 5 commits intoanza-xyz:masterfrom
joncinque merged 5 commits intoanza-xyz:masterfrom
Conversation
joncinque
added a commit
to joncinque/solana-sdk
that referenced
this pull request
Aug 4, 2025
#### Problem As noted in anza-xyz#226, the rent collector crate and struct are no longer needed, and with anza-xyz/agave#7297, will no longer be used. #### Summary of changes Mark the crate as deprecated, so that we can backport and release the change, then delete the crate entirely.
joncinque
added a commit
to joncinque/solana-sdk
that referenced
this pull request
Aug 4, 2025
#### Problem As noted in anza-xyz#226, the rent collector crate and struct are no longer needed, and with anza-xyz/agave#7297, will no longer be used. #### Summary of changes Mark the crate as deprecated, so that we can backport and release the change, then delete the crate entirely.
brooksprumo
reviewed
Aug 4, 2025
brooksprumo
left a comment
brooksprumo
left a comment
There was a problem hiding this comment.
The accounts-db changes are fine. We don't actually need the rent epoch field in tiered storage at all anymore. But since it is still there, copying the RENT_EXEMPT_RENT_EPOCH constant is fine.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #7297 +/- ##
=========================================
- Coverage 83.3% 83.3% -0.1%
=========================================
Files 798 799 +1
Lines 362986 363014 +28
=========================================
+ Hits 302372 302391 +19
- Misses 60614 60623 +9 🚀 New features to boost your workflow:
|
|
If this PR represents a change to the public RPC API:
Thank you for keeping the RPC clients in sync with the server API @joncinque. |
joncinque
force-pushed
the
no-rent-collector
branch
2 times, most recently
from
0d578ff to
05366eb
Compare
joncinque
added a commit
to anza-xyz/solana-sdk
that referenced
this pull request
Aug 7, 2025
#### Problem As noted in #226, the rent collector crate and struct are no longer needed, and with anza-xyz/agave#7297, will no longer be used. #### Summary of changes Mark the crate as deprecated, so that we can backport and release the change, then delete the crate entirely.
github-actions Bot
pushed a commit
to anza-xyz/solana-sdk
that referenced
this pull request
Aug 7, 2025
#### Problem As noted in #226, the rent collector crate and struct are no longer needed, and with anza-xyz/agave#7297, will no longer be used. #### Summary of changes Mark the crate as deprecated, so that we can backport and release the change, then delete the crate entirely. (cherry picked from commit 0cabe5d)
buffalojoec
previously approved these changes
Aug 8, 2025
#### Problem As outlined in anza-xyz/solana-sdk#226, the RentCollector is no longer needed, and with solana-labs#6782, it's needed even less. #### Summary of changes Inline the `RentCollector` struct into `solana-runtime` with the few functions needed. This changes the frozen-abi hash because the type now comes from a different crate. The only other usage was the `RENT_EXEMPT_RENT_EPOCH` constant, which is used in svm and accounts-db. Since there's no good common crate that both of these use, I inlined the const in both places, along with a test to make sure they don't diverge. Finally, remove solana-rent-collector usage everywhere.
This reverts commit 101c5bf.
joncinque
force-pushed
the
no-rent-collector
branch
from
05366eb to
841427b
Compare
Author
|
Can I get another approval on this? I'll need to publish rent-collector v3 if this doesn't land 😅 |
brooksprumo
approved these changes
Aug 11, 2025
buffalojoec
approved these changes
Aug 12, 2025
joncinque
added a commit
to anza-xyz/solana-sdk
that referenced
this pull request
Aug 13, 2025
#### Problem As noted in #226, the rent collector crate and struct are no longer needed, and with anza-xyz/agave#7297, will no longer be used. #### Summary of changes Mark the crate as deprecated, so that we can backport and release the change, then delete the crate entirely. (cherry picked from commit 0cabe5d)
joncinque
added a commit
to anza-xyz/solana-sdk
that referenced
this pull request
Aug 14, 2025
* rent-collector: Deprecate the crate (#262) #### Problem As noted in #226, the rent collector crate and struct are no longer needed, and with anza-xyz/agave#7297, will no longer be used. #### Summary of changes Mark the crate as deprecated, so that we can backport and release the change, then delete the crate entirely. (cherry picked from commit 0cabe5d) * Add allow(deprecated) to re-export in the sdk --------- Co-authored-by: Jon C <me@jonc.dev>
febo
pushed a commit
to febo/solana-sdk
that referenced
this pull request
Sep 21, 2025
#### Problem As noted in anza-xyz#226, the rent collector crate and struct are no longer needed, and with anza-xyz/agave#7297, will no longer be used. #### Summary of changes Mark the crate as deprecated, so that we can backport and release the change, then delete the crate entirely.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
As outlined in anza-xyz/solana-sdk#226, the RentCollector is no longer needed, and with #6782, it's needed even less.
Summary of changes
Inline the
RentCollectorstruct intosolana-runtimewith the few functions needed. This changes the frozen-abi hash because the type now comes from a different crate.The only other usage was the
RENT_EXEMPT_RENT_EPOCHconstant, which is used in svm and accounts-db. Since there's no good common crate that both of these use, I inlined the const in both places, along with a test to make sure they don't diverge.Finally, remove solana-rent-collector usage everywhere.
@brooksprumo can you look at the accounts db changes?