algokit-utils 2.2.2b4__py3-none-any.whl → 2.2.2b5__py3-none-any.whl

algokit_utils/application_client.py

@@ -1,5 +1,6 @@
 import base64
 import copy
+import dataclasses
 import json
 import logging
 import re
@@ -58,7 +59,6 @@ if typing.TYPE_CHECKING:
     from algosdk.v2client.algod import AlgodClient
     from algosdk.v2client.indexer import IndexerClient
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -375,7 +375,7 @@ class ApplicationClient:
     ) -> None:
         """Adds a signed transaction with application id == 0 and the schema and source of client's app_spec to atc"""
         approval_program, clear_program = self._check_is_compiled()
-        transaction_parameters = _convert_transaction_parameters(transaction_parameters)
+        transaction_parameters = _convert_transaction_parameters(CreateCallParameters, transaction_parameters)
 
         extra_pages = transaction_parameters.extra_pages or num_extra_program_pages(
             approval_program.raw_binary, clear_program.raw_binary
@@ -388,7 +388,7 @@ class ApplicationClient:
             abi_args=abi_kwargs,
             on_complete=transaction_parameters.on_complete or transaction.OnComplete.NoOpOC,
             call_config=au_spec.CallConfig.CREATE,
-            parameters=transaction_parameters,
+            parameters=_convert_transaction_parameters(TransactionParameters, transaction_parameters),
             approval_program=approval_program.raw_binary,
             clear_program=clear_program.raw_binary,
             global_schema=self.app_spec.global_state_schema,
@@ -567,12 +567,12 @@ class ApplicationClient:
         **abi_kwargs: ABIArgType,
     ) -> None:
         """Adds a signed transaction with specified parameters to atc"""
-        _parameters = _convert_transaction_parameters(transaction_parameters)
+        _parameters = _convert_transaction_parameters(OnCompleteCallParameters, transaction_parameters)
         self.add_method_call(
             atc,
             abi_method=call_abi_method,
             abi_args=abi_kwargs,
-            parameters=_parameters,
+            parameters=_convert_transaction_parameters(TransactionParameters, transaction_parameters),
             on_complete=_parameters.on_complete or transaction.OnComplete.NoOpOC,
         )
 
@@ -607,7 +607,7 @@ class ApplicationClient:
     ) -> TransactionResponse | ABITransactionResponse:
         """Submits a signed transaction with specified parameters"""
         atc = AtomicTransactionComposer()
-        _parameters = _convert_transaction_parameters(transaction_parameters)
+        _parameters = _convert_transaction_parameters(OnCompleteCallParameters, transaction_parameters)
         self.compose_call(
             atc,
             call_abi_method=call_abi_method,
@@ -1003,7 +1003,7 @@ class ApplicationClient:
         if app_id is None:
             self._load_reference_and_check_app_id()
             app_id = self.app_id
-        parameters = _convert_transaction_parameters(parameters)
+        parameters = _convert_transaction_parameters(TransactionParameters, parameters)
         method = self._resolve_method(abi_method, abi_args, on_complete, call_config)
         sp = parameters.suggested_params or self.suggested_params or self.algod_client.suggested_params()
         signer, sender = self.resolve_signer_sender(parameters.signer, parameters.sender)
@@ -1317,11 +1317,18 @@ def _create_simulate_traces(simulate: SimulateAtomicTransactionResponse) -> list
     return traces
 
 
+_TParams = typing.TypeVar("_TParams", TransactionParameters, OnCompleteCallParameters, CreateCallParameters)
+
+
 def _convert_transaction_parameters(
-    args: TransactionParameters | TransactionParametersDict | None,
-) -> CreateCallParameters:
-    _args = args.__dict__ if isinstance(args, TransactionParameters) else (args or {})
-    return CreateCallParameters(**_args)
+    cls: type[_TParams],
+    args: object | None,
+) -> _TParams:
+    if args is None:
+        return cls()
+    args_dict = args.__dict__ if not isinstance(args, dict) else (args or {})
+    _args = {f.name: args_dict[f.name] for f in dataclasses.fields(cls) if f.name in args_dict}
+    return cls(**_args)
 
 
 def get_sender_from_signer(signer: TransactionSigner | None) -> str | None:

algokit_utils/deploy.py

@@ -23,6 +23,7 @@ from algokit_utils.models import (
     ABIMethod,
     Account,
     CreateCallParameters,
+    TransactionParameters,
     TransactionResponse,
 )
 
@@ -724,7 +725,7 @@ class Deployer:
     def _create_app(self) -> DeployResponse:
         assert self.app_client.existing_deployments
 
-        method, abi_args, parameters = _convert_deploy_args(
+        method, abi_args, parameters = _convert_create_deploy_args(
             self.create_args, self.new_app_metadata, self.signer, self.sender
         )
         create_response = self.app_client.create(
@@ -751,7 +752,7 @@ class Deployer:
             f"{self.new_app_metadata.name} ({self.new_app_metadata.version}) in {self.creator} account."
         )
         atc = AtomicTransactionComposer()
-        create_method, create_abi_args, create_parameters = _convert_deploy_args(
+        create_method, create_abi_args, create_parameters = _convert_create_deploy_args(
             self.create_args, self.new_app_metadata, self.signer, self.sender
         )
         self.app_client.compose_create(
@@ -850,11 +851,10 @@ def _convert_deploy_args(
     note: AppDeployMetaData,
     signer: TransactionSigner | None,
     sender: str | None,
-) -> tuple[ABIMethod | bool | None, ABIArgsDict, CreateCallParameters]:
+) -> tuple[ABIMethod | bool | None, ABIArgsDict, TransactionParameters]:
     args = _args.__dict__ if isinstance(_args, DeployCallArgs) else (_args or {})
 
-    # return most derived type, unused parameters are ignored
-    parameters = CreateCallParameters(
+    parameters = TransactionParameters(
         note=note.encode(),
         signer=signer,
         sender=sender,
@@ -865,11 +865,25 @@ def _convert_deploy_args(
         foreign_apps=args.get("foreign_apps"),
         boxes=args.get("boxes"),
         rekey_to=args.get("rekey_to"),
+    )
+
+    return args.get("method"), args.get("args") or {}, parameters
+
+
+def _convert_create_deploy_args(
+    _args: DeployCallArgs | DeployCallArgsDict | None,
+    note: AppDeployMetaData,
+    signer: TransactionSigner | None,
+    sender: str | None,
+) -> tuple[ABIMethod | bool | None, ABIArgsDict, CreateCallParameters]:
+    method, args, parameters = _convert_deploy_args(_args, note, signer, sender)
+    create_parameters = CreateCallParameters(
+        **parameters.__dict__,
         extra_pages=args.get("extra_pages"),
         on_complete=args.get("on_complete"),
     )
 
-    return args.get("method"), args.get("args") or {}, parameters
+    return method, args, create_parameters
 
 
 def get_app_id_from_tx_id(algod_client: "AlgodClient", tx_id: str) -> int:

algokit_utils/models.py

@@ -155,25 +155,86 @@ class TransactionParameters:
 
 # CreateTransactionParameters is used by algokit-client-generator clients
 @dataclasses.dataclass(kw_only=True)
-class CreateTransactionParameters(TransactionParameters):
+class CreateTransactionParameters:
     """Additional parameters that can be included in a transaction when calling a create method"""
 
+    signer: TransactionSigner | None = None
+    """Signer to use when signing this transaction"""
+    sender: str | None = None
+    """Sender of this transaction"""
+    suggested_params: transaction.SuggestedParams | None = None
+    """SuggestedParams to use for this transaction"""
+    note: bytes | str | None = None
+    """Note for this transaction"""
+    lease: bytes | str | None = None
+    """Lease value for this transaction"""
+    boxes: Sequence[tuple[int, bytes | bytearray | str | int]] | None = None
+    """Box references to include in transaction. A sequence of (app id, box key) tuples"""
+    accounts: list[str] | None = None
+    """Accounts to include in transaction"""
+    foreign_apps: list[int] | None = None
+    """List of foreign apps (by app id) to include in transaction"""
+    foreign_assets: list[int] | None = None
+    """List of foreign assets (by asset id) to include in transaction"""
+    rekey_to: str | None = None
+    """Address to rekey to"""
     extra_pages: int | None = None
 
 
 @dataclasses.dataclass(kw_only=True)
-class OnCompleteCallParameters(TransactionParameters):
+class OnCompleteCallParameters:
     """Additional parameters that can be included in a transaction when using the
     ApplicationClient.call/compose_call methods"""
 
+    signer: TransactionSigner | None = None
+    """Signer to use when signing this transaction"""
+    sender: str | None = None
+    """Sender of this transaction"""
+    suggested_params: transaction.SuggestedParams | None = None
+    """SuggestedParams to use for this transaction"""
+    note: bytes | str | None = None
+    """Note for this transaction"""
+    lease: bytes | str | None = None
+    """Lease value for this transaction"""
+    boxes: Sequence[tuple[int, bytes | bytearray | str | int]] | None = None
+    """Box references to include in transaction. A sequence of (app id, box key) tuples"""
+    accounts: list[str] | None = None
+    """Accounts to include in transaction"""
+    foreign_apps: list[int] | None = None
+    """List of foreign apps (by app id) to include in transaction"""
+    foreign_assets: list[int] | None = None
+    """List of foreign assets (by asset id) to include in transaction"""
+    rekey_to: str | None = None
+    """Address to rekey to"""
     on_complete: transaction.OnComplete | None = None
 
 
 @dataclasses.dataclass(kw_only=True)
-class CreateCallParameters(OnCompleteCallParameters):
+class CreateCallParameters:
     """Additional parameters that can be included in a transaction when using the
     ApplicationClient.create/compose_create methods"""
 
+    signer: TransactionSigner | None = None
+    """Signer to use when signing this transaction"""
+    sender: str | None = None
+    """Sender of this transaction"""
+    suggested_params: transaction.SuggestedParams | None = None
+    """SuggestedParams to use for this transaction"""
+    note: bytes | str | None = None
+    """Note for this transaction"""
+    lease: bytes | str | None = None
+    """Lease value for this transaction"""
+    boxes: Sequence[tuple[int, bytes | bytearray | str | int]] | None = None
+    """Box references to include in transaction. A sequence of (app id, box key) tuples"""
+    accounts: list[str] | None = None
+    """Accounts to include in transaction"""
+    foreign_apps: list[int] | None = None
+    """List of foreign apps (by app id) to include in transaction"""
+    foreign_assets: list[int] | None = None
+    """List of foreign assets (by asset id) to include in transaction"""
+    rekey_to: str | None = None
+    """Address to rekey to"""
+    on_complete: transaction.OnComplete | None = None
     extra_pages: int | None = None
 
 
@@ -202,17 +263,58 @@ class TransactionParametersDict(TypedDict, total=False):
     """Address to rekey to"""
 
 
-class OnCompleteCallParametersDict(TypedDict, TransactionParametersDict, total=False):
+class OnCompleteCallParametersDict(TypedDict, total=False):
     """Additional parameters that can be included in a transaction when using the
     ApplicationClient.call/compose_call methods"""
 
+    signer: TransactionSigner
+    """Signer to use when signing this transaction"""
+    sender: str
+    """Sender of this transaction"""
+    suggested_params: transaction.SuggestedParams
+    """SuggestedParams to use for this transaction"""
+    note: bytes | str
+    """Note for this transaction"""
+    lease: bytes | str
+    """Lease value for this transaction"""
+    boxes: Sequence[tuple[int, bytes | bytearray | str | int]]
+    """Box references to include in transaction. A sequence of (app id, box key) tuples"""
+    accounts: list[str]
+    """Accounts to include in transaction"""
+    foreign_apps: list[int]
+    """List of foreign apps (by app id) to include in transaction"""
+    foreign_assets: list[int]
+    """List of foreign assets (by asset id) to include in transaction"""
+    rekey_to: str
+    """Address to rekey to"""
     on_complete: transaction.OnComplete
 
 
-class CreateCallParametersDict(TypedDict, OnCompleteCallParametersDict, total=False):
+class CreateCallParametersDict(TypedDict, total=False):
     """Additional parameters that can be included in a transaction when using the
     ApplicationClient.create/compose_create methods"""
 
+    signer: TransactionSigner
+    """Signer to use when signing this transaction"""
+    sender: str
+    """Sender of this transaction"""
+    suggested_params: transaction.SuggestedParams
+    """SuggestedParams to use for this transaction"""
+    note: bytes | str
+    """Note for this transaction"""
+    lease: bytes | str
+    """Lease value for this transaction"""
+    boxes: Sequence[tuple[int, bytes | bytearray | str | int]]
+    """Box references to include in transaction. A sequence of (app id, box key) tuples"""
+    accounts: list[str]
+    """Accounts to include in transaction"""
+    foreign_apps: list[int]
+    """List of foreign apps (by app id) to include in transaction"""
+    foreign_assets: list[int]
+    """List of foreign assets (by asset id) to include in transaction"""
+    rekey_to: str
+    """Address to rekey to"""
+    on_complete: transaction.OnComplete
     extra_pages: int
 
 

{algokit_utils-2.2.2b4.dist-info → algokit_utils-2.2.2b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: algokit-utils
-Version: 2.2.2b4
+Version: 2.2.2b5
 Summary: Utilities for Algorand development for use by AlgoKit
 License: MIT
 Author: Algorand Foundation

{algokit_utils-2.2.2b4.dist-info → algokit_utils-2.2.2b5.dist-info}/RECORD

@@ -3,18 +3,18 @@ algokit_utils/_debugging.py,sha256=4UC5NZGqxF32y742TUB34rX9kWaObXCCPOs-lbkQjGQ,1
 algokit_utils/_ensure_funded.py,sha256=ZdEdUB43QGIQrg7cSSgNrDmWaLSUhli9x9I6juwKfgo,6786
 algokit_utils/_transfer.py,sha256=CyXGOR_Zy-2crQhk-78uUbB8Sj_ZeTzxPwOAHU7wwno,5947
 algokit_utils/account.py,sha256=UIuOQZe28pQxjEP9TzhtYlOU20tUdzzS-nIIZM9Bp6Y,7364
-algokit_utils/application_client.py,sha256=xOZJ8i3y8wDJL0Uvaw1o-UmJKvSmbv8ib5RwGl4ar0w,58661
+algokit_utils/application_client.py,sha256=qylA2aI4Ecs532bIs6fyc6FgLnWey9PBzZBZW_jnYtk,59092
 algokit_utils/application_specification.py,sha256=XusOe7VrGPun2UoNspC9Ei202NzPkxRNx5USXiABuXc,7466
 algokit_utils/asset.py,sha256=jsc7T1dH9HZA3Yve2gRLObwUlK6xLDoQz0NxLLnqaGs,7216
 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=BxIFPtZd1lO8o_JmQQDIKk0O93E_bE-ZzglEWXwbefw,35110
 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/models.py,sha256=iJUiV6eLq5N_FKki4X5ll5rYQslU_wSPiSTtl61Z1CI,12803
 algokit_utils/network_clients.py,sha256=sj5y_g5uclddWCEyUCptA-KjWuAtLV06hZH4QIGM1yE,5313
 algokit_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-algokit_utils-2.2.2b4.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
-algokit_utils-2.2.2b4.dist-info/METADATA,sha256=ljuQvwihRxkVXBUYrOfYDY7t3IKXOQBOlYK-DWS_3ko,2207
-algokit_utils-2.2.2b4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-algokit_utils-2.2.2b4.dist-info/RECORD,,
+algokit_utils-2.2.2b5.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
+algokit_utils-2.2.2b5.dist-info/METADATA,sha256=8mkuN9VkBEa_Z2oH1GmzccM-SH63NFZmlBsXxc5CHQ4,2207
+algokit_utils-2.2.2b5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+algokit_utils-2.2.2b5.dist-info/RECORD,,