diff --git a/Cargo.lock b/Cargo.lock index 826a30f97..5571f2d10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -714,7 +714,7 @@ dependencies = [ [[package]] name = "clarity" version = "0.0.1" -source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#8f56fd4d45a88b25dc1c8869ee892edda579527a" +source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#bc9adb35430a893ad1d56dc5234883d6d5147dbc" dependencies = [ "hashbrown 0.15.5", "integer-sqrt", @@ -1185,7 +1185,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -1316,7 +1316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -2400,7 +2400,7 @@ dependencies = [ [[package]] name = "libstackerdb" version = "0.0.1" -source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#8f56fd4d45a88b25dc1c8869ee892edda579527a" +source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#bc9adb35430a893ad1d56dc5234883d6d5147dbc" dependencies = [ "clarity", "secp256k1 0.24.3", @@ -2987,7 +2987,7 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "pox-locking" version = "2.4.0" -source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#8f56fd4d45a88b25dc1c8869ee892edda579527a" +source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#bc9adb35430a893ad1d56dc5234883d6d5147dbc" dependencies = [ "clarity", "slog", @@ -3507,7 +3507,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.9.4", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "stacks-common" version = "0.0.1" -source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#8f56fd4d45a88b25dc1c8869ee892edda579527a" +source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#bc9adb35430a893ad1d56dc5234883d6d5147dbc" dependencies = [ "chrono", "curve25519-dalek", @@ -4248,7 +4248,7 @@ dependencies = [ [[package]] name = "stackslib" version = "0.0.1" -source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#8f56fd4d45a88b25dc1c8869ee892edda579527a" +source = "git+https://github.com/stacks-network/stacks-core.git?branch=develop#bc9adb35430a893ad1d56dc5234883d6d5147dbc" dependencies = [ "clarity", "ed25519-dalek", @@ -4419,7 +4419,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix 1.0.8", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -4428,7 +4428,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a43bddab41f8626c7bdaab872bbba75f8df5847b516d77c569c746e2ae5eb746" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -5184,7 +5184,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 72bb46c9c..bf7a07cf7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,6 +38,7 @@ reqwest = { version = "0.12.22", default-features = false, features = [ "rustls-tls", ] } strum = { version = "0.27.1" } +tempfile = { version = "3.21" } toml = { version = "0.5.6", features = ["preserve_order"] } tokio = { version = "1.47.0", features = ["full"] } tokio-util = { version = "0.7.16", features = ["codec"] } diff --git a/components/clarinet-cli/Cargo.toml b/components/clarinet-cli/Cargo.toml index c7c3a2303..65415f757 100644 --- a/components/clarinet-cli/Cargo.toml +++ b/components/clarinet-cli/Cargo.toml @@ -62,7 +62,7 @@ winapi = { version = "0.3.9", features = [ ] } [dev-dependencies] -tempfile = "3.0.0" +tempfile = { workspace = true } indoc = { workspace = true } [package.metadata.winres] diff --git a/components/clarity-repl/Cargo.toml b/components/clarity-repl/Cargo.toml index 6774e554e..bd7a3c10b 100644 --- a/components/clarity-repl/Cargo.toml +++ b/components/clarity-repl/Cargo.toml @@ -66,7 +66,7 @@ web-sys = { workspace = true } test-case = "*" divan = "0.1" mockito = { workspace = true } -tempfile = "3.19" +tempfile = { workspace = true } clarinet-files = { path = "../clarinet-files" } clarinet-deployments = { path = "../clarinet-deployments" } diff --git a/components/clarity-repl/src/repl/remote_data/context.rs b/components/clarity-repl/src/repl/remote_data/context.rs index 529b13437..0138cd58a 100644 --- a/components/clarity-repl/src/repl/remote_data/context.rs +++ b/components/clarity-repl/src/repl/remote_data/context.rs @@ -1,7 +1,7 @@ use clarity::types::StacksEpochId; use clarity::vm::callables::{DefineType, DefinedFunction}; use clarity::vm::costs::LimitedCostTracker; -use clarity::vm::errors::{CheckErrors, InterpreterResult as Result}; +use clarity::vm::errors::{CheckErrors, InterpreterResult as Result, SyntaxBindingErrorType}; use clarity::vm::functions::define::DefineFunctionsParsed; use clarity::vm::types::parse_name_type_pairs; use clarity::vm::{ClarityName, ContractContext, SymbolicExpression}; @@ -21,7 +21,12 @@ fn handle_function( let function_name = function_symbol .match_atom() .ok_or(CheckErrors::ExpectedName)?; - let arguments = parse_name_type_pairs(*epoch_id, arg_symbols, cost_tracker)?; + let arguments = parse_name_type_pairs::<_, CheckErrors>( + *epoch_id, + arg_symbols, + SyntaxBindingErrorType::Eval, + cost_tracker, + )?; Ok(( function_name.clone(), DefinedFunction::new(arguments, body, define_type, function_name, context_name),