From 5bb5cef76f3acc516533b915238cfe9cfd310bd7 Mon Sep 17 00:00:00 2001 From: Rigidity Date: Mon, 5 Aug 2024 09:47:40 -0400 Subject: [PATCH 1/3] Workspace dependencies --- Cargo.toml | 33 ++++++++++++++++++++++++++++----- fuzz/Cargo.toml | 7 ++----- wasm/Cargo.toml | 10 +++++----- wheel/Cargo.toml | 4 ++-- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 652cbc03..a667a8e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,23 +33,46 @@ openssl = ["dep:openssl"] [profile.release] lto = "thin" -[dependencies] +[workspace.dependencies] +clvmr = { path = "." } lazy_static = "1.5.0" num-bigint = "0.4.6" num-traits = "0.2.19" num-integer = "0.1.46" chia-bls = "0.10.0" sha2 = "0.10.8" -openssl = { version = "0.10.64", features = ["vendored"], optional = true } +openssl = "0.10.64" hex-literal = "0.4.1" # for secp sigs +k256 = "0.13.3" +p256 = "0.13.2" +rstest = "0.21.0" +criterion = "0.5.1" +hex = "0.4.3" +pyo3 = "0.22.1" +wasm-bindgen = "0.2.92" +wasm-bindgen-test = "0.3.42" +js-sys = "0.3.69" +getrandom = "0.2.15" +libfuzzer-sys = "0.4.6" + +[dependencies] +lazy_static = { workspace = true } +num-bigint = { workspace = true } +num-traits = { workspace = true } +num-integer = { workspace = true } +chia-bls = { workspace = true } +sha2 = { workspace = true } +openssl = { workspace = true, features = ["vendored"], optional = true } +hex-literal = { workspace = true } +# for secp sigs k256 = { version = "0.13.3", features = ["ecdsa"] } p256 = { version = "0.13.2", features = ["ecdsa"] } [dev-dependencies] -rstest = "0.21.0" -criterion = "0.5.1" -hex = "0.4.3" +rstest = { workspace = true } +criterion = { workspace = true } +hex = { workspace = true } [[bench]] name = "run-program" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 5eca6b99..cd509719 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -9,11 +9,8 @@ edition = "2021" cargo-fuzz = true [dependencies] -libfuzzer-sys = "0.4.6" - -[dependencies.clvmr] -path = ".." -default-features = false +libfuzzer-sys = { workspace = true } +clvmr = { workspace = true, default-features = false } [[bin]] name = "fuzz_run_program" diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index 7d97bbba..2a0ed93a 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -15,8 +15,8 @@ crate-type = ["cdylib"] path = "src/lib.rs" [dependencies] -clvmr = { path = ".." } -wasm-bindgen = "0.2.92" -wasm-bindgen-test = "0.3.42" -js-sys = "0.3.69" -getrandom = { version = "0.2.15", features = ["js"] } +clvmr = { workspace = true } +wasm-bindgen = { workspace = true } +wasm-bindgen-test = { workspace = true } +js-sys = { workspace = true } +getrandom = { workspace = true, features = ["js"] } diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml index baf63a0e..173a290c 100644 --- a/wheel/Cargo.toml +++ b/wheel/Cargo.toml @@ -15,8 +15,8 @@ crate-type = ["cdylib"] path = "src/lib.rs" [dependencies] -clvmr = { path = ".." } -pyo3 = { version = "0.22.1", features = ["abi3-py38", "extension-module"] } +clvmr = { workspace = true } +pyo3 = { workspace = true, features = ["abi3-py38", "extension-module"] } [features] openssl = ["clvmr/openssl"] From 919e50e19e01154403a907106af1b9a225013e50 Mon Sep 17 00:00:00 2001 From: Rigidity Date: Mon, 5 Aug 2024 09:50:30 -0400 Subject: [PATCH 2/3] Finish workspace deps --- Cargo.toml | 7 +++++++ fuzz/Cargo.toml | 2 +- tools/Cargo.toml | 26 +++++++++++++------------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a667a8e4..afe22d44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,6 +55,13 @@ wasm-bindgen-test = "0.3.42" js-sys = "0.3.69" getrandom = "0.2.15" libfuzzer-sys = "0.4.6" +rand = "0.8.5" +sha1 = "0.10.6" +linreg = "0.2.0" +serde = "1.0.204" +serde_json = "1.0.120" +clap = "4.5.9" +rand_chacha = "0.3.1" [dependencies] lazy_static = { workspace = true } diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index cd509719..f809b592 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -10,7 +10,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = { workspace = true } -clvmr = { workspace = true, default-features = false } +clvmr = { workspace = true } [[bin]] name = "fuzz_run_program" diff --git a/tools/Cargo.toml b/tools/Cargo.toml index 306c3a66..e9ffb55c 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -10,19 +10,19 @@ repository = "https://github.com/Chia-Network/clvm_rs/tools/" readme = "README.md" [dependencies] -hex-literal = "0.4.1" -hex = "0.4.3" -rand = "0.8.5" -sha1 = "0.10.6" -linreg = "0.2.0" -clvmr = { path = ".." } -chia-bls = "0.10.0" -num-bigint = "0.4.6" -num-integer = "0.1.46" -serde = { version = "1.0.204", features = ["derive"] } -serde_json = "1.0.120" -clap = { version = "4.5.9", features = ["derive"] } -rand_chacha = "0.3.1" +hex-literal = { workspace = true } +hex = { workspace = true } +rand = { workspace = true } +sha1 = { workspace = true } +linreg = { workspace = true } +clvmr = { workspace = true } +chia-bls = { workspace = true } +num-bigint = { workspace = true } +num-integer = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +clap = { workspace = true, features = ["derive"] } +rand_chacha = { workspace = true } [[bin]] name = "generate-fuzz-corpus" From 5f9e1af13a2b5b028c614cbd9d072a9ad77bdb28 Mon Sep 17 00:00:00 2001 From: Rigidity Date: Mon, 5 Aug 2024 09:51:52 -0400 Subject: [PATCH 3/3] Bump dependencies --- Cargo.lock | 45 +++++++++++++++++++++++---------------------- Cargo.toml | 8 ++++---- package-lock.json | 8 ++++---- package.json | 2 +- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3db76508..61eeb8c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -238,9 +238,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -248,9 +248,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -260,9 +260,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", @@ -959,9 +959,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags", "cfg-if", @@ -994,9 +994,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1133,9 +1133,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e99090d12f6182924499253aaa1e73bf15c69cea8d2774c3c781e35badc3548" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" dependencies = [ "cfg-if", "indoc", @@ -1151,9 +1151,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7879eb018ac754bba32cb0eec7526391c02c14a093121857ed09fbf1d1057d41" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" dependencies = [ "once_cell", "target-lexicon", @@ -1161,9 +1161,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2baa5559a411fc1cf519295f24c34b53d5d725818bc96b5abf94762da09041" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" dependencies = [ "libc", "pyo3-build-config", @@ -1171,9 +1171,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049621c20a23f2def20f4fe67978d1da8d8a883d64b9c21362f3b776e254edc7" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1183,9 +1183,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e969ee2e025435f1819d31a275ba4bb9cbbdf3ac535227fdbd85b9322ffe144" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" dependencies = [ "heck", "proc-macro2", @@ -1400,11 +1400,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] diff --git a/Cargo.toml b/Cargo.toml index afe22d44..aafdda82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ num-traits = "0.2.19" num-integer = "0.1.46" chia-bls = "0.10.0" sha2 = "0.10.8" -openssl = "0.10.64" +openssl = "0.10.66" hex-literal = "0.4.1" # for secp sigs k256 = "0.13.3" @@ -49,7 +49,7 @@ p256 = "0.13.2" rstest = "0.21.0" criterion = "0.5.1" hex = "0.4.3" -pyo3 = "0.22.1" +pyo3 = "0.22.2" wasm-bindgen = "0.2.92" wasm-bindgen-test = "0.3.42" js-sys = "0.3.69" @@ -59,8 +59,8 @@ rand = "0.8.5" sha1 = "0.10.6" linreg = "0.2.0" serde = "1.0.204" -serde_json = "1.0.120" -clap = "4.5.9" +serde_json = "1.0.121" +clap = "4.5.11" rand_chacha = "0.3.1" [dependencies] diff --git a/package-lock.json b/package-lock.json index ceba34a9..15b155bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "devDependencies": { - "prettier": "^3.3.2" + "prettier": "^3.3.3" } }, "node_modules/prettier": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", - "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "license": "MIT", "bin": { diff --git a/package.json b/package.json index 0e5e7447..ad7cf763 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,6 @@ "fmt": "prettier --write ." }, "devDependencies": { - "prettier": "^3.3.2" + "prettier": "^3.3.3" } }