oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support silent loading of verify lib

Browse source
This commit is contained in:
shortcutme 2019-10-16 15:43:07 +02:00
parent 5ca3401eb9
commit 20c63c73b3
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Crypt/CryptBitcoin.py
View file

@ -9,17 +9,18 @@ from Config import config
lib_verify_best = "btctools" lib_verify_best = "btctools"
def loadLib(lib_name): def loadLib(lib_name, silent=False):
global bitcoin, libsecp256k1message, lib_verify_best global bitcoin, libsecp256k1message, lib_verify_best
if lib_name == "libsecp256k1": if lib_name == "libsecp256k1":
s = time.time() s = time.time()
from lib import libsecp256k1message from lib import libsecp256k1message
import coincurve import coincurve
lib_verify_best = "libsecp256k1" lib_verify_best = "libsecp256k1"
logging.info( if not silent:
"Libsecpk256k1 loaded: %s in %.3fs" % logging.info(
(type(coincurve._libsecp256k1.lib).__name__, time.time() - s) "Libsecpk256k1 loaded: %s in %.3fs" %
) (type(coincurve._libsecp256k1.lib).__name__, time.time() - s)
)
elif lib_name == "openssl": elif lib_name == "openssl":
s = time.time() s = time.time()
import bitcoin.signmessage import bitcoin.signmessage
@ -33,11 +34,11 @@ def loadLib(lib_name):
# OpenSSL 1.1.1+ # OpenSSL 1.1.1+
ssl_version = bitcoin.core.key._ssl.OpenSSL_version_num() ssl_version = bitcoin.core.key._ssl.OpenSSL_version_num()
logging.info( if not silent:
"OpenSSL loaded: %s, version: %.9X in %.3fs" % logging.info(
(bitcoin.core.key._ssl, ssl_version, time.time() - s) "OpenSSL loaded: %s, version: %.9X in %.3fs" %
) (bitcoin.core.key._ssl, ssl_version, time.time() - s)
)
try: try:
if not config.use_libsecp256k1: if not config.use_libsecp256k1: