refactor: addressing pr comments

src/algokit_utils/__init__.py

@@ -11,6 +11,7 @@
 
 # Core types and utilities that are commonly used
 from algokit_utils.models.account import Account
+from algokit_utils.models.amount import AlgoAmount
 from algokit_utils.applications.app_deployer import OnSchemaBreak, OnUpdate, OperationPerformed
 from algokit_utils.applications.app_manager import DELETABLE_TEMPLATE_NAME, UPDATABLE_TEMPLATE_NAME
 from algokit_utils.errors.logic_error import LogicError
@@ -132,6 +133,7 @@
 __all__ = [
     # Core types and utilities
     "Account",
+    "AlgoAmount",
     "LogicError",
     "AlgorandClient",
     "DELETABLE_TEMPLATE_NAME",

src/algokit_utils/applications/app_client.py

@@ -42,7 +42,7 @@
     CompiledTeal,
 )
 from algokit_utils.models.state import BoxName, BoxValue
-from algokit_utils.models.transaction import AppCallSendParams, SendParams
+from algokit_utils.models.transaction import SendParams
 from algokit_utils.transactions.transaction_composer import (
     AppCallMethodCallParams,
     AppCallParams,
@@ -1023,7 +1023,7 @@ def __init__(self, client: AppClient) -> None:
     def update(
         self,
         params: AppClientBareCallParams | None = None,
-        send_params: AppCallSendParams | None = None,
+        send_params: SendParams | None = None,
         compilation_params: AppClientCompilationParams | None = None,
     ) -> SendAppTransactionResult[ABIReturn]:
         """Send an application update transaction.
@@ -1052,7 +1052,7 @@ def update(
         )
 
     def opt_in(
-        self, params: AppClientBareCallParams | None = None, send_params: AppCallSendParams | None = None
+        self, params: AppClientBareCallParams | None = None, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[ABIReturn]:
         """Send an application opt-in transaction.
 
@@ -1069,7 +1069,7 @@ def opt_in(
         )
 
     def delete(
-        self, params: AppClientBareCallParams | None = None, send_params: AppCallSendParams | None = None
+        self, params: AppClientBareCallParams | None = None, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[ABIReturn]:
         """Send an application delete transaction.
 
@@ -1086,7 +1086,7 @@ def delete(
         )
 
     def clear_state(
-        self, params: AppClientBareCallParams | None = None, send_params: AppCallSendParams | None = None
+        self, params: AppClientBareCallParams | None = None, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[ABIReturn]:
         """Send an application clear state transaction.
 
@@ -1103,7 +1103,7 @@ def clear_state(
         )
 
     def close_out(
-        self, params: AppClientBareCallParams | None = None, send_params: AppCallSendParams | None = None
+        self, params: AppClientBareCallParams | None = None, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[ABIReturn]:
         """Send an application close out transaction.
 
@@ -1123,7 +1123,7 @@ def call(
         self,
         params: AppClientBareCallParams | None = None,
         on_complete: OnComplete | None = None,
-        send_params: AppCallSendParams | None = None,
+        send_params: SendParams | None = None,
     ) -> SendAppTransactionResult[ABIReturn]:
         """Send an application call transaction.
 
@@ -1173,7 +1173,7 @@ def fund_app_account(
         )
 
     def opt_in(
-        self, params: AppClientMethodCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppClientMethodCallParams, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[Arc56ReturnValueType]:
         """Send an application opt-in transaction.
 
@@ -1191,7 +1191,7 @@ def opt_in(
         )
 
     def delete(
-        self, params: AppClientMethodCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppClientMethodCallParams, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[Arc56ReturnValueType]:
         """Send an application delete transaction.
 
@@ -1212,7 +1212,7 @@ def update(
         self,
         params: AppClientMethodCallParams,
         compilation_params: AppClientCompilationParams | None = None,
-        send_params: AppCallSendParams | None = None,
+        send_params: SendParams | None = None,
     ) -> SendAppUpdateTransactionResult[Arc56ReturnValueType]:
         """Send an application update transaction.
 
@@ -1235,7 +1235,7 @@ def update(
         return result
 
     def close_out(
-        self, params: AppClientMethodCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppClientMethodCallParams, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[Arc56ReturnValueType]:
         """Send an application close out transaction.
 
@@ -1253,7 +1253,7 @@ def close_out(
         )
 
     def call(
-        self, params: AppClientMethodCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppClientMethodCallParams, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[Arc56ReturnValueType]:
         """Send an application call transaction.
 
@@ -1272,7 +1272,7 @@ def call(
             method_call_to_simulate = self._algorand.new_group().add_app_call_method_call(
                 self._client.params.call(params)
             )
-            send_params = send_params or AppCallSendParams()
+            send_params = send_params or SendParams()
             simulate_response = self._client._handle_call_errors(
                 lambda: method_call_to_simulate.simulate(
                     allow_unnamed_resources=send_params.get("populate_app_call_resources") or True,

src/algokit_utils/applications/app_factory.py

@@ -45,7 +45,7 @@
     AppSourceMaps,
 )
 from algokit_utils.models.state import TealTemplateParams
-from algokit_utils.models.transaction import AppCallSendParams
+from algokit_utils.models.transaction import SendParams
 from algokit_utils.transactions.transaction_composer import (
     AppCreateMethodCallParams,
     AppCreateParams,
@@ -381,7 +381,7 @@ def __init__(self, factory: "AppFactory") -> None:
     def create(
         self,
         params: AppFactoryCreateParams | None = None,
-        send_params: AppCallSendParams | None = None,
+        send_params: SendParams | None = None,
         compilation_params: AppClientCompilationParams | None = None,
     ) -> tuple[AppClient, SendAppCreateTransactionResult]:
         compilation_params = compilation_params or AppClientCompilationParams()
@@ -441,7 +441,7 @@ def bare(self) -> _AppFactoryBareSendAccessor:
     def create(
         self,
         params: AppFactoryCreateMethodCallParams,
-        send_params: AppCallSendParams | None = None,
+        send_params: SendParams | None = None,
         compilation_params: AppClientCompilationParams | None = None,
     ) -> tuple[AppClient, AppFactoryCreateMethodCallResult[Arc56ReturnValueType]]:
         compilation_params = compilation_params or AppClientCompilationParams()

src/algokit_utils/models/amount.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from decimal import Decimal
+
 import algosdk
 from typing_extensions import Self
 
@@ -18,15 +20,15 @@ class AlgoAmount:
     >>> amount = AlgoAmount({"microAlgos": 1_000_000})
     """
 
-    def __init__(self, amount: dict[str, int]):
+    def __init__(self, amount: dict[str, int | Decimal]):
         if "microAlgos" in amount:
             self.amount_in_micro_algo = int(amount["microAlgos"])
         elif "microAlgo" in amount:
             self.amount_in_micro_algo = int(amount["microAlgo"])
         elif "algos" in amount:
-            self.amount_in_micro_algo = algosdk.util.algos_to_microalgos(float(amount["algos"]))
+            self.amount_in_micro_algo = int(amount["algos"] * algosdk.constants.MICROALGOS_TO_ALGOS_RATIO)
         elif "algo" in amount:
-            self.amount_in_micro_algo = algosdk.util.algos_to_microalgos(float(amount["algo"]))
+            self.amount_in_micro_algo = int(amount["algo"] * algosdk.constants.MICROALGOS_TO_ALGOS_RATIO)
         else:
             raise ValueError("Invalid amount provided")
 
@@ -47,23 +49,23 @@ def micro_algo(self) -> int:
         return self.amount_in_micro_algo
 
     @property
-    def algos(self) -> int:
+    def algos(self) -> Decimal:
         """Return the amount as a number in Algo.
 
         :returns: The amount in Algo.
         """
         return algosdk.util.microalgos_to_algos(self.amount_in_micro_algo)  # type: ignore[no-any-return]
 
     @property
-    def algo(self) -> int:
+    def algo(self) -> Decimal:
         """Return the amount as a number in Algo.
 
         :returns: The amount in Algo.
         """
         return algosdk.util.microalgos_to_algos(self.amount_in_micro_algo)  # type: ignore[no-any-return]
 
     @staticmethod
-    def from_algos(amount: int) -> AlgoAmount:
+    def from_algos(amount: int | Decimal) -> AlgoAmount:
         """Create an AlgoAmount object representing the given number of Algo.
 
         :param amount: The amount in Algo.
@@ -75,7 +77,7 @@ def from_algos(amount: int) -> AlgoAmount:
         return AlgoAmount({"algos": amount})
 
     @staticmethod
-    def from_algo(amount: int) -> AlgoAmount:
+    def from_algo(amount: int | Decimal) -> AlgoAmount:
         """Create an AlgoAmount object representing the given number of Algo.
 
         :param amount: The amount in Algo.

src/algokit_utils/models/transaction.py

@@ -4,7 +4,6 @@
 import algosdk
 
 __all__ = [
-    "AppCallSendParams",
     "Arc2TransactionNote",
     "BaseArc2Note",
     "JsonFormatArc2Note",
@@ -96,9 +95,6 @@ def _return_if_type(self, txn_type: type[TxnTypeT]) -> TxnTypeT:
 class SendParams(TypedDict, total=False):
     max_rounds_to_wait: int | None
     suppress_log: bool | None
-
-
-class AppCallSendParams(SendParams, total=False):
     populate_app_call_resources: bool | None
     cover_app_call_inner_txn_fees: bool | None
 

src/algokit_utils/transactions/transaction_composer.py

@@ -28,7 +28,7 @@
 from algokit_utils.applications.app_spec.arc56 import Method as Arc56Method
 from algokit_utils.config import config
 from algokit_utils.models.state import BoxIdentifier, BoxReference
-from algokit_utils.models.transaction import AppCallSendParams, SendParams, TransactionWrapper
+from algokit_utils.models.transaction import SendParams, TransactionWrapper
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -1609,7 +1609,7 @@ def execute(
 
     def send(
         self,
-        params: SendParams | AppCallSendParams | None = None,
+        params: SendParams | None = None,
     ) -> SendAtomicTransactionComposerResults:
         """Send the transaction group to the network.
 
@@ -1621,13 +1621,13 @@ def send(
 
         if not params:
             has_app_call = any(isinstance(txn.txn, ApplicationCallTxn) for txn in group)
-            params = AppCallSendParams() if has_app_call else SendParams()
-
-        cover_app_call_inner_txn_fees: bool | None = params.get("cover_app_call_inner_txn_fees")  # type: ignore[assignment]
-        populate_app_call_resources: bool | None = params.get("populate_app_call_resources")  # type: ignore[assignment]
+            params = SendParams() if has_app_call else SendParams()
 
+        cover_app_call_inner_txn_fees = params.get("cover_app_call_inner_txn_fees")
+        populate_app_call_resources = params.get("populate_app_call_resources")
         wait_rounds = params.get("max_rounds_to_wait")
         sp = self._get_suggested_params() if not wait_rounds or cover_app_call_inner_txn_fees else None
+
         if wait_rounds is None:
             last_round = max(txn.txn.last_valid_round for txn in group)
             assert sp is not None

src/algokit_utils/transactions/transaction_sender.py

@@ -11,7 +11,7 @@
 from algokit_utils.applications.app_manager import AppManager
 from algokit_utils.assets.asset_manager import AssetManager
 from algokit_utils.config import config
-from algokit_utils.models.transaction import AppCallSendParams, SendParams, TransactionWrapper
+from algokit_utils.models.transaction import SendParams, TransactionWrapper
 from algokit_utils.transactions.transaction_composer import (
     AppCallMethodCallParams,
     AppCallParams,
@@ -214,9 +214,9 @@ def _send_app_call(
         c: Callable[[TransactionComposer], Callable[[TxnParamsT], TransactionComposer]],
         pre_log: Callable[[TxnParamsT, Transaction], str] | None = None,
         post_log: Callable[[TxnParamsT, SendSingleTransactionResult], str] | None = None,
-    ) -> Callable[[TxnParamsT, AppCallSendParams | None], SendAppTransactionResult[ABIReturn]]:
+    ) -> Callable[[TxnParamsT, SendParams | None], SendAppTransactionResult[ABIReturn]]:
         def send_app_call(
-            params: TxnParamsT, send_params: AppCallSendParams | None = None
+            params: TxnParamsT, send_params: SendParams | None = None
         ) -> SendAppTransactionResult[ABIReturn]:
             result = self._send(c, pre_log, post_log)(params, send_params)
             return SendAppTransactionResult[ABIReturn](
@@ -231,9 +231,9 @@ def _send_app_update_call(
         c: Callable[[TransactionComposer], Callable[[TxnParamsT], TransactionComposer]],
         pre_log: Callable[[TxnParamsT, Transaction], str] | None = None,
         post_log: Callable[[TxnParamsT, SendSingleTransactionResult], str] | None = None,
-    ) -> Callable[[TxnParamsT, AppCallSendParams | None], SendAppUpdateTransactionResult[ABIReturn]]:
+    ) -> Callable[[TxnParamsT, SendParams | None], SendAppUpdateTransactionResult[ABIReturn]]:
         def send_app_update_call(
-            params: TxnParamsT, send_params: AppCallSendParams | None = None
+            params: TxnParamsT, send_params: SendParams | None = None
         ) -> SendAppUpdateTransactionResult[ABIReturn]:
             result = self._send_app_call(c, pre_log, post_log)(params, send_params)
 
@@ -266,9 +266,9 @@ def _send_app_create_call(
         c: Callable[[TransactionComposer], Callable[[TxnParamsT], TransactionComposer]],
         pre_log: Callable[[TxnParamsT, Transaction], str] | None = None,
         post_log: Callable[[TxnParamsT, SendSingleTransactionResult], str] | None = None,
-    ) -> Callable[[TxnParamsT, AppCallSendParams | None], SendAppCreateTransactionResult[ABIReturn]]:
+    ) -> Callable[[TxnParamsT, SendParams | None], SendAppCreateTransactionResult[ABIReturn]]:
         def send_app_create_call(
-            params: TxnParamsT, send_params: AppCallSendParams | None = None
+            params: TxnParamsT, send_params: SendParams | None = None
         ) -> SendAppCreateTransactionResult[ABIReturn]:
             result = self._send_app_update_call(c, pre_log, post_log)(params, send_params)
             app_id = int(result.confirmation["application-index"])  # type: ignore[call-overload]
@@ -454,7 +454,7 @@ def asset_opt_out(
         )(params, send_params)
 
     def app_create(
-        self, params: AppCreateParams, send_params: AppCallSendParams | None = None
+        self, params: AppCreateParams, send_params: SendParams | None = None
     ) -> SendAppCreateTransactionResult[ABIReturn]:
         """Create a new application.
 
@@ -465,7 +465,7 @@ def app_create(
         return self._send_app_create_call(lambda c: c.add_app_create)(params, send_params)
 
     def app_update(
-        self, params: AppUpdateParams, send_params: AppCallSendParams | None = None
+        self, params: AppUpdateParams, send_params: SendParams | None = None
     ) -> SendAppUpdateTransactionResult[ABIReturn]:
         """Update an application.
 
@@ -476,7 +476,7 @@ def app_update(
         return self._send_app_update_call(lambda c: c.add_app_update)(params, send_params)
 
     def app_delete(
-        self, params: AppDeleteParams, send_params: AppCallSendParams | None = None
+        self, params: AppDeleteParams, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[ABIReturn]:
         """Delete an application.
 
@@ -487,7 +487,7 @@ def app_delete(
         return self._send_app_call(lambda c: c.add_app_delete)(params, send_params)
 
     def app_call(
-        self, params: AppCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppCallParams, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[ABIReturn]:
         """Call an application.
 
@@ -498,7 +498,7 @@ def app_call(
         return self._send_app_call(lambda c: c.add_app_call)(params, send_params)
 
     def app_create_method_call(
-        self, params: AppCreateMethodCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppCreateMethodCallParams, send_params: SendParams | None = None
     ) -> SendAppCreateTransactionResult[ABIReturn]:
         """Call an application's create method.
 
@@ -509,7 +509,7 @@ def app_create_method_call(
         return self._send_app_create_call(lambda c: c.add_app_create_method_call)(params, send_params)
 
     def app_update_method_call(
-        self, params: AppUpdateMethodCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppUpdateMethodCallParams, send_params: SendParams | None = None
     ) -> SendAppUpdateTransactionResult[ABIReturn]:
         """Call an application's update method.
 
@@ -520,7 +520,7 @@ def app_update_method_call(
         return self._send_app_update_call(lambda c: c.add_app_update_method_call)(params, send_params)
 
     def app_delete_method_call(
-        self, params: AppDeleteMethodCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppDeleteMethodCallParams, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[ABIReturn]:
         """Call an application's delete method.
 
@@ -531,7 +531,7 @@ def app_delete_method_call(
         return self._send_app_call(lambda c: c.add_app_delete_method_call)(params, send_params)
 
     def app_call_method_call(
-        self, params: AppCallMethodCallParams, send_params: AppCallSendParams | None = None
+        self, params: AppCallMethodCallParams, send_params: SendParams | None = None
     ) -> SendAppTransactionResult[ABIReturn]:
         """Call an application's call method.