Merge branch 'develop' into fix/health-v3-use-canonical-stacks-height-header

Author: Jiloc

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,4 +20,3 @@
 - [ ] Changelog is updated
 - [ ] Required documentation changes (e.g., `docs/rpc/openapi.yaml` and `rpc-endpoints.md` for v2 endpoints, `event-dispatcher.md` for new events)
 - [ ] New clarity functions have corresponding PR in `clarity-benchmarking` repo
-- [ ] New integration test(s) added to `bitcoin-tests.yml`

.github/workflows/bitcoin-tests.yml

@@ -58,7 +58,6 @@ jobs:
         exclude:
           # The following tests are excluded from CI runs. Some of these may be
           #  worth investigating adding back into the CI
-          - test-name: tests::bitcoin_regtest::bitcoind_integration_test_segwit
           - test-name: tests::nakamoto_integrations::consensus_hash_event_dispatcher
           - test-name: tests::neon_integrations::atlas_integration_test
           - test-name: tests::neon_integrations::atlas_stress_integration_test

.github/workflows/cargo-hack-check.yml

@@ -116,3 +116,24 @@ jobs:
 
       - name: Run cargo hack check
         run: ${{ matrix.command }}
+
+  fuzz-targets:
+    name: Fuzz targets (nightly)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - name: Install Rust nightly toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
+        with:
+          toolchain: nightly
+
+      - name: Check fuzz targets
+        run: |
+          cargo +nightly check \
+            --manifest-path clarity/fuzz/Cargo.toml \
+            --bins \
+            --locked

.github/workflows/github-release.yml

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

CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## Unreleased
 
+### Added
+
+- When determining a global transaction replay set, the state evaluator now uses a longest-common-prefix algorithm to find a replay set in the case where a single replay set has less than 70% of signer weight.
+
+## [3.2.0.0.1]
+### Added
+
+- Adds node-config-docsgen to automatically create config documentation (#6227)
+
 ### 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.

Cargo.lock

@@ -11,7 +11,9 @@ members = [
     "libsigner",
     "stacks-signer",
     "stacks-node",
-    "contrib/tools/config-docs-generator"]
+]
+
+exclude = ["contrib/tools/config-docs-generator"]
 
 # Dependencies we want to keep the same between workspace members
 [workspace.dependencies]