restricts rent-paying accounts lifetime extension #26606

behzadnouri · 2022-07-13T15:17:27Z

Problem

#22292 prevents rent paying accounts creation going forward. However a rent
paying account can linger on for ever if it is continually topped up but
stays below the rent-exempt minimum.
This can prevent eliminating accounts-rewrites and the problematic
rent_epoch field in accounts.

Link to discord discussion:
https://discord.com/channels/428295358100013066/943609352068145162/995202300001927219

Summary of Changes

This commit restricts rent-paying accounts lifetime extension by preventing
increasing lamports on the account if the account stays below the
rent-exempt minimum.

Feature Gate Issue: #26607

CriesofCarrots

Thanks, @behzadnouri . Logic looks fine, some nits.

CriesofCarrots · 2022-07-14T05:53:22Z

sdk/src/feature_set.rs

@@ -456,6 +456,10 @@ pub mod enable_bpf_loader_extend_program_data_ix {
    solana_sdk::declare_id!("8Zs9W7D9MpSEtUWSQdGniZk2cNmV22y6FLJwCx53asme");
 }

+pub mod restrict_rent_paying_accounts_ttl_extension {


This name is kind of hard to parse at a glance. Can we call it something like: prevent_crediting_rent_paying_accounts? I would prefer we not add a phrase like "TTL extension" that then ought to be defined.

CriesofCarrots · 2022-07-14T06:04:38Z

runtime/src/account_rent_state.rs

+                        post_data_size == pre_data_size && {
+                            !restrict_rent_paying_accounts_ttl_extension
+                                || post_lamports <= pre_lamports
+                        }


Did cargo fmt wrap this extended boolean in brackets like this instead of parens? That's weird.

Rust accepts both; I think in this case { gives more readable format:

post_data_size == pre_data_size && { !prevent_crediting_rent_paying_accounts || post_lamports <= pre_lamports }

vs

post_data_size == pre_data_size && (!prevent_crediting_rent_paying_accounts || post_lamports <= pre_lamports)

runtime/src/account_rent_state.rs

CriesofCarrots · 2022-07-14T06:09:23Z

runtime/src/account_rent_state.rs

+            },
+            restrict_rent_paying_accounts_ttl_extension
+        ));
+        // No resize, same lamports is always allowed.


I understand that the word "transition" is implied here, but if you could find a way to rewrite these comments so they don't say "lamports is" so many times, I would appreciate it.

jstarry

lgtm, just some nits on naming and code formatting

jstarry · 2022-07-14T12:33:52Z

runtime/src/account_rent_state.rs

+                        // Cannot be RentPaying if resized
+                        post_data_size == pre_data_size && {
+                            !prevent_crediting_rent_paying_accounts || post_lamports <= pre_lamports
+                        }


Suggested change

// Cannot be RentPaying if resized

post_data_size == pre_data_size && {

!prevent_crediting_rent_paying_accounts || post_lamports <= pre_lamports

}

// Cannot remain RentPaying if resized

if post_data_size != pre_data_size {

false

} else if prevent_crediting_rent_paying_accounts {

// Cannot remain RentPaying if credited

post_lamports <= pre_lamports

} else {

true

}

I prefer this more-explicit suggestion too

jstarry · 2022-07-14T12:37:49Z

sdk/src/feature_set.rs

@@ -564,6 +568,7 @@ lazy_static! {
        (cap_accounts_data_size_per_block::id(), "cap the accounts data size per block #25517"),
        (preserve_rent_epoch_for_rent_exempt_accounts::id(), "preserve rent epoch for rent exempt accounts #26479"),
        (enable_bpf_loader_extend_program_data_ix::id(), "enable bpf upgradeable loader ExtendProgramData instruction #25234"),
+        (prevent_crediting_rent_paying_accounts::id(), "prevent crediting rent paying accounts #26606"),


Technically rent paying accounts can be credited if they become rent exempt. Can you rename the feature module name and the description here to match your PR title? I think restrict_rent_paying_accounts_lifetime_extension would be pretty clear

we are doing back and forth here; initially it was: restrict_rent_paying_accounts_ttl_extension.
@CriesofCarrots asked to change it: #26606 (comment)

Yup I saw that comment thread as well. Like I said, I think that @CriesofCarrots's suggestion is a bit misleading so I hope that changing from "ttl" to "lifetime" is a good compromise.

I don't have strong preference either way since this is going to be deleted soon anyways.
I will wait for @CriesofCarrots comment. If there is no objection, I can change it to what you suggest.

Personally, I think it’s fine as-is, but to address Justin’s concern about lost nuance, it could be prevent_crediting_accounts_that_end_rent_paying or similar, I suppose.
I am opposed to the “lifetime” suggestion, as rust already has a definition of the word; I don’t think that “accounts lifetime extension” is that clear unless you already understand the problem, and I am disinclined to add new verbiage that ought to be explained, especially for functionality that is being made obsolete.

prevent_crediting_accounts_that_end_rent_paying works for me

Pull request has been modified.

CriesofCarrots

Comment nits. Otherwise, this lgtm

CriesofCarrots · 2022-07-14T14:30:41Z

runtime/src/account_rent_state.rs

+        // Transition is always allowed if there is no account data resize and
+        // account's lamports is reduced because that will shorten rent paying
+        // account lifeline.


Suggested change

// Transition is always allowed if there is no account data resize and

// account's lamports is reduced because that will shorten rent paying

// account lifeline.

// Transition is always allowed if there is no account data resize and

// account's lamports is reduced.

CriesofCarrots · 2022-07-14T14:31:04Z

runtime/src/account_rent_state.rs

+        // Once the feature is activated, transition is not allowed if the
+        // account is credited with more lamports.


Suggested change

// Once the feature is activated, transition is not allowed if the

// account is credited with more lamports.

// Once the feature is activated, transition is not allowed if the

// account is credited with more lamports and remains rent-paying.

Pull request has been modified.

solana-labs/solana#26606 prevents crediting a rent paying account if the account stays rent paying. As a result, test_lamport_transfer fails. The commit updates destination account lamports so that after transfer it is no longer rent paying.

solana-labs#22292 prevents rent paying accounts creation going forward. However a rent paying account can linger on for ever if it is continually topped up but stays below the rent-exempt minimum. This can prevent eliminating accounts-rewrites and the problematic rent_epoch field in accounts. Link to discord discussion: https://discord.com/channels/428295358100013066/943609352068145162/995202300001927219 This commit restricts rent-paying accounts lifeline extension by preventing increasing lamports on the account if the account stays below the rent-exempt minimum.

Pull request has been modified.

#22292 prevents rent paying accounts creation going forward. However a rent paying account can linger on for ever if it is continually topped up but stays below the rent-exempt minimum. This can prevent eliminating accounts-rewrites and the problematic rent_epoch field in accounts. Link to discord discussion: https://discord.com/channels/428295358100013066/943609352068145162/995202300001927219 This commit restricts rent-paying accounts lifetime extension by preventing increasing lamports on the account if the account stays below the rent-exempt minimum. (cherry picked from commit bf225ba) # Conflicts: # runtime/src/account_rent_state.rs # runtime/src/accounts.rs # runtime/src/bank/transaction_account_state_info.rs # sdk/src/feature_set.rs

…26635) * restricts rent-paying accounts lifetime extension (#26606) #22292 prevents rent paying accounts creation going forward. However a rent paying account can linger on for ever if it is continually topped up but stays below the rent-exempt minimum. This can prevent eliminating accounts-rewrites and the problematic rent_epoch field in accounts. Link to discord discussion: https://discord.com/channels/428295358100013066/943609352068145162/995202300001927219 This commit restricts rent-paying accounts lifetime extension by preventing increasing lamports on the account if the account stays below the rent-exempt minimum. (cherry picked from commit bf225ba) # Conflicts: # runtime/src/account_rent_state.rs # runtime/src/accounts.rs # runtime/src/bank/transaction_account_state_info.rs # sdk/src/feature_set.rs * removes mergify merge conflicts Co-authored-by: behzad nouri <[email protected]>

solana-labs#22292 prevents rent paying accounts creation going forward. However a rent paying account can linger on for ever if it is continually topped up but stays below the rent-exempt minimum. This can prevent eliminating accounts-rewrites and the problematic rent_epoch field in accounts. Link to discord discussion: https://discord.com/channels/428295358100013066/943609352068145162/995202300001927219 This commit restricts rent-paying accounts lifetime extension by preventing increasing lamports on the account if the account stays below the rent-exempt minimum.

behzadnouri added the feature-gate Pull Request adds or modifies a runtime feature gate label Jul 13, 2022

behzadnouri mentioned this pull request Jul 13, 2022

Feature Gate: restrict rent-paying accounts TTL extension #26607

Closed

behzadnouri force-pushed the restrict-rent-paying-ttl-extension branch from 33da4c9 to 5fde79a Compare July 13, 2022 15:19

behzadnouri requested review from jstarry, CriesofCarrots, jeffwashington and t-nelson July 13, 2022 18:28

behzadnouri force-pushed the restrict-rent-paying-ttl-extension branch from 5fde79a to d8d37bc Compare July 13, 2022 19:31

CriesofCarrots reviewed Jul 14, 2022

View reviewed changes

behzadnouri force-pushed the restrict-rent-paying-ttl-extension branch from d8d37bc to 7a1e96e Compare July 14, 2022 11:41

behzadnouri changed the title ~~restricts rent-paying accounts TTL extension~~ restricts rent-paying accounts lifeline extension Jul 14, 2022

jstarry previously approved these changes Jul 14, 2022

View reviewed changes

behzadnouri changed the title ~~restricts rent-paying accounts lifeline extension~~ restricts rent-paying accounts lifetime extension Jul 14, 2022

behzadnouri force-pushed the restrict-rent-paying-ttl-extension branch from 7a1e96e to 3299e60 Compare July 14, 2022 14:20

CriesofCarrots previously approved these changes Jul 14, 2022

View reviewed changes

behzadnouri force-pushed the restrict-rent-paying-ttl-extension branch from 3299e60 to 5ab36a9 Compare July 14, 2022 17:56

behzadnouri force-pushed the restrict-rent-paying-ttl-extension branch from 5ab36a9 to 6c826ce Compare July 14, 2022 17:58

behzadnouri mentioned this pull request Jul 14, 2022

patches test_lamport_transfer solana-labs/solana-program-library#3346

Merged

t-nelson previously approved these changes Jul 15, 2022

View reviewed changes

behzadnouri force-pushed the restrict-rent-paying-ttl-extension branch from 6c826ce to ef05348 Compare July 15, 2022 11:30

behzadnouri merged commit bf225ba into solana-labs:master Jul 15, 2022

behzadnouri deleted the restrict-rent-paying-ttl-extension branch July 15, 2022 13:23

behzadnouri added the v1.10 label Jul 15, 2022

mergify bot mentioned this pull request Jul 15, 2022

restricts rent-paying accounts lifetime extension (backport #26606) #26635

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

restricts rent-paying accounts lifetime extension #26606

restricts rent-paying accounts lifetime extension #26606

behzadnouri commented Jul 13, 2022 •

edited

Loading

CriesofCarrots left a comment

CriesofCarrots Jul 14, 2022

behzadnouri Jul 14, 2022

CriesofCarrots Jul 14, 2022

behzadnouri Jul 14, 2022

CriesofCarrots Jul 14, 2022

behzadnouri Jul 14, 2022

jstarry left a comment

jstarry Jul 14, 2022

CriesofCarrots Jul 14, 2022

behzadnouri Jul 14, 2022

jstarry Jul 14, 2022

behzadnouri Jul 14, 2022 •

edited

Loading

jstarry Jul 14, 2022

behzadnouri Jul 14, 2022

CriesofCarrots Jul 14, 2022

jstarry Jul 14, 2022

behzadnouri Jul 14, 2022

CriesofCarrots left a comment

CriesofCarrots Jul 14, 2022

behzadnouri Jul 14, 2022

CriesofCarrots Jul 14, 2022

behzadnouri Jul 14, 2022

-                        // Cannot be RentPaying if resized
-                        post_data_size == pre_data_size && {
-                            !prevent_crediting_rent_paying_accounts || post_lamports <= pre_lamports
-                        }
+                        // Cannot remain RentPaying if resized
+                        if post_data_size != pre_data_size {
+                            false
+                        } else if prevent_crediting_rent_paying_accounts {
+                            // Cannot remain RentPaying if credited
+                            post_lamports <= pre_lamports
+                        } else {
+                            true
+                        }

		// Once the feature is activated, transition is not allowed if the
		// account is credited with more lamports.

restricts rent-paying accounts lifetime extension #26606

restricts rent-paying accounts lifetime extension #26606

Conversation

behzadnouri commented Jul 13, 2022 • edited Loading

Problem

Summary of Changes

CriesofCarrots left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jstarry left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

behzadnouri Jul 14, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CriesofCarrots left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

behzadnouri commented Jul 13, 2022 •

edited

Loading

behzadnouri Jul 14, 2022 •

edited

Loading