Merge branch 'develop' of https://github.com/stacks-network/stacks-core into feat/signer-two-phase-commit-impl

Author: jferrant

.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/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,54 +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 (WASM Web)
+        run: |
+          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: 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
+
       - name: Run cargo hack check
         run: ${{ matrix.command }}
 
@@ -130,10 +124,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,6 +9,7 @@ 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.
 
 ### Changed

Cargo.lock

@@ -37,6 +37,7 @@ features = ["arbitrary_precision", "unbounded_depth"]
 [dev-dependencies]
 assert-json-diff = "1.0.0"
 mutants = "0.0.3"
+proptest = { version = "1.6.0", default-features = false, features = ["std"] }
 rstest = { version = "0.17.0" }
 rstest_reuse = { version = "0.5.0" }
 # a nightly rustc regression (35dbef235 2021-03-02) prevents criterion from compiling

clarity/Cargo.toml

@@ -37,3 +37,10 @@ name = "fuzz_value_sanitize"
 path = "fuzz_targets/fuzz_value_sanitize.rs"
 test = false
 doc = false
+
+[[bin]]
+name = "execute_v2_raw"
+path = "fuzz_targets/execute_v2_raw.rs"
+test = false
+doc = false
+bench = false

clarity/fuzz/Cargo.toml

@@ -0,0 +1,22 @@
+// Copyright (C) 2025 Stacks Open Internet Foundation
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+
+fuzz_target!(|s: &str| {
+    let _ = clarity::vm::execute_v2(s);
+});