Add frozen account support (#8989)

automerge

ledger/src/bank_forks_utils.rs

@@ -66,6 +66,7 @@ pub fn load(
 
                 let deserialized_bank = snapshot_utils::bank_from_archive(
                     &account_paths,
+                    &process_options.frozen_accounts,
                     &snapshot_config.snapshot_path,
                     &archive_filename,
                 )

ledger/src/blockstore_processor.rs

@@ -23,6 +23,7 @@ use solana_sdk::{
     clock::{Slot, MAX_RECENT_BLOCKHASHES},
     genesis_config::GenesisConfig,
     hash::Hash,
+    pubkey::Pubkey,
     signature::Keypair,
     timing::duration_as_ms,
     transaction::{Result, Transaction, TransactionError},
@@ -271,6 +272,7 @@ pub struct ProcessOptions {
     pub entry_callback: Option<ProcessCallback>,
     pub override_num_threads: Option<usize>,
     pub new_hard_forks: Option<Vec<Slot>>,
+    pub frozen_accounts: Vec<Pubkey>,
 }
 
 pub fn process_blockstore(
@@ -289,7 +291,11 @@ pub fn process_blockstore(
     }
 
     // Setup bank for slot 0
-    let bank0 = Arc::new(Bank::new_with_paths(&genesis_config, account_paths));
+    let bank0 = Arc::new(Bank::new_with_paths(
+        &genesis_config,
+        account_paths,
+        &opts.frozen_accounts,
+    ));
     info!("processing ledger for slot 0...");
     let recyclers = VerifyRecyclers::default();
     process_bank_0(&bank0, blockstore, &opts, &recyclers)?;
@@ -2611,7 +2617,7 @@ pub mod tests {
         genesis_config: &GenesisConfig,
         account_paths: Vec<PathBuf>,
     ) -> EpochSchedule {
-        let bank = Bank::new_with_paths(&genesis_config, account_paths);
+        let bank = Bank::new_with_paths(&genesis_config, account_paths, &[]);
         bank.epoch_schedule().clone()
     }
 

ledger/src/snapshot_utils.rs

@@ -12,7 +12,7 @@ use solana_runtime::{
         MAX_SNAPSHOT_DATA_FILE_SIZE,
     },
 };
-use solana_sdk::{clock::Slot, hash::Hash};
+use solana_sdk::{clock::Slot, hash::Hash, pubkey::Pubkey};
 use std::{
     cmp::Ordering,
     env,
@@ -432,6 +432,7 @@ pub fn remove_snapshot<P: AsRef<Path>>(slot: Slot, snapshot_path: P) -> Result<(
 
 pub fn bank_from_archive<P: AsRef<Path>>(
     account_paths: &[PathBuf],
+    frozen_account_pubkeys: &[Pubkey],
     snapshot_path: &PathBuf,
     snapshot_tar: P,
 ) -> Result<Bank> {
@@ -450,6 +451,7 @@ pub fn bank_from_archive<P: AsRef<Path>>(
     let bank = rebuild_bank_from_snapshots(
         snapshot_version.trim(),
         account_paths,
+        frozen_account_pubkeys,
         &unpacked_snapshots_dir,
         unpacked_accounts_dir,
     )?;
@@ -575,6 +577,7 @@ pub fn untar_snapshot_in<P: AsRef<Path>, Q: AsRef<Path>>(
 fn rebuild_bank_from_snapshots<P>(
     snapshot_version: &str,
     account_paths: &[PathBuf],
+    frozen_account_pubkeys: &[Pubkey],
     unpacked_snapshots_dir: &PathBuf,
     append_vecs_path: P,
 ) -> Result<Bank>
@@ -606,12 +609,16 @@ where
                 }
             };
             info!("Rebuilding accounts...");
-            bank.set_bank_rc(
-                bank::BankRc::new(account_paths.to_vec(), 0, bank.slot()),
-                bank::StatusCacheRc::default(),
-            );
-            bank.rc
-                .accounts_from_stream(stream.by_ref(), &append_vecs_path)?;
+            let rc = bank::BankRc::from_stream(
+                account_paths,
+                bank.slot(),
+                &bank.ancestors,
+                frozen_account_pubkeys,
+                stream.by_ref(),
+                &append_vecs_path,
+            )?;
+
+            bank.set_bank_rc(rc, bank::StatusCacheRc::default());
             Ok(bank)
         },
     )?;