From fc0c74d722a3a13b32fd6481b631363fe1a38e5b Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 6 Jan 2022 02:43:54 +0000
Subject: [PATCH] Only sum accounts data len from non-zero lamport accounts
 (#22309) (#22317)

(cherry picked from commit ab13e395184ca515c36b32469eda940a132a2b5d)

Co-authored-by: Brooks Prumo <brooks@solana.com>
---
 runtime/src/accounts_db.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 5e3ca0c5f8..6c24ee40fc 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -6708,7 +6708,9 @@ impl AccountsDb {
                         &self.account_indexes,
                     );
                 }
-                accounts_data_len += stored_account.data().len() as u64;
+                if !stored_account.is_zero_lamport() {
+                    accounts_data_len += stored_account.data().len() as u64;
+                }
 
                 if !rent_collector.should_collect_rent(&pubkey, &stored_account, false) || {
                     let (_rent_due, exempt) = rent_collector.get_rent_due(&stored_account);