Merge branch 'develop' into chore/add-http-traffic-heartbeat-log

Author: Jiloc

Cargo.lock

@@ -21,13 +21,8 @@ hashbrown = { workspace = true }
 lazy_static = "1.4.0"
 libc = "0.2"
 libstackerdb = { path = "../libstackerdb" }
-prometheus = { version = "0.9", optional = true }
 serde = "1"
-serde_derive = "1"
-serde_stacker = "0.1"
 slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-slog-term = "2.6.0"
-slog-json = { version = "2.3.0", optional = true }
 stacks-common = { path = "../stacks-common" }
 stackslib = { path = "../stackslib"}
 thiserror = { workspace = true }
@@ -42,15 +37,8 @@ rand = { workspace = true }
 version = "1.0"
 features = ["arbitrary_precision", "unbounded_depth"]
 
-[dependencies.secp256k1]
-version = "0.24.3"
-features = ["serde", "recovery"]
-
 [target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
 sha2 = { version = "0.10", features = ["asm"] }
 
 [target.'cfg(any(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")), any(target_os = "windows")))'.dependencies]
 sha2 = { version = "0.10" }
-
-[features]
-monitoring_prom = ["prometheus"]

libsigner/Cargo.toml

@@ -17,8 +17,6 @@ path = "./src/libstackerdb.rs"
 
 [dependencies]
 serde = "1"
-serde_derive = "1"
-serde_stacker = "0.1"
 stacks-common = { path = "../stacks-common" }
 clarity = { path = "../clarity" }
 

libstackerdb/Cargo.toml

@@ -31,8 +31,6 @@ prometheus = { version = "0.9", optional = true }
 rand_core = "0.6"
 reqwest = { version = "0.11.22", default-features = false, features = ["blocking", "json", "rustls-tls"] }
 serde = "1"
-serde_derive = "1"
-serde_stacker = "0.1"
 slog = { version = "2.5.2", features = [ "max_level_trace" ] }
 slog-json = { version = "2.3.0", optional = true }
 slog-term = "2.6.0"
@@ -62,5 +60,5 @@ features = ["serde", "recovery"]
 
 [features]
 default = []
-monitoring_prom = ["libsigner/monitoring_prom", "prometheus", "tiny_http"]
+monitoring_prom = ["prometheus", "tiny_http"]
 testing = []

stacks-signer/Cargo.toml

@@ -36,21 +36,15 @@ rand_core = { workspace = true }
 rand_chacha = { workspace = true }
 serde = "1"
 serde_derive = "1"
-serde_stacker = "0.1"
-sha3 = "0.10.1"
 ripemd = "0.1.1"
 regex = "1"
 mio = "0.6"
 lazy_static = "1.4.0"
 url = "2.1.0"
 percent-encoding = "2.1.0"
 prometheus = { version = "0.9", optional = true }
-integer-sqrt = "0.1.3"
 slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-slog-term = "2.6.0"
-slog-json = { version = "2.3.0", optional = true }
-chrono = "0.4.19"
-libc = "0.2.82"
+chrono = { version = "0.4.19", optional = true }
 clarity = { path = "../clarity" }
 stacks-common = { path = "../stacks-common" }
 pox-locking = { path = "../pox-locking" }
@@ -97,15 +91,16 @@ rstest = "0.17.0"
 rstest_reuse = "0.5.0"
 mutants = "0.0.3"
 rlimit = "0.10.2"
+chrono = "0.4.19"
 
 [features]
 default = []
 profile-sqlite = []
 disable-costs = []
 developer-mode = ["clarity/developer-mode"]
 monitoring_prom = ["prometheus"]
-slog_json = ["slog-json", "stacks-common/slog_json", "clarity/slog_json", "pox-locking/slog_json"]
-testing = []
+slog_json = ["stacks-common/slog_json", "clarity/slog_json", "pox-locking/slog_json"]
+testing = ["chrono"]
 
 [target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
 sha2 = { version = "0.10", features = ["asm"] }

stackslib/Cargo.toml

@@ -722,6 +722,7 @@ pub mod tests {
     }
 
     #[test]
+    #[cfg(unix)]
     fn test_get_unconfirmed_commits() {
         use std::os::unix::fs::PermissionsExt;
         let shell_code = r#"#!/bin/bash
@@ -808,6 +809,87 @@ EOF
         );
     }
 
+    #[test]
+    #[cfg(windows)]
+    fn test_get_unconfirmed_commits() {
+        let shell_code = r#"@echo off
+(
+echo [
+echo  {
+echo   "txid": "73c318be8cd272a73200b9630089d77a44342d84b2c0d81c937da714152cf402",
+echo   "burn": 555000,
+echo   "address": "1FCcoFSKWvNyhjazNvVdLLw8mGkGdcRMux",
+echo   "input_txid": "ef0dbf0fc4755de5e94843a4da7c1d943571299afb15f32b76bac5d18d8668ce",
+echo   "input_index": 3,
+echo   "pox_addrs": [
+echo       "0014db14133a9dbb1d0e16b60513453e48b6ff2847a9",
+echo       "a91418c42080a1e87fd02dd3fca94c4513f9ecfe741487"
+echo   ]
+echo  }
+echo ]
+)
+"#;
+        let path = "/tmp/test-get-unconfirmed-commits.bat";
+        if fs::metadata(path).is_ok() {
+            fs::remove_file(path).unwrap();
+        }
+        {
+            let mut f = fs::File::create(path).unwrap();
+            f.write_all(shell_code.as_bytes()).unwrap();
+        }
+
+        let ms = MinerStats {
+            unconfirmed_commits_helper: path.to_string(),
+        };
+
+        let mut commits = ms.get_unconfirmed_commits(123, &[]).unwrap();
+        assert_eq!(commits.len(), 1);
+        let commit = commits.pop().unwrap();
+
+        assert_eq!(
+            commit.txid,
+            Txid::from_hex("73c318be8cd272a73200b9630089d77a44342d84b2c0d81c937da714152cf402")
+                .unwrap()
+        );
+        assert_eq!(commit.burn_fee, 555000);
+        assert_eq!(
+            commit.apparent_sender.0,
+            "1FCcoFSKWvNyhjazNvVdLLw8mGkGdcRMux".to_string()
+        );
+        assert_eq!(
+            commit.input.0,
+            Txid::from_hex("ef0dbf0fc4755de5e94843a4da7c1d943571299afb15f32b76bac5d18d8668ce")
+                .unwrap()
+        );
+        assert_eq!(commit.input.1, 3);
+        assert_eq!(commit.block_height, 123);
+
+        assert_eq!(
+            commit.commit_outs,
+            vec![
+                PoxAddress::Addr20(
+                    true,
+                    PoxAddressType20::P2WPKH,
+                    [
+                        219, 20, 19, 58, 157, 187, 29, 14, 22, 182, 5, 19, 69, 62, 72, 182, 255,
+                        40, 71, 169
+                    ]
+                ),
+                PoxAddress::Standard(
+                    StacksAddress::new(
+                        20,
+                        Hash160([
+                            0x18, 0xc4, 0x20, 0x80, 0xa1, 0xe8, 0x7f, 0xd0, 0x2d, 0xd3, 0xfc, 0xa9,
+                            0x4c, 0x45, 0x13, 0xf9, 0xec, 0xfe, 0x74, 0x14
+                        ])
+                    )
+                    .unwrap(),
+                    None
+                )
+            ]
+        );
+    }
+
     #[test]
     fn test_get_spend_and_win_distribution() {
         let active_miners_and_commits = vec![

stackslib/src/config/chain_data.rs

@@ -2883,9 +2883,10 @@ pub mod test {
         pub fn test_path(config: &TestPeerConfig) -> String {
             let random = thread_rng().gen::<u64>();
             let random_bytes = to_hex(&random.to_be_bytes());
+            let cleaned_config_test_name = config.test_name.replace("::", "_");
             format!(
                 "/tmp/stacks-node-tests/units-test-peer/{}-{}",
-                &config.test_name, random_bytes
+                &cleaned_config_test_name, random_bytes
             )
         }
 

stackslib/src/net/mod.rs

@@ -21,22 +21,28 @@ use std::collections::{HashMap, HashSet};
 use clarity::vm::types::{QualifiedContractIdentifier, StandardPrincipalData};
 use rand::prelude::*;
 use rand::thread_rng;
-use rlimit;
 
 use crate::core::PEER_VERSION_TESTNET;
 use crate::net::db::*;
 use crate::net::test::*;
 use crate::net::*;
 use crate::util_lib::test::*;
 
+#[cfg(unix)]
 fn setup_rlimit_nofiles() {
+    use rlimit;
     info!("Attempt to set nofile rlimit to 4096 (required for these tests to run)");
     assert!(rlimit::Resource::NOFILE.get().is_ok());
     let (slimit, hlimit) = rlimit::getrlimit(rlimit::Resource::NOFILE).unwrap();
     rlimit::setrlimit(rlimit::Resource::NOFILE, 4096.max(slimit), hlimit).unwrap();
     info!("Successfully set nofile rlimit to 4096");
 }
 
+#[cfg(windows)]
+fn setup_rlimit_nofiles() {
+    // rlimit empty stub, since windows hasn't a hard file descriptor limit
+}
+
 fn stacker_db_id(i: usize) -> QualifiedContractIdentifier {
     QualifiedContractIdentifier::new(
         StandardPrincipalData::new(0x01, [i as u8; 20]).unwrap(),

stackslib/src/net/tests/convergence.rs

@@ -25,7 +25,6 @@ regex = "1"
 libsigner = { path = "../../libsigner" }
 url = "2.1.0"
 rand = { workspace = true }
-rand_core = { workspace = true }
 hashbrown = { workspace = true }
 rusqlite = { workspace = true }
 async-h1 = { version = "2.3.2", optional = true }
@@ -62,7 +61,7 @@ name = "stacks-events"
 path = "src/stacks_events.rs"
 
 [features]
-monitoring_prom = ["stacks/monitoring_prom", "libsigner/monitoring_prom", "stacks-signer/monitoring_prom", "async-h1", "async-std", "http-types"]
+monitoring_prom = ["stacks/monitoring_prom", "stacks-signer/monitoring_prom", "async-h1", "async-std", "http-types"]
 slog_json = ["stacks/slog_json", "stacks-common/slog_json", "clarity/slog_json"]
 prod-genesis-chainstate = []
 default = []