Merge branch 'develop' into fix/clone-double-reference

Author: jcnelson

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

@@ -6,10 +6,10 @@ COPY . .
 
 RUN cargo test --no-run --workspace
 
-RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-0.20.0/bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
-RUN cd / && tar -xvzf bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
+RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-25.0/bitcoin-25.0-x86_64-linux-gnu.tar.gz
+RUN cd / && tar -xvzf bitcoin-25.0-x86_64-linux-gnu.tar.gz
 
-RUN ln -s /bitcoin-0.20.0/bin/bitcoind /bin/
+RUN ln -s /bitcoin-25.0/bin/bitcoind /bin/
 
 ENV BITCOIND_TEST 1
 WORKDIR /src/testnet/stacks-node

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

@@ -15,9 +15,9 @@ ENV RUSTFLAGS="-Cinstrument-coverage" \
 RUN cargo test --no-run && \
     cargo build
 
-RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-0.20.0/bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
-RUN cd / && tar -xvzf bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
+RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-25.0/bitcoin-25.0-x86_64-linux-gnu.tar.gz
+RUN cd / && tar -xvzf bitcoin-25.0-x86_64-linux-gnu.tar.gz
 
-RUN ln -s /bitcoin-0.20.0/bin/bitcoind /bin/
+RUN ln -s /bitcoin-25.0/bin/bitcoind /bin/
 
 ENV BITCOIND_TEST 1

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

@@ -4,12 +4,15 @@ WORKDIR /src
 
 COPY . .
 
-RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-0.20.0/bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
-RUN cd / && tar -xvzf bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
+RUN apt-get update && apt-get install -y libclang-dev
 
-RUN ln -s /bitcoin-0.20.0/bin/bitcoind /bin/
+RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-25.0/bitcoin-25.0-x86_64-linux-gnu.tar.gz
+RUN cd / && tar -xvzf bitcoin-25.0-x86_64-linux-gnu.tar.gz
+
+RUN ln -s /bitcoin-25.0/bin/bitcoind /bin/
 
 RUN rustup component add llvm-tools-preview && \
+    rustup component add rustfmt && \
     cargo install grcov
 
 ENV RUSTFLAGS="-Cinstrument-coverage" \

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

@@ -4,11 +4,11 @@ WORKDIR /src
 
 COPY . .
 
-RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-0.20.0/bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
-RUN cd / && tar -xvzf bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
+RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-25.0/bitcoin-25.0-x86_64-linux-gnu.tar.gz
+RUN cd / && tar -xvzf bitcoin-25.0-x86_64-linux-gnu.tar.gz
 
-RUN ln -s /bitcoin-0.20.0/bin/bitcoind /bin/
-RUN ln -s /bitcoin-0.20.0/bin/bitcoin-cli /bin/
+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

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

@@ -9,12 +9,13 @@ WORKDIR /src
 
 COPY . .
 
-RUN apt-get update && apt-get install -y git
+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 --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
+RUN 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} \
     && mkdir -p /out \
     && cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out

.github/workflows/bitcoin-tests.yml

@@ -31,6 +31,7 @@ jobs:
       - name: Reclaim disk space
         id: cleanup
         run: |
+          sudo apt-get update
           sudo apt-get remove -y '^dotnet-.*'
           sudo apt-get remove -y '^llvm-.*'
           sudo apt-get remove -y 'php.*'
@@ -138,6 +139,8 @@ jobs:
           - tests::neon_integrations::bad_microblock_pubkey
           - tests::epoch_24::fix_to_pox_contract
           - tests::epoch_24::verify_auto_unlock_behavior
+          - tests::stackerdb::test_stackerdb_load_store
+          - tests::stackerdb::test_stackerdb_event_observer
     steps:
       - name: Checkout the latest code
         id: git_checkout

.github/workflows/image-build-alpine-binary.yml

@@ -39,6 +39,7 @@ jobs:
         run: |
           echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV
           echo "GITHUB_REF_SHORT=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+          echo "DOCKER_PUSH=${{ (secrets.DOCKERHUB_USERNAME != '') && (secrets.DOCKERHUB_PASSWORD != '') }}" >> $GITHUB_ENV
       - name: Set up QEMU
         id: docker_qemu
         uses: docker/setup-qemu-action@v2
@@ -62,6 +63,8 @@ jobs:
       - name: Login to DockerHub
         id: docker_login
         uses: docker/login-action@v2
+        # Only attempt login and push if we have credentials
+        if: env.DOCKER_PUSH == 'true'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -78,4 +81,4 @@ jobs:
             STACKS_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
             GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
             GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
-          push: true
+          push: ${{ env.DOCKER_PUSH }}

.github/workflows/image-build-debian-binary.yml

@@ -49,6 +49,7 @@ jobs:
         run: |
           echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV
           echo "GITHUB_REF_SHORT=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+          echo "DOCKER_PUSH=${{ (secrets.DOCKERHUB_USERNAME != '') && (secrets.DOCKERHUB_PASSWORD != '') }}" >> $GITHUB_ENV
       - name: Set up QEMU
         id: docker_qemu
         uses: docker/setup-qemu-action@v2
@@ -73,6 +74,8 @@ jobs:
       - name: Login to DockerHub
         id: docker_login
         uses: docker/login-action@v2
+        # Only attempt login and push if we have credentials
+        if: env.DOCKER_PUSH == 'true'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -89,4 +92,4 @@ jobs:
             STACKS_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
             GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
             GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
-          push: true
+          push: ${{ env.DOCKER_PUSH }}

.github/workflows/image-build-debian-source.yml

@@ -46,6 +46,7 @@ jobs:
         run: |
           echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV
           echo "GITHUB_REF_SHORT=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+          echo "DOCKER_PUSH=${{ (secrets.DOCKERHUB_USERNAME != '') && (secrets.DOCKERHUB_PASSWORD != '') }}" >> $GITHUB_ENV
       - name: Set up QEMU
         id: docker_qemu
         uses: docker/setup-qemu-action@v2
@@ -72,6 +73,8 @@ jobs:
       - name: Login to DockerHub
         id: docker_login
         uses: docker/login-action@v2
+        # Only attempt login and push if we have credentials
+        if: env.DOCKER_PUSH == 'true'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -87,4 +90,4 @@ jobs:
             STACKS_NODE_VERSION=${{ env.GITHUB_SHA_SHORT }}
             GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
             GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
-          push: true
+          push: ${{ env.DOCKER_PUSH }}

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

@@ -61,6 +61,7 @@ jobs:
         #  LLVM_PROFILE_FILE: stacks-blockchain-%p-%m.profraw
         run: |
           cargo nextest run --workspace
+          cargo nextest run --package clarity --features developer-mode
       - name: Collate grcov
         # grcov doesn't work with cargo nextest currently, getting
         #  that to work again will have to happen separately. Getting unit