Merge pull request #23 from Golem-Base/rvdp/update

Relax python version bound

Author: r-vdp

README.md

@@ -79,7 +79,7 @@ The `main` function demonstrates how to create, extend, and query entities:
 
 - Subscribes to log events from the network (create, update, delete, extend).
 
-- Creates an entity with data `"hello"`, TTL of `60`, and an annotation of `("foo", "bar")`.
+- Creates an entity with data `"hello"`, BTL of `60`, and an annotation of `("foo", "bar")`.
 
 - Prints various metadata and state:
 

example/nix/packages/golem-base-sdk-example.nix

@@ -20,7 +20,7 @@ let
 
   pythonSet =
     (pkgs.callPackage inputs.pyproject-nix.build.packages {
-      python = pkgs.python312;
+      python = pkgs.python310;
     }).overrideScope
       (
         lib.composeManyExtensions [

example/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 version = "0.0.1"
 license = "GPL-3.0-only"
-requires-python = ">=3.12"
+requires-python = ">=3.10"
 dynamic = ["description"]
 classifiers = ["Private :: Do Not Upload"]
 

example/uv.lock

@@ -740,10 +740,9 @@ async def _send_gb_transaction(
                 await self.http_client().eth.call(txData)
             except Web3RPCError as e:
                 if e.rpc_response:
+                    error = e.rpc_response["error"]["message"]
                     raise Exception(
-                        f"Error while processing transaction: {
-                            e.rpc_response['error']['message']
-                        }"
+                        f"Error while processing transaction: {error}"
                     ) from e
                 else:
                     raise e

flake.lock

@@ -4,8 +4,9 @@
 from dataclasses import dataclass
 from typing import (
     Any,
+    Generic,
     NewType,
-    override,
+    TypeVar,
 )
 
 from eth_typing import ChecksumAddress, HexStr
@@ -27,8 +28,9 @@ def as_address(self) -> ChecksumAddress:
         """Convert this instance to a `eth_typing.ChecksumAddress`."""
         return AsyncWeb3.to_checksum_address(self.as_hex_string())
 
-    @override
+    # @override
     def __repr__(self) -> str:
+        """Encode bytes as a string."""
         return f"{type(self).__name__}({self.as_hex_string()})"
 
     @staticmethod
@@ -44,15 +46,20 @@ def from_hex_string(hexstr: str) -> "GenericBytes":
 Address = NewType("Address", GenericBytes)
 
 
+# TODO: use new generic syntax once we can bump to python 3.12 or higher
+V = TypeVar("V")
+
+
 @dataclass(frozen=True)
-class Annotation[V]:
+class Annotation(Generic[V]):
     """Class to represent generic annotations."""
 
     key: str
     value: V
 
-    @override
+    # @override
     def __repr__(self) -> str:
+        """Encode annotation as a string."""
         return f"{type(self).__name__}({self.key} -> {self.value})"
 
 
@@ -61,7 +68,7 @@ class GolemBaseCreate:
     """Class to represent a create operation in Golem Base."""
 
     data: bytes
-    ttl: int
+    btl: int
     string_annotations: Sequence[Annotation[str]]
     numeric_annotations: Sequence[Annotation[int]]
 
@@ -72,7 +79,7 @@ class GolemBaseUpdate:
 
     entity_key: EntityKey
     data: bytes
-    ttl: int
+    btl: int
     string_annotations: Sequence[Annotation[str]]
     numeric_annotations: Sequence[Annotation[int]]
 

golem_base_sdk/__init__.py

@@ -1,6 +1,7 @@
 """Utility methods."""
 
 import logging
+from typing import TypeVar
 
 import rlp
 
@@ -15,8 +16,10 @@
 
 def rlp_encode_transaction(tx: GolemBaseTransaction) -> bytes:
     """Encode a Golem Base transaction in RLP."""
+    # TODO: use new generic syntax once we can bump to python 3.12 or higher
+    T = TypeVar("T")
 
-    def format_annotation[T](annotation: Annotation[T]) -> tuple[str, T]:
+    def format_annotation(annotation: Annotation[T]) -> tuple[str, T]:
         return (annotation.key, annotation.value)
 
     # Turn the transaction into a simple list of basic types that can be
@@ -26,7 +29,7 @@ def format_annotation[T](annotation: Annotation[T]) -> tuple[str, T]:
         list(
             map(
                 lambda el: [
-                    el.ttl,
+                    el.btl,
                     el.data,
                     list(map(format_annotation, el.string_annotations)),
                     list(map(format_annotation, el.numeric_annotations)),
@@ -39,7 +42,7 @@ def format_annotation[T](annotation: Annotation[T]) -> tuple[str, T]:
             map(
                 lambda el: [
                     el.entity_key.generic_bytes,
-                    el.ttl,
+                    el.btl,
                     el.data,
                     list(map(format_annotation, el.string_annotations)),
                     list(map(format_annotation, el.numeric_annotations)),