From dd58c4d41578db5a401efcf222303489e8607ea6 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 18 Jul 2025 21:47:06 +0300 Subject: [PATCH 1/2] update to soldeer 0.6.0 --- Cargo.lock | 77 +++++++++++++++++++++++++++++++++++++++++++++++------- Cargo.toml | 4 +-- 2 files changed, 69 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3fe504399f294..31987a46551dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2311,6 +2311,15 @@ dependencies = [ "bzip2-sys", ] +[[package]] +name = "bzip2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea8dcd42434048e4f7a304411d9273a411f647446c1234a65ce0554923f4cff" +dependencies = [ + "libbz2-rs-sys", +] + [[package]] name = "bzip2-sys" version = "0.1.13+1.0.8" @@ -3778,6 +3787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" dependencies = [ "crc32fast", + "libz-rs-sys", "miniz_oxide", ] @@ -4672,7 +4682,7 @@ dependencies = [ "tracing", "tracing-subscriber 0.3.19", "ui_test", - "zip-extract", + "zip-extract 0.2.1", ] [[package]] @@ -5794,6 +5804,12 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" +[[package]] +name = "libbz2-rs-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775bf80d5878ab7c2b1080b5351a48b2f737d9f6f8b383574eebcc22be0dfccb" + [[package]] name = "libc" version = "0.2.174" @@ -5904,6 +5920,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libz-rs-sys" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221" +dependencies = [ + "zlib-rs", +] + [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -8892,9 +8917,9 @@ dependencies = [ [[package]] name = "soldeer-commands" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5234cb6edcb3ac81b73c4554391e47c78d5493ac17c59115d2e72b87746816" +checksum = "64c6643ada3819431e78fd2f31943ba2d8428780d34205db00b719fe4944a533" dependencies = [ "bon", "clap", @@ -8911,9 +8936,9 @@ dependencies = [ [[package]] name = "soldeer-core" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67f45108aec81281be2c23000bde114d568ac3899026779f21656bbc3d85671" +checksum = "fb97101eb5bad9cf4959325de64513303d238f30584ce9abe8ad21460c14afac" dependencies = [ "bon", "chrono", @@ -8936,8 +8961,8 @@ dependencies = [ "tokio", "toml_edit", "uuid 1.17.0", - "zip", - "zip-extract", + "zip 4.3.0", + "zip-extract 0.4.1", ] [[package]] @@ -9163,7 +9188,7 @@ dependencies = [ "tempfile", "thiserror 2.0.12", "url", - "zip", + "zip 2.4.2", ] [[package]] @@ -10863,7 +10888,7 @@ checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" dependencies = [ "aes", "arbitrary", - "bzip2", + "bzip2 0.5.2", "constant_time_eq", "crc32fast", "crossbeam-utils", @@ -10885,6 +10910,21 @@ dependencies = [ "zstd", ] +[[package]] +name = "zip" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aed4ac33e8eb078c89e6cbb1d5c4c7703ec6d299fc3e7c3695af8f8b423468b" +dependencies = [ + "arbitrary", + "bzip2 0.6.0", + "crc32fast", + "flate2", + "indexmap 2.10.0", + "memchr", + "zopfli", +] + [[package]] name = "zip-extract" version = "0.2.1" @@ -10893,9 +10933,26 @@ checksum = "25a8c9e90f27d1435088a7b540b6cc8ae6ee525d992a695f16012d2f365b3d3c" dependencies = [ "log", "thiserror 1.0.69", - "zip", + "zip 2.4.2", ] +[[package]] +name = "zip-extract" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa5b9958fd0b5b685af54f2c3fa21fca05fe295ebaf3e77b6d24d96c4174037" +dependencies = [ + "log", + "thiserror 2.0.12", + "zip 4.3.0", +] + +[[package]] +name = "zlib-rs" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a" + [[package]] name = "zopfli" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 848376fcd052a..3d682632c5b82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -335,8 +335,8 @@ semver = "1" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["arbitrary_precision"] } similar-asserts = "1.7" -soldeer-commands = "=0.5.4" -soldeer-core = { version = "=0.5.4", features = ["serde"] } +soldeer-commands = "=0.6.0" +soldeer-core = { version = "=0.6.0", features = ["serde"] } strum = "0.27" tempfile = "3.20" tokio = "1" From c9412a4f78f07c87b0b619ef7405aea991d3e4e4 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 23 Jul 2025 10:15:03 +0300 Subject: [PATCH 2/2] updated to v0.6.1 because we removed the dangling dependency --- Cargo.lock | 26 +++++--------------------- Cargo.toml | 4 ++-- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f6666eeb63e0..a2ab7856f8b94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2311,15 +2311,6 @@ dependencies = [ "bzip2-sys", ] -[[package]] -name = "bzip2" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea8dcd42434048e4f7a304411d9273a411f647446c1234a65ce0554923f4cff" -dependencies = [ - "libbz2-rs-sys", -] - [[package]] name = "bzip2-sys" version = "0.1.13+1.0.8" @@ -5839,12 +5830,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" -[[package]] -name = "libbz2-rs-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775bf80d5878ab7c2b1080b5351a48b2f737d9f6f8b383574eebcc22be0dfccb" - [[package]] name = "libc" version = "0.2.174" @@ -8952,9 +8937,9 @@ dependencies = [ [[package]] name = "soldeer-commands" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c6643ada3819431e78fd2f31943ba2d8428780d34205db00b719fe4944a533" +checksum = "4e8ff0e7ac2832b40dafe5b80811be1be41e6cab457c53aec3adcc80d8e03d02" dependencies = [ "bon", "clap", @@ -8971,9 +8956,9 @@ dependencies = [ [[package]] name = "soldeer-core" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb97101eb5bad9cf4959325de64513303d238f30584ce9abe8ad21460c14afac" +checksum = "92fd37a392b41211f12efbe0d5475bc7effde301dddc088998be8ada02e39941" dependencies = [ "bon", "chrono", @@ -10922,7 +10907,7 @@ checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" dependencies = [ "aes", "arbitrary", - "bzip2 0.5.2", + "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", @@ -10951,7 +10936,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aed4ac33e8eb078c89e6cbb1d5c4c7703ec6d299fc3e7c3695af8f8b423468b" dependencies = [ "arbitrary", - "bzip2 0.6.0", "crc32fast", "flate2", "indexmap 2.10.0", diff --git a/Cargo.toml b/Cargo.toml index eedcd134a57f8..d06b51bf2428b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -335,8 +335,8 @@ semver = "1" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["arbitrary_precision"] } similar-asserts = "1.7" -soldeer-commands = "=0.6.0" -soldeer-core = { version = "=0.6.0", features = ["serde"] } +soldeer-commands = "=0.6.1" +soldeer-core = { version = "=0.6.1", features = ["serde"] } strum = "0.27" tempfile = "3.20" tokio = "1"