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

Deprecate legacy staking (#99)

Browse Source 
* add post balance to MineEvent log

* log input hash

* deprecate legacy staking

* update error message

* remove stake from readme

* err msg

* err msg

* update logs and comments

* consolidate logs

* last hash at

* bump version

* deprecate legacy staking

* update error message

* remove stake from readme

* err msg

* err msg

* bump version

---------

Co-authored-by: tonton-sol <19677766+tonton-sol@users.noreply.github.com>
Co-authored-by: alex <aabinaei@gmail.com>
This commit is contained in:
Hardhat Chad
2024-10-24 13:41:03 -05:00
committed by GitHub
parent 22b974bf7b
commit d59b3a2f4d
10 changed files with 12 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
program/src/lib.rs
View File

@@ -34,6 +34,7 @@ pub fn process_instruction(
OreInstruction::Mine => process_mine(accounts, data)?,
OreInstruction::Open => process_open(accounts, data)?,
OreInstruction::Reset => process_reset(accounts, data)?,
#[allow(deprecated)]
OreInstruction::Stake => process_stake(accounts, data)?,
OreInstruction::Update => process_update(accounts, data)?,
OreInstruction::Upgrade => process_upgrade(accounts, data)?,

22
program/src/mine.rs
View File

@@ -94,28 +94,6 @@ pub fn process_mine(accounts: &[AccountInfo], data: &[u8]) -> ProgramResult {
.checked_mul(2u64.checked_pow(normalized_difficulty).unwrap())
.unwrap();
// Apply staking multiplier.
//
// If user has greater than or equal to the max stake on the network, they receive 2x multiplier.
// Any stake less than this will receives between 1x and 2x multipler. The multipler is only active
// if the miner's last stake deposit was more than one minute ago to protect against flash loan attacks.
if proof.balance.gt(&0) && proof.last_stake_at.saturating_add(ONE_MINUTE).lt(&t) {
// Calculate staking reward.
if config.top_balance.gt(&0) {
let staking_reward = (reward as u128)
.checked_mul(proof.balance.min(config.top_balance) as u128)
.unwrap()
.checked_div(config.top_balance as u128)
.unwrap() as u64;
reward = reward.checked_add(staking_reward).unwrap();
}
// Update bus stake tracker.
if proof.balance.gt(&bus.top_balance) {
bus.top_balance = proof.balance;
}
}
// Apply boosts.
//
// Boosts are staking incentives that can multiply a miner's rewards. Up to 3 boosts can be applied

42
program/src/stake.rs
View File

@@ -1,44 +1,6 @@
use ore_api::prelude::*;
use steel::*;
/// Stake deposits ORE into a proof account to earn multiplier.
pub fn process_stake(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
// Parse args.
let args = Stake::try_from_bytes(data)?;
let amount = u64::from_le_bytes(args.amount);
// Load accounts.
let [signer_info, proof_info, sender_info, treasury_tokens_info, token_program] = accounts
else {
return Err(ProgramError::NotEnoughAccountKeys);
};
signer_info.is_signer()?;
let proof = proof_info
.to_account_mut::<Proof>(&ore_api::ID)?
.check_mut(|p| p.authority == *signer_info.key)?;
sender_info
.is_writable()?
.to_token_account()?
.check(|t| t.owner == *signer_info.key)?
.check(|t| t.mint == MINT_ADDRESS)?;
treasury_tokens_info.is_writable()?.is_treasury_tokens()?;
token_program.is_program(&spl_token::ID)?;
// Update the proof balance.
proof.balance = proof.balance.checked_add(amount).unwrap();
// Update deposit timestamp.
let clock = Clock::get()?;
proof.last_stake_at = clock.unix_timestamp;
// Transfer tokens from signer to treasury.
transfer(
signer_info,
sender_info,
treasury_tokens_info,
token_program,
amount,
)?;
Ok(())
pub fn process_stake(_accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResult {
panic!("This instruction has been deprecated. Please stake with the boost program instead.");
}

2
program/src/upgrade.rs
View File

@@ -4,7 +4,7 @@ use steel::*;
/// Upgrade allows a user to migrate a v1 token to a v2 token at a 1:1 exchange rate.
pub fn process_upgrade(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
// Parse args
let args = Stake::try_from_bytes(data)?;
let args = Upgrade::try_from_bytes(data)?;
let amount = u64::from_le_bytes(args.amount);
// Load accounts