From 1ad89987c47cde70c58b3ea9e6610581f500adb7 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 10 Jul 2024 11:05:26 -0700 Subject: [PATCH] dropped loggers --- api/src/loaders.rs | 23 ++--------------------- program/src/reset.rs | 17 +---------------- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/api/src/loaders.rs b/api/src/loaders.rs index 8c5cdf3..0f68979 100644 --- a/api/src/loaders.rs +++ b/api/src/loaders.rs @@ -1,6 +1,6 @@ use solana_program::{ - account_info::AccountInfo, log::sol_log, program_error::ProgramError, program_pack::Pack, - pubkey::Pubkey, system_program, sysvar, + account_info::AccountInfo, program_error::ProgramError, program_pack::Pack, pubkey::Pubkey, + system_program, sysvar, }; use spl_token::state::Mint; @@ -36,11 +36,6 @@ 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); } @@ -111,8 +106,6 @@ 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); } @@ -240,11 +233,6 @@ 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); } @@ -271,16 +259,9 @@ pub fn load_treasury_tokens<'a, 'info>( info: &'a AccountInfo<'info>, is_writable: bool, ) -> Result<(), ProgramError> { - sol_log(&format!("key: {}", info.key.to_string())); - sol_log(&format!( - "treasury tokens address: {}", - TREASURY_TOKENS_ADDRESS.to_string() - )); if info.key.ne(&TREASURY_TOKENS_ADDRESS) { return Err(ProgramError::InvalidSeeds); } - sol_log("validated"); - load_token_account(info, Some(&TREASURY_ADDRESS), &MINT_ADDRESS, is_writable) } diff --git a/program/src/reset.rs b/program/src/reset.rs index 0042d63..716190e 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, log::sol_log, + account_info::AccountInfo, clock::Clock, entrypoint::ProgramResult, program_error::ProgramError, program_pack::Pack, pubkey::Pubkey, sysvar::Sysvar, }; use spl_token::state::Mint; @@ -42,31 +42,18 @@ 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] = [ @@ -113,8 +100,6 @@ pub fn process_reset<'a, 'info>( return Err(OreError::MaxSupply.into()); } - sol_log("funding treasury token account"); - // Fund treasury token account let amount = MAX_SUPPLY .saturating_sub(mint.supply)