Merge branch 'develop' into pointblankdev-maint/burnchain-naming-cleanup

CHANGELOG.md

@@ -5,6 +5,22 @@ 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]
+
+### Added
+
+- When the Clarity library is built with feature flag `developer-mode`, comments
+  from the source code are now attached to the `SymbolicExpression` nodes. This
+  will be useful for tools that use the Clarity library to analyze and
+  manipulate Clarity source code, e.g. a formatter.
+
+### Fixed
+
+- The transaction receipts for smart contract publish transactions now indicate
+  a result of `(err none)` if the top-level code of the smart contract contained
+  runtime error and include details about the error in the `vm_error` field of
+  the receipt. Fixes issues #3154, #3328.
+
 ## [2.1.0.0.2]
 
 This software update is a hotfix to resolve improper unlock handling
@@ -273,6 +289,10 @@ this version of the software on it.
 - The `blockstack-core` binary has been renamed to `stacks-inspect`.
   This binary provides CLI tools for chain and mempool inspection.
 
+### Fixed
+- The AtlasDB previously could lose `AttachmentInstance` data during shutdown
+  or crashes (#3082). This release resolves that.
+
 ## [2.05.0.1.0]
 
 ### Added 

CONTRIBUTORS.md

@@ -12,6 +12,7 @@ You can find information on joining online community forums (Discord, mailing li
 [How Can I Contribute?](#how-can-i-contribute)
 * [Development Workflow](#development-workflow)
 * [Contributing Conventions](#contributing-conventions)
+* [Developer Setup](#recommended-developer-setup)
 
 [Style](#style)
 * [Git Commit Messages](#git-commit-messages)
@@ -105,6 +106,35 @@ Each module should include an `Error` enumeration in its `mod.rs` that encodes
 errors specific to the module.  All error code paths in the module should return
 an `Err` type with one of the module's errors.
 
+## Recommended developer setup
+
+### Recommended githooks
+It is helpful to set up the pre-commit git hook set up, so that Rust formatting issues are caught before 
+you push your code. Follow these instruction to set it up: 
+1. Rename `.git/hooks/pre-commit.sample` to `.git/hooks/pre-commit`
+2. Change the content of `.git/hooks/pre-commit` to be the following 
+```bash
+#!/bin/sh
+
+HAS_ISSUES=0
+for file in $(git diff --name-only --staged); do
+    FMT_RESULT="$(cargo fmt -- $file --check --config group_imports=StdExternalCrate 2>/dev/null || true)"
+    if [ "$FMT_RESULT" != "" ]; then
+        HAS_ISSUES=1
+    fi
+done
+
+if [ $HAS_ISSUES -eq 1 ]
+then
+    echo 'rustfmt failed: run "cargo fmt --all -- --config group_imports=StdExternalCrate"'
+fi
+
+exit $HAS_ISSUES
+```
+3. Make it executable by running `chmod +x .git/hooks/pre-commit`
+
+That's it! Now your pre-commit hook should be configured on your local machine. 
+
 # Style
 ## Git Commit Messages
 Aim to use descriptive git commit messages. We try to follow [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/).