Merge branch 'develop' into feat/read-count-extend

Author: aaronb-stacks

.cargo/config.toml

@@ -1,7 +1,7 @@
 [alias]
 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-types -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
+clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity-types -p clarity -p libsigner -p stacks-common -p clarity-cli -p stacks-cli -p stacks-inspect --no-deps --tests --all-features -- -D warnings"
 clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing -Wclippy::nonminimal_bool -Wclippy::clone_on_copy"
 
 # Uncomment to improve performance slightly, at the cost of portability

CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - Added `result_hex` and `post_condition_aborted` to the block replay RPC endpoint
 - Added `--epoch <epoch_number>` flag to `clarity-cli` commands to specify the epoch context for evaluation.
 
+### Fixed
+
+- Correctly produce the receipt for the `costs-4` contract, which was deployed on epoch 3.3 activation. Users who consume node events and want to fill in the missing receipt (e.g. the Hiro API) will need to revert their chainstate to before the 3.3 activation and then resume sync to receive the previously missing event.
+
 ## [3.3.0.0.1]
 
 - Add indexes to `nakamoto_block_headers` to fix a performance regression. Node may take a few minutes to restart during the upgrade while the new indexes are created.

Cargo.lock

@@ -12,6 +12,7 @@ members = [
     "stacks-signer",
     "stacks-node",
     "contrib/stacks-inspect",
+    "contrib/clarity-cli",
     "contrib/stacks-cli"
 ]
 

Cargo.toml

@@ -184,8 +184,6 @@ pub enum RuntimeError {
     BadBlockHash(Vec<u8>),
     /// Failed to unwrap an `Optional` (`none`) or `Response` (`err` or `ok`) Clarity value.
     UnwrapFailure,
-    /// Attempt to set metadata (e.g., for NFTs or tokens) that was already initialized.
-    MetadataAlreadySet,
     /// Interaction with a deprecated or inactive Proof of Transfer (PoX) contract.
     DefunctPoxContract,
     /// Attempt to lock STX for stacking when already locked in an active PoX cycle.
@@ -207,8 +205,6 @@ pub enum EarlyReturnError {
     AssertionFailed(Box<Value>),
 }
 
-pub type InterpreterResult<R> = Result<R, VmExecutionError>;
-
 impl<T> PartialEq<IncomparableError<T>> for IncomparableError<T> {
     fn eq(&self, _other: &IncomparableError<T>) -> bool {
         false