algokit-utils 4.2.1b1__py3-none-any.whl → 4.2.2__py3-none-any.whl

algokit_utils/errors/logic_error.py

@@ -20,7 +20,7 @@ __all__ = [
 
 
 LOGIC_ERROR = (
-    ".*transaction (?P<transaction_id>[A-Z0-9]+): logic eval error: (?P<message>.*). Details: .*pc=(?P<pc>[0-9]+).*"
+    ".*transaction (?P<transaction_id>[A-Z0-9]+): (logic eval error: )?(?P<message>.*). Details: .*pc=(?P<pc>[0-9]+).*"
 )
 
 

algokit_utils/transactions/transaction_composer.py

@@ -21,7 +21,7 @@ from algosdk.atomic_transaction_composer import (
 from algosdk.transaction import OnComplete, SuggestedParams
 from algosdk.v2client.algod import AlgodClient
 from algosdk.v2client.models.simulate_request import SimulateRequest
-from typing_extensions import deprecated
+from typing_extensions import Never, deprecated
 
 from algokit_utils.applications.abi import ABIReturn, ABIValue
 from algokit_utils.applications.app_manager import AppManager
@@ -667,7 +667,7 @@ def _encode_lease(lease: str | bytes | None) -> bytes | None:
         raise TypeError(f"Unknown lease type received of {type(lease)}")
 
 
-def _get_group_execution_info(  # noqa: C901, PLR0912
+def _get_group_execution_info(
     atc: AtomicTransactionComposer,
     algod: AlgodClient,
     populate_app_call_resources: bool | None = None,
@@ -682,6 +682,7 @@ def _get_group_execution_info(  # noqa: C901, PLR0912
         txn_groups=[],
         allow_unnamed_resources=True,
         allow_empty_signatures=True,
+        exec_trace_config=algosdk.v2client.models.SimulateTraceConfig(enable=True),
     )
 
     # Clone ATC with null signers
@@ -710,26 +711,14 @@ def _get_group_execution_info(  # noqa: C901, PLR0912
             f"Required for transactions: {', '.join(str(i) for i in app_call_indexes_without_max_fees)}"
         )
 
-    # Get fee parameters
-    per_byte_txn_fee = suggested_params.fee if suggested_params else 0
-    min_txn_fee = int(suggested_params.min_fee) if suggested_params else 1000  # type: ignore[unused-ignore]
-
     # Simulate transactions
     result = empty_signer_atc.simulate(algod, simulate_request)
 
     group_response = result.simulate_response["txn-groups"][0]
 
     if group_response.get("failure-message"):
-        msg = group_response["failure-message"]
-        if cover_app_call_inner_transaction_fees and "fee too small" in msg:
-            raise ValueError(
-                "Fees were too small to resolve execution info via simulate. "
-                "You may need to increase an app call transaction maxFee."
-            )
-        failed_at = group_response.get("failed-at", [0])[0]
-        raise ValueError(
-            f"Error resolving execution info via simulate in transaction {failed_at}: "
-            f"{group_response['failure-message']}"
+        _handle_simulation_error(
+            group_response, cover_app_call_inner_transaction_fees=cover_app_call_inner_transaction_fees
         )
 
     # Build execution info
@@ -743,27 +732,12 @@ def _get_group_execution_info(  # noqa: C901, PLR0912
 
         required_fee_delta = 0
         if cover_app_call_inner_transaction_fees:
-            # Calculate parent transaction fee
-            parent_per_byte_fee = per_byte_txn_fee * (original_txn.estimate_size() + 75)
-            parent_min_fee = max(parent_per_byte_fee, min_txn_fee)
-            parent_fee_delta = parent_min_fee - original_txn.fee
-
-            if isinstance(original_txn, algosdk.transaction.ApplicationCallTxn):
-                # Calculate inner transaction fees recursively
-                def calculate_inner_fee_delta(inner_txns: list[dict], acc: int = 0) -> int:
-                    for inner_txn in reversed(inner_txns):
-                        current_fee_delta = (
-                            calculate_inner_fee_delta(inner_txn["inner-txns"], acc)
-                            if inner_txn.get("inner-txns")
-                            else acc
-                        ) + (min_txn_fee - inner_txn["txn"]["txn"].get("fee", 0))
-                        acc = max(0, current_fee_delta)
-                    return acc
-
-                inner_fee_delta = calculate_inner_fee_delta(txn_result.get("inner-txns", []))
-                required_fee_delta = inner_fee_delta + parent_fee_delta
-            else:
-                required_fee_delta = parent_fee_delta
+            required_fee_delta = _calculate_required_fee_delta(
+                original_txn,
+                txn_result,
+                per_byte_txn_fee=suggested_params.fee if suggested_params else 0,
+                min_txn_fee=int(suggested_params.min_fee) if suggested_params else 1000,
+            )
 
         txn_results.append(
             ExecutionInfoTxn(
@@ -782,6 +756,64 @@ def _get_group_execution_info(  # noqa: C901, PLR0912
     )
 
 
+def _handle_simulation_error(
+    group_response: dict[str, Any], *, cover_app_call_inner_transaction_fees: bool | None
+) -> Never:
+    msg = group_response["failure-message"]
+    if cover_app_call_inner_transaction_fees and "fee too small" in msg:
+        raise ValueError(
+            "Fees were too small to resolve execution info via simulate. "
+            "You may need to increase an app call transaction maxFee."
+        )
+    failed_at = group_response.get("failed-at", [0])[0]
+    details = ""
+    if "logic eval error" not in msg:
+        # extract last pc from trace so we can format an error that can be parsed into a LogicError
+        try:
+            trace = group_response["txn-results"][failed_at]["exec-trace"]
+        except (KeyError, IndexError):
+            pass
+        else:
+            try:
+                program_trace = trace["approval-program-trace"]
+            except KeyError:
+                program_trace = trace["clear-program-trace"]
+            pc = program_trace[-1]["pc"]
+            details = f". Details: pc={pc}"
+    raise ValueError(
+        f"Error resolving execution info via simulate in transaction {failed_at}: "
+        f"{group_response['failure-message']}{details}"
+    )
+
+
+def _calculate_required_fee_delta(
+    txn: transaction.Transaction, txn_result: dict[str, Any], *, per_byte_txn_fee: int, min_txn_fee: int
+) -> int:
+    # Calculate parent transaction fee
+    original_txn_size = txn.estimate_size()
+    assert isinstance(original_txn_size, int), "expected txn size to be an int"
+    parent_per_byte_fee = per_byte_txn_fee * (original_txn_size + 75)
+    parent_min_fee = max(parent_per_byte_fee, min_txn_fee)
+    original_txn_fee = txn.fee
+    assert isinstance(original_txn_fee, int), "expected original txn fee to be an int"
+    parent_fee_delta = parent_min_fee - original_txn_fee
+
+    if isinstance(txn, algosdk.transaction.ApplicationCallTxn):
+        # Calculate inner transaction fees recursively
+        def calculate_inner_fee_delta(inner_txns: list[dict], acc: int = 0) -> int:
+            for inner_txn in reversed(inner_txns):
+                current_fee_delta = (
+                    calculate_inner_fee_delta(inner_txn["inner-txns"], acc) if inner_txn.get("inner-txns") else acc
+                ) + (min_txn_fee - inner_txn["txn"]["txn"].get("fee", 0))
+                acc = max(0, current_fee_delta)
+            return acc
+
+        inner_fee_delta = calculate_inner_fee_delta(txn_result.get("inner-txns", []))
+        return inner_fee_delta + parent_fee_delta
+    else:
+        return parent_fee_delta
+
+
 def _find_available_transaction_index(
     txns: list[TransactionWithSigner], reference_type: str, reference: str | dict[str, Any] | int
 ) -> int:
@@ -1041,13 +1073,15 @@ def prepare_group_for_sending(  # noqa: C901, PLR0912, PLR0915
             foreign_apps.append(app_id)
             app_txn.foreign_apps = foreign_apps
         elif ref_type == "box":
+            # ensure app_id is added before calling translate_box_reference
+            app_id = box_ref[0]
+            if app_id != 0:
+                foreign_apps = list(getattr(app_txn, "foreign_apps", []) or [])
+                foreign_apps.append(app_id)
+                app_txn.foreign_apps = foreign_apps
             boxes = list(getattr(app_txn, "boxes", []) or [])
             boxes.append(BoxReference.translate_box_reference(box_ref, app_txn.foreign_apps or [], app_txn.index))  # type: ignore[arg-type]
             app_txn.boxes = boxes
-            if box_ref[0] != 0:
-                foreign_apps = list(getattr(app_txn, "foreign_apps", []) or [])
-                foreign_apps.append(box_ref[0])
-                app_txn.foreign_apps = foreign_apps
         elif ref_type == "asset":
             asset_id = int(cast(str | int, reference))
             foreign_assets = list(getattr(app_txn, "foreign_assets", []) or [])
@@ -1812,7 +1846,7 @@ class TransactionComposer:
             txn_with_signers: list[TransactionWithSignerAndContext] = []
 
             for txn in self._txns:
-                txn_with_signers.extend(self._build_txn(txn, suggested_params))
+                txn_with_signers.extend(self._build_txn(txn, suggested_params, include_signer=True))
 
             for ts in txn_with_signers:
                 self._atc.add_transaction(ts)
@@ -1852,9 +1886,9 @@ class TransactionComposer:
             txn_with_signers: list[TransactionWithSigner] = []
 
             if isinstance(txn, MethodCallParams):
-                txn_with_signers.extend(self._build_method_call(txn, suggested_params))
+                txn_with_signers.extend(self._build_method_call(txn, suggested_params, include_signer=False))
             else:
-                txn_with_signers.extend(self._build_txn(txn, suggested_params))
+                txn_with_signers.extend(self._build_txn(txn, suggested_params, include_signer=False))
 
             for ts in txn_with_signers:
                 transactions.append(ts.txn)
@@ -2129,7 +2163,11 @@ class TransactionComposer:
         )
 
     def _build_method_call(  # noqa: C901, PLR0912, PLR0915
-        self, params: MethodCallParams, suggested_params: algosdk.transaction.SuggestedParams
+        self,
+        params: MethodCallParams,
+        suggested_params: algosdk.transaction.SuggestedParams,
+        *,
+        include_signer: bool,
     ) -> list[TransactionWithSignerAndContext]:
         method_args: list[ABIValue | TransactionWithSigner] = []
         txns_for_group: list[TransactionWithSignerAndContext] = []
@@ -2159,7 +2197,9 @@ class TransactionComposer:
                     method_args.append(
                         TransactionWithSignerAndContext(
                             txn=arg,
-                            signer=signer if signer is not None else self._get_signer(params.sender),
+                            signer=signer
+                            if signer is not None
+                            else (NULL_SIGNER if not include_signer else self._get_signer(params.sender)),
                             context=TransactionContext(abi_method=None),
                         )
                     )
@@ -2171,7 +2211,9 @@ class TransactionComposer:
                         | AppUpdateMethodCallParams()
                         | AppDeleteMethodCallParams()
                     ):
-                        temp_txn_with_signers = self._build_method_call(arg, suggested_params)
+                        temp_txn_with_signers = self._build_method_call(
+                            arg, suggested_params, include_signer=include_signer
+                        )
                         # Add all transactions except the last one in reverse order
                         txns_for_group.extend(temp_txn_with_signers[:-1])
                         # Add the last transaction to method_args
@@ -2208,7 +2250,7 @@ class TransactionComposer:
                 method_args.append(
                     TransactionWithSignerAndContext(
                         txn=txn.txn,
-                        signer=signer or self._get_signer(params.sender),
+                        signer=signer or (NULL_SIGNER if not include_signer else self._get_signer(params.sender)),
                         context=TransactionContext(abi_method=params.method),
                     )
                 )
@@ -2255,7 +2297,8 @@ class TransactionComposer:
             "sp": suggested_params,
             "signer": params.signer
             if params.signer is not None
-            else self._get_signer(params.sender) or algosdk.atomic_transaction_composer.EmptySigner(),
+            else (NULL_SIGNER if not include_signer else self._get_signer(params.sender))
+            or algosdk.atomic_transaction_composer.EmptySigner(),
             "method_args": list(reversed(method_args)),
             "on_complete": params.on_complete or algosdk.transaction.OnComplete.NoOpOC,
             "boxes": [AppManager.get_box_reference(ref) for ref in params.box_references]
@@ -2496,6 +2539,8 @@ class TransactionComposer:
         self,
         txn: TransactionWithSigner | TxnParams | AtomicTransactionComposer,
         suggested_params: algosdk.transaction.SuggestedParams,
+        *,
+        include_signer: bool,
     ) -> list[TransactionWithSignerAndContext]:
         match txn:
             case TransactionWithSigner():
@@ -2505,7 +2550,7 @@ class TransactionComposer:
             case AtomicTransactionComposer():
                 return self._build_atc(txn)
             case algosdk.transaction.Transaction():
-                signer = self._get_signer(txn.sender)
+                signer = NULL_SIGNER if not include_signer else self._get_signer(txn.sender)
                 return [TransactionWithSignerAndContext(txn=txn, signer=signer, context=TransactionContext.empty())]
             case (
                 AppCreateMethodCallParams()
@@ -2513,10 +2558,10 @@ class TransactionComposer:
                 | AppUpdateMethodCallParams()
                 | AppDeleteMethodCallParams()
             ):
-                return self._build_method_call(txn, suggested_params)
+                return self._build_method_call(txn, suggested_params, include_signer=include_signer)
 
         signer = txn.signer.signer if isinstance(txn.signer, TransactionSignerAccountProtocol) else txn.signer  # type: ignore[assignment]
-        signer = signer or self._get_signer(txn.sender)
+        signer = signer or (NULL_SIGNER if not include_signer else self._get_signer(txn.sender))
 
         match txn:
             case PaymentParams():

{algokit_utils-4.2.1b1.dist-info → algokit_utils-4.2.2.dist-info}/METADATA

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: algokit-utils
-Version: 4.2.1b1
+Version: 4.2.2
 Summary: Utilities for Algorand development for use by AlgoKit
 License: MIT
+License-File: LICENSE
 Author: Algorand Foundation
 Author-email: contact@algorand.foundation
 Requires-Python: >=3.10,<4.0
@@ -12,8 +13,9 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: httpx (>=0.23.1,<=0.28.1)
-Requires-Dist: py-algorand-sdk (>=2.4.0,<3.0.0)
+Requires-Dist: py-algorand-sdk (>=2.11.0,<3.0.0)
 Requires-Dist: typing-extensions (>=4.6.0)
 Description-Content-Type: text/markdown
 

{algokit_utils-4.2.1b1.dist-info → algokit_utils-4.2.2.dist-info}/RECORD

@@ -45,7 +45,7 @@ algokit_utils/config.py,sha256=CvDH5B8uPWnm6wCHHlMsl-0lONzq26vPLvwmnbw7c-k,6048
 algokit_utils/deploy.py,sha256=UUtSDI6JcBUuto62FuirhUlDcjZwQyLkiERgDMx8P7A,330
 algokit_utils/dispenser_api.py,sha256=-EO4Dq3q_v4kSMey43kXJfoX8uCBPJpjEMTlLI7xn_I,324
 algokit_utils/errors/__init__.py,sha256=CmuiLVjzMAOYxPaIIwmYCNArsso_RtS2ssFoNdp5CMs,61
-algokit_utils/errors/logic_error.py,sha256=uxqUOU9-D1R5TrKturCbmmWRVlB024Ca4CfVi8x_sgo,4104
+algokit_utils/errors/logic_error.py,sha256=ksRsYjo7a3_8scf9UhByoQ4x3BJ7WpVYRQoiEScV3pM,4107
 algokit_utils/logic_error.py,sha256=3duw-l6tBr-DeapO0e0tYHoa9rOxP-QZZ6QWmN8L9tc,305
 algokit_utils/models/__init__.py,sha256=0aB_c5pnkqKl1Z0hkxM9qbKn2qVdizZE2DvziN9ObqM,465
 algokit_utils/models/account.py,sha256=eqGJvExzd7gDm3--DBDaIq6pJarxMPHZ-UySxZ9Qznk,6778
@@ -61,10 +61,10 @@ algokit_utils/protocols/account.py,sha256=CowaVY7ErBP84TWBHNvBjkZy18whPb8HIlMZtJ
 algokit_utils/protocols/typed_clients.py,sha256=UrQrHbN2SvS8pEFJ8JQodvouoWeBrQOQGZGyBQx1KLM,3322
 algokit_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 algokit_utils/transactions/__init__.py,sha256=7fYF3m6DyOGzbV36MT5svo0wSkj9AIz496kWgIWSAlk,225
-algokit_utils/transactions/transaction_composer.py,sha256=iOIa_9hknbpCQc2hRyX-aBoHG-NGRxGnEAJstwGVKgw,106645
+algokit_utils/transactions/transaction_composer.py,sha256=aDYo9SGjMr-cKUEwZUJx2Cyw85rZz77n_LVe2fGINH8,108435
 algokit_utils/transactions/transaction_creator.py,sha256=cuP6Xm-fhGoCc2FNSbLiEg3iQRwW38rfdTzsqPyEcpM,29053
 algokit_utils/transactions/transaction_sender.py,sha256=Wi3ws9S-Df1JeTlaSTXmq-WS24Gsq7WGsKk1B0z23ao,50117
-algokit_utils-4.2.1b1.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
-algokit_utils-4.2.1b1.dist-info/METADATA,sha256=pP2yk78rbXNtBjxqXtSi85z9EpJsDQZ7C9LYH9Efp3E,2421
-algokit_utils-4.2.1b1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-algokit_utils-4.2.1b1.dist-info/RECORD,,
+algokit_utils-4.2.2.dist-info/METADATA,sha256=CK6pN2Zc0QUkk3FAvEhptDopTjCL-YzWmXnkCvhpcd4,2493
+algokit_utils-4.2.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+algokit_utils-4.2.2.dist-info/licenses/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
+algokit_utils-4.2.2.dist-info/RECORD,,

{algokit_utils-4.2.1b1.dist-info → algokit_utils-4.2.2.dist-info}/WHEEL

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