nerva-py 1.0.0b1__py3-none-any.whl → 1.1.0__py3-none-any.whl

nerva/__init__.py

@@ -11,12 +11,35 @@ class VersionInfo(NamedTuple):
     major: int
     minor: int
     micro: int
-    releaselevel: Literal["alpha", "beta", "final"]
+    releaselevel: Literal[
+        "alpha", "beta", "release-candidate", "post", "dev", "final"
+    ]
     serial: int
 
+    def __str__(self) -> str:
+        v = f"{version_info.major}.{version_info.minor}.{version_info.micro}"
+
+        if version_info.releaselevel != "final":
+            if version_info.releaselevel == "alpha":
+                v += "a"
+            elif version_info.releaselevel == "beta":
+                v += "b"
+            elif version_info.releaselevel == "release-candidate":
+                v += "rc"
+            elif version_info.releaselevel == "post":
+                v += "post"
+            elif version_info.releaselevel == "dev":
+                v += "dev"
+
+            v += str(version_info.serial)
+
+        return v
+
 
 version_info: VersionInfo = VersionInfo(
-    major=1, minor=0, micro=0, releaselevel="beta", serial=1
+    major=1, minor=1, micro=0, releaselevel="final", serial=0
 )
 
+__version__ = str(version_info)
+
 del NamedTuple, Literal, VersionInfo

nerva/__main__.py

@@ -2,7 +2,7 @@ import sys
 import argparse
 import platform
 
-import aiohttp
+import httpx
 
 import nerva
 
@@ -13,16 +13,12 @@ def show_version() -> None:
     v = sys.version_info
     entries.append(
         f"- Python v{v.major}.{v.minor}.{v.micro}"
-        + (f"-{v.releaselevel}" if v.releaselevel != "final" else "")
+        + (f"-{v.releaselevel}{v.serial}" if v.releaselevel != "final" else "")
     )
 
-    v = nerva.version_info
-    entries.append(
-        f"- pyxnv v{v.major}.{v.minor}.{v.micro}"
-        + (f"{v.releaselevel[0]}{v.serial}" if v.releaselevel != "final" else "")
-    )
+    entries.append(f"- nerva-py v{nerva.__version__}")
 
-    entries.append(f"- aiohttp v{aiohttp.__version__}")
+    entries.append(f"- httpx v{httpx.__version__}")
 
     uname = platform.uname()
     entries.append(f"- System Info: {uname.system} {uname.release} {uname.version}")

nerva/daemon.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 from typing import Any, Dict, List, Optional
 
-import aiohttp
+import httpx
 
-__all__ = ["DaemonJSONRPC", "DaemonOther"]
+__all__ = ["Daemon", "DaemonLegacy"]
 
 
-class DaemonJSONRPC:
+class Daemon:
     """
     A class to interact with the Nerva daemon's JSON-RPC interface.
 
@@ -32,7 +32,7 @@ class DaemonJSONRPC:
         The headers for the request.
     """
 
-    __slots__ = ["url", "timeout", "headers"]
+    __slots__ = ["url", "timeout", "headers", "auth"]
 
     def __init__(
         self,
@@ -40,20 +40,26 @@ class DaemonJSONRPC:
         port: Optional[int] = 17566,
         ssl: Optional[bool] = False,
         timeout: Optional[float] = 10.0,
+        username: Optional[str] = None,
+        password: Optional[str] = None,
     ) -> None:
         self.url: str = f"{'https' if ssl else 'http'}://{host}:{port}"
         self.timeout: float = timeout
         self.headers: Dict[str, str] = {"Content-Type": "application/json"}
+        self.auth: Optional[httpx.DigestAuth] = (
+            httpx.DigestAuth(username, password) if username and password else None
+        )
 
     async def _request(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
-        async with aiohttp.ClientSession() as session:
-            async with session.post(
+        async with httpx.AsyncClient() as client:
+            response = await client.post(
                 f"{self.url}/json_rpc",
                 json={"jsonrpc": "2.0", "id": 0, "method": method, "params": params},
                 headers=self.headers,
                 timeout=self.timeout,
-            ) as response:
-                return await response.json(content_type=None)
+                auth=self.auth,
+            )
+            return response.json()
 
     async def get_block_count(self) -> Dict[str, Any]:
         """
@@ -634,7 +640,7 @@ class DaemonJSONRPC:
         return await self._request("add_peer", {"host": host})
 
 
-class DaemonOther:
+class DaemonLegacy:
     """
     A class to interact with the Nerva daemon's independent endpoint methods.
 
@@ -660,7 +666,7 @@ class DaemonOther:
 
     """
 
-    __slots__ = ["url", "timeout", "headers"]
+    __slots__ = ["url", "timeout", "headers", "auth"]
 
     def __init__(
         self,
@@ -668,23 +674,28 @@ class DaemonOther:
         port: Optional[int] = 17566,
         ssl: Optional[bool] = False,
         timeout: Optional[float] = 10.0,
+        username: Optional[str] = None,
+        password: Optional[str] = None,
     ):
         self.url = f"{'https' if ssl else 'http'}://{host}:{port}"
         self.timeout = timeout
-
         self.headers = {"Content-Type": "application/json"}
+        self.auth = (
+            httpx.DigestAuth(username, password) if username and password else None
+        )
 
     async def _request(
         self, endpoint: str, params: Dict[str, Any]
     ) -> Dict[str, Any]:
-        async with aiohttp.ClientSession() as session:
-            async with session.post(
+        async with httpx.AsyncClient() as client:
+            response = await client.post(
                 f"{self.url}/{endpoint}",
                 json=params,
                 headers=self.headers,
                 timeout=self.timeout,
-            ) as response:
-                return await response.json(content_type=None)
+                auth=self.auth,
+            )
+            return response.json()
 
     async def get_height(self) -> Dict[str, Any]:
         """

nerva/wallet.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any, Dict, List, Optional
 
-import aiohttp
+import httpx
 
 __all__ = ["Wallet"]
 
@@ -56,23 +56,22 @@ class Wallet:
         password: str = "",
     ) -> None:
         self.url: str = f"http{'s' if ssl else ''}://{host}:{port}"
-        self.auth: Optional[aiohttp.BasicAuth] = (
-            aiohttp.BasicAuth(username, password) if username and password else None
-        )
         self.timeout: float = timeout
-
         self.headers: Dict[str, str] = {"Content-Type": "application/json"}
+        self.auth: Optional[httpx.DigestAuth] = (
+            httpx.DigestAuth(username, password) if username and password else None
+        )
 
     async def _request(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
-        async with aiohttp.ClientSession() as session:
-            async with session.post(
+        async with httpx.AsyncClient() as client:
+            response = await client.post(
                 f"{self.url}/json_rpc",
                 json={"jsonrpc": "2.0", "id": 0, "method": method, "params": params},
                 headers=self.headers,
                 auth=self.auth,
                 timeout=self.timeout,
-            ) as response:
-                return await response.json(content_type=None)
+            )
+            return response.json()
 
     async def get_balance(
         self, account_index: int, address_indices: Optional[List[int]] = None

{nerva_py-1.0.0b1.dist-info → nerva_py-1.1.0.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.3
 Name: nerva-py
-Version: 1.0.0b1
+Version: 1.1.0
 Summary: Python bindings for the JSON RPC interface of the Nerva cryptocurrency.
 Author-email: Sayan Bhattacharyya <sayan@sn1f3rt.dev>
-License-Expression: MIT
-License-File: LICENSE
+License: MIT
 Keywords: bindings,cryptocurrency,json-rpc,nerva,python
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -19,12 +18,13 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
-Requires-Dist: aiohttp>=3.10.10
+Requires-Dist: httpx>=0.27.2
 Description-Content-Type: text/markdown
 
 # Nerva Python Library
 
 [![Ruff](https://github.com/Sn1F3rt/nerva-py/actions/workflows/ruff.yml/badge.svg)](https://github.com/Sn1F3rt/nerva-py/actions/workflows/ruff.yml)
+[![Build](https://github.com/Sn1F3rt/nerva-py/actions/workflows/build.yml/badge.svg)](https://github.com/Sn1F3rt/nerva-py/actions/workflows/build.yml)
 [![License](https://img.shields.io/github/license/Sn1F3rt/nerva-py)](LICENSE)
 
 ## Table of Contents
@@ -69,12 +69,16 @@ Here is a simple example to get you started:
 ```python
 import asyncio
 
-from nerva.daemon import DaemonJSONRPC
+from nerva.daemon import Daemon
 
 
 async def main():
-    daemon = DaemonJSONRPC(
-        host="x.y.z.w",
+    daemon = Daemon(
+        host="localhost",
+        port=17566,
+        ssl=False,
+        username="rpcuser", # omit if daemon was not started with the rpc-login flag
+        password="rpcpassword" # omit if daemon was not started with the rpc-login flag
     )
 
     print(await daemon.get_info())

nerva_py-1.1.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+nerva/__init__.py,sha256=uuerw1FTJ5CGL7NvOwKsp_-oTmN87MfSsfI7LYqNCUU,1128
+nerva/__main__.py,sha256=vcuFqUiFv6xclYd1ME59lNH_d_E429SwMV-ShxmXCsg,1219
+nerva/daemon.py,sha256=zMq1LUuJ1tggvVHTZGVGRksrqnHjnCNZ2AVogG6Vi9s,33573
+nerva/utils.py,sha256=UzyhRTE2w7_H2YCz50ospggApyFbTOnrB92fuED9laQ,999
+nerva/wallet.py,sha256=aomyDwd-a2kadX3v9FKHvhswFjYZOnELX95wQhxGkUo,59289
+nerva_py-1.1.0.dist-info/METADATA,sha256=v0_5mR_OVkmaU8RdjPFZFxqk2yYul1_jtQb4PcTfFgc,2873
+nerva_py-1.1.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+nerva_py-1.1.0.dist-info/licenses/LICENSE,sha256=OB3n91B4pOwIG9kD-nL-INDB0A7ma5fL9q32FGyoIQ4,1086
+nerva_py-1.1.0.dist-info/RECORD,,

{nerva_py-1.0.0b1.dist-info → nerva_py-1.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.26.3
 Root-Is-Purelib: true
 Tag: py3-none-any

nerva_py-1.0.0b1.dist-info/RECORD

@@ -1,9 +0,0 @@
-nerva/__init__.py,sha256=BR2PGu54C7y7F9NpvUqhLZY0itVlQHcFDmudd-ebM_4,412
-nerva/__main__.py,sha256=n4QOXzSwV07Sqr2_Ow0sPwg1PNrbbtDqo6URlaWuaFI,1345
-nerva/daemon.py,sha256=unffqyBt0qYL2Z3JpNGqJRMGZBG8hTbfDCIsbb2qkFk,33168
-nerva/utils.py,sha256=UzyhRTE2w7_H2YCz50ospggApyFbTOnrB92fuED9laQ,999
-nerva/wallet.py,sha256=EhQBS9PNq9QZdiP5I8y_jTPr_PtRHCf81dNwRdblDZA,59334
-nerva_py-1.0.0b1.dist-info/METADATA,sha256=iuuzuy8wPGnSgfuAWa5Z5Eo9Gog_uxdjYiAJc3ASBKs,2547
-nerva_py-1.0.0b1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-nerva_py-1.0.0b1.dist-info/licenses/LICENSE,sha256=OB3n91B4pOwIG9kD-nL-INDB0A7ma5fL9q32FGyoIQ4,1086
-nerva_py-1.0.0b1.dist-info/RECORD,,