Merge branch 'next' into 4388-nakamoto-stacks-signer-should-store-its-party-shares-on-the-side-to-enable-restart

Merging instead of rebasing because we're at the end of a PR review process
and some people find rebases disruptive when they are re-reviewing.

Author: netrome

.github/workflows/ci.yml

@@ -89,11 +89,9 @@ jobs:
   ##
   ## Runs when the following is true:
   ##  - tag is provided
-  ##  - workflow is building default branch (master)
   create-release:
     if: |
-      inputs.tag != '' &&
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Create Release
     needs:
       - rustfmt

.github/workflows/create-source-binary.yml

@@ -21,11 +21,9 @@ concurrency:
 jobs:
   ## Runs when the following is true:
   ##  - tag is provided
-  ##  - workflow is building default branch (master)
   artifact:
     if: |
-      inputs.tag != '' &&
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Build Binaries
     runs-on: ubuntu-latest
     strategy:
@@ -60,4 +58,3 @@ jobs:
           arch: ${{ matrix.arch }}
           cpu: ${{ matrix.cpu }}
           tag: ${{ inputs.tag }}
-

.github/workflows/github-release.yml

@@ -25,11 +25,9 @@ jobs:
   ##
   ## Runs when the following is true:
   ##  - tag is provided
-  ##  - workflow is building default branch (master)
   build-binaries:
     if: |
-      inputs.tag != '' && 
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Build Binaries
     uses: ./.github/workflows/create-source-binary.yml
     with:
@@ -41,8 +39,7 @@ jobs:
   ##  - workflow is building default branch (master)
   create-release:
     if: |
-      inputs.tag != '' && 
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Create Release
     runs-on: ubuntu-latest
     needs:
@@ -84,8 +81,7 @@ jobs:
   ##  - workflow is building default branch (master)
   docker-image:
     if: |
-      inputs.tag != '' && 
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Docker Image (Binary)
     uses: ./.github/workflows/image-build-binary.yml
     needs:

.github/workflows/image-build-binary.yml

@@ -28,8 +28,7 @@ jobs:
   ##  - workflow is building default branch (master)
   image:
     if: |
-      inputs.tag != '' && 
-      github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      inputs.tag != ''
     name: Build Image
     runs-on: ubuntu-latest
     strategy:

stackslib/src/core/mod.rs

@@ -134,7 +134,7 @@ pub const BITCOIN_TESTNET_STACKS_21_BURN_HEIGHT: u64 = 2_422_101;
 pub const BITCOIN_TESTNET_STACKS_22_BURN_HEIGHT: u64 = 2_431_300;
 pub const BITCOIN_TESTNET_STACKS_23_BURN_HEIGHT: u64 = 2_431_633;
 pub const BITCOIN_TESTNET_STACKS_24_BURN_HEIGHT: u64 = 2_432_545;
-pub const BITCOIN_TESTNET_STACKS_25_BURN_HEIGHT: u64 = 20_000_000;
+pub const BITCOIN_TESTNET_STACKS_25_BURN_HEIGHT: u64 = 2_583_893;
 pub const BITCOIN_TESTNET_STACKS_30_BURN_HEIGHT: u64 = 30_000_000;
 
 pub const BITCOIN_REGTEST_FIRST_BLOCK_HEIGHT: u64 = 0;