Merge branch 'develop' into feat/tx-replay-failsafe

Author: hstove

.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-serialization -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
 clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing"
 
 # Uncomment to improve performance slightly, at the cost of portability

.github/workflows/github-release.yml

@@ -90,6 +90,8 @@ jobs:
             cpu: armv7
           - arch: macos # excludes macos-armv7
             cpu: armv7
+          - arch: macos # excludes macos-x64
+            cpu: x86_64
     steps:
       - name: Build Binary (${{ matrix.arch }}_${{ matrix.cpu }})
         uses: stacks-network/actions/stacks-core/release/create-source-binary@main

.github/workflows/stacks-core-tests.yml

@@ -71,6 +71,15 @@ jobs:
           validate: "true"
           redocly-version: "1.34"
 
+  ## Generate and upload node configuration documentation
+  node-config-docsgen:
+    name: Node Configuration Documentation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate Node Configuration Documentation
+        id: node_config_docsgen
+        uses: stacks-network/actions/stacks-core/node-config-docsgen@main
+
   ## Disabled
   ##   - this test can take several hours to run
   nettest:
@@ -141,6 +150,7 @@ jobs:
     if: always()
     needs:
       - open-api-validation
+      - node-config-docsgen
       - core-contracts-clarinet-test
     steps:
       - name: Check Tests Status

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
+## Unreleased
+
+### Fixed
+
+- Fixed a typo in the metrics_identifier route from `/v2/stackedb/:principal/:contract_name/replicas` to `/v2/stackerdb/:principal/:contract_name/replicas`. Note: This may be a breaking change for systems relying on the incorrect route. Please update any metrics tools accordingly.
+
 ## [3.2.0.0.0]
 
 ### Added

Cargo.lock

@@ -4,6 +4,7 @@ members = [
     "stackslib",
     "stacks-common",
     "pox-locking",
+    "clarity-serialization",
     "clarity",
     "stx-genesis",
     "libstackerdb",
@@ -12,8 +13,6 @@ members = [
     "stacks-node",
     "contrib/tools/config-docs-generator"]
 
-exclude = ["contrib/clarity-serialization"]
-
 # Dependencies we want to keep the same between workspace members
 [workspace.dependencies]
 ed25519-dalek = { version = "2.1.1", default-features = false }

Cargo.toml

@@ -10,17 +10,17 @@ keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized"
 readme = "README.md"
 
 [dependencies]
-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
 regex = { version = "1", default-features = false }
-serde = { version = "1", features = ["derive"] }
-serde_derive = { version = "1" }
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-stacks_common = { package = "stacks-common", path = "../../stacks-common", default-features = false }
-thiserror = { version = "1.0.65" }
+serde = { workspace = true }
+serde_derive = { workspace = true }
+slog = { workspace = true }
+stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 mutants = "0.0.3"
-test-case = { version = "3.3.1", default-features = false }
+rstest = "0.17.0"
 
 [features]
 default = []