From aaa5a983c1d48579b1d6acd1d317468e48a4be12 Mon Sep 17 00:00:00 2001 From: Hugo Caillard <911307+hugocaillard@users.noreply.github.com> Date: Wed, 14 Jun 2023 13:48:19 +0200 Subject: [PATCH 1/3] chore: update changelog for 1.7.0 --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3aaacf7fe..98c4fff01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +#### 1.7.0 (2023-06-14) +##### New Features + +* Upgrade clarity-vm and handle epoch 2.4 (0c8de5b4) +* Improve clarity test code coverage and handle code branches (#1030) (13d45025) + +##### Chores + +* update chainhook-sdk (5eed0bf6) +* update chainhook-types (57a7957d) +* handle clarity-vm 2.1 (#1037) (7fe94b80) +* bump clarity repl to 1.6.4 (#1036) (3bad4177) +* remove unused deps (#1032) (c30af614) + #### 1.6.1 (2023-05-16) *Note* This release fixes the build of v1.6.0 From a93e638c7f557ae160482efb0560135d18f4af6d Mon Sep 17 00:00:00 2001 From: Hugo Caillard <911307+hugocaillard@users.noreply.github.com> Date: Wed, 14 Jun 2023 13:48:31 +0200 Subject: [PATCH 2/3] chore: bump version to 1.7.0 --- Cargo.lock | 47 +++++++++++++++--------- components/clarinet-cli/Cargo.toml | 2 +- components/clarity-repl/Cargo.toml | 2 +- components/stacks-devnet-js/Cargo.toml | 2 +- components/stacks-devnet-js/package.json | 2 +- components/stacks-network/Cargo.toml | 6 ++- 6 files changed, 37 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 878a8b8a7..05b31705d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -786,7 +786,7 @@ dependencies = [ [[package]] name = "clarinet-cli" -version = "1.6.2" +version = "1.7.0" dependencies = [ "aes 0.7.5", "ansi_term", @@ -802,7 +802,7 @@ dependencies = [ "clarinet-files", "clarinet-utils 1.0.0", "clarity-lsp", - "clarity-repl 1.6.4", + "clarity-repl 1.7.0", "crossbeam-channel", "crossterm 0.22.1", "ctrlc", @@ -902,7 +902,7 @@ dependencies = [ "bitcoincore-rpc-json", "clarinet-files", "clarinet-utils 1.0.0", - "clarity-repl 1.6.4", + "clarity-repl 1.7.0", "libsecp256k1 0.7.1", "reqwest", "serde", @@ -921,7 +921,7 @@ dependencies = [ "bitcoin", "chainhook-types", "clarinet-utils 1.0.0", - "clarity-repl 1.6.4", + "clarity-repl 1.7.0", "js-sys", "libsecp256k1 0.7.1", "serde", @@ -961,7 +961,7 @@ version = "1.0.0" dependencies = [ "clap", "clarinet-files", - "clarity-repl 1.6.4", + "clarity-repl 1.7.0", "serde", "serde_derive", "serde_json", @@ -973,7 +973,7 @@ name = "clarity-jupyter-kernel" version = "1.0.0" dependencies = [ "chrono", - "clarity-repl 1.6.4", + "clarity-repl 1.7.0", "colored", "dirs", "failure", @@ -995,7 +995,7 @@ version = "1.0.0" dependencies = [ "clarinet-deployments", "clarinet-files", - "clarity-repl 1.6.4", + "clarity-repl 1.7.0", "console_error_panic_hook", "js-sys", "lazy_static", @@ -1012,6 +1012,8 @@ dependencies = [ [[package]] name = "clarity-repl" version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a0deb0194874c1759dab6b6df926980d1de17a5317b22bacd21b00e213b0d8d" dependencies = [ "ansi_term", "atty", @@ -1021,7 +1023,7 @@ dependencies = [ "debug_types", "futures", "getrandom 0.2.8", - "hiro-system-kit 0.1.0", + "hiro-system-kit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "httparse", "integer-sqrt", "lazy_static", @@ -1040,15 +1042,11 @@ dependencies = [ "sha3 0.9.1", "tokio", "tokio-util 0.7.7", - "wasm-bindgen", - "wasm-bindgen-futures", ] [[package]] name = "clarity-repl" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0deb0194874c1759dab6b6df926980d1de17a5317b22bacd21b00e213b0d8d" +version = "1.7.0" dependencies = [ "ansi_term", "atty", @@ -1058,7 +1056,7 @@ dependencies = [ "debug_types", "futures", "getrandom 0.2.8", - "hiro-system-kit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hiro-system-kit 0.1.0", "httparse", "integer-sqrt", "lazy_static", @@ -1077,6 +1075,8 @@ dependencies = [ "sha3 0.9.1", "tokio", "tokio-util 0.7.7", + "wasm-bindgen", + "wasm-bindgen-futures", ] [[package]] @@ -5675,7 +5675,7 @@ dependencies = [ [[package]] name = "stacks-devnet-js" -version = "1.6.2" +version = "1.7.0" dependencies = [ "clarinet-deployments", "clarinet-files", @@ -5691,7 +5691,7 @@ dependencies = [ [[package]] name = "stacks-network" -version = "1.5.1" +version = "1.7.0" dependencies = [ "base58 0.2.0", "bitcoin", @@ -5703,7 +5703,7 @@ dependencies = [ "clarinet-deployments", "clarinet-files", "clarinet-utils 1.0.0", - "clarity-repl 1.6.4", + "clarity-repl 1.7.0", "crossbeam-channel", "crossterm 0.22.1", "ctrlc", @@ -5721,13 +5721,24 @@ dependencies = [ "tui", ] +[[package]] +name = "stacks-rpc-client" +version = "1.0.6" +dependencies = [ + "clarity-repl 1.7.0", + "reqwest", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "stacks-rpc-client" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cf5e7c501af0ccfbd24059ec0617574f06be4eb94e8492221d8e77a9a9b881" dependencies = [ - "clarity-repl 1.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "clarity-repl 1.6.4", "reqwest", "serde", "serde_derive", diff --git a/components/clarinet-cli/Cargo.toml b/components/clarinet-cli/Cargo.toml index bf7633f96..1c3242147 100644 --- a/components/clarinet-cli/Cargo.toml +++ b/components/clarinet-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clarinet-cli" -version = "1.6.2" +version = "1.7.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/clarity-repl/Cargo.toml b/components/clarity-repl/Cargo.toml index 00b267c70..1ca89ac94 100644 --- a/components/clarity-repl/Cargo.toml +++ b/components/clarity-repl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clarity-repl" -version = "1.6.4" +version = "1.7.0" description = "Clarity REPL" authors = [ "Ludo Galabru ", diff --git a/components/stacks-devnet-js/Cargo.toml b/components/stacks-devnet-js/Cargo.toml index 88e276f78..b98b6349e 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 = "1.6.2" +version = "1.7.0" license = "ISC" edition = "2018" exclude = ["index.node"] diff --git a/components/stacks-devnet-js/package.json b/components/stacks-devnet-js/package.json index 29456d916..5ab5a13ad 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": "1.6.2", + "version": "1.7.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 bd4093503..b7ac9f218 100644 --- a/components/stacks-network/Cargo.toml +++ b/components/stacks-network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stacks-network" -version = "1.5.1" +version = "1.7.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -31,7 +31,9 @@ futures = "0.3.12" base58 = "0.2.0" # chainhook-sdk = { version = "=0.4.0", default-features = false, features = ["log"], path = "../../../chainhook/components/chainhook-sdk" } -chainhook-sdk = { version = "=0.4.0", default-features = false, features = ["log"] } +chainhook-sdk = { version = "=0.4.0", default-features = false, features = [ + "log", +] } stacks-rpc-client = { path = "../stacks-rpc-client" } clarinet-files = { path = "../clarinet-files", features = ["cli"] } clarinet-deployments = { path = "../clarinet-deployments", features = ["cli"] } From 6dd14feec8d34fec81b1c930695bf43d5b072e0d Mon Sep 17 00:00:00 2001 From: Hugo Caillard <911307+hugocaillard@users.noreply.github.com> Date: Wed, 14 Jun 2023 16:41:05 +0200 Subject: [PATCH 3/3] chore: update cargo.lock --- Cargo.lock | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05b31705d..b0c0e631d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5721,17 +5721,6 @@ dependencies = [ "tui", ] -[[package]] -name = "stacks-rpc-client" -version = "1.0.6" -dependencies = [ - "clarity-repl 1.7.0", - "reqwest", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "stacks-rpc-client" version = "1.0.6" @@ -5749,7 +5738,7 @@ dependencies = [ name = "stacks-rpc-client" version = "1.0.7" dependencies = [ - "clarity-repl 1.6.4", + "clarity-repl 1.7.0", "hmac 0.12.1", "libsecp256k1 0.7.1", "pbkdf2",