admin functions

This commit is contained in:
Hardhat Chad
2024-02-14 07:22:01 +00:00
parent 418738127c
commit f917e49b3f
11 changed files with 287 additions and 217 deletions

View File

@@ -1,10 +1,68 @@
use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
use solana_program::{
account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
pubkey::Pubkey,
};
use crate::{
instruction::ClaimArgs,
loaders::*,
state::{Proof, Treasury},
TREASURY,
};
pub fn process_claim<'a, 'info>(
_program_id: &Pubkey,
accounts: &'a [AccountInfo<'info>],
data: &[u8],
) -> ProgramResult {
// TODO
// Parse args
let args = bytemuck::try_from_bytes::<ClaimArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
// Validate accounts
let [signer, beneficiary_info, mint_info, proof_info, treasury_info, treasury_tokens_info, token_program] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
load_signer(signer)?;
load_token_account(beneficiary_info, None, mint_info.key)?;
load_mint(mint_info)?;
load_treasury(treasury_info)?;
load_token_account(treasury_tokens_info, Some(treasury_info.key), mint_info.key)?;
load_account(token_program, spl_token::id())?;
// Validate claim amout
let mut proof_data = proof_info.data.borrow_mut();
let mut proof = bytemuck::try_from_bytes_mut::<Proof>(&mut proof_data).unwrap();
if proof.claimable_rewards.lt(&args.amount) {
return Err(ProgramError::Custom(1));
}
// Update claimable amount
proof.claimable_rewards = proof.claimable_rewards.saturating_sub(args.amount);
// Update lifetime status
let mut treasury_data = treasury_info.data.borrow_mut();
let mut treasury = bytemuck::try_from_bytes_mut::<Treasury>(&mut treasury_data).unwrap();
treasury.total_claimed_rewards = treasury.total_claimed_rewards.saturating_add(args.amount);
// Distribute tokens from treasury to beneficiary
solana_program::program::invoke_signed(
&spl_token::instruction::transfer(
&spl_token::id(),
treasury_tokens_info.key,
beneficiary_info.key,
treasury_info.key,
&[treasury_info.key],
args.amount,
)?,
&[
token_program.clone(),
treasury_tokens_info.clone(),
beneficiary_info.clone(),
treasury_info.clone(),
],
&[&[TREASURY, &[treasury.bump as u8]]],
)?;
Ok(())
}

View File

@@ -15,67 +15,28 @@ pub fn process_epoch<'a, 'info>(
accounts: &'a [AccountInfo<'info>],
_data: &[u8],
) -> ProgramResult {
// Validate accounts
let [signer, bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info, bus_7_info, mint_info, treasury_info, treasury_tokens_info, token_program] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
let _ = load_signer(signer)?;
let _ = load_bus(bus_0_info)?;
let _ = load_bus(bus_1_info)?;
let _ = load_bus(bus_2_info)?;
let _ = load_bus(bus_3_info)?;
let _ = load_bus(bus_4_info)?;
let _ = load_bus(bus_5_info)?;
let _ = load_bus(bus_6_info)?;
let _ = load_bus(bus_7_info)?;
let _ = load_mint(mint_info)?;
let _ = load_treasury(treasury_info)?;
let _ = load_token_account(treasury_tokens_info, treasury_info.key, mint_info.key)?;
let _ = load_account(token_program, spl_token::id())?;
load_signer(signer)?;
load_bus(bus_0_info)?;
load_bus(bus_1_info)?;
load_bus(bus_2_info)?;
load_bus(bus_3_info)?;
load_bus(bus_4_info)?;
load_bus(bus_5_info)?;
load_bus(bus_6_info)?;
load_bus(bus_7_info)?;
load_mint(mint_info)?;
load_treasury(treasury_info)?;
load_token_account(treasury_tokens_info, Some(treasury_info.key), mint_info.key)?;
load_account(token_program, spl_token::id())?;
let busses: [&AccountInfo; 8] = [
bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info,
bus_7_info,
];
// let _ = load_signer(signer)?;
// let _ = load_bus(bus_info)?;
// let _ = load_proof(proof_info, signer.key)?;
// let _ = load_treasury(treasury_info)?;
// let _ = load_account(slot_hashes_info, sysvar::slot_hashes::id())?;
// let accounts_iter = &mut accounts.iter();
// Account 1: Signer
// let _signer = load_signer(next_account_info(accounts_iter)?)?;
// Accounts 2-9: Busses
// let busses = vec![
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// ];
// Account 10: Mint
// let mint = load_mint(next_account_info(accounts_iter)?)?;
// Account 11: Treasury
// let treasury_info = load_treasury(next_account_info(accounts_iter)?)?;
// Account 12: Treasury tokens
// let treasury_tokens = load_token_account(
// next_account_info(accounts_iter)?,
// treasury_info.key,
// mint.key,
// )?;
// Account 13: Token program
// let token_program = load_account(next_account_info(accounts_iter)?, spl_token::id())?;
// Validate epoch has ended
let clock = Clock::get().unwrap();
let mut treasury_data = treasury_info.data.borrow_mut();

View File

@@ -3,11 +3,8 @@ use std::mem::size_of;
use solana_program::program_pack::Pack;
use solana_program::{self, sysvar};
use solana_program::{
account_info::{next_account_info, AccountInfo},
entrypoint::ProgramResult,
program_error::ProgramError,
pubkey::Pubkey,
system_program,
account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
pubkey::Pubkey, system_program,
};
use spl_token::state::Mint;
@@ -24,87 +21,43 @@ pub fn process_initialize<'a, 'info>(
accounts: &'a [AccountInfo<'info>],
data: &[u8],
) -> ProgramResult {
let accounts_iter = &mut accounts.iter();
// Parse args
let args = bytemuck::try_from_bytes::<InitializeArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
// Account 1: Signer
let signer = load_signer(next_account_info(accounts_iter)?)?;
// Accounts 2-9: Busses
let busses = vec![
load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[BUS, &[0], &[args.bus_0_bump]],
)?,
load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[BUS, &[1], &[args.bus_1_bump]],
)?,
load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[BUS, &[2], &[args.bus_2_bump]],
)?,
load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[BUS, &[3], &[args.bus_3_bump]],
)?,
load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[BUS, &[4], &[args.bus_4_bump]],
)?,
load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[BUS, &[5], &[args.bus_5_bump]],
)?,
load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[BUS, &[6], &[args.bus_6_bump]],
)?,
load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[BUS, &[7], &[args.bus_7_bump]],
)?,
];
// Account 10: Mint
let mint = load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[MINT, &[args.mint_bump]],
)?;
if !mint.key.eq(&MINT_ADDRESS) {
// Validate accounts
let [signer, bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info, bus_7_info, mint_info, treasury_info, treasury_tokens_info, system_program, token_program, associated_token_program, rent_sysvar] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
load_signer(signer)?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]])?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]])?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]])?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]])?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]])?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]])?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]])?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]])?;
load_uninitialized_pda(mint_info, &[MINT, &[args.mint_bump]])?;
if !mint_info.key.eq(&MINT_ADDRESS) {
return Err(ProgramError::InvalidAccountData);
}
// Account 11: Treasury
let treasury_info = load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[TREASURY, &[args.treasury_bump]],
)?;
load_uninitialized_pda(treasury_info, &[TREASURY, &[args.treasury_bump]])?;
if !treasury_info.key.eq(&TREASURY_ADDRESS) {
return Err(ProgramError::InvalidSeeds);
}
// Account 12: Treasury tokens
let treasury_tokens = load_uninitialized_account(next_account_info(accounts_iter)?)?;
// Account 13: System program
let system_program = load_account(next_account_info(accounts_iter)?, system_program::id())?;
// Account 14: Token program
let token_program = load_account(next_account_info(accounts_iter)?, spl_token::id())?;
// Account 15: Associated token program
let associated_token_program = load_account(
next_account_info(accounts_iter)?,
spl_associated_token_account::id(),
)?;
// Account 16: Rent sysvar
let rent_sysvar = load_account(next_account_info(accounts_iter)?, sysvar::rent::id())?;
load_uninitialized_account(treasury_tokens_info)?;
load_account(system_program, system_program::id())?;
load_account(token_program, spl_token::id())?;
load_account(associated_token_program, spl_associated_token_account::id())?;
load_account(rent_sysvar, sysvar::rent::id())?;
// Initialize bus accounts
let bus_bumps = vec![
let bus_infos = [
bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info,
bus_7_info,
];
let bus_bumps = [
args.bus_0_bump,
args.bus_1_bump,
args.bus_2_bump,
@@ -116,14 +69,14 @@ pub fn process_initialize<'a, 'info>(
];
for i in 0..BUS_COUNT {
create_pda(
busses[i],
bus_infos[i],
&crate::id(),
size_of::<Bus>(),
&[BUS, &[i as u8], &[bus_bumps[i]]],
system_program,
signer,
)?;
busses[i].try_borrow_mut_data()?.copy_from_slice(
bus_infos[i].try_borrow_mut_data()?.copy_from_slice(
Bus {
bump: bus_bumps[i] as u32,
id: i as u32,
@@ -154,7 +107,7 @@ pub fn process_initialize<'a, 'info>(
// Initialize mint
create_pda(
mint,
mint_info,
&spl_token::id(),
Mint::LEN,
&[MINT, &[args.mint_bump]],
@@ -164,14 +117,14 @@ pub fn process_initialize<'a, 'info>(
solana_program::program::invoke_signed(
&spl_token::instruction::initialize_mint(
&spl_token::id(),
mint.key,
mint_info.key,
treasury_info.key,
None,
TOKEN_DECIMALS,
)?,
&[
token_program.clone(),
mint.clone(),
mint_info.clone(),
treasury_info.clone(),
rent_sysvar.clone(),
],
@@ -183,15 +136,15 @@ pub fn process_initialize<'a, 'info>(
&spl_associated_token_account::instruction::create_associated_token_account(
signer.key,
treasury_info.key,
mint.key,
mint_info.key,
&spl_token::id(),
),
&[
associated_token_program.clone(),
signer.clone(),
treasury_tokens.clone(),
treasury_tokens_info.clone(),
treasury_info.clone(),
mint.clone(),
mint_info.clone(),
system_program.clone(),
token_program.clone(),
],

View File

@@ -1,7 +1,7 @@
use std::mem::size_of;
use solana_program::{
account_info::{next_account_info, AccountInfo},
account_info::AccountInfo,
clock::Clock,
entrypoint::ProgramResult,
keccak::{hashv, Hash as KeccakHash},
@@ -27,15 +27,15 @@ pub fn process_mine<'a, 'info>(
let args =
bytemuck::try_from_bytes::<MineArgs>(data).or(Err(ProgramError::InvalidInstructionData))?;
// Parse accounts
// Validate accounts
let [signer, bus_info, proof_info, treasury_info, slot_hashes_info] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
let _ = load_signer(signer)?;
let _ = load_bus(bus_info)?;
let _ = load_proof(proof_info, signer.key)?;
let _ = load_treasury(treasury_info)?;
let _ = load_account(slot_hashes_info, sysvar::slot_hashes::id())?;
load_signer(signer)?;
load_bus(bus_info)?;
load_proof(proof_info, signer.key)?;
load_treasury(treasury_info)?;
load_account(slot_hashes_info, sysvar::slot_hashes::id())?;
// Validate epoch is active
let clock = Clock::get().unwrap();

View File

@@ -3,9 +3,13 @@ mod epoch;
mod initialize;
mod mine;
mod proof;
mod update_admin;
mod update_difficulty;
pub use claim::*;
pub use epoch::*;
pub use initialize::*;
pub use mine::*;
pub use proof::*;
pub use update_admin::*;
pub use update_difficulty::*;

View File

@@ -1,12 +1,8 @@
use std::mem::size_of;
use solana_program::{
account_info::{next_account_info, AccountInfo},
entrypoint::ProgramResult,
keccak::hashv,
program_error::ProgramError,
pubkey::Pubkey,
system_program,
account_info::AccountInfo, entrypoint::ProgramResult, keccak::hashv,
program_error::ProgramError, pubkey::Pubkey, system_program,
};
use crate::{instruction::ProofArgs, loaders::*, state::Proof, utils::create_pda, PROOF};
@@ -16,21 +12,17 @@ pub fn process_proof<'a, 'info>(
accounts: &'a [AccountInfo<'info>],
data: &[u8],
) -> ProgramResult {
let accounts_iter = &mut accounts.iter();
// Parse args
let args = bytemuck::try_from_bytes::<ProofArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
// Account 1: Signer
let signer = load_signer(next_account_info(accounts_iter)?)?;
// Account 2: Proof
let proof_info = load_uninitialized_pda(
next_account_info(accounts_iter)?,
&[PROOF, signer.key.as_ref(), &[args.bump]],
)?;
// Account 3: System program
let system_program = load_account(next_account_info(accounts_iter)?, system_program::id())?;
// Validate accounts
let [signer, proof_info, system_program] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
load_signer(signer)?;
load_uninitialized_pda(proof_info, &[PROOF, signer.key.as_ref(), &[args.bump]])?;
load_account(system_program, system_program::id())?;
// Initialize proof
create_pda(

View File

@@ -0,0 +1,35 @@
use solana_program::{
account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
pubkey::Pubkey,
};
use crate::{instruction::UpdateAdminArgs, loaders::*, state::Treasury};
pub fn process_update_admin<'a, 'info>(
_program_id: &Pubkey,
accounts: &'a [AccountInfo<'info>],
data: &[u8],
) -> ProgramResult {
// Parse args
let args = bytemuck::try_from_bytes::<UpdateAdminArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
// Validate accounts
let [signer, treasury_info] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
load_signer(signer)?;
load_treasury(treasury_info)?;
// Validate admin signer
let mut treasury_data = treasury_info.data.borrow_mut();
let mut treasury = bytemuck::try_from_bytes_mut::<Treasury>(&mut treasury_data).unwrap();
if !treasury.admin.eq(&signer.key) {
return Err(ProgramError::MissingRequiredSignature);
}
// Update admin
treasury.admin = args.new_admin;
Ok(())
}

View File

@@ -0,0 +1,35 @@
use solana_program::{
account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
pubkey::Pubkey,
};
use crate::{instruction::UpdateDifficultyArgs, loaders::*, state::Treasury};
pub fn process_update_difficulty<'a, 'info>(
_program_id: &Pubkey,
accounts: &'a [AccountInfo<'info>],
data: &[u8],
) -> ProgramResult {
// Parse args
let args = bytemuck::try_from_bytes::<UpdateDifficultyArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
// Validate accounts
let [signer, treasury_info] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
load_signer(signer)?;
load_treasury(treasury_info)?;
// Validate admin signer
let mut treasury_data = treasury_info.data.borrow_mut();
let mut treasury = bytemuck::try_from_bytes_mut::<Treasury>(&mut treasury_data).unwrap();
if !treasury.admin.eq(&signer.key) {
return Err(ProgramError::MissingRequiredSignature);
}
// Update admin
treasury.difficulty = args.new_difficulty;
Ok(())
}