diff --git a/api/src/sdk.rs b/api/src/sdk.rs index b0c354c..2634136 100644 --- a/api/src/sdk.rs +++ b/api/src/sdk.rs @@ -123,12 +123,14 @@ pub fn redeem(signer: Pubkey, amount: u64) -> Instruction { pub fn reset(signer: Pubkey, miners: Vec) -> Instruction { let board_address = board_pda().0; let mint_address = MINT_ADDRESS; + let square_address = square_pda().0; let treasury_address = TREASURY_ADDRESS; 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(square_address, false), AccountMeta::new(treasury_address, false), AccountMeta::new(treasury_tokens_address, false), AccountMeta::new_readonly(system_program::ID, false), @@ -153,7 +155,7 @@ pub fn prospect(signer: Pubkey, fee_collector: Pubkey, amount: u64, square_id: u let board_address = board_pda().0; let config_address = config_pda().0; let miner_address = miner_pda(signer).0; - let square_address = square_pda(0).0; + let square_address = square_pda().0; Instruction { program_id: crate::ID, accounts: vec![ diff --git a/api/src/state/mod.rs b/api/src/state/mod.rs index 6e49ed3..33b38e0 100644 --- a/api/src/state/mod.rs +++ b/api/src/state/mod.rs @@ -44,8 +44,8 @@ pub fn miner_pda(authority: Pubkey) -> (Pubkey, u8) { Pubkey::find_program_address(&[MINER, &authority.to_bytes()], &crate::ID) } -pub fn square_pda(id: u64) -> (Pubkey, u8) { - Pubkey::find_program_address(&[SQUARE, &id.to_le_bytes()], &crate::ID) +pub fn square_pda() -> (Pubkey, u8) { + Pubkey::find_program_address(&[SQUARE], &crate::ID) } pub fn treasury_pda() -> (Pubkey, u8) { diff --git a/cli/src/main.rs b/cli/src/main.rs index a5a1c44..da450b5 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -335,7 +335,7 @@ async fn get_slot_hashes(rpc: &RpcClient) -> Result { } async fn get_square(rpc: &RpcClient) -> Result { - let square_pda = ore_api::state::square_pda(0); + let square_pda = ore_api::state::square_pda(); let account = rpc.get_account(&square_pda.0).await?; let square = Square::try_from_bytes(&account.data)?; Ok(*square)