diff --git a/api/src/lib.rs b/api/src/lib.rs index 514f1e3..04f97c6 100644 --- a/api/src/lib.rs +++ b/api/src/lib.rs @@ -10,4 +10,4 @@ pub(crate) use ore_utils as utils; use solana_program::declare_id; // declare_id!("mineRHF5r6S7HyD9SppBfVMXMavDkJsxwGesEvxZr2A"); -declare_id!("CWZk6C3fGbpr1UprdCGaLvnW2ogh7okEmeXaS161RxUg"); +declare_id!("EcZSwrCoS7bgstnUMdELZGno2riZ6mhW8hvRbq6vUCNm"); diff --git a/api/src/loaders.rs b/api/src/loaders.rs index 90f13ed..ebcd1dc 100644 --- a/api/src/loaders.rs +++ b/api/src/loaders.rs @@ -1,6 +1,6 @@ use solana_program::{ - account_info::AccountInfo, program_error::ProgramError, program_pack::Pack, pubkey::Pubkey, - system_program, sysvar, + account_info::AccountInfo, log::sol_log, program_error::ProgramError, program_pack::Pack, + pubkey::Pubkey, system_program, sysvar, }; use spl_token::state::Mint; @@ -36,6 +36,11 @@ pub fn load_bus<'a, 'info>( return Err(ProgramError::InvalidAccountOwner); } + sol_log(&format!("key: {}", info.key.to_string())); + sol_log(&format!( + "bus address: {}", + BUS_ADDRESSES[id as usize].to_string() + )); if info.key.ne(&BUS_ADDRESSES[id as usize]) { return Err(ProgramError::InvalidSeeds); } @@ -106,6 +111,8 @@ pub fn load_config<'a, 'info>( return Err(ProgramError::InvalidAccountOwner); } + sol_log(&format!("key: {}", info.key.to_string())); + sol_log(&format!("config address: {}", CONFIG_ADDRESS.to_string())); if info.key.ne(&CONFIG_ADDRESS) { return Err(ProgramError::InvalidSeeds); } @@ -233,6 +240,11 @@ pub fn load_treasury<'a, 'info>( return Err(ProgramError::InvalidAccountOwner); } + sol_log(&format!("key: {}", info.key.to_string())); + sol_log(&format!( + "treasury address: {}", + TREASURY_ADDRESS.to_string() + )); if info.key.ne(&TREASURY_ADDRESS) { return Err(ProgramError::InvalidSeeds); } diff --git a/program/src/reset.rs b/program/src/reset.rs index 716190e..d3b8a11 100644 --- a/program/src/reset.rs +++ b/program/src/reset.rs @@ -5,7 +5,7 @@ use ore_api::{ state::{Bus, Config}, }; use solana_program::{ - account_info::AccountInfo, clock::Clock, entrypoint::ProgramResult, + account_info::AccountInfo, clock::Clock, entrypoint::ProgramResult, log::sol_log, program_error::ProgramError, program_pack::Pack, pubkey::Pubkey, sysvar::Sysvar, }; use spl_token::state::Mint; @@ -42,18 +42,31 @@ pub fn process_reset<'a, 'info>( else { return Err(ProgramError::NotEnoughAccountKeys); }; + sol_log("loading signer"); load_signer(signer)?; + sol_log("loading bus 0"); load_bus(bus_0_info, 0, true)?; + sol_log("loading bus 1"); load_bus(bus_1_info, 1, true)?; + sol_log("loading bus 2"); load_bus(bus_2_info, 2, true)?; + sol_log("loading bus 3"); load_bus(bus_3_info, 3, true)?; + sol_log("loading bus 4"); load_bus(bus_4_info, 4, true)?; + sol_log("loading bus 5"); load_bus(bus_5_info, 5, true)?; + sol_log("loading bus 6"); load_bus(bus_6_info, 6, true)?; + sol_log("loading bus 7"); load_bus(bus_7_info, 7, true)?; + sol_log("loading config"); load_config(config_info, true)?; + sol_log("loading mint"); load_mint(mint_info, MINT_ADDRESS, true)?; + sol_log("loading treasury"); load_treasury(treasury_info, true)?; + sol_log("loading treasury tokens"); load_treasury_tokens(treasury_tokens_info, true)?; load_program(token_program, spl_token::id())?; let busses: [&AccountInfo; BUS_COUNT] = [