CLI for admin remove new claim instruction.

Author: RustNinja

cli/readme.md

@@ -1,12 +1,65 @@
-cargo run -- --mint 4dzPmLDFSpuaCcTUoQjw71Bq8u8RWgHJQcLS63Y8ZrZp \
-  --rpc-url https://api.devnet.solana.com \
-  --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/test.json \
+cargo run -- --mint Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9 \
+  --rpc-url "https://cosmopolitanism-saltwort-wclzzpyvrk-dedicated.helius-rpc.com/?api-key=21ddfc65-32a5-4870-9654-078d9cfd75db" \
+  --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/seed.csv \
   new-distributor \
-  --clawback-receiver-token-account 5pT9ijgv2Qpxn4ux4u4crCCJhgAe4w7GoeaCPJKgP4NW \
-  --start-vesting-ts 1738958910 \
-  --end-vesting-ts 1739317492 \
-  --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/test_csv.csv \
-  --clawback-start-ts 1739458492
+  --clawback-receiver-token-account PYsq43ovMAvj3yuiF7jgfcfbCgASapELHKAQPDS6WfU \
+  --start-vesting-ts 1739226501 \
+  --end-vesting-ts 1802721780 \
+  --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/seed.csv \
+  --clawback-start-ts 1802809200
+
+
+  cargo run -- --mint Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9 \
+  --rpc-url "https://mainnet.helius-rpc.com/?api-key=40963904-fc44-47f3-bed3-f01a0047f70a" \                      
+  --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/solvers.csv \
+  new-distributor \
+  --clawback-receiver-token-account PYsq43ovMAvj3yuiF7jgfcfbCgASapELHKAQPDS6WfU \
+  --start-vesting-ts 1739270610 \
+  --end-vesting-ts 1746960210 \
+  --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/solvers.csv \
+  --clawback-start-ts 1747050225
+
+  cargo run -- --mint Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9 \
+  --rpc-url "https://cosmopolitanism-saltwort-wclzzpyvrk-dedicated.helius-rpc.com/?api-key=21ddfc65-32a5-4870-9654-078d9cfd75db" \
+  --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/angels.csv \
+  new-distributor \
+  --clawback-receiver-token-account PYsq43ovMAvj3yuiF7jgfcfbCgASapELHKAQPDS6WfU \
+  --start-vesting-ts 1739265171 \
+  --end-vesting-ts 1802337171 \
+  --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/angels.csv \
+  --clawback-start-ts 1802423571
+
+  cargo run -- --mint Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9 \
+  --rpc-url "https://cosmopolitanism-saltwort-wclzzpyvrk-dedicated.helius-rpc.com/?api-key=21ddfc65-32a5-4870-9654-078d9cfd75db" \
+  --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/advisors.csv \
+  new-distributor \
+  --clawback-receiver-token-account PYsq43ovMAvj3yuiF7jgfcfbCgASapELHKAQPDS6WfU \
+  --start-vesting-ts 1739269222 \
+  --end-vesting-ts 1814434953 \
+  --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/advisors.csv \
+  --clawback-start-ts 1814521353
+
+
+  cargo run -- --mint Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9 \
+  --rpc-url "https://cosmopolitanism-saltwort-wclzzpyvrk-dedicated.helius-rpc.com/?api-key=21ddfc65-32a5-4870-9654-078d9cfd75db" \
+  --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/cliff.csv \
+  new-distributor \
+  --clawback-receiver-token-account PYsq43ovMAvj3yuiF7jgfcfbCgASapELHKAQPDS6WfU \
+  --start-vesting-ts 1751017353 \
+  --end-vesting-ts 1829900553 \
+  --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/cliff.csv \
+  --clawback-start-ts 1829986953
+
+
+  cargo run -- --mint Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9 \
+  --rpc-url "https://cosmopolitanism-saltwort-wclzzpyvrk-dedicated.helius-rpc.com/?api-key=21ddfc65-32a5-4870-9654-078d9cfd75db" \
+  --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/seriesaangular.csv \
+  new-distributor \
+  --clawback-receiver-token-account PYsq43ovMAvj3yuiF7jgfcfbCgASapELHKAQPDS6WfU \
+  --start-vesting-ts 1754937145 \
+  --end-vesting-ts 1818009145 \
+  --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/seriesaangular.csv \
+  --clawback-start-ts 1818095545
 
 
 
@@ -15,3 +68,11 @@ cargo run -- --mint Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9 \
   --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/seed.csv \
   claim \
   --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/seed.csv
+
+
+  cargo run -- --mint Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9 \
+  --rpc-url "https://cosmopolitanism-saltwort-wclzzpyvrk-dedicated.helius-rpc.com/?api-key=21ddfc65-32a5-4870-9654-078d9cfd75db" \
+  --keypair-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/seriesaangular.csv \
+  clawback-now \
+  --amount 1331285000000000
+  

cli/src/bin/cli.rs

@@ -66,6 +66,7 @@ pub enum Commands {
     ClawbackNow(ClawbackNowArgs),
     /// Create a Merkle tree, given a CSV of recipients
     CreateMerkleTree(CreateMerkleTreeArgs),
+    AdminRemoveNewClaim(ClaimArgs),
     SetAdmin(SetAdminArgs),
 }
 
@@ -77,6 +78,10 @@ pub struct ClaimArgs {
     pub merkle_tree_path: PathBuf,
 }
 
+#[derive(Parser, Debug)]
+pub struct AdminRemoveNewClaim {
+}
+
 // NewDistributor subcommand args
 #[derive(Parser, Debug)]
 pub struct NewDistributorArgs {
@@ -135,7 +140,7 @@ fn main() {
     // let mint = Pubkey::from_str("Mant1sZcb8x2YMZe7RdqSfStCj4YxjmQByNKyHpLJK9").unwrap();
     // // let escrow = Pubkey::from_str("HnCv1EJJ2sMN55TUDMLGJgSRf4MKvorQn8s1QGdpTqZy").unwrap();
     // // let escrow = Pubkey::from_str("57FXFvcgAYxvoWK7TyjtYjNx3sTG6vRFpoEUqs1Tj6Qu").unwrap();
-    // let programid = Pubkey::from_str("DSfM7SNVJhQBZAznaoJuR3ZKsvVnz7FHWxwR1yCEfUiV").unwrap();
+    // let programid = Pubkey::from_str("A7rDhNV2tVn5gS7g3yWeZAFpsixKXmRdjqHtLXLnYy41").unwrap();
 
     // let (distributor, _bump) =
     //     get_merkle_distributor_pda(&programid, &mint, 0);
@@ -161,6 +166,9 @@ fn main() {
         Commands::SetAdmin(set_admin_args) => {
             process_set_admin(&args, set_admin_args);
         }
+        Commands::AdminRemoveNewClaim(args2) => {
+            admin_remove_new_claim(&args, args2);
+        }
     }
 }
 
@@ -338,6 +346,73 @@ fn process_claim(args: &Args, claim_args: &ClaimArgs) {
     println!("successfully claimed tokens with signature {signature:#?}",);
 }
 
+fn admin_remove_new_claim(args: &Args, claim_args: &ClaimArgs) {
+    use dotenv::dotenv;
+    dotenv().ok();
+
+    let env_siner_private_key = std::env::var("SIGNER_PRIV_KEY").expect("SIGNER_PRIV_KEY must be set.");
+    let private_key_bytes = bs58::decode(env_siner_private_key).into_vec().unwrap();
+
+    let keypair = Keypair::from_bytes(&private_key_bytes).unwrap();
+    println!("This is pubkey {}", keypair.pubkey().to_string());
+
+    let claimant = keypair.pubkey();
+
+    let claimant_wallet = Pubkey::from_str("G6JbPX7UxrxukQbpXSjPDTeRzoCRRyvZixtrbHGoy1pd").unwrap();
+
+    let (distributor, bump) =
+        get_merkle_distributor_pda(&args.program_id, &args.mint, args.airdrop_version);
+    println!("distributor pubkey {}", distributor);
+
+    let (claim_status_pda, _bump) = get_claim_status_pda(&args.program_id, &claimant_wallet, &distributor);
+    println!("claim pda: {claim_status_pda}, bump: {bump}");
+
+    let client = RpcClient::new_with_commitment(&args.rpc_url, CommitmentConfig::confirmed());
+
+    let merkle_tree = AirdropMerkleTree::new_from_csv(&claim_args.merkle_tree_path)
+        .expect("failed to load merkle tree from file");
+
+    
+    let node = merkle_tree.get_node(&claimant_wallet);
+
+    let clawback_ata = Pubkey::from_str("PYsq43ovMAvj3yuiF7jgfcfbCgASapELHKAQPDS6WfU").unwrap();
+    let clawback_ata = get_associated_token_address(&clawback_ata, &args.mint);
+
+    let remove_admin_claim = Instruction {
+        program_id: args.program_id,
+        accounts: merkle_distributor::accounts::RemoveNewClaim {
+            distributor,
+            claim_status: claim_status_pda,
+            from: get_associated_token_address(&distributor, &args.mint),
+            to: clawback_ata,
+            token_program: token::ID,
+            admin: keypair.pubkey(),
+            system_program: solana_program::system_program::ID,
+        }
+        .to_account_metas(None),
+        data: merkle_distributor::instruction::AdminRemoveNewClaim {
+            claimant: claimant_wallet,
+            amount_unlocked: node.amount_unlocked(),
+            amount_locked: node.amount_locked(),
+            proof: node.proof.unwrap(),
+
+        }.data(),
+    };
+    
+    let tx = Transaction::new_signed_with_payer(
+        &[remove_admin_claim],
+        Some(&keypair.pubkey()),
+        &[&keypair],
+        client.get_latest_blockhash().unwrap(),
+    );
+
+    let signature = client
+        .send_and_confirm_transaction_with_spinner(&tx)
+        .unwrap();
+
+    println!("Successfully remove claim admin! signature: {signature:#?}");
+}
+
 fn check_distributor_onchain_matches(
     account: &Account,
     merkle_tree: &AirdropMerkleTree,
@@ -545,7 +620,7 @@ fn process_clawback_now(args: &Args, clawback_args: &ClawbackNowArgs) {
             distributor,
             from,
             to: clawback_ata,
-            claimant: keypair.pubkey(),
+            admin: keypair.pubkey(),
             system_program: solana_program::system_program::ID,
             token_program: token::ID,
         }
@@ -558,7 +633,7 @@ fn process_clawback_now(args: &Args, clawback_args: &ClawbackNowArgs) {
     let tx = Transaction::new_signed_with_payer(
         &[clawback_ix],
         Some(&keypair.pubkey()),
-        &[&keypair, &keypair],
+        &[&keypair],
         client.get_latest_blockhash().unwrap(),
     );
 

programs/merkle-distributor/src/instructions/remove_new_claim.rs

@@ -79,10 +79,10 @@ pub struct RemoveNewClaim<'info> {
 #[allow(clippy::result_large_err)]
 pub fn handle_admin_remove_new_claim(
     ctx: Context<RemoveNewClaim>,
+    claimant: Pubkey,
     amount_unlocked: u64,
     amount_locked: u64,
     proof: Vec<[u8; 32]>,
-    claimant: Pubkey,
 ) -> Result<()> {
     let distributor = &mut ctx.accounts.distributor;
 

programs/merkle-distributor/src/lib.rs

@@ -30,7 +30,7 @@ security_txt! {
     source_code: "https://github.com/jito-foundation/distributor"
 }
 
-declare_id!("DSfM7SNVJhQBZAznaoJuR3ZKsvVnz7FHWxwR1yCEfUiV");
+declare_id!("HZgU97aM4kvTehjqqXqnvSZL74jHEJaD6QYafkVPPM7G");
 
 #[program]
 pub mod merkle_distributor {
@@ -109,12 +109,12 @@ pub mod merkle_distributor {
     #[allow(clippy::result_large_err)]
     pub fn admin_remove_new_claim(
         ctx: Context<RemoveNewClaim>,
+        claimant: Pubkey,
         amount_unlocked: u64,
         amount_locked: u64,
         proof: Vec<[u8; 32]>,
-        claimant: Pubkey,
     ) -> Result<()> {
-        handle_admin_remove_new_claim(ctx, amount_unlocked, amount_locked, proof, claimant)
+        handle_admin_remove_new_claim(ctx, claimant, amount_unlocked, amount_locked, proof)
     }
 
     #[allow(clippy::result_large_err)]