stacks-network · wileyj · Jan 29, 2024 · Oct 2, 2023 · Oct 2, 2023 · Oct 2, 2023
@@ -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

@@ -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
@@ -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" \

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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:

@@ -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

@@ -37,7 +37,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

@@ -37,6 +37,7 @@ jobs:
         uses: stacks-network/actions/stacks-core/testenv@main
         with:
           genesis: true
+          btc-version: "25.0"
 
       ## Run test matrix using restored cache of archive file
       ##   - Test will timeout after env.TEST_TIMEOUT minutes
@@ -84,7 +85,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
@@ -135,25 +138,45 @@ jobs:
   # Core contract tests
   core-contracts-clarinet-test:
     name: Core Contracts Test
+    defaults:
+      run:
+        working-directory: "./contrib/core-contract-tests/"
     runs-on: ubuntu-latest
     steps:
-      ## Checkout the code
       - name: Checkout the latest code
         id: git_checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      ## Use Clarinet to run contract unit-tests and create code coverage file
-      - name: Execute core contract unit tests in Clarinet
+        uses: actions/checkout@v3
+      - name: Execute core contract unit tests with clarinet-sdk
         id: clarinet_unit_test
-        uses: docker://hirosystems/clarinet:1.8.0
+        uses: actions/setup-node@v3
         with:
-          args: test --coverage --manifest-path=./contrib/core-contract-tests/Clarinet.toml
-
+          node-version: 18.x
+          cache: "npm"
+          cache-dependency-path: "./contrib/core-contract-tests/package-lock.json"
+      - run: npm ci
+      - run: npm test
       ## Upload code coverage file
       - name: Code Coverage
         id: codecov
         uses: stacks-network/actions/codecov@main
         with:
           test-name: ${{ matrix.test-name }}
           upload-only: true
-          filename: ./coverage.lcov
+          filename: ./lcov.info
+
+  # Core contract tests on Clarinet v1
+  # Check for false positives/negatives
+  # https://github.com/stacks-network/stacks-blockchain/pull/4031#pullrequestreview-1713341208
+  core-contracts-clarinet-test-clarinet-v1:
+    name: Core Contracts Test Clarinet V1
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        id: git_checkout
+        uses: actions/checkout@v3
+      - name: Execute core contract unit tests in Clarinet
+        id: clarinet_unit_test_v1
+        uses: docker://hirosystems/clarinet:1.7.1
+        with:
+          args: test --manifest-path=./contrib/core-contract-tests/Clarinet.toml contrib/core-contract-tests/tests/bns/name_register_test.ts
+