astreum 0.2.12__tar.gz → 0.2.13__tar.gz

{astreum-0.2.12/src/astreum.egg-info → astreum-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.2.12
+Version: 0.2.13
 Summary: Python library to interact with the Astreum blockchain and its Lispeum virtual machine.
 Author-email: "Roy R. O. Okello" <roy@stelar.xyz>
 Project-URL: Homepage, https://github.com/astreum/lib
@@ -118,6 +118,6 @@ except ParseError as e:
 ## Testing
 
 ```bash
-
+source venv/bin/activate
 python3 -m unittest discover -s tests
 ```

{astreum-0.2.12 → astreum-0.2.13}/README.md

@@ -100,6 +100,6 @@ except ParseError as e:
 ## Testing
 
 ```bash
-
+source venv/bin/activate
 python3 -m unittest discover -s tests
 ```

{astreum-0.2.12 → astreum-0.2.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "astreum"
-version = "0.2.12"
+version = "0.2.13"
 authors = [
   { name="Roy R. O. Okello", email="roy@stelar.xyz" },
 ]

astreum-0.2.13/src/astreum/models/transaction.py

@@ -0,0 +1,83 @@
+from ..format import encode, decode
+from ..crypto import ed25519
+import blake3
+
+class Transaction:
+    def __init__(
+        self,
+        sender_pk: bytes,
+        recipient_pk: bytes,
+        amount: int,
+        fee: int,
+        nonce: int,
+        signature: bytes | None = None,
+    ) -> None:
+        self.sender_pk = sender_pk
+        self.recipient_pk = recipient_pk
+        self.amount = amount
+        self.fee = fee
+        self.nonce = nonce
+        self.signature = signature
+
+        if self.amount < 0 or self.fee < 0:
+            raise ValueError("amount and fee must be non-negative")
+        
+        if self.fee % 2 != 0:
+            raise ValueError("fee must be divisible by two")
+
+        self.tx_body_hash: bytes = blake3.blake3(self._body_bytes()).digest()
+        
+        if self.signature is not None:
+            self.tx_hash = blake3.blake3(self.tx_body_hash + self.signature).digest()
+        else:
+            self.tx_hash = None
+
+    def sign(self, priv_key: ed25519.Ed25519PrivateKey) -> None:
+        if self.signature is not None:
+            raise ValueError("transaction already signed")
+        sig = priv_key.sign(self.tx_body_hash)
+        self.signature = sig
+        self.tx_hash = blake3.blake3(self.tx_body_hash + sig).digest()
+
+    def verify_signature(self) -> bool:
+        if self.signature is None:
+            return False
+        try:
+            pub = ed25519.Ed25519PublicKey.from_public_bytes(self.sender_pk)
+            pub.verify(self.signature, self.tx_body_hash)
+            return True
+        except Exception:
+            return False
+
+    def to_bytes(self) -> bytes:
+        sig = self.signature or b""
+        return encode([
+            self.sender_pk,
+            self.recipient_pk,
+            self.amount,
+            self.fee,
+            self.nonce,
+            sig,
+        ])
+
+    @classmethod
+    def from_bytes(cls, blob: bytes) -> 'Transaction':
+        sender, recipient, amount, fee, nonce, sig = decode(blob)
+        return cls(sender, recipient, int(amount), int(fee), int(nonce), sig)
+
+    def _body_bytes(self) -> bytes:
+        return encode([
+            self.sender_pk,
+            self.recipient_pk,
+            self.amount,
+            self.fee,
+            self.nonce,
+        ])
+
+    def __eq__(self, other: "Transaction") -> bool:
+        if not isinstance(other, Transaction):
+            return NotImplemented
+        return self.tx_hash == other.tx_hash
+
+    def __hash__(self) -> int:
+        return int.from_bytes(self.tx_hash, 'big')

{astreum-0.2.12 → astreum-0.2.13}/src/astreum/node.py

@@ -6,6 +6,8 @@ from pathlib import Path
 from typing import Tuple, Dict, Union, Optional, List
 from datetime import datetime, timedelta, timezone
 import uuid
+
+from .models.transaction import Transaction
 from .format import encode, decode
 from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey, X25519PublicKey
 from cryptography.hazmat.primitives import serialization
@@ -323,87 +325,6 @@ class Env:
             f"parent_id={self.parent_id})"
         )
 
-
-class Transaction:
-    def __init__(
-        self,
-        sender_pk: bytes,
-        recipient_pk: bytes,
-        amount: int,
-        fee: int,
-        nonce: int,
-        signature: bytes | None = None,
-    ) -> None:
-        self.sender_pk = sender_pk
-        self.recipient_pk = recipient_pk
-        self.amount = amount
-        self.fee = fee
-        self.nonce = nonce
-        self.signature = signature
-
-        if self.amount < 0 or self.fee < 0:
-            raise ValueError("amount and fee must be non-negative")
-        
-        if self.fee % 2 != 0:
-            raise ValueError("fee must be divisible by two")
-
-        self.tx_body_hash: bytes = blake3.blake3(self._body_bytes()).digest()
-        
-        if self.signature is not None:
-            self.tx_hash = blake3.blake3(self.tx_body_hash + self.signature).digest()
-        else:
-            self.tx_hash = None
-
-    def sign(self, priv_key: ed25519.Ed25519PrivateKey) -> None:
-        if self.signature is not None:
-            raise ValueError("transaction already signed")
-        sig = priv_key.sign(self.tx_body_hash)
-        self.signature = sig
-        self.tx_hash = blake3.blake3(self.tx_body_hash + sig).digest()
-
-    def verify_signature(self) -> bool:
-        if self.signature is None:
-            return False
-        try:
-            pub = ed25519.Ed25519PublicKey.from_public_bytes(self.sender_pk)
-            pub.verify(self.signature, self.tx_body_hash)
-            return True
-        except Exception:
-            return False
-
-    def to_bytes(self) -> bytes:
-        sig = self.signature or b""
-        return encode([
-            self.sender_pk,
-            self.recipient_pk,
-            self.amount,
-            self.fee,
-            self.nonce,
-            sig,
-        ])
-
-    @classmethod
-    def from_bytes(cls, blob: bytes) -> 'Transaction':
-        sender, recipient, amount, fee, nonce, sig = decode(blob)
-        return cls(sender, recipient, int(amount), int(fee), int(nonce), sig)
-
-    def _body_bytes(self) -> bytes:
-        return encode([
-            self.sender_pk,
-            self.recipient_pk,
-            self.amount,
-            self.fee,
-            self.nonce,
-        ])
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, Transaction):
-            return NotImplemented
-        return self.tx_hash == other.tx_hash
-
-    def __hash__(self) -> int:
-        return int.from_bytes(self.tx_hash, 'big')
-
 class Block:
     def __init__(
         self,

{astreum-0.2.12 → astreum-0.2.13/src/astreum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.2.12
+Version: 0.2.13
 Summary: Python library to interact with the Astreum blockchain and its Lispeum virtual machine.
 Author-email: "Roy R. O. Okello" <roy@stelar.xyz>
 Project-URL: Homepage, https://github.com/astreum/lib
@@ -118,6 +118,6 @@ except ParseError as e:
 ## Testing
 
 ```bash
-
+source venv/bin/activate
 python3 -m unittest discover -s tests
 ```

{astreum-0.2.12 → astreum-0.2.13}/src/astreum.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ src/astreum/crypto/x25519.py
 src/astreum/lispeum/__init__.py
 src/astreum/lispeum/parser.py
 src/astreum/lispeum/tokenizer.py
-src/astreum/utils/__init__.py
-src/astreum/utils/patricia.py
+src/astreum/models/__init__.py
+src/astreum/models/patricia.py
+src/astreum/models/transaction.py
 tests/test_node_machine.py