Use epoch_of_snapshot

pyth-network · Oct 16, 2023 · c2d6c78 · c2d6c78
1 parent 1808d5a
commit c2d6c78
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/staking/programs/staking/src/lib.rs b/staking/programs/staking/src/lib.rs
@@ -413,12 +413,6 @@ pub mod staking {
         let epoch_of_snapshot: u64;
         voter_record.weight_action = Some(action);
 
-        if let Some(transfer_epoch) = ctx.accounts.stake_account_metadata.transfer_epoch {
-            if get_current_epoch(config)? < transfer_epoch {
-                return Err(error!(ErrorCode::VoteDuringTransferEpoch));
-            }
-        }
-
         match action {
             VoterWeightAction::CastVote => {
                 let proposal_account: &AccountInfo = ctx
@@ -477,6 +471,12 @@ pub mod staking {
             return Err(error!(ErrorCode::InvalidVotingEpoch));
         }
 
+        if let Some(transfer_epoch) = ctx.accounts.stake_account_metadata.transfer_epoch {
+            if epoch_of_snapshot <= transfer_epoch {
+                return Err(error!(ErrorCode::VoteDuringTransferEpoch));
+            }
+        }
+
         voter_record.voter_weight = compute_voter_weight(
             stake_account_positions,
             epoch_of_snapshot,