add support for decimals f64 in vesting CLI.

Author: RustNinja

Anchor.toml

@@ -6,7 +6,7 @@ seeds = true
 skip-lint = false
 
 [programs.devnet]
-merkle_distributor = "32q88TuJFJuRLFZzZLmpVLEF5Hzcb8aoMsCpzPJPvtaB"
+merkle_distributor = "nHU2sptsUARgKih9UJnYLuAGgiUHA2wPyeu5vm8h3yW"
 
 [registry]
 url = "https://api.apr.dev"

cli/readme.md

@@ -0,0 +1,17 @@
+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 \
+  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
+
+
+
+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 \
+  claim \
+  --merkle-tree-path /Users/mykyta/development/composable/mantis-staking-program/solana/merkle-tree/test_fixtures/test_csv.csv

merkle-tree/src/csv_entry.rs

@@ -15,14 +15,14 @@ pub enum AirdropCategory {
 }
 
 /// Represents a single entry in a CSV
-#[derive(Debug, Clone, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct CsvEntry {
     /// Pubkey of the claimant; will be responsible for signing the claim
     pub pubkey: String,
     /// amount unlocked, (ui amount)
-    pub amount_unlocked: u64,
+    pub amount_unlocked: f64,
     /// amount locked, (ui amount)
-    pub amount_locked: u64,
+    pub amount_locked: f64,
     /// Category
     pub category: AirdropCategory,
 }
@@ -57,8 +57,8 @@ mod tests {
             entries[0].pubkey,
             "4SX6nqv5VRLMoNfYM5phvHgcBNcBEwUEES4qPPjf1EqS"
         );
-        assert_eq!(entries[0].amount_unlocked, 1000);
-        assert_eq!(entries[0].amount_locked, 500);
+        assert_eq!(entries[0].amount_unlocked, 1000f64);
+        assert_eq!(entries[0].amount_locked, 500f64);
         assert_eq!(entries[0].category, AirdropCategory::Staker);
     }
 }

merkle-tree/src/tree_node.rs

@@ -64,8 +64,8 @@ impl TreeNode {
 }
 
 /// Converts a ui amount to a token amount (with decimals)
-fn ui_amount_to_token_amount(amount: u64) -> u64 {
-    amount * 10u64.checked_pow(MINT_DECIMALS).unwrap()
+fn ui_amount_to_token_amount(amount: f64) -> u64 {
+    (amount * 10u64.checked_pow(MINT_DECIMALS).unwrap() as f64) as u64
 }
 
 impl From<CsvEntry> for TreeNode {
@@ -125,7 +125,7 @@ mod tests {
 
     #[test]
     fn test_ui_amount_to_token_amount() {
-        let ui_amount = 5;
+        let ui_amount = 5f64;
         let token_amount = ui_amount_to_token_amount(ui_amount);
         assert_eq!(token_amount, 5_000_000_000);
     }

programs/merkle-distributor/src/lib.rs

@@ -30,7 +30,7 @@ security_txt! {
     source_code: "https://github.com/jito-foundation/distributor"
 }
 
-declare_id!("32q88TuJFJuRLFZzZLmpVLEF5Hzcb8aoMsCpzPJPvtaB");
+declare_id!("nHU2sptsUARgKih9UJnYLuAGgiUHA2wPyeu5vm8h3yW");
 
 #[program]
 pub mod merkle_distributor {