From 72d38e24902c1073cda6714c6ac1e90d8bf87e2b Mon Sep 17 00:00:00 2001 From: Giannis Chatziveroglou Date: Thu, 20 Jul 2023 17:03:03 -0700 Subject: [PATCH] move shutdown notice in lib.rs --- programs/cardinal-rewards-center/src/lib.rs | 49 +++++++++++++------ .../init_reward_distributor.rs | 4 +- .../src/stake_booster/boost_stake_entry.rs | 4 +- .../src/stake_booster/init_stake_booster.rs | 4 +- .../src/stake_entry/ccs/stake_ccs.rs | 4 +- .../src/stake_entry/editions/stake_edition.rs | 4 +- .../src/stake_entry/init_entry.rs | 5 +- .../src/stake_entry/pnfts/stake_pnft.rs | 4 +- .../src/stake_pool/init_pool.rs | 5 +- 9 files changed, 41 insertions(+), 42 deletions(-) diff --git a/programs/cardinal-rewards-center/src/lib.rs b/programs/cardinal-rewards-center/src/lib.rs index 874877aa..d0b1e6fd 100644 --- a/programs/cardinal-rewards-center/src/lib.rs +++ b/programs/cardinal-rewards-center/src/lib.rs @@ -1,3 +1,4 @@ +use crate::errors::ErrorCode; pub mod stake_pool; pub use stake_pool::*; pub mod stake_entry; @@ -26,8 +27,10 @@ pub mod cardinal_rewards_center { use super::*; //// stake_pool //// - pub fn init_pool(ctx: Context, ix: InitPoolIx) -> Result<()> { - stake_pool::init_pool::handler(ctx, ix) + pub fn init_pool(_ctx: Context, _ix: InitPoolIx) -> Result<()> { + // shutdown + return Err(error!(ErrorCode::ProtocolsShutdown)); + // stake_pool::init_pool::handler(ctx, ix) } pub fn update_pool(ctx: Context, ix: UpdatePoolIx) -> Result<()> { stake_pool::update_pool::handler(ctx, ix) @@ -37,8 +40,10 @@ pub mod cardinal_rewards_center { } //// stake_entry //// - pub fn init_entry(ctx: Context, user: Pubkey) -> Result<()> { - stake_entry::init_entry::handler(ctx, user) + pub fn init_entry(_ctx: Context, _user: Pubkey) -> Result<()> { + // shutdown + return Err(error!(ErrorCode::ProtocolsShutdown)); + // stake_entry::init_pool::handler(ctx, user) } pub fn update_total_stake_seconds(ctx: Context) -> Result<()> { stake_entry::update_total_stake_seconds::handler(ctx) @@ -65,21 +70,27 @@ pub mod cardinal_rewards_center { stake_entry::close_stake_entry::handler(ctx) } //// stake_entry::editions //// - pub fn stake_edition<'key, 'accounts, 'remaining, 'info>(ctx: Context<'key, 'accounts, 'remaining, 'info, StakeEditionCtx<'info>>, amount: u64) -> Result<()> { - stake_entry::editions::stake_edition::handler(ctx, amount) + pub fn stake_edition<'key, 'accounts, 'remaining, 'info>(_ctx: Context<'key, 'accounts, 'remaining, 'info, StakeEditionCtx<'info>>, _amount: u64) -> Result<()> { + // shutdown + return Err(error!(ErrorCode::ProtocolsShutdown)); + // stake_entry::editions::stake_edition::handler(ctx, amount) } pub fn unstake_edition<'key, 'accounts, 'remaining, 'info>(ctx: Context<'key, 'accounts, 'remaining, 'info, UnstakeEditionCtx<'info>>) -> Result<()> { stake_entry::editions::unstake_edition::handler(ctx) } //// stake_entry::ccs //// - pub fn stake_ccs<'key, 'accounts, 'remaining, 'info>(ctx: Context<'key, 'accounts, 'remaining, 'info, StakeCCSCtx<'info>>, amount: u64) -> Result<()> { - stake_entry::ccs::stake_ccs::handler(ctx, amount) + pub fn stake_ccs<'key, 'accounts, 'remaining, 'info>(_ctx: Context<'key, 'accounts, 'remaining, 'info, StakeCCSCtx<'info>>, _amount: u64) -> Result<()> { + // shutdown + return Err(error!(ErrorCode::ProtocolsShutdown)); + // stake_entry::ccs::stake_ccs::handler(ctx, amount) } pub fn unstake_ccs<'key, 'accounts, 'remaining, 'info>(ctx: Context<'key, 'accounts, 'remaining, 'info, UnstakeCCSCtx<'info>>) -> Result<()> { stake_entry::ccs::unstake_ccs::handler(ctx) } - pub fn stake_pnft(ctx: Context) -> Result<()> { - stake_entry::pnfts::stake_pnft::handler(ctx) + pub fn stake_pnft(_ctx: Context) -> Result<()> { + // shutdown + return Err(error!(ErrorCode::ProtocolsShutdown)); + // stake_entry::pnfts::stake_pnft::handler(ctx) } pub fn unstake_pnft(ctx: Context) -> Result<()> { @@ -95,14 +106,18 @@ pub mod cardinal_rewards_center { } //// stake_booster //// - pub fn init_stake_booster(ctx: Context, ix: InitStakeBoosterIx) -> Result<()> { - stake_booster::init_stake_booster::handler(ctx, ix) + pub fn init_stake_booster(_ctx: Context, _ix: InitStakeBoosterIx) -> Result<()> { + // shutdown + return Err(error!(ErrorCode::ProtocolsShutdown)); + // stake_booster::init_stake_booster::handler(ctx, ix) } pub fn update_stake_booster(ctx: Context, ix: UpdateStakeBoosterIx) -> Result<()> { stake_booster::update_stake_booster::handler(ctx, ix) } - pub fn boost_stake_entry(ctx: Context, ix: BoostStakeEntryIx) -> Result<()> { - stake_booster::boost_stake_entry::handler(ctx, ix) + pub fn boost_stake_entry(_ctx: Context, _ix: BoostStakeEntryIx) -> Result<()> { + // shutdown + return Err(error!(ErrorCode::ProtocolsShutdown)); + // stake_booster::boost_stake_entry::handler(ctx, ix) } pub fn close_stake_booster(ctx: Context) -> Result<()> { stake_booster::close_stake_booster::handler(ctx) @@ -136,8 +151,10 @@ pub mod cardinal_rewards_center { //// reward_distribution //// //// reward_distribution::reward_distributor //// - pub fn init_reward_distributor(ctx: Context, ix: InitRewardDistributorIx) -> Result<()> { - reward_distribution::reward_distributor::init_reward_distributor::handler(ctx, ix) + pub fn init_reward_distributor(_ctx: Context, _ix: InitRewardDistributorIx) -> Result<()> { + // shutdown + return Err(error!(ErrorCode::ProtocolsShutdown)); + // reward_distribution::reward_distributor::init_reward_distributor::handler(ctx, ix) } pub fn update_reward_distributor(ctx: Context, ix: UpdateRewardDistributorIx) -> Result<()> { reward_distribution::reward_distributor::update_reward_distributor::handler(ctx, ix) diff --git a/programs/cardinal-rewards-center/src/reward_distribution/reward_distributor/init_reward_distributor.rs b/programs/cardinal-rewards-center/src/reward_distribution/reward_distributor/init_reward_distributor.rs index e230cec1..868d300e 100644 --- a/programs/cardinal-rewards-center/src/reward_distribution/reward_distributor/init_reward_distributor.rs +++ b/programs/cardinal-rewards-center/src/reward_distribution/reward_distributor/init_reward_distributor.rs @@ -61,7 +61,5 @@ pub fn handler(ctx: Context, ix: InitRewardDistributor assert_payment_info(ctx.accounts.stake_pool.key(), Action::ClaimRewards, ix.claim_rewards_payment_info)?; - // shutdown - return Err(error!(ErrorCode::ProtocolsShutdown)); - // Ok(()) + Ok(()) } diff --git a/programs/cardinal-rewards-center/src/stake_booster/boost_stake_entry.rs b/programs/cardinal-rewards-center/src/stake_booster/boost_stake_entry.rs index 3cdc4546..7ec40bdb 100644 --- a/programs/cardinal-rewards-center/src/stake_booster/boost_stake_entry.rs +++ b/programs/cardinal-rewards-center/src/stake_booster/boost_stake_entry.rs @@ -69,7 +69,5 @@ pub fn handler(ctx: Context, ix: BoostStakeEntryIx) -> Resul )?; handle_payment_info(ctx.accounts.stake_booster.boost_action_payment_info, remaining_accounts)?; - // shutdown - return Err(error!(ErrorCode::ProtocolsShutdown)); - // Ok(()) + Ok(()) } diff --git a/programs/cardinal-rewards-center/src/stake_booster/init_stake_booster.rs b/programs/cardinal-rewards-center/src/stake_booster/init_stake_booster.rs index e3bb78b8..ab9220b9 100644 --- a/programs/cardinal-rewards-center/src/stake_booster/init_stake_booster.rs +++ b/programs/cardinal-rewards-center/src/stake_booster/init_stake_booster.rs @@ -54,7 +54,5 @@ pub fn handler(ctx: Context, ix: InitStakeBoosterIx) -> Res stake_booster.start_time_seconds = ix.start_time_seconds; stake_booster.boost_action_payment_info = ix.boost_action_payment_info; - // shutdown - return Err(error!(ErrorCode::ProtocolsShutdown)); - // Ok(()) + Ok(()) } diff --git a/programs/cardinal-rewards-center/src/stake_entry/ccs/stake_ccs.rs b/programs/cardinal-rewards-center/src/stake_entry/ccs/stake_ccs.rs index cd6b8bb9..ef1c1899 100644 --- a/programs/cardinal-rewards-center/src/stake_entry/ccs/stake_ccs.rs +++ b/programs/cardinal-rewards-center/src/stake_entry/ccs/stake_ccs.rs @@ -109,7 +109,5 @@ pub fn handler<'key, 'accounts, 'remaining, 'info>(ctx: Context<'key, 'accounts, stake_pool.total_staked = stake_pool.total_staked.checked_add(1).expect("Add error"); stake_entry_fill_zeros(stake_entry)?; - // shutdown - return Err(error!(ErrorCode::ProtocolsShutdown)); - // Ok(()) + Ok(()) } diff --git a/programs/cardinal-rewards-center/src/stake_entry/editions/stake_edition.rs b/programs/cardinal-rewards-center/src/stake_entry/editions/stake_edition.rs index dcd7f963..baad1115 100644 --- a/programs/cardinal-rewards-center/src/stake_entry/editions/stake_edition.rs +++ b/programs/cardinal-rewards-center/src/stake_entry/editions/stake_edition.rs @@ -112,7 +112,5 @@ pub fn handler<'key, 'accounts, 'remaining, 'info>(ctx: Context<'key, 'accounts, stake_pool.total_staked = stake_pool.total_staked.checked_add(1).expect("Add error"); stake_entry_fill_zeros(stake_entry)?; - // shutdown - return Err(error!(ErrorCode::ProtocolsShutdown)); - // Ok(()) + Ok(()) } diff --git a/programs/cardinal-rewards-center/src/stake_entry/init_entry.rs b/programs/cardinal-rewards-center/src/stake_entry/init_entry.rs index c7362187..98805a81 100644 --- a/programs/cardinal-rewards-center/src/stake_entry/init_entry.rs +++ b/programs/cardinal-rewards-center/src/stake_entry/init_entry.rs @@ -1,5 +1,4 @@ use crate::authorization::mint_is_allowed; -use crate::errors::ErrorCode; use crate::stake_seed; use crate::StakeEntry; use crate::StakePool; @@ -43,7 +42,5 @@ pub fn handler(ctx: Context, _user: Pubkey) -> Result<()> { let remaining_accounts = &mut ctx.remaining_accounts.iter(); mint_is_allowed(stake_pool, &ctx.accounts.stake_mint_metadata, ctx.accounts.stake_mint.key(), remaining_accounts)?; - // shutdown - return Err(error!(ErrorCode::ProtocolsShutdown)); - // Ok(()) + Ok(()) } diff --git a/programs/cardinal-rewards-center/src/stake_entry/pnfts/stake_pnft.rs b/programs/cardinal-rewards-center/src/stake_entry/pnfts/stake_pnft.rs index 52f7b968..a4ed982e 100644 --- a/programs/cardinal-rewards-center/src/stake_entry/pnfts/stake_pnft.rs +++ b/programs/cardinal-rewards-center/src/stake_entry/pnfts/stake_pnft.rs @@ -182,7 +182,5 @@ pub fn handler(ctx: Context) -> Result<()> { &[&user_escrow_seeds.iter().map(|s| s.as_slice()).collect::>()], )?; - // shutdown - return Err(error!(ErrorCode::ProtocolsShutdown)); - // Ok(()) + Ok(()) } diff --git a/programs/cardinal-rewards-center/src/stake_pool/init_pool.rs b/programs/cardinal-rewards-center/src/stake_pool/init_pool.rs index db4f9ad0..af269ebc 100644 --- a/programs/cardinal-rewards-center/src/stake_pool/init_pool.rs +++ b/programs/cardinal-rewards-center/src/stake_pool/init_pool.rs @@ -1,5 +1,4 @@ use crate::assert_payment_info; -use crate::errors::ErrorCode; use crate::utils::resize_account; use crate::Action; use crate::StakePool; @@ -73,7 +72,5 @@ pub fn handler(ctx: Context, ix: InitPoolIx) -> Result<()> { stake_pool.set_inner(new_stake_pool); - // shutdown - return Err(error!(ErrorCode::ProtocolsShutdown)); - // Ok(()) + Ok(()) }