Chore/merge develop to aac client breaking

.github/actions/dockerfiles/Dockerfile.alpine-binary

@@ -31,7 +31,7 @@ RUN case "${TAG}" in \
             ;; \
         *) \
             echo "/bin/stacks-node mainnet" > /tmp/command.sh && \
-            rm /bin/blockstack-cli /bin/clarity-cli /bin/stacks-events /bin/stacks-inspect \
+            rm /bin/stacks-cli /bin/clarity-cli /bin/stacks-inspect \
             ;; \
     esac && \
     chmod +x /tmp/command.sh

.github/actions/dockerfiles/Dockerfile.debian-binary

@@ -31,7 +31,7 @@ RUN case "${TAG}" in \
             ;; \
         *) \
             echo "/bin/stacks-node mainnet" > /tmp/command.sh && \
-            rm /bin/blockstack-cli /bin/clarity-cli /bin/stacks-events /bin/stacks-inspect \
+            rm /bin/stacks-cli /bin/clarity-cli /bin/stacks-inspect \
             ;; \
     esac && \
     chmod +x /tmp/command.sh

.github/workflows/github-release.yml

@@ -62,7 +62,7 @@ jobs:
       inputs.node_tag != '' ||
       inputs.signer_tag != ''
     name: Build Binaries
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     needs:
       - andon-cord
     permissions:

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

@@ -11,6 +11,7 @@ env:
   RUST_BACKTRACE: full
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3
   TEST_TIMEOUT: 30
+  CI: true  # Required by insta snapshot tests to run in CI
 
 concurrency:
   group: stacks-core-tests-${{ github.head_ref || github.ref || github.run_id }}

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## Unreleased
 
+### Changed
+
+- Renamed Clarity 4's new `block-time` to `stacks-block-time`
+
+## [3.2.0.0.2]
+
 ### Added
 
 - Renamed `clarity-serialization` to `clarity-types`.
@@ -21,6 +27,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
   - `block-time`
   - `to-ascii?`
 - Added `contract_cost_limit_percentage` to the miner config file — sets the percentage of a block’s execution cost at which, if a large non-boot contract call would cause a BlockTooBigError, the miner will stop adding further non-boot contract calls and only include STX transfers and boot contract calls for the remainder of the block.
+- Fixed a bug caused by a miner winning a sortition with a block commit that pointed to a previous tip, which would cause the miner to try and reorg itself. [#6481](https://github.com/stacks-network/stacks-core/issues/6481)
 
 ### Changed
 

Cargo.toml

@@ -55,3 +55,8 @@ lto = "fat"
 [profile.release-lite]
 inherits = "release"
 lto = "thin"
+
+# faster tests for `insta` https://docs.rs/insta/1.43.2/insta/#optional-faster-runs
+[profile.dev.package]
+insta.opt-level = 3
+similar.opt-level = 3