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

consts

Browse Source
This commit is contained in:
Hardhat Chad
2024-04-30 18:17:06 +00:00
parent f7572aa2cf
commit 54bd0a025c
6 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/processor/initialize.rs
View File

@@ -17,9 +17,8 @@ use crate::{
utils::create_pda,
utils::AccountDeserialize,
utils::Discriminator,
BUS, BUS_COUNT, CONFIG, INITIAL_BASE_REWARD_RATE, INITIAL_MIN_DIFFICULTY, INITIAL_TOLERANCE,
METADATA, METADATA_NAME, METADATA_SYMBOL, METADATA_URI, MINT, MINT_ADDRESS, MINT_NOISE,
TOKEN_DECIMALS, TREASURY,
BUS, BUS_COUNT, CONFIG, INITIAL_BASE_REWARD_RATE, INITIAL_TOLERANCE, METADATA, MINT,
MINT_ADDRESS, MINT_NOISE, TOKEN_DECIMALS, TREASURY,
};
/// Initialize sets up the Ore program. Its responsibilities include:
@@ -135,7 +134,6 @@ pub fn process_initialize<'a, 'info>(
config.admin = *signer.key;
config.base_reward_rate = INITIAL_BASE_REWARD_RATE;
config.last_reset_at = 0;
config.min_difficulty = INITIAL_MIN_DIFFICULTY;
config.paused = 0;
config.tolerance_liveness = INITIAL_TOLERANCE;
config.tolerance_spam = INITIAL_TOLERANCE;

24
src/processor/mine.rs
View File

@@ -18,7 +18,7 @@ use crate::{
loaders::*,
state::{Bus, Config, Proof},
utils::AccountDeserialize,
EPOCH_DURATION,
MIN_DIFFICULTY, ONE_MINUTE, TWO_YEARS,
};
// TODO Look into tx introspection to require 1 hash per tx
@@ -72,7 +72,7 @@ pub fn process_mine<'a, 'info>(
// TODO Validate epoch is active
// let treasury_data = treasury_info.data.borrow();
// let treasury = Treasury::try_from_bytes(&treasury_data)?;
// let threshold = treasury.last_reset_at.saturating_add(EPOCH_DURATION);
// let threshold = treasury.last_reset_at.saturating_add(ONE_MINUTE);
// if clock.unix_timestamp.ge(&threshold) {
// return Err(OreError::NeedsReset.into());
// }
@@ -83,27 +83,21 @@ pub fn process_mine<'a, 'info>(
// Validate hash satisfies the minimnum difficulty
let difficulty = drillx::difficulty(hx);
sol_log(&format!("Diff {}", difficulty));
if difficulty.le(&config.min_difficulty) {
if difficulty.lt(&MIN_DIFFICULTY) {
return Err(OreError::HashTooEasy.into());
}
// Calculate base reward rate
let difficulty = difficulty.saturating_sub(config.min_difficulty);
let difficulty = difficulty.saturating_sub(MIN_DIFFICULTY);
let mut reward = config
.base_reward_rate
.saturating_mul(2u64.saturating_pow(difficulty));
sol_log(&format!("Base {}", reward));
// Apply staking multiplier
// Apply staking multiplier, only if last deposit was at least 1 block ago to prevent flash loan attacks
if clock.slot.gt(&proof.last_deposit_slot) {
// Only apply if last deposit was at least 1 block ago to prevent flash loan attacks.
// TODO Cleanup math with a const here (unnecessary cus)
// TODO Move const into config
let max_stake = reward
.saturating_mul(60) // min/hour
.saturating_mul(24) // hour/day
.saturating_mul(365) // day/year
.saturating_mul(2); // year
// TODO Move staking requirement into config? Admin adjustable?
let max_stake = reward.saturating_mul(TWO_YEARS);
let staking_reward = proof
.balance
.min(max_stake)
@@ -115,7 +109,7 @@ pub fn process_mine<'a, 'info>(
// Apply spam/liveness penalty
let t = clock.unix_timestamp;
let t_target = proof.last_hash_at.saturating_add(EPOCH_DURATION);
let t_target = proof.last_hash_at.saturating_add(ONE_MINUTE);
let t_spam = t_target.saturating_sub(config.tolerance_spam);
let t_liveness = t_target.saturating_add(config.tolerance_liveness);
if t.lt(&t_spam) {
@@ -127,7 +121,7 @@ pub fn process_mine<'a, 'info>(
.saturating_mul(t.saturating_sub(t_liveness) as u64)
.saturating_div(
t_target
.saturating_add(EPOCH_DURATION)
.saturating_add(ONE_MINUTE)
.saturating_sub(t_liveness) as u64,
),
);

2
src/processor/pause.rs
View File

@@ -28,7 +28,7 @@ pub fn process_pause<'a, 'info>(
}
// Update paused
config.paused = args.paused as u32;
config.paused = args.paused as u64;
Ok(())
}

6
src/processor/reset.rs
View File

@@ -11,8 +11,8 @@ use crate::{
},
state::{Bus, Config},
utils::AccountDeserialize,
BUS_COUNT, BUS_EPOCH_REWARDS, EPOCH_DURATION, MAX_EPOCH_REWARDS, MINT_ADDRESS,
SMOOTHING_FACTOR, TARGET_EPOCH_REWARDS, TREASURY, TREASURY_BUMP,
BUS_COUNT, BUS_EPOCH_REWARDS, MAX_EPOCH_REWARDS, MINT_ADDRESS, ONE_MINUTE, SMOOTHING_FACTOR,
TARGET_EPOCH_REWARDS, TREASURY, TREASURY_BUMP,
};
/// Reset sets up the Ore program for the next epoch. Its responsibilities include:
@@ -78,7 +78,7 @@ pub fn process_reset<'a, 'info>(
// Validate enough time has passed since last reset
let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
let threshold = config.last_reset_at.saturating_add(EPOCH_DURATION);
let threshold = config.last_reset_at.saturating_add(ONE_MINUTE);
if clock.unix_timestamp.lt(&threshold) {
return Ok(());
}