This commit is contained in:
Hardhat Chad
2025-09-17 14:15:13 -07:00
parent 959fd70c44
commit 69d0383cf6
17 changed files with 350 additions and 168 deletions

View File

@@ -2,25 +2,25 @@ use ore_api::prelude::*;
use steel::*;
/// Claims a block reward.
pub fn process_claim(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
pub fn process_claim_ore(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
// Parse data.
let args = Claim::try_from_bytes(data)?;
let args = ClaimORE::try_from_bytes(data)?;
let amount = u64::from_le_bytes(args.amount);
// Load accounts.
let [signer_info, board_info, miner_info, mint_info, recipient_info, vault_info, system_program, token_program, associated_token_program] =
let [signer_info, miner_info, mint_info, recipient_info, treasury_info, treasury_tokens_info, system_program, token_program, associated_token_program] =
accounts
else {
return Err(ProgramError::NotEnoughAccountKeys);
};
signer_info.is_signer()?;
board_info.as_account::<Board>(&ore_api::ID)?;
let miner = miner_info
.as_account_mut::<Miner>(&ore_api::ID)?
.assert_mut(|m| m.authority == *signer_info.key)?;
mint_info.has_address(&MINT_ADDRESS)?.as_mint()?;
recipient_info.as_associated_token_account(&signer_info.key, &mint_info.key)?;
vault_info.as_associated_token_account(&board_info.key, &mint_info.key)?;
treasury_info.as_account_mut::<Treasury>(&ore_api::ID)?;
treasury_tokens_info.as_associated_token_account(&treasury_info.key, &mint_info.key)?;
system_program.is_program(&system_program::ID)?;
token_program.is_program(&spl_token::ID)?;
associated_token_program.is_program(&spl_associated_token_account::ID)?;
@@ -41,19 +41,19 @@ pub fn process_claim(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
}
// Load amount.
let amount = miner.rewards.min(amount);
let amount = miner.rewards_ore.min(amount);
// Update miner.
miner.rewards -= amount;
miner.rewards_ore -= amount;
// Transfer reward to recipient.
transfer_signed(
board_info,
vault_info,
treasury_info,
treasury_tokens_info,
recipient_info,
token_program,
amount,
&[BOARD],
&[TREASURY],
)?;
Ok(())

30
program/src/claim_sol.rs Normal file
View File

@@ -0,0 +1,30 @@
use ore_api::prelude::*;
use steel::*;
/// Claims a block reward.
pub fn process_claim_sol(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
// Parse data.
let args = ClaimSOL::try_from_bytes(data)?;
let amount = u64::from_le_bytes(args.amount);
// Load accounts.
let [signer_info, miner_info, system_program] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
signer_info.is_signer()?;
let miner = miner_info
.as_account_mut::<Miner>(&ore_api::ID)?
.assert_mut(|m| m.authority == *signer_info.key)?;
system_program.is_program(&system_program::ID)?;
// Load amount.
let amount = miner.rewards_sol.min(amount);
// Update miner.
miner.rewards_sol -= amount;
// Transfer reward to recipient.
miner_info.send(amount, signer_info);
Ok(())
}

View File

@@ -4,7 +4,7 @@ use steel::*;
/// Initializes the program.
pub fn process_initialize(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResult {
// Load accounts.
let [signer_info, board_info, config_info, mint_info, treasury_info, vault_info, system_program, token_program, associated_token_program] =
let [signer_info, board_info, config_info, mint_info, treasury_info, treasury_tokens_info, system_program, token_program, associated_token_program] =
accounts
else {
return Err(ProgramError::NotEnoughAccountKeys);
@@ -14,7 +14,7 @@ pub fn process_initialize(accounts: &[AccountInfo<'_>], _data: &[u8]) -> Program
config_info.has_seeds(&[CONFIG], &ore_api::ID)?;
mint_info.has_address(&MINT_ADDRESS)?.as_mint()?;
treasury_info.has_seeds(&[TREASURY], &ore_api::ID)?;
vault_info.has_address(&vault_address())?;
treasury_tokens_info.has_address(&treasury_tokens_address())?;
system_program.is_program(&system_program::ID)?;
token_program.is_program(&spl_token::ID)?;
associated_token_program.is_program(&spl_associated_token_account::ID)?;
@@ -35,8 +35,10 @@ pub fn process_initialize(accounts: &[AccountInfo<'_>], _data: &[u8]) -> Program
board.start_slot = 0;
board.end_slot = 0;
board.slot_hash = [0; 32];
board.total_commits = 0;
board.total_burned = 0;
board.top_winner = Pubkey::default();
board.total_prospects = 0;
board.total_vaulted = 0;
board.total_winnings = 0;
} else {
board_info.as_account::<Board>(&ore_api::ID)?;
}
@@ -52,10 +54,10 @@ pub fn process_initialize(accounts: &[AccountInfo<'_>], _data: &[u8]) -> Program
)?;
let config = config_info.as_account_mut::<Config>(&ore_api::ID)?;
config.admin = *signer_info.key;
config.block_duration = INITIAL_BLOCK_DURATION;
config.sniper_fee_duration = INITIAL_SNIPER_FEE_DURATION;
config.block_duration = 0;
config.sniper_fee_duration = 0;
config.fee_collector = *signer_info.key;
config.fee_rate = FEE_LAMPORTS;
config.fee_rate = 0;
} else {
config_info.as_account::<Config>(&ore_api::ID)?;
}
@@ -69,23 +71,25 @@ pub fn process_initialize(accounts: &[AccountInfo<'_>], _data: &[u8]) -> Program
&ore_api::ID,
&[TREASURY],
)?;
let treasury = treasury_info.as_account_mut::<Treasury>(&ore_api::ID)?;
treasury.balance = 0;
} else {
treasury_info.as_account::<Treasury>(&ore_api::ID)?;
}
// Initialize vault token account.
if vault_info.data_is_empty() {
if treasury_tokens_info.data_is_empty() {
create_associated_token_account(
signer_info,
board_info,
vault_info,
treasury_info,
treasury_tokens_info,
mint_info,
system_program,
token_program,
associated_token_program,
)?;
} else {
vault_info.as_associated_token_account(board_info.key, mint_info.key)?;
treasury_tokens_info.as_associated_token_account(treasury_info.key, mint_info.key)?;
}
Ok(())

View File

@@ -2,7 +2,7 @@ use ore_api::prelude::*;
use steel::*;
/// Initializes the program.
pub fn process_initialize_square(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResult {
pub fn process_initialize_squares(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResult {
// Load accounts.
let (required_accounts, square_accounts) = accounts.split_at(2);
let [signer_info, system_program] = required_accounts else {

View File

@@ -1,18 +1,22 @@
mod claim;
mod claim_ore;
mod claim_seeker;
mod claim_sol;
mod initialize;
mod initialize_square;
mod initialize_squares;
mod prospect;
mod redeem;
mod reset;
mod set_admin;
mod set_fee_collector;
mod whitelist;
use claim::*;
use claim_ore::*;
use claim_seeker::*;
use claim_sol::*;
use initialize::*;
use initialize_square::*;
use initialize_squares::*;
use prospect::*;
use redeem::*;
use reset::*;
use set_admin::*;
use set_fee_collector::*;
@@ -29,10 +33,12 @@ pub fn process_instruction(
match ix {
// User
OreInstruction::Claim => process_claim(accounts, data)?,
OreInstruction::ClaimSOL => process_claim_sol(accounts, data)?,
OreInstruction::ClaimORE => process_claim_ore(accounts, data)?,
OreInstruction::Initialize => process_initialize(accounts, data)?,
OreInstruction::InitializeSquare => process_initialize_square(accounts, data)?,
OreInstruction::InitializeSquares => process_initialize_squares(accounts, data)?,
OreInstruction::Prospect => process_prospect(accounts, data)?,
OreInstruction::Redeem => process_redeem(accounts, data)?,
OreInstruction::Reset => process_reset(accounts, data)?,
// Admin
@@ -41,8 +47,6 @@ pub fn process_instruction(
// Seeker
OreInstruction::ClaimSeeker => process_claim_seeker(accounts, data)?,
_ => return Err(ProgramError::InvalidInstructionData),
}
Ok(())

View File

@@ -10,7 +10,7 @@ pub fn process_prospect(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes
// Load accounts.
let clock = Clock::get()?;
let [signer_info, board_info, config_info, fee_collector_info, miner_info, sender_info, square_info, vault_info, system_program, token_program] =
let [signer_info, board_info, config_info, fee_collector_info, miner_info, square_info, system_program] =
accounts
else {
return Err(ProgramError::NotEnoughAccountKeys);
@@ -27,13 +27,10 @@ pub fn process_prospect(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes
.has_address(&config.fee_collector)?
.is_writable()?;
miner_info.is_writable()?;
sender_info.as_associated_token_account(&signer_info.key, &MINT_ADDRESS)?;
let square = square_info
.as_account_mut::<Square>(&ore_api::ID)?
.assert_mut(|s| s.id == square_id)?;
vault_info.has_address(&vault_address())?;
system_program.is_program(&system_program::ID)?;
token_program.is_program(&spl_token::ID)?;
// Create miner.
let miner = if miner_info.data_is_empty() {
@@ -47,9 +44,11 @@ pub fn process_prospect(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes
let miner = miner_info.as_account_mut::<Miner>(&ore_api::ID)?;
miner.authority = *signer_info.key;
miner.commits = [0; 25];
miner.rewards = 0;
miner.rewards_sol = 0;
miner.rewards_ore = 0;
miner.round_id = board.id;
miner.total_rewards = 0;
miner.lifetime_rewards_sol = 0;
miner.lifetime_rewards_ore = 0;
miner
} else {
miner_info
@@ -64,8 +63,9 @@ pub fn process_prospect(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes
board.slot_hash = [0; 32];
board.start_slot = clock.slot;
board.end_slot = clock.slot + 150; // one minute
board.total_commits = 0;
board.total_burned = 0;
board.total_prospects = 0;
board.total_vaulted = 0;
board.total_winnings = 0;
}
// Reset miner
@@ -81,6 +81,10 @@ pub fn process_prospect(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes
square.round_id = board.id;
}
// Normalize amount.
let fee = amount / 100;
let amount = amount - fee;
// Update miner
let is_first_play_on_square = miner.commits[square_id as usize] == 0;
miner.commits[square_id as usize] += amount;
@@ -93,15 +97,11 @@ pub fn process_prospect(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes
// Update board
board.commits[square_id as usize] += amount;
board.total_commits += amount;
board.total_prospects += amount;
// Transfer tokens.
transfer(signer_info, sender_info, vault_info, token_program, amount)?;
// Pay fee.
if config.fee_rate > 0 {
fee_collector_info.collect(config.fee_rate, &signer_info)?;
}
// Transfer prospects.
board_info.collect(amount, &signer_info)?;
fee_collector_info.collect(fee, &signer_info)?;
Ok(())
}

39
program/src/redeem.rs Normal file
View File

@@ -0,0 +1,39 @@
use ore_api::prelude::*;
use steel::*;
/// Redeem ORE for SOL backing.
pub fn process_redeem(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
// Parse data.
let args = Redeem::try_from_bytes(data)?;
let amount = u64::from_le_bytes(args.amount);
// Load accounts.
let [signer_info, mint_info, sender_info, treasury_info, system_program, token_program] =
accounts
else {
return Err(ProgramError::NotEnoughAccountKeys);
};
signer_info.is_signer()?;
let mint = mint_info.has_address(&MINT_ADDRESS)?.as_mint()?;
let sender = sender_info.as_associated_token_account(&signer_info.key, &mint_info.key)?;
let treasury = treasury_info
.as_account_mut::<Treasury>(&ore_api::ID)?
.assert_mut(|t| t.balance >= amount)?;
system_program.is_program(&system_program::ID)?;
token_program.is_program(&spl_token::ID)?;
// Normalize amount.
let amount = amount.min(sender.amount());
// Load redemption amount.
let redemption_amount = treasury.balance * amount / mint.supply();
// Burn ORE.
burn(sender_info, mint_info, signer_info, token_program, amount)?;
// Transfer SOL to recipient.
treasury_info.send(redemption_amount, signer_info);
treasury.balance -= redemption_amount;
Ok(())
}

View File

@@ -1,5 +1,5 @@
use ore_api::prelude::*;
use solana_program::slot_hashes::SlotHashes;
use solana_program::{log::sol_log, slot_hashes::SlotHashes};
use steel::*;
/// Claims a block reward.
@@ -7,7 +7,7 @@ pub fn process_reset(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul
// Load accounts.
let clock = Clock::get()?;
let (required_accounts, miner_accounts) = accounts.split_at(9);
let [signer_info, board_info, mint_info, treasury_info, reserve_tokens_info, vault_info, system_program, token_program, slot_hashes_sysvar] =
let [signer_info, board_info, mint_info, reserve_tokens_info, treasury_info, treasury_tokens_info, system_program, token_program, slot_hashes_sysvar] =
required_accounts
else {
return Err(ProgramError::NotEnoughAccountKeys);
@@ -22,12 +22,14 @@ pub fn process_reset(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul
.has_address(&BOOST_RESERVE_TOKEN)?
.as_token_account()?
.assert(|t| t.mint() == MINT_ADDRESS)?;
vault_info.has_address(&vault_address())?;
treasury_info.has_address(&TREASURY_ADDRESS)?;
let treasury = treasury_info.as_account_mut::<Treasury>(&ore_api::ID)?;
treasury_tokens_info.as_associated_token_account(&treasury_info.key, &mint_info.key)?;
system_program.is_program(&system_program::ID)?;
token_program.is_program(&spl_token::ID)?;
slot_hashes_sysvar.is_sysvar(&sysvar::slot_hashes::ID)?;
sol_log("A");
// Mint tokens to the boost reserve.
mint_to_signed(
mint_info,
@@ -38,6 +40,8 @@ pub fn process_reset(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul
&[TREASURY],
)?;
sol_log("B");
// Sample slot hashes.
let (winning_square, square_commits) =
if let Ok(slot_hash) = get_slot_hash(board.end_slot, slot_hashes_sysvar) {
@@ -51,20 +55,18 @@ pub fn process_reset(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul
(u64::MAX, 0)
};
// No one won. Burn all rewards.
sol_log("C");
// No one won. Vault all prospects.
if square_commits == 0 {
board.total_burned = board.total_commits;
burn_signed(
vault_info,
mint_info,
board_info,
token_program,
board.total_commits,
&[BOARD],
)?;
board.total_vaulted = board.total_prospects;
treasury.balance += board.total_prospects;
board_info.send(board.total_prospects, &treasury_info);
return Ok(());
}
sol_log("D");
// Get winnings amount (prospects on all non-winning squares).
let mut winnings = 0;
for (i, commits) in board.commits.iter().enumerate() {
@@ -73,55 +75,118 @@ pub fn process_reset(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul
}
}
// Get burn amount.
let burn_amount = winnings / 10; // Burn 10% of non-winning prospects.
board.total_burned = burn_amount;
let winnings = winnings - burn_amount;
burn_signed(
vault_info,
mint_info,
board_info,
token_program,
burn_amount,
&[BOARD],
)?;
sol_log("E");
// Mint 1 ORE to winners while there are emissions left.
let mint_amount = ONE_ORE.min(MAX_SUPPLY - mint.supply());
let winnings = winnings + mint_amount;
if mint_amount > 0 {
mint_to_signed(
mint_info,
vault_info,
treasury_info,
token_program,
mint_amount,
&[TREASURY],
)?;
}
// Get vault amount.
let vault_amount = winnings / 10; // Vault 10% of winnings.
board.total_vaulted = vault_amount;
let winnings = winnings - vault_amount;
// board_info.send(vault_amount, &treasury_info);
treasury.balance += vault_amount;
sol_log("F");
// Payout winnings to miners.
let mut top_winner = None;
let mut top_winner_commits = 0;
let mut rewards_sol = [0; 16];
let mut checksum = 0;
for miner_info in miner_accounts {
for (i, miner_info) in miner_accounts.iter().enumerate() {
sol_log("G");
// Transfer winnings to miner.
let miner = miner_info
.as_account_mut::<Miner>(&ore_api::ID)?
.assert_mut(|m| m.round_id == board.id)?;
let miner_commits = miner.commits[winning_square as usize];
let rewards = (winnings * miner_commits / square_commits) + miner_commits; // Winners get their own prospect back plus their share of the winnings.
miner.rewards += rewards;
miner.total_rewards += rewards;
let rewards = miner_commits + (winnings * miner_commits / square_commits); // Winners get their own prospect back plus their share of the winnings.
miner.rewards_sol += rewards;
miner.lifetime_rewards_sol += rewards;
checksum += miner_commits;
rewards_sol[i] = rewards;
// board_info.send(rewards, &miner_info);
// Find the top winner.
if miner_commits > top_winner_commits {
sol_log("H");
top_winner_commits = miner_commits;
top_winner = Some(i);
// top_winner = Some(miner);
}
}
sol_log("I");
// Verify checksum.
if checksum != square_commits {
// This can only happen if the caller didn't provide full set of winning miners.
sol_log("J");
return Err(ProgramError::InvalidAccountData);
}
sol_log("K");
// Payout reward to top winner.
if let Some(i) = top_winner {
sol_log("L");
let miner = miner_accounts[i].as_account_mut::<Miner>(&ore_api::ID)?;
let mint_amount = ONE_ORE.min(MAX_SUPPLY - mint.supply());
if mint_amount > 0 {
// sol_log("M");
miner.rewards_ore += mint_amount;
miner.lifetime_rewards_ore += mint_amount;
board.top_winner = miner.authority;
// sol_log("M2");
mint_to_signed(
mint_info,
treasury_tokens_info,
treasury_info,
token_program,
mint_amount,
&[TREASURY],
)?;
// sol_log("N");
}
// miner.rewards_ore += rewards_sol[i];
// miner.lifetime_rewards_ore += rewards_sol[i];
// board.top_winner = miner.authority;
}
// if let Some(miner) = top_winner {
// sol_log("L");
// let mint_amount = ONE_ORE.min(MAX_SUPPLY - mint.supply());
// sol_log(&format!("mint_amount: {}", mint_amount));
// if mint_amount > 0 {
// sol_log("M");
// miner.rewards_ore += mint_amount;
// miner.lifetime_rewards_ore += mint_amount;
// board.top_winner = miner.authority;
// sol_log("M2");
// mint_to_signed(
// mint_info,
// treasury_tokens_info,
// treasury_info,
// token_program,
// mint_amount,
// &[TREASURY],
// )?;
// sol_log("N");
// }
// }
sol_log("O");
// Update board.
board.total_winnings = winnings;
// Do SOL transfers.
board_info.send(vault_amount, &treasury_info);
for (i, miner_info) in miner_accounts.iter().enumerate() {
board_info.send(rewards_sol[i], &miner_info);
}
// Send vault amount to treasury.
Ok(())
}