Skip to content

Tidies unused snapshot fields #10852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brooksprumo merged 1 commit into from
Feb 26, 2026
Merged

Tidies unused snapshot fields #10852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions runtime/src/bank/serde_snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ mod tests {
&bank2.get_snapshot_storages(None),
ExtraFieldsToSerialize {
lamports_per_signature: bank2.fee_rate_governor.lamports_per_signature,
obsolete_incremental_snapshot_persistence: None,
obsolete_epoch_accounts_hash: None,
unused_incremental_snapshot_persistence: None,
unused_epoch_accounts_hash: None,
versioned_epoch_stakes,
accounts_lt_hash,
},
Expand Down Expand Up @@ -316,7 +316,7 @@ mod tests {
mod test_bank_serialize {
use {
super::*,
crate::{bank::BankHashStats, serde_snapshot::ObsoleteIncrementalSnapshotPersistence},
crate::{bank::BankHashStats, serde_snapshot::UnusedIncrementalSnapshotPersistence},
solana_accounts_db::accounts_hash::AccountsLtHash,
solana_frozen_abi::abi_example::AbiExample,
solana_hash::Hash,
Expand Down Expand Up @@ -345,7 +345,7 @@ mod tests {
#[cfg_attr(
feature = "frozen-abi",
derive(AbiExample),
frozen_abi(digest = "EEwojKqUDSpYNeutW56K9bsJmsjCMZn8i4n3qgvJYRxf")
frozen_abi(digest = "FCDuswxZnGvvJURSkrQPshX45a25CR6UAmPgzGeUfMFv")
Copy link
Copy Markdown
Author

@brooksprumo brooksprumo Feb 26, 2026

Choose a reason for hiding this comment

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

Here's the frozen abi diff, showing the renames:

--- ./bank__serde_snapshot__tests__test_bank_serialize__BankAbiTestWrapper_frozen_abi__test_api_digest_EEwojKqUDSpYNeutW56K9bsJmsjCMZn8i4n3qgvJYRxf	2026-02-26 12:10:12
+++ ./bank__serde_snapshot__tests__test_bank_serialize__BankAbiTestWrapper_frozen_abi__test_api_digest_FCDuswxZnGvvJURSkrQPshX45a25CR6UAmPgzGeUfMFv	2026-02-26 15:05:03
@@ -424,7 +424,7 @@
                                 primitive u64
                             field burnPercent: u8
                                 primitive u8
-                    field collected_rent: u64
+                    field unused_collected_rent: u64
                         primitive u64
                     field rent_collector: solana_runtime::rent_collector::RentCollector
                         struct RentCollector (fields = 4)
@@ -1037,7 +1037,7 @@
                         primitive u64
                     element solana_runtime::serde_snapshot::BankHashInfo
                         struct BankHashInfo (fields = 3)
-                            field obsolete_accounts_delta_hash: [u8; 32]
+                            field unused_accounts_delta_hash: [u8; 32]
                                 tuple (elements = 32)
                                     element u8
                                         primitive u8
@@ -1103,7 +1103,7 @@
                                         primitive u8
                                     element u8
                                         primitive u8
-                            field obsolete_accounts_hash: [u8; 32]
+                            field unused_accounts_hash: [u8; 32]
                                 tuple (elements = 32)
                                     element u8
                                         primitive u8
@@ -1262,11 +1262,11 @@
                 struct ExtraFieldsToSerialize (fields = 5)
                     field lamports_per_signature: u64
                         primitive u64
-                    field obsolete_incremental_snapshot_persistence: core::option::Option<solana_runtime::serde_snapshot::ObsoleteIncrementalSnapshotPersistence>
+                    field unused_incremental_snapshot_persistence: core::option::Option<solana_runtime::serde_snapshot::UnusedIncrementalSnapshotPersistence>
                         enum Option (variants = 2)
                             variant(0) None (unit)
-                            variant(1) Some(solana_runtime::serde_snapshot::ObsoleteIncrementalSnapshotPersistence) (newtype)
-                                struct ObsoleteIncrementalSnapshotPersistence (fields = 5)
+                            variant(1) Some(solana_runtime::serde_snapshot::UnusedIncrementalSnapshotPersistence) (newtype)
+                                struct UnusedIncrementalSnapshotPersistence (fields = 5)
                                     field full_slot: u64
                                         primitive u64
                                     field full_hash: [u8; 32]
@@ -1405,7 +1405,7 @@
                                                 primitive u8
                                     field incremental_capitalization: u64
                                         primitive u64
-                    field obsolete_epoch_accounts_hash: core::option::Option<solana_hash::Hash>
+                    field unused_epoch_accounts_hash: core::option::Option<solana_hash::Hash>
                         enum Option (variants = 2)
                             variant(0) None (unit)
                             variant(1) Some(solana_hash::Hash) (newtype)

)]
#[derive(serde::Serialize)]
pub struct BankAbiTestWrapper {
Expand All @@ -362,7 +362,7 @@ mod tests {
// ensure there is at least one snapshot storage example for ABI digesting
assert!(!snapshot_storages.is_empty());

let incremental_snapshot_persistence = ObsoleteIncrementalSnapshotPersistence {
let incremental_snapshot_persistence = UnusedIncrementalSnapshotPersistence {
full_slot: u64::default(),
full_hash: [1; 32],
full_capitalization: u64::default(),
Expand All @@ -379,10 +379,8 @@ mod tests {
&snapshot_storages,
ExtraFieldsToSerialize {
lamports_per_signature: bank.fee_rate_governor.lamports_per_signature,
obsolete_incremental_snapshot_persistence: Some(
incremental_snapshot_persistence,
),
obsolete_epoch_accounts_hash: Some(Hash::new_unique()),
unused_incremental_snapshot_persistence: Some(incremental_snapshot_persistence),
unused_epoch_accounts_hash: Some(Hash::new_unique()),
versioned_epoch_stakes,
accounts_lt_hash: Some(AccountsLtHash(LtHash::identity()).into()),
},
Expand Down
39 changes: 19 additions & 20 deletions runtime/src/serde_snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const MAX_STREAM_SIZE: u64 = 32 * 1024 * 1024 * 1024;
#[derive(Debug, Deserialize)]
pub(crate) struct AccountsDbFields<T>(
Vec<(Slot, SmallVec<[T; 1]>)>,
u64, // obsolete, formerly write_version
u64, // unused, formerly write_version
Slot,
BankHashInfo,
/// all slots that were roots within the last epoch
Expand Down Expand Up @@ -125,7 +125,7 @@ impl<T: SerializableStorage> AccountsDbFields<T> {
#[cfg_attr(feature = "frozen-abi", derive(AbiExample))]
#[cfg_attr(feature = "dev-context-only-utils", derive(Default, PartialEq))]
#[derive(Serialize, Deserialize, Clone, Debug)]
pub struct ObsoleteIncrementalSnapshotPersistence {
pub struct UnusedIncrementalSnapshotPersistence {
pub full_slot: u64,
pub full_hash: [u8; 32],
pub full_capitalization: u64,
Expand All @@ -136,8 +136,8 @@ pub struct ObsoleteIncrementalSnapshotPersistence {
#[cfg_attr(feature = "frozen-abi", derive(AbiExample))]
#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
struct BankHashInfo {
obsolete_accounts_delta_hash: [u8; 32],
obsolete_accounts_hash: [u8; 32],
unused_accounts_delta_hash: [u8; 32],
unused_accounts_hash: [u8; 32],
stats: BankHashStats,
}

Expand Down Expand Up @@ -178,13 +178,12 @@ struct DeserializableVersionedBank {
_unused_collector_fees: u64,
_unused_fee_calculator: u64,
fee_rate_governor: FeeRateGovernor,
_collected_rent: u64,
_unused_collected_rent: u64,
rent_collector: RentCollector,
epoch_schedule: EpochSchedule,
inflation: Inflation,
stakes: DeserializableStakes<Delegation>,
#[allow(dead_code)]
unused_accounts: UnusedAccounts,
_unused_accounts: UnusedAccounts,
unused_epoch_stakes: HashMap<Epoch, ()>,
is_delta: bool,
}
Expand Down Expand Up @@ -257,7 +256,7 @@ struct SerializableVersionedBank {
unused_collector_fees: u64,
unused_fee_calculator: u64,
fee_rate_governor: FeeRateGovernor,
collected_rent: u64,
unused_collected_rent: u64,
rent_collector: RentCollector,
epoch_schedule: EpochSchedule,
inflation: Inflation,
Expand Down Expand Up @@ -295,7 +294,7 @@ impl From<BankFieldsToSerialize> for SerializableVersionedBank {
unused_collector_fees: 0,
unused_fee_calculator: 0,
fee_rate_governor: rhs.fee_rate_governor,
collected_rent: u64::default(),
unused_collected_rent: u64::default(),
rent_collector: rhs.rent_collector,
epoch_schedule: rhs.epoch_schedule,
inflation: rhs.inflation,
Expand Down Expand Up @@ -421,9 +420,9 @@ struct ExtraFieldsToDeserialize {
#[serde(deserialize_with = "default_on_eof")]
lamports_per_signature: u64,
#[serde(deserialize_with = "default_on_eof")]
_obsolete_incremental_snapshot_persistence: Option<ObsoleteIncrementalSnapshotPersistence>,
_unused_incremental_snapshot_persistence: Option<UnusedIncrementalSnapshotPersistence>,
#[serde(deserialize_with = "default_on_eof")]
_obsolete_epoch_accounts_hash: Option<Hash>,
_unused_epoch_accounts_hash: Option<Hash>,
#[serde(deserialize_with = "default_on_eof")]
versioned_epoch_stakes: Vec<(u64, DeserializableVersionedEpochStakes)>,
#[serde(deserialize_with = "default_on_eof")]
Expand Down Expand Up @@ -451,8 +450,8 @@ struct ExtraFieldsToDeserialize {
#[derive(Debug, Serialize)]
pub struct ExtraFieldsToSerialize {
pub lamports_per_signature: u64,
pub obsolete_incremental_snapshot_persistence: Option<ObsoleteIncrementalSnapshotPersistence>,
pub obsolete_epoch_accounts_hash: Option<Hash>,
pub unused_incremental_snapshot_persistence: Option<UnusedIncrementalSnapshotPersistence>,
pub unused_epoch_accounts_hash: Option<Hash>,
pub versioned_epoch_stakes: HashMap<u64, VersionedEpochStakes>,
pub accounts_lt_hash: Option<SerdeAccountsLtHash>,
}
Expand Down Expand Up @@ -482,8 +481,8 @@ where
// Process extra fields
let ExtraFieldsToDeserialize {
lamports_per_signature,
_obsolete_incremental_snapshot_persistence,
_obsolete_epoch_accounts_hash,
_unused_incremental_snapshot_persistence,
_unused_epoch_accounts_hash,
versioned_epoch_stakes,
accounts_lt_hash,
block_id: _,
Expand Down Expand Up @@ -679,8 +678,8 @@ impl Serialize for SerializableBankAndStorage<'_> {
},
ExtraFieldsToSerialize {
lamports_per_signature,
obsolete_incremental_snapshot_persistence: None,
obsolete_epoch_accounts_hash: None,
unused_incremental_snapshot_persistence: None,
unused_epoch_accounts_hash: None,
versioned_epoch_stakes,
accounts_lt_hash,
},
Expand Down Expand Up @@ -752,8 +751,8 @@ impl Serialize for SerializableAccountsDb<'_> {
)
}));
let bank_hash_info = BankHashInfo {
obsolete_accounts_delta_hash: [0; 32],
obsolete_accounts_hash: [0; 32],
unused_accounts_delta_hash: [0; 32],
unused_accounts_hash: [0; 32],
stats: self.bank_hash_stats.clone(),
};

Expand All @@ -763,7 +762,7 @@ impl Serialize for SerializableAccountsDb<'_> {
let mut serialize_account_storage_timer = Measure::start("serialize_account_storage_ms");
let result = (
entries,
0u64, // obsolete, formerly write_version
0u64, // unused, formerly write_version
self.slot,
bank_hash_info,
historical_roots,
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/snapshot_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,8 @@ pub fn serialize_snapshot(
let versioned_epoch_stakes = mem::take(&mut bank_fields.versioned_epoch_stakes);
let extra_fields = ExtraFieldsToSerialize {
lamports_per_signature: bank_fields.fee_rate_governor.lamports_per_signature,
obsolete_incremental_snapshot_persistence: None,
obsolete_epoch_accounts_hash: None,
unused_incremental_snapshot_persistence: None,
unused_epoch_accounts_hash: None,
versioned_epoch_stakes,
accounts_lt_hash: Some(bank_fields.accounts_lt_hash.clone().into()),
};
Expand Down
Loading