Skip to content

Commit 962e7dd

Browse files
authored
Merge pull request #6538 from jferrant/chore/merge-develop-to-aac-client-breaking
Chore/merge develop to aac client breaking
2 parents fb129a4 + f1e1291 commit 962e7dd

Some content is hidden

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

87 files changed

+2359
-3712
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
1313
- Add `stackerdb_timeout_secs` to miner config for limiting duration of StackerDB HTTP requests.
1414
- When determining a global transaction replay set, the state evaluator now uses a longest-common-prefix algorithm to find a replay set in the case where a single replay set has less than 70% of signer weight.
1515
- New endpoints /v3/tenures/blocks/, /v3/tenures/blocks/hash, /v3/tenures/blocks/height allowing retrieving the list of stacks blocks from a burn block
16+
- New authenticated endpoint /v3/block/replay to replay the execution of any Nakamoto block in the chain (useful for validation, simulation, getting events...)
1617
- Creates epoch 3.3 and costs-4 in preparation for a hardfork to activate Clarity 4
1718
- Adds support for new Clarity 4 builtins (not activated until epoch 3.3):
1819
- `contract-hash?`

Cargo.lock

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ members = [
1111
"libsigner",
1212
"stacks-signer",
1313
"stacks-node",
14+
"contrib/stacks-inspect",
15+
"contrib/stacks-cli"
1416
]
1517

1618
exclude = ["contrib/tools/config-docs-generator"]

clarity-types/src/errors/ast.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,12 @@ impl ParseError {
203203
}
204204

205205
pub fn rejectable(&self) -> bool {
206-
matches!(*self.err, ParseErrorKind::InterpreterFailure)
206+
matches!(
207+
*self.err,
208+
ParseErrorKind::InterpreterFailure
209+
| ParseErrorKind::ExpressionStackDepthTooDeep
210+
| ParseErrorKind::VaryExpressionStackDepthTooDeep
211+
)
207212
}
208213

209214
pub fn has_pre_expression(&self) -> bool {

clarity/src/vm/analysis/mod.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use self::type_checker::v2_05::TypeChecker as TypeChecker2_05;
3535
use self::type_checker::v2_1::TypeChecker as TypeChecker2_1;
3636
pub use self::types::{AnalysisPass, ContractAnalysis};
3737
#[cfg(feature = "rusqlite")]
38-
use crate::vm::ast::{build_ast_with_rules, ASTRules};
38+
use crate::vm::ast::build_ast;
3939
use crate::vm::costs::LimitedCostTracker;
4040
#[cfg(feature = "rusqlite")]
4141
use crate::vm::database::MemoryBackingStore;
@@ -54,16 +54,9 @@ pub fn mem_type_check(
5454
epoch: StacksEpochId,
5555
) -> Result<(Option<TypeSignature>, ContractAnalysis), StaticCheckError> {
5656
let contract_identifier = QualifiedContractIdentifier::transient();
57-
let contract = build_ast_with_rules(
58-
&contract_identifier,
59-
snippet,
60-
&mut (),
61-
version,
62-
epoch,
63-
ASTRules::PrecheckSize,
64-
)
65-
.map_err(|_| CheckErrorKind::Expects("Failed to build AST".into()))?
66-
.expressions;
57+
let contract = build_ast(&contract_identifier, snippet, &mut (), version, epoch)
58+
.map_err(|_| CheckErrorKind::Expects("Failed to build AST".into()))?
59+
.expressions;
6760

6861
let mut marf = MemoryBackingStore::new();
6962
let mut analysis_db = marf.as_analysis_db();

0 commit comments

Comments
 (0)