feat: optionally reclaim expired account rent from operator (#172)

**Problem**
Our rent reclamation is currently an ad-hoc script. The tip router
operator should handle operations like these without a need for manual
action.

**Solution**
- Add tx_utils for common utils for sending **bulk** transactions
- Add reclaim mod with the expired claim status account related
functions
- Add expired distribution account related functions
- Use num_monitored_epochs as bounds for epochs to check for expired
accounts
- Call reclaim expired accounts from main.rs Run
- Emit metrics related to expired transactions


<img width="835" height="290" alt="Screenshot 2025-07-23 at 1 53 03 PM"
src="https://github.com/user-attachments/assets/acebe38f-8b09-4be3-a0ac-8a0a05c42409"
/>
<img width="832" height="278" alt="Screenshot 2025-07-24 at 12 05 02 PM"
src="https://github.com/user-attachments/assets/373b6037-fec2-459b-9405-f58c508e47b5"
/>

Author: gzalz

.github/workflows/ci.yaml

@@ -18,8 +18,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - name: Install cargo-audit from crates.io
         uses: baptiste0928/cargo-install@v3
         with:
@@ -32,8 +30,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: rustfmt, clippy
@@ -74,8 +70,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - name: Install Protobuf Compiler
         run: |
           sudo apt-get update
@@ -136,8 +130,6 @@ jobs:
     runs-on: big-runner-1
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - name: Install system dependencies
         run: sudo apt-get update && sudo apt-get install -y libudev-dev
       - run: docker pull --platform linux/amd64 solanafoundation/solana-verifiable-build:2.2.14

priority_fee_distribution_sdk/src/instruction.rs

@@ -140,6 +140,32 @@ pub fn close_claim_status_ix(
     }
 }
 
+pub fn close_priority_fee_distribution_account_ix(
+    config: Pubkey,
+    priority_fee_distribution_account: Pubkey,
+    expired_funds_account: Pubkey,
+    validator_vote_account: Pubkey,
+    signer: Pubkey,
+    epoch: u64,
+) -> Instruction {
+    Instruction {
+        program_id: jito_priority_fee_distribution::ID,
+        accounts:
+            jito_priority_fee_distribution::client::accounts::ClosePriorityFeeDistributionAccount {
+                config,
+                priority_fee_distribution_account,
+                expired_funds_account,
+                validator_vote_account,
+                signer,
+            }
+            .to_account_metas(None),
+        data: jito_priority_fee_distribution::client::args::ClosePriorityFeeDistributionAccount {
+            _epoch: epoch,
+        }
+        .data(),
+    }
+}
+
 pub fn migrate_tda_merkle_root_upload_authority_ix(
     priority_fee_distribution_account: Pubkey,
     merkle_root_upload_config: Pubkey,

tip-router-operator-cli/repo-at-older-commit

@@ -0,0 +1 @@
+Subproject commit b38bfedee0826d351776dd5597c96c263b28cbeb

tip-router-operator-cli/src/cli.rs

@@ -172,6 +172,9 @@ pub enum Commands {
         #[arg(long, env, default_value = "true")]
         save_stages: bool,
 
+        #[arg(long, env, default_value = "false")]
+        reclaim_expired_accounts: bool,
+
         #[arg(
             long,
             env,

tip-router-operator-cli/src/lib.rs

@@ -11,9 +11,11 @@ pub mod distribution_meta;
 pub mod load_and_process_ledger;
 pub mod priority_fees;
 pub mod process_epoch;
+pub mod reclaim;
 pub mod rpc_utils;
 pub mod solana_cli;
 pub mod submit;
+pub mod tx_utils;
 
 use std::fs;
 use std::path::{Path, PathBuf};

tip-router-operator-cli/src/main.rs

@@ -15,7 +15,7 @@ use ::{
         create_merkle_tree_collection, create_meta_merkle_tree, create_stake_meta,
         ledger_utils::get_bank_from_snapshot_at_slot,
         load_bank_from_snapshot, merkle_tree_collection_file_name, meta_merkle_tree_path,
-        process_epoch, read_merkle_tree_collection, read_stake_meta_collection,
+        process_epoch, read_merkle_tree_collection, read_stake_meta_collection, reclaim,
         stake_meta_file_name,
         submit::{submit_recent_epochs_to_ncn, submit_to_ncn},
         tip_router::get_ncn_config,
@@ -49,7 +49,8 @@ async fn main() -> Result<()> {
     // Ensure backup directory and
     cli.force_different_backup_snapshot_dir();
 
-    let keypair = read_keypair_file(&cli.keypair_path).expect("Failed to read keypair file");
+    let keypair =
+        Arc::new(read_keypair_file(&cli.keypair_path).expect("Failed to read keypair file"));
     let rpc_client = Arc::new(RpcClient::new(cli.rpc_url.clone()));
 
     datapoint_info!(
@@ -104,6 +105,7 @@ async fn main() -> Result<()> {
             claim_tips,
             claim_tips_metrics,
             claim_tips_epoch_lookback,
+            reclaim_expired_accounts,
         } => {
             assert!(
                 num_monitored_epochs > 0,
@@ -173,9 +175,9 @@ async fn main() -> Result<()> {
                 }
             });
 
+            let keypair_arc = Arc::clone(&keypair);
             // Check for new meta merkle trees and submit to NCN periodically
             tokio::spawn(async move {
-                let keypair_arc = Arc::new(keypair);
                 loop {
                     if let Err(e) = submit_recent_epochs_to_ncn(
                         &rpc_client_clone,
@@ -196,13 +198,13 @@ async fn main() -> Result<()> {
                 }
             });
 
-            let cli_clone: Cli = cli.clone();
+            let save_path = cli.clone().get_save_path();
+
             // Track incremental snapshots and backup to `backup_snapshots_dir`
             tokio::spawn(async move {
-                let save_path = cli_clone.get_save_path();
                 loop {
                     if let Err(e) = BackupSnapshotMonitor::new(
-                        &rpc_url,
+                        rpc_url.clone().as_str(),
                         full_snapshots_path.clone(),
                         backup_snapshots_dir.clone(),
                         override_target_slot,
@@ -367,7 +369,26 @@ async fn main() -> Result<()> {
                 });
             }
 
-            // Endless loop that transitions between stages of the operator process.
+            if reclaim_expired_accounts {
+                let rpc_url = cli.rpc_url.clone();
+                tokio::spawn(async move {
+                    loop {
+                        info!("Checking for expired accounts to close...");
+                        if let Err(e) = reclaim::close_expired_accounts(
+                            &rpc_url,
+                            tip_distribution_program_id,
+                            priority_fee_distribution_program_id,
+                            Arc::clone(&keypair),
+                            num_monitored_epochs,
+                        )
+                        .await
+                        {
+                            error!("Error closing expired accounts: {}", e);
+                        }
+                        sleep(Duration::from_secs(1800)).await;
+                    }
+                });
+            } // Endless loop that transitions between stages of the operator process.
             process_epoch::loop_stages(
                 rpc_client,
                 cli,
@@ -406,7 +427,7 @@ async fn main() -> Result<()> {
             let operator_address = Pubkey::from_str(&cli.operator_address)?;
             submit_to_ncn(
                 &rpc_client,
-                &keypair,
+                &keypair.clone(),
                 &operator_address,
                 &meta_merkle_tree_path,
                 epoch,

tip-router-operator-cli/src/process_epoch.rs

@@ -5,6 +5,13 @@ use std::{
     time::{Duration, Instant},
 };
 
+use crate::{
+    backup_snapshots::SnapshotInfo, cli::SnapshotPaths, create_merkle_tree_collection,
+    create_meta_merkle_tree, create_stake_meta, ledger_utils::get_bank_from_snapshot_at_slot,
+    load_bank_from_snapshot, meta_merkle_tree_path, read_merkle_tree_collection,
+    read_stake_meta_collection, submit::submit_to_ncn, tip_router::get_ncn_config, Cli,
+    OperatorState, Version,
+};
 use anyhow::Result;
 use log::{error, info};
 use meta_merkle_tree::generated_merkle_tree::{GeneratedMerkleTreeCollection, StakeMetaCollection};
@@ -14,14 +21,6 @@ use solana_runtime::bank::Bank;
 use solana_sdk::{epoch_info::EpochInfo, pubkey::Pubkey, signature::read_keypair_file};
 use tokio::time;
 
-use crate::{
-    backup_snapshots::SnapshotInfo, cli::SnapshotPaths, create_merkle_tree_collection,
-    create_meta_merkle_tree, create_stake_meta, ledger_utils::get_bank_from_snapshot_at_slot,
-    load_bank_from_snapshot, meta_merkle_tree_path, read_merkle_tree_collection,
-    read_stake_meta_collection, submit::submit_to_ncn, tip_router::get_ncn_config, Cli,
-    OperatorState, Version,
-};
-
 const MAX_WAIT_FOR_INCREMENTAL_SNAPSHOT_TICKS: u64 = 1200; // Experimentally determined
 const OPTIMAL_INCREMENTAL_SNAPSHOT_SLOT_RANGE: u64 = 800; // Experimentally determined