algokit-utils 3.0.0b4__py3-none-any.whl → 3.0.0b6__py3-none-any.whl

algokit_utils/transactions/transaction_composer.py

@@ -68,6 +68,9 @@ __all__ = [
     "TransactionComposer",
     "TransactionComposerBuildResult",
     "TxnParams",
+    "calculate_extra_program_pages",
+    "populate_app_call_resources",
+    "prepare_group_for_sending",
     "send_atomic_transaction_composer",
 ]
 
@@ -107,7 +110,7 @@ class PaymentParams(_CommonTxnParams):
     :ivar receiver: The account that will receive the ALGO
     :ivar amount: Amount to send
     :ivar close_remainder_to: If given, close the sender account and send the remaining balance to this address,
-    defaults to None
+        defaults to None
     """
 
     receiver: str
@@ -299,9 +302,9 @@ class AppCreateParams(_CommonTxnParams):
     """Parameters for creating an application.
 
     :ivar approval_program: The program to execute for all OnCompletes other than ClearState as raw teal (string)
-    or compiled teal (bytes)
+        or compiled teal (bytes)
     :ivar clear_state_program: The program to execute for ClearState OnComplete as raw teal (string)
-    or compiled teal (bytes)
+        or compiled teal (bytes)
     :ivar schema: The state schema for the app. This is immutable, defaults to None
     :ivar on_complete: The OnComplete action (cannot be ClearState), defaults to None
     :ivar args: Application arguments, defaults to None
@@ -330,9 +333,9 @@ class AppUpdateParams(_CommonTxnParams):
 
     :ivar app_id: ID of the application
     :ivar approval_program: The program to execute for all OnCompletes other than ClearState as raw teal (string)
-    or compiled teal (bytes)
+        or compiled teal (bytes)
     :ivar clear_state_program: The program to execute for ClearState OnComplete as raw teal (string)
-    or compiled teal (bytes)
+        or compiled teal (bytes)
     :ivar args: Application arguments, defaults to None
     :ivar account_references: Account references, defaults to None
     :ivar app_references: App references, defaults to None
@@ -417,7 +420,7 @@ class AppCallMethodCallParams(_BaseAppMethodCall):
     :ivar app_id: ID of the application
     :ivar method: The ABI method to call
     :ivar args: Arguments to the ABI method, either an ABI value, transaction with explicit signer,
-    transaction, another method call, or None
+        transaction, another method call, or None
     :ivar on_complete: The OnComplete action (cannot be UpdateApplication or ClearState), defaults to None
     """
 
@@ -673,7 +676,7 @@ def _get_group_execution_info(  # noqa: C901, PLR0912
             if not suggested_params:
                 raise ValueError("suggested_params required when cover_app_call_inner_transaction_fees enabled")
 
-            max_fee = max_fees.get(i).micro_algos if max_fees and i in max_fees else None  # type: ignore[union-attr]
+            max_fee = max_fees.get(i).micro_algo if max_fees and i in max_fees else None  # type: ignore[union-attr]
             if max_fee is None:
                 app_call_indexes_without_max_fees.append(i)
             else:
@@ -795,7 +798,7 @@ def _find_available_transaction_index(
     return next((i for i, txn in enumerate(txns) if check_transaction(txn)), -1)
 
 
-def _num_extra_program_pages(approval: bytes | None, clear: bytes | None) -> int:
+def calculate_extra_program_pages(approval: bytes | None, clear: bytes | None) -> int:
     """Calculate minimum number of extra_pages required for provided approval and clear programs"""
     total = len(approval or b"") + len(clear or b"")
     return max(0, (total - 1) // algosdk.constants.APP_PAGE_MAX_SIZE)
@@ -843,7 +846,7 @@ def prepare_group_for_sending(  # noqa: C901, PLR0912, PLR0915
             if not txn_info:
                 continue
             txn = group[i].txn
-            max_fee = max_fees.get(i).micro_algos if max_fees and i in max_fees else None  # type: ignore[union-attr]
+            max_fee = max_fees.get(i).micro_algo if max_fees and i in max_fees else None  # type: ignore[union-attr]
             immutable_fee = max_fee is not None and max_fee == txn.fee
             priority_multiplier = (
                 1000
@@ -1096,7 +1099,7 @@ def prepare_group_for_sending(  # noqa: C901, PLR0912, PLR0915
                 )
 
             transaction_fee = cur_txn.fee + additional_fee
-            max_fee = max_fees.get(i).micro_algos if max_fees and i in max_fees else None  # type: ignore[union-attr]
+            max_fee = max_fees.get(i).micro_algo if max_fees and i in max_fees else None  # type: ignore[union-attr]
 
             if max_fee is None or transaction_fee > max_fee:
                 raise ValueError(
@@ -1224,11 +1227,11 @@ def send_atomic_transaction_composer(  # noqa: C901, PLR0912
             if not suppress_log:
                 logger.info(
                     f"Sending group of {len(transactions_to_send)} transactions ({group_id})",
-                    suppress_log=suppress_log or False,
+                    extra={"suppress_log": suppress_log or False},
                 )
                 logger.debug(
                     f"Transaction IDs ({group_id}): {[t.get_txid() for t in transactions_to_send]}",
-                    suppress_log=suppress_log or False,
+                    extra={"suppress_log": suppress_log or False},
                 )
 
         # Simulate if debug enabled
@@ -1248,12 +1251,12 @@ def send_atomic_transaction_composer(  # noqa: C901, PLR0912
             if len(transactions_to_send) > 1:
                 logger.info(
                     f"Group transaction ({group_id}) sent with {len(transactions_to_send)} transactions",
-                    suppress_log=suppress_log or False,
+                    extra={"suppress_log": suppress_log or False},
                 )
             else:
                 logger.info(
                     f"Sent transaction ID {transactions_to_send[0].get_txid()}",
-                    suppress_log=suppress_log or False,
+                    extra={"suppress_log": suppress_log or False},
                 )
 
         # Get confirmations if not skipping
@@ -1275,8 +1278,9 @@ def send_atomic_transaction_composer(  # noqa: C901, PLR0912
         if config.debug:
             logger.error(
                 "Received error executing Atomic Transaction Composer and debug flag enabled; "
-                "attempting simulation to get more information",
-                suppress_log=suppress_log or False,
+                "attempting simulation to get more information ",
+                extra={"suppress_log": suppress_log or False},
+                exc_info=e,
             )
 
             simulate = None
@@ -1310,7 +1314,8 @@ def send_atomic_transaction_composer(  # noqa: C901, PLR0912
 
         logger.error(
             "Received error executing Atomic Transaction Composer, for more information enable the debug flag",
-            suppress_log=suppress_log or False,
+            extra={"suppress_log": suppress_log or False},
+            exc_info=e,
         )
         raise e
 
@@ -1324,7 +1329,7 @@ class TransactionComposer:
     :param algod: An instance of AlgodClient used to get suggested params and send transactions
     :param get_signer: A function that takes an address and returns a TransactionSigner for that address
     :param get_suggested_params: Optional function to get suggested transaction parameters,
-    defaults to using algod.suggested_params()
+        defaults to using algod.suggested_params()
     :param default_validity_window: Optional default validity window for transactions in rounds, defaults to 10
     :param app_manager: Optional AppManager instance for compiling TEAL programs, defaults to None
     """
@@ -1600,6 +1605,8 @@ class TransactionComposer:
                     signers[idx] = ts.signer
                 if isinstance(ts, TransactionWithSignerAndContext) and ts.context.abi_method:
                     method_calls[idx] = ts.context.abi_method
+                    if ts.context.max_fee:
+                        self._txn_max_fees[idx] = ts.context.max_fee
                 idx += 1
 
         return BuiltTransactions(transactions=transactions, method_calls=method_calls, signers=signers)
@@ -1681,7 +1688,7 @@ class TransactionComposer:
 
         :param allow_more_logs: Whether to allow more logs than the standard limit
         :param allow_empty_signatures: Whether to allow transactions with empty signatures
-        :param allow_unnamed_resources: Whether to allow unnamed resources
+        :param allow_unnamed_resources: Whether to allow unnamed resources.
         :param extra_opcode_budget: Additional opcode budget to allocate
         :param exec_trace_config: Configuration for execution tracing
         :param simulation_round: Round number to simulate at
@@ -1839,7 +1846,7 @@ class TransactionComposer:
                 txn_params["sp"].last = txn_params["sp"].first + window
 
         if params.static_fee is not None and txn_params["sp"]:
-            txn_params["sp"].fee = params.static_fee.micro_algos
+            txn_params["sp"].fee = params.static_fee.micro_algo
             txn_params["sp"].flat_fee = True
 
         if isinstance(txn_params.get("method"), Arc56Method):
@@ -1848,9 +1855,9 @@ class TransactionComposer:
         txn = build_txn(txn_params)
 
         if params.extra_fee:
-            txn.fee += params.extra_fee.micro_algos
+            txn.fee += params.extra_fee.micro_algo
 
-        if params.max_fee and txn.fee > params.max_fee.micro_algos:
+        if params.max_fee and txn.fee > params.max_fee.micro_algo:
             raise ValueError(f"Transaction fee {txn.fee} is greater than max_fee {params.max_fee}")
         use_max_fee = params.max_fee and params.max_fee.micro_algo > (
             params.static_fee.micro_algo if params.static_fee else 0
@@ -1980,7 +1987,7 @@ class TransactionComposer:
         if app_id == 0:
             extra_pages = getattr(params, "extra_program_pages", None)
             if extra_pages is None and approval_program is not None:
-                extra_pages = _num_extra_program_pages(approval_program, clear_program)
+                extra_pages = calculate_extra_program_pages(approval_program, clear_program)
 
         txn_params = {
             "app_id": app_id,
@@ -2037,7 +2044,7 @@ class TransactionComposer:
             "sender": params.sender,
             "sp": suggested_params,
             "receiver": params.receiver,
-            "amt": params.amount.micro_algos,
+            "amt": params.amount.micro_algo,
             "close_remainder_to": params.close_remainder_to,
         }
 
@@ -2117,7 +2124,8 @@ class TransactionComposer:
                     num_uints=params.schema.get("local_ints", 0),
                     num_byte_slices=params.schema.get("local_byte_slices", 0),
                 ),
-                "extra_pages": params.extra_program_pages or _num_extra_program_pages(approval_program, clear_program),
+                "extra_pages": params.extra_program_pages
+                or calculate_extra_program_pages(approval_program, clear_program),
             }
 
         return self._common_txn_build_step(lambda x: algosdk.transaction.ApplicationCallTxn(**x), params, txn_params)

{algokit_utils-3.0.0b4.dist-info → algokit_utils-3.0.0b6.dist-info}/METADATA

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

{algokit_utils-3.0.0b4.dist-info → algokit_utils-3.0.0b6.dist-info}/RECORD

@@ -3,8 +3,8 @@ algokit_utils/_debugging.py,sha256=nAiC10WXiZsvc0RPWOrMLpjJQZT_ItgcMl7D9Z4DfYc,1
 algokit_utils/_legacy_v2/__init__.py,sha256=WcRE30axWjGnBB09bJCeTw9NT-2_jDN_CVJITFcIDc8,4689
 algokit_utils/_legacy_v2/_ensure_funded.py,sha256=tw4ZEcqsKBHbSCH9gPz3V2onGaj1kyv6BM9V59fLgCU,6931
 algokit_utils/_legacy_v2/_transfer.py,sha256=FRut71CU8kDn4-FqMepwZGjFPhPtQg5Wv5_kdtVqK-8,6256
-algokit_utils/_legacy_v2/account.py,sha256=yP3t7qB-fAXfLf8G5buYgsdknwrdigzrWsTu08XJWuE,8224
-algokit_utils/_legacy_v2/application_client.py,sha256=ScUalY2h2Wj_TAPYdxuucAmdwRwvO-xZ0yOMXDb9OgE,59536
+algokit_utils/_legacy_v2/account.py,sha256=_4pxTKO6y9XK4CkUb1M9Du_XVXKeU1MWXHx54KPVbMk,8240
+algokit_utils/_legacy_v2/application_client.py,sha256=Gb7WldXLi0V92YfeU19HP1rJ-L4Rmz2Lxm2q45tQJ2s,59610
 algokit_utils/_legacy_v2/application_specification.py,sha256=wp2Y9ou2_F-bSFbDnm6AEhFexybmD7-fAT0CuWtO26g,521
 algokit_utils/_legacy_v2/asset.py,sha256=b4GEzsPuHAbb330ZjoyY3lol0SisQGwJiOpnXvuXvJI,7594
 algokit_utils/_legacy_v2/common.py,sha256=lB6zHUDJSjYiZ41hvcG0P5TZk_t-n2Iy0OXuQcJosm0,823
@@ -14,15 +14,15 @@ 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=pQjfdDeoi5694QYD-EmvlVpuSvIYdFH_e0LKXkcwzRA,39369
-algokit_utils/accounts/kmd_account_manager.py,sha256=7HF2eKYULu6TAXSSXrSGZG7i6VuIEMyf6Ppmo5hE3EI,6342
+algokit_utils/accounts/account_manager.py,sha256=zr8NV6k9L8xESzsmbFK06T-DOmVEvHWcoHgIIX5SDcQ,39763
+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=ZwiLuFXx2EwWJ_cOEvNWCzt5onoasm-QmQPv9N7d49g,10087
-algokit_utils/applications/app_client.py,sha256=xHpcZhp6l1PO6OeY009rJ-T3rOyRAS7xrA3evAKI1Jk,83432
-algokit_utils/applications/app_deployer.py,sha256=RrSmIsbN84z0lNtGD8JP2FwkDmsAD_HvF8b4kHnCSmo,23099
+algokit_utils/applications/app_client.py,sha256=oAwe9_6-ETWJIdXNScDvUiVYN8JNP4kplSnr3qCQPVY,84979
+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
 algokit_utils/applications/app_spec/__init__.py,sha256=HtjAhAqHNFml9WbRKGmhJnwyJeW8AztPRO_BriQ84vs,140
@@ -31,17 +31,17 @@ algokit_utils/applications/app_spec/arc56.py,sha256=8GyQ_gDBSkHLzTL35D1r7dce5owh
 algokit_utils/applications/enums.py,sha256=1MUBrPW9v0-OZk6jsa5rqSEEpC-z-6QAQIs9G7pLn1I,1257
 algokit_utils/asset.py,sha256=ZnNo_MsDGPb8UTPxi7cmIZpbrT0x0xZjblHP01pDAC0,874
 algokit_utils/assets/__init__.py,sha256=6igogt0eo0TEae6-rO9qPsmlrKkbnkq3aV8wtePX3yk,63
-algokit_utils/assets/asset_manager.py,sha256=S4-ob-JO31aCq3N9tqI2JREtq2R7eJ8F6WTXbQczvg4,14132
+algokit_utils/assets/asset_manager.py,sha256=0vs02dbXarAkVxehM4XJp_AHveZCujIPfnQVXiwhZiw,14152
 algokit_utils/beta/_utils.py,sha256=eGgrSH5dA7Lhe7Z_9rudU7O6azZHMH0U7A3in4GpFOg,1839
 algokit_utils/beta/account_manager.py,sha256=xDFvsMSha0Ki42BGvKvfScQWT_W9y4GeP_RWXjc3vnE,213
 algokit_utils/beta/algorand_client.py,sha256=xDFvsMSha0Ki42BGvKvfScQWT_W9y4GeP_RWXjc3vnE,213
 algokit_utils/beta/client_manager.py,sha256=xDFvsMSha0Ki42BGvKvfScQWT_W9y4GeP_RWXjc3vnE,213
 algokit_utils/beta/composer.py,sha256=xDFvsMSha0Ki42BGvKvfScQWT_W9y4GeP_RWXjc3vnE,213
 algokit_utils/clients/__init__.py,sha256=qUuKBvfLnw4z6ZU9x7mc-mLjfnnXC9UcvtoeU33ZLJ8,136
-algokit_utils/clients/client_manager.py,sha256=DzJMf_jdQoZYNcy0sK34Uv-IenqJmfAupkqzo_Asp-A,25683
+algokit_utils/clients/client_manager.py,sha256=Yl5k7LwlUaoHh76tNK1UxFl8xoFdaTejrhrr488E0Ww,25559
 algokit_utils/clients/dispenser_api_client.py,sha256=lx6II3beCt7YiKO2TrW6UbsRVirf3NoWMJi8HD_W5nI,6045
 algokit_utils/common.py,sha256=5wl83vWw91RYdEC4hTTufqaptKiFtgjKLIyONDmRSH0,300
-algokit_utils/config.py,sha256=Fd466a33pyqmblKn3YUEoSqMSGbKDmZeaS5Uu7_CNHw,7029
+algokit_utils/config.py,sha256=7ZtShaEsVXxajtu15JyKP4ugCQxGq6AGRh6kF4taqKA,6412
 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
@@ -49,22 +49,22 @@ algokit_utils/errors/logic_error.py,sha256=uxqUOU9-D1R5TrKturCbmmWRVlB024Ca4CfVi
 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/amount.py,sha256=2Eb5W9IduM4hqvWz0bpD8-8htKhhmUonaLCuz9c2_1w,9411
+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=Qe631nHpLgjtGcwqWTc6D4Gk_5Fc_dutxD-bCTsb-xw,723
+algokit_utils/models/network.py,sha256=3QNcZ9jVmckv3CCxrD2Y1jiwBdBGdaaziiRgOpsqhwI,904
 algokit_utils/models/simulate.py,sha256=F9OSEfA9QGFGe5po24h8IGLor5z1ogu5Cwm3l6cHnAs,236
 algokit_utils/models/state.py,sha256=N6jsjZiZsz-Rn1ZDnBRvVv1En-lUrh97JuaaDRZtCkg,1478
-algokit_utils/models/transaction.py,sha256=Am0-rmfiANVq9_Zbd1zMTtaV91ZcPqtEfpp2ScQ2Ji8,3052
+algokit_utils/models/transaction.py,sha256=2JJLDbbbKEWaXkfx3rtcSjsQNVH6f8kyhY1iFBVW-Uc,3019
 algokit_utils/network_clients.py,sha256=Nd096NpRM7z9iLLdLSC9HV9jl_8Y7sT9ft54mqfyxLA,251
 algokit_utils/protocols/__init__.py,sha256=yD7ZxPEiERQ5ecJuz7BSM9uz1_GhamIaQWCnuVikgro,126
 algokit_utils/protocols/account.py,sha256=CowaVY7ErBP84TWBHNvBjkZy18whPb8HIlMZtJRLh4w,624
 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=yGLFgJk51BKgnwbGYmmuDIE7WPpZZmHqVAVZ7IWcRDQ,94794
+algokit_utils/transactions/transaction_composer.py,sha256=QA5j3l-UhnaCoohN9Pri8t_bPJrOrZh3ogYQf4FwDm0,95183
 algokit_utils/transactions/transaction_creator.py,sha256=A1YHeGC2EkR2V0HPYJiXVOAEIrfjBW2KVyYgi3exm4E,6167
 algokit_utils/transactions/transaction_sender.py,sha256=uQmHElJgUIxLXfdklMNoabjQQzUku8CFP82wwhfr44E,22769
-algokit_utils-3.0.0b4.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
-algokit_utils-3.0.0b4.dist-info/METADATA,sha256=-QVF-0xUq7DMn6ZLnL4uBA5M0pnI5yh2UrjuDOBFCOk,2416
-algokit_utils-3.0.0b4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-algokit_utils-3.0.0b4.dist-info/RECORD,,
+algokit_utils-3.0.0b6.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
+algokit_utils-3.0.0b6.dist-info/METADATA,sha256=DFaxl-bIa2v5PkXM4Fbj7oCl3FJod5u6ADkrXrThayk,2416
+algokit_utils-3.0.0b6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+algokit_utils-3.0.0b6.dist-info/RECORD,,