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

bump clvm_rs dependency
Chia-Network · Jan 7, 2025 · 3f7ce68 · 3f7ce68
2 parents 80cd2bc + fa7269a
commit 3f7ce68
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 41 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -311,6 +311,10 @@ 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: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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.10.0"
+clvmr = "0.11.0"
 syn = "2.0.95"
 quote = "1.0.38"
 proc-macro2 = "1.0.92"

diff --git a/crates/chia-consensus/src/gen/solution_generator.rs b/crates/chia-consensus/src/gen/solution_generator.rs
@@ -418,28 +418,27 @@ mod tests {
 
                 b78080
 
-                fe81f6
+                ff0180
 
                 ffff04ffff01ff32ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff
                 06ffff04ff02ffff04ff09ff80808080ffff02ff06ffff04ff02ffff04ff0dff
                 8080808080ffff01ff0bffff0101
 
-                fe6f
+                ff0580
 
                 80ff0180
 
-                fe3e
+                ff0180
 
                 80ffff04ffff01b08cf5533a94afae0f4613d3ea565e47abc5373415967ef582
                 4fd009c602cb629e259908ce533c21de7fd7a68eb96c52d0
 
-                fe7f
+                ff0180
 
                 80ff8601977420dc00ffff80ffff01ffff3dffa080115c1c71035a2cd60a4949
                 9fb9e5cb55be8d6e25e8680bfc0409b7acaeffd48080ff8080808080"
             )
         );
-
         let generator_output = run_generator(&result);
         assert_eq!(generator_output, EXPECTED_GENERATOR_OUTPUT);
     }