diff --git a/CHANGELOG.md b/CHANGELOG.md index 39abb7aa8..cf5553d00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +# [2.3.0](https://github.com/hirosystems/clarinet/compare/v2.2.1...v2.3.0) (2024-03-01) + +##### Chores + +* Update clarinet new project template (#1367) (80be7030) +* Remove chainhook subcommands (#1328) (1d084ef3) + +##### New Features + +* Handle deployment plans in simnet (clarinet-sdk only) (#1360) (a340d48a) +* Improve clarity-wasm results comparison (#1358) (0f9e612a) +* Enable clarity-wasm in clarity check (#1355) (abc34585) + +##### Bug Fixes + +* Log to devnet.log file when running js devnet (#1363) (388c5018) +* Reemove errors on exit when running devnet with `--no-dashboard` (#1357) (fad5c763) + +##### Refactors + +* Let @stacks/transactions handle tuple items sorting in tests diff (#1362) (d3138915) + # [2.2.1](https://github.com/hirosystems/clarinet/compare/v2.2.0...v2.2.1) (2024-02-08) ##### Bug Fixes diff --git a/Cargo.lock b/Cargo.lock index 3291c5dc3..978feb8fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -687,7 +687,7 @@ dependencies = [ "serde-hex", "serde_derive", "serde_json", - "stacks-rpc-client 2.2.1 (git+https://github.com/hirosystems/clarinet.git?rev=1458e224)", + "stacks-rpc-client 2.2.1", "threadpool", "tokio", ] @@ -794,7 +794,7 @@ dependencies = [ [[package]] name = "clarinet-cli" -version = "2.2.1" +version = "2.3.0" dependencies = [ "ansi_term", "atty", @@ -807,7 +807,7 @@ dependencies = [ "clarinet-files", "clarinet-utils", "clarity-lsp", - "clarity-repl 2.2.1", + "clarity-repl 2.3.0", "crossbeam-channel", "crossterm", "ctrlc", @@ -853,7 +853,7 @@ dependencies = [ [[package]] name = "clarinet-deployments" -version = "2.2.1" +version = "2.3.0" dependencies = [ "base58 0.2.0", "base64 0.21.7", @@ -862,7 +862,7 @@ dependencies = [ "bitcoincore-rpc-json 0.16.0", "clarinet-files", "clarinet-utils", - "clarity-repl 2.2.1", + "clarity-repl 2.3.0", "colored 2.1.0", "libsecp256k1 0.7.1", "reqwest", @@ -870,19 +870,19 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "stacks-rpc-client 2.2.1", + "stacks-rpc-client 2.3.0", "tiny-hderive", ] [[package]] name = "clarinet-files" -version = "2.2.1" +version = "2.3.0" dependencies = [ "bip39", "bitcoin 0.29.2", "chainhook-types", "clarinet-utils", - "clarity-repl 2.2.1", + "clarity-repl 2.3.0", "js-sys", "libsecp256k1 0.7.1", "serde", @@ -898,11 +898,11 @@ dependencies = [ [[package]] name = "clarinet-sdk-wasm" -version = "2.3.0-rc3" +version = "2.3.0" dependencies = [ "clarinet-deployments", "clarinet-files", - "clarity-repl 2.2.1", + "clarity-repl 2.3.0", "colored 2.1.0", "console_error_panic_hook", "gloo-utils", @@ -951,7 +951,7 @@ version = "1.0.0" dependencies = [ "clap", "clarinet-files", - "clarity-repl 2.2.1", + "clarity-repl 2.3.0", "serde", "serde_derive", "serde_json", @@ -963,7 +963,7 @@ name = "clarity-jupyter-kernel" version = "1.0.0" dependencies = [ "chrono", - "clarity-repl 2.2.1", + "clarity-repl 2.3.0", "colored 1.9.3", "dirs", "failure", @@ -985,7 +985,7 @@ version = "1.0.0" dependencies = [ "clarinet-deployments", "clarinet-files", - "clarity-repl 2.2.1", + "clarity-repl 2.3.0", "console_error_panic_hook", "js-sys", "lazy_static", @@ -1002,57 +1002,57 @@ dependencies = [ [[package]] name = "clarity-repl" version = "2.2.1" +source = "git+https://github.com/hirosystems/clarinet.git?rev=1458e224#1458e224d6aa8b53f49f50d880d6d0d078454438" dependencies = [ "ansi_term", "atty", - "bytes", "chrono", - "clar2wasm", "clarity", - "debug_types", - "futures", "getrandom 0.2.8", - "hiro-system-kit 0.1.0", - "httparse", + "hiro-system-kit 0.1.0 (git+https://github.com/hirosystems/clarinet.git?rev=1458e224)", "integer-sqrt", "lazy_static", - "log", - "memchr", - "pico-args", - "prettytable-rs", "regex", "reqwest", - "rustyline", "serde", "serde_derive", "serde_json", "sha2 0.10.6", - "tokio", - "tokio-util", - "wasm-bindgen", - "wasm-bindgen-futures", "wsts 7.0.0", ] [[package]] name = "clarity-repl" -version = "2.2.1" -source = "git+https://github.com/hirosystems/clarinet.git?rev=1458e224#1458e224d6aa8b53f49f50d880d6d0d078454438" +version = "2.3.0" dependencies = [ "ansi_term", "atty", + "bytes", "chrono", + "clar2wasm", "clarity", + "debug_types", + "futures", "getrandom 0.2.8", - "hiro-system-kit 0.1.0 (git+https://github.com/hirosystems/clarinet.git?rev=1458e224)", + "hiro-system-kit 0.1.0", + "httparse", "integer-sqrt", "lazy_static", + "log", + "memchr", + "pico-args", + "prettytable-rs", "regex", "reqwest", + "rustyline", "serde", "serde_derive", "serde_json", "sha2 0.10.6", + "tokio", + "tokio-util", + "wasm-bindgen", + "wasm-bindgen-futures", "wsts 7.0.0", ] @@ -4691,7 +4691,7 @@ dependencies = [ [[package]] name = "stacks-devnet-js" -version = "2.2.1" +version = "2.3.0" dependencies = [ "clarinet-deployments", "clarinet-files", @@ -4707,7 +4707,7 @@ dependencies = [ [[package]] name = "stacks-network" -version = "2.2.1" +version = "2.3.0" dependencies = [ "ansi_term", "atty", @@ -4722,7 +4722,7 @@ dependencies = [ "clarinet-deployments", "clarinet-files", "clarinet-utils", - "clarity-repl 2.2.1", + "clarity-repl 2.3.0", "crossbeam-channel", "crossterm", "ctrlc", @@ -4735,7 +4735,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "stacks-rpc-client 2.2.1", + "stacks-rpc-client 2.3.0", "tokio", "tracing", "tracing-appender", @@ -4745,6 +4745,7 @@ dependencies = [ [[package]] name = "stacks-rpc-client" version = "2.2.1" +source = "git+https://github.com/hirosystems/clarinet.git?rev=1458e224#1458e224d6aa8b53f49f50d880d6d0d078454438" dependencies = [ "clarity-repl 2.2.1", "hmac 0.12.1", @@ -4760,10 +4761,9 @@ dependencies = [ [[package]] name = "stacks-rpc-client" -version = "2.2.1" -source = "git+https://github.com/hirosystems/clarinet.git?rev=1458e224#1458e224d6aa8b53f49f50d880d6d0d078454438" +version = "2.3.0" dependencies = [ - "clarity-repl 2.2.1 (git+https://github.com/hirosystems/clarinet.git?rev=1458e224)", + "clarity-repl 2.3.0", "hmac 0.12.1", "libsecp256k1 0.7.1", "pbkdf2", diff --git a/components/clarinet-cli/Cargo.toml b/components/clarinet-cli/Cargo.toml index 12bac050f..e994acde8 100644 --- a/components/clarinet-cli/Cargo.toml +++ b/components/clarinet-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clarinet-cli" -version = "2.2.1" +version = "2.3.0" authors = ["Ludo Galabru ", "Brice Dobry "] edition = "2021" description = "Clarinet is a simple, modern and opinionated runtime for testing, integrating and deploying Clarity smart contracts." diff --git a/components/clarinet-cli/src/generate/project.rs b/components/clarinet-cli/src/generate/project.rs index b6c51fb7a..88ddfcc43 100644 --- a/components/clarinet-cli/src/generate/project.rs +++ b/components/clarinet-cli/src/generate/project.rs @@ -491,13 +491,13 @@ btc_address = "mvZtbibDAAA3WLpY7zXXFqRa3T4XSknBX7" "author": "", "license": "ISC", "dependencies": {{ - "@hirosystems/clarinet-sdk": "^1.0.0", - "@stacks/transactions": "^6.9.0", + "@hirosystems/clarinet-sdk": "^2.3.0", + "@stacks/transactions": "^6.12.0", "chokidar-cli": "^3.0.0", - "typescript": "^5.2.2", - "vite": "^5.0.6", - "vitest": "^1.0.1", - "vitest-environment-clarinet": "^1.1.0" + "typescript": "^5.3.3", + "vite": "^5.1.4", + "vitest": "^1.3.1", + "vitest-environment-clarinet": "^2.0.0" }} }} "#, @@ -580,7 +580,12 @@ import { vitestSetupFilePath, getClarinetVitestsArgv } from "@hirosystems/clarin export default defineConfig({ test: { environment: "clarinet", // use vitest-environment-clarinet - singleThread: true, + pool: "forks", + poolOptions: { + threads: { + singleThread: true, + }, + }, setupFiles: [ vitestSetupFilePath, // custom setup files can be added here @@ -593,6 +598,7 @@ export default defineConfig({ }, }, }); + "#.into(); let name = "vitest.config.js".into(); let path = format!("{}/{}/{}", self.project_path, self.project_name, name); diff --git a/components/clarinet-deployments/Cargo.toml b/components/clarinet-deployments/Cargo.toml index 08c7a8c54..51feba0c0 100644 --- a/components/clarinet-deployments/Cargo.toml +++ b/components/clarinet-deployments/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clarinet-deployments" -version = "2.2.1" +version = "2.3.0" edition = "2021" [dependencies] diff --git a/components/clarinet-files/Cargo.toml b/components/clarinet-files/Cargo.toml index 96df79197..02612c02b 100644 --- a/components/clarinet-files/Cargo.toml +++ b/components/clarinet-files/Cargo.toml @@ -2,7 +2,7 @@ name = "clarinet-files" description = "Clarinet manifests files helpers" license = "GPL-3.0" -version = "2.2.1" +version = "2.3.0" edition = "2021" [dependencies] diff --git a/components/clarinet-sdk-wasm/Cargo.toml b/components/clarinet-sdk-wasm/Cargo.toml index bc1fbfc95..86312def5 100644 --- a/components/clarinet-sdk-wasm/Cargo.toml +++ b/components/clarinet-sdk-wasm/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "clarinet-sdk-wasm" -version = "2.3.0-rc3" +version = "2.3.0" license = "GPL-3.0" repository = "https://github.com/hirosystems/clarinet" description = "The core lib that powers @hirosystems/clarinet-sdk" diff --git a/components/clarinet-sdk/package.json b/components/clarinet-sdk/package.json index 6b584a2c9..0fa616e13 100644 --- a/components/clarinet-sdk/package.json +++ b/components/clarinet-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@hirosystems/clarinet-sdk", - "version": "2.3.0-rc3", + "version": "2.3.0", "description": "A SDK to interact with Clarity Smart Contracts", "homepage": "https://docs.hiro.so/clarinet/feature-guides/clarinet-js-sdk", "repository": { diff --git a/components/clarity-repl/Cargo.toml b/components/clarity-repl/Cargo.toml index e6a62e4a2..aa741180b 100644 --- a/components/clarity-repl/Cargo.toml +++ b/components/clarity-repl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clarity-repl" -version = "2.2.1" +version = "2.3.0" description = "Clarity REPL" authors = [ "Ludo Galabru ", diff --git a/components/stacks-devnet-js/Cargo.toml b/components/stacks-devnet-js/Cargo.toml index dc4a9e6c5..a53e8d941 100644 --- a/components/stacks-devnet-js/Cargo.toml +++ b/components/stacks-devnet-js/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stacks-devnet-js" -version = "2.2.1" +version = "2.3.0" license = "ISC" edition = "2018" exclude = ["index.node"] diff --git a/components/stacks-devnet-js/package-lock.json b/components/stacks-devnet-js/package-lock.json index 530ade0ce..0103a53ef 100644 --- a/components/stacks-devnet-js/package-lock.json +++ b/components/stacks-devnet-js/package-lock.json @@ -1,12 +1,12 @@ { "name": "@hirosystems/stacks-devnet-js", - "version": "2.2.1", + "version": "2.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@hirosystems/stacks-devnet-js", - "version": "2.2.1", + "version": "2.3.0", "hasInstallScript": true, "license": "GPL-3.0", "dependencies": { diff --git a/components/stacks-devnet-js/package.json b/components/stacks-devnet-js/package.json index ccb74eb22..60d0333bf 100644 --- a/components/stacks-devnet-js/package.json +++ b/components/stacks-devnet-js/package.json @@ -1,6 +1,6 @@ { "name": "@hirosystems/stacks-devnet-js", - "version": "2.2.1", + "version": "2.3.0", "description": "stacks-devnet-js is a library for writing end to end tests for protocols interacting with the Stacks blockchain and the Bitcoin blockchain.", "author": "Ludo Galabru", "repository": "https://github.com/hirosystems/clarinet/tree/main/components/stacks-devnet-js", diff --git a/components/stacks-network/Cargo.toml b/components/stacks-network/Cargo.toml index a97942054..de8cc252f 100644 --- a/components/stacks-network/Cargo.toml +++ b/components/stacks-network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stacks-network" -version = "2.2.1" +version = "2.3.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/components/stacks-rpc-client/Cargo.toml b/components/stacks-rpc-client/Cargo.toml index bb773d782..aef41b5be 100644 --- a/components/stacks-rpc-client/Cargo.toml +++ b/components/stacks-rpc-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stacks-rpc-client" -version = "2.2.1" +version = "2.3.0" description = "HTTP Client for the Stacks blockchain" license = "GPL-3.0" edition = "2021" diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index d7db48313..000000000 --- a/package-lock.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "clarinet", - "lockfileVersion": 3, - "requires": true, - "packages": { - "node_modules/@hirosystems/clarinet-sdk-wasm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@hirosystems/clarinet-sdk-wasm/-/clarinet-sdk-wasm-1.0.0.tgz", - "integrity": "sha512-axDe2iSSnxwbQT8FzJZ6U1jivKpQduHhq2wjMs6y0eX6gkbR19xDa0V/fMoaGb1ke6D1R5Hex7oTO+UJST+lUw==" - } - } -}