rename to staking program. clean up warnings of unused variables.

Author: RustNinja

Cargo.lock

@@ -9,7 +9,7 @@ members = [
     "common/*",
     "solana/allocator",
     "solana/restaking/programs/*",
-    "solana/restaking-v2/programs/*",
+    "solana/staking/programs/*",
     "solana/signature-verifier",
     "solana/solana-ibc/programs/*",
     "solana/trie",

Cargo.toml

@@ -33,6 +33,8 @@ pub enum ErrorCode {
     SameAdmin,
     #[msg("Claim window expired")]
     ClaimExpired,
+    #[msg("Claim not started yet")]
+    ClaimNotStarted,
     #[msg("Arithmetic Error (overflow/underflow)")]
     ArithmeticError,
     #[msg("Start Timestamp cannot be after end Timestamp")]

solana/merkle-distributor/src/error.rs

@@ -71,11 +71,14 @@ pub fn handle_claim_locked(ctx: Context<ClaimLocked>) -> Result<()> {
 
     require!(!distributor.clawed_back, ErrorCode::ClaimExpired);
 
+    require!(
+        curr_ts < distributor.start_ts,
+        ErrorCode::ClaimNotStarted,
+    );
+
     //allow to withdraw only when the lockup period is over
     let amount = claim_status.amount_withdrawable(
         curr_ts,
-        distributor.start_ts,
-        distributor.end_ts,
         distributor.duration,
     )?;
 

solana/merkle-distributor/src/instructions/claim_locked.rs

@@ -113,6 +113,7 @@ pub mod merkle_distributor {
         handle_set_admin(ctx)
     }
 
+    #[allow(clippy::result_large_err)]
     pub fn update_stake(
         ctx: Context<SetStake>,
         amount: u64,

solana/merkle-distributor/src/lib.rs

@@ -35,8 +35,6 @@ impl ClaimStatus {
     pub fn amount_withdrawable(
         &mut self,
         curr_ts: i64,
-        start_ts: i64,
-        end_ts: i64,
         duration: i64,
     ) -> Result<u64> {
 
@@ -267,7 +265,7 @@ mod tests {
             };
 
             assert_eq!(
-                claim_status.amount_withdrawable(curr_ts, 0, 100, 0),
+                claim_status.amount_withdrawable(curr_ts, 0),
                 Ok(expected)
             );
         }

solana/merkle-distributor/src/state/claim_status.rs

@@ -1,12 +1,12 @@
 [package]
-name = "restaking_v2"
+name = "staking"
 version = "0.1.0"
 description = "Created with Anchor"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "restaking_v2"
+name = "staking"
 
 [features]
 # added so that we can compile this along with `solana-ibc` with mocks features. Currently unused.