Skip to content

Commit 2f06397

Browse files
committed
Merge branch 'develop' into chore/static-analysis-error-tests-3
2 parents a415642 + 1efff8e commit 2f06397

File tree

108 files changed

+3109
-2025
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+3109
-2025
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
1313
- Added `result_hex` and `post_condition_aborted` to the block replay RPC endpoint
1414
- Added `--epoch <epoch_number>` flag to `clarity-cli` commands to specify the epoch context for evaluation.
1515

16+
### Fixed
17+
18+
- 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.
19+
1620
## [3.3.0.0.1]
1721

1822
- 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.

clarity-types/src/errors/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ pub enum RuntimeError {
184184
BadBlockHash(Vec<u8>),
185185
/// Failed to unwrap an `Optional` (`none`) or `Response` (`err` or `ok`) Clarity value.
186186
UnwrapFailure,
187-
/// Attempt to set metadata (e.g., for NFTs or tokens) that was already initialized.
188-
MetadataAlreadySet,
189187
/// Interaction with a deprecated or inactive Proof of Transfer (PoX) contract.
190188
DefunctPoxContract,
191189
/// Attempt to lock STX for stacking when already locked in an active PoX cycle.
@@ -207,8 +205,6 @@ pub enum EarlyReturnError {
207205
AssertionFailed(Box<Value>),
208206
}
209207

210-
pub type InterpreterResult<R> = Result<R, VmExecutionError>;
211-
212208
impl<T> PartialEq<IncomparableError<T>> for IncomparableError<T> {
213209
fn eq(&self, _other: &IncomparableError<T>) -> bool {
214210
false

0 commit comments

Comments
 (0)