make cli more robust

wphan · wphan · commit 5d516dedec3d · 2025-06-16T22:13:09.000-07:00
diff --git a/api/src/cache.rs b/api/src/cache.rs
@@ -286,15 +286,18 @@ impl Cache {
         let distributors_to_load = self.distributors.clone();
         let distributor_keys_vec = self.get_distributor_keys();
         let distributor_keys = distributor_keys_vec.as_slice();
-        
+
         // Retry logic for network errors
         let mut retry_count = 0;
         const MAX_RETRIES: u32 = 3;
         const RETRY_DELAY: Duration = Duration::from_secs(2);
-        
+
         loop {
             match rpc_client
-                .get_multiple_accounts_with_commitment(&distributor_keys, CommitmentConfig::confirmed())
+                .get_multiple_accounts_with_commitment(
+                    &distributor_keys,
+                    CommitmentConfig::confirmed(),
+                )
                 .await
             {
                 Ok(accounts) => {
@@ -306,12 +309,15 @@ impl Cache {
                         let distributor = distributors_to_load.get(index).unwrap();
                         match account {
                             Some(account) => {
-                                let distributor_data =
-                                    MerkleDistributor::try_deserialize(&mut account.data.as_slice())
-                                        .map_err(|err| ApiError::InternalError(Box::new(err)))
-                                        .unwrap();
-                                distributor_cache
-                                    .insert(distributor.distributor_pubkey.clone(), distributor_data);
+                                let distributor_data = MerkleDistributor::try_deserialize(
+                                    &mut account.data.as_slice(),
+                                )
+                                .map_err(|err| ApiError::InternalError(Box::new(err)))
+                                .unwrap();
+                                distributor_cache.insert(
+                                    distributor.distributor_pubkey.clone(),
+                                    distributor_data,
+                                );
                             }
                             None => {
                                 println!(
@@ -325,18 +331,22 @@ impl Cache {
                 }
                 Err(e) => {
                     retry_count += 1;
-                    println!("Error in distributor gma (attempt {}/{}): {:?}", retry_count, MAX_RETRIES, e);
-                    
+                    println!(
+                        "Error in distributor gma (attempt {}/{}): {:?}",
+                        retry_count, MAX_RETRIES, e
+                    );
+
                     if retry_count >= MAX_RETRIES {
                         println!("Max retries reached for distributor cache update. Skipping this cycle.");
                         break;
                     }
-                    
+
                     // Check if it's a network error that's worth retrying
                     let error_string = format!("{:?}", e);
-                    if error_string.contains("IncompleteMessage") || 
-                       error_string.contains("timeout") ||
-                       error_string.contains("connection") {
+                    if error_string.contains("IncompleteMessage")
+                        || error_string.contains("timeout")
+                        || error_string.contains("connection")
+                    {
                         println!("Retrying after {} seconds...", RETRY_DELAY.as_secs());
                         tokio::time::sleep(RETRY_DELAY).await;
                     } else {
@@ -365,10 +375,16 @@ impl Cache {
                         }
                         // Allow polling updates (slot 0) to override if data is different
                         // This fixes the bug where WebSocket misses updates but polling catches them
-                        if entry.get().slot <= data.slot || (data.slot == 0 && entry.get().data != data.data) {
+                        if entry.get().slot <= data.slot
+                            || (data.slot == 0 && entry.get().data != data.data)
+                        {
                             println!(
                                 "Updating cache with {} for claimant: {} ({}) on {} tree",
-                                if data.slot > 0 { "newer slot" } else { "polling data" },
+                                if data.slot > 0 {
+                                    "newer slot"
+                                } else {
+                                    "polling data"
+                                },
                                 data.data.claimant.to_string(),
                                 pubkey,
                                 data.data.distributor.to_string()
diff --git a/api/src/main.rs b/api/src/main.rs
@@ -106,9 +106,7 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
     info!("started rpc client at {}", args.rpc_url);
 
     let mut paths: Vec<_> = match fs::read_dir(&args.merkle_tree_path) {
-        Ok(entries) => entries
-            .filter_map(|r| r.ok())
-            .collect(),
+        Ok(entries) => entries.filter_map(|r| r.ok()).collect(),
         Err(e) => {
             eprintln!(
                 "Warning: Could not read merkle tree directory '{}': {}",
diff --git a/cli/src/bin/cli.rs b/cli/src/bin/cli.rs
@@ -72,9 +72,9 @@ pub struct Args {
 
 impl Args {
     fn get_program_client(&self) -> Program<Rc<Keypair>> {
-        // let payer =
-        //     read_keypair_file(self.keypair_path.clone()).expect("Wallet keypair file not found");
-        let payer = Keypair::new();
+        let payer = read_keypair_file(self.keypair_path.clone().unwrap())
+            .expect("Wallet keypair file not found");
+        // let payer = Keypair::new();
         let client = AnchorClient::new_with_options(
             Cluster::Custom(self.rpc_url.clone(), self.rpc_url.clone()),
             Rc::new(Keypair::from_bytes(&payer.to_bytes()).unwrap()),
@@ -530,29 +530,43 @@ fn check_distributor_onchain_matches(
 
 fn get_pre_list() -> Vec<String> {
     let list = vec![
-        "DHLXnJdACTY83yKwnUkeoDjqi4QBbsYGa1v8tJL76ViX",
-        "BULRqL3U2jPgwvz6HYCyBVq9BMtK94Y1Nz98KQop23aD",
-        "7w32LzRsJrQiE7S3ZSdkz9TSFGey1XNsonPmdm9xDUch",
-        "55pPhcCcp8gEKvKWr1JUkAcdwMeemmNhTHmkWNR9sJib",
-        "62ucxc2gd5TBCwzToEEWVV4M5drVK7Fi7aYozniqWtac",
-        "5unTfT2kssBuNvHPY6LbJfJpLqEcdMxGYLWHwShaeTLi",
-        "9zg3seAh4Er1Nz8GAuiciH437apxtzgUWBT8frhudevR",
-        "AjefJWRfjRCVNSQ1pHnTW8F7szLV7xFZftiB3yM5vnTa",
-        "8SEFruHjgNrnV8ak2Ff11wg9em8Nh72RWTwk359bRyzE",
-        "7jBypy9HX1dyLHPnmRnRubibNUaBPrShnERGnoE7rc3C",
-        "XWpxVfYTeKmmp18DPxqPvWFL7P1C2vbdegDPAbXkV1n",
-        "AuTFdqo4GsxpDgtag87pDaHE259cE94Z82kdpFozVBhC",
-        "6h43GsVT3TjtLa5nRpsXp15GDpAY4smWCYHgcq58dSPM",
-        "2mAax9cNqDXDg9eDJDby1tBh9Q8N3TS7qLhX9rMp8EVc",
-        "JBeYA7dmBGCNgaEdtqdoUnESwKJho5YvgXVNLgo4n3MM",
-        "HeTpE5BnNinzNv92MzVAGyVT5LjAwTWuk5qQcPURmi2L",
-        "Bidku3jkJUxiTzBJZroEfwPcUWueNUst9LrMbZQLhrtG",
-        "HUQytvb7WCCqbHnpQrVgXhmXSw4XfWMnmqCiKz6T1vsU",
-        "4zvTjdpyr3SAgLeSpCnq4KaHvX2j5SbkwxYydzbfqhRQ",
-        "EVfUfs9XNwJmfNvoazDbZVb6ecnGCxgQrJzsCQHoQ4q7",
-        "GMtwcuktJfrRcnyGktWW4Vab8cfjPcBy3xbuZgRegw6E",
-        "HAPdsaZFfQDG4bD8vzBbPCUawUWKSJxvhQ7TGg1BeAxZ",
+        // "DHLXnJdACTY83yKwnUkeoDjqi4QBbsYGa1v8tJL76ViX",
+        // "BULRqL3U2jPgwvz6HYCyBVq9BMtK94Y1Nz98KQop23aD",
+        // "7w32LzRsJrQiE7S3ZSdkz9TSFGey1XNsonPmdm9xDUch",
+        // "55pPhcCcp8gEKvKWr1JUkAcdwMeemmNhTHmkWNR9sJib",
+        // "62ucxc2gd5TBCwzToEEWVV4M5drVK7Fi7aYozniqWtac",
+        // "5unTfT2kssBuNvHPY6LbJfJpLqEcdMxGYLWHwShaeTLi",
+        // "9zg3seAh4Er1Nz8GAuiciH437apxtzgUWBT8frhudevR",
+        // "AjefJWRfjRCVNSQ1pHnTW8F7szLV7xFZftiB3yM5vnTa",
+        // "8SEFruHjgNrnV8ak2Ff11wg9em8Nh72RWTwk359bRyzE",
+        // "7jBypy9HX1dyLHPnmRnRubibNUaBPrShnERGnoE7rc3C",
+        // "XWpxVfYTeKmmp18DPxqPvWFL7P1C2vbdegDPAbXkV1n",
+        // "AuTFdqo4GsxpDgtag87pDaHE259cE94Z82kdpFozVBhC",
+        // "6h43GsVT3TjtLa5nRpsXp15GDpAY4smWCYHgcq58dSPM",
+        // "2mAax9cNqDXDg9eDJDby1tBh9Q8N3TS7qLhX9rMp8EVc",
+        // "JBeYA7dmBGCNgaEdtqdoUnESwKJho5YvgXVNLgo4n3MM",
+        // "HeTpE5BnNinzNv92MzVAGyVT5LjAwTWuk5qQcPURmi2L",
+        // "Bidku3jkJUxiTzBJZroEfwPcUWueNUst9LrMbZQLhrtG",
+        // "HUQytvb7WCCqbHnpQrVgXhmXSw4XfWMnmqCiKz6T1vsU",
+        // "4zvTjdpyr3SAgLeSpCnq4KaHvX2j5SbkwxYydzbfqhRQ",
+        // "EVfUfs9XNwJmfNvoazDbZVb6ecnGCxgQrJzsCQHoQ4q7",
+        // "GMtwcuktJfrRcnyGktWW4Vab8cfjPcBy3xbuZgRegw6E",
+        // "HAPdsaZFfQDG4bD8vzBbPCUawUWKSJxvhQ7TGg1BeAxZ",
+        "4FED9aSQhGfX43FrSUa6GgmNjBsy76GTe9UHig7r2nK6",
+        "6PAG5Le18uDrwkWWyuMFF3N3G74ksShVbUR5L7uDJtFR",
+        "HZ1g3FXyvDt4pC1p7mUFnA44UtPkXghGJUtoxw5TDi42",
+        "7gcjNCwGKhFsfDgHwH6Ja4pM2xBJj47hJpexxMFDyBpM",
+        "8LWr1b9bXN7vRAgSL1Gg8U36ZB7oHGDupRQYVcw4FiQ9",
+        "9qkVBGAgPzixW8Fky7sTjAoAv6ZAZEymVGvmYvqVwFmR",
+        "FtfVWjnft13vKCGHGj6QaZcHWP8GcvJKanXQY3JL3zd3",
+        "6gS27oW41tRD4GHW5QXe3vQN9SkC7TyFFQmtuRtJRT9Q",
+        "dRiaT3YueNdfkhRBkLnzE6TDf4b35uESgL3Boopzxj6",
+        "DRiL3JgMc8Hdxv6TBkxDcan9qEm2JoBhFiWViQxupPo",
+        "DriQrk2v2HsLigaqH2qJtpCQ3MrNLGvq8GTB6jtXC2F",
+        "DriEp7U5awPuc6p4ZM8gFWWxS79Go7VQstkKaMiGwJb",
+        "DriM2HACfSFeh5tHum2aRgfgFeRGy72qpbc4UsMkvLm",
     ];
+
     let list: Vec<String> = list.iter().map(|x| x.to_string()).collect();
     list
 }
diff --git a/cli/src/bin/instructions/process_claim.rs b/cli/src/bin/instructions/process_claim.rs
@@ -1,5 +1,5 @@
-use solana_sdk::compute_budget::ComputeBudgetInstruction;
 use crate::*;
+use solana_sdk::compute_budget::ComputeBudgetInstruction;
 
 pub fn process_claim(args: &Args, claim_args: &ClaimArgs) {
     let keypair = read_keypair_file(&args.keypair_path.clone().unwrap())
@@ -62,12 +62,8 @@ pub fn process_claim(args: &Args, claim_args: &ClaimArgs) {
     ixs.push(claim_ix);
 
     let blockhash = client.get_latest_blockhash().unwrap();
-    let tx = Transaction::new_signed_with_payer(
-        &ixs,
-        Some(&claimant.key()),
-        &[&keypair],
-        blockhash,
-    );
+    let tx =
+        Transaction::new_signed_with_payer(&ixs, Some(&claimant.key()), &[&keypair], blockhash);
 
     let signature = client
         .send_and_confirm_transaction_with_spinner(&tx)
diff --git a/cli/src/bin/instructions/process_fund_all.rs b/cli/src/bin/instructions/process_fund_all.rs
@@ -1,5 +1,5 @@
-use solana_sdk::compute_budget::ComputeBudgetInstruction;
 use crate::*;
+use solana_sdk::compute_budget::ComputeBudgetInstruction;
 
 pub fn process_fund_all(args: &Args, fund_all_args: &FundAllArgs) {
     let program = args.get_program_client();
@@ -17,6 +17,29 @@ pub fn process_fund_all(args: &Args, fund_all_args: &FundAllArgs) {
     for file in paths {
         let single_tree_path = file.path();
 
+        // Skip directories
+        if single_tree_path.is_dir() {
+            continue;
+        }
+
+        // Skip non-JSON files
+        match single_tree_path.extension() {
+            Some(ext) if ext == "json" => {
+                // Continue processing JSON files
+            }
+            Some(ext) => {
+                println!("skipping non-json file: {}", single_tree_path.display());
+                continue;
+            }
+            None => {
+                println!(
+                    "skipping file without extension: {}",
+                    single_tree_path.display()
+                );
+                continue;
+            }
+        }
+
         let merkle_tree =
             AirdropMerkleTree::new_from_file(&single_tree_path).expect("failed to read");
         let (distributor_pubkey, _bump) =
@@ -45,14 +68,17 @@ pub fn process_fund_all(args: &Args, fund_all_args: &FundAllArgs) {
             );
         }
 
-        ixs.push(spl_token::instruction::transfer(
-            &spl_token::id(),
-            &source_vault,
-            &token_vault,
-            &keypair.pubkey(),
-            &[],
-            merkle_tree.max_total_claim,
-        ).unwrap());
+        ixs.push(
+            spl_token::instruction::transfer(
+                &spl_token::id(),
+                &source_vault,
+                &token_vault,
+                &keypair.pubkey(),
+                &[],
+                merkle_tree.max_total_claim,
+            )
+            .unwrap(),
+        );
 
         let tx = Transaction::new_signed_with_payer(
             &ixs,
diff --git a/cli/src/bin/instructions/process_new_distributor.rs b/cli/src/bin/instructions/process_new_distributor.rs
@@ -1,5 +1,5 @@
-use solana_sdk::compute_budget::ComputeBudgetInstruction;
 use crate::*;
+use solana_sdk::compute_budget::ComputeBudgetInstruction;
 
 pub fn process_new_distributor(args: &Args, new_distributor_args: &NewDistributorArgs) {
     let client = RpcClient::new_with_commitment(&args.rpc_url, CommitmentConfig::finalized());
@@ -75,6 +75,13 @@ pub fn process_new_distributor(args: &Args, new_distributor_args: &NewDistributo
                 ),
             );
         }
+        println!("clawback_receiver: ");
+        println!("keypair: {}", keypair.pubkey());
+        println!(
+            "keypair balance: {}",
+            client.get_balance(&keypair.pubkey()).unwrap()
+        );
+        println!("program payer: {}", program.payer());
         let clawback_receiver = get_or_create_ata(&program, args.mint, keypair.pubkey()).unwrap();
 
         ixs.push(Instruction {
