algokit-utils 3.0.0b7__py3-none-any.whl → 3.0.0b9__py3-none-any.whl

algokit_utils/accounts/account_manager.py

@@ -7,7 +7,6 @@ import algosdk
 from algosdk import mnemonic
 from algosdk.atomic_transaction_composer import TransactionSigner
 from algosdk.mnemonic import to_private_key
-from algosdk.transaction import LogicSigAccount as AlgosdkLogicSigAccount
 from algosdk.transaction import SuggestedParams
 from typing_extensions import Self
 
@@ -313,7 +312,7 @@ class AccountManager:
         :param args: The (binary) arguments to pass into the logic signature
         :returns: The registered AlgosdkLogicSigAccount instance
         """
-        logic_sig = LogicSigAccount(AlgosdkLogicSigAccount(program, args))
+        logic_sig = LogicSigAccount(program, args)
         self._accounts[logic_sig.address] = logic_sig
         return logic_sig
 

algokit_utils/applications/app_client.py

@@ -1900,6 +1900,11 @@ class AppClient:
         method = self._app_spec.get_arc56_method(method_name_or_signature)
         result: list[ABIValue | ABIStruct | AppMethodCallTransactionArgument | None] = []
 
+        if args and len(method.args) < len(args):
+            raise ValueError(
+                f"Unexpected arg at position {len(method.args)}. {method.name} only expects {len(method.args)} args"
+            )
+
         for i, method_arg in enumerate(method.args):
             arg_value = args[i] if args and i < len(args) else None
 

algokit_utils/models/account.py

@@ -9,6 +9,7 @@ from typing_extensions import deprecated
 
 __all__ = [
     "DISPENSER_ACCOUNT_NAME",
+    "LogicSigAccount",
     "MultiSigAccount",
     "MultisigMetadata",
     "SigningAccount",
@@ -118,6 +119,14 @@ class MultiSigAccount:
             [account.private_key for account in signing_accounts],
         )
 
+    @property
+    def multisig(self) -> Multisig:
+        """Get the underlying `algosdk.transaction.Multisig` object instance.
+
+        :return: The `algosdk.transaction.Multisig` object instance
+        """
+        return self._multisig
+
     @property
     def params(self) -> MultisigMetadata:
         """Get the parameters for the multisig account.
@@ -173,20 +182,31 @@ class LogicSigAccount:
     Provides functionality to manage and sign transactions for a logic sig account.
     """
 
-    _account: AlgosdkLogicSigAccount
     _signer: LogicSigTransactionSigner
 
-    def __init__(self, account: AlgosdkLogicSigAccount) -> None:
-        self._account = account
-        self._signer = LogicSigTransactionSigner(account)
+    def __init__(self, program: bytes, args: list[bytes] | None) -> None:
+        self._signer = LogicSigTransactionSigner(AlgosdkLogicSigAccount(program, args))
+
+    @property
+    def lsig(self) -> AlgosdkLogicSigAccount:
+        """Get the underlying `algosdk.transaction.LogicSigAccount` object instance.
+
+        :return: The `algosdk.transaction.LogicSigAccount` object instance
+        """
+        return self._signer.lsig
 
     @property
     def address(self) -> str:
-        """Get the address of the multisig account.
+        """Get the address of the logic sig account.
 
-        :return: The multisig account address
+        If the LogicSig is delegated to another account, this will return the address of that account.
+
+        If the LogicSig is not delegated to another account, this will return an escrow address that is the hash of
+        the LogicSig's program code.
+
+        :return: The logic sig account address
         """
-        return self._account.address()
+        return self._signer.lsig.address()
 
     @property
     def signer(self) -> LogicSigTransactionSigner:

algokit_utils/transactions/transaction_composer.py

@@ -591,9 +591,27 @@ class SendAtomicTransactionComposerResults:
     simulate_response: dict[str, Any] | None = None
 
 
+class UnnamedResourcesAccessed:
+    """Information about unnamed resource access."""
+
+    def __init__(self, resources_accessed: dict[str, Any] | None = None):
+        resources = resources_accessed or {}
+
+        if not isinstance(resources, dict):
+            raise TypeError(f"Expected dictionary object, got {type(resources_accessed)}")
+
+        self.accounts: list[str] | None = resources.get("accounts", None)
+        self.app_locals: list[dict[str, Any]] | None = resources.get("app-locals", None)
+        self.apps: list[int] | None = resources.get("apps", None)
+        self.asset_holdings: list[dict[str, Any]] | None = resources.get("asset-holdings", None)
+        self.assets: list[int] | None = resources.get("assets", None)
+        self.boxes: list[dict[str, Any]] | None = resources.get("boxes", None)
+        self.extra_box_refs: int | None = resources.get("extra-box-refs", None)
+
+
 @dataclass
 class ExecutionInfoTxn:
-    unnamed_resources_accessed: dict | None = None
+    unnamed_resources_accessed: UnnamedResourcesAccessed | None = None
     required_fee_delta: int = 0
 
 
@@ -601,7 +619,7 @@ class ExecutionInfoTxn:
 class ExecutionInfo:
     """Information about transaction execution from simulation."""
 
-    group_unnamed_resources_accessed: dict[str, Any] | None = None
+    group_unnamed_resources_accessed: UnnamedResourcesAccessed | None = None
     txns: list[ExecutionInfoTxn] | None = None
 
 
@@ -706,7 +724,7 @@ def _get_group_execution_info(  # noqa: C901, PLR0912
             )
         failed_at = group_response.get("failed-at", [0])[0]
         raise ValueError(
-            f"Error during resource population simulation in transaction {failed_at}: "
+            f"Error resolving execution info via simulate in transaction {failed_at}: "
             f"{group_response['failure-message']}"
         )
 
@@ -745,7 +763,7 @@ def _get_group_execution_info(  # noqa: C901, PLR0912
 
         txn_results.append(
             ExecutionInfoTxn(
-                unnamed_resources_accessed=txn_result_raw.get("unnamed-resources-accessed")
+                unnamed_resources_accessed=UnnamedResourcesAccessed(txn_result_raw.get("unnamed-resources-accessed"))
                 if populate_app_call_resources
                 else None,
                 required_fee_delta=required_fee_delta,
@@ -753,7 +771,7 @@ def _get_group_execution_info(  # noqa: C901, PLR0912
         )
 
     return ExecutionInfo(
-        group_unnamed_resources_accessed=group_response.get("unnamed-resources-accessed")
+        group_unnamed_resources_accessed=UnnamedResourcesAccessed(group_response.get("unnamed-resources-accessed"))
         if populate_app_call_resources
         else None,
         txns=txn_results,
@@ -1052,11 +1070,11 @@ def prepare_group_for_sending(  # noqa: C901, PLR0912, PLR0915
         resources = txn_info.unnamed_resources_accessed
         if resources and is_app_txn:
             app_txn = group[i].txn
-            if resources.get("boxes") or resources.get("extra-box-refs"):
+            if resources.boxes or resources.extra_box_refs:
                 raise ValueError("Unexpected boxes at transaction level")
-            if resources.get("appLocals"):
+            if resources.app_locals:
                 raise ValueError("Unexpected app local at transaction level")
-            if resources.get("assetHoldings"):
+            if resources.asset_holdings:
                 raise ValueError("Unexpected asset holding at transaction level")
 
             # Update application call fields
@@ -1066,10 +1084,10 @@ def prepare_group_for_sending(  # noqa: C901, PLR0912, PLR0915
             boxes = list(getattr(app_txn, "boxes", []) or [])
 
             # Add new resources
-            accounts.extend(resources.get("accounts", []))
-            foreign_apps.extend(resources.get("apps", []))
-            foreign_assets.extend(resources.get("assets", []))
-            boxes.extend(resources.get("boxes", []))
+            accounts.extend(resources.accounts or [])
+            foreign_apps.extend(resources.apps or [])
+            foreign_assets.extend(resources.assets or [])
+            boxes.extend(resources.boxes or [])
 
             # Validate limits
             if len(accounts) > MAX_APP_CALL_ACCOUNT_REFERENCES:
@@ -1113,45 +1131,41 @@ def prepare_group_for_sending(  # noqa: C901, PLR0912, PLR0915
     group_resources = execution_info.group_unnamed_resources_accessed
     if group_resources:
         # Handle cross-reference resources first
-        for app_local in group_resources.get("appLocals", []):
+        for app_local in group_resources.app_locals or []:
             populate_group_resource(group, app_local, "appLocal")
             # Remove processed resources
-            if "accounts" in group_resources:
-                group_resources["accounts"] = [
-                    acc for acc in group_resources["accounts"] if acc != app_local["account"]
-                ]
-            if "apps" in group_resources:
-                group_resources["apps"] = [app for app in group_resources["apps"] if int(app) != int(app_local["app"])]
+            if group_resources.accounts:
+                group_resources.accounts = [acc for acc in group_resources.accounts if acc != app_local["account"]]
+            if group_resources.apps:
+                group_resources.apps = [app for app in group_resources.apps if int(app) != int(app_local["app"])]
 
-        for asset_holding in group_resources.get("assetHoldings", []):
+        for asset_holding in group_resources.asset_holdings or []:
             populate_group_resource(group, asset_holding, "assetHolding")
             # Remove processed resources
-            if "accounts" in group_resources:
-                group_resources["accounts"] = [
-                    acc for acc in group_resources["accounts"] if acc != asset_holding["account"]
-                ]
-            if "assets" in group_resources:
-                group_resources["assets"] = [
-                    asset for asset in group_resources["assets"] if int(asset) != int(asset_holding["asset"])
+            if group_resources.accounts:
+                group_resources.accounts = [acc for acc in group_resources.accounts if acc != asset_holding["account"]]
+            if group_resources.assets:
+                group_resources.assets = [
+                    asset for asset in group_resources.assets if int(asset) != int(asset_holding["asset"])
                 ]
 
         # Handle remaining resources
-        for account in group_resources.get("accounts", []):
+        for account in group_resources.accounts or []:
             populate_group_resource(group, account, "account")
 
-        for box in group_resources.get("boxes", []):
+        for box in group_resources.boxes or []:
             populate_group_resource(group, box, "box")
-            if "apps" in group_resources:
-                group_resources["apps"] = [app for app in group_resources["apps"] if int(app) != int(box["app"])]
+            if group_resources.apps:
+                group_resources.apps = [app for app in group_resources.apps if int(app) != int(box["app"])]
 
-        for asset in group_resources.get("assets", []):
+        for asset in group_resources.assets or []:
             populate_group_resource(group, asset, "asset")
 
-        for app in group_resources.get("apps", []):
+        for app in group_resources.apps or []:
             populate_group_resource(group, app, "app")
 
         # Handle extra box references
-        extra_box_refs = group_resources.get("extra-box-refs", 0)
+        extra_box_refs = group_resources.extra_box_refs or 0
         for _ in range(extra_box_refs):
             populate_group_resource(group, {"app": 0, "name": ""}, "box")
 
@@ -2111,18 +2125,24 @@ class TransactionComposer:
             if not sdk_params["approval_program"] or not sdk_params["clear_program"]:
                 raise ValueError("approval_program and clear_program are required for application creation")
 
-            if not params.schema:
-                raise ValueError("schema is required for application creation")
+            schema = params.schema
+            if not schema:
+                schema = AppCreateSchema(
+                    global_ints=0,
+                    global_byte_slices=0,
+                    local_ints=0,
+                    local_byte_slices=0,
+                )
 
             txn_params = {
                 **txn_params,
                 "global_schema": algosdk.transaction.StateSchema(
-                    num_uints=params.schema.get("global_ints", 0),
-                    num_byte_slices=params.schema.get("global_byte_slices", 0),
+                    num_uints=schema["global_ints"],
+                    num_byte_slices=schema["global_byte_slices"],
                 ),
                 "local_schema": algosdk.transaction.StateSchema(
-                    num_uints=params.schema.get("local_ints", 0),
-                    num_byte_slices=params.schema.get("local_byte_slices", 0),
+                    num_uints=schema["local_ints"],
+                    num_byte_slices=schema["local_byte_slices"],
                 ),
                 "extra_pages": params.extra_program_pages
                 or calculate_extra_program_pages(approval_program, clear_program),

{algokit_utils-3.0.0b7.dist-info → algokit_utils-3.0.0b9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: algokit-utils
-Version: 3.0.0b7
+Version: 3.0.0b9
 Summary: Utilities for Algorand development for use by AlgoKit
 License: MIT
 Author: Algorand Foundation

{algokit_utils-3.0.0b7.dist-info → algokit_utils-3.0.0b9.dist-info}/RECORD

@@ -14,14 +14,14 @@ algokit_utils/_legacy_v2/models.py,sha256=hH7aO50E4po4EgxXI9zdX5HTthn1HLfSLvkuPf
 algokit_utils/_legacy_v2/network_clients.py,sha256=5nqC-47hreWvMxR-PQWs_QP44wJDAGhtS1MQv8JQ82o,5660
 algokit_utils/account.py,sha256=gyGrBSoafUh8WV677IzYGkYoxtzzElsgxGMp4SgA4pk,410
 algokit_utils/accounts/__init__.py,sha256=_LyY0se6TaQOes7vAcmbpt6pmG4VKlzfTt37-IjwimA,138
-algokit_utils/accounts/account_manager.py,sha256=zr8NV6k9L8xESzsmbFK06T-DOmVEvHWcoHgIIX5SDcQ,39763
+algokit_utils/accounts/account_manager.py,sha256=-yjs3ep_FpPHS8wHRmaYCnZdq_aSK6iAYuahxr0uPHY,39665
 algokit_utils/accounts/kmd_account_manager.py,sha256=0flsU5T11JciyL0YvOKDHPVSm-ghV0RjJAbtm8JwrhU,6476
 algokit_utils/algorand.py,sha256=Gtx3vspZmSxUrNWmh09NFQB24G4v4CEogYuRX_9o5Xw,10554
 algokit_utils/application_client.py,sha256=5UIxXIBjukjRyjZPCeXmaNlAftbb3TziV7EfBolW79k,337
 algokit_utils/application_specification.py,sha256=-ZM13Qv-AcLmwudJCq8xGPoWLvAvKBICgAdHeFozKbY,1416
 algokit_utils/applications/__init__.py,sha256=NGjhpBeExsQZOAYCT2QUFag1xuKoFiX-Ux5SR2GNzd8,452
 algokit_utils/applications/abi.py,sha256=IhrEUdg2kDzR4iU5_FzUDjlMIHO7Rfe-ibJ6z9CMUq8,10260
-algokit_utils/applications/app_client.py,sha256=oAwe9_6-ETWJIdXNScDvUiVYN8JNP4kplSnr3qCQPVY,84979
+algokit_utils/applications/app_client.py,sha256=TGMngl7BNLvMlMt3lsREEQrI0C1-jl4IhYqVNr2oG7g,85191
 algokit_utils/applications/app_deployer.py,sha256=MD7RIvh6Z6dFr9sx8dP5nP1DzSEbwz-vX-Exz_CwoN4,24740
 algokit_utils/applications/app_factory.py,sha256=wljyXuXWaMc3KJkDeACJ5XVEfIsVxeSXqdGTJ9p3tJQ,33425
 algokit_utils/applications/app_manager.py,sha256=EA1uRtmvPVAdKi1I5HSCpHjIDgLN7eZcEPT0Cj3C7fU,17661
@@ -48,7 +48,7 @@ algokit_utils/errors/__init__.py,sha256=CmuiLVjzMAOYxPaIIwmYCNArsso_RtS2ssFoNdp5
 algokit_utils/errors/logic_error.py,sha256=uxqUOU9-D1R5TrKturCbmmWRVlB024Ca4CfVi8x_sgo,4104
 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=TdeKjhYkppD8g0DYRGbnCsi8zfPz3zU74DaZte_CYJw,6014
+algokit_utils/models/account.py,sha256=eqGJvExzd7gDm3--DBDaIq6pJarxMPHZ-UySxZ9Qznk,6778
 algokit_utils/models/amount.py,sha256=PcjzqRY5ThcUuSYHk1yeYgUooos1j2-54hBIJJcipd4,7567
 algokit_utils/models/application.py,sha256=lM2_g5kZ18k_zyVzcbGvkvqHzksfb2sgRqowJ3pvUgo,1288
 algokit_utils/models/network.py,sha256=3QNcZ9jVmckv3CCxrD2Y1jiwBdBGdaaziiRgOpsqhwI,904
@@ -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=QA5j3l-UhnaCoohN9Pri8t_bPJrOrZh3ogYQf4FwDm0,95183
+algokit_utils/transactions/transaction_composer.py,sha256=S9GrGDCTg0JJa4HbcTVbGAsV_qAHW2xWNiT9olo6_tk,96058
 algokit_utils/transactions/transaction_creator.py,sha256=A1YHeGC2EkR2V0HPYJiXVOAEIrfjBW2KVyYgi3exm4E,6167
 algokit_utils/transactions/transaction_sender.py,sha256=uQmHElJgUIxLXfdklMNoabjQQzUku8CFP82wwhfr44E,22769
-algokit_utils-3.0.0b7.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
-algokit_utils-3.0.0b7.dist-info/METADATA,sha256=3dnyhhb2GQYO2_jC_wNVrmbHWoCQBIk2wxyEb5F34r0,2420
-algokit_utils-3.0.0b7.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-algokit_utils-3.0.0b7.dist-info/RECORD,,
+algokit_utils-3.0.0b9.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
+algokit_utils-3.0.0b9.dist-info/METADATA,sha256=98lFs0a_MbLQwVSjyx-jrxYeIU_Juzr_B7ZxhdhhnsM,2420
+algokit_utils-3.0.0b9.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+algokit_utils-3.0.0b9.dist-info/RECORD,,