rent-collector: Inline struct and const, remove dep (#7297)

joncinque · web-flow · commit c372da25621b · 2025-08-12T13:09:08.000+02:00
* rent-collector: Inline struct and const, remove dep #### 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 `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. * Make `RentCollector` crate-private, expose rent() directly * Revert "Make `RentCollector` crate-private, expose rent() directly" This reverts commit 101c5bf. * Put accidentally removed comment back in post-rebase * Also remove it from snapshot_package.rs
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -486,7 +486,6 @@ solana-quic-definitions = "2.3.0"
 solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=3.0.0" }
 solana-remote-wallet = { path = "remote-wallet", version = "=3.0.0", default-features = false }
 solana-rent = "2.2.1"
-solana-rent-collector = "2.2.1"
 solana-reward-info = "2.2.1"
 solana-rpc = { path = "rpc", version = "=3.0.0" }
 solana-rpc-client = { path = "rpc-client", version = "=3.0.0", default-features = false }
diff --git a/accounts-db/Cargo.toml b/accounts-db/Cargo.toml
@@ -87,7 +87,6 @@ solana-nohash-hasher = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 solana-rayon-threadlimit = { workspace = true }
 solana-rent = { workspace = true, optional = true }
-solana-rent-collector = { workspace = true }
 solana-reward-info = { workspace = true, features = ["serde"] }
 solana-sha256-hasher = { workspace = true }
 solana-signer = { workspace = true, optional = true }
@@ -127,6 +126,7 @@ solana-logger = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-signature = { workspace = true, features = ["rand"] }
 solana-slot-history = { workspace = true }
+solana-svm = { workspace = true }
 static_assertions = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
 strum_macros = { workspace = true }
diff --git a/accounts-db/benches/bench_accounts_file.rs b/accounts-db/benches/bench_accounts_file.rs
@@ -7,12 +7,11 @@ use {
         append_vec::{self, AppendVec},
         tiered_storage::{
             file::TieredReadableFile,
-            hot::{HotStorageReader, HotStorageWriter},
+            hot::{HotStorageReader, HotStorageWriter, RENT_EXEMPT_RENT_EPOCH},
         },
     },
     solana_clock::Slot,
     solana_pubkey::Pubkey,
-    solana_rent_collector::RENT_EXEMPT_RENT_EPOCH,
     solana_system_interface::MAX_PERMITTED_DATA_LENGTH,
     std::mem::ManuallyDrop,
 };
diff --git a/accounts-db/benches/utils.rs b/accounts-db/benches/utils.rs
@@ -9,9 +9,9 @@ use {
     },
     rand_chacha::ChaChaRng,
     solana_account::AccountSharedData,
+    solana_accounts_db::tiered_storage::hot::RENT_EXEMPT_RENT_EPOCH,
     solana_pubkey::Pubkey,
     solana_rent::Rent,
-    solana_rent_collector::RENT_EXEMPT_RENT_EPOCH,
     std::iter,
 };
 
diff --git a/accounts-db/src/tiered_storage/hot.rs b/accounts-db/src/tiered_storage/hot.rs
@@ -24,10 +24,19 @@ use {
     solana_account::{AccountSharedData, ReadableAccount, WritableAccount},
     solana_clock::Epoch,
     solana_pubkey::Pubkey,
-    solana_rent_collector::RENT_EXEMPT_RENT_EPOCH,
     std::{io::Write, option::Option, path::Path},
 };
 
+/// When rent is collected from an exempt account, rent_epoch is set to this
+/// value. The idea is to have a fixed, consistent value for rent_epoch for all accounts that do not collect rent.
+/// This enables us to get rid of the field completely.
+pub const RENT_EXEMPT_RENT_EPOCH: Epoch = Epoch::MAX;
+#[cfg(test)]
+static_assertions::const_assert_eq!(
+    RENT_EXEMPT_RENT_EPOCH,
+    solana_svm::rent_calculator::RENT_EXEMPT_RENT_EPOCH
+);
+
 pub const HOT_FORMAT: TieredStorageFormat = TieredStorageFormat {
     meta_entry_size: std::mem::size_of::<HotAccountMeta>(),
     account_meta_format: AccountMetaFormat::Hot,
diff --git a/accounts-db/src/tiered_storage/test_utils.rs b/accounts-db/src/tiered_storage/test_utils.rs
@@ -2,10 +2,12 @@
 //! Helper functions for TieredStorage tests
 use {
     super::footer::TieredStorageFooter,
-    crate::{account_storage::stored_account_info::StoredAccountInfo, append_vec::StoredMeta},
+    crate::{
+        account_storage::stored_account_info::StoredAccountInfo, append_vec::StoredMeta,
+        tiered_storage::hot::RENT_EXEMPT_RENT_EPOCH,
+    },
     solana_account::{Account, AccountSharedData, ReadableAccount},
     solana_pubkey::Pubkey,
-    solana_rent_collector::RENT_EXEMPT_RENT_EPOCH,
 };
 
 /// Create a test account based on the specified seed.
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -37,7 +37,6 @@ frozen-abi = [
     "solana-perf/frozen-abi",
     "solana-program-runtime/frozen-abi",
     "solana-rent/frozen-abi",
-    "solana-rent-collector/frozen-abi",
     "solana-stake-interface/frozen-abi",
     "solana-svm/frozen-abi",
     "solana-transaction-error/frozen-abi",
@@ -139,7 +138,6 @@ solana-program-runtime = { workspace = true, features = ["metrics"] }
 solana-pubkey = { workspace = true, features = ["rand"] }
 solana-rayon-threadlimit = { workspace = true }
 solana-rent = { workspace = true }
-solana-rent-collector = { workspace = true, features = ["serde"] }
 solana-reward-info = { workspace = true }
 solana-runtime-transaction = { workspace = true }
 solana-sdk-ids = { workspace = true }
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -44,6 +44,7 @@ use {
         epoch_stakes::{NodeVoteAccounts, VersionedEpochStakes},
         inflation_rewards::points::InflationPointCalculationEvent,
         installed_scheduler_pool::{BankWithScheduler, InstalledSchedulerRwLock},
+        rent_collector::RentCollector,
         runtime_config::RuntimeConfig,
         snapshot_hash::SnapshotHash,
         stake_account::StakeAccount,
@@ -112,7 +113,6 @@ use {
         invoke_context::BuiltinFunctionWithContext, loaded_programs::ProgramCacheEntry,
     },
     solana_pubkey::Pubkey,
-    solana_rent_collector::RentCollector,
     solana_reward_info::RewardInfo,
     solana_runtime_transaction::{
         runtime_transaction::RuntimeTransaction, transaction_with_meta::TransactionWithMeta,
diff --git a/runtime/src/bank/serde_snapshot.rs b/runtime/src/bank/serde_snapshot.rs
@@ -352,7 +352,7 @@ mod tests {
         #[cfg_attr(
             feature = "frozen-abi",
             derive(AbiExample),
-            frozen_abi(digest = "CCsPFzrwkgWmiYh25nwNvBSRdgiUW45Rh6jGh1XGcNZt")
+            frozen_abi(digest = "A1MwPVjhDGFcajPV44UFRrkuJ7mR4rw4DykCcEqKk1hy")
         )]
         #[derive(Serialize)]
         pub struct BankAbiTestWrapper {
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -18,6 +18,7 @@ pub mod loader_utils;
 pub mod non_circulating_supply;
 pub mod prioritization_fee;
 pub mod prioritization_fee_cache;
+pub mod rent_collector;
 pub mod runtime_config;
 pub mod serde_snapshot;
 pub mod snapshot_archive_info;
diff --git a/runtime/src/rent_collector.rs b/runtime/src/rent_collector.rs
@@ -0,0 +1,48 @@
+use {
+    solana_clock::Epoch, solana_epoch_schedule::EpochSchedule,
+    solana_genesis_config::GenesisConfig, solana_rent::Rent,
+};
+
+#[cfg_attr(feature = "frozen-abi", derive(solana_frozen_abi_macro::AbiExample))]
+#[derive(Clone, Debug, PartialEq, serde_derive::Deserialize, serde_derive::Serialize)]
+pub struct RentCollector {
+    pub epoch: Epoch,
+    pub epoch_schedule: EpochSchedule,
+    pub slots_per_year: f64,
+    pub rent: Rent,
+}
+
+impl Default for RentCollector {
+    fn default() -> Self {
+        Self {
+            epoch: Epoch::default(),
+            epoch_schedule: EpochSchedule::default(),
+            // derive default value using GenesisConfig::default()
+            slots_per_year: GenesisConfig::default().slots_per_year(),
+            rent: Rent::default(),
+        }
+    }
+}
+
+impl RentCollector {
+    pub(crate) fn new(
+        epoch: Epoch,
+        epoch_schedule: EpochSchedule,
+        slots_per_year: f64,
+        rent: Rent,
+    ) -> Self {
+        Self {
+            epoch,
+            epoch_schedule,
+            slots_per_year,
+            rent,
+        }
+    }
+
+    pub(crate) fn clone_with_epoch(&self, epoch: Epoch) -> Self {
+        Self {
+            epoch,
+            ..self.clone()
+        }
+    }
+}
diff --git a/runtime/src/serde_snapshot.rs b/runtime/src/serde_snapshot.rs
@@ -4,6 +4,7 @@ use {
     crate::{
         bank::{Bank, BankFieldsToDeserialize, BankFieldsToSerialize, BankHashStats, BankRc},
         epoch_stakes::VersionedEpochStakes,
+        rent_collector::RentCollector,
         runtime_config::RuntimeConfig,
         snapshot_utils::{SnapshotError, StorageAndNextAccountsFileId},
         stake_account::StakeAccount,
@@ -35,7 +36,6 @@ use {
     solana_lattice_hash::lt_hash::LtHash,
     solana_measure::measure::Measure,
     solana_pubkey::Pubkey,
-    solana_rent_collector::RentCollector,
     solana_serde::default_on_eof,
     solana_stake_interface::state::Delegation,
     std::{
diff --git a/svm/Cargo.toml b/svm/Cargo.toml
@@ -64,7 +64,6 @@ solana-program-pack = { workspace = true }
 solana-program-runtime = { workspace = true, features = ["metrics"] }
 solana-pubkey = { workspace = true }
 solana-rent = { workspace = true }
-solana-rent-collector = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
diff --git a/svm/src/account_loader.rs b/svm/src/account_loader.rs
@@ -4,7 +4,9 @@ use {
     crate::{
         account_overrides::AccountOverrides,
         nonce_info::NonceInfo,
-        rent_calculator::{check_rent_state_with_account, get_account_rent_state},
+        rent_calculator::{
+            check_rent_state_with_account, get_account_rent_state, RENT_EXEMPT_RENT_EPOCH,
+        },
         rollback_accounts::RollbackAccounts,
         transaction_error_metrics::TransactionErrorMetrics,
         transaction_execution_result::ExecutedTransaction,
@@ -26,7 +28,6 @@ use {
     },
     solana_pubkey::Pubkey,
     solana_rent::Rent,
-    solana_rent_collector::RENT_EXEMPT_RENT_EPOCH,
     solana_sdk_ids::{
         bpf_loader_upgradeable, native_loader,
         sysvar::{self, slot_history},
@@ -827,7 +828,6 @@ mod tests {
         },
         solana_pubkey::Pubkey,
         solana_rent::Rent,
-        solana_rent_collector::RENT_EXEMPT_RENT_EPOCH,
         solana_sdk_ids::{
             bpf_loader, bpf_loader_upgradeable, native_loader, system_program, sysvar,
         },
diff --git a/svm/src/rent_calculator.rs b/svm/src/rent_calculator.rs
@@ -4,12 +4,18 @@
 
 use {
     solana_account::{AccountSharedData, ReadableAccount},
+    solana_clock::Epoch,
     solana_pubkey::Pubkey,
     solana_rent::Rent,
     solana_transaction_context::{IndexOfAccount, TransactionContext},
     solana_transaction_error::{TransactionError, TransactionResult},
 };
 
+/// When rent is collected from an exempt account, rent_epoch is set to this
+/// value. The idea is to have a fixed, consistent value for rent_epoch for all accounts that do not collect rent.
+/// This enables us to get rid of the field completely.
+pub const RENT_EXEMPT_RENT_EPOCH: Epoch = Epoch::MAX;
+
 /// Rent state of a Solana account.
 #[derive(Debug, PartialEq, Eq)]
 pub enum RentState {
diff --git a/svm/src/transaction_processor.rs b/svm/src/transaction_processor.rs
@@ -1087,6 +1087,7 @@ mod tests {
                 TRANSACTION_ACCOUNT_BASE_SIZE,
             },
             nonce_info::NonceInfo,
+            rent_calculator::RENT_EXEMPT_RENT_EPOCH,
             rollback_accounts::RollbackAccounts,
         },
         agave_reserved_account_keys::ReservedAccountKeys,
@@ -1107,7 +1108,6 @@ mod tests {
             loaded_programs::{BlockRelation, ProgramCacheEntryType},
         },
         solana_rent::Rent,
-        solana_rent_collector::RENT_EXEMPT_RENT_EPOCH,
         solana_sdk_ids::{bpf_loader, loader_v4, system_program, sysvar},
         solana_signature::Signature,
         solana_svm_callback::{AccountState, InvokeContextCallback},
