Merge pull request #4262 from stacks-network/release/2.5.0.1.0

Release/2.4.0.1.0 RC1

Author: wileyj

.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.code-cov

@@ -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.generic.bitcoin-tests

@@ -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.large-genesis

@@ -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/bitcoin-int-tests/Dockerfile.net-tests

@@ -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/actions/dockerfiles/Dockerfile.debian-source

@@ -36,7 +36,9 @@ jobs:
       - name: Setup Test Environment
         id: setup_tests
         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/atlas-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 ## forced failure
+          - tests::neon_integrations::antientropy_integration_test 
           - tests::neon_integrations::bad_microblock_pubkey
           - tests::neon_integrations::bitcoind_forking_test
           - tests::neon_integrations::bitcoind_integration_test
@@ -75,7 +75,9 @@ jobs:
       - name: Setup Test Environment
         id: setup_tests
         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/bitcoin-tests.yml

@@ -44,6 +44,7 @@ jobs:
         uses: stacks-network/actions/stacks-core/cache/bitcoin@main
         with:
           action: save
+          btc-version: "25.0"
 
   ## Cache nextest archives for tests
   nextest-archive:

.github/workflows/create-cache.yml

@@ -59,7 +59,9 @@ jobs:
       - name: Setup Test Environment
         id: setup_tests
         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