sgx.py 0.11.dev1__tar.gz → 0.12.dev1__tar.gz

sgx_py-0.12.dev1/PKG-INFO

@@ -0,0 +1,38 @@
+Metadata-Version: 2.4
+Name: sgx.py
+Version: 0.12.dev1
+Summary: SGX
+Home-page: http://github.com/skalenetwork/sgx.py
+Author: SKALE Labs
+Author-email: support@skalelabs.com
+Requires-Python: >=3.11,<4
+License-File: LICENSE
+Requires-Dist: cryptography<51,>=50.0.2
+Requires-Dist: cytoolz>=0.12
+Requires-Dist: eth-account<0.15,>=0.13
+Requires-Dist: eth-hash[pycryptodome]>=0.7
+Requires-Dist: eth-utils<7,>=5
+Requires-Dist: hexbytes<3,>=1
+Requires-Dist: pem==23.1.0
+Requires-Dist: pyzmq==27.2.0
+Requires-Dist: requests>=2.33.0
+Requires-Dist: urllib3>=2.8.0
+Provides-Extra: linter
+Requires-Dist: ruff==0.17.2; extra == "linter"
+Provides-Extra: dev
+Requires-Dist: ruff==0.17.2; extra == "dev"
+Requires-Dist: build==1.6.1; extra == "dev"
+Requires-Dist: coincurve==13.0.0; extra == "dev"
+Requires-Dist: python-dotenv==1.2.4; extra == "dev"
+Requires-Dist: twine==7.0.0; extra == "dev"
+Requires-Dist: pytest==9.1.1; extra == "dev"
+Requires-Dist: mock==5.2.0; extra == "dev"
+Requires-Dist: web3==8.0.0; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/setup.py

@@ -5,14 +5,16 @@ from setuptools import (
 
 extras_require = {
     'linter': [
-        'ruff==0.13.2',
+        'ruff==0.17.2',
     ],
     'dev': [
+        'build==1.6.1',
         'coincurve==13.0.0',
-        'python-dotenv==0.13.0',
-        'twine==6.2.0',
-        'pytest==8.4.2',
+        'python-dotenv==1.2.4',
+        'twine==7.0.0',
+        'pytest==9.1.1',
         'mock==5.2.0',
+        'web3==8.0.0',
     ],
 }
 
@@ -20,16 +22,22 @@ extras_require['dev'] = extras_require['linter'] + extras_require['dev']
 
 setup(
     name='sgx.py',
-    version='0.11dev1',
+    version='0.12dev1',
     description='SGX',
     url='http://github.com/skalenetwork/sgx.py',
     author='SKALE Labs',
     author_email='support@skalelabs.com',
     install_requires=[
-        'web3>=6.20.2,<8.0.0',
-        'pyzmq==27.1.0',
+        'cryptography>=50.0.2,<51',
+        'cytoolz>=0.12',
+        'eth-account>=0.13,<0.15',
+        'eth-hash[pycryptodome]>=0.7',
+        'eth-utils>=5,<7',
+        'hexbytes>=1,<3',
         'pem==23.1.0',
-        'cryptography>=46.0.1,<47.0.0',
+        'pyzmq==27.2.0',
+        'requests>=2.33.0',
+        'urllib3>=2.8.0',
     ],
     packages=find_packages(exclude=['tests']),
     python_requires='>=3.11,<4',

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/sgx/constants.py

@@ -10,3 +10,4 @@ SGX_ZMQ_RESPONSE_TIMEOUT_MS = 5000
 CSR_FILENAME = 'sgx.csr'
 KEY_FILENAME = 'sgx.key'
 CRT_FILENAME = 'sgx.crt'
+LOCK_FILENAME = 'sgx.enroll.lock'

sgx_py-0.12.dev1/sgx/generate.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+umask 077
+
+CSR_PATH="$1"
+KEY_PATH="$2"
+COMMON_NAME="$3"
+
+rm -f -- "$CSR_PATH" "$KEY_PATH"
+
+openssl req -new -sha256 -nodes \
+    -out "$CSR_PATH" \
+    -newkey rsa:2048 \
+    -keyout "$KEY_PATH" \
+    -subj "/CN=$COMMON_NAME"
+
+chmod 600 "$KEY_PATH"

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/sgx/http.py

@@ -1,29 +1,33 @@
-import os
+import fcntl
+import json
 import logging
+import os
 import secrets
-import requests
-import json
+from contextlib import contextmanager
 from time import sleep
 from urllib.parse import urlparse
 
+import requests
 import urllib3
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
+
 from sgx.constants import (
-    GENERATE_SCRIPT_PATH,
-    DEFAULT_TIMEOUT,
-    CSR_FILENAME,
     CRT_FILENAME,
+    CSR_FILENAME,
+    DEFAULT_TIMEOUT,
+    GENERATE_SCRIPT_PATH,
     KEY_FILENAME,
-    SGX_RESPONSE_TIMEOUT
+    LOCK_FILENAME,
+    SGX_RESPONSE_TIMEOUT,
 )
-from sgx.utils import run_cmd, print_request_log, print_response_log, SgxError
-
+from sgx.utils import SgxError, print_request_log, print_response_log, run_cmd
 
 requests.packages.urllib3.disable_warnings(InsecureRequestWarning)  # TODO: Remove
 logger = logging.getLogger(__name__)
 
 
 MAX_RETRIES = 22
+CSR_STATUS_PENDING = 1
 
 
 class SgxSSLError(SgxError):
@@ -34,15 +38,36 @@ class SgxUnreachableError(SgxError):
     pass
 
 
+def certificate_exists(crt_dir_path: str) -> bool:
+    return all(
+        os.path.exists(os.path.join(crt_dir_path, filename))
+        for filename in (CRT_FILENAME, KEY_FILENAME)
+    )
+
+
+@contextmanager
+def enrollment_lock(crt_dir_path: str):
+    lock_path = os.path.join(crt_dir_path, LOCK_FILENAME)
+    fd = os.open(lock_path, os.O_CREAT | os.O_RDWR, 0o600)
+    try:
+        fcntl.flock(fd, fcntl.LOCK_EX)
+        yield
+    finally:
+        os.close(fd)
+
+
 def get_certificate_credentials(crt_dir_path, csr_server):
     key_path = os.path.join(crt_dir_path, KEY_FILENAME)
     crt_path = os.path.join(crt_dir_path, CRT_FILENAME)
-    if not os.path.exists(crt_path) or not os.path.exists(key_path):
-        csr_path = os.path.join(crt_dir_path, CSR_FILENAME)
-        if not os.path.exists(csr_path) or not os.path.exists(key_path):
-            generate_csr_credentials(csr_path, key_path)
-        csr_hash = sign_certificate(csr_server, csr_path)
-        write_crt_to_file(crt_path, csr_server, csr_hash)
+    if certificate_exists(crt_dir_path):
+        return crt_path, key_path
+    with enrollment_lock(crt_dir_path):
+        if not certificate_exists(crt_dir_path):
+            csr_path = os.path.join(crt_dir_path, CSR_FILENAME)
+            if not os.path.exists(csr_path) or not os.path.exists(key_path):
+                generate_csr_credentials(csr_path, key_path)
+            csr_hash = sign_certificate(csr_server, csr_path)
+            write_crt_to_file(crt_path, csr_server, csr_hash)
     return crt_path, key_path
 
 
@@ -52,13 +77,23 @@ def generate_csr_credentials(csr_path, key_path):
 
 
 def write_crt_to_file(crt_path, csr_server, csr_hash):
-    response = send_request_safe(csr_server, 'getCertificate', {'hash': csr_hash})
-    while response['result']['status'] == 1:
-        response = send_request_safe(csr_server, 'getCertificate', {'hash': csr_hash})
-        sleep(DEFAULT_TIMEOUT)
-    crt = response['result']['cert']
-    with open(crt_path, "w+") as f:
-        f.write(crt)
+    for _ in range(MAX_RETRIES):
+        response = send_request(csr_server, 'getCertificate', {'hash': csr_hash})
+        if response.get('error'):
+            raise SgxSSLError(response['error']['message'])
+        result = response['result']
+        if result['status'] == CSR_STATUS_PENDING:
+            sleep(DEFAULT_TIMEOUT)
+            continue
+        if result['status'] != 0:
+            raise SgxSSLError(result['errorMessage'])
+        with open(crt_path, 'w') as f:
+            f.write(result['cert'])
+        return
+    raise SgxSSLError(
+        f'Certificate signing request {csr_hash} is still pending '
+        f'after {MAX_RETRIES} attempts'
+    )
 
 
 def sign_certificate(csr_server, csr_path):

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/sgx/sgx.py

@@ -18,20 +18,22 @@
 #     along with sgx.py.  If not, see <https://www.gnu.org/licenses/>.
 
 import logging
-from dataclasses import dataclass
 from collections.abc import Mapping
-from hexbytes import HexBytes
-from eth_account.datastructures import SignedTransaction, SignedMessage
-from eth_utils.curried import keccak
+from dataclasses import dataclass
+
 from cytoolz import dissoc
-from sgx.sgx_rpc_handler import SgxRPCHandler
-from sgx.sgx_zmq import SgxZmq
-from sgx.utils import public_key_to_address
 from eth_account._utils import signing
 from eth_account._utils.legacy_transactions import encode_transaction
+from eth_account.datastructures import SignedMessage, SignedTransaction
 from eth_account.typed_transactions.typed_transaction import TypedTransaction
-from eth_utils.encoding import big_endian_to_int
 from eth_utils.conversions import add_0x_prefix, remove_0x_prefix
+from eth_utils.curried import keccak
+from eth_utils.encoding import big_endian_to_int
+from hexbytes import HexBytes
+
+from sgx.sgx_rpc_handler import SgxRPCHandler
+from sgx.sgx_zmq import SgxZmq
+from sgx.utils import public_key_to_address
 
 logger = logging.getLogger(__name__)
 

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/sgx/sgx_rpc_handler.py

@@ -18,15 +18,12 @@
 #     along with sgx.py.  If not, see <https://www.gnu.org/licenses/>.
 
 import logging
-import os
 from enum import Enum
-
 from urllib.parse import urlparse
 
-from sgx.http import send_request
+from sgx.http import certificate_exists, send_request
 from sgx.utils import SgxError
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -44,7 +41,7 @@ class SgxRPCHandler:
     def __init__(self, sgx_endpoint, path_to_cert):
         self.sgx_endpoint = check_provider(sgx_endpoint)
         self.path_to_cert = path_to_cert
-        if path_to_cert and len(os.listdir(path_to_cert)) != 3:
+        if path_to_cert and not certificate_exists(path_to_cert):
             self.get_server_status()
 
     def ecdsa_sign(self, key_name, transaction_hash):
@@ -179,7 +176,9 @@ class SgxRPCHandler:
         response = self.__send_request("createBLSPrivateKeyV2", params)
         return response['result']['status'] == 0
 
-    def create_bls_private_key_v3(self, poly_name, bls_key_name, eth_key_name, secret_contributions, n, t):
+    def create_bls_private_key_v3(
+        self, poly_name, bls_key_name, eth_key_name, secret_contributions, n, t
+    ):
         params = dict()
         # polyName is optional in V3 - new nodes joining the network do not pass it
         if poly_name:

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/sgx/sgx_zmq.py

@@ -24,20 +24,17 @@ import os
 from dataclasses import dataclass
 from enum import Enum
 from time import sleep
-from sgx.utils import public_key_to_address
+from urllib.parse import urlparse
 
-from eth_utils.conversions import add_0x_prefix, remove_0x_prefix
 import pem
 import zmq
 from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives.asymmetric import ec, rsa, padding
+from cryptography.hazmat.primitives.asymmetric import ec, padding, rsa
 from cryptography.hazmat.primitives.serialization import load_pem_private_key
+from eth_utils.conversions import add_0x_prefix, remove_0x_prefix
 
-from urllib.parse import urlparse
-
-from sgx.constants import DEFAULT_TIMEOUT, SGX_ZMQ_RESPONSE_TIMEOUT_MS, CRT_FILENAME, KEY_FILENAME
-from sgx.utils import SgxError
-
+from sgx.constants import CRT_FILENAME, DEFAULT_TIMEOUT, KEY_FILENAME, SGX_ZMQ_RESPONSE_TIMEOUT_MS
+from sgx.utils import SgxError, public_key_to_address
 
 logger = logging.getLogger(__name__)
 
@@ -291,7 +288,6 @@ class SgxZmq:
         p_id = os.getpid()
         if not self.sockets.get(p_id):
             socket_p_id = self.ctx.socket(zmq.DEALER)
-            socket_p_id.setsockopt_string(zmq.IDENTITY, '135:14603077656239261618')
             socket_p_id.setsockopt(zmq.LINGER, 0)
             socket_p_id.setsockopt(zmq.SNDTIMEO, SGX_ZMQ_RESPONSE_TIMEOUT_MS)
             socket_p_id.setsockopt(zmq.RCVTIMEO, SGX_ZMQ_RESPONSE_TIMEOUT_MS)

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/sgx/utils.py

@@ -18,48 +18,55 @@
 #     along with sgx.py.  If not, see <https://www.gnu.org/licenses/>.
 
 
-import copy
 import logging
 import os
 import subprocess
 from subprocess import PIPE
 
-from web3 import Web3
-
+from eth_utils import keccak, to_checksum_address, to_hex
 
 logger = logging.getLogger(__name__)
 
+REDACTED = '<redacted>'
+SECRET_FIELDS = frozenset({
+    'dhKey',
+    'key',
+    'keyShare',
+    'secretContributions',
+    'secretShare',
+})
+
 
 class SgxError(Exception):
     pass
 
 
-def crop_json(json_data, crop_len=50):
-    for key, value in json_data.items():
-        if isinstance(value, dict):
-            crop_json(value)
-        else:
-            if isinstance(value, str) and len(value) > crop_len:
-                json_data[key] = value[:crop_len] + '...'
+def redact(data: object, crop_len: int = 50) -> object:
+    if isinstance(data, dict):
+        return {
+            key: REDACTED if key in SECRET_FIELDS else redact(value, crop_len)
+            for key, value in data.items()
+        }
+    if isinstance(data, list):
+        return [redact(item, crop_len) for item in data]
+    if isinstance(data, str) and len(data) > crop_len:
+        return data[:crop_len] + '...'
+    return data
 
 
 def print_request_log(request):
-    cropped_request = copy.deepcopy(request)
-    crop_json(cropped_request)
-    logger.info(f'Send request: {request}')
+    logger.info(f'Send request: {redact(request)}')
 
 
 def print_response_log(response):
-    cropped_response = copy.deepcopy(response)
-    crop_json(cropped_response)
-    logger.info(f'Response received: {cropped_response}')
+    logger.info(f'Response received: {redact(response)}')
 
 
-def run_cmd(cmd, env={}, shell=False):
+def run_cmd(cmd, env=None, shell=False):
     logger.info(f'Running: {cmd}')
     res = subprocess.run(
         cmd, shell=shell, stdout=PIPE, stderr=PIPE,
-        env={**env, **os.environ}
+        env={**os.environ, **(env or {})}
     )
     if res.returncode:
         logger.error('Error during shell execution:')
@@ -69,5 +76,5 @@ def run_cmd(cmd, env={}, shell=False):
 
 
 def public_key_to_address(pk):
-    hash_ = Web3.keccak(hexstr=str(pk))
-    return Web3.to_checksum_address(Web3.to_hex(hash_[-20:]))
+    hash_ = keccak(hexstr=str(pk))
+    return to_checksum_address(to_hex(hash_[-20:]))

sgx_py-0.12.dev1/sgx.py.egg-info/PKG-INFO

@@ -0,0 +1,38 @@
+Metadata-Version: 2.4
+Name: sgx.py
+Version: 0.12.dev1
+Summary: SGX
+Home-page: http://github.com/skalenetwork/sgx.py
+Author: SKALE Labs
+Author-email: support@skalelabs.com
+Requires-Python: >=3.11,<4
+License-File: LICENSE
+Requires-Dist: cryptography<51,>=50.0.2
+Requires-Dist: cytoolz>=0.12
+Requires-Dist: eth-account<0.15,>=0.13
+Requires-Dist: eth-hash[pycryptodome]>=0.7
+Requires-Dist: eth-utils<7,>=5
+Requires-Dist: hexbytes<3,>=1
+Requires-Dist: pem==23.1.0
+Requires-Dist: pyzmq==27.2.0
+Requires-Dist: requests>=2.33.0
+Requires-Dist: urllib3>=2.8.0
+Provides-Extra: linter
+Requires-Dist: ruff==0.17.2; extra == "linter"
+Provides-Extra: dev
+Requires-Dist: ruff==0.17.2; extra == "dev"
+Requires-Dist: build==1.6.1; extra == "dev"
+Requires-Dist: coincurve==13.0.0; extra == "dev"
+Requires-Dist: python-dotenv==1.2.4; extra == "dev"
+Requires-Dist: twine==7.0.0; extra == "dev"
+Requires-Dist: pytest==9.1.1; extra == "dev"
+Requires-Dist: mock==5.2.0; extra == "dev"
+Requires-Dist: web3==8.0.0; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

sgx_py-0.12.dev1/sgx.py.egg-info/requires.txt

@@ -0,0 +1,23 @@
+cryptography<51,>=50.0.2
+cytoolz>=0.12
+eth-account<0.15,>=0.13
+eth-hash[pycryptodome]>=0.7
+eth-utils<7,>=5
+hexbytes<3,>=1
+pem==23.1.0
+pyzmq==27.2.0
+requests>=2.33.0
+urllib3>=2.8.0
+
+[dev]
+ruff==0.17.2
+build==1.6.1
+coincurve==13.0.0
+python-dotenv==1.2.4
+twine==7.0.0
+pytest==9.1.1
+mock==5.2.0
+web3==8.0.0
+
+[linter]
+ruff==0.17.2

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/tests/test_core.py

@@ -1,22 +1,18 @@
-import urllib
 import os
 import secrets
+import socket
+import urllib
 
 import eth_account._utils.legacy_transactions as transactions
 import pytest
-
-from eth_account.messages import defunct_hash_message, encode_defunct
-
 from dotenv import load_dotenv
+from eth_account.messages import defunct_hash_message, encode_defunct
 from eth_keys import keys
 from hexbytes import HexBytes
-import socket
 from web3 import Web3
 
-
 from sgx import SgxClient
 
-
 load_dotenv()
 
 SGX_URL = os.getenv('SERVER')

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/tests/test_dkg.py

@@ -1,14 +1,16 @@
-from sgx import SgxClient
-from sgx.sgx_rpc_handler import SgxServerError
-from sgx.sgx_zmq import SgxZmqServerError
+import binascii
+import hashlib
 import os
-from time import sleep
-from dotenv import load_dotenv
 import random
-import coincurve
-import binascii
 import secrets
-import hashlib
+from time import sleep
+
+import coincurve
+from dotenv import load_dotenv
+
+from sgx import SgxClient
+from sgx.sgx_rpc_handler import SgxServerError
+from sgx.sgx_zmq import SgxZmqServerError
 
 load_dotenv()
 

{sgx_py-0.11.dev1 → sgx_py-0.12.dev1}/tests/test_http.py

@@ -3,8 +3,7 @@ import pytest
 import requests
 import urllib3
 
-from sgx.http import send_request
-from sgx.http import SgxUnreachableError
+from sgx.http import SgxUnreachableError, send_request
 
 URL = 'http://127.0.0.1:1026'
 INVALID_URL = 'http://127.0.0.1:1033'

sgx_py-0.11.dev1/PKG-INFO

@@ -1,30 +0,0 @@
-Metadata-Version: 2.4
-Name: sgx.py
-Version: 0.11.dev1
-Summary: SGX
-Home-page: http://github.com/skalenetwork/sgx.py
-Author: SKALE Labs
-Author-email: support@skalelabs.com
-Requires-Python: >=3.11,<4
-License-File: LICENSE
-Requires-Dist: web3<8.0.0,>=6.20.2
-Requires-Dist: pyzmq==27.1.0
-Requires-Dist: pem==23.1.0
-Requires-Dist: cryptography<47.0.0,>=46.0.1
-Provides-Extra: linter
-Requires-Dist: ruff==0.13.2; extra == "linter"
-Provides-Extra: dev
-Requires-Dist: ruff==0.13.2; extra == "dev"
-Requires-Dist: coincurve==13.0.0; extra == "dev"
-Requires-Dist: python-dotenv==0.13.0; extra == "dev"
-Requires-Dist: twine==6.2.0; extra == "dev"
-Requires-Dist: pytest==8.4.2; extra == "dev"
-Requires-Dist: mock==5.2.0; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary

sgx_py-0.11.dev1/sgx/generate.sh

@@ -1 +0,0 @@
-openssl req -new -sha256 -nodes -out $1 -newkey rsa:2048 -keyout $2 -subj /CN=$3

sgx_py-0.11.dev1/sgx.py.egg-info/PKG-INFO

@@ -1,30 +0,0 @@
-Metadata-Version: 2.4
-Name: sgx.py
-Version: 0.11.dev1
-Summary: SGX
-Home-page: http://github.com/skalenetwork/sgx.py
-Author: SKALE Labs
-Author-email: support@skalelabs.com
-Requires-Python: >=3.11,<4
-License-File: LICENSE
-Requires-Dist: web3<8.0.0,>=6.20.2
-Requires-Dist: pyzmq==27.1.0
-Requires-Dist: pem==23.1.0
-Requires-Dist: cryptography<47.0.0,>=46.0.1
-Provides-Extra: linter
-Requires-Dist: ruff==0.13.2; extra == "linter"
-Provides-Extra: dev
-Requires-Dist: ruff==0.13.2; extra == "dev"
-Requires-Dist: coincurve==13.0.0; extra == "dev"
-Requires-Dist: python-dotenv==0.13.0; extra == "dev"
-Requires-Dist: twine==6.2.0; extra == "dev"
-Requires-Dist: pytest==8.4.2; extra == "dev"
-Requires-Dist: mock==5.2.0; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary

sgx_py-0.11.dev1/sgx.py.egg-info/requires.txt

@@ -1,15 +0,0 @@
-web3<8.0.0,>=6.20.2
-pyzmq==27.1.0
-pem==23.1.0
-cryptography<47.0.0,>=46.0.1
-
-[dev]
-ruff==0.13.2
-coincurve==13.0.0
-python-dotenv==0.13.0
-twine==6.2.0
-pytest==8.4.2
-mock==5.2.0
-
-[linter]
-ruff==0.13.2