Merge branch 'develop' into fix/considered_txs

Author: obycode

.github/workflows/clippy.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
@@ -34,4 +37,4 @@ jobs:
           components: clippy
       - name: Clippy
         id: clippy
-        run: cargo clippy-stacks
+        run: cargo clippy-stacks

.github/workflows/github-release.yml

@@ -38,6 +38,21 @@ concurrency:
 run-name: ${{ inputs.node_tag || inputs.signer_tag }}
 
 jobs:
+  ## This job's sole purpose is trigger a secondary approval outside of the matrix jobs below. 
+  ##   - If this job isn't approved to run, then the subsequent jobs will also not run - for this reason, we always exit 0
+  ##   - `andon-cord` requires the repo environment "Build Release", which will trigger a secondary approval step before running this workflow.  
+  andon-cord:
+    if: |
+      inputs.node_tag != '' ||
+      inputs.signer_tag != ''
+    name: Andon Cord
+    runs-on: ubuntu-latest
+    environment: "Build Release"
+    steps:
+      - name: Check Approval
+        id: check
+        run: |
+          exit 0
   ## Build arch dependent binaries from source
   ##
   ## Runs when the following is true:
@@ -48,7 +63,8 @@ jobs:
       inputs.signer_tag != ''
     name: Build Binaries
     runs-on: ubuntu-latest
-    environment: "Build Release"
+    needs:
+      - andon-cord
     strategy:
       ## Run a maximum of 10 builds concurrently, using the matrix defined in inputs.arch
       max-parallel: 10
@@ -91,6 +107,7 @@ jobs:
     name: Create Release
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
     permissions:
       contents: write
@@ -107,7 +124,6 @@ jobs:
           is_signer_release: ${{ inputs.is_signer_release }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
   ## Builds arch dependent Docker images from binaries
   ##
   ## Note: this step requires the binaries in the create-release step to be uploaded
@@ -120,6 +136,7 @@ jobs:
     name: Docker Image (Binary)
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
       - create-release
     strategy:
@@ -147,11 +164,15 @@ jobs:
   ## Create the downstream PR for the release branch to master,develop
   create-pr:
     if: |
-      inputs.node_tag != '' ||
-      inputs.signer_tag != ''
+      !contains(github.ref, '-rc') &&
+      (
+        inputs.node_tag != '' ||
+        inputs.signer_tag != ''
+      )
     name: Create Downstream PR (${{ github.ref_name }})
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
       - create-release
       - docker-image

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

@@ -21,6 +21,8 @@ jobs:
   image:
     name: Build Image
     runs-on: ubuntu-latest
+    ## Requires the repo environment "Push to Docker", which will trigger a secondary approval step before running this workflow.
+    environment: "Push to Docker"
     steps:
       ## Setup Docker for the builds
       - name: Docker setup

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - When a miner times out waiting for signatures, it will re-propose the same block instead of building a new block ([#5877](https://github.com/stacks-network/stacks-core/pull/5877))
 - Improve tenure downloader trace verbosity applying proper logging level depending on the tenure state ("debug" if unconfirmed, "info" otherwise) ([#5871](https://github.com/stacks-network/stacks-core/issues/5871))
 - Remove warning log about missing UTXOs when a node is configured as `miner` with `mock_mining` mode enabled ([#5841](https://github.com/stacks-network/stacks-core/issues/5841)) 
+- Deprecated the `wait_on_interim_blocks` option in the miner config file. This option is no longer needed, as the miner will always wait for interim blocks to be processed before mining a new block. To wait extra time in between blocks, use the `min_time_between_blocks_ms` option instead.
 
 ## [3.1.0.0.7]
 

contrib/tools/block-replay.sh

@@ -195,7 +195,7 @@ start_replay() {
             starting_block=0 # for the block counter, start at this block
             ## use these values if `--testing` arg is provided (only replay 1_000 blocks) Note:  2.5 epoch is at 153106
             ${TESTING} && total_blocks=153000
-            ${TESTING} && starting_block=15200
+            ${TESTING} && starting_block=152000
             ;;
     esac
     local block_diff=$((total_blocks - starting_block)) ## how many blocks are being replayed

pox-locking/src/pox_2.rs

@@ -173,8 +173,8 @@ pub fn parse_pox_increase(result: &Value) -> std::result::Result<(PrincipalData,
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v2 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v2 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_increase_v2(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,
@@ -226,8 +226,8 @@ pub fn pox_lock_increase_v2(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v2 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v2 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_extend_v2(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,

pox-locking/src/pox_3.rs

@@ -96,8 +96,8 @@ pub fn pox_lock_v3(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v3 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v3 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_extend_v3(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,
@@ -132,8 +132,8 @@ pub fn pox_lock_extend_v3(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v3 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v3 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_increase_v3(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,

pox-locking/src/pox_4.rs

@@ -69,8 +69,8 @@ pub fn pox_lock_v4(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v4 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v4 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_extend_v4(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,
@@ -105,8 +105,8 @@ pub fn pox_lock_extend_v4(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v4 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v4 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_increase_v4(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,

stacks-common/src/deps_common/bitcoin/blockdata/block.rs

@@ -101,7 +101,7 @@ impl BlockHeader {
 
     /// Computes the target value in float format from Uint256 format.
     pub fn compact_target_from_u256(value: &Uint256) -> u32 {
-        let mut size = (value.bits() + 7) / 8;
+        let mut size = value.bits().div_ceil(8);
         let mut compact = if size <= 3 {
             (value.low_u64() << (8 * (3 - size))) as u32
         } else {

stacks-common/src/deps_common/bitcoin/util/hash.rs

@@ -436,7 +436,7 @@ pub fn bitcoin_merkle_root(data: Vec<Sha256dHash>) -> Sha256dHash {
         return data[0];
     }
     // Recursion
-    let iterations = (data.len() + 1) / 2;
+    let iterations = data.len().div_ceil(2);
     let mut next = Vec::with_capacity(iterations);
     for idx in 0..iterations {
         let idx1 = 2 * idx;