From fbbdb23214a1e3fd56b33d1c114c78b26578689e Mon Sep 17 00:00:00 2001
From: zancas <zancas@zingolabs.org>
Date: Tue, 11 Jan 2022 10:16:22 -0700
Subject: [PATCH 1/2] blake2b/s is integrated into hashlib, drop external
 python package dependency

---
 qa/rpc-tests/test_framework/blocktools.py | 2 +-
 qa/rpc-tests/test_framework/flyclient.py  | 2 +-
 qa/rpc-tests/test_framework/mininode.py   | 2 +-
 qa/rpc-tests/test_framework/script.py     | 2 +-
 qa/rpc-tests/test_framework/zip244.py     | 2 +-
 src/chainparams.cpp                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index 6cf7d8d2b..53a2512ca 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -4,7 +4,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from pyblake2 import blake2b
+from hashlib import blake2b
 
 from .mininode import CBlock, CTransaction, CTxIn, CTxOut, COutPoint
 from .script import CScript, OP_0, OP_EQUAL, OP_HASH160, OP_TRUE, OP_CHECKSIG
diff --git a/qa/rpc-tests/test_framework/flyclient.py b/qa/rpc-tests/test_framework/flyclient.py
index 368c6516c..4e01cf76c 100644
--- a/qa/rpc-tests/test_framework/flyclient.py
+++ b/qa/rpc-tests/test_framework/flyclient.py
@@ -1,4 +1,4 @@
-from pyblake2 import blake2b
+from hashlib import blake2b
 import struct
 from typing import (List, Optional)
 
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 2c51f4421..f6421e922 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -36,7 +36,7 @@ from threading import RLock
 from threading import Thread
 import logging
 import copy
-from pyblake2 import blake2b
+from hashlib import blake2b
 
 from .equihash import (
     gbp_basic,
diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py
index d9d548952..49192770d 100644
--- a/qa/rpc-tests/test_framework/script.py
+++ b/qa/rpc-tests/test_framework/script.py
@@ -22,7 +22,7 @@ if sys.version > '3':
     bchr = lambda x: bytes([x])
     bord = lambda x: x
 
-from pyblake2 import blake2b
+from hashlib import blake2b
 
 from binascii import hexlify
 import struct
diff --git a/qa/rpc-tests/test_framework/zip244.py b/qa/rpc-tests/test_framework/zip244.py
index f9cd5ceee..027732053 100644
--- a/qa/rpc-tests/test_framework/zip244.py
+++ b/qa/rpc-tests/test_framework/zip244.py
@@ -13,7 +13,7 @@
 
 import struct
 
-from pyblake2 import blake2b
+from hashlib import blake2b
 
 from .mininode import ser_string, ser_uint256
 from .script import (
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index d9a7cb182..40b4e2159 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -52,7 +52,7 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi
  * transaction cannot be spent since it did not originally exist in the
  * database (and is in any case of zero value).
  *
- * >>> from pyblake2 import blake2s
+ * >>> from hashlib import blake2s
  * >>> 'Zcash' + blake2s(b'The Economist 2016-10-29 Known unknown: Another crypto-currency is born. BTC#436254 0000000000000000044f321997f336d2908cf8c8d6893e88dbf067e2d949487d ETH#2521903 483039a6b6bd8bd05f0584f9a078d075e454925eb71c1f13eaff59b405a721bb DJIA close on 27 Oct 2016: 18,169.68').hexdigest()
  *
  * CBlock(hash=00040fe8, ver=4, hashPrevBlock=00000000000000, hashMerkleRoot=c4eaa5, nTime=1477641360, nBits=1f07ffff, nNonce=4695, vtx=1)

From 30abf2514825b9be0b350cfa3cd68b1e6d85e35c Mon Sep 17 00:00:00 2001
From: zancas <zancas@zingolabs.org>
Date: Tue, 11 Jan 2022 10:32:18 -0700
Subject: [PATCH 2/2] update doctest in gtest suite to prefer hashlib

---
 src/gtest/test_joinsplit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gtest/test_joinsplit.cpp b/src/gtest/test_joinsplit.cpp
index 5cd910ffe..19d906872 100644
--- a/src/gtest/test_joinsplit.cpp
+++ b/src/gtest/test_joinsplit.cpp
@@ -221,11 +221,11 @@ TEST(Joinsplit, HSig)
 /*
 // by Taylor Hornby
 
-import pyblake2
+import hashlib
 import binascii
 
 def hSig(randomSeed, nf1, nf2, joinSplitPubKey):
-    return pyblake2.blake2b(
+    return hashlib.blake2b(
         data=(randomSeed + nf1 + nf2 + joinSplitPubKey),
         digest_size=32,
         person=b"ZcashComputehSig"