Add rent_payer to VestingBalance for rent reclaim on close

solana/programs/staking/src/contexts/close_vesting_balance.rs

@@ -15,6 +15,9 @@ pub struct CloseVestingBalance<'info> {
             @ VestingError::InvalidVestingAdmin
     )]
     admin: Signer<'info>,
+    #[account(mut)]
+    /// CHECK: This account is the original rent_payer for the vesting_balance account
+    rent_payer: UncheckedAccount<'info>,
     mint: InterfaceAccount<'info, Mint>,
     #[account(
         mut,
@@ -24,9 +27,10 @@ pub struct CloseVestingBalance<'info> {
     config: Account<'info, VestingConfig>,
     #[account(
         mut,
+        has_one = rent_payer,
         seeds = [VESTING_BALANCE_SEED.as_bytes(), config.key().as_ref(), vester_ta.owner.key().as_ref()],
         bump,
-        close = admin,
+        close = rent_payer,
     )]
     vesting_balance: Account<'info, VestingBalance>,
     #[account(

solana/programs/staking/src/contexts/create_vesting_balance.rs

@@ -53,6 +53,7 @@ impl<'info> CreateVestingBalance<'info> {
             stake_account_metadata: Pubkey::default(),
             total_vesting_balance: 0,
             bump,
+            rent_payer: self.admin.key(),
         });
 
         Ok(())

solana/programs/staking/src/contexts/transfer_vesting.rs

@@ -319,6 +319,7 @@ impl<'info> crate::contexts::TransferVesting<'info> {
                 .checked_add(self.vest.amount)
                 .ok_or(VestingError::Overflow)?,
             bump: new_vesting_balance_bump,
+            rent_payer: self.vester.key(),
         });
 
         self.vesting_balance.total_vesting_balance = self

solana/programs/staking/src/state/vesting_balance.rs

@@ -9,6 +9,7 @@ pub struct VestingBalance {
     pub total_vesting_balance: u64,
     pub bump: u8,
     pub stake_account_metadata: Pubkey,
+    pub rent_payer: Pubkey,
 }
 
 impl VestingBalance {
@@ -21,6 +22,6 @@ pub mod tests {
 
     #[test]
     fn check_size() {
-        assert!(VestingBalance::LEN == 8 + 32 + 8 + 1 + 32); // 81
+        assert!(VestingBalance::LEN == 8 + 32 + 8 + 1 + 32 + 32); // 113
     }
 }