mirror of
https://github.com/d0zingcat/ore.git
synced 2026-05-15 23:16:46 +00:00
mine v2
This commit is contained in:
@@ -1,16 +1,6 @@
|
||||
use solana_program::{
|
||||
account_info::AccountInfo, clock::Clock, entrypoint::ProgramResult,
|
||||
program_error::ProgramError, pubkey::Pubkey, sysvar::Sysvar,
|
||||
};
|
||||
use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
|
||||
|
||||
use crate::{
|
||||
error::OreError,
|
||||
loaders::*,
|
||||
state::{Bus, Treasury},
|
||||
utils::AccountDeserialize,
|
||||
BUS_COUNT, BUS_EPOCH_REWARDS, EPOCH_DURATION, MAX_EPOCH_REWARDS, SMOOTHING_FACTOR, START_AT,
|
||||
TARGET_EPOCH_REWARDS, TREASURY,
|
||||
};
|
||||
use crate::{BUS_EPOCH_REWARDS, SMOOTHING_FACTOR, TARGET_EPOCH_REWARDS};
|
||||
|
||||
/// Reset sets up the Ore program for the next epoch. Its responsibilities include:
|
||||
/// 1. Reset bus account rewards counters.
|
||||
@@ -33,85 +23,85 @@ pub fn process_reset<'a, 'info>(
|
||||
accounts: &'a [AccountInfo<'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 {
|
||||
return Err(ProgramError::NotEnoughAccountKeys);
|
||||
};
|
||||
load_signer(signer)?;
|
||||
load_bus(bus_0_info, 0, true)?;
|
||||
load_bus(bus_1_info, 1, true)?;
|
||||
load_bus(bus_2_info, 2, true)?;
|
||||
load_bus(bus_3_info, 3, true)?;
|
||||
load_bus(bus_4_info, 4, true)?;
|
||||
load_bus(bus_5_info, 5, true)?;
|
||||
load_bus(bus_6_info, 6, true)?;
|
||||
load_bus(bus_7_info, 7, true)?;
|
||||
load_mint(mint_info, true)?;
|
||||
load_treasury(treasury_info, true)?;
|
||||
load_token_account(
|
||||
treasury_tokens_info,
|
||||
Some(treasury_info.key),
|
||||
mint_info.key,
|
||||
true,
|
||||
)?;
|
||||
load_program(token_program, spl_token::id())?;
|
||||
let busses: [&AccountInfo; BUS_COUNT] = [
|
||||
bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info,
|
||||
bus_7_info,
|
||||
];
|
||||
// // 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);
|
||||
// };
|
||||
// load_signer(signer)?;
|
||||
// load_bus(bus_0_info, 0, true)?;
|
||||
// load_bus(bus_1_info, 1, true)?;
|
||||
// load_bus(bus_2_info, 2, true)?;
|
||||
// load_bus(bus_3_info, 3, true)?;
|
||||
// load_bus(bus_4_info, 4, true)?;
|
||||
// load_bus(bus_5_info, 5, true)?;
|
||||
// load_bus(bus_6_info, 6, true)?;
|
||||
// load_bus(bus_7_info, 7, true)?;
|
||||
// load_mint(mint_info, true)?;
|
||||
// load_treasury(treasury_info, true)?;
|
||||
// load_token_account(
|
||||
// treasury_tokens_info,
|
||||
// Some(treasury_info.key),
|
||||
// mint_info.key,
|
||||
// true,
|
||||
// )?;
|
||||
// load_program(token_program, spl_token::id())?;
|
||||
// let busses: [&AccountInfo; BUS_COUNT] = [
|
||||
// bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info,
|
||||
// bus_7_info,
|
||||
// ];
|
||||
|
||||
// Validate mining has starting
|
||||
let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
|
||||
if clock.unix_timestamp.lt(&START_AT) {
|
||||
return Err(OreError::NotStarted.into());
|
||||
}
|
||||
// // Validate mining has starting
|
||||
// let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
|
||||
// if clock.unix_timestamp.lt(&START_AT) {
|
||||
// return Err(OreError::NotStarted.into());
|
||||
// }
|
||||
|
||||
// Validate at least 60 seconds have passed since last reset
|
||||
let mut treasury_data = treasury_info.data.borrow_mut();
|
||||
let treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
let threshold = treasury.last_reset_at.saturating_add(EPOCH_DURATION);
|
||||
if clock.unix_timestamp.lt(&threshold) {
|
||||
return Err(OreError::ResetTooEarly.into());
|
||||
}
|
||||
// // Validate at least 60 seconds have passed since last reset
|
||||
// let mut treasury_data = treasury_info.data.borrow_mut();
|
||||
// let treasury = Treasury::try_from_bytes_mut(&mut treasury_data)?;
|
||||
// let threshold = treasury.last_reset_at.saturating_add(EPOCH_DURATION);
|
||||
// if clock.unix_timestamp.lt(&threshold) {
|
||||
// return Err(OreError::ResetTooEarly.into());
|
||||
// }
|
||||
|
||||
// Record current timestamp
|
||||
treasury.last_reset_at = clock.unix_timestamp;
|
||||
// // Record current timestamp
|
||||
// treasury.last_reset_at = clock.unix_timestamp;
|
||||
|
||||
// Reset bus accounts and calculate actual rewards mined since last reset
|
||||
let mut total_remaining_rewards = 0u64;
|
||||
for i in 0..BUS_COUNT {
|
||||
let mut bus_data = busses[i].data.borrow_mut();
|
||||
let bus = Bus::try_from_bytes_mut(&mut bus_data)?;
|
||||
total_remaining_rewards = total_remaining_rewards.saturating_add(bus.rewards);
|
||||
bus.rewards = BUS_EPOCH_REWARDS;
|
||||
}
|
||||
let total_epoch_rewards = MAX_EPOCH_REWARDS.saturating_sub(total_remaining_rewards);
|
||||
// // Reset bus accounts and calculate actual rewards mined since last reset
|
||||
// let mut total_remaining_rewards = 0u64;
|
||||
// for i in 0..BUS_COUNT {
|
||||
// let mut bus_data = busses[i].data.borrow_mut();
|
||||
// let bus = Bus::try_from_bytes_mut(&mut bus_data)?;
|
||||
// total_remaining_rewards = total_remaining_rewards.saturating_add(bus.rewards);
|
||||
// bus.rewards = BUS_EPOCH_REWARDS;
|
||||
// }
|
||||
// let total_epoch_rewards = MAX_EPOCH_REWARDS.saturating_sub(total_remaining_rewards);
|
||||
|
||||
// Update reward rate for next epoch
|
||||
treasury.reward_rate = calculate_new_reward_rate(treasury.reward_rate, total_epoch_rewards);
|
||||
// // Update reward rate for next epoch
|
||||
// treasury.reward_rate = calculate_new_reward_rate(treasury.reward_rate, total_epoch_rewards);
|
||||
|
||||
// Fund treasury token account
|
||||
let treasury_bump = treasury.bump as u8;
|
||||
drop(treasury_data);
|
||||
solana_program::program::invoke_signed(
|
||||
&spl_token::instruction::mint_to(
|
||||
&spl_token::id(),
|
||||
mint_info.key,
|
||||
treasury_tokens_info.key,
|
||||
treasury_info.key,
|
||||
&[treasury_info.key],
|
||||
total_epoch_rewards,
|
||||
)?,
|
||||
&[
|
||||
token_program.clone(),
|
||||
mint_info.clone(),
|
||||
treasury_tokens_info.clone(),
|
||||
treasury_info.clone(),
|
||||
],
|
||||
&[&[TREASURY, &[treasury_bump]]],
|
||||
)?;
|
||||
// // Fund treasury token account
|
||||
// let treasury_bump = treasury.bump as u8;
|
||||
// drop(treasury_data);
|
||||
// solana_program::program::invoke_signed(
|
||||
// &spl_token::instruction::mint_to(
|
||||
// &spl_token::id(),
|
||||
// mint_info.key,
|
||||
// treasury_tokens_info.key,
|
||||
// treasury_info.key,
|
||||
// &[treasury_info.key],
|
||||
// total_epoch_rewards,
|
||||
// )?,
|
||||
// &[
|
||||
// token_program.clone(),
|
||||
// mint_info.clone(),
|
||||
// treasury_tokens_info.clone(),
|
||||
// treasury_info.clone(),
|
||||
// ],
|
||||
// &[&[TREASURY, &[treasury_bump]]],
|
||||
// )?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user