This commit is contained in:
Hardhat Chad
2024-02-14 18:30:51 +00:00
parent bbc1d835ea
commit 25c2b17ee9
21 changed files with 670 additions and 45 deletions

View File

@@ -17,10 +17,9 @@ pub fn process_claim<'a, 'info>(
data: &[u8],
) -> ProgramResult {
// Parse args
let args = bytemuck::try_from_bytes::<ClaimArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
let args = ClaimArgs::try_from_bytes(data)?;
// Validate accounts
// Load accounts
let [signer, beneficiary_info, mint_info, proof_info, treasury_info, treasury_tokens_info, token_program] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
@@ -38,7 +37,7 @@ pub fn process_claim<'a, 'info>(
// 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();
let mut proof = Proof::try_from_bytes_mut(&mut proof_data)?;
if proof.claimable_rewards.lt(&args.amount) {
return Err(OreError::InvalidClaimAmount.into());
}
@@ -48,7 +47,7 @@ pub fn process_claim<'a, 'info>(
// 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();
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
treasury.total_claimed_rewards = treasury.total_claimed_rewards.saturating_add(args.amount);
// Distribute tokens from treasury to beneficiary

View File

@@ -13,10 +13,9 @@ pub fn process_create_proof<'a, 'info>(
data: &[u8],
) -> ProgramResult {
// Parse args
let args = bytemuck::try_from_bytes::<CreateProofArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
let args = CreateProofArgs::try_from_bytes(data)?;
// Validate accounts
// Load accounts
let [signer, proof_info, system_program] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
@@ -34,7 +33,7 @@ pub fn process_create_proof<'a, 'info>(
signer,
)?;
let mut proof_data = proof_info.data.borrow_mut();
let mut proof = bytemuck::try_from_bytes_mut::<Proof>(&mut proof_data).unwrap();
let mut proof = Proof::try_from_bytes_mut(&mut proof_data)?;
proof.bump = args.bump as u64;
proof.authority = *signer.key;
proof.claimable_rewards = 0;

View File

@@ -22,10 +22,9 @@ pub fn process_initialize<'a, 'info>(
data: &[u8],
) -> ProgramResult {
// Parse args
let args = bytemuck::try_from_bytes::<InitializeArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
let args = InitializeArgs::try_from_bytes(data)?;
// Validate accounts
// Load 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);
};
@@ -96,7 +95,7 @@ pub fn process_initialize<'a, 'info>(
signer,
)?;
let mut treasury_data = treasury_info.data.borrow_mut();
let mut treasury = bytemuck::try_from_bytes_mut::<Treasury>(&mut treasury_data).unwrap();
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
treasury.bump = args.treasury_bump as u64;
treasury.admin = *signer.key;
treasury.epoch_start_at = 0;

View File

@@ -26,10 +26,9 @@ pub fn process_mine<'a, 'info>(
data: &[u8],
) -> ProgramResult {
// Parse args
let args =
bytemuck::try_from_bytes::<MineArgs>(data).or(Err(ProgramError::InvalidInstructionData))?;
let args = MineArgs::try_from_bytes(data)?;
// Validate accounts
// Load accounts
let [signer, bus_info, proof_info, treasury_info, slot_hashes_info] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
@@ -40,9 +39,9 @@ pub fn process_mine<'a, 'info>(
load_sysvar(slot_hashes_info, sysvar::slot_hashes::id())?;
// Validate epoch is active
let clock = Clock::get().unwrap();
let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
let treasury_data = treasury_info.data.borrow();
let treasury = bytemuck::try_from_bytes::<Treasury>(&treasury_data).unwrap();
let treasury = Treasury::try_from_bytes(&treasury_data)?;
let epoch_end_at = treasury.epoch_start_at.saturating_add(EPOCH_DURATION);
if clock.unix_timestamp.ge(&epoch_end_at) {
return Err(OreError::EpochExpired.into());
@@ -50,7 +49,7 @@ pub fn process_mine<'a, 'info>(
// Validate provided hash
let mut proof_data = proof_info.data.borrow_mut();
let mut proof = bytemuck::try_from_bytes_mut::<Proof>(&mut proof_data).unwrap();
let mut proof = Proof::try_from_bytes_mut(&mut proof_data)?;
validate_hash(
proof.hash.into(),
args.hash.into(),
@@ -61,7 +60,7 @@ pub fn process_mine<'a, 'info>(
// Update claimable rewards
let mut bus_data = bus_info.data.borrow_mut();
let mut bus = bytemuck::try_from_bytes_mut::<Bus>(&mut bus_data).unwrap();
let mut bus = Bus::try_from_bytes_mut(&mut bus_data)?;
if bus.available_rewards.lt(&treasury.reward_rate) {
return Err(OreError::InsufficientBusRewards.into());
}

View File

@@ -16,7 +16,7 @@ pub fn process_reset<'a, 'info>(
accounts: &'a [AccountInfo<'info>],
_data: &[u8],
) -> ProgramResult {
// Validate accounts
// Load 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);
};
@@ -44,9 +44,9 @@ pub fn process_reset<'a, 'info>(
];
// Validate epoch has ended
let clock = Clock::get().unwrap();
let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
let mut treasury_data = treasury_info.data.borrow_mut();
let mut treasury = bytemuck::try_from_bytes_mut::<Treasury>(&mut treasury_data).unwrap();
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
let epoch_end_at = treasury.epoch_start_at.saturating_add(EPOCH_DURATION);
if clock.unix_timestamp.lt(&epoch_end_at) {
return Err(OreError::EpochActive.into());
@@ -56,7 +56,7 @@ pub fn process_reset<'a, 'info>(
let mut total_available_rewards = 0u64;
for i in 0..BUS_COUNT {
let mut bus_data = busses[i].data.borrow_mut();
let mut bus = bytemuck::try_from_bytes_mut::<Bus>(&mut bus_data).unwrap();
let mut bus = Bus::try_from_bytes_mut(&mut bus_data)?;
total_available_rewards = total_available_rewards.saturating_add(bus.available_rewards);
bus.available_rewards = BUS_EPOCH_REWARDS;
}

View File

@@ -11,10 +11,9 @@ pub fn process_update_admin<'a, 'info>(
data: &[u8],
) -> ProgramResult {
// Parse args
let args = bytemuck::try_from_bytes::<UpdateAdminArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
let args = UpdateAdminArgs::try_from_bytes(data)?;
// Validate accounts
// Load accounts
let [signer, treasury_info] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
@@ -23,7 +22,7 @@ pub fn process_update_admin<'a, '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();
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
if !treasury.admin.eq(&signer.key) {
return Err(ProgramError::MissingRequiredSignature);
}

View File

@@ -11,10 +11,9 @@ pub fn process_update_difficulty<'a, 'info>(
data: &[u8],
) -> ProgramResult {
// Parse args
let args = bytemuck::try_from_bytes::<UpdateDifficultyArgs>(data)
.or(Err(ProgramError::InvalidInstructionData))?;
let args = UpdateDifficultyArgs::try_from_bytes(data)?;
// Validate accounts
// Load accounts
let [signer, treasury_info] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
@@ -23,7 +22,7 @@ pub fn process_update_difficulty<'a, '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();
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
if !treasury.admin.eq(&signer.key) {
return Err(ProgramError::MissingRequiredSignature);
}