Chore: Merge next to develop

.cargo/config

@@ -2,7 +2,15 @@
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
 
+# Default to `native`
+# This makes it slightly faster for running tests and locally built binaries.
+# This can cause trouble when building "portable" binaries, such as for docker,
+# so disable it with the "portable" feature.
+[target.'cfg(not(feature = "portable"))']
+rustflags = ["-Ctarget-cpu=native"]
+
 # Needed by perf to generate flamegraphs.
 #[target.x86_64-unknown-linux-gnu]
 #linker = "/usr/bin/clang"
 #rustflags = ["-Clink-arg=-fuse-ld=lld", "-Clink-arg=-Wl,--no-rosegment"]
+

.github/actions/bitcoin-int-tests/Dockerfile.atlas-test

@@ -1,9 +1,11 @@
-FROM rust:bullseye
+FROM rust:bookworm
 
 WORKDIR /src
 
 COPY . .
 
+RUN apt-get -y install libllvm16 libclang1-16
+
 RUN cargo test --no-run --workspace
 
 RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-25.0/bitcoin-25.0-x86_64-linux-gnu.tar.gz

.github/actions/bitcoin-int-tests/Dockerfile.generic.bitcoin-tests

@@ -1,4 +1,4 @@
-FROM rust:bullseye
+FROM rust:bookworm
 
 WORKDIR /src/
 
@@ -12,6 +12,8 @@ RUN rustup component add llvm-tools-preview && \
 ENV RUSTFLAGS="-Cinstrument-coverage" \
     LLVM_PROFILE_FILE="stacks-blockchain-%p-%m.profraw"
 
+RUN apt-get -y install libllvm16 libclang1-16
+
 RUN cargo test --no-run && \
     cargo build
 

.github/actions/bitcoin-int-tests/Dockerfile.large-genesis

@@ -1,4 +1,4 @@
-FROM rust:bullseye AS test
+FROM rust:bookworm AS test
 
 WORKDIR /src
 

.github/actions/bitcoin-int-tests/Dockerfile.net-tests

@@ -1,4 +1,4 @@
-FROM rust:bullseye
+FROM rust:bookworm
 
 WORKDIR /src
 
@@ -11,7 +11,7 @@ RUN ln -s /bitcoin-25.0/bin/bitcoind /bin/
 RUN ln -s /bitcoin-25.0/bin/bitcoin-cli /bin/
 
 RUN apt-get update
-RUN apt-get install -y jq screen net-tools ncat sqlite3 xxd openssl curl
+RUN apt-get install -y jq screen net-tools ncat sqlite3 xxd openssl curl libllvm16 libclang1-16
 
 RUN cargo build --workspace
 

.github/actions/bitcoin-int-tests/Dockerfile.rustfmt

@@ -1,4 +1,4 @@
-FROM rust:bullseye
+FROM rust:bookworm
 
 WORKDIR /src
 

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

@@ -7,16 +7,19 @@ ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 ARG TARGETARCH
 ARG TARGETVARIANT
-ARG REPO=stacks-network/stacks-core
+ARG REPO
 
-RUN case ${TARGETARCH} in \
-    "amd64")  BIN_ARCH=linux-musl-x64  ;; \
-    "arm64")  BIN_ARCH=linux-musl-arm64  ;; \
-    "arm")  BIN_ARCH=linux-musl-armv7  ;; \
-    "*") exit 1 ;; \
+RUN case ${TARGETPLATFORM} in \
+    linux/amd64/v2) BIN_ARCH=linux-glibc-x64-v2 ;; \
+    linux/amd64*) BIN_ARCH=linux-glibc-x64 ;; \
+    linux/arm64*) BIN_ARCH=linux-glibc-arm64 ;; \
+    linux/arm/v7) BIN_ARCH=linux-glibc-armv7 ;; \
+    *) exit 1 ;; \
     esac \
-    && echo "wget  -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \
-    && wget  -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
+    && echo "TARGETPLATFORM: $TARGETPLATFORM" \
+    && echo "BIN_ARCH: $BIN_ARCH" \
+    && echo "wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \
+    && wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
     && unzip ${BIN_ARCH}.zip -d /out
 
 FROM --platform=${TARGETPLATFORM} alpine

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

@@ -7,18 +7,21 @@ ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 ARG TARGETARCH
 ARG TARGETVARIANT
-ARG REPO=stacks-network/stacks-core
+ARG REPO
 
-RUN case ${TARGETARCH} in \
-    "amd64")  BIN_ARCH=linux-musl-x64  ;; \
-    "arm64")  BIN_ARCH=linux-musl-arm64  ;; \
-    "arm")  BIN_ARCH=linux-musl-armv7  ;; \
-    "*") exit 1 ;; \
+RUN case ${TARGETPLATFORM} in \
+    linux/amd64/v2) BIN_ARCH=linux-glibc-x64-v2 ;; \
+    linux/amd64*) BIN_ARCH=linux-glibc-x64 ;; \
+    linux/arm64*) BIN_ARCH=linux-glibc-arm64 ;; \
+    linux/arm/v7) BIN_ARCH=linux-glibc-armv7 ;; \
+    *) exit 1 ;; \
     esac \
-    && echo "wget  -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \
-    && wget  -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
+    && echo "TARGETPLATFORM: $TARGETPLATFORM" \
+    && echo "BIN_ARCH: $BIN_ARCH" \
+    && echo "wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \
+    && wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
     && unzip ${BIN_ARCH}.zip -d /out
 
-FROM --platform=${TARGETPLATFORM} debian:bullseye
+FROM --platform=${TARGETPLATFORM} debian:bookworm
 COPY --from=builder /out/stacks-node /bin/
 CMD ["stacks-node", "mainnet"]

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

@@ -1,25 +1,28 @@
-FROM rust:bullseye as build
+FROM rust:bookworm as build
 
 ARG STACKS_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 ARG BUILD_DIR=/build
 ARG TARGET=x86_64-unknown-linux-gnu
+# Allow us to override the default `--target-cpu` for the given target triplet
+ARG TARGET_CPU
+ENV RUSTFLAGS="${TARGET_CPU:+${RUSTFLAGS} -Ctarget-cpu=${TARGET_CPU}}"
 WORKDIR /src
 
 COPY . .
 
 RUN apt-get update && apt-get install -y git libclang-dev
 
 # Run all the build steps in ramdisk in an attempt to speed things up
-RUN target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
+RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
     && cd ${BUILD_DIR} \
     && rustup target add ${TARGET} \
     && rustup component add rustfmt \
-    && cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
+    && cargo build --features monitoring_prom,slog_json,portable --release --workspace --target ${TARGET} \
     && mkdir -p /out \
     && cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
 
-FROM --platform=${TARGETPLATFORM} debian:bullseye
-COPY --from=build /out/stacks-node /bin/
+FROM --platform=${TARGETPLATFORM} debian:bookworm
+COPY --from=build /out/stacks-node /out/stacks-signer /bin/
 CMD ["stacks-node", "mainnet"]

.github/actions/docsgen/Dockerfile.docsgen

@@ -1,4 +1,4 @@
-FROM rust:bullseye as build
+FROM rust:bookworm as build
 
 WORKDIR /src
 

.github/workflows/bitcoin-tests.yml

@@ -31,7 +31,7 @@ jobs:
         test-name:
           - tests::bitcoin_regtest::bitcoind_integration_test
           - tests::integrations::integration_test_get_info
-          - tests::neon_integrations::antientropy_integration_test 
+          - tests::neon_integrations::antientropy_integration_test
           - tests::neon_integrations::bad_microblock_pubkey
           - tests::neon_integrations::bitcoind_forking_test
           - tests::neon_integrations::bitcoind_integration_test
@@ -59,6 +59,7 @@ jobs:
           - tests::neon_integrations::size_overflow_unconfirmed_stream_microblocks_integration_test
           - tests::neon_integrations::stx_delegate_btc_integration_test
           - tests::neon_integrations::stx_transfer_btc_integration_test
+          - tests::neon_integrations::stack_stx_burn_op_test
           - tests::neon_integrations::test_chainwork_first_intervals
           - tests::neon_integrations::test_chainwork_partial_interval
           - tests::neon_integrations::test_flash_block_skip_tenure
@@ -68,8 +69,25 @@ jobs:
           - tests::neon_integrations::test_problematic_microblocks_are_not_relayed_or_stored
           - tests::neon_integrations::test_problematic_txs_are_not_stored
           - tests::neon_integrations::use_latest_tip_integration_test
+          - tests::neon_integrations::confirm_unparsed_ongoing_ops
           - tests::neon_integrations::min_txs
+          - tests::neon_integrations::vote_for_aggregate_key_burn_op_test
+          - tests::epoch_25::microblocks_disabled
           - tests::should_succeed_handling_malformed_and_valid_txs
+          - tests::nakamoto_integrations::simple_neon_integration
+          - tests::nakamoto_integrations::mine_multiple_per_tenure_integration
+          - tests::nakamoto_integrations::block_proposal_api_endpoint
+          - tests::nakamoto_integrations::miner_writes_proposed_block_to_stackerdb
+          - tests::nakamoto_integrations::correct_burn_outs
+          - tests::nakamoto_integrations::vote_for_aggregate_key_burn_op
+          - tests::nakamoto_integrations::follower_bootup
+          - tests::signer::stackerdb_dkg
+          - tests::signer::stackerdb_sign
+          - tests::signer::stackerdb_block_proposal
+          - tests::signer::stackerdb_filter_bad_transactions
+          - tests::signer::stackerdb_mine_2_nakamoto_reward_cycles
+          - tests::signer::stackerdb_sign_after_signer_reboot
+          - tests::nakamoto_integrations::stack_stx_burn_op_integration_test
           # Do not run this one until we figure out why it fails in CI
           # - tests::neon_integrations::bitcoin_reorg_flap
     steps:
@@ -79,7 +97,7 @@ jobs:
         uses: stacks-network/actions/stacks-core/testenv@main
         with:
           btc-version: "25.0"
-          
+
       ## Run test matrix using restored cache of archive file
       ##   - Test will timeout after env.TEST_TIMEOUT minutes
       - name: Run Tests

.github/workflows/ci.yml

@@ -2,6 +2,9 @@
 name: CI
 
 on:
+  merge_group:
+    types:
+      - checks_requested
   push:
     branches:
       - master
@@ -77,18 +80,18 @@ jobs:
 
       - name: Rustfmt
         id: rustfmt
-        uses: actions-rust-lang/rustfmt@2d1d4e9f72379428552fa1def0b898733fb8472d # v1.1.0
+        uses: stacks-network/actions/rustfmt@main
+        with:
+          alias: "fmt-stacks"
 
   ######################################################################################
   ## Create a tagged github release
   ##
   ## Runs when the following is true:
   ##  - tag is provided
-  ##  - workflow is building default branch (master)
   create-release:
     if: |
-      inputs.tag != '' &&
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Create Release
     needs:
       - rustfmt
@@ -145,6 +148,7 @@ jobs:
           ) ||
           github.event_name == 'workflow_dispatch' ||
           github.event_name == 'pull_request' ||
+          github.event_name == 'merge_group' ||
           (
             contains('
               refs/heads/master

.github/workflows/create-source-binary.yml

@@ -9,12 +9,6 @@ on:
         description: "Tag name of this release (x.y.z)"
         required: true
         type: string
-      arch:
-        description: "Stringified JSON object listing of platform matrix"
-        required: false
-        type: string
-        default: >-
-          ["linux-glibc-x64", "linux-musl-x64", "linux-glibc-arm64", "linux-glibc-armv7", "linux-musl-arm64", "linux-musl-armv7", "macos-x64", "macos-arm64", "windows-x64"]
 
 ## change the display name to the tag being built
 run-name: ${{ inputs.tag }}
@@ -27,44 +21,40 @@ concurrency:
 jobs:
   ## Runs when the following is true:
   ##  - tag is provided
-  ##  - workflow is building default branch (master)
   artifact:
     if: |
-      inputs.tag != '' && 
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Build Binaries
     runs-on: ubuntu-latest
     strategy:
       ## Run a maximum of 10 builds concurrently, using the matrix defined in inputs.arch
       max-parallel: 10
       matrix:
-        platform: ${{ fromJson(inputs.arch) }}
-    steps:
-      ## Setup Docker for the builds
-      - name: Docker setup
-        uses: stacks-network/actions/docker@main
-
-      ## Build the binaries using defined dockerfiles
-      - name: Build Binary (${{ matrix.platform }})
-        id: build_binaries
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # 5.0.0
-        with:
-          file: build-scripts/Dockerfile.${{ matrix.platform }}
-          outputs: type=local,dest=./release/${{ matrix.platform }}
-          build-args: |
-            STACKS_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
-            OS_ARCH=${{ matrix.platform }}
-            GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
-            GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
-
-      ## Compress the binary artifact
-      - name: Compress artifact
-        id: compress_artifact
-        run: zip --junk-paths ${{ matrix.platform }} ./release/${{ matrix.platform }}/*
+        arch:
+          - linux-musl
+          - linux-glibc
+          - macos
+          - windows
+        cpu:
+          - arm64
+          - armv7
+          - x86-64 ## defaults to x86-64-v3 variant - intel haswell (2013) and newer
+          # - x86-64-v2 ## intel nehalem (2008) and newer
+          # - x86-64-v3 ## intel haswell (2013) and newer
+          # - x86-64-v4 ## intel skylake (2017) and newer
+        exclude:
+          - arch: windows # excludes windows-arm64
+            cpu: arm64
+          - arch: windows # excludes windows-armv7
+            cpu: armv7
+          - arch: macos # excludes macos-armv7
+            cpu: armv7
 
-      ## Upload the binary artifact to the github action (used in `github-release.yml` to create a release)
-      - name: Upload artifact
-        id: upload_artifact
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+    steps:
+      - name: Build Binary (${{ matrix.arch }}_${{ matrix.cpu }})
+        id: build_binary
+        uses: stacks-network/actions/stacks-core/create-source-binary@main
         with:
-          path: ${{ matrix.platform }}.zip
+          arch: ${{ matrix.arch }}
+          cpu: ${{ matrix.cpu }}
+          tag: ${{ inputs.tag }}

.github/workflows/github-release.yml

@@ -25,11 +25,9 @@ jobs:
   ##
   ## Runs when the following is true:
   ##  - tag is provided
-  ##  - workflow is building default branch (master)
   build-binaries:
     if: |
-      inputs.tag != '' && 
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Build Binaries
     uses: ./.github/workflows/create-source-binary.yml
     with:
@@ -41,8 +39,7 @@ jobs:
   ##  - workflow is building default branch (master)
   create-release:
     if: |
-      inputs.tag != '' && 
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Create Release
     runs-on: ubuntu-latest
     needs:
@@ -84,8 +81,7 @@ jobs:
   ##  - workflow is building default branch (master)
   docker-image:
     if: |
-      inputs.tag != '' && 
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Docker Image (Binary)
     uses: ./.github/workflows/image-build-binary.yml
     needs: