diff --git a/api/src/sdk.rs b/api/src/sdk.rs index be4c1e2..ef363bb 100644 --- a/api/src/sdk.rs +++ b/api/src/sdk.rs @@ -156,19 +156,17 @@ pub fn redeem(signer: Pubkey, amount: u64) -> Instruction { } } -// 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, treasury_info, treasury_tokens_info, system_program, token_program, slot_hashes_sysvar] = pub fn reset(signer: Pubkey, miners: Vec) -> Instruction { let board_address = board_pda().0; let mint_address = MINT_ADDRESS; let treasury_address = TREASURY_ADDRESS; - let reserve_tokens_address = BOOST_RESERVE_TOKEN; let treasury_tokens_address = treasury_tokens_address(); let mut accounts = vec![ AccountMeta::new(signer, true), AccountMeta::new(board_address, false), AccountMeta::new(mint_address, false), - AccountMeta::new(reserve_tokens_address, false), AccountMeta::new(treasury_address, false), AccountMeta::new(treasury_tokens_address, false), AccountMeta::new_readonly(system_program::ID, false), diff --git a/api/src/state/treasury.rs b/api/src/state/treasury.rs index 9047e30..4d5146d 100644 --- a/api/src/state/treasury.rs +++ b/api/src/state/treasury.rs @@ -1,7 +1,5 @@ use steel::*; -use crate::state::treasury_pda; - use super::OreAccount; /// Treasury is a singleton account which is the mint authority for the ORE token and the authority of diff --git a/program/src/claim_ore.rs b/program/src/claim_ore.rs index 3f05295..04c71e6 100644 --- a/program/src/claim_ore.rs +++ b/program/src/claim_ore.rs @@ -40,7 +40,7 @@ pub fn process_claim_ore(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRe recipient_info.as_associated_token_account(signer_info.key, mint_info.key)?; } - // Load amount. + // Normalize amount. let amount = miner.rewards_ore.min(amount); // Update miner. diff --git a/program/src/claim_sol.rs b/program/src/claim_sol.rs index 3aade8f..7794cdc 100644 --- a/program/src/claim_sol.rs +++ b/program/src/claim_sol.rs @@ -17,7 +17,7 @@ pub fn process_claim_sol(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRe .assert_mut(|m| m.authority == *signer_info.key)?; system_program.is_program(&system_program::ID)?; - // Load amount. + // Normalize amount. let amount = miner.rewards_sol.min(amount); // Update miner. diff --git a/program/src/lib.rs b/program/src/lib.rs index 8eb62f3..943c2e4 100644 --- a/program/src/lib.rs +++ b/program/src/lib.rs @@ -41,7 +41,7 @@ pub fn process_instruction( OreInstruction::Initialize => process_initialize(accounts, data)?, OreInstruction::InitializeSquares => process_initialize_squares(accounts, data)?, OreInstruction::Prospect => process_prospect(accounts, data)?, - OreInstruction::Redeem => process_redeem(accounts, data)?, + OreInstruction::Redeem => panic!("not allowed"), OreInstruction::Reset => process_reset(accounts, data)?, // Admin diff --git a/program/src/prospect.rs b/program/src/prospect.rs index 680609f..a210597 100644 --- a/program/src/prospect.rs +++ b/program/src/prospect.rs @@ -70,6 +70,7 @@ 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.top_miner = Pubkey::default(); board.total_prospects = 0; board.total_vaulted = 0; board.total_winnings = 0; diff --git a/program/src/reset.rs b/program/src/reset.rs index ff76868..a7b9fd1 100644 --- a/program/src/reset.rs +++ b/program/src/reset.rs @@ -6,7 +6,7 @@ use steel::*; pub fn process_reset(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResult { // Load accounts. let clock = Clock::get()?; - let (required_accounts, miner_accounts) = accounts.split_at(9); + let (required_accounts, miner_accounts) = accounts.split_at(8); let [signer_info, board_info, mint_info, treasury_info, treasury_tokens_info, system_program, token_program, slot_hashes_sysvar] = required_accounts else { diff --git a/program/src/whitelist.rs b/program/src/whitelist.rs index 9bff6e1..08c4bc4 100644 --- a/program/src/whitelist.rs +++ b/program/src/whitelist.rs @@ -1,9 +1,10 @@ use solana_program::pubkey; use steel::*; -pub const AUTHORIZED_ACCOUNTS: [Pubkey; 2] = [ +pub const AUTHORIZED_ACCOUNTS: [Pubkey; 3] = [ pubkey!("pqspJ298ryBjazPAr95J9sULCVpZe3HbZTWkbC1zrkS"), pubkey!("6B9PjpHfbhPcSakS5UQ7ZctgbPujfsryVRpDecskGLiz"), + pubkey!("HBUh9g46wk2X89CvaNN15UmsznP59rh6od1h8JwYAopk"), // pubkey!("By5JFFueXCqeqLk5MzR8ZSwFxASz3SKWX2TVfT1LTFbX"), // pubkey!("J89R2jNKbfkFoJjvkjnwwepvJRE2M8VPQ67RhPeQfVY8"), // pubkey!("6Qaf8uCcYWkWb12FZYUhuqkae3np2WiaZCv7ic4PMf72"),