Skip to content

Remove an unnecessary deserialization/mut account #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
larrinator1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove an unnecessary deserialization/mut account #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions programs/quarry-merge-mine/src/account_conversions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ impl<'info> ClaimRewards<'info> {
claim: self.stake.gen_user_claim(),
}
}

/// Conversion.
pub fn to_user_stake_accounts(&self) -> quarry_mine::cpi::accounts::UserStake<'info> {
self.stake.gen_user_stake(&self.stake_token_account)
}
}

impl<'info> QuarryStake<'info> {
Expand Down
7 changes: 4 additions & 3 deletions programs/quarry-merge-mine/src/account_validators.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,14 @@ impl<'info> Validate<'info> for ClaimRewards<'info> {
fn validate(&self) -> Result<()> {
self.stake.validate()?;

let staked_mint_key = self.stake.quarry.token_mint_key;

assert_keys_eq!(self.mint_wrapper, self.stake.rewarder.mint_wrapper);
assert_keys_eq!(self.minter.mint_wrapper, self.mint_wrapper);
assert_keys_eq!(self.minter.minter_authority, self.stake.rewarder);
assert_keys_eq!(self.rewards_token_mint, self.mint_wrapper.token_mint);
assert_keys_eq!(
self.rewards_token_mint,
self.stake.rewarder.rewards_token_mint
);

assert_keys_eq!(self.rewards_token_account.mint, self.rewards_token_mint);
assert_keys_eq!(self.rewards_token_account.owner, self.stake.mm);
Expand All @@ -107,7 +109,6 @@ impl<'info> Validate<'info> for ClaimRewards<'info> {
self.stake.rewarder.claim_fee_token_account
);
assert_keys_eq!(self.claim_fee_token_account.mint, self.rewards_token_mint);
assert_keys_eq!(self.stake_token_account.mint, staked_mint_key);

Ok(())
}
Expand Down
7 changes: 3 additions & 4 deletions programs/quarry-merge-mine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ pub struct ClaimRewards<'info> {
/// Mint wrapper program.
pub mint_wrapper_program: Program<'info, quarry_mint_wrapper::program::QuarryMintWrapper>,
/// [quarry_mint_wrapper::Minter].
#[account(mut)]
#[account(mut, has_one = mint_wrapper)]
pub minter: Box<Account<'info, quarry_mint_wrapper::Minter>>,

/// [Mint] of the [quarry_mine] rewards token.
Expand All @@ -320,9 +320,8 @@ pub struct ClaimRewards<'info> {
pub claim_fee_token_account: Box<Account<'info, TokenAccount>>,

/// Arbitrary account holding the [Mint] of the quarry staked token.
/// Passed to [quarry_mine] but unused.
#[account(mut)]
pub stake_token_account: Box<Account<'info, TokenAccount>>,
/// CHECK: Unused.
pub stake_token_account: UncheckedAccount<'info>,

/// User's stake.
pub stake: QuarryStake<'info>,
Expand Down