Merge branch develop into chore/remove-unused-imports-stacks-common

Author: jbencin

.github/workflows/bitcoin-tests.yml

@@ -135,6 +135,10 @@ jobs:
           - tests::signer::v0::tenure_extend_after_bad_commit
           - tests::signer::v0::block_proposal_max_age_rejections
           - tests::signer::v0::global_acceptance_depends_on_block_announcement
+          - tests::signer::v0::no_reorg_due_to_successive_block_validation_ok
+          - tests::signer::v0::incoming_signers_ignore_block_proposals
+          - tests::signer::v0::outgoing_signers_ignore_block_proposals
+          - tests::signer::v0::injected_signatures_are_ignored_across_boundaries
           - tests::nakamoto_integrations::burn_ops_integration_test
           - tests::nakamoto_integrations::check_block_heights
           - tests::nakamoto_integrations::clarity_burn_state

.github/workflows/ci.yml

@@ -164,6 +164,38 @@ jobs:
       - check-release
     uses: ./.github/workflows/stacks-core-tests.yml
 
+  ## Checks to run on built binaries
+  ##
+  ## Runs when:
+  ##   - it is a release run
+  ##   or:
+  ##     - it is not a release run
+  ##       and any of:
+  ##         - this workflow is called manually
+  ##         - PR is opened
+  ##         - PR added to merge queue
+  ##         - commit to either (development, next, master) branch
+  stacks-core-build-tests:
+    if: |
+      needs.check-release.outputs.is_release == 'true' || (
+        github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'pull_request' ||
+        github.event_name == 'merge_group' ||
+        (
+          contains('
+            refs/heads/master
+            refs/heads/develop
+            refs/heads/next
+          ', github.event.pull_request.head.ref) &&
+          github.event_name == 'push'
+        )
+      )
+    name: Stacks Core Build Tests
+    needs:
+      - rustfmt
+      - check-release
+    uses: ./.github/workflows/core-build-tests.yml
+
   bitcoin-tests:
     if: |
       needs.check-release.outputs.is_release == 'true' || (

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

@@ -0,0 +1,33 @@
+name: Core build tests
+
+# Only run when:
+#   - PRs are (re)opened against develop branch
+on:
+  workflow_call:
+
+jobs:
+  check-consts:
+    name: Check the constants from stacks-inspect
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        id: git_checkout
+        uses: actions/checkout@v3
+      - 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
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+      - name: Build the binaries
+        id: build
+        run: |
+          cargo build
+      - name: Dump constants JSON
+        id: consts-dump
+        run: cargo run --bin stacks-inspect -- dump-consts | tee out.json
+      - name: Set expected constants JSON
+        id: expects-json
+        run: diff out.json ./sample/expected_consts.json

CHANGELOG.md

@@ -8,21 +8,17 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 ## [Unreleased]
 
 ### Added
+
 - Add `tenure_timeout_secs` to the miner for determining when a time-based tenure extend should be attempted.
+- Added configuration option `block_proposal_max_age_secs` under `[connection_options]` to prevent processing stale block proposals
 
 ### Changed
+- The RPC endpoint `/v3/block_proposal` no longer will evaluate block proposals more than `block_proposal_max_age_secs` old
 
+- When a transaction is dropped due to replace-by-fee, the `/drop_mempool_tx` event observer payload now includes `new_txid`, which is the transaction that replaced this dropped transaction. When a transaction is dropped for other reasons, `new_txid` is `null`. [#5381](https://github.com/stacks-network/stacks-core/pull/5381)
 - Nodes will assume that all PoX anchor blocks exist by default, and stall initial block download indefinitely to await their arrival (#5502)
 
-## [3.1.0.0.1]
-
-### Added
-
-- A miner will now generate a tenure-extend when at least 70% of the signers have confirmed that they are willing to allow one, via the new timestamp included in block responses. This allows the miner to refresh its budget in between Bitcoin blocks. ([#5476](https://github.com/stacks-network/stacks-core/discussions/5476))
-
-### Changed
-
-## [3.1.0.0.0]
+## [3.1.0.0.2]
 
 ### Added
 
@@ -31,6 +27,8 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
   - `/v2/clarity/marf/:marf_key_hash`
   - `/v2/clarity/metadata/:principal/:contract_name/:clarity_metadata_key`
 - When a proposed block is validated by a node, the block can be validated even when the block version is different than the node's default ([#5539](https://github.com/stacks-network/stacks-core/pull/5539))
+- A miner will now generate a tenure-extend when at least 70% of the signers have confirmed that they are willing to allow one, via the new timestamp included in block responses. This allows the miner to refresh its budget in between Bitcoin blocks. ([#5476](https://github.com/stacks-network/stacks-core/discussions/5476))
+- Set the epoch to 3.1 in the Clarity DB upon activation.
 
 ### Changed
 

libsigner/src/v0/messages.rs

@@ -686,6 +686,22 @@ impl BlockResponse {
             BlockResponse::Rejected(rejection) => rejection.signer_signature_hash,
         }
     }
+
+    /// Get the block accept data from the block response
+    pub fn as_block_accepted(&self) -> Option<&BlockAccepted> {
+        match self {
+            BlockResponse::Accepted(accepted) => Some(accepted),
+            _ => None,
+        }
+    }
+
+    /// Get the block accept data from the block response
+    pub fn as_block_rejection(&self) -> Option<&BlockRejection> {
+        match self {
+            BlockResponse::Rejected(rejection) => Some(rejection),
+            _ => None,
+        }
+    }
 }
 
 impl StacksMessageCodec for BlockResponse {

pox-locking/Cargo.toml

@@ -28,3 +28,4 @@ mutants = "0.0.3"
 
 [features]
 slog_json = ["stacks_common/slog_json", "clarity/slog_json"]
+testing = []

sample/conf/testnet-follower-conf.toml

@@ -77,8 +77,8 @@ start_height = 6
 
 [[burnchain.epochs]]
 epoch_name = "3.0"
-start_height = 56_457
+start_height = 1900
 
 [[burnchain.epochs]]
 epoch_name = "3.1"
-start_height = 77_770
+start_height = 2000

sample/conf/testnet-miner-conf.toml

@@ -73,8 +73,8 @@ start_height = 6
 
 [[burnchain.epochs]]
 epoch_name = "3.0"
-start_height = 56_457
+start_height = 1900
 
 [[burnchain.epochs]]
 epoch_name = "3.1"
-start_height = 77_770
+start_height = 2000

sample/conf/testnet-signer.toml

@@ -75,4 +75,8 @@ start_height = 6
 
 [[burnchain.epochs]]
 epoch_name = "3.0"
-start_height = 56_457
+start_height = 1900
+
+[[burnchain.epochs]]
+epoch_name = "3.1"
+start_height = 2000

sample/expected_consts.json

@@ -0,0 +1,12 @@
+{
+  "chain_id_mainnet": 1,
+  "chain_id_testnet": 2147483648,
+  "microstacks_per_stacks": 1000000,
+  "miner_reward_maturity": 100,
+  "network_id_mainnet": 385875968,
+  "network_id_testnet": 4278190080,
+  "peer_version_mainnet_major": 402653184,
+  "peer_version_testnet_major": 4207599104,
+  "signer_slots_per_user": 13,
+  "stacks_epoch_max": 9223372036854775807
+}