Merge branch 'develop' into feat/tx-replay-unmineable-only

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

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)