update stacks-core/develop (#2207)

Author: brady-stacks

Cargo.lock

@@ -23,11 +23,11 @@ default-members = ["components/clarinet-cli"]
 version = "3.14.0"
 
 [workspace.dependencies]
-clarity = { git = "https://github.com/stacks-network/stacks-core.git", rev = "68c67034326bfcc4565d74e659c8c6144f5adebf", package = "clarity", default-features = false }
-clarity-types = { git = "https://github.com/stacks-network/stacks-core.git", rev = "68c67034326bfcc4565d74e659c8c6144f5adebf", package = "clarity-types" }
-stacks-common = { git = "https://github.com/stacks-network/stacks-core.git", rev = "68c67034326bfcc4565d74e659c8c6144f5adebf", package = "stacks-common", default-features = false }
-pox-locking = { git = "https://github.com/stacks-network/stacks-core.git", rev = "68c67034326bfcc4565d74e659c8c6144f5adebf", package = "pox-locking", default-features = false }
-stackslib = { git = "https://github.com/stacks-network/stacks-core.git", rev = "68c67034326bfcc4565d74e659c8c6144f5adebf", package = "stackslib", default-features = false }
+clarity = { git = "https://github.com/stacks-network/stacks-core.git", rev = "41bd9d0a15a08d8ab2603edf11774b0d21a616ec", package = "clarity", default-features = false }
+clarity-types = { git = "https://github.com/stacks-network/stacks-core.git", rev = "41bd9d0a15a08d8ab2603edf11774b0d21a616ec", package = "clarity-types" }
+stacks-common = { git = "https://github.com/stacks-network/stacks-core.git", rev = "41bd9d0a15a08d8ab2603edf11774b0d21a616ec", package = "stacks-common", default-features = false }
+pox-locking = { git = "https://github.com/stacks-network/stacks-core.git", rev = "41bd9d0a15a08d8ab2603edf11774b0d21a616ec", package = "pox-locking", default-features = false }
+stackslib = { git = "https://github.com/stacks-network/stacks-core.git", rev = "41bd9d0a15a08d8ab2603edf11774b0d21a616ec", package = "stackslib", default-features = false }
 
 aes-gcm = "0.10"
 argon2 = "0.5.3"

Cargo.toml

@@ -28,7 +28,7 @@ use clarity_repl::clarity::vm::analysis::AnalysisDatabase;
 use clarity_repl::clarity::vm::costs::LimitedCostTracker;
 use clarity_repl::clarity::vm::diagnostic::Diagnostic;
 use clarity_repl::clarity::vm::types::QualifiedContractIdentifier;
-use clarity_repl::clarity::ClarityVersion;
+use clarity_repl::clarity::{ClarityVersion, StacksEpochId};
 use clarity_repl::frontend::Terminal;
 use clarity_repl::repl::diagnostic::output_diagnostic;
 use clarity_repl::repl::settings::{ApiUrl, RemoteDataSettings};
@@ -148,33 +148,41 @@ struct Formatter {
 }
 
 impl Formatter {
-    fn get_input_sources(&self) -> Vec<FormatterInputSource> {
+    fn get_input_sources(&self, manifest: &ProjectManifest) -> Vec<FormatterInputSource> {
         if self.stdin {
             vec![FormatterInputSource::Stdin]
         } else if let Some(file) = &self.file {
-            vec![FormatterInputSource::File(file.clone())]
+            let epoch = manifest
+                .contracts
+                .values()
+                .find(|c| from_code_source(c.code_source.clone()) == *file)
+                .map(|c| c.epoch.resolve());
+            vec![FormatterInputSource::File(file.clone(), epoch)]
         } else {
-            // look for files at the default code path (./contracts/) if
-            // cmd.manifest_path is not specified OR if cmd.file is not specified
-            let manifest = load_manifest_or_exit(self.manifest_path.clone(), true);
-            let contracts = manifest.contracts.values().cloned();
-            contracts
-                .map(|c| from_code_source(c.code_source))
-                .map(FormatterInputSource::File)
+            manifest
+                .contracts
+                .values()
+                .cloned()
+                .map(|c| {
+                    FormatterInputSource::File(
+                        from_code_source(c.code_source),
+                        Some(c.epoch.resolve()),
+                    )
+                })
                 .collect()
         }
     }
 }
 
 enum FormatterInputSource {
-    File(String),
+    File(String, Option<StacksEpochId>),
     Stdin,
 }
 
 impl FormatterInputSource {
     fn get_input(&self) -> String {
         match self {
-            FormatterInputSource::File(path) => {
+            FormatterInputSource::File(path, _) => {
                 fs::read_to_string(path).unwrap_or_else(|e| panic!("Failed to read file: {e}"))
             }
             FormatterInputSource::Stdin => io::stdin()
@@ -187,7 +195,14 @@ impl FormatterInputSource {
 
     fn file_path(&self) -> Option<&str> {
         match self {
-            FormatterInputSource::File(path) => Some(path),
+            FormatterInputSource::File(path, _) => Some(path),
+            FormatterInputSource::Stdin => None,
+        }
+    }
+
+    fn epoch(&self) -> Option<StacksEpochId> {
+        match self {
+            FormatterInputSource::File(_, epoch) => *epoch,
             FormatterInputSource::Stdin => None,
         }
     }
@@ -1333,7 +1348,8 @@ pub fn main() {
                 "{}",
                 format_warn!("This command is in beta. Feedback is welcome!"),
             );
-            let sources = cmd.get_input_sources();
+            let manifest = load_manifest_or_exit(cmd.manifest_path.clone(), false);
+            let sources = cmd.get_input_sources(&manifest);
             let mut settings = formatter::Settings::default();
 
             if let Some(max_line_length) = cmd.max_line_length {
@@ -1353,7 +1369,7 @@ pub fn main() {
 
             for source in sources {
                 let input = source.get_input();
-                let output = formatter.format(&input);
+                let output = formatter.format(&input, source.epoch());
 
                 if cmd.check {
                     if let Some(file_path) = source.file_path() {

components/clarinet-cli/src/frontend/cli.rs

@@ -6,6 +6,8 @@ use std::collections::HashMap;
 use std::iter::Peekable;
 use std::{fmt, slice};
 
+use clarity::types::StacksEpochId;
+use clarity::vm::ast::stack_depth_checker::StackDepthLimits;
 use clarity::vm::functions::define::DefineFunctions;
 use clarity::vm::functions::NativeFunctions;
 use clarity::vm::representations::{PreSymbolicExpression, PreSymbolicExpressionType};
@@ -68,9 +70,13 @@ impl ClarityFormatter {
         Self { settings }
     }
     /// formatting for files to ensure a newline at the end
-    pub fn format_file(&self, source: &str) -> String {
+    pub fn format_file(&self, source: &str, epoch: Option<StacksEpochId>) -> String {
         let trimmed_source = source.trim_start_matches(['\n', '\r']);
-        let pse = clarity::vm::ast::parser::v2::parse(trimmed_source).unwrap();
+        let pse = clarity::vm::ast::parser::v2::parse(
+            trimmed_source,
+            StackDepthLimits::for_epoch(epoch.unwrap_or(StacksEpochId::latest())),
+        )
+        .unwrap();
         let agg = Aggregator::new(&self.settings, &pse, Some(trimmed_source));
         let result = agg.generate();
 
@@ -83,12 +89,20 @@ impl ClarityFormatter {
         agg.generate()
     }
     /// Alias `format_file` to `format`
-    pub fn format(&self, source: &str) -> String {
-        self.format_file(source)
+    pub fn format(&self, source: &str, epoch: Option<StacksEpochId>) -> String {
+        self.format_file(source, epoch)
     }
     /// for range formatting within editors
-    pub fn format_section(&self, source: &str) -> Result<String, String> {
-        let pse = clarity::vm::ast::parser::v2::parse(source).map_err(|e| e.to_string())?;
+    pub fn format_section(
+        &self,
+        source: &str,
+        epoch: Option<StacksEpochId>,
+    ) -> Result<String, String> {
+        let pse = clarity::vm::ast::parser::v2::parse(
+            source,
+            StackDepthLimits::for_epoch(epoch.unwrap_or(StacksEpochId::latest())),
+        )
+        .map_err(|e| e.to_string())?;
 
         // range formatting specifies to the aggregator that we're
         // starting mid-source and thus should pre-populate
@@ -1889,6 +1903,8 @@ mod tests_formatter {
     #[allow(unused_imports)]
     use std::assert_eq;
 
+    use clarity::types::StacksEpochId;
+    use clarity::vm::ast::stack_depth_checker::StackDepthLimits;
     use indoc::indoc;
 
     use super::{ClarityFormatter, Settings};
@@ -1902,12 +1918,12 @@ mod tests_formatter {
 
     fn format_with_default(source: &str) -> String {
         let formatter = ClarityFormatter::new(Settings::default());
-        formatter.format_section(source).unwrap()
+        formatter.format_section(source, None).unwrap()
     }
 
     fn format_with(source: &str, settings: Settings) -> String {
         let formatter = ClarityFormatter::new(settings);
-        formatter.format_section(source).unwrap()
+        formatter.format_section(source, None).unwrap()
     }
 
     #[test]
@@ -2743,7 +2759,11 @@ mod tests_formatter {
     #[test]
     fn format_ast_without_source() {
         let src = "(define-private (noop) (begin (+ 1 2) (ok true)))";
-        let ast = clarity::vm::ast::parser::v2::parse(src).unwrap();
+        let ast = clarity::vm::ast::parser::v2::parse(
+            src,
+            StackDepthLimits::for_epoch(StacksEpochId::latest()),
+        )
+        .unwrap();
         let formatter = ClarityFormatter::new(Settings::default());
         let expected = format_with_default(src);
         let result = formatter.format_ast(&ast);
@@ -2753,7 +2773,11 @@ mod tests_formatter {
     #[test]
     fn format_ast_without_source_handle_indentation() {
         let src = "  (begin (+ 1 2) (ok true))";
-        let ast = clarity::vm::ast::parser::v2::parse(src).unwrap();
+        let ast = clarity::vm::ast::parser::v2::parse(
+            src,
+            StackDepthLimits::for_epoch(StacksEpochId::latest()),
+        )
+        .unwrap();
         let expected = format_with_default(src);
         let formatter = ClarityFormatter::new(Settings::default());
         let result = formatter.format_ast(&ast);
@@ -2879,7 +2903,11 @@ mod tests_formatter {
     fn test_list_type_signature() {
         fn assert_list_type_signature(src: &str, expected: bool) {
             let settings = Settings::default();
-            let exprs = clarity::vm::ast::parser::v2::parse(src).unwrap();
+            let exprs = clarity::vm::ast::parser::v2::parse(
+                src,
+                StackDepthLimits::for_epoch(StacksEpochId::latest()),
+            )
+            .unwrap();
             let aggregator = Aggregator::new(&settings, &exprs, Some(src));
             let list_exprs = exprs[0].match_list().unwrap();
             assert_eq!(aggregator.is_list_type_signature(list_exprs), expected);

components/clarinet-format/src/formatter/mod.rs

@@ -3,6 +3,8 @@ use std::fs;
 use std::path::Path;
 
 use clarinet_format::formatter::{ClarityFormatter, Indentation, Settings};
+use clarity::types::StacksEpochId;
+use clarity::vm::ast::stack_depth_checker::StackDepthLimits;
 
 /// This is strictly for reading top metadata from golden tests
 fn from_metadata(metadata: &str) -> Settings {
@@ -45,7 +47,7 @@ fn format_file_with_metadata(source: &str) -> String {
 
     let real_source = lines.collect::<Vec<&str>>().join("\n");
     let formatter = ClarityFormatter::new(settings);
-    formatter.format_file(&real_source)
+    formatter.format_file(&real_source, None)
 }
 #[test]
 fn test_irl_contracts() {
@@ -72,7 +74,10 @@ fn test_irl_contracts() {
             pretty_assertions::assert_eq!(result, intended, "Mismatch in file: {:?}", file_name);
             // parse resulting contract
             let (_statements, diagnostics, success) =
-                clarity::vm::ast::parser::v2::parse_collect_diagnostics(&result);
+                clarity::vm::ast::parser::v2::parse_collect_diagnostics(
+                    &result,
+                    StackDepthLimits::for_epoch(StacksEpochId::latest()),
+                );
 
             if !diagnostics.is_empty() {
                 println!("Result of re-parsing file: {}", file_name.to_str().unwrap());

components/clarinet-format/tests/golden.rs

@@ -415,7 +415,7 @@ pub fn process_request(
             };
 
             let formatter = clarinet_format::formatter::ClarityFormatter::new(formatting_options);
-            let formatted_result = formatter.format_file(source);
+            let formatted_result = formatter.format_file(source, Some(contract_data.epoch));
             let text_edit = ls_types::TextEdit {
                 range: ls_types::Range {
                     start: ls_types::Position {
@@ -470,6 +470,7 @@ pub fn process_request(
                 },
                 max_line_length,
             };
+            let epoch = Some(contract_data.epoch);
 
             // extract the text of just this range
             let lines: Vec<&str> = source.lines().collect();
@@ -540,7 +541,7 @@ pub fn process_request(
             let formatter = clarinet_format::formatter::ClarityFormatter::new(formatting_options);
 
             // Try to format the range text, but handle panics/errors gracefully
-            let formatted_result = formatter.format_section(&range_text);
+            let formatted_result = formatter.format_section(&range_text, epoch);
 
             let formatted_result = match formatted_result {
                 Ok(formatted_text) => {

components/clarity-lsp/src/common/backend.rs

@@ -1,4 +1,6 @@
+use ::clarity::types::StacksEpochId;
 use ::clarity::vm::ast::parser;
+use ::clarity::vm::ast::stack_depth_checker::StackDepthLimits;
 use ::clarity::vm::events::{FTEventType, NFTEventType, STXEventType, StacksTransactionEvent};
 use ::clarity::vm::representations::PreSymbolicExpressionType::Comment;
 
@@ -71,8 +73,10 @@ pub fn serialize_event(event: &StacksTransactionEvent) -> serde_json::Value {
 }
 
 pub fn remove_env_simnet(source: String) -> Result<String, String> {
-    let (pre_expressions, mut _diagnostics, success) =
-        parser::v2::parse_collect_diagnostics(&source);
+    let (pre_expressions, mut _diagnostics, success) = parser::v2::parse_collect_diagnostics(
+        &source,
+        StackDepthLimits::for_epoch(StacksEpochId::latest()),
+    );
 
     if !success {
         return Err("failed to parse pre_expressions from source".to_string());

components/clarity-repl/src/utils.rs

@@ -21,7 +21,7 @@
 
         # Hash for clarity git dependency - update this when Cargo.lock changes
         # Run `nix run .#check-git-dependencies-hash` to verify or get the new hash
-        clarityHash = "sha256-6/IsZoFOl2qX7yyakQVKxrl3fNXwSRBb3nCnFFkaA/U=";
+        clarityHash = "sha256-ktmxnwyId37u944Q9PsJmk7lR8jbLseHRsgEyxObMGk=";
 
         clarinet = pkgs.rustPlatform.buildRustPackage {
           inherit pname version;