Merge branch 'develop' into next

.cargo/config

@@ -1,3 +1,2 @@
 [alias]
-stacks-node = "run --package stacks-node --"
-puppet-chain = "run --package puppet-chain --"
+stacks-node = "run --package stacks-node --"

.github/workflows/bitcoin-tests.yml

@@ -40,6 +40,7 @@ jobs:
         test-name:
           - tests::neon_integrations::miner_submit_twice
           - tests::neon_integrations::microblock_integration_test
+          - tests::neon_integrations::microblock_fork_poison_integration_test
           - tests::neon_integrations::size_check_integration_test
           - tests::neon_integrations::cost_voting_integration
           - tests::integrations::integration_test_get_info
@@ -59,7 +60,6 @@ jobs:
           - tests::neon_integrations::antientropy_integration_test
           - tests::neon_integrations::filter_low_fee_tx_integration_test
           - tests::neon_integrations::filter_long_runtime_tx_integration_test
-          - tests::neon_integrations::mining_transactions_is_fair
           - tests::neon_integrations::microblock_large_tx_integration_test_FLAKY
           - tests::neon_integrations::block_large_tx_integration_test
           - tests::neon_integrations::microblock_limit_hit_integration_test
@@ -70,6 +70,11 @@ jobs:
           - tests::neon_integrations::test_flash_block_skip_tenure
           - tests::neon_integrations::test_chainwork_first_intervals
           - tests::neon_integrations::test_chainwork_partial_interval
+          - tests::neon_integrations::test_problematic_txs_are_not_stored
+          - tests::neon_integrations::test_problematic_blocks_are_not_mined
+          - tests::neon_integrations::test_problematic_blocks_are_not_relayed_or_stored
+          - tests::neon_integrations::test_problematic_microblocks_are_not_mined
+          - tests::neon_integrations::test_problematic_microblocks_are_not_relayed_or_stored
           - tests::epoch_205::test_dynamic_db_method_costs
           - tests::epoch_205::transition_empty_blocks
           - tests::epoch_205::test_cost_limit_switch_version205

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'The tag to create (optional)'
+        description: "The tag to create (optional)"
         required: false
 
 concurrency:
@@ -110,7 +110,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        platform: [ windows-x64, macos-x64, macos-arm64, linux-x64, linux-musl-x64, linux-armv7, linux-arm64 ]
+        platform:
+          [
+            windows-x64,
+            macos-x64,
+            macos-arm64,
+            linux-x64,
+            linux-musl-x64,
+            linux-armv7,
+            linux-arm64,
+          ]
 
     steps:
       - uses: actions/checkout@v2
@@ -131,7 +140,7 @@ jobs:
             STACKS_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }}
             GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
             GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
-          
+
       - name: Compress artifact
         run: zip --junk-paths ${{ matrix.platform }} ./dist/${{ matrix.platform }}/*
 
@@ -141,14 +150,14 @@ jobs:
           name: ${{ matrix.platform }}
           path: ${{ matrix.platform }}.zip
 
-  call-docker-platforms-workflow:
-    if: ${{ github.event.inputs.tag != '' }}
-    uses: stacks-network/stacks-blockchain/.github/workflows/docker-platforms.yml@master
-    with:
-      tag: ${{ github.event.inputs.tag }}
-    secrets:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+#  call-docker-platforms-workflow:
+#    if: ${{ github.event.inputs.tag != '' }}
+#    uses: stacks-network/stacks-blockchain/.github/workflows/docker-platforms.yml@master
+#    with:
+#      tag: ${{ github.event.inputs.tag }}
+#    secrets:
+#      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+#      DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
 
   # Build docker image, tag it with the git tag and `latest` if running on master branch, and publish under the following conditions
   # Will publish if:
@@ -290,7 +299,16 @@ jobs:
       - create-release
     strategy:
       matrix:
-        platform: [ windows-x64, macos-x64, macos-arm64, linux-x64, linux-musl-x64, linux-armv7, linux-arm64 ]
+        platform:
+          [
+            windows-x64,
+            macos-x64,
+            macos-arm64,
+            linux-x64,
+            linux-musl-x64,
+            linux-armv7,
+            linux-arm64,
+          ]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/docs-pr.yml

@@ -19,7 +19,7 @@ on:
   push:
     branches: [master]
 
-jobs:      
+jobs:
   dist:
     runs-on: ubuntu-latest
     env:

.gitignore

@@ -59,6 +59,7 @@ testnet/index.html
 # will have compiled files and executables
 /target/
 /testnet/helium/target/
+/contrib/tools/puppet-chain/target/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk