diff --git a/program/src/claim_ore.rs b/program/src/claim_ore.rs index ac8cfcf..656d6ab 100644 --- a/program/src/claim_ore.rs +++ b/program/src/claim_ore.rs @@ -20,7 +20,7 @@ pub fn process_claim_ore(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRe .as_account_mut::(&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)?; + recipient_info.is_writable()?; treasury_info.as_account_mut::(&ore_api::ID)?; treasury_tokens_info.as_associated_token_account(&treasury_info.key, &mint_info.key)?; system_program.is_program(&system_program::ID)?; diff --git a/program/src/deploy.rs b/program/src/deploy.rs index 5aa4141..12adf15 100644 --- a/program/src/deploy.rs +++ b/program/src/deploy.rs @@ -20,10 +20,9 @@ pub fn process_deploy(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResul sol_log( &format!( - "Deploying {} SOL to {} squares: {:?}", + "Deploying {} SOL to {} squares", lamports_to_sol(amount), squares.iter().filter(|&&s| s).count(), - squares ) .as_str(), ); diff --git a/program/src/reset.rs b/program/src/reset.rs index 232940f..e866fda 100644 --- a/program/src/reset.rs +++ b/program/src/reset.rs @@ -16,7 +16,7 @@ pub fn process_reset(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul let board = board_info .as_account_mut::(&ore_api::ID)? .assert_mut(|b| b.slot_hash == [0; 32])? - .assert_mut(|b| clock.slot >= b.end_slot)?; + .assert_mut(|b| clock.slot > b.end_slot)?; let config = config_info.as_account_mut::(&ore_api::ID)?; let mint = mint_info.has_address(&MINT_ADDRESS)?.as_mint()?; let square = square_info.as_account_mut::(&ore_api::ID)?; diff --git a/program/src/whitelist.rs b/program/src/whitelist.rs index af7b5b9..993958e 100644 --- a/program/src/whitelist.rs +++ b/program/src/whitelist.rs @@ -1,7 +1,7 @@ use solana_program::pubkey; use steel::*; -pub const AUTHORIZED_ACCOUNTS: [Pubkey; 244] = [ +pub const AUTHORIZED_ACCOUNTS: [Pubkey; 246] = [ pubkey!("pqspJ298ryBjazPAr95J9sULCVpZe3HbZTWkbC1zrkS"), pubkey!("6B9PjpHfbhPcSakS5UQ7ZctgbPujfsryVRpDecskGLiz"), pubkey!("HBUh9g46wk2X89CvaNN15UmsznP59rh6od1h8JwYAopk"), @@ -246,4 +246,6 @@ pub const AUTHORIZED_ACCOUNTS: [Pubkey; 244] = [ pubkey!("2pUaXgALLnnxYAPBaLT9R72NCZJshrXkTTUmQTnJUsxF"), pubkey!("4LVEx7bZ9PEVP1o9xsbN9XbbHuZH3T4t94AkWJAkMRd4"), pubkey!("6Fg49wV8MGW5PeTTF1LoFRR8FzUGiMZXC3gWZiagAWzg"), + pubkey!("BwCwfRRe2y6Rxv6SQZMRQ499TTakKnKEDbPofN8JQ7p"), + pubkey!("5D1oAw6sE14YvdSPwGWGbFCj7SVTbivnTxWXxbvNrur6"), ];