tonutils 2.0.1b4__py3-none-any.whl → 2.0.1b5__py3-none-any.whl

tonutils/__meta__.py

@@ -1 +1 @@
-__version__ = "2.0.1b4"
+__version__ = "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/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/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/tools/block_scanner/traversal.py

@@ -34,63 +34,64 @@ class ShardTraversal:
         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]:
-        out: t.List[BlockIdExt] = []
-        stack: t.List[BlockIdExt] = [root]
-        post: t.List[BlockIdExt] = []
+        """Recursively walk from root block back to seen blocks."""
+        if out is None:
+            out = []
 
-        while stack:
-            blk = stack.pop()
-            key = self.shard_key(blk)
-            if seen_seqno.get(key, -1) >= blk.seqno:
-                continue
+        key = self.shard_key(root)
+        if seen_seqno.get(key, -1) >= root.seqno:
+            return out
 
-            post.append(blk)
-            _, header = await get_header(blk)
-            prev_ref = header.info.prev_ref
+        _, 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(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)
+        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/tools/block_scanner/where.py

@@ -2,11 +2,7 @@ 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]):
@@ -55,97 +51,3 @@ class _Not(Where[TEvent]):
 
     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)

{tonutils-2.0.1b4.dist-info → tonutils-2.0.1b5.dist-info}/METADATA

@@ -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.dist-info → tonutils-2.0.1b5.dist-info}/RECORD

@@ -1,12 +1,12 @@
 tonutils/__init__.py,sha256=ueJrDkU1JBlZiX0q8roQfzYOZY62Of_CiHZlxIIQFO0,228
-tonutils/__meta__.py,sha256=9hS3P2QnGv90JwrHxXnlkhgaiyUR_t8z-ovZW7v3DGk,24
+tonutils/__meta__.py,sha256=uHnZdT43kWVuqeXaVY86NLU06cIBG4SuxsLdEUaX6v8,24
 tonutils/cli.py,sha256=WGir-ihgPuKTgKGmhjPZeKk9wgsm64jiJciOnVlsdco,2645
 tonutils/exceptions.py,sha256=67jXCFPyOnVnd8EaqYg1osVIXg34VZX-aJHPunpc-oI,6462
 tonutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tonutils/types.py,sha256=ORevKllLjb7pmL3AQTMeSoiZQ4KFhoB_rA7KpGqZZjU,14542
 tonutils/utils.py,sha256=w2sXvVMA2Erz_JSSN2WuYSi7RAPDAOOwWYiThu8Q0Ps,16499
 tonutils/clients/__init__.py,sha256=PvHsOHOtkVonfiowEPi6P7ggDeQeQorXcksujru6efQ,561
-tonutils/clients/base.py,sha256=K2Z0FTF1c1V420mJn8Az9PGgzfbHmK6fnyFPXtrEWGM,9594
+tonutils/clients/base.py,sha256=DjNhFd_p82Osqn0qWIjflpt9S1NVZc3MQIEj5U5E9-k,9631
 tonutils/clients/limiter.py,sha256=d2WO7Dx-ksg3gvl05WuDMu1KycuQj0XrmiG67Q7wnFo,3592
 tonutils/clients/protocol.py,sha256=4QerYoqBKAAfNZVpyQW2sp5KZZlq8xHCn9yWbbJERPQ,2557
 tonutils/clients/adnl/__init__.py,sha256=shkczPIYlTrOHjpnOBIoRwEYRQ4rVGfLnOZvnQY0a5U,174
@@ -89,20 +89,20 @@ tonutils/contracts/wallet/versions/v4.py,sha256=2sAsjJ8_3oYAj5JwWH3PiMyoGbgl6-f7
 tonutils/contracts/wallet/versions/v5.py,sha256=1J6KXPOc7Q5S5EdFM9WXQzNGRZrw5EgxDZ9dmyHwsXE,8890
 tonutils/tonconnect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tonutils/tools/__init__.py,sha256=QYOVuGY50FFkWlgIvHc2RPU3xiEWSbwnwZ6wuZPQnCA,102
-tonutils/tools/block_scanner/__init__.py,sha256=j0TLZR8reFTXlD55zIjYI2WmP8Yizhwu0DQYzGnFBSQ,385
+tonutils/tools/block_scanner/__init__.py,sha256=NRZ2XuDL3VwXJJ0iMe6ETh5w1aX4pCMMIv9UmmOj5yE,260
 tonutils/tools/block_scanner/annotations.py,sha256=i6Xsu_rBERr7qEmhGGcwlYYkqf8cLjNJlZ4rXUf51WY,795
 tonutils/tools/block_scanner/dispatcher.py,sha256=lgrs0MPnnyx0VibVQGYXU6s5mpqV_lO47yhO0uOCV30,4393
 tonutils/tools/block_scanner/events.py,sha256=6M80JoiVMRy7kBBuT8-KlHJ5Dx3GHUjIKmZVPaXXeaA,727
-tonutils/tools/block_scanner/scanner.py,sha256=eIdETj2awJOK72MUZH15-wzQjF0VKZBBXg-c0V1pu64,9988
-tonutils/tools/block_scanner/traversal.py,sha256=DBwMgHzy-oXhc6PVlrW6x7pvN2HiYghKdtdBGZp2MvE,3085
-tonutils/tools/block_scanner/where.py,sha256=FQaNBUEopgWZgTulZ8kg2cG0FMvvJAL1ddI2bKCoAzQ,3813
+tonutils/tools/block_scanner/scanner.py,sha256=2arPhNPu-6Klcj-PnSnP3DBVWekhlYjn2iqvN-1wigU,9929
+tonutils/tools/block_scanner/traversal.py,sha256=Zp0Uon0OTvLTsZi-zviMyvJHBsZRUx9XExxLU6LMkVA,3101
+tonutils/tools/block_scanner/where.py,sha256=sZUuabQ5joATkJqUh5R3N5r4P9WblmRrVYEVdZeJvZw,1239
 tonutils/tools/status_monitor/__init__.py,sha256=QnMlA0IDLtCGgXsEgB9q3EJTBo2s5js6lSJk0oZkQZQ,72
 tonutils/tools/status_monitor/console.py,sha256=UX3BzjjzeS_nKFGg4NkZJpu9fR_IAJZdQUMz0HcJCdg,5036
 tonutils/tools/status_monitor/models.py,sha256=yHuiEuij4h2kVoOK3sbhNq6SwiGDW_evZmzUwMy1GQs,608
 tonutils/tools/status_monitor/monitor.py,sha256=8zUwNwFScmcjK9ES7XX1LZWjw49lk8CSUQATcUYM57E,10085
-tonutils-2.0.1b4.dist-info/licenses/LICENSE,sha256=fG-yM-8DSkOTaJ558P7uF5PNXBmineVO9-HC12YbIxs,1060
-tonutils-2.0.1b4.dist-info/METADATA,sha256=uulcdOShjPjzlh6h97LbvLuzmB9SxVQlJB8QjHawYfc,4181
-tonutils-2.0.1b4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tonutils-2.0.1b4.dist-info/entry_points.txt,sha256=qijo1cqvbbzLVbXp-PCYh19Pgmd7duH6yljmnUPd55I,47
-tonutils-2.0.1b4.dist-info/top_level.txt,sha256=-7H_mGl8S9HKQrkUiTLmEbtMM-knzRzd_a0cZZnuZIU,9
-tonutils-2.0.1b4.dist-info/RECORD,,
+tonutils-2.0.1b5.dist-info/licenses/LICENSE,sha256=fG-yM-8DSkOTaJ558P7uF5PNXBmineVO9-HC12YbIxs,1060
+tonutils-2.0.1b5.dist-info/METADATA,sha256=1Wvi3Vlsb0IYwLaKlchY-OdFZ_TYNmHmZIzuyDQj55w,4181
+tonutils-2.0.1b5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tonutils-2.0.1b5.dist-info/entry_points.txt,sha256=qijo1cqvbbzLVbXp-PCYh19Pgmd7duH6yljmnUPd55I,47
+tonutils-2.0.1b5.dist-info/top_level.txt,sha256=-7H_mGl8S9HKQrkUiTLmEbtMM-knzRzd_a0cZZnuZIU,9
+tonutils-2.0.1b5.dist-info/RECORD,,