fix account overrides

core/src/bundle_stage.rs

@@ -306,7 +306,6 @@ impl BundleStage {
         let mut account_overrides = AccountOverrides {
             slot_history: None,
             cached_accounts_with_rent: HashMap::with_capacity(20),
-            accounts: HashMap::with_capacity(20),
         };
 
         let mut execution_results = Vec::new();

runtime/src/account_overrides.rs

@@ -8,7 +8,6 @@ use {
 pub struct AccountOverrides {
     pub slot_history: Option<AccountSharedData>,
     pub cached_accounts_with_rent: HashMap<Pubkey, AccountSharedData>,
-    pub accounts: HashMap<Pubkey, AccountSharedData>,
 }
 
 pub enum AccountWithRentInfo {
@@ -19,15 +18,16 @@ pub enum AccountWithRentInfo {
 impl AccountOverrides {
     pub fn set_account(&mut self, pubkey: &Pubkey, account: Option<AccountSharedData>) {
         match account {
-            Some(account) => self.accounts.insert(*pubkey, account),
-            None => self.accounts.remove(pubkey),
+            Some(account) => self.cached_accounts_with_rent.insert(*pubkey, account),
+            None => self.cached_accounts_with_rent.remove(pubkey),
         };
     }
 
     /// Sets in the slot history
     ///
     /// Note: no checks are performed on the correctness of the contained data
     pub fn set_slot_history(&mut self, slot_history: Option<AccountSharedData>) {
+        self.slot_history = slot_history.clone();
         self.set_account(&sysvar::slot_history::id(), slot_history);
     }