From 42bfdb5d25c525079129e062cc017d784aefa721 Mon Sep 17 00:00:00 2001
From: Giacomo Pasini <Zeegomo@users.noreply.github.com>
Date: Wed, 6 Apr 2022 10:34:43 +0200
Subject: [PATCH] release 0.4.0 (#125)

* release 0.4.0

* Resolve thread_local sec audit

Switch from stderrlog to env_logger and the former depends on a
flawed version of thread_local
---
 Cargo.lock                    | 44 +++++++++++++++++------------------
 Cargo.toml                    |  4 ++--
 src/bin/cli/recovery/tally.rs |  8 +++----
 src/bin/cli/recovery/votes.rs |  8 +++----
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2bd6a8a4..f437e0f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -489,7 +489,7 @@ dependencies = [
 
 [[package]]
 name = "catalyst-toolbox"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "assert_cmd 0.10.2",
  "assert_fs",
@@ -503,6 +503,7 @@ dependencies = [
  "chain-time",
  "chain-vote",
  "csv",
+ "env_logger 0.9.0",
  "futures",
  "gag",
  "graphql_client",
@@ -530,7 +531,6 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "sscanf",
- "stderrlog",
  "structopt",
  "symmetric-cipher",
  "test-strategy",
@@ -736,7 +736,7 @@ name = "chain-vote"
 version = "0.1.0"
 source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund8#45d47303e8fd7534e77d13cbd08cc4253ce6917c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
  "chain-core",
  "chain-crypto",
  "const_format",
@@ -1371,6 +1371,19 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "environmental"
 version = "1.1.3"
@@ -3734,7 +3747,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
 dependencies = [
- "env_logger",
+ "env_logger 0.7.1",
  "log",
  "rand 0.7.3",
  "rand_core 0.5.1",
@@ -4586,19 +4599,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "stderrlog"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a53e2eff3e94a019afa6265e8ee04cb05b9d33fe9f5078b14e4e391d155a38"
-dependencies = [
- "atty",
- "chrono",
- "log",
- "termcolor",
- "thread_local",
-]
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -4926,11 +4926,11 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.0.1"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
- "lazy_static",
+ "once_cell",
 ]
 
 [[package]]
@@ -5282,9 +5282,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.6"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77be66445c4eeebb934a7340f227bfe7b338173d3f8c00a60a5a58005c9faecf"
+checksum = "b9df98b037d039d03400d9dd06b0f8ce05486b5f25e9a2d7d36196e142ebbc52"
 dependencies = [
  "ansi_term",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index d139432a..cf40f06e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "catalyst-toolbox"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 
 authors = ["danielsanchezq <daniel.sanchez@iohk.io>"]
@@ -45,7 +45,7 @@ regex = "1.5"
 serde = "1.0"
 serde_json = "1.0"
 structopt = "0.3"
-stderrlog = "0.5"
+env_logger = "0.9"
 serde_yaml = "0.8.17"
 sscanf = "0.1"
 thiserror = "1.0"
diff --git a/src/bin/cli/recovery/tally.rs b/src/bin/cli/recovery/tally.rs
index 1e653123..a0f54f18 100644
--- a/src/bin/cli/recovery/tally.rs
+++ b/src/bin/cli/recovery/tally.rs
@@ -61,9 +61,9 @@ pub struct ReplayCli {
     #[structopt(flatten)]
     output_format: OutputFormat,
 
-    /// Verbose mode (-v, -vv, -vvv, etc)
-    #[structopt(short = "v", long = "verbose", parse(from_occurrences))]
-    verbose: usize,
+    /// Verbose mode
+    #[structopt(short = "v", long = "verbose")]
+    verbose: log::LevelFilter,
 }
 
 fn read_block0(path: PathBuf) -> Result<Block, Error> {
@@ -87,7 +87,7 @@ impl ReplayCli {
             output_format,
             verbose,
         } = self;
-        stderrlog::new().verbosity(verbose).init().unwrap();
+        env_logger::Builder::new().filter_level(verbose).init();
 
         let block0 = if let Some(path) = block0_path {
             read_block0(path)?
diff --git a/src/bin/cli/recovery/votes.rs b/src/bin/cli/recovery/votes.rs
index 8a0e55aa..32171c4c 100644
--- a/src/bin/cli/recovery/votes.rs
+++ b/src/bin/cli/recovery/votes.rs
@@ -35,9 +35,9 @@ pub struct VotesPrintout {
     #[structopt(flatten)]
     output_format: OutputFormat,
 
-    /// Verbose mode (-v, -vv, -vvv, etc)
-    #[structopt(short = "v", long = "verbose", parse(from_occurrences))]
-    verbose: usize,
+    /// Verbose mode
+    #[structopt(short = "v", long = "verbose")]
+    verbose: log::LevelFilter,
 }
 
 #[derive(Serialize)]
@@ -102,7 +102,7 @@ impl VotesPrintout {
             verbose,
         } = self;
 
-        stderrlog::new().verbosity(verbose).init().unwrap();
+        env_logger::Builder::new().filter_level(verbose).init();
         let reader = std::fs::File::open(block0_path)?;
         let reader = std::io::BufReader::new(reader);
         let block0 = Block::deserialize(&mut Codec::new(reader)).unwrap();