Merge branch 'develop' into fix/error-during-btc-reorg

Author: aldur

.cargo/config.toml

@@ -1,7 +1,7 @@
 [alias]
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
-clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
+clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings -A clippy::uninlined-format-args"
 
 # Uncomment to improve performance slightly, at the cost of portability
 #   * Note that native binaries may not run on CPUs that are different from the build machine

.vscode/settings.json

@@ -1,12 +1,8 @@
 {
-    "lldb.launch.sourceLanguages": [
-        "rust"
-    ],
-    "rust-analyzer.runnables.extraEnv": {
-        "BITCOIND_TEST": "1"
-    },
-    "rust-analyzer.rustfmt.extraArgs": [
-        "+nightly"
-    ],
-    "files.eol": "\n"
-}
+  "lldb.launch.sourceLanguages": ["rust"],
+  "rust-analyzer.runnables.extraEnv": {
+    "BITCOIND_TEST": "1"
+  },
+  "rust-analyzer.rustfmt.extraArgs": ["+nightly"],
+  "files.eol": "\n"
+}

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 ### Added
 
 - Added a new RPC endpoint `/v3/health` to query the node's health status. The endpoint returns a 200 status code with relevant synchronization information (including the node's current Stacks tip height, the maximum Stacks tip height among its neighbors, and the difference between these two). A user can use the `difference_from_max_peer` value to decide what is a good threshold for them before considering the node out of sync. The endpoint returns a 500 status code if the query cannot retrieve viable data.
+- Improve prometheus metrics to gain more insights into the current state of the mempool
+  - `stacks_node_miner_stop_reason_total`: Counts the number of times the miner stopped mining due to various reasons.
+  - Always report the number of transactions mined in the last attempt, even if there were 0
 
 - Added a new option `--postcondition-mode [allow, deny]` to `blockstack-cli publish` command, to set the post-condition mode to allow or deny on the transaction (default is deny)
 
@@ -20,6 +23,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 ### Fixed
 
 - Fixed an issue that prevented the correct usage of anchor mode options (`--microblock-only`, `--block-only`) when using `blockstack-cli publish` command.
+- Fix several bugs in the mock-miner that caused it to fail to mine blocks in certain conditions
 
 ## [3.1.0.0.12]
 

stacks-common/build.rs

@@ -74,23 +74,22 @@ fn main() {
         "pub const GIT_COMMIT: Option<&'static str> = {git_commit:?};\n",
     ));
     if let Some(git_commit) = git_commit {
-        println!("cargo:rustc-env=GIT_COMMIT={}", git_commit);
+        println!("cargo:rustc-env=GIT_COMMIT={git_commit}");
     }
 
     let git_branch = current_git_branch();
     rust_code.push_str(&format!(
         "pub const GIT_BRANCH: Option<&'static str> = {git_branch:?};\n",
     ));
     if let Some(git_branch) = git_branch {
-        println!("cargo:rustc-env=GIT_BRANCH={}", git_branch);
+        println!("cargo:rustc-env=GIT_BRANCH={git_branch}");
     }
 
     let is_clean = if is_working_tree_clean() { "" } else { "+" };
     rust_code.push_str(&format!(
-        "pub const GIT_TREE_CLEAN: Option<&'static str> = Some(\"{}\");\n",
-        is_clean
+        "pub const GIT_TREE_CLEAN: Option<&'static str> = Some(\"{is_clean}\");\n",
     ));
-    println!("cargo:rustc-env=GIT_TREE_CLEAN={}", is_clean);
+    println!("cargo:rustc-env=GIT_TREE_CLEAN={is_clean}");
 
     let out_dir = env::var_os("OUT_DIR").unwrap();
     let dest_path = Path::new(&out_dir).join("versions.rs");

stacks-common/src/address/c32.rs

@@ -369,7 +369,7 @@ pub fn c32_address_decode(c32_address_str: &str) -> Result<(u8, Vec<u8>), Error>
 
 pub fn c32_address(version: u8, data: &[u8]) -> Result<String, Error> {
     let c32_string = c32_check_encode(version, data)?;
-    Ok(format!("S{}", c32_string))
+    Ok(format!("S{c32_string}"))
 }
 
 #[cfg(test)]

stacks-common/src/address/mod.rs

@@ -56,15 +56,14 @@ impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
             Error::InvalidCrockford32 => write!(f, "Invalid crockford 32 string"),
-            Error::InvalidVersion(ref v) => write!(f, "Invalid version {}", v),
+            Error::InvalidVersion(ref v) => write!(f, "Invalid version {v}"),
             Error::EmptyData => f.write_str("Empty data"),
-            Error::BadByte(b) => write!(f, "invalid base58 character 0x{:x}", b),
+            Error::BadByte(b) => write!(f, "invalid base58 character 0x{b:x}"),
             Error::BadChecksum(exp, actual) => write!(
                 f,
-                "base58ck checksum 0x{:x} does not match expected 0x{:x}",
-                actual, exp
+                "base58ck checksum 0x{actual:x} does not match expected 0x{exp:x}"
             ),
-            Error::InvalidLength(ell) => write!(f, "length {} invalid for this base58 type", ell),
+            Error::InvalidLength(ell) => write!(f, "length {ell} invalid for this base58 type"),
             Error::TooShort(_) => write!(f, "base58ck data not even long enough for a checksum"),
             Error::Other(ref s) => f.write_str(s),
         }

stacks-common/src/bitvec.rs

@@ -246,7 +246,7 @@ impl<const MAX_SIZE: u16> BitVec<MAX_SIZE> {
             .data
             .into_iter()
             .fold(String::new(), |acc, byte| {
-                acc + &format!("{:08b}", byte).chars().rev().collect::<String>()
+                acc + &format!("{byte:08b}").chars().rev().collect::<String>()
             })
             .chars()
             .take(self.len() as usize)

stacks-common/src/codec/mod.rs

@@ -139,15 +139,13 @@ fn read_next_vec<T: StacksMessageCodec + Sized, R: Read>(
         if len > max_items {
             // too many items
             return Err(Error::DeserializeError(format!(
-                "Array has too many items ({} > {}",
-                len, max_items
+                "Array has too many items ({len} > {max_items})"
             )));
         }
     } else if len != num_items {
         // inexact item count
         return Err(Error::DeserializeError(format!(
-            "Array has incorrect number of items ({} != {})",
-            len, num_items
+            "Array has incorrect number of items ({len} != {num_items})"
         )));
     }
 

stacks-common/src/deps_common/bech32/mod.rs

@@ -679,11 +679,11 @@ pub enum Error {
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            Error::MissingSeparator => write!(f, "missing human-readable separator, \"{}\"", SEP),
+            Error::MissingSeparator => write!(f, "missing human-readable separator, \"{SEP}\""),
             Error::InvalidChecksum => write!(f, "invalid checksum"),
             Error::InvalidLength => write!(f, "invalid length"),
-            Error::InvalidChar(n) => write!(f, "invalid character (code={})", n),
-            Error::InvalidData(n) => write!(f, "invalid data point ({})", n),
+            Error::InvalidChar(n) => write!(f, "invalid character (code={n})"),
+            Error::InvalidData(n) => write!(f, "invalid data point ({n})"),
             Error::InvalidPadding => write!(f, "invalid padding"),
             Error::MixedCase => write!(f, "mixed-case strings not allowed"),
         }

stacks-common/src/deps_common/bitcoin/blockdata/script.rs

@@ -111,14 +111,14 @@ impl fmt::Debug for Script {
             if opcode == opcodes::All::OP_PUSHBYTES_0 {
                 f.write_str("OP_0")?;
             } else {
-                write!(f, "{:?}", opcode)?;
+                write!(f, "{opcode:?}")?;
             }
             // Write any pushdata
             if data_len > 0 {
                 f.write_str(" ")?;
                 if index + data_len <= self.0.len() {
                     for ch in &self.0[index..index + data_len] {
-                        write!(f, "{:02x}", ch)?;
+                        write!(f, "{ch:02x}")?;
                     }
                     index += data_len;
                 } else {
@@ -140,7 +140,7 @@ impl fmt::Display for Script {
 impl fmt::LowerHex for Script {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         for &ch in self.0.iter() {
-            write!(f, "{:02x}", ch)?;
+            write!(f, "{ch:02x}")?;
         }
         Ok(())
     }
@@ -149,7 +149,7 @@ impl fmt::LowerHex for Script {
 impl fmt::UpperHex for Script {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         for &ch in self.0.iter() {
-            write!(f, "{:02X}", ch)?;
+            write!(f, "{ch:02X}")?;
         }
         Ok(())
     }
@@ -677,7 +677,7 @@ impl serde::Serialize for Script {
     where
         S: serde::Serializer,
     {
-        serializer.serialize_str(&format!("{:x}", self))
+        serializer.serialize_str(&format!("{self:x}"))
     }
 }