algokit-utils 4.1.0b2__py3-none-any.whl → 4.1.0b4__py3-none-any.whl

algokit_utils/applications/app_deployer.py

@@ -447,7 +447,8 @@ class AppDeployer:
         composer = self._transaction_sender.new_group()
 
         # Add create transaction
-        if isinstance(deployment.create_params, AppCreateMethodCallParams):
+        has_abi_create = isinstance(deployment.create_params, AppCreateMethodCallParams)
+        if has_abi_create:
             composer.add_app_create_method_call(
                 AppCreateMethodCallParams(
                     **{
@@ -467,10 +468,10 @@ class AppDeployer:
                     }
                 )
             )
-        create_txn_index = composer.count() - 1
 
         # Add delete transaction
-        if isinstance(deployment.delete_params, AppDeleteMethodCallParams):
+        has_abi_delete = isinstance(deployment.delete_params, AppDeleteMethodCallParams)
+        if has_abi_delete:
             delete_call_params = AppDeleteMethodCallParams(
                 **{
                     **deployment.delete_params.__dict__,
@@ -486,12 +487,15 @@ class AppDeployer:
                 }
             )
             composer.add_app_delete(delete_params)
-        delete_txn_index = composer.count() - 1
 
-        result = composer.send()
+        result = composer.send(deployment.send_params)
 
-        create_result = SendAppCreateTransactionResult[ABIReturn].from_composer_result(result, create_txn_index)
-        delete_result = SendAppTransactionResult[ABIReturn].from_composer_result(result, delete_txn_index)
+        create_result = SendAppCreateTransactionResult[ABIReturn].from_composer_result(
+            result, is_abi=has_abi_create, index=0
+        )
+        delete_result = SendAppTransactionResult[ABIReturn].from_composer_result(
+            result, is_abi=has_abi_delete, index=-1
+        )
 
         app_id = int(result.confirmations[0]["application-index"])  # type: ignore[call-overload]
         app_metadata = ApplicationMetaData(

algokit_utils/transactions/transaction_sender.py

@@ -81,7 +81,9 @@ class SendSingleTransactionResult:
     """The ABI return value if applicable"""
 
     @classmethod
-    def from_composer_result(cls, result: SendAtomicTransactionComposerResults, index: int = -1) -> Self:
+    def from_composer_result(
+        cls, result: SendAtomicTransactionComposerResults, *, is_abi: bool = False, index: int = -1
+    ) -> Self:
         # Get base parameters
         base_params = {
             "transaction": result.transactions[index],
@@ -104,12 +106,12 @@ class SendSingleTransactionResult:
                 {
                     "app_id": app_id,
                     "app_address": algosdk.logic.get_application_address(app_id),
-                    "abi_return": result.returns[index] if result.returns else None,  # type: ignore[dict-item]
+                    "abi_return": result.returns[index] if result.returns and is_abi else None,  # type: ignore[dict-item]
                 }
             )
         # For regular app transactions, just add abi_return
         elif cls is SendAppTransactionResult:
-            base_params["abi_return"] = result.returns[index] if result.returns else None  # type: ignore[assignment]
+            base_params["abi_return"] = result.returns[index] if result.returns and is_abi else None  # type: ignore[assignment]
 
         return cls(**base_params)  # type: ignore[arg-type]
 

{algokit_utils-4.1.0b2.dist-info → algokit_utils-4.1.0b4.dist-info}/METADATA

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

{algokit_utils-4.1.0b2.dist-info → algokit_utils-4.1.0b4.dist-info}/RECORD

@@ -22,7 +22,7 @@ algokit_utils/application_specification.py,sha256=wV0H088IudMqlxsW-gsZIfJyKA4e-z
 algokit_utils/applications/__init__.py,sha256=NGjhpBeExsQZOAYCT2QUFag1xuKoFiX-Ux5SR2GNzd8,452
 algokit_utils/applications/abi.py,sha256=OjTdn4szJPPeC8XmosdDYtkIIVgQSWAnqz2DHw5OH9g,10117
 algokit_utils/applications/app_client.py,sha256=WKedIu3CDamBW8dAAR5IBYCXkesvETkof1dwIqKHaNE,88474
-algokit_utils/applications/app_deployer.py,sha256=-6pCs61PdFMMrnDIpXOuaIlr6TgDkvsB6vwbOZhOiZ0,30606
+algokit_utils/applications/app_deployer.py,sha256=xJCu7SU66OTg5misSbSF0QI8abRB-DWAwAVKd1kNcPI,30685
 algokit_utils/applications/app_factory.py,sha256=jVAzoK1J9S-BTGHA5BLxT-cl0pWhPdf222W4fYpFihE,45352
 algokit_utils/applications/app_manager.py,sha256=8bboIswlwBQhPIqilSBMaxd83yHjIpkloezmtgcAdZY,22301
 algokit_utils/applications/app_spec/__init__.py,sha256=HtjAhAqHNFml9WbRKGmhJnwyJeW8AztPRO_BriQ84vs,140
@@ -65,8 +65,8 @@ algokit_utils/transactions/__init__.py,sha256=7fYF3m6DyOGzbV36MT5svo0wSkj9AIz496
 algokit_utils/transactions/_algokit_core_bridge.py,sha256=Q9Mf86fo-mOVu-8i1MeA91AkwhBnEjsx-4w3uVoY5dg,2191
 algokit_utils/transactions/transaction_composer.py,sha256=yHpL9FqYEFevh3WRIwHcBZ2ukEXPFmkzYK8nJev83i4,104959
 algokit_utils/transactions/transaction_creator.py,sha256=cuP6Xm-fhGoCc2FNSbLiEg3iQRwW38rfdTzsqPyEcpM,29053
-algokit_utils/transactions/transaction_sender.py,sha256=4u2FON3YM4_DKPde6gSkZFAH1wp7FC8E65HpQ803RNo,50056
-algokit_utils-4.1.0b2.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
-algokit_utils-4.1.0b2.dist-info/METADATA,sha256=BJSEVChxc2P4vLfe_BD3zBAZ4YUNThwRsucP-pjLh6k,2421
-algokit_utils-4.1.0b2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-algokit_utils-4.1.0b2.dist-info/RECORD,,
+algokit_utils/transactions/transaction_sender.py,sha256=Wi3ws9S-Df1JeTlaSTXmq-WS24Gsq7WGsKk1B0z23ao,50117
+algokit_utils-4.1.0b4.dist-info/LICENSE,sha256=J5i7U1Q9Q2c7saUzlvFRmrCCFhQyXb5Juz_LO5omNUw,1076
+algokit_utils-4.1.0b4.dist-info/METADATA,sha256=WA_h3REWZghI1qzldGwvKkBp-B5__0pyMvKCRYCtKLg,2421
+algokit_utils-4.1.0b4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+algokit_utils-4.1.0b4.dist-info/RECORD,,