Add a feature to disable rent collection #33945

HaoranYi · 2023-11-03T17:50:08Z

Problem

The rent paying accounts on solana are phasing out.

Add a feature gate to disable rent collection. When there are no longer any rent
paying accounts on the network, we can enable this feature.

Summary of Changes

Add disable_rent_collection feature
when the feature is enabled, all accounts are treated rent-exempt. No rent fees will be collected and distributed.

Note: This feature only disables rent collection (not rewrite), all accounts are still being rewritten. To skip account rewrite, please refer to skip_rent_rewrite feature #26599.

Feature Gate Issue: #33946

codecov · 2023-11-03T22:33:49Z

Codecov Report

Merging #33945 (2cb7153) into master (7ba9fbc) will increase coverage by 0.1%.
Report is 1337 commits behind head on master.
The diff coverage is 91.1%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #33945      +/-   ##
==========================================
+ Coverage    81.8%    81.9%    +0.1%     
==========================================
  Files         766      812      +46     
  Lines      209154   219664   +10510     
==========================================
+ Hits       171206   180038    +8832     
- Misses      37948    39626    +1678

accounts-db/src/accounts.rs

runtime/src/bank/fee_distribution.rs

runtime/src/bank/tests.rs

accounts-db/src/rent_collector.rs

runtime/src/bank/tests.rs

accounts-db/src/rent_collector.rs

runtime/src/bank.rs

accounts-db/src/accounts.rs

brooksprumo

Looking good!

accounts-db/src/accounts.rs

Co-authored-by: Brooks <[email protected]>

When rent fee collection is disabled, we won't collect rent for any account. If there are any rent paying accounts, their `rent_epoch` won't change too.

ledger/src/blockstore_processor.rs

brooksprumo

Lgtm!

runtime/src/bank/fee_distribution.rs

I overlooked a thing

brooksprumo

Lgtm

runtime/src/bank/fee_distribution.rs

CriesofCarrots · 2023-11-16T17:00:27Z

Why did this land before the SIMD?

jeffwashington · 2023-11-16T17:57:41Z

Why did this land before the SIMD?

yes, seems like it should've had simd. The whole goal was to ease the way for other clients, and was done after discussions with fd... Ha.

HaoranYi · 2023-11-16T18:39:43Z

Here is the SIMD https://github.com/solana-foundation/solana-improvement-documents/pull/84/files.
@jeffwashington It seems that I can't find you on https://github.com/solana-foundation/solana-improvement-documents.
Maybe you are not added to that repo?

CriesofCarrots · 2023-11-16T23:14:48Z

I am on that repo, and did see that SIMD. It looks like you’ve done some work on it today, but as of my comment this morning, it didn’t describe a design aside from linking to this PR, hadn’t had any discussion, and isn’t approved and merged.

HaoranYi · 2023-11-16T23:58:29Z

I am on that repo, and did see that SIMD. It looks like you’ve done some work on it today, but as of my comment this morning, it didn’t describe a design aside from linking to this PR, hadn’t had any discussion, and isn’t approved and merged.

Yeah. I worked on the SIMD today. Hopefully, it won't take us too long to get SIMD approved, since today we don't have any rent paying accounts on the mainnet. In retrospect, we should have merged SIMD PR before merging this PR.

HaoranYi added the feature-gate Pull Request adds or modifies a runtime feature gate label Nov 3, 2023

HaoranYi force-pushed the nov_3 branch from 32aaa1e to 681a81b Compare November 3, 2023 18:02

HaoranYi changed the title ~~add a feature to disable rent collection~~ Add a feature to disable rent collection Nov 3, 2023

HaoranYi requested review from brooksprumo and jeffwashington November 6, 2023 14:58

HaoranYi force-pushed the nov_3 branch from c6b86ff to 64e59c3 Compare November 6, 2023 15:15

brooksprumo reviewed Nov 6, 2023

View reviewed changes

accounts-db/src/accounts.rs Outdated Show resolved Hide resolved

HaoranYi force-pushed the nov_3 branch from e095a35 to a26e606 Compare November 7, 2023 16:12

jeffwashington requested a review from brooksprumo November 10, 2023 16:26

brooksprumo reviewed Nov 10, 2023

View reviewed changes

runtime/src/bank/fee_distribution.rs Outdated Show resolved Hide resolved

runtime/src/bank/tests.rs Show resolved Hide resolved

runtime/src/bank/tests.rs Show resolved Hide resolved

accounts-db/src/rent_collector.rs Outdated Show resolved Hide resolved

jeffwashington requested a review from brooksprumo November 13, 2023 20:45

brooksprumo reviewed Nov 13, 2023

View reviewed changes

runtime/src/bank/tests.rs Outdated Show resolved Hide resolved

runtime/src/bank/tests.rs Outdated Show resolved Hide resolved

runtime/src/bank/tests.rs Outdated Show resolved Hide resolved

accounts-db/src/rent_collector.rs Outdated Show resolved Hide resolved

HaoranYi force-pushed the nov_3 branch from 27bdf9d to e1aee98 Compare November 14, 2023 18:48

HaoranYi requested a review from Lichtso November 14, 2023 18:52

brooksprumo reviewed Nov 14, 2023

View reviewed changes

runtime/src/bank.rs Show resolved Hide resolved

accounts-db/src/accounts.rs Show resolved Hide resolved

brooksprumo self-requested a review November 14, 2023 22:35

brooksprumo reviewed Nov 15, 2023

View reviewed changes

accounts-db/src/accounts.rs Outdated Show resolved Hide resolved

accounts-db/src/accounts.rs Show resolved Hide resolved

brooksprumo mentioned this pull request Nov 15, 2023

Uses RENT_EXEMPT_RENT_EPOCH to mark account as rent exempt #34090

Merged

HaoranYi requested a review from brooksprumo November 15, 2023 19:03

HaoranYi and others added 10 commits November 15, 2023 20:10

add a feature to disable rent collection

f78e3c6

fix a test

5369bce

fix a test

9b8fd1e

rekey

c646565

should collect rent

380fe4c

Update runtime/src/bank/fee_distribution.rs

978c17e

Co-authored-by: Brooks <[email protected]>

expand tests to cover both rent collection disabled and enabled

a5fdf2d

feedbacks

aaec57e

reviews - move should collect rent check out of rent collector into bank

c3c7af1

enforce rent_epoch to u64:max when rent collection is disabled

b83fe1c

HaoranYi added 4 commits November 15, 2023 20:10

review feedbacks and fix a test

883dd6e

When rent fee collection is disabled, we won't collect rent for any account. If there are any rent paying accounts, their `rent_epoch` won't change too.

revise comments

5647649

update rent_epoch for rent exempted account

0af3d3c

rebase

82fb9af

HaoranYi force-pushed the nov_3 branch from 11ee171 to 82fb9af Compare November 15, 2023 20:11

set rent_epoch in rent collection for rent exempted account

7b09ea3

brooksprumo reviewed Nov 15, 2023

View reviewed changes

ledger/src/blockstore_processor.rs Outdated Show resolved Hide resolved

revert test change

488650d

HaoranYi force-pushed the nov_3 branch from 2242ab5 to 488650d Compare November 15, 2023 21:10

brooksprumo previously approved these changes Nov 15, 2023

View reviewed changes

jeffwashington reviewed Nov 15, 2023

View reviewed changes

runtime/src/bank/fee_distribution.rs Show resolved Hide resolved

brooksprumo self-requested a review November 15, 2023 22:02

don't assert

2cb7153

brooksprumo approved these changes Nov 16, 2023

View reviewed changes

runtime/src/bank/fee_distribution.rs Show resolved Hide resolved

HaoranYi merged commit 60fdd85 into solana-labs:master Nov 16, 2023

acheroncrypto mentioned this pull request Nov 16, 2023

docs: Add Solana Playground quickstart page, and add examples page for anchor contraints and types. coral-xyz/anchor#2703

Merged

acheroncrypto mentioned this pull request Nov 21, 2023

lang: Remove rent_exempt constraint coral-xyz/anchor#2708

Open

willhickey mentioned this pull request Mar 28, 2024

v1.18 commits - please ignore anza-xyz/agave#475

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a feature to disable rent collection #33945

Add a feature to disable rent collection #33945

HaoranYi commented Nov 3, 2023 •

edited

Loading

codecov bot commented Nov 3, 2023 •

edited

Loading

brooksprumo left a comment

brooksprumo left a comment

brooksprumo left a comment

CriesofCarrots commented Nov 16, 2023

jeffwashington commented Nov 16, 2023

HaoranYi commented Nov 16, 2023

CriesofCarrots commented Nov 16, 2023

HaoranYi commented Nov 16, 2023 •

edited

Loading

Add a feature to disable rent collection #33945

Add a feature to disable rent collection #33945

Conversation

HaoranYi commented Nov 3, 2023 • edited Loading

Problem

Summary of Changes

codecov bot commented Nov 3, 2023 • edited Loading

Codecov Report

brooksprumo left a comment

Choose a reason for hiding this comment

brooksprumo left a comment

Choose a reason for hiding this comment

brooksprumo left a comment

Choose a reason for hiding this comment

CriesofCarrots commented Nov 16, 2023

jeffwashington commented Nov 16, 2023

HaoranYi commented Nov 16, 2023

CriesofCarrots commented Nov 16, 2023

HaoranYi commented Nov 16, 2023 • edited Loading

HaoranYi commented Nov 3, 2023 •

edited

Loading

codecov bot commented Nov 3, 2023 •

edited

Loading

HaoranYi commented Nov 16, 2023 •

edited

Loading