mirror of
https://github.com/d0zingcat/ore.git
synced 2026-05-14 23:16:48 +00:00
fix warnings
This commit is contained in:
@@ -22,7 +22,9 @@ pub fn process_claim<'a, 'info>(
|
||||
let amount = u64::from_le_bytes(args.amount);
|
||||
|
||||
// Load accounts
|
||||
let [signer, beneficiary_info, mint_info, proof_info, treasury_info, treasury_tokens_info, token_program] = accounts else {
|
||||
let [signer, beneficiary_info, mint_info, proof_info, treasury_info, treasury_tokens_info, token_program] =
|
||||
accounts
|
||||
else {
|
||||
return Err(ProgramError::NotEnoughAccountKeys);
|
||||
};
|
||||
load_signer(signer)?;
|
||||
@@ -39,7 +41,7 @@ pub fn process_claim<'a, 'info>(
|
||||
|
||||
// Validate claim amout
|
||||
let mut proof_data = proof_info.data.borrow_mut();
|
||||
let mut proof = Proof::try_from_bytes_mut(&mut proof_data)?;
|
||||
let proof = Proof::try_from_bytes_mut(&mut proof_data)?;
|
||||
if proof.claimable_rewards.lt(&amount) {
|
||||
return Err(OreError::InvalidClaimAmount.into());
|
||||
}
|
||||
@@ -49,7 +51,7 @@ pub fn process_claim<'a, 'info>(
|
||||
|
||||
// Update lifetime status
|
||||
let mut treasury_data = treasury_info.data.borrow_mut();
|
||||
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
let treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
treasury.total_claimed_rewards = treasury.total_claimed_rewards.saturating_add(amount);
|
||||
|
||||
// Distribute tokens from treasury to beneficiary
|
||||
|
||||
@@ -30,7 +30,9 @@ pub fn process_initialize<'a, 'info>(
|
||||
let args = InitializeArgs::try_from_bytes(data)?;
|
||||
|
||||
// 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 {
|
||||
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)?;
|
||||
@@ -87,7 +89,7 @@ pub fn process_initialize<'a, 'info>(
|
||||
)?;
|
||||
let mut bus_data = bus_infos[i].try_borrow_mut_data()?;
|
||||
bus_data[0] = Bus::discriminator() as u8;
|
||||
let mut bus = Bus::try_from_bytes_mut(&mut bus_data)?;
|
||||
let bus = Bus::try_from_bytes_mut(&mut bus_data)?;
|
||||
bus.id = i as u64;
|
||||
bus.rewards = 0;
|
||||
}
|
||||
@@ -103,7 +105,7 @@ pub fn process_initialize<'a, 'info>(
|
||||
)?;
|
||||
let mut treasury_data = treasury_info.data.borrow_mut();
|
||||
treasury_data[0] = Treasury::discriminator() as u8;
|
||||
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
let 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;
|
||||
|
||||
@@ -51,7 +51,7 @@ pub fn process_mine<'a, 'info>(
|
||||
|
||||
// Validate provided hash
|
||||
let mut proof_data = proof_info.data.borrow_mut();
|
||||
let mut proof = Proof::try_from_bytes_mut(&mut proof_data)?;
|
||||
let proof = Proof::try_from_bytes_mut(&mut proof_data)?;
|
||||
validate_hash(
|
||||
proof.hash.into(),
|
||||
args.hash.into(),
|
||||
@@ -62,7 +62,7 @@ pub fn process_mine<'a, 'info>(
|
||||
|
||||
// Update claimable rewards
|
||||
let mut bus_data = bus_info.data.borrow_mut();
|
||||
let mut bus = Bus::try_from_bytes_mut(&mut bus_data)?;
|
||||
let bus = Bus::try_from_bytes_mut(&mut bus_data)?;
|
||||
if bus.rewards.lt(&treasury.reward_rate) {
|
||||
return Err(OreError::InsufficientBusRewards.into());
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ pub fn process_register<'a, 'info>(
|
||||
)?;
|
||||
let mut proof_data = proof_info.data.borrow_mut();
|
||||
proof_data[0] = Proof::discriminator() as u8;
|
||||
let mut proof = Proof::try_from_bytes_mut(&mut proof_data)?;
|
||||
let proof = Proof::try_from_bytes_mut(&mut proof_data)?;
|
||||
proof.authority = *signer.key;
|
||||
proof.claimable_rewards = 0;
|
||||
proof.hash = hashv(&[signer.key.as_ref()]).into();
|
||||
|
||||
@@ -18,7 +18,9 @@ pub fn process_reset<'a, 'info>(
|
||||
_data: &[u8],
|
||||
) -> ProgramResult {
|
||||
// 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 {
|
||||
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);
|
||||
};
|
||||
load_signer(signer)?;
|
||||
@@ -47,7 +49,7 @@ pub fn process_reset<'a, 'info>(
|
||||
// Validate epoch has ended
|
||||
let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
|
||||
let mut treasury_data = treasury_info.data.borrow_mut();
|
||||
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
let 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());
|
||||
@@ -57,7 +59,7 @@ pub fn process_reset<'a, 'info>(
|
||||
let mut total_bus_rewards = 0u64;
|
||||
for i in 0..BUS_COUNT {
|
||||
let mut bus_data = busses[i].data.borrow_mut();
|
||||
let mut bus = Bus::try_from_bytes_mut(&mut bus_data)?;
|
||||
let bus = Bus::try_from_bytes_mut(&mut bus_data)?;
|
||||
total_bus_rewards = total_bus_rewards.saturating_add(bus.rewards);
|
||||
bus.rewards = BUS_EPOCH_REWARDS;
|
||||
}
|
||||
|
||||
@@ -22,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 = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
let treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
if treasury.admin.ne(&signer.key) {
|
||||
return Err(ProgramError::MissingRequiredSignature);
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ pub fn process_update_difficulty<'a, 'info>(
|
||||
|
||||
// Validate admin signer
|
||||
let mut treasury_data = treasury_info.data.borrow_mut();
|
||||
let mut treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
let treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
if treasury.admin.ne(&signer.key) {
|
||||
return Err(ProgramError::MissingRequiredSignature);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user