d0zingcat/ore
1
0
Fork 0
mirror of https://github.com/d0zingcat/ore.git synced 2026-05-17 15:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ix builders

Browse Source
This commit is contained in:
Hardhat Chad
2024-04-28 17:20:14 +00:00
parent e65aa9c385
commit 96bc317c96
4 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/processor/claim.rs
View File

@@ -4,18 +4,13 @@ use solana_program::{
};
use crate::{
error::OreError,
instruction::ClaimArgs,
loaders::*,
state::{Proof, Treasury},
utils::AccountDeserialize,
MINT_ADDRESS, TREASURY,
error::OreError, instruction::ClaimArgs, loaders::*, state::Proof, utils::AccountDeserialize,
MINT_ADDRESS, TREASURY, TREASURY_BUMP,
};
/// Claim distributes owed token rewards from the treasury to the miner. Its responsibilies include:
/// 1. Transfer tokens from the treasury to the miner.
/// 2. Decrement the miner's claimable rewards counter by an appropriate amount.
/// 3. Update the program's lifetime stats.
/// 1. Decrement the miner's claimable rewards counter.
/// 2. Transfer tokens from the treasury to the miner.
///
/// Safety requirements:
/// - Claim is a permissionless instruction and can be called by any miner.
@@ -39,7 +34,7 @@ pub fn process_claim<'a, 'info>(
load_signer(signer)?;
load_token_account(beneficiary_info, None, &MINT_ADDRESS, true)?;
load_proof(proof_info, signer.key, true)?;
load_treasury(treasury_info, true)?;
load_treasury(treasury_info, false)?;
load_token_account(
treasury_tokens_info,
Some(treasury_info.key),
@@ -57,10 +52,6 @@ pub fn process_claim<'a, 'info>(
.ok_or(OreError::ClaimTooLarge)?;
// Distribute tokens from treasury to beneficiary
let mut treasury_data = treasury_info.data.borrow_mut();
let treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
let treasury_bump = treasury.bump;
drop(treasury_data);
solana_program::program::invoke_signed(
&spl_token::instruction::transfer(
&spl_token::id(),
@@ -76,7 +67,7 @@ pub fn process_claim<'a, 'info>(
beneficiary_info.clone(),
treasury_info.clone(),
],
&[&[TREASURY, &[treasury_bump as u8]]],
&[&[TREASURY, &[TREASURY_BUMP]]],
)?;
Ok(())

4
src/processor/stake.rs
View File

@@ -18,13 +18,13 @@ pub fn process_stake<'a, 'info>(
let amount = u64::from_le_bytes(args.amount);
// Load accounts
let [signer_info, sender_info, proof_info, treasury_tokens_info, token_program] = accounts
let [signer_info, proof_info, sender_info, treasury_tokens_info, token_program] = accounts
else {
return Err(ProgramError::NotEnoughAccountKeys);
};
load_signer(signer_info)?;
load_token_account(sender_info, Some(signer_info.key), &MINT_ADDRESS, true)?;
load_proof(proof_info, signer_info.key, true)?;
load_token_account(sender_info, Some(signer_info.key), &MINT_ADDRESS, true)?;
load_token_account(
treasury_tokens_info,
Some(&TREASURY_ADDRESS),