feat: deprecate unlocking duration

pyth-network · Aug 28, 2024 · 6b1ff18 · 6b1ff18
1 parent b286cff
commit 6b1ff18
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 189 deletions.
diff --git a/staking/integration-tests/src/staking/instructions.rs b/staking/integration-tests/src/staking/instructions.rs
@@ -26,10 +26,7 @@ use {
     },
     anchor_spl::token::spl_token,
     integrity_pool::utils::{
-        clock::{
-            EPOCH_DURATION,
-            UNLOCKING_DURATION,
-        },
+        clock::EPOCH_DURATION,
         types::frac64,
     },
     litesvm::types::TransactionResult,
@@ -59,7 +56,7 @@ pub fn init_config_account(svm: &mut litesvm::LiteSVM, payer: &Keypair, pyth_tok
             governance_authority: payer.pubkey(),
             pyth_token_mint,
             pyth_governance_realm: MAINNET_REALM_ID,
-            unlocking_duration: UNLOCKING_DURATION,
+            unlocking_duration: 1,
             epoch_duration: EPOCH_DURATION,
             freeze: false,
             pda_authority: payer.pubkey(),

diff --git a/staking/integration-tests/tests/stability.rs b/staking/integration-tests/tests/stability.rs
@@ -45,7 +45,6 @@ use {
     integrity_pool::{
         state::pool::PoolData,
         utils::{
-            clock::UNLOCKING_DURATION,
             constants::MAX_PUBLISHERS,
             types::FRAC_64_MULTIPLIER,
         },
@@ -334,7 +333,7 @@ fn sanity_check_publisher(
         for i in 0..positions.get_position_capacity() {
             if let Some(position) = positions.read_position(i).unwrap() {
                 let position_state = position
-                    .get_current_position(get_current_epoch(svm), UNLOCKING_DURATION)
+                    .get_current_position(get_current_epoch(svm))
                     .unwrap();
                 if matches!(position, Position {
                         target_with_parameters: TargetWithParameters::IntegrityPool { publisher: p, .. },
@@ -518,7 +517,7 @@ fn test_stability(props: StabilityTestProps) {
                 for i in 0..positions.get_position_capacity() {
                     if let Some(position) = positions.read_position(i).unwrap() {
                         let position_state = position
-                            .get_current_position(get_current_epoch(&mut svm), UNLOCKING_DURATION)
+                            .get_current_position(get_current_epoch(&mut svm))
                             .unwrap();
                         if matches!(position, Position {
                                 target_with_parameters: TargetWithParameters::IntegrityPool { publisher: p, .. },
@@ -682,7 +681,7 @@ fn test_stability(props: StabilityTestProps) {
                 for i in 0..positions.get_position_capacity() {
                     if let Some(position) = positions.read_position(i).unwrap() {
                         let position_state = position
-                            .get_current_position(get_current_epoch(&mut svm), UNLOCKING_DURATION)
+                            .get_current_position(get_current_epoch(&mut svm))
                             .unwrap();
                         if matches!(
                             position,

diff --git a/staking/programs/integrity-pool/src/lib.rs b/staking/programs/integrity-pool/src/lib.rs
@@ -7,10 +7,7 @@ use {
         TargetWithParameters,
     },
     utils::{
-        clock::{
-            get_current_epoch,
-            UNLOCKING_DURATION,
-        },
+        clock::get_current_epoch,
         constants::{
             MAX_PUBLISHERS,
             POOL_CONFIG,
@@ -177,8 +174,7 @@ pub mod integrity_pool {
             .read_position(position_index.into())?
             .ok_or(IntegrityPoolError::ThisCodeShouldBeUnreachable)?;
 
-        let position_state =
-            position.get_current_position(get_current_epoch()?, UNLOCKING_DURATION)?;
+        let position_state = position.get_current_position(get_current_epoch()?)?;
         pool_data.remove_delegation(
             publisher.key,
             &ctx.accounts.stake_account_positions.key(),

diff --git a/staking/programs/integrity-pool/src/state/pool.rs b/staking/programs/integrity-pool/src/state/pool.rs
@@ -6,10 +6,7 @@ use {
     crate::{
         error::IntegrityPoolError,
         utils::{
-            clock::{
-                time_to_epoch,
-                UNLOCKING_DURATION,
-            },
+            clock::time_to_epoch,
             constants::{
                 MAX_EVENTS,
                 MAX_PUBLISHERS,
@@ -142,8 +139,7 @@ impl PoolData {
                     break;
                 }
 
-                let position_state =
-                    position.get_current_position(event.epoch, UNLOCKING_DURATION)?;
+                let position_state = position.get_current_position(event.epoch)?;
 
                 match position_state {
                     PositionState::LOCKED | PositionState::PREUNLOCKING => {}

diff --git a/staking/programs/integrity-pool/src/utils/clock.rs b/staking/programs/integrity-pool/src/utils/clock.rs
@@ -7,7 +7,6 @@ use {
 };
 
 pub const EPOCH_DURATION: u64 = 60 * 60 * 24 * 7; // 1 week
-pub const UNLOCKING_DURATION: u8 = 1; // 1 epoch
 
 /// Computes Pyth clock.
 /// Right now it's just the current Unix timestamp divided by the epoch duration.

diff --git a/staking/programs/staking/src/lib.rs b/staking/programs/staking/src/lib.rs
@@ -52,14 +52,12 @@ pub mod staking {
     /// Creates a global config for the program
     use super::*;
 
-
     pub fn init_config(ctx: Context<InitConfig>, global_config: GlobalConfig) -> Result<()> {
         let config_account = &mut ctx.accounts.config_account;
         config_account.bump = ctx.bumps.config_account;
         config_account.governance_authority = global_config.governance_authority;
         config_account.pyth_token_mint = global_config.pyth_token_mint;
         config_account.pyth_governance_realm = global_config.pyth_governance_realm;
-        config_account.unlocking_duration = global_config.unlocking_duration;
         config_account.epoch_duration = global_config.epoch_duration;
         config_account.freeze = global_config.freeze;
         config_account.pda_authority = global_config.pda_authority;
@@ -227,7 +225,6 @@ pub mod staking {
             stake_account_custody.amount,
             unvested_balance,
             current_epoch,
-            config.unlocking_duration,
         )?;
 
         if let Some(target_account) = maybe_target_account {
@@ -262,7 +259,6 @@ pub mod staking {
 
         stake_account_positions.merge_target_positions(
             current_epoch,
-            config.unlocking_duration,
             &mut stake_account_metadata.next_index,
             target_with_parameters,
         )?;
@@ -322,7 +318,7 @@ pub mod staking {
             .checked_sub(amount)
             .ok_or_else(|| error!(ErrorCode::AmountBiggerThanPosition))?;
 
-        match current_position.get_current_position(current_epoch, config.unlocking_duration)? {
+        match current_position.get_current_position(current_epoch)? {
             PositionState::LOCKED => {
                 // If remaining amount is 0 keep only 1 position
                 if remaining_amount == 0 {
@@ -434,7 +430,6 @@ pub mod staking {
             remaining_balance,
             unvested_balance,
             current_epoch,
-            config.unlocking_duration,
         )
         .is_err()
         {
@@ -457,7 +452,6 @@ pub mod staking {
             ctx.accounts.stake_account_custody.amount,
             unvested_balance,
             current_epoch,
-            config.unlocking_duration,
         )
         .is_err()
         {
@@ -500,7 +494,6 @@ pub mod staking {
             stake_account_custody.amount,
             unvested_balance,
             current_epoch,
-            config.unlocking_duration,
         )?;
 
         let epoch_of_snapshot: u64;
@@ -573,7 +566,6 @@ pub mod staking {
         voter_record.voter_weight = compute_voter_weight(
             stake_account_positions,
             epoch_of_snapshot,
-            config.unlocking_duration,
             governance_target.get_current_amount_locked(epoch_of_snapshot)?,
             MAX_VOTER_WEIGHT,
         )?;
@@ -688,7 +680,6 @@ pub mod staking {
                     config.pyth_token_list_time,
                 )?,
             current_epoch,
-            config.unlocking_duration,
         )?;
 
         // Check that there aren't any positions (i.e., staked tokens) in the source account.
@@ -743,7 +734,6 @@ pub mod staking {
                     config.pyth_token_list_time,
                 )?,
             current_epoch,
-            config.unlocking_duration,
         )?;
 
         utils::risk::validate(
@@ -757,7 +747,6 @@ pub mod staking {
                     config.pyth_token_list_time,
                 )?,
             current_epoch,
-            config.unlocking_duration,
         )?;
 
         // Delete current request
@@ -817,15 +806,13 @@ pub mod staking {
         let next_index = &mut ctx.accounts.stake_account_metadata.next_index;
 
         let current_epoch = get_current_epoch(&ctx.accounts.config)?;
-        let unlocking_duration = ctx.accounts.config.unlocking_duration;
 
         let SlashedAmounts {
             total_slashed,
             locked_slashed,
             preunlocking_slashed,
         } = stake_account_positions.slash_positions(
             current_epoch,
-            unlocking_duration,
             next_index,
             ctx.accounts.stake_account_custody.amount,
             publisher.key,

diff --git a/staking/programs/staking/src/state/global_config.rs b/staking/programs/staking/src/state/global_config.rs
@@ -10,10 +10,12 @@ pub struct GlobalConfig {
     pub governance_authority:  Pubkey,
     pub pyth_token_mint:       Pubkey,
     pub pyth_governance_realm: Pubkey,
+    // unlocking_duration is deprecated, but we need to keep it for account structure
     pub unlocking_duration:    u8,
     pub epoch_duration:        u64, // epoch duration in seconds
     pub freeze:                bool,
-    pub pda_authority:         Pubkey, /* Authority that can authorize the transfer of locked
+    pub pda_authority:         Pubkey, /* Authority that can authorize the transfer of
+                                        * locked
                                         * tokens */
     pub governance_program:    Pubkey, // Governance program id