Merge branch 'develop' into feat/clarity-depend-on-clarity-serialization

Author: Jiloc

.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

@@ -124,9 +124,16 @@ jobs:
           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

CHANGELOG.md

@@ -16,7 +16,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 - 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]
 

Cargo.lock

@@ -35,6 +35,7 @@ rusqlite = { workspace = true, optional = true }
 assert-json-diff = "1.0.0"
 clarity-serialization = { package = "clarity-serialization", path = "../clarity-serialization", default-features = false, features = ["testing"] }
 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" }
 

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);
+});

clarity/fuzz/fuzz_targets/execute_v2_raw.rs

@@ -29,6 +29,8 @@ mod contracts;
 mod datamaps;
 mod defines;
 mod principals;
+#[cfg(test)]
+mod representations;
 mod sequences;
 #[cfg(test)]
 mod simple_apply_eval;