From eaf3aa7c510e4332102c6104978234b03c17a973 Mon Sep 17 00:00:00 2001
From: Earle Lowe <e.lowe@chia.net>
Date: Tue, 2 Jan 2024 09:49:56 -0800
Subject: [PATCH] portable SHA256

---
 .github/workflows/build-test.yml |  3 +++
 Cargo.lock                       | 17 ++++++++---------
 Cargo.toml                       |  3 +++
 chia-bls/Cargo.toml              |  2 +-
 wheel/Cargo.toml                 |  3 +++
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 9a25098e0..0974add63 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -176,6 +176,9 @@ jobs:
 
     - name: Build Windows with maturin on Python ${{ matrix.python }}
       if: matrix.os.matrix == 'windows'
+      env:
+        CC: 'clang'
+        CFLAGS: "-D__BLST_PORTABLE__"
       run: |
         py -${{ matrix.python.major-dot-minor }} -m venv venv
         . .\venv\Scripts\Activate.ps1
diff --git a/Cargo.lock b/Cargo.lock
index ab99c18d5..e5b0cf69b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -233,8 +233,7 @@ dependencies = [
 [[package]]
 name = "blst"
 version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b"
+source = "git+https://github.com/supranational/blst.git?rev=0d46eefa45fc1e57aceb42bba0e84eab3a7a9725#0d46eefa45fc1e57aceb42bba0e84eab3a7a9725"
 dependencies = [
  "cc",
  "glob",
@@ -283,7 +282,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chia"
-version = "0.2.12"
+version = "0.2.13"
 dependencies = [
  "chia-protocol",
  "chia-traits",
@@ -303,7 +302,7 @@ dependencies = [
 
 [[package]]
 name = "chia-bls"
-version = "0.2.12"
+version = "0.2.13"
 dependencies = [
  "anyhow",
  "arbitrary",
@@ -334,7 +333,7 @@ dependencies = [
 
 [[package]]
 name = "chia-client"
-version = "0.2.12"
+version = "0.2.13"
 dependencies = [
  "chia-protocol",
  "chia-traits",
@@ -361,7 +360,7 @@ dependencies = [
 
 [[package]]
 name = "chia-protocol"
-version = "0.2.12"
+version = "0.2.13"
 dependencies = [
  "arbitrary",
  "chia-bls",
@@ -390,7 +389,7 @@ dependencies = [
 
 [[package]]
 name = "chia-ssl"
-version = "0.2.12"
+version = "0.2.13"
 dependencies = [
  "lazy_static",
  "rand",
@@ -422,7 +421,7 @@ dependencies = [
 
 [[package]]
 name = "chia-traits"
-version = "0.2.12"
+version = "0.2.13"
 dependencies = [
  "chia_py_streamable_macro",
  "chia_streamable_macro",
@@ -444,7 +443,7 @@ dependencies = [
 
 [[package]]
 name = "chia_py_streamable_macro"
-version = "0.2.12"
+version = "0.2.13"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 020d68241..ce6effa83 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,3 +59,6 @@ crate-type = ["rlib"]
 
 [profile.release]
 lto = "thin"
+
+[patch.crates-io]
+blst = { git = "https://github.com/supranational/blst.git", rev = "0d46eefa45fc1e57aceb42bba0e84eab3a7a9725" }
diff --git a/chia-bls/Cargo.toml b/chia-bls/Cargo.toml
index 1b2ce6f18..93753e42b 100644
--- a/chia-bls/Cargo.toml
+++ b/chia-bls/Cargo.toml
@@ -19,7 +19,7 @@ anyhow = "1.0.71"
 # the newer sha2 crate doesn't implement the digest traits required by hkdf
 sha2 = "0.9.9"
 hkdf = "0.11.0"
-blst = { version = "0.3.11", features = ["portable"] }
+blst = { version = "0.3.11", git = "https://github.com/supranational/blst.git", rev = "0d46eefa45fc1e57aceb42bba0e84eab3a7a9725", features = ["portable"] }
 clvmr = "=0.3.0"
 hex = "0.4.3"
 thiserror = "1.0.44"
diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml
index 4bc979806..7518f1838 100644
--- a/wheel/Cargo.toml
+++ b/wheel/Cargo.toml
@@ -24,3 +24,6 @@ chia-protocol = { version = "=0.2.13", path = "../chia-protocol", features = ["p
 chia-traits = { version = "=0.2.13", path = "../chia-traits", features = ["py-bindings"]  }
 chia_py_streamable_macro = { version = "=0.2.13", path = "../chia_py_streamable_macro" }
 chia_streamable_macro = { version = "=0.2.12", path = "../chia_streamable_macro" }
+
+[patch.crates-io]
+blst = { git = "https://github.com/supranational/blst.git", rev = "0d46eefa45fc1e57aceb42bba0e84eab3a7a9725" }