Merge branch 'develop' into feat/clarity-4

Author: obycode

.cargo/config.toml

@@ -2,7 +2,7 @@
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
 clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity-serialization -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
-clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing"
+clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing -Wclippy::nonminimal_bool"
 
 # Uncomment to improve performance slightly, at the cost of portability
 #   * Note that native binaries may not run on CPUs that are different from the build machine

.github/workflows/bitcoin-tests.yml

@@ -80,11 +80,6 @@ jobs:
           - test-name: tests::epoch_205::test_dynamic_db_method_costs
           - test-name: tests::epoch_205::test_exact_block_costs
           - test-name: tests::epoch_205::transition_empty_blocks
-          - test-name: tests::epoch_21::test_pox_missing_five_anchor_blocks
-          - test-name: tests::epoch_21::test_pox_reorg_flap_duel
-          - test-name: tests::epoch_21::test_pox_reorg_flap_reward_cycles
-          - test-name: tests::epoch_21::test_pox_reorg_one_flap
-          - test-name: tests::epoch_21::test_pox_reorgs_three_flaps
           - test-name: tests::epoch_21::test_sortition_divergence_pre_21
           - test-name: tests::epoch_21::test_v1_unlock_height_with_current_stackers
           - test-name: tests::epoch_21::test_v1_unlock_height_with_delay_and_current_stackers
@@ -99,7 +94,6 @@ jobs:
           - test-name: tests::epoch_21::transition_removes_pox_sunset
           - test-name: tests::epoch_22::disable_pox
           - test-name: tests::epoch_22::pox_2_unlock_all
-          - test-name: tests::epoch_22::test_pox_reorg_one_flap
           - test-name: tests::epoch_23::trait_invocation_behavior
           - test-name: tests::epoch_24::fix_to_pox_contract
           - test-name: tests::epoch_24::verify_auto_unlock_behavior

.github/workflows/cargo-hack-check.yml

@@ -38,13 +38,12 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Setup Rust with Cache
+      - name: Setup Rust
         uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           toolchain: ${{ needs.setup.outputs.rust-toolchain }}
           target: x86_64-pc-windows-gnu,x86_64-unknown-linux-gnu
-          cache: true
-          cache-key: cargo-hack-native-${{ needs.setup.outputs.rust-toolchain }}-${{ hashFiles('**/Cargo.lock') }}
+          cache: false
 
       - name: Install cargo-hack
         uses: taiki-e/install-action@2383334cf567d78771fc7d89b6b3802ef1412cf6  # v2.56.8
@@ -66,56 +65,49 @@ jobs:
             --target x86_64-pc-windows-gnu \
             --target x86_64-unknown-linux-gnu
 
-  # WASM targets - separate cache since dependencies differ
+  # WASM targets - No caching needed as it runs in parallel with longer jobs
   wasm-targets:
-    name: ${{ matrix.name }}
+    name: WASM targets
     runs-on: ubuntu-latest
     needs: setup
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: "Clarity & Stacks-Common WASM Web"
-            command: |
-              cargo hack check \
-                -p clarity-serialization \
-                -p stacks-common \
-                --each-feature \
-                --no-dev-deps \
-                --exclude-features=default,rusqlite,ctrlc-handler,wasm-deterministic \
-                --features=wasm-web
-
-          - name: "Clarity & Stacks-Common WASM Deterministic"
-            command: |
-              cargo hack check \
-                -p clarity-serialization \
-                -p stacks-common \
-                --each-feature \
-                --no-dev-deps \
-                --include-features=wasm-deterministic,slog_json \
-                --features=wasm-deterministic
-
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
-      - name: Setup Rust with Cache
+      - name: Setup Rust
         uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           toolchain: ${{ needs.setup.outputs.rust-toolchain }}
           target: wasm32-unknown-unknown
-          cache: true
-          cache-key: cargo-hack-wasm-${{ matrix.name }}-${{ needs.setup.outputs.rust-toolchain }}-${{ hashFiles('**/Cargo.lock') }}
+          cache: false
 
       - name: Install cargo-hack
         uses: taiki-e/install-action@2383334cf567d78771fc7d89b6b3802ef1412cf6 # v2.56.8
         with:
           tool: cargo-hack
 
-      - name: Run cargo hack check
-        run: ${{ matrix.command }}
+      - name: Run cargo hack check (WASM Web)
+        run: |
+          cargo hack check \
+            -p clarity \
+            -p clarity-serialization \
+            -p stacks-common \
+            --each-feature \
+            --no-dev-deps \
+            --exclude-features=default,rusqlite,ctrlc-handler,wasm-deterministic,testing \
+            --features=wasm-web
+
+      - name: Run cargo hack check (WASM Deterministic)
+        run: |
+          cargo hack check \
+            -p clarity-serialization \
+            -p stacks-common \
+            --each-feature \
+            --no-dev-deps \
+            --include-features=wasm-deterministic,slog_json \
+            --features=wasm-deterministic
 
   fuzz-targets:
     name: Fuzz targets (nightly)
@@ -130,10 +122,18 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: nightly
+          cache: false
 
-      - name: Check fuzz targets
+      - name: Check fuzz targets (clarity)
         run: |
           cargo +nightly check \
             --manifest-path clarity/fuzz/Cargo.toml \
             --bins \
             --locked
+
+      - name: Check fuzz targets (stackslib)
+        run: |
+          cargo +nightly check \
+            --manifest-path stackslib/fuzz/Cargo.toml \
+            --bins \
+            --locked

.github/workflows/clippy.yml

@@ -26,15 +26,19 @@ jobs:
       - name: Checkout the latest code
         id: git_checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       - 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@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
           components: clippy
+          cache: false
+
       - name: Clippy
         id: clippy
         run: cargo clippy-stacks

.github/workflows/constants-check.yml

@@ -17,14 +17,17 @@ jobs:
       - name: Checkout the latest code
         id: git_checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       - 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@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
+          cache: false
 
       - name: Dump constants JSON
         id: consts-dump

.github/workflows/nix-check.yml

@@ -38,4 +38,5 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@e1c1dae8e170ed20fd2e6aaf9979ca2d3905d636  # v12
         with:
           use-flakehub: false  # Remove error when trying to authenticate without credentials
+          use-gha-cache: false # Disable uploading cache to gha cache
       - run: nix flake check ./contrib/nix

CHANGELOG.md

@@ -9,12 +9,21 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ### Added
 
+- Add `stackerdb_timeout_secs` to miner config for limiting duration of StackerDB HTTP requests.
 - When determining a global transaction replay set, the state evaluator now uses a longest-common-prefix algorithm to find a replay set in the case where a single replay set has less than 70% of signer weight.
+- New endpoint /v3/tenures/blocks/ allowing retrieving the list of stacks blocks from a burn block
 - Creates epoch 3.3 and costs-4 in preparation for a hardfork to activate Clarity 4
 - Adds support for new Clarity 4 builtins (not activated until epoch 3.3):
   - `contract-hash?`
 
+### Changed
+
+- Clarity errors pertaining to syntax binding errors have been made more
+  expressive (#6337)
+- Removed affirmation maps logic throughout, upgrading chainstate DB schema to 11 and burnchain DB schema to 3 (#6314)
+
 ## [3.2.0.0.1]
+
 ### Added
 
 - Adds node-config-docsgen to automatically create config documentation (#6227)

Cargo.lock

@@ -12,11 +12,12 @@ readme = "README.md"
 [dependencies]
 lazy_static = { workspace = true }
 regex = { version = "1", default-features = false }
+rusqlite = { workspace = true, optional = true }
 serde = { workspace = true }
+serde_json = { version = "1.0", default-features = false }
 serde_derive = { workspace = true }
 slog = { workspace = true }
 stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
-thiserror = { workspace = true }
 
 [dev-dependencies]
 mutants = "0.0.3"
@@ -25,7 +26,9 @@ rstest = "0.17.0"
 [features]
 default = []
 testing = []
+developer-mode = ["stacks_common/developer-mode"]
 slog_json = ["stacks_common/slog_json"]
+rusqlite = ["stacks_common/rusqlite", "dep:rusqlite"]
 
 # Wasm-specific features for easier configuration
 wasm-web = ["stacks_common/wasm-web"]

clarity-serialization/Cargo.toml

@@ -21,17 +21,15 @@ This crate provides the core components for working with Clarity data structures
 This example demonstrates how to construct a complex Clarity `(tuple)` and serialize it to its hexadecimal string representation, which is suitable for use as a transaction argument.
 
 ```rust
-use clarity_serialization::types::{Value, TupleData, PrincipalData};
+use clarity_serialization::types::{PrincipalData, TupleData, Value};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // 1. Construct the individual values that will go into our tuple.
     let id = Value::UInt(101);
-    let owner = Value::Principal(
-        PrincipalData::parse("SM2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQVX8X0G")?
-    );
-    let metadata = Value::some(
-        Value::buff_from(vec![0xde, 0xad, 0xbe, 0xef])?
-    )?;
+    let owner = Value::Principal(PrincipalData::parse(
+        "SM2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQVX8X0G",
+    )?);
+    let metadata = Value::some(Value::buff_from(vec![0xde, 0xad, 0xbe, 0xef])?)?;
 
     // 2. Create a vec of name-value pairs for the tuple.
     let tuple_fields = vec![
@@ -44,7 +42,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let my_tuple = Value::from(TupleData::from_data(tuple_fields)?);
 
     // 4. Serialize the tuple to its consensus-cricital hex string.
-    let hex_string = my_tuple.serialize_to_hex()?;
+    let hex_string = my_tuple
+        .serialize_to_hex()
+        .map_err(|e| format!("Error serializing tuple to hex: {e:?}"))?;
 
     println!("Clarity Tuple: {my_tuple}");
     println!("Serialized Hex: {hex_string}");
@@ -64,7 +64,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 This example shows the reverse process: taking a hex string and deserializing it into a structured `Value` object, while validating it against an expected type.
 
 ```rust
-use clarity_serialization::types::{Value, TypeSignature};
+use clarity_serialization::types::{TypeSignature, Value};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let hex_string = "0c000000030269640100000000000000000000000000000065086d657461646174610a0200000004deadbeef056f776e65720514a46ff88886c2ef9762d970b4d2c63678835bd39d";