Skip to content

Remove mut constraints from the unused accounts #405

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 3 commits into
base: master
Choose a base branch
from
Open

Remove mut constraints from the unused accounts #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad6310f
Remove mut constraints from the unused accounts
larrinator1 Feb 18, 2022
0c01f67
use token program for the unused accounts
larrinator1 Feb 18, 2022
96fa834
pass in system program for the unused clock
larrinator1 Feb 18, 2022
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
4 changes: 2 additions & 2 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 @@ -52,8 +52,8 @@ impl<'info> QuarryStake<'info> {
quarry: self.quarry.to_account_info(),
token_program: self.token_program.to_account_info(),
rewarder: self.rewarder.to_account_info(),
unused_miner_vault: self.unused_account.to_account_info(),
unused_token_account: self.unused_account.to_account_info(),
unused_miner_vault: self.token_program.to_account_info(),
unused_token_account: self.token_program.to_account_info(),
}
}

Expand Down
5 changes: 0 additions & 5 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 @@ -349,11 +349,6 @@ pub struct QuarryStake<'info> {

/// [quarry_mine] program.
pub mine_program: Program<'info, quarry_mine::program::QuarryMine>,

/// Unused variable used as a filler for deprecated accounts. Handled by [quarry_mine].
/// One should pass in a randomly generated Keypair for this account.
#[account(mut)]
pub unused_account: UncheckedAccount<'info>,
}

/// Error Codes
Expand Down
2 changes: 0 additions & 2 deletions programs/quarry-mine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,11 +783,9 @@ pub struct UserClaim<'info> {
pub quarry: Account<'info, Quarry>,

/// Placeholder for the miner vault.
#[account(mut)]
pub unused_miner_vault: UncheckedAccount<'info>,

/// Placeholder for the user's staked token account.
#[account(mut)]
pub unused_token_account: UncheckedAccount<'info>,

/// Token program
Expand Down
2 changes: 1 addition & 1 deletion programs/quarry-operator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ pub mod quarry_operator {
auth: ctx.accounts.with_delegate.to_auth_accounts(),
token_mint: ctx.accounts.token_mint.to_account_info(),
payer: ctx.accounts.payer.to_account_info(),
unused_clock: ctx.accounts.unused_clock.to_account_info(),
unused_clock: ctx.accounts.system_program.to_account_info(),
system_program: ctx.accounts.system_program.to_account_info(),
},
signer_seeds,
Expand Down