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

cu optimization

Browse Source
This commit is contained in:
Hardhat Chad
2024-02-14 00:15:46 +00:00
parent 54b7a35433
commit 418738127c
5 changed files with 133 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/processor/epoch.rs
View File

@@ -1,10 +1,6 @@
use solana_program::{
account_info::{next_account_info, AccountInfo},
clock::Clock,
entrypoint::ProgramResult,
program_error::ProgramError,
pubkey::Pubkey,
sysvar::Sysvar,
account_info::AccountInfo, clock::Clock, entrypoint::ProgramResult,
program_error::ProgramError, pubkey::Pubkey, sysvar::Sysvar,
};
use crate::{
@@ -19,38 +15,66 @@ pub fn process_epoch<'a, 'info>(
accounts: &'a [AccountInfo<'info>],
_data: &[u8],
) -> ProgramResult {
let accounts_iter = &mut accounts.iter();
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);
};
let _ = load_signer(signer)?;
let _ = load_bus(bus_0_info)?;
let _ = load_bus(bus_1_info)?;
let _ = load_bus(bus_2_info)?;
let _ = load_bus(bus_3_info)?;
let _ = load_bus(bus_4_info)?;
let _ = load_bus(bus_5_info)?;
let _ = load_bus(bus_6_info)?;
let _ = load_bus(bus_7_info)?;
let _ = load_mint(mint_info)?;
let _ = load_treasury(treasury_info)?;
let _ = load_token_account(treasury_tokens_info, treasury_info.key, mint_info.key)?;
let _ = load_account(token_program, spl_token::id())?;
// Account 1: Signer
let _signer = load_signer(next_account_info(accounts_iter)?)?;
// Accounts 2-9: Busses
let busses = vec![
load_bus(next_account_info(accounts_iter)?)?,
load_bus(next_account_info(accounts_iter)?)?,
load_bus(next_account_info(accounts_iter)?)?,
load_bus(next_account_info(accounts_iter)?)?,
load_bus(next_account_info(accounts_iter)?)?,
load_bus(next_account_info(accounts_iter)?)?,
load_bus(next_account_info(accounts_iter)?)?,
load_bus(next_account_info(accounts_iter)?)?,
let busses: [&AccountInfo; 8] = [
bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info,
bus_7_info,
];
// let _ = load_signer(signer)?;
// let _ = load_bus(bus_info)?;
// let _ = load_proof(proof_info, signer.key)?;
// let _ = load_treasury(treasury_info)?;
// let _ = load_account(slot_hashes_info, sysvar::slot_hashes::id())?;
// let accounts_iter = &mut accounts.iter();
// Account 1: Signer
// let _signer = load_signer(next_account_info(accounts_iter)?)?;
// Accounts 2-9: Busses
// let busses = vec![
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// load_bus(next_account_info(accounts_iter)?)?,
// ];
// Account 10: Mint
let mint = load_mint(next_account_info(accounts_iter)?)?;
// let mint = load_mint(next_account_info(accounts_iter)?)?;
// Account 11: Treasury
let treasury_info = load_treasury(next_account_info(accounts_iter)?)?;
// let treasury_info = load_treasury(next_account_info(accounts_iter)?)?;
// Account 12: Treasury tokens
let treasury_tokens = load_token_account(
next_account_info(accounts_iter)?,
treasury_info.key,
mint.key,
)?;
// let treasury_tokens = load_token_account(
// next_account_info(accounts_iter)?,
// treasury_info.key,
// mint.key,
// )?;
// Account 13: Token program
let token_program = load_account(next_account_info(accounts_iter)?, spl_token::id())?;
// let token_program = load_account(next_account_info(accounts_iter)?, spl_token::id())?;
// Validate epoch has ended
let clock = Clock::get().unwrap();
@@ -81,16 +105,16 @@ pub fn process_epoch<'a, 'info>(
solana_program::program::invoke_signed(
&spl_token::instruction::mint_to(
&spl_token::id(),
mint.key,
treasury_tokens.key,
mint_info.key,
treasury_tokens_info.key,
treasury_info.key,
&[treasury_info.key],
total_epoch_rewards,
)?,
&[
token_program.clone(),
mint.clone(),
treasury_tokens.clone(),
mint_info.clone(),
treasury_tokens_info.clone(),
treasury_info.clone(),
],
&[&[TREASURY, &[treasury_bump]]],

93
src/processor/mine.rs
View File

@@ -23,71 +23,56 @@ pub fn process_mine<'a, 'info>(
accounts: &'a [AccountInfo<'info>],
data: &[u8],
) -> ProgramResult {
// let accounts_iter = &mut accounts.iter();
// let args =
// bytemuck::try_from_bytes::<MineArgs>(data).or(Err(ProgramError::InvalidInstructionData))?;
// Parse args
let args =
bytemuck::try_from_bytes::<MineArgs>(data).or(Err(ProgramError::InvalidInstructionData))?;
// let [signer, bus_info, proof_info, treasury_info, slot_hashes_info] = accounts else {
// return Err(ProgramError::NotEnoughAccountKeys);
// };
// let _ = load_signer(signer)?;
// let _ = load_bus(bus_info)?;
// let _ = load_proof(proof_info, signer.key)?;
// let _ = load_treasury(treasury_info)?;
// let _ = load_account(slot_hashes_info, sysvar::slot_hashes::id())?;
// Account 1: Signer
// let signer = load_signer(next_account_info(accounts_iter)?)?;
// Account 2: Bus
// let bus_info = load_bus(next_account_info(accounts_iter)?)?;
// Account 3: Proof
// let proof_info = load_proof(next_account_info(accounts_iter)?, signer.key)?;
// Account 4: Treasury
// let treasury_info = load_treasury(next_account_info(accounts_iter)?)?;
// Account 5: Slot hashes svsvar
// let slot_hashes_info =
// load_account(next_account_info(accounts_iter)?, sysvar::slot_hashes::id())?;
// Parse accounts
let [signer, bus_info, proof_info, treasury_info, slot_hashes_info] = accounts else {
return Err(ProgramError::NotEnoughAccountKeys);
};
let _ = load_signer(signer)?;
let _ = load_bus(bus_info)?;
let _ = load_proof(proof_info, signer.key)?;
let _ = load_treasury(treasury_info)?;
let _ = load_account(slot_hashes_info, sysvar::slot_hashes::id())?;
// Validate epoch is active
// let clock = Clock::get().unwrap();
// let treasury_data = treasury_info.data.borrow();
// let treasury = bytemuck::try_from_bytes::<Treasury>(&treasury_data).unwrap();
// let epoch_end_at = treasury.epoch_start_at.saturating_add(EPOCH_DURATION);
// if !clock.unix_timestamp.lt(&epoch_end_at) {
// return Err(ProgramError::Custom(1));
// }
let clock = Clock::get().unwrap();
let treasury_data = treasury_info.data.borrow();
let treasury = bytemuck::try_from_bytes::<Treasury>(&treasury_data).unwrap();
let epoch_end_at = treasury.epoch_start_at.saturating_add(EPOCH_DURATION);
if !clock.unix_timestamp.lt(&epoch_end_at) {
return Err(ProgramError::Custom(1));
}
// Validate provided hash
// let mut proof_data = proof_info.data.borrow_mut();
// let mut proof = bytemuck::try_from_bytes_mut::<Proof>(&mut proof_data).unwrap();
// validate_hash(
// proof.hash.into(),
// args.hash.into(),
// *signer.key,
// u64::from_le_bytes(args.nonce),
// treasury.difficulty.into(),
// )?;
let mut proof_data = proof_info.data.borrow_mut();
let mut proof = bytemuck::try_from_bytes_mut::<Proof>(&mut proof_data).unwrap();
validate_hash(
proof.hash.into(),
args.hash.into(),
*signer.key,
u64::from_le_bytes(args.nonce),
treasury.difficulty.into(),
)?;
// Update claimable rewards
// let mut bus_data = bus_info.data.borrow_mut();
// let mut bus = bytemuck::try_from_bytes_mut::<Bus>(&mut bus_data).unwrap();
// if !bus.available_rewards.ge(&treasury.reward_rate) {
// return Err(ProgramError::Custom(1));
// }
// bus.available_rewards = bus.available_rewards.saturating_sub(treasury.reward_rate);
// proof.claimable_rewards = proof.claimable_rewards.saturating_add(treasury.reward_rate);
let mut bus_data = bus_info.data.borrow_mut();
let mut bus = bytemuck::try_from_bytes_mut::<Bus>(&mut bus_data).unwrap();
if bus.available_rewards.lt(&treasury.reward_rate) {
return Err(ProgramError::Custom(1));
}
bus.available_rewards = bus.available_rewards.saturating_sub(treasury.reward_rate);
proof.claimable_rewards = proof.claimable_rewards.saturating_add(treasury.reward_rate);
// Hash most recent slot hash into the next challenge to prevent pre-mining attacks
// let slot_hash_bytes = &slot_hashes_info.data.borrow()[0..size_of::<SlotHash>()];
// proof.hash = hashv(&[KeccakHash::from(args.hash).as_ref(), slot_hash_bytes]).into();
let slot_hash_bytes = &slot_hashes_info.data.borrow()[0..size_of::<SlotHash>()];
proof.hash = hashv(&[KeccakHash::from(args.hash).as_ref(), slot_hash_bytes]).into();
// Update lifetime stats
// proof.total_hashes = proof.total_hashes.saturating_add(1);
// proof.total_rewards = proof.total_rewards.saturating_add(1);
proof.total_hashes = proof.total_hashes.saturating_add(1);
proof.total_rewards = proof.total_rewards.saturating_add(1);
// TODO Log?