fix: deployment send params aren't passed into the composer

Author: PatrickDinh

src/algokit_utils/applications/app_deployer.py

@@ -488,7 +488,7 @@ def _replace_app(
             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)

tests/artifacts/delete_abi_with_inner/application.json

@@ -0,0 +1,125 @@
+{
+  "name": "DeleteAbiWithInner",
+  "structs": {},
+  "methods": [
+    {
+      "name": "create",
+      "args": [],
+      "returns": {
+        "type": "void"
+      },
+      "actions": {
+        "create": ["NoOp"],
+        "call": []
+      },
+      "readonly": false,
+      "events": [],
+      "recommendations": {}
+    },
+    {
+      "name": "delete",
+      "args": [
+        {
+          "type": "uint64",
+          "name": "app_id"
+        }
+      ],
+      "returns": {
+        "type": "void"
+      },
+      "actions": {
+        "create": [],
+        "call": ["DeleteApplication"]
+      },
+      "readonly": false,
+      "events": [],
+      "recommendations": {}
+    }
+  ],
+  "arcs": [22, 28],
+  "networks": {},
+  "state": {
+    "schema": {
+      "global": {
+        "ints": 0,
+        "bytes": 1
+      },
+      "local": {
+        "ints": 0,
+        "bytes": 0
+      }
+    },
+    "keys": {
+      "global": {
+        "greeting": {
+          "keyType": "AVMString",
+          "valueType": "AVMString",
+          "key": "Z3JlZXRpbmc="
+        }
+      },
+      "local": {},
+      "box": {}
+    },
+    "maps": {
+      "global": {},
+      "local": {},
+      "box": {}
+    }
+  },
+  "bareActions": {
+    "create": [],
+    "call": []
+  },
+  "sourceInfo": {
+    "approval": {
+      "sourceInfo": [
+        {
+          "pc": [50],
+          "errorMessage": "OnCompletion is not DeleteApplication"
+        },
+        {
+          "pc": [66],
+          "errorMessage": "OnCompletion is not NoOp"
+        },
+        {
+          "pc": [70],
+          "errorMessage": "can only call when creating"
+        },
+        {
+          "pc": [53],
+          "errorMessage": "can only call when not creating"
+        }
+      ],
+      "pcOffsetMethod": "cblocks"
+    },
+    "clear": {
+      "sourceInfo": [],
+      "pcOffsetMethod": "none"
+    }
+  },
+  "source": {
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDEwCiNwcmFnbWEgdHlwZXRyYWNrIGZhbHNlCgovLyB0ZXN0cy5hcnRpZmFjdHMuZGVsZXRlX2FiaV93aXRoX2lubmVyLmNvbnRyYWN0LkRlbGV0ZUFiaVdpdGhJbm5lci5fX2FsZ29weV9lbnRyeXBvaW50X3dpdGhfaW5pdCgpIC0+IHVpbnQ2NDoKbWFpbjoKICAgIGludGNibG9jayAwIDEgVE1QTF9ERUxFVEFCTEUKICAgIGJ5dGVjYmxvY2sgVE1QTF9HUkVFVElORwogICAgdHhuIEFwcGxpY2F0aW9uSUQKICAgIGJueiBtYWluX2FmdGVyX2lmX2Vsc2VAMgogICAgLy8gY29udHJhY3QucHk6MTEKICAgIC8vIHNlbGYuZ3JlZXRpbmcgPSBUZW1wbGF0ZVZhcltTdHJpbmddKCJHUkVFVElORyIpCiAgICBwdXNoYnl0ZXMgImdyZWV0aW5nIgogICAgYnl0ZWNfMCAvLyBUTVBMX0dSRUVUSU5HCiAgICBhcHBfZ2xvYmFsX3B1dAoKbWFpbl9hZnRlcl9pZl9lbHNlQDI6CiAgICAvLyBjb250cmFjdC5weTo5CiAgICAvLyBjbGFzcyBEZWxldGVBYmlXaXRoSW5uZXIoQVJDNENvbnRyYWN0KToKICAgIHR4biBOdW1BcHBBcmdzCiAgICBieiBtYWluX2FmdGVyX2lmX2Vsc2VANwogICAgcHVzaGJ5dGVzcyAweDRjNWM2MWJhIDB4OGEzOWU3OWYgLy8gbWV0aG9kICJjcmVhdGUoKXZvaWQiLCBtZXRob2QgImRlbGV0ZSh1aW50NjQpdm9pZCIKICAgIHR4bmEgQXBwbGljYXRpb25BcmdzIDAKICAgIG1hdGNoIG1haW5fY3JlYXRlX3JvdXRlQDUgbWFpbl9kZWxldGVfcm91dGVANgoKbWFpbl9hZnRlcl9pZl9lbHNlQDc6CiAgICAvLyBjb250cmFjdC5weTo5CiAgICAvLyBjbGFzcyBEZWxldGVBYmlXaXRoSW5uZXIoQVJDNENvbnRyYWN0KToKICAgIGludGNfMCAvLyAwCiAgICByZXR1cm4KCm1haW5fZGVsZXRlX3JvdXRlQDY6CiAgICAvLyBjb250cmFjdC5weToxNwogICAgLy8gQGFyYzQuYWJpbWV0aG9kKGFsbG93X2FjdGlvbnM9WyJEZWxldGVBcHBsaWNhdGlvbiJdKQogICAgdHhuIE9uQ29tcGxldGlvbgogICAgcHVzaGludCA1IC8vIERlbGV0ZUFwcGxpY2F0aW9uCiAgICA9PQogICAgYXNzZXJ0IC8vIE9uQ29tcGxldGlvbiBpcyBub3QgRGVsZXRlQXBwbGljYXRpb24KICAgIHR4biBBcHBsaWNhdGlvbklECiAgICBhc3NlcnQgLy8gY2FuIG9ubHkgY2FsbCB3aGVuIG5vdCBjcmVhdGluZwogICAgLy8gY29udHJhY3QucHk6OQogICAgLy8gY2xhc3MgRGVsZXRlQWJpV2l0aElubmVyKEFSQzRDb250cmFjdCk6CiAgICB0eG5hIEFwcGxpY2F0aW9uQXJncyAxCiAgICBidG9pCiAgICAvLyBjb250cmFjdC5weToxNwogICAgLy8gQGFyYzQuYWJpbWV0aG9kKGFsbG93X2FjdGlvbnM9WyJEZWxldGVBcHBsaWNhdGlvbiJdKQogICAgY2FsbHN1YiBkZWxldGUKICAgIGludGNfMSAvLyAxCiAgICByZXR1cm4KCm1haW5fY3JlYXRlX3JvdXRlQDU6CiAgICAvLyBjb250cmFjdC5weToxMwogICAgLy8gQGFyYzQuYWJpbWV0aG9kKGNyZWF0ZT0icmVxdWlyZSIpCiAgICB0eG4gT25Db21wbGV0aW9uCiAgICAhCiAgICBhc3NlcnQgLy8gT25Db21wbGV0aW9uIGlzIG5vdCBOb09wCiAgICB0eG4gQXBwbGljYXRpb25JRAogICAgIQogICAgYXNzZXJ0IC8vIGNhbiBvbmx5IGNhbGwgd2hlbiBjcmVhdGluZwogICAgaW50Y18xIC8vIDEKICAgIHJldHVybgoKCi8vIHRlc3RzLmFydGlmYWN0cy5kZWxldGVfYWJpX3dpdGhfaW5uZXIuY29udHJhY3QuRGVsZXRlQWJpV2l0aElubmVyLmRlbGV0ZShhcHBfaWQ6IHVpbnQ2NCkgLT4gdm9pZDoKZGVsZXRlOgogICAgLy8gY29udHJhY3QucHk6MTctMTgKICAgIC8vIEBhcmM0LmFiaW1ldGhvZChhbGxvd19hY3Rpb25zPVsiRGVsZXRlQXBwbGljYXRpb24iXSkKICAgIC8vIGRlZiBkZWxldGUoc2VsZiwgYXBwX2lkOiBVSW50NjQpIC0+IE5vbmU6CiAgICBwcm90byAxIDAKICAgIC8vIGNvbnRyYWN0LnB5OjE5CiAgICAvLyBhcmM0LmFiaV9jYWxsKCJub19vcCIsIGFwcF9pZD1hcHBfaWQpCiAgICBpdHhuX2JlZ2luCiAgICBmcmFtZV9kaWcgLTEKICAgIGl0eG5fZmllbGQgQXBwbGljYXRpb25JRAogICAgcHVzaGJ5dGVzIDB4NzcyOWViMzIgLy8gbWV0aG9kICJub19vcCgpdm9pZCIKICAgIGl0eG5fZmllbGQgQXBwbGljYXRpb25BcmdzCiAgICBwdXNoaW50IDYgLy8gYXBwbAogICAgaXR4bl9maWVsZCBUeXBlRW51bQogICAgaW50Y18wIC8vIDAKICAgIGl0eG5fZmllbGQgRmVlCiAgICBpdHhuX3N1Ym1pdAogICAgLy8gY29udHJhY3QucHk6MjAKICAgIC8vIGFzc2VydCBUZW1wbGF0ZVZhcltib29sXSgiREVMRVRBQkxFIikKICAgIGludGNfMiAvLyBUTVBMX0RFTEVUQUJMRQogICAgYXNzZXJ0CiAgICByZXRzdWIK",
+    "clear": "I3ByYWdtYSB2ZXJzaW9uIDEwCiNwcmFnbWEgdHlwZXRyYWNrIGZhbHNlCgovLyBhbGdvcHkuYXJjNC5BUkM0Q29udHJhY3QuY2xlYXJfc3RhdGVfcHJvZ3JhbSgpIC0+IHVpbnQ2NDoKbWFpbjoKICAgIHB1c2hpbnQgMSAvLyAxCiAgICByZXR1cm4K"
+  },
+  "byteCode": {
+    "approval": "CiADAAEAJgEAMRhAAAyACGdyZWV0aW5nKGcxG0EAFYICBExcYboEijnnnzYaAI4CABQAAiJDMRmBBRJEMRhENhoBF4gADCNDMRkURDEYFEQjQ4oBALGL/7IYgAR3KesyshqBBrIQIrIBsyREiQ==",
+    "clear": "CoEBQw=="
+  },
+  "compilerInfo": {
+    "compiler": "puya",
+    "compilerVersion": {
+      "major": 4,
+      "minor": 4,
+      "patch": 4
+    }
+  },
+  "events": [],
+  "templateVariables": {
+    "DELETABLE": {
+      "type": "AVMUint64"
+    },
+    "GREETING": {
+      "type": "AVMString"
+    }
+  }
+}

tests/artifacts/delete_abi_with_inner/contract.py

@@ -0,0 +1,20 @@
+from algopy import (
+    ARC4Contract,
+    arc4,
+    UInt64,
+    TemplateVar,
+    String
+)
+
+class DeleteAbiWithInner(ARC4Contract):
+    def __init__(self) -> None:
+        self.greeting = TemplateVar[String]("GREETING")
+
+    @arc4.abimethod(create="require")
+    def create(self) -> None:
+        return
+        
+    @arc4.abimethod(allow_actions=["DeleteApplication"])
+    def delete(self, app_id: UInt64) -> None:
+        arc4.abi_call("no_op", app_id=app_id)
+        assert TemplateVar[bool]("DELETABLE")

tests/transactions/test_fee_coverage.py

@@ -7,9 +7,18 @@
 
 from algokit_utils import SigningAccount
 from algokit_utils.algorand import AlgorandClient
-from algokit_utils.applications.app_client import AppClient, AppClientMethodCallParams, FundAppAccountParams
-from algokit_utils.applications.app_factory import AppFactoryCreateMethodCallParams, AppFactoryCreateParams
-from algokit_utils.models.amount import AlgoAmount
+from algokit_utils.applications.app_client import (
+    AppClient,
+    AppClientMethodCallCreateParams,
+    AppClientMethodCallParams,
+    FundAppAccountParams,
+)
+from algokit_utils.applications.app_deployer import OnUpdate
+from algokit_utils.applications.app_factory import (
+    AppFactoryCreateMethodCallParams,
+    AppFactoryCreateParams,
+)
+from algokit_utils.models.amount import AlgoAmount, micro_algo
 from algokit_utils.transactions.transaction_composer import PaymentParams
 
 
@@ -692,3 +701,70 @@ def _assert_min_fee(self, app_client: AppClient, params: AppClientMethodCallPara
 
         with pytest.raises(Exception, match="fee too small"):
             app_client.send.call(params_copy)
+
+
+class TestAppDeployerFees:
+    @pytest.fixture
+    def algorand(self) -> AlgorandClient:
+        algorand = AlgorandClient.default_localnet()
+        sp = algorand.client.algod.suggested_params()
+        sp.min_fee = 1000
+        algorand.set_suggested_params_cache(suggested_params=sp)
+        return algorand
+
+    @pytest.fixture
+    def inner_app_id(self, algorand: AlgorandClient, funded_account: SigningAccount) -> int:
+        # Load inner fee contract spec
+        spec_path = Path(__file__).parent.parent / "artifacts" / "inner-fee" / "application.json"
+        inner_fee_spec = json.loads(spec_path.read_text())
+
+        # Create app factory
+        factory = algorand.client.get_app_factory(app_spec=inner_fee_spec, default_sender=funded_account.address)
+
+        # Create app
+        app_client, _ = factory.send.bare.create()
+        return app_client.app_id
+
+    def test_delete_abi_inner_app_call_fees_should_be_covered(
+        self, algorand: AlgorandClient, funded_account: SigningAccount, inner_app_id: int
+    ) -> None:
+        # contract spec
+        contract_spec_path = Path(__file__).parent.parent / "artifacts" / "delete_abi_with_inner" / "application.json"
+        contract_spec = json.loads(contract_spec_path.read_text())
+
+        # Create app factory
+        factory = algorand.client.get_app_factory(app_spec=contract_spec, default_sender=funded_account.address)
+
+        # Deploy the app and fund the account
+        app_client, _ = factory.deploy(
+            compilation_params={
+                "deploy_time_params": {
+                    "GREETING": "Hello",
+                },
+                "deletable": True,
+            },
+            create_params=AppClientMethodCallCreateParams(
+                method="create", args=[inner_app_id], max_fee=micro_algo(200_000)
+            ),
+        )
+        app_client.fund_app_account(FundAppAccountParams(amount=AlgoAmount.from_algo(3)))
+
+        # Replace the app, the delete call has inner app call
+        _, replace_deploy_result = factory.deploy(
+            compilation_params={
+                "deploy_time_params": {
+                    "GREETING": "Hello!",
+                },
+                "deletable": True,
+            },
+            on_update=OnUpdate.ReplaceApp,
+            create_params=AppClientMethodCallCreateParams(
+                method="create", args=[inner_app_id], max_fee=micro_algo(200_000)
+            ),
+            delete_params=AppClientMethodCallParams(method="delete", args=[inner_app_id], max_fee=micro_algo(200_000)),
+            send_params={"populate_app_call_resources": True, "cover_app_call_inner_transaction_fees": True},
+        )
+
+        assert replace_deploy_result.create_result is not None
+        assert replace_deploy_result.delete_result is not None
+        assert replace_deploy_result.delete_result.confirmation is not None