Merge branch 'develop' into feat/tx-replay-handle-forks

Author: hstove

.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/relay-server /bin/stacks-events /bin/stacks-inspect \
+            rm /bin/blockstack-cli /bin/clarity-cli /bin/stacks-events /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/relay-server /bin/stacks-events /bin/stacks-inspect \
+            rm /bin/blockstack-cli /bin/clarity-cli /bin/stacks-events /bin/stacks-inspect \
             ;; \
     esac && \
     chmod +x /tmp/command.sh

CHANGELOG.md

@@ -5,12 +5,16 @@ 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
+# Unreleased
 
 ### 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.
 
+### Changed
+
+- Changed default mempool walk strategy to `NextNonceWithHighestFeeRate`
+
 ## [3.1.0.0.12]
 
 ### Added

Cargo.lock

@@ -7,7 +7,6 @@ members = [
     "clarity",
     "stx-genesis",
     "libstackerdb",
-    "contrib/tools/relay-server",
     "libsigner",
     "stacks-signer",
     "testnet/stacks-node"]

Cargo.toml

@@ -104,7 +104,6 @@
               (lib.fileset.fileFilter (file: file.hasExt "clar") ../..)
               #
               (craneLib.fileset.commonCargoSources ../../clarity)
-              (craneLib.fileset.commonCargoSources ../../contrib/tools/relay-server)
               (craneLib.fileset.commonCargoSources ../../libsigner)
               (craneLib.fileset.commonCargoSources ../../libstackerdb)
               (craneLib.fileset.commonCargoSources ../../pox-locking)