From 03b930515bc554396bc69d811be834d22978a1d3 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 11 Aug 2021 09:49:19 +0000
Subject: [PATCH] Handle 0-lamport account in index generation (#19041)
 (#19160)

* Handle 0-lamport account in index generation

* rename duplicate to dirty keys

Co-authored-by: Carl Lin <carl@solana.com>
(cherry picked from commit 5a4979f25f38e0cfe651045464cd2f11efedc18b)

Co-authored-by: sakridge <sakridge@gmail.com>
---
 runtime/src/accounts_index.rs | 37 ++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/runtime/src/accounts_index.rs b/runtime/src/accounts_index.rs
index b7d08cb130..680577e47a 100644
--- a/runtime/src/accounts_index.rs
+++ b/runtime/src/accounts_index.rs
@@ -1388,39 +1388,44 @@ impl<T: 'static + Clone + IsCached + ZeroLamport + std::marker::Sync + std::mark
         items.for_each(|(pubkey, account_info)| {
             let bin = get_bin_pubkey(pubkey);
             // this value is equivalent to what update() below would have created if we inserted a new item
+            let is_zero_lamport = account_info.is_zero_lamport();
             let info = WriteAccountMapEntry::new_entry_after_update(slot, account_info);
-            binned[bin].1.push((*pubkey, info));
+            binned[bin].1.push((*pubkey, info, is_zero_lamport));
         });
         binned.retain(|x| !x.1.is_empty());
 
         let insertion_time = AtomicU64::new(0);
 
-        let duplicate_keys = binned
+        let dirty_pubkeys = binned
             .into_iter()
             .map(|(pubkey_bin, items)| {
                 let mut _reclaims = SlotList::new();
                 let mut w_account_maps = self.account_maps[pubkey_bin].write().unwrap();
                 let mut insert_time = Measure::start("insert_into_primary_index"); // really should be in each loop
-                let mut duplicate_keys = Vec::with_capacity(items.len());
-                items.into_iter().for_each(|(pubkey, new_item)| {
-                    let already_exists = self.insert_new_entry_if_missing_with_lock(
-                        pubkey,
-                        &mut w_account_maps,
-                        new_item,
-                    );
-                    if let Some((mut w_account_entry, account_info, pubkey)) = already_exists {
-                        w_account_entry.update(slot, account_info, &mut _reclaims);
-                        duplicate_keys.push(pubkey);
-                    }
-                });
+                let mut dirty_pubkeys = Vec::with_capacity(items.len());
+                items
+                    .into_iter()
+                    .for_each(|(pubkey, new_item, is_zero_lamport)| {
+                        let already_exists = self.insert_new_entry_if_missing_with_lock(
+                            pubkey,
+                            &mut w_account_maps,
+                            new_item,
+                        );
+                        if let Some((mut w_account_entry, account_info, pubkey)) = already_exists {
+                            w_account_entry.update(slot, account_info, &mut _reclaims);
+                            dirty_pubkeys.push(pubkey);
+                        } else if is_zero_lamport {
+                            dirty_pubkeys.push(pubkey);
+                        }
+                    });
                 insert_time.stop();
                 insertion_time.fetch_add(insert_time.as_us(), Ordering::Relaxed);
-                duplicate_keys
+                dirty_pubkeys
             })
             .flatten()
             .collect::<Vec<_>>();
 
-        (duplicate_keys, insertion_time.load(Ordering::Relaxed))
+        (dirty_pubkeys, insertion_time.load(Ordering::Relaxed))
     }
 
     // Updates the given pubkey at the given slot with the new account information.