Merge remote-tracking branch 'stacks-network/develop' into fix/bad-syntax-binding-error-variants

Author: jcnelson

.github/workflows/github-release.yml

@@ -90,6 +90,8 @@ jobs:
             cpu: armv7
           - arch: macos # excludes macos-armv7
             cpu: armv7
+          - arch: macos # excludes macos-x64
+            cpu: x86_64
     steps:
       - name: Build Binary (${{ matrix.arch }}_${{ matrix.cpu }})
         uses: stacks-network/actions/stacks-core/release/create-source-binary@main

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

@@ -71,6 +71,15 @@ jobs:
           validate: "true"
           redocly-version: "1.34"
 
+  ## Generate and upload node configuration documentation
+  node-config-docsgen:
+    name: Node Configuration Documentation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate Node Configuration Documentation
+        id: node_config_docsgen
+        uses: stacks-network/actions/stacks-core/node-config-docsgen@main
+
   ## Disabled
   ##   - this test can take several hours to run
   nettest:
@@ -141,6 +150,7 @@ jobs:
     if: always()
     needs:
       - open-api-validation
+      - node-config-docsgen
       - core-contracts-clarinet-test
     steps:
       - name: Check Tests Status

CHANGELOG.md

@@ -5,11 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
-## Unreleased
+## [3.2.0.0.0]
 
 ### Added
 
+- Added the `clarity-serialization` crate: A lightweight crate for serializing and deserializing Clarity values. This crate decouples core data types from the Clarity VM, making it easier to build off-chain tooling, and other applications that interact with Clarity data. It includes support for `wasm32-unknown-unknown` targets via the `wasm-web` and `wasm-deterministic` features.
 - Added `/v3/contracts/fast-call-read/:principal/:contract_name/:func_name` api endpoint. It allows to run read-only calls faster by disabling the cost and memory trackers. This endpoint requires authentication.
+- **SIP-031 consensus rules, activating in epoch 3.2 at block 907_740**
 
 ### Changed
 

Cargo.lock

@@ -12,6 +12,8 @@ members = [
     "stacks-node",
     "contrib/tools/config-docs-generator"]
 
+exclude = ["contrib/clarity-serialization"]
+
 # Dependencies we want to keep the same between workspace members
 [workspace.dependencies]
 ed25519-dalek = { version = "2.1.1", default-features = false }

Cargo.toml

@@ -20,7 +20,6 @@ path = "./src/libclarity.rs"
 [dependencies]
 serde = "1"
 serde_derive = "1"
-serde_stacker = "0.1"
 regex = "1"
 lazy_static = "1.4.0"
 integer-sqrt = "0.1.3"
@@ -44,6 +43,9 @@ rstest_reuse = { version = "0.5.0" }
 #  but it isn't necessary for tests: only benchmarks. therefore, commenting out for now.
 # criterion = "0.3"
 
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+serde_stacker = "0.1"
+
 [features]
 default = ["rusqlite"]
 developer-mode = ["stacks_common/developer-mode"]

clarity/Cargo.toml

@@ -53,6 +53,7 @@ macro_rules! clarity_serializable {
             }
         }
         impl ClarityDeserializable<$Name> for $Name {
+            #[cfg(not(target_family = "wasm"))]
             fn deserialize(json: &str) -> Result<Self> {
                 let mut deserializer = serde_json::Deserializer::from_str(&json);
                 // serde's default 128 depth limit can be exhausted
@@ -65,6 +66,12 @@ macro_rules! clarity_serializable {
                     InterpreterError::Expect("Failed to deserialize vm.Value".into()).into()
                 })
             }
+            #[cfg(target_family = "wasm")]
+            fn deserialize(json: &str) -> Result<Self> {
+                serde_json::from_str(json).map_err(|_| {
+                    InterpreterError::Expect("Failed to deserialize vm.Value".into()).into()
+                })
+            }
         }
     };
 }