Merge branch 'develop' into chore/consistent-log-label-signer-signature-hash

Jiloc · web-flow · commit 7777b86bc124 · 2025-03-26T15:46:25.000+01:00
diff --git a/pox-locking/src/events.rs b/pox-locking/src/events.rs
@@ -21,9 +21,6 @@ use clarity::vm::errors::Error as ClarityError;
 use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier, ResponseData, TupleData};
 use clarity::vm::Value;
 #[cfg(any(test, feature = "testing"))]
-use slog::slog_debug;
-use slog::slog_error;
-#[cfg(any(test, feature = "testing"))]
 use stacks_common::debug;
 use stacks_common::types::StacksEpochId;
 use stacks_common::{error, test_debug};
diff --git a/pox-locking/src/events_24.rs b/pox-locking/src/events_24.rs
@@ -20,9 +20,6 @@ use clarity::vm::errors::Error as ClarityError;
 use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier, TupleData};
 use clarity::vm::Value;
 #[cfg(any(test, feature = "testing"))]
-use slog::slog_debug;
-use slog::slog_error;
-#[cfg(any(test, feature = "testing"))]
 use stacks_common::debug;
 use stacks_common::{error, test_debug};
 
diff --git a/pox-locking/src/lib.rs b/pox-locking/src/lib.rs
@@ -30,7 +30,6 @@ use clarity::vm::contexts::GlobalContext;
 use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
 use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
 use clarity::vm::Value;
-use slog::slog_warn;
 use stacks_common::types::StacksEpochId;
 use stacks_common::warn;
 
diff --git a/pox-locking/src/pox_1.rs b/pox-locking/src/pox_1.rs
@@ -23,7 +23,6 @@ use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
 use clarity::vm::events::{STXEventType, STXLockEventData, StacksTransactionEvent};
 use clarity::vm::types::PrincipalData;
 use clarity::vm::Value;
-use slog::slog_debug;
 use stacks_common::debug;
 
 use crate::LockingError;
diff --git a/pox-locking/src/pox_2.rs b/pox-locking/src/pox_2.rs
@@ -23,7 +23,6 @@ use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
 use clarity::vm::events::{STXEventType, STXLockEventData, StacksTransactionEvent};
 use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
 use clarity::vm::{Environment, Value};
-use slog::{slog_debug, slog_error};
 use stacks_common::{debug, error};
 
 use crate::events::synthesize_pox_event_info;
diff --git a/pox-locking/src/pox_3.rs b/pox-locking/src/pox_3.rs
@@ -23,7 +23,6 @@ use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
 use clarity::vm::events::{STXEventType, STXLockEventData, StacksTransactionEvent};
 use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
 use clarity::vm::{Environment, Value};
-use slog::{slog_debug, slog_error};
 use stacks_common::{debug, error};
 
 use crate::events::synthesize_pox_event_info;
diff --git a/pox-locking/src/pox_4.rs b/pox-locking/src/pox_4.rs
@@ -23,7 +23,6 @@ use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
 use clarity::vm::events::{STXEventType, STXLockEventData, StacksTransactionEvent};
 use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
 use clarity::vm::{Environment, Value};
-use slog::{slog_debug, slog_error};
 use stacks_common::{debug, error};
 
 use crate::events::synthesize_pox_event_info;
diff --git a/stacks-common/src/util/log.rs b/stacks-common/src/util/log.rs
@@ -268,7 +268,7 @@ macro_rules! trace {
     ($($arg:tt)*) => ({
         let cur_level = $crate::util::log::get_loglevel();
         if slog::Level::Trace.is_at_least(cur_level) {
-            slog_trace!($crate::util::log::LOGGER, $($arg)*)
+            slog::slog_trace!($crate::util::log::LOGGER, $($arg)*)
         }
     })
 }
@@ -278,7 +278,7 @@ macro_rules! error {
     ($($arg:tt)*) => ({
         let cur_level = $crate::util::log::get_loglevel();
         if slog::Level::Error.is_at_least(cur_level) {
-            slog_error!($crate::util::log::LOGGER, $($arg)*)
+            slog::slog_error!($crate::util::log::LOGGER, $($arg)*)
         }
     })
 }
@@ -288,7 +288,7 @@ macro_rules! warn {
     ($($arg:tt)*) => ({
         let cur_level = $crate::util::log::get_loglevel();
         if slog::Level::Warning.is_at_least(cur_level) {
-            slog_warn!($crate::util::log::LOGGER, $($arg)*)
+            slog::slog_warn!($crate::util::log::LOGGER, $($arg)*)
         }
     })
 }
@@ -298,7 +298,7 @@ macro_rules! info {
     ($($arg:tt)*) => ({
         let cur_level = $crate::util::log::get_loglevel();
         if slog::Level::Info.is_at_least(cur_level) {
-            slog_info!($crate::util::log::LOGGER, $($arg)*)
+            slog::slog_info!($crate::util::log::LOGGER, $($arg)*)
         }
     })
 }
@@ -308,7 +308,7 @@ macro_rules! debug {
     ($($arg:tt)*) => ({
         let cur_level = $crate::util::log::get_loglevel();
         if slog::Level::Debug.is_at_least(cur_level) {
-            slog_debug!($crate::util::log::LOGGER, $($arg)*)
+            slog::slog_debug!($crate::util::log::LOGGER, $($arg)*)
         }
     })
 }
@@ -318,7 +318,7 @@ macro_rules! fatal {
     ($($arg:tt)*) => ({
         let cur_level = $crate::util::log::get_loglevel();
         if slog::Level::Critical.is_at_least(cur_level) {
-            slog_crit!($crate::util::log::LOGGER, $($arg)*)
+            slog::slog_crit!($crate::util::log::LOGGER, $($arg)*)
         }
     })
 }
diff --git a/stacks-signer/src/chainstate.rs b/stacks-signer/src/chainstate.rs
@@ -20,7 +20,6 @@ use blockstack_lib::chainstate::stacks::TenureChangePayload;
 use blockstack_lib::net::api::getsortition::SortitionInfo;
 use blockstack_lib::util_lib::db::Error as DBError;
 use libsigner::v0::messages::RejectReason;
-use slog::{slog_info, slog_warn};
 use stacks_common::types::chainstate::{BurnchainHeaderHash, ConsensusHash, StacksPublicKey};
 use stacks_common::util::get_epoch_time_secs;
 use stacks_common::util::hash::Hash160;
diff --git a/stacks-signer/src/client/mod.rs b/stacks-signer/src/client/mod.rs
@@ -25,7 +25,6 @@ use clarity::vm::errors::Error as ClarityError;
 use clarity::vm::types::serialization::SerializationError;
 use libsigner::RPCError;
 use libstackerdb::Error as StackerDBError;
-use slog::slog_debug;
 pub use stackerdb::*;
 pub use stacks_client::*;
 use stacks_common::codec::Error as CodecError;
diff --git a/stacks-signer/src/client/stackerdb.rs b/stacks-signer/src/client/stackerdb.rs
@@ -19,7 +19,6 @@ use clarity::codec::read_next;
 use hashbrown::HashMap;
 use libsigner::{MessageSlotID, SignerMessage, SignerSession, StackerDBSession};
 use libstackerdb::{StackerDBChunkAckData, StackerDBChunkData};
-use slog::{slog_debug, slog_info, slog_warn};
 use stacks_common::types::chainstate::StacksPrivateKey;
 use stacks_common::util::hash::to_hex;
 use stacks_common::{debug, info, warn};
diff --git a/stacks-signer/src/client/stacks_client.rs b/stacks-signer/src/client/stacks_client.rs
@@ -43,7 +43,6 @@ use libsigner::v0::messages::PeerInfo;
 use reqwest::header::AUTHORIZATION;
 use serde::Deserialize;
 use serde_json::json;
-use slog::{slog_debug, slog_warn};
 use stacks_common::codec::StacksMessageCodec;
 use stacks_common::consts::CHAIN_ID_MAINNET;
 use stacks_common::types::chainstate::{
diff --git a/stacks-signer/src/lib.rs b/stacks-signer/src/lib.rs
@@ -52,7 +52,6 @@ use chainstate::SortitionsView;
 use config::GlobalConfig;
 use libsigner::{SignerEvent, SignerEventReceiver, SignerEventTrait, VERSION_STRING};
 use runloop::SignerResult;
-use slog::{slog_info, slog_warn};
 use stacks_common::{info, warn};
 use v0::signer_state::LocalStateMachine;
 
diff --git a/stacks-signer/src/main.rs b/stacks-signer/src/main.rs
@@ -34,7 +34,6 @@ use clarity::types::chainstate::StacksPublicKey;
 use clarity::util::sleep_ms;
 use libsigner::{SignerSession, VERSION_STRING};
 use libstackerdb::StackerDBChunkData;
-use slog::{slog_debug, slog_error};
 use stacks_common::util::hash::to_hex;
 use stacks_common::util::secp256k1::MessageSignature;
 use stacks_common::{debug, error};
diff --git a/stacks-signer/src/monitor_signers.rs b/stacks-signer/src/monitor_signers.rs
@@ -21,7 +21,6 @@ use clarity::types::StacksEpochId;
 use clarity::util::sleep_ms;
 use libsigner::v0::messages::{MessageSlotID, SignerMessage};
 use libsigner::SignerSession;
-use slog::{slog_info, slog_warn};
 use stacks_common::{info, warn};
 
 use crate::cli::MonitorSignersArgs;
diff --git a/stacks-signer/src/monitoring/mod.rs b/stacks-signer/src/monitoring/mod.rs
@@ -25,7 +25,6 @@ mod server;
 pub mod actions {
     use ::prometheus::HistogramTimer;
     use blockstack_lib::chainstate::nakamoto::NakamotoBlock;
-    use slog::slog_error;
     use stacks_common::error;
 
     use crate::config::GlobalConfig;
@@ -130,7 +129,6 @@ pub mod actions {
 #[cfg(not(feature = "monitoring_prom"))]
 pub mod actions {
     use blockstack_lib::chainstate::nakamoto::NakamotoBlock;
-    use slog::slog_info;
     use stacks_common::info;
 
     use crate::v0::signer_state::LocalStateMachine;
diff --git a/stacks-signer/src/monitoring/server.rs b/stacks-signer/src/monitoring/server.rs
@@ -20,7 +20,6 @@ use std::time::Instant;
 use clarity::util::hash::to_hex;
 use clarity::util::secp256k1::Secp256k1PublicKey;
 use libsigner::VERSION_STRING;
-use slog::{slog_debug, slog_error, slog_info, slog_warn};
 use stacks_common::{debug, error, info, warn};
 use tiny_http::{Response as HttpResponse, Server as HttpServer};
 
diff --git a/stacks-signer/src/runloop.rs b/stacks-signer/src/runloop.rs
@@ -20,7 +20,6 @@ use std::time::Duration;
 use clarity::codec::StacksMessageCodec;
 use hashbrown::HashMap;
 use libsigner::{SignerEntries, SignerEvent, SignerRunLoop};
-use slog::{slog_debug, slog_error, slog_info, slog_warn};
 use stacks_common::{debug, error, info, warn};
 
 use crate::chainstate::SortitionsView;
diff --git a/stacks-signer/src/signerdb.rs b/stacks-signer/src/signerdb.rs
@@ -35,7 +35,6 @@ use rusqlite::{
     params, Connection, Error as SqliteError, OpenFlags, OptionalExtension, Transaction,
 };
 use serde::{Deserialize, Serialize};
-use slog::{slog_debug, slog_error};
 use stacks_common::codec::{read_next, write_next, Error as CodecError, StacksMessageCodec};
 use stacks_common::types::chainstate::ConsensusHash;
 use stacks_common::util::get_epoch_time_secs;
diff --git a/stacks-signer/src/tests/chainstate.rs b/stacks-signer/src/tests/chainstate.rs
@@ -31,7 +31,6 @@ use clarity::types::chainstate::{BurnchainHeaderHash, SortitionId};
 use clarity::util::vrf::VRFProof;
 use libsigner::v0::messages::RejectReason;
 use libsigner::{BlockProposal, BlockProposalData};
-use slog::slog_info;
 use stacks_common::bitvec::BitVec;
 use stacks_common::consts::CHAIN_ID_TESTNET;
 use stacks_common::info;
diff --git a/stacks-signer/src/v0/signer.rs b/stacks-signer/src/v0/signer.rs
@@ -40,7 +40,6 @@ use libsigner::v0::messages::{
     RejectReason, RejectReasonPrefix, SignerMessage,
 };
 use libsigner::{BlockProposal, SignerEvent};
-use slog::{slog_debug, slog_error, slog_info, slog_warn};
 use stacks_common::types::chainstate::StacksAddress;
 use stacks_common::util::get_epoch_time_secs;
 use stacks_common::util::secp256k1::MessageSignature;
diff --git a/stacks-signer/src/v0/signer_state.rs b/stacks-signer/src/v0/signer_state.rs
@@ -22,7 +22,6 @@ use libsigner::v0::messages::{
     StateMachineUpdateMinerState,
 };
 use serde::{Deserialize, Serialize};
-use slog::{slog_info, slog_warn};
 use stacks_common::bitvec::BitVec;
 use stacks_common::codec::Error as CodecError;
 use stacks_common::types::chainstate::{ConsensusHash, StacksBlockId, TrieHash};
diff --git a/stacks-signer/src/v0/tests.rs b/stacks-signer/src/v0/tests.rs
@@ -18,7 +18,6 @@ use std::sync::LazyLock;
 use blockstack_lib::chainstate::nakamoto::NakamotoBlock;
 use libsigner::v0::messages::{BlockResponse, RejectReason};
 use libsigner::BlockProposal;
-use slog::{slog_info, slog_warn};
 use stacks_common::types::chainstate::StacksPublicKey;
 use stacks_common::util::get_epoch_time_secs;
 use stacks_common::util::tests::TestFlag;
diff --git a/stackslib/src/main.rs b/stackslib/src/main.rs
@@ -22,9 +22,6 @@
 #[macro_use]
 extern crate stacks_common;
 
-#[macro_use(slog_debug, slog_info, slog_warn)]
-extern crate slog;
-
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_arch = "arm")))]
 use tikv_jemallocator::Jemalloc;
 

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ macro_rules! trace {`
`268`	`268`	`($($arg:tt)*) => ({`
`269`	`269`	`let cur_level = $crate::util::log::get_loglevel();`
`270`	`270`	`if slog::Level::Trace.is_at_least(cur_level) {`
`271`		`- slog_trace!($crate::util::log::LOGGER, $($arg)*)`
	`271`	`+ slog::slog_trace!($crate::util::log::LOGGER, $($arg)*)`
`272`	`272`	`}`
`273`	`273`	`})`
`274`	`274`	`}`
`@@ -278,7 +278,7 @@ macro_rules! error {`
`278`	`278`	`($($arg:tt)*) => ({`
`279`	`279`	`let cur_level = $crate::util::log::get_loglevel();`
`280`	`280`	`if slog::Level::Error.is_at_least(cur_level) {`
`281`		`- slog_error!($crate::util::log::LOGGER, $($arg)*)`
	`281`	`+ slog::slog_error!($crate::util::log::LOGGER, $($arg)*)`
`282`	`282`	`}`
`283`	`283`	`})`
`284`	`284`	`}`
`@@ -288,7 +288,7 @@ macro_rules! warn {`
`288`	`288`	`($($arg:tt)*) => ({`
`289`	`289`	`let cur_level = $crate::util::log::get_loglevel();`
`290`	`290`	`if slog::Level::Warning.is_at_least(cur_level) {`
`291`		`- slog_warn!($crate::util::log::LOGGER, $($arg)*)`
	`291`	`+ slog::slog_warn!($crate::util::log::LOGGER, $($arg)*)`
`292`	`292`	`}`
`293`	`293`	`})`
`294`	`294`	`}`
`@@ -298,7 +298,7 @@ macro_rules! info {`
`298`	`298`	`($($arg:tt)*) => ({`
`299`	`299`	`let cur_level = $crate::util::log::get_loglevel();`
`300`	`300`	`if slog::Level::Info.is_at_least(cur_level) {`
`301`		`- slog_info!($crate::util::log::LOGGER, $($arg)*)`
	`301`	`+ slog::slog_info!($crate::util::log::LOGGER, $($arg)*)`
`302`	`302`	`}`
`303`	`303`	`})`
`304`	`304`	`}`
`@@ -308,7 +308,7 @@ macro_rules! debug {`
`308`	`308`	`($($arg:tt)*) => ({`
`309`	`309`	`let cur_level = $crate::util::log::get_loglevel();`
`310`	`310`	`if slog::Level::Debug.is_at_least(cur_level) {`
`311`		`- slog_debug!($crate::util::log::LOGGER, $($arg)*)`
	`311`	`+ slog::slog_debug!($crate::util::log::LOGGER, $($arg)*)`
`312`	`312`	`}`
`313`	`313`	`})`
`314`	`314`	`}`
`@@ -318,7 +318,7 @@ macro_rules! fatal {`
`318`	`318`	`($($arg:tt)*) => ({`
`319`	`319`	`let cur_level = $crate::util::log::get_loglevel();`
`320`	`320`	`if slog::Level::Critical.is_at_least(cur_level) {`
`321`		`- slog_crit!($crate::util::log::LOGGER, $($arg)*)`
	`321`	`+ slog::slog_crit!($crate::util::log::LOGGER, $($arg)*)`
`322`	`322`	`}`
`323`	`323`	`})`
`324`	`324`	`}`