Merge pull request #849 from Chia-Network/revert-845-bump-clvmr-0.11.0

Revert "bump clvm_rs dependency"

.github/workflows/build-wheels.yml

@@ -311,10 +311,6 @@ jobs:
         with:
           fetch-depth: 1
       - uses: dtolnay/rust-toolchain@stable
-      - run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
-        if: runner.os == 'Windows'
-      - run: vcpkg install openssl:x64-windows-static-md
-        if: runner.os == 'Windows'
       - name: Prepare for coverage
         if: matrix.os == 'ubuntu-latest'
         run: |

Cargo.lock

@@ -198,18 +198,6 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -291,7 +279,7 @@ dependencies = [
  "chia-protocol",
  "chia-puzzles",
  "chia-secp",
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "chia-ssl",
  "chia-traits 0.17.0",
  "clvm-traits",
@@ -301,13 +289,13 @@ dependencies = [
 
 [[package]]
 name = "chia-bls"
-version = "0.15.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53dea95bd7dac1e69c59ef6839ecf30ff3fe29170c16c4aa00093be21e0d789e"
+checksum = "725b43b268cb81f014559eed11a74d0e5b9dd55282cae272ff509796099ab0b9"
 dependencies = [
+ "anyhow",
  "blst",
- "chia-sha2 0.15.0",
- "chia-traits 0.15.0",
+ "chia-traits 0.10.0",
  "hex",
  "hkdf",
  "lru",
@@ -321,7 +309,7 @@ version = "0.17.0"
 dependencies = [
  "arbitrary",
  "blst",
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "chia-traits 0.17.0",
  "chia_py_streamable_macro",
  "criterion",
@@ -364,7 +352,7 @@ dependencies = [
  "chia-bls 0.17.0",
  "chia-protocol",
  "chia-puzzles",
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "chia-traits 0.17.0",
  "chia_py_streamable_macro",
  "chia_streamable_macro 0.17.0",
@@ -389,7 +377,7 @@ dependencies = [
  "chia-bls 0.17.0",
  "chia-consensus",
  "chia-protocol",
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "chia-traits 0.17.0",
  "clvm-traits",
  "clvm-utils",
@@ -404,7 +392,7 @@ version = "0.17.0"
 dependencies = [
  "arbitrary",
  "chia-bls 0.17.0",
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "chia-traits 0.17.0",
  "chia_py_streamable_macro",
  "chia_streamable_macro 0.17.0",
@@ -422,7 +410,7 @@ version = "0.16.0"
 dependencies = [
  "arbitrary",
  "chia-protocol",
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "chia-traits 0.17.0",
  "clvm-traits",
  "clvmr",
@@ -438,7 +426,7 @@ dependencies = [
  "arbitrary",
  "chia-bls 0.17.0",
  "chia-protocol",
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "clvm-traits",
  "clvm-utils",
  "clvmr",
@@ -463,24 +451,14 @@ version = "0.17.0"
 dependencies = [
  "anyhow",
  "arbitrary",
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "hex",
  "k256",
  "p256",
  "rand",
  "rand_chacha",
 ]
 
-[[package]]
-name = "chia-sha2"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7020f53eeae8b4c24c5666165738173a167c6478e0c0a9e1c428a491a2e1383d"
-dependencies = [
- "openssl",
- "sha2",
-]
-
 [[package]]
 name = "chia-sha2"
 version = "0.17.0"
@@ -523,20 +501,20 @@ dependencies = [
 
 [[package]]
 name = "chia-traits"
-version = "0.15.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57bbde886b38a9a5df185e751d90e295d14e99659bf43df7fa701d52d4da1ea"
+checksum = "1fb786114e5c748fe0af3ba1e95840fa1910b28f7300c05184506045aff60bb6"
 dependencies = [
- "chia-sha2 0.15.0",
- "chia_streamable_macro 0.15.0",
+ "chia_streamable_macro 0.10.0",
+ "sha2",
  "thiserror",
 ]
 
 [[package]]
 name = "chia-traits"
 version = "0.17.0"
 dependencies = [
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "chia_streamable_macro 0.17.0",
  "pyo3",
  "thiserror",
@@ -570,9 +548,9 @@ dependencies = [
 
 [[package]]
 name = "chia_streamable_macro"
-version = "0.15.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e78b5981952d2383b08344fdc6e6f843e72cc9d502d46d1d2824c485b34694"
+checksum = "43975e01fb4293021af4950366a6f80c45d7301d499622359c7533bd7af19592"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -701,7 +679,7 @@ dependencies = [
 name = "clvm-utils"
 version = "0.17.0"
 dependencies = [
- "chia-sha2 0.17.0",
+ "chia-sha2",
  "clvm-traits",
  "clvmr",
  "hex",
@@ -721,21 +699,20 @@ dependencies = [
 
 [[package]]
 name = "clvmr"
-version = "0.11.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b38393b34f8eb8460f66be324a0b4a507d5ffbcc1a88e49682d4b81936113a4"
+checksum = "2a0a3193c4f868919b940fa188f4251ed0c24e39d425ded397945bef1b08f7d9"
 dependencies = [
- "bitvec",
- "chia-bls 0.15.0",
- "chia-sha2 0.15.0",
+ "chia-bls 0.10.0",
  "hex-literal",
  "k256",
  "lazy_static",
  "num-bigint",
  "num-integer",
  "num-traits",
+ "openssl",
  "p256",
- "rand",
+ "sha2",
  "sha3",
 ]
 
@@ -1027,12 +1004,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
 [[package]]
 name = "futures"
 version = "0.3.30"
@@ -1630,6 +1601,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "openssl-src"
+version = "300.3.2+3.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.104"
@@ -1638,6 +1618,7 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -1873,12 +1854,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2281,12 +2256,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
 [[package]]
 name = "target-lexicon"
 version = "0.12.15"
@@ -2703,15 +2672,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
 [[package]]
 name = "x509-parser"
 version = "0.16.0"

Cargo.toml

@@ -123,7 +123,7 @@ chia-puzzles-fuzz = { path = "./crates/chia-puzzles/fuzz", version = "0.16.0" }
 clvm-traits-fuzz = { path = "./crates/clvm-traits/fuzz", version = "0.16.0" }
 clvm-utils-fuzz = { path = "./crates/clvm-utils/fuzz", version = "0.16.0" }
 blst = { version = "0.3.12", features = ["portable"] }
-clvmr = "0.11.0"
+clvmr = "0.10.0"
 syn = "2.0.95"
 quote = "1.0.38"
 proc-macro2 = "1.0.92"

crates/chia-consensus/src/gen/solution_generator.rs

@@ -418,27 +418,28 @@ mod tests {
 
                 b78080
 
-                ff0180
+                fe81f6
 
                 ffff04ffff01ff32ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff
                 06ffff04ff02ffff04ff09ff80808080ffff02ff06ffff04ff02ffff04ff0dff
                 8080808080ffff01ff0bffff0101
 
-                ff0580
+                fe6f
 
                 80ff0180
 
-                ff0180
+                fe3e
 
                 80ffff04ffff01b08cf5533a94afae0f4613d3ea565e47abc5373415967ef582
                 4fd009c602cb629e259908ce533c21de7fd7a68eb96c52d0
 
-                ff0180
+                fe7f
 
                 80ff8601977420dc00ffff80ffff01ffff3dffa080115c1c71035a2cd60a4949
                 9fb9e5cb55be8d6e25e8680bfc0409b7acaeffd48080ff8080808080"
             )
         );
+
         let generator_output = run_generator(&result);
         assert_eq!(generator_output, EXPECTED_GENERATOR_OUTPUT);
     }