tonutils 2.0.1b4__tar.gz → 2.0.1b5__tar.gz

{tonutils-2.0.1b4/tonutils.egg-info → tonutils-2.0.1b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tonutils
-Version: 2.0.1b4
+Version: 2.0.1b5
 Summary: Tonutils is a high-level, object-oriented Python library designed to facilitate seamless interactions with the TON blockchain.
 Author: nessshon
 Maintainer: nessshon

tonutils-2.0.1b5/tonutils/__meta__.py

@@ -0,0 +1 @@
+__version__ = "2.0.1b5"

{tonutils-2.0.1b4 → tonutils-2.0.1b5}/tonutils/clients/base.py

@@ -272,7 +272,11 @@ class BaseClient(abc.ABC):
 
         blen = len(domain) * 8
         rlen = t.cast(int, res[0])
-        cell = t.cast(Cell, res[1])
+
+        cell = res[1]
+
+        if cell is None:
+            return None
 
         if rlen % 8 != 0 or rlen > blen:
             raise ValueError(f"Invalid resolved length: result {rlen}, bytes {blen}.")

{tonutils-2.0.1b4 → tonutils-2.0.1b5}/tonutils/tools/block_scanner/__init__.py

@@ -4,13 +4,7 @@ from .events import (
     TransactionsEvent,
 )
 from .scanner import BlockScanner
-from .where import (
-    Where,
-    comment,
-    destination,
-    opcode,
-    sender,
-)
+from .where import Where
 
 
 __all__ = [
@@ -19,8 +13,4 @@ __all__ = [
     "TransactionEvent",
     "TransactionsEvent",
     "Where",
-    "comment",
-    "destination",
-    "opcode",
-    "sender",
 ]

{tonutils-2.0.1b4 → tonutils-2.0.1b5}/tonutils/tools/block_scanner/scanner.py

@@ -186,8 +186,9 @@ class BlockScanner:
                     get_header=self._client.get_block_header,
                 )
             )
+            # Update seen_seqno after collecting blocks for this shard
+            shards_seqno[self._traversal.shard_key(shard_tip)] = shard_tip.seqno
 
-        blocks.sort(key=lambda b: (b.workchain, b.shard, b.seqno))
         return blocks
 
     def _emit_block(self, mc_block: BlockIdExt, block: BlockIdExt) -> None:
@@ -239,12 +240,9 @@ class BlockScanner:
         self,
         mc_block: BlockIdExt,
         block: BlockIdExt,
-        shards_seqno: t.Dict[t.Tuple[int, int], int],
     ) -> None:
         """Process shard block and emit events for block + transactions."""
         self._ensure_running()
-
-        shards_seqno[self._traversal.shard_key(block)] = block.seqno
         self._emit_block(mc_block, block)
 
         if not self._include_transactions:
@@ -304,7 +302,7 @@ class BlockScanner:
                     shards_seqno=state.shards_seqno,
                 )
                 for block in blocks:
-                    await self._handle_block(state.mc_block, block, state.shards_seqno)
+                    await self._handle_block(state.mc_block, block)
                 state.mc_block = await self._wait_next_mc_block(state.mc_block)
         finally:
             await self._dispatcher.aclose()

tonutils-2.0.1b5/tonutils/tools/block_scanner/traversal.py

@@ -0,0 +1,97 @@
+import typing as t
+
+from pytoniq_core.tl import BlockIdExt
+from pytoniq_core.tlb.block import ExtBlkRef
+
+
+class ShardTraversal:
+
+    @staticmethod
+    def shard_key(blk: BlockIdExt) -> t.Tuple[int, int]:
+        return blk.workchain, blk.shard
+
+    @staticmethod
+    def simulate_overflow(x: int) -> int:
+        return (x + 2**63) % 2**64 - 2**63
+
+    @staticmethod
+    def lower_bit64(num: int) -> int:
+        return num & (~num + 1)
+
+    def get_child_shard(self, shard: int, *, left: bool) -> int:
+        x = self.lower_bit64(shard) >> 1
+        if left:
+            return self.simulate_overflow(shard - x)
+        return self.simulate_overflow(shard + x)
+
+    def get_parent_shard(self, shard: int) -> int:
+        x = self.lower_bit64(shard)
+        return self.simulate_overflow((shard - x) | (x << 1))
+
+    async def walk_unseen(
+        self,
+        *,
+        root: BlockIdExt,
+        seen_seqno: t.Dict[t.Tuple[int, int], int],
+        get_header: t.Callable[[BlockIdExt], t.Awaitable[t.Any]],
+        out: t.Optional[t.List[BlockIdExt]] = None,
+    ) -> t.List[BlockIdExt]:
+        """Recursively walk from root block back to seen blocks."""
+        if out is None:
+            out = []
+
+        key = self.shard_key(root)
+        if seen_seqno.get(key, -1) >= root.seqno:
+            return out
+
+        _, header = await get_header(root)
+        prev_ref = header.info.prev_ref
+
+        if prev_ref.type_ == "prev_blk_info":
+            prev: ExtBlkRef = prev_ref.prev
+            prev_shard = (
+                self.get_parent_shard(root.shard)
+                if header.info.after_split
+                else root.shard
+            )
+            await self.walk_unseen(
+                root=BlockIdExt(
+                    workchain=root.workchain,
+                    shard=prev_shard,
+                    seqno=prev.seqno,
+                    root_hash=prev.root_hash,
+                    file_hash=prev.file_hash,
+                ),
+                seen_seqno=seen_seqno,
+                get_header=get_header,
+                out=out,
+            )
+        else:
+            prev1, prev2 = prev_ref.prev1, prev_ref.prev2
+            await self.walk_unseen(
+                root=BlockIdExt(
+                    workchain=root.workchain,
+                    shard=self.get_child_shard(root.shard, left=True),
+                    seqno=prev1.seqno,
+                    root_hash=prev1.root_hash,
+                    file_hash=prev1.file_hash,
+                ),
+                seen_seqno=seen_seqno,
+                get_header=get_header,
+                out=out,
+            )
+            await self.walk_unseen(
+                root=BlockIdExt(
+                    workchain=root.workchain,
+                    shard=self.get_child_shard(root.shard, left=False),
+                    seqno=prev2.seqno,
+                    root_hash=prev2.root_hash,
+                    file_hash=prev2.file_hash,
+                ),
+                seen_seqno=seen_seqno,
+                get_header=get_header,
+                out=out,
+            )
+
+        out.append(root)
+        return out

tonutils-2.0.1b5/tonutils/tools/block_scanner/where.py

@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+import typing as t
+
+from tonutils.tools.block_scanner.annotations import TEvent
+
+
+class Where(t.Generic[TEvent]):
+    __slots__ = ()
+
+    def __call__(self, event: TEvent) -> bool:
+        raise NotImplementedError
+
+    def __and__(self, other: Where[TEvent]) -> _And[TEvent]:
+        return _And(self, other)
+
+    def __or__(self, other: Where[TEvent]) -> _Or[TEvent]:
+        return _Or(self, other)
+
+    def __invert__(self) -> _Not[TEvent]:
+        return _Not(self)
+
+
+class _And(Where[TEvent]):
+    __slots__ = ("_a", "_b")
+
+    def __init__(self, a: Where[TEvent], b: Where[TEvent]) -> None:
+        self._a = a
+        self._b = b
+
+    def __call__(self, event: TEvent) -> bool:
+        return self._a(event) and self._b(event)
+
+
+class _Or(Where[TEvent]):
+    __slots__ = ("_a", "_b")
+
+    def __init__(self, a: Where[TEvent], b: Where[TEvent]) -> None:
+        self._a = a
+        self._b = b
+
+    def __call__(self, event: TEvent) -> bool:
+        return self._a(event) or self._b(event)
+
+
+class _Not(Where[TEvent]):
+    __slots__ = ("_f",)
+
+    def __init__(self, f: Where[TEvent]) -> None:
+        self._f = f
+
+    def __call__(self, event: TEvent) -> bool:
+        return not self._f(event)

{tonutils-2.0.1b4 → tonutils-2.0.1b5/tonutils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tonutils
-Version: 2.0.1b4
+Version: 2.0.1b5
 Summary: Tonutils is a high-level, object-oriented Python library designed to facilitate seamless interactions with the TON blockchain.
 Author: nessshon
 Maintainer: nessshon

tonutils-2.0.1b4/tonutils/__meta__.py

@@ -1 +0,0 @@
-__version__ = "2.0.1b4"

tonutils-2.0.1b4/tonutils/tools/block_scanner/traversal.py

@@ -1,96 +0,0 @@
-import typing as t
-
-from pytoniq_core.tl import BlockIdExt
-from pytoniq_core.tlb.block import ExtBlkRef
-
-
-class ShardTraversal:
-
-    @staticmethod
-    def shard_key(blk: BlockIdExt) -> t.Tuple[int, int]:
-        return blk.workchain, blk.shard
-
-    @staticmethod
-    def simulate_overflow(x: int) -> int:
-        return (x + 2**63) % 2**64 - 2**63
-
-    @staticmethod
-    def lower_bit64(num: int) -> int:
-        return num & (~num + 1)
-
-    def get_child_shard(self, shard: int, *, left: bool) -> int:
-        x = self.lower_bit64(shard) >> 1
-        if left:
-            return self.simulate_overflow(shard - x)
-        return self.simulate_overflow(shard + x)
-
-    def get_parent_shard(self, shard: int) -> int:
-        x = self.lower_bit64(shard)
-        return self.simulate_overflow((shard - x) | (x << 1))
-
-    async def walk_unseen(
-        self,
-        *,
-        root: BlockIdExt,
-        seen_seqno: t.Dict[t.Tuple[int, int], int],
-        get_header: t.Callable[[BlockIdExt], t.Awaitable[t.Any]],
-    ) -> t.List[BlockIdExt]:
-        out: t.List[BlockIdExt] = []
-        stack: t.List[BlockIdExt] = [root]
-        post: t.List[BlockIdExt] = []
-
-        while stack:
-            blk = stack.pop()
-            key = self.shard_key(blk)
-            if seen_seqno.get(key, -1) >= blk.seqno:
-                continue
-
-            post.append(blk)
-            _, header = await get_header(blk)
-            prev_ref = header.info.prev_ref
-
-            if prev_ref.type_ == "prev_blk_info":
-                prev: ExtBlkRef = prev_ref.prev
-                prev_shard = (
-                    self.get_parent_shard(blk.shard)
-                    if header.info.after_split
-                    else blk.shard
-                )
-                stack.append(
-                    BlockIdExt(
-                        workchain=blk.workchain,
-                        shard=prev_shard,
-                        seqno=prev.seqno,
-                        root_hash=prev.root_hash,
-                        file_hash=prev.file_hash,
-                    )
-                )
-
-            else:
-                prev1, prev2 = prev_ref.prev1, prev_ref.prev2
-                stack.append(
-                    BlockIdExt(
-                        workchain=blk.workchain,
-                        shard=self.get_child_shard(blk.shard, left=True),
-                        seqno=prev1.seqno,
-                        root_hash=prev1.root_hash,
-                        file_hash=prev1.file_hash,
-                    )
-                )
-                stack.append(
-                    BlockIdExt(
-                        workchain=blk.workchain,
-                        shard=self.get_child_shard(blk.shard, left=False),
-                        seqno=prev2.seqno,
-                        root_hash=prev2.root_hash,
-                        file_hash=prev2.file_hash,
-                    )
-                )
-
-        for blk in reversed(post):
-            key = self.shard_key(blk)
-            if seen_seqno.get(key, -1) >= blk.seqno:
-                continue
-            out.append(blk)
-
-        return out

tonutils-2.0.1b4/tonutils/tools/block_scanner/where.py

@@ -1,151 +0,0 @@
-from __future__ import annotations
-
-import typing as t
-
-from pytoniq_core import Address
-
-from tonutils.tools.block_scanner import TransactionEvent
-from tonutils.tools.block_scanner.annotations import TEvent
-from tonutils.types import AddressLike
-
-
-class Where(t.Generic[TEvent]):
-    __slots__ = ()
-
-    def __call__(self, event: TEvent) -> bool:
-        raise NotImplementedError
-
-    def __and__(self, other: Where[TEvent]) -> _And[TEvent]:
-        return _And(self, other)
-
-    def __or__(self, other: Where[TEvent]) -> _Or[TEvent]:
-        return _Or(self, other)
-
-    def __invert__(self) -> _Not[TEvent]:
-        return _Not(self)
-
-
-class _And(Where[TEvent]):
-    __slots__ = ("_a", "_b")
-
-    def __init__(self, a: Where[TEvent], b: Where[TEvent]) -> None:
-        self._a = a
-        self._b = b
-
-    def __call__(self, event: TEvent) -> bool:
-        return self._a(event) and self._b(event)
-
-
-class _Or(Where[TEvent]):
-    __slots__ = ("_a", "_b")
-
-    def __init__(self, a: Where[TEvent], b: Where[TEvent]) -> None:
-        self._a = a
-        self._b = b
-
-    def __call__(self, event: TEvent) -> bool:
-        return self._a(event) or self._b(event)
-
-
-class _Not(Where[TEvent]):
-    __slots__ = ("_f",)
-
-    def __init__(self, f: Where[TEvent]) -> None:
-        self._f = f
-
-    def __call__(self, event: TEvent) -> bool:
-        return not self._f(event)
-
-
-class _Opcode(Where[TransactionEvent]):
-    __slots__ = ("_ops",)
-
-    def __init__(self, *ops: int) -> None:
-        self._ops = frozenset(ops)
-
-    def __call__(self, event: TransactionEvent) -> bool:
-        msg = event.transaction.in_msg
-        if msg is None or msg.body is None:
-            return False
-
-        if len(msg.body.bits) < 32:
-            return False
-
-        op = msg.body.begin_parse().load_uint(32)
-        return op in self._ops
-
-
-class _Comment(Where[TransactionEvent]):
-    __slots__ = ("_texts", "_any")
-
-    def __init__(self, *texts: str) -> None:
-        self._texts = frozenset(texts)
-        self._any = len(texts) == 0
-
-    def __call__(self, event: TransactionEvent) -> bool:
-        msg = event.transaction.in_msg
-        if msg is None or msg.body is None:
-            return False
-
-        body = msg.body.begin_parse()
-        if len(body.bits) < 32:
-            return False
-
-        op = body.load_uint(32)
-        if op != 0:
-            return False
-
-        if self._any:
-            return True
-        try:
-            text = body.load_snake_string()
-        except (Exception,):
-            return False
-
-        return text in self._texts
-
-
-class _Sender(Where[TransactionEvent]):
-    __slots__ = ("_addrs",)
-
-    def __init__(self, *addrs: AddressLike) -> None:
-        self._addrs = frozenset(Address(a) if isinstance(a, str) else a for a in addrs)
-
-    def __call__(self, event: TransactionEvent) -> bool:
-        msg = event.transaction.in_msg
-        if msg is None:
-            return False
-
-        src = msg.info.src
-        return src is not None and src in self._addrs
-
-
-class _Destination(Where[TransactionEvent]):
-    __slots__ = ("_addrs",)
-
-    def __init__(self, *addrs: AddressLike) -> None:
-        self._addrs = frozenset(Address(a) if isinstance(a, str) else a for a in addrs)
-
-    def __call__(self, event: TransactionEvent) -> bool:
-        msg = event.transaction.in_msg
-        if msg is None:
-            return False
-
-        dest = msg.info.dest
-        return dest is not None and dest in self._addrs
-
-
-def opcode(*ops: int) -> Where[TransactionEvent]:
-    return _Opcode(*ops)
-
-
-def comment(*texts: str) -> Where[TransactionEvent]:
-    return _Comment(*texts)
-
-
-def sender(*addresses: AddressLike) -> Where[TransactionEvent]:
-    return _Sender(*addresses)
-
-
-def destination(*addresses: AddressLike) -> Where[TransactionEvent]:
-    return _Destination(*addresses)