Fixes accounts_data_size update in replace_program_account()

Author: brooksprumo

runtime/src/bank.rs

@@ -5725,9 +5725,11 @@ impl Bank {
                     .unwrap()
                     .remove_programs([*old_address].into_iter());
 
+                // The new account's data wasn't changed, just moved to a new address.
+                // The old account's data was effectively removed.
                 self.calculate_and_update_accounts_data_size_delta_off_chain(
                     old_account.data().len(),
-                    new_account.data().len(),
+                    0,
                 );
             }
         }

runtime/src/bank/tests.rs

@@ -7037,25 +7037,24 @@ fn test_program_replacement() {
 
     // Setup original program account
     let old_address = Pubkey::new_unique();
-    let new_address = Pubkey::new_unique();
-    bank.store_account_and_update_capitalization(
-        &old_address,
-        &AccountSharedData::from(Account {
-            lamports: 100,
-            ..Account::default()
-        }),
-    );
-    assert_eq!(bank.get_balance(&old_address), 100);
+    let old_lamports = 100;
+    let old_data_size = 1_111;
+    let old_program_account =
+        AccountSharedData::new(old_lamports, old_data_size, &Pubkey::new_unique());
+    bank.store_account_and_update_capitalization(&old_address, &old_program_account);
+    assert_eq!(bank.get_balance(&old_address), old_lamports);
 
     // Setup new program account
-    let new_program_account = AccountSharedData::from(Account {
-        lamports: 123,
-        ..Account::default()
-    });
+    let new_address = Pubkey::new_unique();
+    let new_lamports = old_lamports + 23;
+    let new_data_size = old_data_size + 444;
+    let new_program_account =
+        AccountSharedData::new(new_lamports, new_data_size, &Pubkey::new_unique());
     bank.store_account_and_update_capitalization(&new_address, &new_program_account);
-    assert_eq!(bank.get_balance(&new_address), 123);
+    assert_eq!(bank.get_balance(&new_address), new_lamports);
 
     let original_capitalization = bank.capitalization();
+    let original_accounts_data_size = bank.load_accounts_data_size();
 
     bank.replace_program_account(&old_address, &new_address, "bank-apply_program_replacement");
 
@@ -7066,7 +7065,16 @@ fn test_program_replacement() {
     assert_eq!(bank.get_account(&old_address), Some(new_program_account));
 
     // Lamports in the old token account were burnt
-    assert_eq!(bank.capitalization(), original_capitalization - 100);
+    assert_eq!(
+        bank.capitalization(),
+        original_capitalization - old_lamports
+    );
+
+    // Old program account was removed from accounts data size
+    assert_eq!(
+        bank.load_accounts_data_size(),
+        original_accounts_data_size - old_data_size as u64,
+    );
 }
 
 fn min_rent_exempt_balance_for_sysvars(bank: &Bank, sysvar_ids: &[Pubkey]) -> u64 {