Merge master into xrpl-py-2.0

Author: connorjchen

.github/workflows/integration_test.yml

@@ -9,12 +9,11 @@ on:
 jobs:
   integration-test:
     name: Integration test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
       matrix:
-        # we have to use 3.7.1 to get around openssl issues
-        python-version: ['3.7.1', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     services:
       rippled:

.github/workflows/unit_test.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   lint-and-type-check:
     name: Lint and type-check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       PYTHON_VERSION: "3.11"
@@ -52,11 +52,10 @@ jobs:
 
   unit-test:
     name: Unit test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        # we have to use 3.7.1 to get around openssl issues
-        python-version: ['3.7.1', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
       - name: Checkout code

.vscode/settings.json

@@ -8,9 +8,13 @@
     "mypy.runUsingActiveInterpreter": true,
     "cSpell.words": [
         "addresscodec",
+        "aiounittest",
+        "altnet",
         "asyncio",
         "binarycodec",
         "nftoken",
+        "rippletest",
+        "ripplex",
         "xaddress"
     ],
 }

docs/conf.py

@@ -51,7 +51,7 @@
 on_rtd = os.environ.get("READTHEDOCS") == "True"
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
+    import sphinx_rtd_theme  # type: ignore
 
     html_theme = "sphinx_rtd_theme"
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

poetry.lock

@@ -41,6 +41,7 @@ websockets = [
 ]
 Deprecated = "^1.2.13"
 types-Deprecated = "^1.2.9"
+pycryptodome = "^3.16.0"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^3.8.4"
@@ -58,8 +59,8 @@ aiounittest = "^1.4.0"
 coverage = "^6.5.0"
 Jinja2 = "^3.1.2"
 MarkupSafe = "2.1.1"
-Sphinx = "^5.1.1"
-poethepoet = "^0.16.2"
+Sphinx = "^5.3.0"
+poethepoet = "^0.16.5"
 
 [tool.isort]
 # Make sure that isort's settings line up with black

pyproject.toml

@@ -1,7 +1,7 @@
 try:
     from unittest import IsolatedAsyncioTestCase
 except ImportError:
-    from aiounittest import AsyncTestCase as IsolatedAsyncioTestCase
+    from aiounittest import AsyncTestCase as IsolatedAsyncioTestCase  # type: ignore
 
 from tests.integration.it_utils import WEBSOCKET_CLIENT, WEBSOCKET_TESTNET_CLIENT
 

tests/integration/integration_test_case.py

@@ -4,6 +4,7 @@
 import inspect
 from threading import Timer as ThreadingTimer
 from time import sleep
+from typing import cast
 
 import xrpl  # noqa: F401 - needed for sync tests
 from xrpl.asyncio.clients import AsyncJsonRpcClient, AsyncWebsocketClient
@@ -28,7 +29,7 @@
 WEBSOCKET_URL = "ws://127.0.0.1:6006"
 
 JSON_TESTNET_URL = "https://s.altnet.rippletest.net:51234"
-WEBSOCKET_TESTNET_URL = "wss://s.altnet.rippletest.net"
+WEBSOCKET_TESTNET_URL = "wss://s.altnet.rippletest.net:51233"
 
 JSON_RPC_CLIENT = JsonRpcClient(JSON_RPC_URL)
 ASYNC_JSON_RPC_CLIENT = AsyncJsonRpcClient(JSON_RPC_URL)
@@ -90,7 +91,8 @@ def __init__(
         delay: float = LEDGER_ACCEPT_TIME,
         request: Request = LEDGER_ACCEPT_REQUEST,
     ):
-        self._timer = ThreadingTimer(delay, client.request, (request,)).start()
+        self._timer = ThreadingTimer(delay, client.request, (request,))
+        self._timer.start()
 
     def cancel(self):
         self._timer.cancel()
@@ -122,7 +124,7 @@ async def fund_wallet(
 def submit_transaction(
     transaction: Transaction,
     wallet: Wallet,
-    client: Client = JSON_RPC_CLIENT,
+    client: SyncClient = JSON_RPC_CLIENT,
     check_fee: bool = True,
 ) -> Response:
     """Signs and submits a transaction to the XRPL."""
@@ -188,12 +190,12 @@ async def accept_ledger_async(
     AsyncTestTimer(client, delay)
 
 
-def _choose_client(use_json_client: bool) -> Client:
-    return _CLIENTS[(False, use_json_client, False)]
+def _choose_client(use_json_client: bool) -> SyncClient:
+    return cast(SyncClient, _CLIENTS[(False, use_json_client, False)])
 
 
-def _choose_client_async(use_json_client: bool) -> Client:
-    return _CLIENTS[(True, use_json_client, False)]
+def _choose_client_async(use_json_client: bool) -> AsyncClient:
+    return cast(AsyncClient, _CLIENTS[(True, use_json_client, False)])
 
 
 def _get_client(is_async: bool, is_json: bool, is_testnet: bool) -> Client:

tests/integration/it_utils.py

@@ -2,8 +2,6 @@
 Low-level functions for creating and using cryptographic keys with the XRP
 Ledger.
 """
-from hashlib import algorithms_available
-
 from xrpl.core.keypairs.exceptions import XRPLKeypairsException
 from xrpl.core.keypairs.main import (
     derive_classic_address,
@@ -13,11 +11,6 @@
     sign,
 )
 
-assert (
-    "ripemd160" in algorithms_available
-), """Your OpenSSL implementation does not include the RIPEMD160 algorithm,
-    which is required by XRPL"""
-
 __all__ = [
     "derive_classic_address",
     "derive_keypair",

xrpl/core/keypairs/__init__.py

@@ -1,6 +1,8 @@
 """Miscellaneous functions that are private to xrpl.core.keypairs."""
 import hashlib
 
+import Crypto.Hash.RIPEMD160 as RIPEMD160
+
 
 def sha512_first_half(message: bytes) -> bytes:
     """
@@ -28,4 +30,4 @@ def get_account_id(public_key: bytes) -> bytes:
         The account ID for the given public key.
     """
     sha_hash = hashlib.sha256(public_key).digest()
-    return hashlib.new("ripemd160", sha_hash).digest()
+    return bytes(RIPEMD160.new(sha_hash).digest())