Chore: merge master into develop

.github/workflows/bitcoin-tests.yml

@@ -98,7 +98,13 @@ jobs:
           - tests::epoch_21::test_v1_unlock_height_with_current_stackers
           - tests::epoch_21::test_v1_unlock_height_with_delay_and_current_stackers
           - tests::epoch_21::trait_invocation_cross_epoch
+          - tests::epoch_22::pox_2_unlock_all
+          - tests::epoch_22::disable_pox
+          - tests::epoch_22::test_pox_reorg_one_flap
+          - tests::epoch_23::trait_invocation_behavior
           - tests::neon_integrations::bad_microblock_pubkey
+          - tests::epoch_24::fix_to_pox_contract
+          - tests::epoch_24::verify_auto_unlock_behavior
     steps:
       - uses: actions/checkout@v2
       - name: Download docker image

.github/workflows/ci.yml

@@ -117,9 +117,10 @@ jobs:
       matrix:
         platform:
           [
+            # disable mac builds until osxcross can be updated for bullseye
             windows-x64,
-            macos-x64,
-            macos-arm64,
+            # macos-x64,
+            # macos-arm64,
             linux-x64,
             linux-musl-x64,
             linux-armv7,
@@ -261,7 +262,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           platforms: linux/amd64
-          file: Dockerfile.stretch
+          file: Dockerfile.debian
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
@@ -306,9 +307,10 @@ jobs:
       matrix:
         platform:
           [
+            # disable mac builds until osxcross can be updated for bullseye
             windows-x64,
-            macos-x64,
-            macos-arm64,
+#            macos-x64,
+#            macos-arm64,
             linux-x64,
             linux-musl-x64,
             linux-armv7,

.github/workflows/docker-platforms.yml

@@ -115,7 +115,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           platforms: ${{ env.BUILD_PLATFORMS }}
-          file: Dockerfile.stretch
+          file: Dockerfile.debian
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |

CHANGELOG.md

@@ -21,11 +21,64 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
   runtime error and include details about the error in the `vm_error` field of
   the receipt. Fixes issues #3154, #3328.
 
+- Added config setting `burnchain.wallet_name` which addresses blank wallets no 
+  longer being created by default in recent bitcoin versions. Fixes issue #3596
+
+## [2.4.0.0.0]
+This is a **consensus-breaking** release to revert consensus to PoX, and is the second fork proposed in SIP-022.
+
+- [SIP-022](https://github.com/stacksgov/sips/blob/main/sips/sip-022/sip-022-emergency-pox-fix.md)
+- [SIP-024](https://github.com/stacksgov/sips/blob/main/sips/sip-024/sip-024-least-supertype-fix.md)
+
+### Fixed
+- PoX is re-enabled and stacking resumes starting at Bitcoin block `791551`
+- Peer network id is updated to `0x18000009`
+- Adds the type sanitization described in SIP-024
+
+This release is compatible with chainstate directories from 2.1.0.0.x and 2.3.0.0.x
+
+## [2.3.0.0.2]
+
+This is a high-priority hotfix release to address a bug in the
+stacks-node miner logic which could impact miner availability.
+
+This release is compatible with chainstate directories from 2.3.0.0.x and 2.1.0.0.x
+
+## [2.3.0.0.1]
+
+This is a hotfix release to update:
+- peer version identifier used by the stacks-node p2p network.
+- yield interpreter errors in deser_hex
+
+This release is compatible with chainstate directories from 2.3.0.0.x and 2.1.0.0.x
+
+## [2.3.0.0.0]
+
+This is a **consensus-breaking** release to address a Clarity VM bug discovered in 2.2.0.0.1.
+Tx and read-only calls to functions with traits as parameters are rejected with unchecked TypeValueError.
+Additional context and rationale can be found in [SIP-023](https://github.com/stacksgov/sips/blob/main/sips/sip-023/sip-023-emergency-fix-traits.md).
+
+This release is compatible with chainstate directories from 2.1.0.0.x.
+
+## [2.2.0.0.1]
+
+This is a **consensus-breaking** release to address a bug and DoS vector in pox-2's `stack-increase` function.
+Additional context and rationale can be found in [SIP-022](https://github.com/stacksgov/sips/blob/main/sips/sip-022/sip-022-emergency-pox-fix.md).
+
+This release is compatible with chainstate directories from 2.1.0.0.x.
+
+## [2.1.0.0.3]
+
+This is a high-priority hotfix release to address a bug in the
+stacks-node miner logic which could impact miner availability. This
+release's chainstate directory is compatible with chainstate
+directories from 2.1.0.0.2.
+
 ## [2.1.0.0.2]
 
 This software update is a hotfix to resolve improper unlock handling
 in mempool admission. This release's chainstate directory is
-compatible with chainstate directories from 2.1.0.0.2.
+compatible with chainstate directories from 2.1.0.0.1.
 
 ### Fixed