astreum 0.2.30__py3-none-any.whl → 0.2.31__py3-none-any.whl

astreum/_node.py

@@ -0,0 +1,382 @@
+from __future__ import annotations
+from typing import Dict, List, Optional
+import uuid
+import threading
+
+# ===============================
+# 1. Helpers (no decoding, two's complement)
+# ===============================
+
+def tc_to_int(b: bytes) -> int:
+    """bytes -> int using two's complement (width = len(b)*8)."""
+    if not b:
+        return 0
+    return int.from_bytes(b, "big", signed=True)
+
+def int_to_tc(n: int, width_bytes: int) -> bytes:
+    """int -> bytes (two's complement, fixed width)."""
+    if width_bytes <= 0:
+        return b"\x00"
+    return n.to_bytes(width_bytes, "big", signed=True)
+
+def min_tc_width(n: int) -> int:
+    """minimum bytes to store n in two's complement."""
+    if n == 0:
+        return 1
+    w = 1
+    while True:
+        try:
+            n.to_bytes(w, "big", signed=True)
+            return w
+        except OverflowError:
+            w += 1
+
+def nand_bytes(a: bytes, b: bytes) -> bytes:
+    """Bitwise NAND on two byte strings, zero-extending to max width."""
+    w = max(len(a), len(b), 1)
+    au = int.from_bytes(a.rjust(w, b"\x00"), "big", signed=False)
+    bu = int.from_bytes(b.rjust(w, b"\x00"), "big", signed=False)
+    mask = (1 << (w * 8)) - 1
+    resu = (~(au & bu)) & mask
+    return resu.to_bytes(w, "big", signed=False)
+
+def bytes_touched(*vals: bytes) -> int:
+    """For metering: how many bytes were manipulated (max of operands)."""
+    return max((len(v) for v in vals), default=1)
+
+# ===============================
+# 2. Structures
+# ===============================
+
+class Expr:
+    class ListExpr:
+        def __init__(self, elements: List['Expr']):
+            self.elements = elements
+        
+        def __repr__(self):
+            if not self.elements:
+                return "()"
+            inner = " ".join(str(e) for e in self.elements)
+            return f"({inner})"
+        
+    class Symbol:
+        def __init__(self, value: str):
+            self.value = value
+
+        def __repr__(self):
+            return self.value
+        
+    class Byte:
+        def __init__(self, value: int):
+            self.value = value
+
+        def __repr__(self):
+            return self.value
+        
+    class Error:
+        def __init__(self, message: str, origin: Optional['Expr'] = None):
+            self.message = message
+            self.origin  = origin
+
+        def __repr__(self):
+            if self.origin is None:
+                return f'(error "{self.message}")'
+            return f'(error "{self.message}" in {self.origin})'
+
+class Env:
+    def __init__(
+        self,
+        data: Optional[Dict[str, Expr]] = None,
+        parent_id: Optional[uuid.UUID] = None,
+    ):
+        self.data: Dict[bytes, Expr] = {} if data is None else data
+        self.parent_id = parent_id
+
+class Meter:
+    def __init__(self, prices: Dict[bytes, int], enabled: bool):
+        self.enabled = enabled
+        self.prices = prices
+        self.total = 0
+
+    def charge(self, op: bytes, size: int):
+        if not self.enabled:
+            return
+        self.total += self.prices.get(op, 0) * max(1, size)
+
+class Node:
+    OPS = {
+        b"add", b"nand", b"jump",
+        b"heap_get", b"heap_set",
+        b"storage_get", b"storage_set",
+    }
+
+    def __init__(self):
+        self.environments: Dict[uuid.UUID, Env] = {}
+        self.machine_costs: Dict[bytes, int] = {
+            b"add": 1,
+            b"nand": 1,
+            b"jump": 1,
+            b"heap_set": 1,
+            b"heap_get": 1,
+            b"storage_set": 1,
+            b"storage_get": 1,
+        }
+        self.in_memory_storage: Dict[bytes, bytes] = {}
+        self.machine_environments_lock = threading.RLock()
+
+    # ---- Env helpers ----
+    def env_get(self, env_id: uuid.UUID, key: bytes) -> Optional[Expr]:
+        cur = self.environments.get(env_id)
+        while cur is not None:
+            if key in cur.data:
+                return cur.data[key]
+            cur = self.environments.get(cur.parent_id) if cur.parent_id else None
+        return None
+
+    def env_set(self, env_id: uuid.UUID, key: bytes, value: Expr) -> bool:
+        with self.machine_environments_lock:
+            env = self.environments.get(env_id)
+            if env is None:
+                return False
+            env.data[key] = value
+            return True
+
+    # ---- Storage (persistent) ----
+    def _local_get(self, key: bytes) -> Optional[bytes]:
+        return self.in_memory_storage.get(key)
+
+    def _local_set(self, key: bytes, value: bytes) -> None:
+        self.in_memory_storage[key] = value
+
+    # ---- Eval ----
+    def low_eval(self, code: List[bytes], metered: bool = False) -> bytes:
+        
+        heap: Dict[int, bytes] = []
+
+        meter = Meter(self.machine_costs, enabled=metered)
+
+        stack: List[bytes] = []
+        pc = 0
+
+        while True:
+            if pc >= len(code):
+                if len(stack) != 1:
+                    raise RuntimeError(f"bad stack state at end: {stack}")
+                return stack.pop()
+
+            tok = code[pc]
+            pc += 1
+
+            # opcode?
+            if tok in self.OPS:
+                # ---------- ADD ----------
+                if tok == b"add":
+                    b_b = stack.pop()
+                    a_b = stack.pop()
+                    a_i = tc_to_int(a_b)
+                    b_i = tc_to_int(b_b)
+                    res_i = a_i + b_i
+                    width = max(len(a_b), len(b_b), min_tc_width(res_i))
+                    res_b = int_to_tc(res_i, width)
+                    meter.charge(b"add", bytes_touched(a_b, b_b, res_b))
+                    stack.append(res_b)
+                    continue
+
+                # ---------- NAND ----------
+                if tok == b"nand":
+                    b_b = stack.pop()
+                    a_b = stack.pop()
+                    res_b = nand_bytes(a_b, b_b)
+                    meter.charge(b"nand", bytes_touched(a_b, b_b, res_b))
+                    stack.append(res_b)
+                    continue
+
+                # ---------- JUMP ----------
+                if tok == b"jump":
+                    tgt_b = stack.pop()
+                    tgt_i = tc_to_int(tgt_b)
+                    meter.charge(b"jump", 0)
+                    pc = tgt_i
+                    continue
+
+                # ---------- HEAP GET ----------
+                if tok == b"heap_get":
+                    key = stack.pop()
+                    val = heap.get(key) or b""
+                    meter.charge(b"heap_get", len(val))
+                    stack.append(val)
+                    continue
+
+                # ---------- HEAP SET ----------
+                if tok == b"heap_set":
+                    val = stack.pop()
+                    key = stack.pop()
+                    ok = heap[key] = val
+                    if not ok:
+                        raise RuntimeError("heap_set failed (env missing)")
+                    meter.charge(b"heap_set", len(val))
+                    continue
+
+                # ---------- STORAGE GET ----------
+                if tok == b"storage_get":
+                    key = stack.pop()
+                    val = self._local_get(key) or b""
+                    meter.charge(b"storage_get", len(val))
+                    stack.append(val)
+                    continue
+
+                # ---------- STORAGE SET ----------
+                if tok == b"storage_set":
+                    val = stack.pop()
+                    key = stack.pop()
+                    self._local_set(key, val)
+                    meter.charge(b"storage_set", len(val))
+                    continue
+
+                # unreachable
+                continue
+
+            # not an opcode → literal blob
+            stack.append(tok)
+
+    def high_eval(self, env_id: uuid.UUID, expr: Expr) -> Expr:
+        # ---------- atoms ----------
+        if isinstance(expr, Expr.Error):
+            return expr
+
+        if isinstance(expr, Expr.Symbol):
+            bound = self.env_get(env_id, expr.value.encode())
+            if bound is None:
+                return Expr.Error(f"unbound symbol '{expr.value}'", origin=expr)
+            return bound
+
+        if not isinstance(expr, Expr.ListExpr):
+            return expr  # Expr.Byte or other literals passthrough
+
+        # ---------- empty / single ----------
+        if len(expr.elements) == 0:
+            return expr
+        if len(expr.elements) == 1:
+            return self.high_eval(env_id, expr.elements[0])
+
+        tail = expr.elements[-1]
+
+        # ---------- (value name def) ----------
+        if isinstance(tail, Expr.Symbol) and tail.value == "def":
+            if len(expr.elements) < 3:
+                return Expr.Error("def expects (value name def)", origin=expr)
+            name_e = expr.elements[-2]
+            if not isinstance(name_e, Expr.Symbol):
+                return Expr.Error("def name must be symbol", origin=name_e)
+            value_e = expr.elements[-3]
+            value_res = self.high_eval(env_id=env_id, expr=value_e)
+            if isinstance(value_res, Expr.Error):
+                return value_res
+            self.env_set(env_id, name_e.value.encode(), value_res)
+            return value_res
+
+        # ---------- (... (body params sk))  LOW-LEVEL CALL ----------
+        if isinstance(tail, Expr.ListExpr):
+            fn_form = tail
+            if (len(fn_form.elements) >= 3
+                and isinstance(fn_form.elements[-1], Expr.Symbol)
+                and fn_form.elements[-1].value == "sk"):
+
+                body_expr   = fn_form.elements[-3]
+                params_expr = fn_form.elements[-2]
+
+                if not isinstance(body_expr, Expr.ListExpr):
+                    return Expr.Error("sk body must be list", origin=body_expr)
+                if not isinstance(params_expr, Expr.ListExpr):
+                    return Expr.Error("sk params must be list", origin=params_expr)
+
+                # params → bytes keys
+                params: List[bytes] = []
+                for p in params_expr.elements:
+                    if not isinstance(p, Expr.Symbol):
+                        return Expr.Error("sk param must be symbol", origin=p)
+                    params.append(p.value.encode())
+
+                # args: preceding items; MUST resolve to Expr.Byte
+                args_exprs = expr.elements[:-1]
+                if len(args_exprs) != len(params):
+                    return Expr.Error("arity mismatch", origin=expr)
+
+                arg_bytes: List[bytes] = []
+                for a in args_exprs:
+                    v = self.high_eval(env_id, a)
+                    if isinstance(v, Expr.Error):
+                        return v
+                    if not isinstance(v, Expr.Byte):
+                        return Expr.Error("argument must resolve to Byte", origin=a)
+                    arg_bytes.append(bytes([v.value & 0xFF]))
+
+                subst: Dict[bytes, bytes] = dict(zip(params, arg_bytes))
+
+                # build low-level code with param substitution
+                code: List[bytes] = []
+                for tok in body_expr.elements:
+                    if isinstance(tok, Expr.Symbol):
+                        sb = tok.value.encode()
+                        code.append(subst.get(sb, sb))
+                    elif isinstance(tok, Expr.Byte):
+                        code.append(bytes([tok.value & 0xFF]))
+                    elif isinstance(tok, Expr.ListExpr):
+                        rv = self.high_eval(env_id, tok)
+                        if isinstance(rv, Expr.Error):
+                            return rv
+                        if not isinstance(rv, Expr.Byte):
+                            return Expr.Error("nested list must resolve to Byte", origin=tok)
+                        code.append(bytes([rv.value & 0xFF]))
+                    else:
+                        return Expr.Error("invalid token in sk body", origin=tok)
+
+                res_bytes = self.low_eval(code, metered=False)
+                return Expr.ListExpr([Expr.Byte(b) for b in res_bytes])
+
+        # ---------- (... (body params fn))  HIGH-LEVEL CALL ----------
+        if isinstance(tail, Expr.ListExpr):
+            fn_form = tail
+            if (len(fn_form.elements) >= 3
+                and isinstance(fn_form.elements[-1], Expr.Symbol)
+                and fn_form.elements[-1].value == "fn"):
+
+                body_expr   = fn_form.elements[-3]
+                params_expr = fn_form.elements[-2]
+
+                if not isinstance(body_expr, Expr.ListExpr):
+                    return Expr.Error("fn body must be list", origin=body_expr)
+                if not isinstance(params_expr, Expr.ListExpr):
+                    return Expr.Error("fn params must be list", origin=params_expr)
+
+                params: List[bytes] = []
+                for p in params_expr.elements:
+                    if not isinstance(p, Expr.Symbol):
+                        return Expr.Error("fn param must be symbol", origin=p)
+                    params.append(p.value.encode())
+
+                args_exprs = expr.elements[:-1]
+                if len(args_exprs) != len(params):
+                    return Expr.Error("arity mismatch", origin=expr)
+
+                arg_bytes: List[bytes] = []
+                for a in args_exprs:
+                    v = self.high_eval(env_id, a)
+                    if isinstance(v, Expr.Error):
+                        return v
+                    if not isinstance(v, Expr.Byte):
+                        return Expr.Error("argument must resolve to Byte", origin=a)
+                    arg_bytes.append(bytes([v.value & 0xFF]))
+
+                # child env, bind params -> Expr.Byte
+                child_env = uuid.uuid4()
+                self.environments[child_env] = Env(parent_id=env_id)
+                for name_b, val_b in zip(params, arg_bytes):
+                    self.env_set(child_env, name_b, Expr.Byte(val_b[0]))
+
+                # evaluate HL body
+                return self.high_eval(child_env, body_expr)
+
+        # ---------- default: resolve each element and return list ----------
+        resolved: List[Expr] = [self.high_eval(env_id, e) for e in expr.elements]
+        return Expr.ListExpr(resolved)

astreum/node.py

@@ -473,6 +473,18 @@ class Node:
                     self.machine_expr_put(env_id=env_id, name=args[0].value, expr=result)
                     return result
 
+
+                ## DEF: (def x 1) -> ()
+
+                ## GET: (x) -> 1
+
+                ## ADD: (+ 1 2) -> (+ 3) -> 3
+
+                ## NAND: (~& 1 1) -> (~& 0) -> 0
+
+                ## 
+
+
                 ## List: ints -> (1 2)
                 # push: (list.push 3 ints) -> (1 2 3) / (list.push 0 0 ints) -> (0 1 2)
                 elif first.value == "list.push":

{astreum-0.2.30.dist-info → astreum-0.2.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.2.30
+Version: 0.2.31
 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

{astreum-0.2.30.dist-info → astreum-0.2.31.dist-info}/RECORD

@@ -1,6 +1,7 @@
 astreum/__init__.py,sha256=y2Ok3EY_FstcmlVASr80lGR_0w-dH-SXDCCQFmL6uwA,28
+astreum/_node.py,sha256=ovOrboz7HYPLM2PdDat8O_Z62u-7FamMqi5c4lJfNmA,14499
 astreum/format.py,sha256=X4tG5GGPweNCE54bHYkLFiuLTbmpy5upO_s1Cef-MGA,2711
-astreum/node.py,sha256=hBux-hMj2vLtXsWaEiMd9y8PgKCh3Sp1-tmaKs0B5ZU,38163
+astreum/node.py,sha256=SuVm1b0QWl1FpDUaLRH1fiFYnXCrPs6qYeUQlPDae8w,38358
 astreum/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/crypto/ed25519.py,sha256=FRnvlN0kZlxn4j-sJKl-C9tqiz_0z4LZyXLj3KIj1TQ,1760
 astreum/crypto/quadratic_form.py,sha256=pJgbORey2NTWbQNhdyvrjy_6yjORudQ67jBz2ScHptg,4037
@@ -26,8 +27,8 @@ astreum/relay/setup.py,sha256=ynvGaJdlDtw_f5LLiow2Wo7IRzUjvgk8eSr1Sv4_zTg,2090
 astreum/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/storage/object.py,sha256=knFlvw_tpcC4twSu1DGNpHX31wlANN8E5dgEqIfU--Q,2041
 astreum/storage/setup.py,sha256=1-9ztEFI_BvRDvAA0lAn4mFya8iq65THTArlj--M3Hg,626
-astreum-0.2.30.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.2.30.dist-info/METADATA,sha256=LqByNjd5zu9TMcCuIw6j-YuRAEYqCQHMP1prBdjFZaM,5478
-astreum-0.2.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-astreum-0.2.30.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.2.30.dist-info/RECORD,,
+astreum-0.2.31.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
+astreum-0.2.31.dist-info/METADATA,sha256=485DWO4gUtf7DGSsbpZg4zOiIc5yzkQE_VC6q_Zdi30,5478
+astreum-0.2.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+astreum-0.2.31.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
+astreum-0.2.31.dist-info/RECORD,,