Merge pull request #6012 from stacks-network/release/3.1.0.0.8

Merge release/3.1.0.0.8 to master

Author: wileyj

.cargo/config.toml

@@ -12,4 +12,3 @@ clippy-stacks = "clippy -p libstackerdb -p stacks-signer -p pox-locking -p clari
 #[target.x86_64-unknown-linux-gnu]
 #linker = "/usr/bin/clang"
 #rustflags = ["-Clink-arg=-fuse-ld=lld", "-Clink-arg=-Wl,--no-rosegment"]
-

.dockerignore

@@ -1,14 +1,3 @@
 Dockerfile*
 target
-integration_tests/blockstack-consensus-data/
-integration_tests/test-out/
-api/data
-.git
-.venv
 .dockerignore
-testnet/index.html
-testnet.log
-testnet-logs*
-legacy
-build-scripts
-dist

.gitattributes

@@ -1,2 +1,6 @@
 legacy/* linguist-vendored
-* text=lf
+# Enforcing 'lf' eol mainly for:
+# - 'stx-genesis' package, where txt files need hash computation and comparison
+# - 'clarity' package, where clarity language is sensitive to line endings for .clar files
+# anyhow, setting eol for all text files to have a homogeneous management over the whole code base
+* text eol=lf

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

@@ -70,30 +70,13 @@ jobs:
           - test-name: tests::neon_integrations::lockup_integration
           - test-name: tests::neon_integrations::most_recent_utxo_integration_test
           - test-name: tests::neon_integrations::run_with_custom_wallet
-          - test-name: tests::neon_integrations::test_competing_miners_build_anchor_blocks_and_microblocks_on_same_chain
           - test-name: tests::neon_integrations::test_competing_miners_build_anchor_blocks_on_same_chain_without_rbf
           - test-name: tests::neon_integrations::test_one_miner_build_anchor_blocks_on_same_chain_without_rbf
           - test-name: tests::signer::v0::tenure_extend_after_2_bad_commits
           - test-name: tests::stackerdb::test_stackerdb_event_observer
           - test-name: tests::stackerdb::test_stackerdb_load_store
-          # Microblock tests that are no longer needed on every CI run
-          #  (microblocks are unsupported starting in Epoch 2.5)
-          - test-name: tests::neon_integrations::bad_microblock_pubkey
-          - test-name: tests::neon_integrations::microblock_fork_poison_integration_test
-          - test-name: tests::neon_integrations::microblock_integration_test
-          - test-name: tests::neon_integrations::microblock_large_tx_integration_test_FLAKY
-          - test-name: tests::neon_integrations::microblock_limit_hit_integration_test
-          - test-name: tests::neon_integrations::microblock_miner_multiple_attempts
-          - test-name: tests::neon_integrations::test_problematic_microblocks_are_not_mined
-          - test-name: tests::neon_integrations::test_problematic_microblocks_are_not_relayed_or_stored
-          - test-name: tests::neon_integrations::runtime_overflow_unconfirmed_microblocks_integration_test
-          - test-name: tests::neon_integrations::size_overflow_unconfirmed_invalid_stream_microblocks_integration_test
-          - test-name: tests::neon_integrations::size_overflow_unconfirmed_microblocks_integration_test
-          - test-name: tests::neon_integrations::size_overflow_unconfirmed_stream_microblocks_integration_test
-          - test-name: tests::epoch_25::microblocks_disabled
           # Epoch tests are covered by the epoch-tests CI workflow, and don't need to run
           #  on every PR (for older epochs)
-          - test-name: tests::epoch_205::bigger_microblock_streams_in_2_05
           - test-name: tests::epoch_205::test_cost_limit_switch_version205
           - test-name: tests::epoch_205::test_dynamic_db_method_costs
           - test-name: tests::epoch_205::test_exact_block_costs
@@ -123,6 +106,13 @@ jobs:
           - test-name: tests::epoch_24::verify_auto_unlock_behavior
           # Disable this flaky test. We don't need continue testing Epoch 2 -> 3 transition
           - test-name: tests::nakamoto_integrations::flash_blocks_on_epoch_3_FLAKY
+          # These mempool tests take a long time to run, and are meant to be run manually
+          - test-name: tests::nakamoto_integrations::large_mempool_original_constant_fee
+          - test-name: tests::nakamoto_integrations::large_mempool_original_random_fee
+          - test-name: tests::nakamoto_integrations::large_mempool_next_constant_fee
+          - test-name: tests::nakamoto_integrations::large_mempool_next_random_fee
+          - test-name: tests::nakamoto_integrations::larger_mempool
+          - test-name: tests::signer::v0::larger_mempool
 
     steps:
       ## Setup test environment

.github/workflows/bitcoin-tests.yml

@@ -94,6 +94,7 @@ jobs:
     needs:
       - rustfmt
       - check-release
+    secrets: inherit 
     uses: ./.github/workflows/github-release.yml
     with:
       node_tag: ${{ needs.check-release.outputs.node_tag }}
@@ -102,22 +103,6 @@ jobs:
       signer_docker_tag: ${{ needs.check-release.outputs.signer_docker_tag }}
       is_node_release: ${{ needs.check-release.outputs.is_node_release }}
       is_signer_release: ${{ needs.check-release.outputs.is_signer_release }}
-    secrets: inherit
-
-  ## Build and push Debian image built from source
-  ##
-  ## Runs when:
-  ##  - it is not a node or signer-only release run
-  docker-image:
-    if: |
-      needs.check-release.outputs.is_node_release != 'true' ||
-      needs.check-release.outputs.is_signer_release != 'true'
-    name: Docker Image (Source)
-    uses: ./.github/workflows/image-build-source.yml
-    needs:
-      - rustfmt
-      - check-release
-    secrets: inherit
 
   ## Create a reusable cache for tests
   ##

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     steps:
       - name: Checkout latest clarity js sdk
         id: git_checkout
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           token: ${{ secrets.GH_TOKEN }}
           repository: ${{ env.CLARITY_JS_SDK_REPOSITORY }}
@@ -46,7 +46,7 @@ jobs:
 
       - name: Create Pull Request
         id: create_pr
-        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
         with:
           token: ${{ secrets.GH_TOKEN }}
           commit-message: "chore: update clarity-native-bin tag"

.github/workflows/clarity-js-sdk-pr.yml

@@ -7,6 +7,9 @@ name: Clippy Checks
 # Only run when:
 #   - PRs are (re)opened against develop branch
 on:
+  merge_group:
+    types:
+      - checks_requested
   pull_request:
     branches:
       - develop
@@ -22,16 +25,16 @@ jobs:
     steps:
       - name: Checkout the latest code
         id: git_checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Define Rust Toolchain
         id: define_rust_toolchain
         run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
       - name: Setup Rust Toolchain
         id: setup_rust_toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
           components: clippy
       - name: Clippy
         id: clippy
-        run: cargo clippy-stacks
+        run: cargo clippy-stacks

.github/workflows/clippy.yml

@@ -12,19 +12,19 @@ jobs:
     steps:
       - name: Checkout the latest code
         id: git_checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Define Rust Toolchain
         id: define_rust_toolchain
         run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
       - name: Setup Rust Toolchain
         id: setup_rust_toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
       - name: Build the binaries
         id: build
         run: |
-          cargo build
+          cargo build --bin stacks-inspect
       - name: Dump constants JSON
         id: consts-dump
         run: cargo run --bin stacks-inspect -- dump-consts | tee out.json

.github/workflows/core-build-tests.yml

@@ -29,7 +29,6 @@ jobs:
       max-parallel: 32
       matrix:
         test-name:
-          - tests::epoch_205::bigger_microblock_streams_in_2_05
           - tests::epoch_205::test_cost_limit_switch_version205
           - tests::epoch_205::test_dynamic_db_method_costs
           - tests::epoch_205::test_exact_block_costs