algorandfoundation
diff --git a/‎docs/conf.py
Lines changed: 1 addition & 1 deletion b/‎docs/conf.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎examples/payments/payments.py
Lines changed: 2 additions & 1 deletion b/‎examples/payments/payments.py
Lines changed: 2 additions & 1 deletion
diff --git a/‎examples/usdc/usdc.py
Lines changed: 2 additions & 1 deletion b/‎examples/usdc/usdc.py
Lines changed: 2 additions & 1 deletion
diff --git a/‎poetry.lock
Lines changed: 21 additions & 21 deletions b/‎poetry.lock
Lines changed: 21 additions & 21 deletions
diff --git a/‎pyproject.toml
Lines changed: 1 addition & 3 deletions b/‎pyproject.toml
Lines changed: 1 addition & 3 deletions
diff --git a/‎src/algokit_subscriber/__init__.py
Lines changed: 7 additions & 7 deletions b/‎src/algokit_subscriber/__init__.py
Lines changed: 7 additions & 7 deletions
diff --git a/‎src/algokit_subscriber/block.py
Lines changed: 2 additions & 2 deletions b/‎src/algokit_subscriber/block.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/algokit_subscriber/indexer_lookup.py
Lines changed: 1 addition & 2 deletions b/‎src/algokit_subscriber/indexer_lookup.py
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/algokit_subscriber/subscriber.py
Lines changed: 5 additions & 3 deletions b/‎src/algokit_subscriber/subscriber.py
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/algokit_subscriber/subscription.py
Lines changed: 24 additions & 32 deletions b/‎src/algokit_subscriber/subscription.py
Lines changed: 24 additions & 32 deletions
diff --git a/‎src/algokit_subscriber/transform.py
Lines changed: 4 additions & 5 deletions b/‎src/algokit_subscriber/transform.py
Lines changed: 4 additions & 5 deletions
@@ -1,4 +1,4 @@
-# ruff: noqa
+# ruff: noqa: ANN001
 # Configuration file for the Sphinx documentation builder.
 #
 # For the full list of built-in configuration values, see the documentation:
 
@@ -1,6 +1,7 @@
+from algokit_utils import AlgorandClient
+
 from algokit_subscriber.subscriber import AlgorandSubscriber
 from algokit_subscriber.types.subscription import SubscribedTransaction
-from algokit_utils import AlgorandClient
 
 algorand = AlgorandClient.mainnet()
 
 
@@ -1,6 +1,7 @@
+from algokit_utils import AlgorandClient
+
 from algokit_subscriber.subscriber import AlgorandSubscriber
 from algokit_subscriber.types.subscription import SubscribedTransaction
-from algokit_utils import AlgorandClient
 
 algorand = AlgorandClient.mainnet()
 
 
@@ -13,7 +13,7 @@ py-algorand-sdk = "^2.7.0"
 algokit-utils = "^3.0.0"
 python-semantic-release = "^9.8.8"
 mypy = "^1.10.1"
-ruff = "^0.5.0"
+ruff = "^0.11.7"
 pytest = "^8.3.5"
 pre-commit = "^4.2.0"
 black = "^24.8.0"
@@ -87,8 +87,6 @@ lint.select = [
     "RUF", # Ruff-specific rules
 ]
 lint.ignore = [
-    "ANN101", # no type for self
-    "ANN102", # no type for cls
     "RET505", # allow else after return
     "SIM108", # allow if-else in place of ternary
     "E111",   # indentation is not a multiple of four
 
@@ -15,14 +15,14 @@
 __all__ = [
     "AlgorandSubscriber",
     "AlgorandSubscriberConfig",
-    "TransactionSubscriptionParams",
-    "TransactionSubscriptionResult",
-    "NamedTransactionFilter",
-    "TransactionFilter",
-    "EventListener",
     "Arc28EventGroup",
-    "SubscribedTransaction",
-    "get_subscribed_transactions",
     "BalanceChange",
     "BalanceChangeRole",
+    "EventListener",
+    "NamedTransactionFilter",
+    "SubscribedTransaction",
+    "TransactionFilter",
+    "TransactionSubscriptionParams",
+    "TransactionSubscriptionResult",
+    "get_subscribed_transactions",
 ]
@@ -10,7 +10,7 @@
 
 def block_response_to_block_data(response: bytes) -> BlockData:
     return cast(
-        BlockData,
+        "BlockData",
         msgpack.unpackb(
             response, strict_map_key=False, unicode_errors="surrogateescape"
         ),
@@ -41,7 +41,7 @@ def get_blocks_bulk(context: dict[str, int], client: AlgodClient) -> list[BlockD
                 params={"format": "msgpack"},
                 response_format="msgpack",
             )
-            decoded = block_response_to_block_data(cast(bytes, response))
+            decoded = block_response_to_block_data(cast("bytes", response))
             blocks.append(decoded)
 
         elapsed_time = time.time() - start_time
 
@@ -127,8 +127,7 @@ def extract_items(response: TransactionSearchResults) -> list[TransactionResult]
         nonlocal current_round
         if "message" in response:
             raise Exception({"status": 404, **response})
-        if response["current-round"] > current_round:
-            current_round = response["current-round"]
+        current_round = max(current_round, response["current-round"])
         return response["transactions"]
 
     def build_request(next_token: str | None = None) -> dict[str, Any]:
 
@@ -47,7 +47,9 @@ def __init__(
             )
 
     def default_error_handler(
-        self, error: Any, _str: str | None = None  # noqa: ANN401
+        self,
+        error: Any,  # noqa: ANN401
+        _str: str | None = None,
     ) -> None:
         raise error
 
@@ -56,15 +58,15 @@ def poll_once(self) -> TransactionSubscriptionResult:
         Execute a single subscription poll.
         """
         watermark = self.config["watermark_persistence"]["get"]() or 0
-        current_round = cast(dict, self.algod.status())["last-round"]
+        current_round = cast("dict", self.algod.status())["last-round"]
 
         self.event_emitter.emit(
             "before:poll", {"watermark": watermark, "current_round": current_round}
         )
 
         poll_result = get_subscribed_transactions(
             subscription=cast(
-                TransactionSubscriptionParams,
+                "TransactionSubscriptionParams",
                 {"watermark": watermark, "current_round": current_round, **self.config},
             ),
             algod=self.algod,
 
@@ -275,17 +275,13 @@ def filter_transaction(t: TransactionResult) -> bool:  # noqa: C901, PLR0912
         if subscription.get("receiver"):
             if isinstance(subscription["receiver"], str):
                 result = result and bool(
-                    axfer
-                    and axfer.get("receiver") == subscription["receiver"]
-                    or pay
-                    and pay.get("receiver") == subscription["receiver"]
+                    (axfer and axfer.get("receiver") == subscription["receiver"])
+                    or (pay and pay.get("receiver") == subscription["receiver"])
                 )
             else:
                 result = result and bool(
-                    axfer
-                    and axfer.get("receiver") in subscription["receiver"]
-                    or pay
-                    and pay.get("receiver") in subscription["receiver"]
+                    (axfer and axfer.get("receiver") in subscription["receiver"])
+                    or (pay and pay.get("receiver") in subscription["receiver"])
                 )
 
         if subscription.get("type"):
@@ -312,42 +308,40 @@ def filter_transaction(t: TransactionResult) -> bool:  # noqa: C901, PLR0912
             if isinstance(subscription["app_id"], int):
                 result = result and bool(
                     t.get("created-application-index") == int(subscription["app_id"])
-                    or appl
-                    and appl.get("application-id") == int(subscription["app_id"])
+                    or (
+                        appl
+                        and appl.get("application-id") == int(subscription["app_id"])
+                    )
                 )
             else:
                 result = result and bool(
                     (
                         (t.get("created-application-index") or 0)
                         in map(int, subscription["app_id"])
                     )
-                    or appl
-                    and appl.get("application-id", 0)
-                    in map(int, subscription["app_id"])
+                    or (
+                        appl
+                        and appl.get("application-id", 0)
+                        in map(int, subscription["app_id"])
+                    )
                 )
 
         if subscription.get("asset_id"):
             if isinstance(subscription["asset_id"], int | float):
                 asset_id = int(subscription["asset_id"])
                 result = result and bool(
                     t.get("created-asset-index") == asset_id
-                    or acfg
-                    and acfg.get("asset-id") == asset_id
-                    or acfg
-                    and acfg.get("asset-id") == asset_id
-                    or axfer
-                    and axfer.get("asset-id") == asset_id
+                    or (acfg and acfg.get("asset-id") == asset_id)
+                    or (acfg and acfg.get("asset-id") == asset_id)
+                    or (axfer and axfer.get("asset-id") == asset_id)
                 )
             else:
                 asset_ids = set(map(int, subscription["asset_id"]))
                 result = result and bool(
                     t.get("created-asset-index") in asset_ids
-                    or axfer
-                    and axfer.get("asset-id") in asset_ids
-                    or acfg
-                    and acfg.get("asset-id") in asset_ids
-                    or afrz
-                    and afrz.get("asset-id") in asset_ids
+                    or (axfer and axfer.get("asset-id") in asset_ids)
+                    or (acfg and acfg.get("asset-id") in asset_ids)
+                    or (afrz and afrz.get("asset-id") in asset_ids)
                 )
 
         if subscription.get("min_amount"):
@@ -485,7 +479,7 @@ def check_single_change(actual_change: dict, change_filter: dict) -> bool:
 
     return any(
         any(
-            check_single_change(cast(dict, actual_change), change_filter)
+            check_single_change(cast("dict", actual_change), change_filter)
             for actual_change in transaction_balance_changes
         )
         for change_filter in filtered_balance_changes
@@ -511,7 +505,7 @@ def get_subscribed_transactions(  # noqa: C901, PLR0912, PLR0915
     max_rounds_to_sync = subscription.get("max_rounds_to_sync") or 500
     sync_behaviour = subscription["sync_behaviour"]
     current_round = subscription.get("current_round") or cast(
-        dict[str, Any], algod.status()
+        "dict[str, Any]", algod.status()
     ).get("last-round", 0)
     block_metadata: list[BlockMetadata] | None = None
 
@@ -637,8 +631,7 @@ def get_subscribed_transactions(  # noqa: C901, PLR0912, PLR0915
             )
 
             logger.debug(
-                f"Retrieved {len(catchup_transactions)} transactions from round {start_round} to round "
-                f"{algod_sync_from_round_number - 1} via indexer in {(time.time() - start):.3f}s"
+                f"Retrieved {len(catchup_transactions)} transactions from round {start_round} to round {algod_sync_from_round_number - 1} via indexer in {(time.time() - start):.3f}s"
             )
         else:
             raise NotImplementedError("Not implemented")
@@ -670,8 +663,7 @@ def get_subscribed_transactions(  # noqa: C901, PLR0912, PLR0915
         block_metadata = [block_data_to_block_metadata(b) for b in blocks]
 
         logger.debug(
-            f"Retrieved {len(block_transactions)} transactions from algod via round(s) {algod_sync_from_round_number}-{end_round} "
-            f"in {(time.time() - start):.3f}s"
+            f"Retrieved {len(block_transactions)} transactions from algod via round(s) {algod_sync_from_round_number}-{end_round} in {(time.time() - start):.3f}s"
         )
     else:
         logger.debug(
@@ -955,7 +947,7 @@ def get_indexer_inner_transactions(
         parent_offset = offset()
         result.append(
             cast(
-                SubscribedTransaction,
+                "SubscribedTransaction",
                 {
                     **t,
                     "parent_transaction_id": root["id"],
 
@@ -154,8 +154,7 @@ def get_parent_offset() -> int:
         )
 
         if (
-            block_transaction.get("dt") is None
-            or block_transaction["dt"].get("itx") is None  # type: ignore[union-attr]
+            block_transaction.get("dt") is None or block_transaction["dt"].get("itx") is None  # type: ignore[union-attr]
         ):
             continue
 
@@ -447,7 +446,7 @@ def get_child_offset() -> int:
         return child_offset + 1
 
     if "get_child_offset" in t:
-        get_child_offset = cast(TransactionInBlockWithChildOffset, t)[
+        get_child_offset = cast("TransactionInBlockWithChildOffset", t)[
             "get_child_offset"
         ]
 
@@ -496,7 +495,7 @@ def get_child_offset() -> int:
             "closing-amount": close_amount,
             "created-application-index": created_app_id,
             "auth-addr": (
-                encode_address(cast(bytes, block_transaction.get("sgnr")))
+                encode_address(cast("bytes", block_transaction.get("sgnr")))
                 if block_transaction.get("sgnr")
                 else None
             ),
@@ -671,7 +670,7 @@ def get_child_offset() -> int:
                 for ibt in block_transaction["dt"].get("itx", [])  # type: ignore[union-attr]
             ]
 
-        return cast(SubscribedTransaction, convert_bytes_to_base64(result))
+        return cast("SubscribedTransaction", convert_bytes_to_base64(result))
 
     except Exception as e:
         logger.error(
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# ruff: noqa`
	`1`	`+# ruff: noqa: ANN001`
`2`	`2`	`# Configuration file for the Sphinx documentation builder.`
`3`	`3`	`#`
`4`	`4`	`# For the full list of built-in configuration values, see the documentation:`