algokit-utils 2.3.1b2__py3-none-any.whl → 2.3.2b1__py3-none-any.whl

algokit_utils/account.py

@@ -39,14 +39,14 @@ def get_account_from_mnemonic(mnemonic: str) -> Account:
 
 def create_kmd_wallet_account(kmd_client: "KMDClient", name: str) -> Account:
     """Creates a wallet with specified name"""
-    wallet_id = kmd_client.create_wallet(name, "")["id"]  # type: ignore[no-untyped-call]
-    wallet_handle = kmd_client.init_wallet_handle(wallet_id, "")  # type: ignore[no-untyped-call]
-    kmd_client.generate_key(wallet_handle)  # type: ignore[no-untyped-call]
+    wallet_id = kmd_client.create_wallet(name, "")["id"]
+    wallet_handle = kmd_client.init_wallet_handle(wallet_id, "")
+    kmd_client.generate_key(wallet_handle)
 
-    key_ids: list[str] = kmd_client.list_keys(wallet_handle)  # type: ignore[no-untyped-call]
+    key_ids: list[str] = kmd_client.list_keys(wallet_handle)
     account_key = key_ids[0]
 
-    private_account_key = kmd_client.export_key(wallet_handle, "", account_key)  # type: ignore[no-untyped-call]
+    private_account_key = kmd_client.export_key(wallet_handle, "", account_key)
     return get_account_from_mnemonic(from_private_key(private_account_key))  # type: ignore[no-untyped-call]
 
 
@@ -116,15 +116,15 @@ def get_kmd_wallet_account(
     predicate: "Callable[[dict[str, Any]], bool] | None" = None,
 ) -> Account | None:
     """Returns wallet matching specified name and predicate or None if not found"""
-    wallets: list[dict] = kmd_client.list_wallets()  # type: ignore[no-untyped-call]
+    wallets: list[dict] = kmd_client.list_wallets()
 
     wallet = next((w for w in wallets if w["name"] == name), None)
     if wallet is None:
         return None
 
     wallet_id = wallet["id"]
-    wallet_handle = kmd_client.init_wallet_handle(wallet_id, "")  # type: ignore[no-untyped-call]
-    key_ids: list[str] = kmd_client.list_keys(wallet_handle)  # type: ignore[no-untyped-call]
+    wallet_handle = kmd_client.init_wallet_handle(wallet_id, "")
+    key_ids: list[str] = kmd_client.list_keys(wallet_handle)
     matched_account_key = None
     if predicate:
         for key in key_ids:
@@ -138,7 +138,7 @@ def get_kmd_wallet_account(
     if not matched_account_key:
         return None
 
-    private_account_key = kmd_client.export_key(wallet_handle, "", matched_account_key)  # type: ignore[no-untyped-call]
+    private_account_key = kmd_client.export_key(wallet_handle, "", matched_account_key)
     return get_account_from_mnemonic(from_private_key(private_account_key))  # type: ignore[no-untyped-call]
 
 

algokit_utils/application_client.py

@@ -49,6 +49,7 @@ from algokit_utils.models import (
     CreateCallParametersDict,
     OnCompleteCallParameters,
     OnCompleteCallParametersDict,
+    SimulationTrace,
     TransactionParameters,
     TransactionParametersDict,
     TransactionResponse,
@@ -232,7 +233,7 @@ class ApplicationClient:
     ) -> "ApplicationClient":
         """Creates a copy of this ApplicationClient, using the new signer, sender and app_id values if provided.
         Will also substitute provided template_values into the associated app_spec in the copy"""
-        new_client: "ApplicationClient" = copy.copy(self)
+        new_client: ApplicationClient = copy.copy(self)
         new_client._prepare(  # noqa: SLF001
             new_client, signer=signer, sender=sender, app_id=app_id, template_values=template_values
         )
@@ -1236,7 +1237,7 @@ def _try_convert_to_logic_error(
     source_ex: Exception | str,
     approval_program: str,
     approval_source_map: SourceMap | typing.Callable[[], SourceMap | None] | None = None,
-    simulate_traces: list | None = None,
+    simulate_traces: list[SimulationTrace] | None = None,
 ) -> Exception | None:
     source_ex_str = str(source_ex)
     logic_error_data = parse_logic_error(source_ex_str)
@@ -1297,7 +1298,7 @@ def execute_atc_with_logic_error(
         raise ex
 
 
-def _create_simulate_traces(simulate: SimulateAtomicTransactionResponse) -> list[dict[str, Any]]:
+def _create_simulate_traces(simulate: SimulateAtomicTransactionResponse) -> list[SimulationTrace]:
     traces = []
     if hasattr(simulate, "simulate_response") and hasattr(simulate, "failed_at") and simulate.failed_at:
         for txn_group in simulate.simulate_response["txn-groups"]:
@@ -1307,12 +1308,12 @@ def _create_simulate_traces(simulate: SimulateAtomicTransactionResponse) -> list
             txn_result = txn_group.get("txn-results", [{}])[0]
             exec_trace = txn_result.get("exec-trace", {})
             traces.append(
-                {
-                    "app-budget-added": app_budget_added,
-                    "app-budget-consumed": app_budget_consumed,
-                    "failure-message": failure_message,
-                    "exec-trace": exec_trace,
-                }
+                SimulationTrace(
+                    app_budget_added=app_budget_added,
+                    app_budget_consumed=app_budget_consumed,
+                    failure_message=failure_message,
+                    exec_trace=exec_trace,
+                )
             )
     return traces
 

algokit_utils/beta/composer.py

@@ -567,7 +567,7 @@ class AlgokitComposer:
 
         return isinstance(x, bool | int | float | str | bytes)
 
-    def _build_method_call(
+    def _build_method_call(  # noqa: C901, PLR0912
         self, params: MethodCallParams, suggested_params: algosdk.transaction.SuggestedParams
     ) -> list[TransactionWithSigner]:
         method_args = []
@@ -633,7 +633,7 @@ class AlgokitComposer:
 
         return self._build_atc(method_atc)
 
-    def _build_txn(
+    def _build_txn(  # noqa: C901, PLR0912
         self,
         txn: TransactionWithSigner | TxnParams | AtomicTransactionComposer,
         suggested_params: algosdk.transaction.SuggestedParams,

algokit_utils/deploy.py

@@ -325,29 +325,45 @@ def add_deploy_template_variables(
 
 
 def _find_unquoted_string(line: str, token: str, start: int = 0, end: int = -1) -> int | None:
-    """Find the first string within a line of TEAL. Only matches outside of quotes are returned.
+    """Find the first string within a line of TEAL. Only matches outside of quotes and base64 are returned.
     Returns None if not found"""
 
     if end < 0:
         end = len(line)
     idx = start
-    in_quotes = False
+    in_quotes = in_base64 = False
     while idx < end:
         current_char = line[idx]
         match current_char:
-            case "\\":
-                if in_quotes:  # skip next character
-                    idx += 1
+            # enter base64
+            case " " | "(" if not in_quotes and _last_token_base64(line, idx):
+                in_base64 = True
+            # exit base64
+            case " " | ")" if not in_quotes and in_base64:
+                in_base64 = False
+            # escaped char
+            case "\\" if in_quotes:
+                # skip next character
+                idx += 1
+            # quote boundary
             case '"':
                 in_quotes = not in_quotes
-            case _:
+            # can test for match
+            case _ if not in_quotes and not in_base64 and line.startswith(token, idx):
                 # only match if not in quotes and string matches
-                if not in_quotes and line.startswith(token, idx):
-                    return idx
+                return idx
         idx += 1
     return None
 
 
+def _last_token_base64(line: str, idx: int) -> bool:
+    try:
+        *_, last = line[:idx].split()
+    except ValueError:
+        return False
+    return last in ("base64", "b64")
+
+
 def _find_template_token(line: str, token: str, start: int = 0, end: int = -1) -> int | None:
     """Find the first template token within a line of TEAL. Only matches outside of quotes are returned.
     Only full token matches are returned, i.e. TMPL_STR will not match against TMPL_STRING
@@ -851,7 +867,7 @@ def _convert_deploy_args(
     signer: TransactionSigner | None,
     sender: str | None,
 ) -> tuple[ABIMethod | bool | None, ABIArgsDict, CreateCallParameters]:
-    args = _args.__dict__ if isinstance(_args, DeployCallArgs) else (_args or {})
+    args = _args.__dict__ if isinstance(_args, DeployCallArgs) else dict(_args or {})
 
     # return most derived type, unused parameters are ignored
     parameters = CreateCallParameters(

algokit_utils/logic_error.py

@@ -2,6 +2,8 @@ import re
 from copy import copy
 from typing import TYPE_CHECKING, TypedDict
 
+from algokit_utils.models import SimulationTrace
+
 if TYPE_CHECKING:
     from algosdk.source_map import SourceMap as AlgoSourceMap
 
@@ -46,7 +48,7 @@ class LogicError(Exception):
         message: str,
         pc: int,
         logic_error: Exception | None = None,
-        traces: list | None = None,
+        traces: list[SimulationTrace] | None = None,
     ):
         self.logic_error = logic_error
         self.logic_error_str = logic_error_str

algokit_utils/models.py

@@ -230,3 +230,11 @@ class CommonCallParameters(TransactionParameters):
 @deprecated(reason="Use TransactionParametersDict instead", version="1.3.1")
 class CommonCallParametersDict(TransactionParametersDict):
     """Deprecated, use TransactionParametersDict instead"""
+
+
+@dataclasses.dataclass
+class SimulationTrace:
+    app_budget_added: int | None
+    app_budget_consumed: int | None
+    failure_message: str | None
+    exec_trace: dict[str, object]

{algokit_utils-2.3.1b2.dist-info → algokit_utils-2.3.2b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: algokit-utils
-Version: 2.3.1b2
+Version: 2.3.2b1
 Summary: Utilities for Algorand development for use by AlgoKit
 License: MIT
 Author: Algorand Foundation
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: deprecated (>=1.2.14,<2.0.0)
 Requires-Dist: httpx (>=0.23.1,<0.24.0)
 Requires-Dist: py-algorand-sdk (>=2.4.0,<3.0.0)

{algokit_utils-2.3.1b2.dist-info → algokit_utils-2.3.2b1.dist-info}/RECORD

@@ -2,23 +2,23 @@ algokit_utils/__init__.py,sha256=Xc9NVy3cETI2qzbkkAea2YrZ9-CLtZLHnuS1UHQ13wQ,490
 algokit_utils/_debugging.py,sha256=4UC5NZGqxF32y742TUB34rX9kWaObXCCPOs-lbkQjGQ,10732
 algokit_utils/_ensure_funded.py,sha256=ZdEdUB43QGIQrg7cSSgNrDmWaLSUhli9x9I6juwKfgo,6786
 algokit_utils/_transfer.py,sha256=R9q8RoMHiwtqcwQjuGHEluMxIzmYqAsI5WrTsQd24Ds,6021
-algokit_utils/account.py,sha256=UIuOQZe28pQxjEP9TzhtYlOU20tUdzzS-nIIZM9Bp6Y,7364
-algokit_utils/application_client.py,sha256=xOZJ8i3y8wDJL0Uvaw1o-UmJKvSmbv8ib5RwGl4ar0w,58661
+algokit_utils/account.py,sha256=JYovI84sxiU2mIbwNwWVuoEJBMuAPJauHx5jkKFrR7E,7067
+algokit_utils/application_client.py,sha256=sDSUBsLhoPJkjTlkWLAOh-DLkEhLypH3p5VzJkSlIx4,58701
 algokit_utils/application_specification.py,sha256=XusOe7VrGPun2UoNspC9Ei202NzPkxRNx5USXiABuXc,7466
 algokit_utils/asset.py,sha256=jsc7T1dH9HZA3Yve2gRLObwUlK6xLDoQz0NxLLnqaGs,7216
 algokit_utils/beta/account_manager.py,sha256=dSb-jpBAWRfmKFYzG6T8t5vkh6ysX2NkZXl5UcZY5WA,8015
 algokit_utils/beta/algorand_client.py,sha256=y1CYYn_ADwgOLTVID9BFMvdubDgKqUfx9R6XH3PrzsA,12649
 algokit_utils/beta/client_manager.py,sha256=rW58VVBdYAV_5QwXNyt3VMP8NGon_IRhq1Dr35Mp31g,3117
-algokit_utils/beta/composer.py,sha256=qpIWQ6Xeysk1FzqW8AntHJ_go_W2qIEDB4uvGFOOdgM,28627
+algokit_utils/beta/composer.py,sha256=isGd8obdf8F4Agnq-yG7mVHxt4VtihZFZNR9LHx5_ek,28673
 algokit_utils/common.py,sha256=K6-3_9dv2clDn0WMYb8AWE_N46kWWIXglZIPfHIowDs,812
 algokit_utils/config.py,sha256=oY3o1kPzVPRiQH--f4HzrMMNPojT078CSudqS9WQaEc,4279
-algokit_utils/deploy.py,sha256=ydE3QSq1lRkjXQC9zdFclywx8q1UgV9l-l3Mx-shbHg,34668
+algokit_utils/deploy.py,sha256=AQz7FTeIpprI83jT470bSgAkqObZc1UgqWxWkEbJjEk,35216
 algokit_utils/dispenser_api.py,sha256=BpwEhKDig6qz54wbO-htG8hmLxFIrvdzXpESUb7Y1zw,5584
-algokit_utils/logic_error.py,sha256=YeE70qHZ6WBeoKCXqnto3uBg8R4ODXiNZkLmfEmASQo,2617
-algokit_utils/models.py,sha256=GWpZQ2bTGfkldM12VZntGlVJTFBTtWf5SM7ZYXC_LHE,8238
+algokit_utils/logic_error.py,sha256=I9fJJ09zfpPlKgcJJ7fqC77BBPTz37QsSlGfZwXDdPQ,2684
+algokit_utils/models.py,sha256=KMpSUv7XGjZ9_50U6qUjcPjGh9_7lsRj3ZlO9Fb2zyE,8421
 algokit_utils/network_clients.py,sha256=TlGRZ4l62_vi__AKg9zyVGiAawTrA0ca6AfPDzRL44E,5136
 algokit_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-algokit_utils-2.3.1b2.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
-algokit_utils-2.3.1b2.dist-info/METADATA,sha256=bYg4HprMBpFc42M-oQ4KI76buhb_K5sXdkTtX02_ot4,2207
-algokit_utils-2.3.1b2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-algokit_utils-2.3.1b2.dist-info/RECORD,,
+algokit_utils-2.3.2b1.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
+algokit_utils-2.3.2b1.dist-info/METADATA,sha256=FPpHJR9cdNhQ-uJt7kTdkox0MXNugTis61YYusNH8IQ,2258
+algokit_utils-2.3.2b1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+algokit_utils-2.3.2b1.dist-info/RECORD,,

{algokit_utils-2.3.1b2.dist-info → algokit_utils-2.3.2b1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any