Refactor transaction sender to match TS implementation

crates/algokit_test_artifacts/contracts/abi-create-and-delete/application.arc56.json

@@ -0,0 +1,151 @@
+{
+    "name": "application",
+    "structs": {},
+    "methods": [
+        {
+            "name": "create",
+            "args": [
+                {
+                    "type": "pay",
+                    "name": "pay_txn"
+                }
+            ],
+            "returns": {
+                "type": "string"
+            },
+            "actions": {
+                "create": [
+                    "NoOp"
+                ],
+                "call": []
+            },
+            "readonly": false,
+            "desc": "Create the application",
+            "events": [],
+            "recommendations": {}
+        },
+        {
+            "name": "delete",
+            "args": [
+                {
+                    "type": "pay",
+                    "name": "pay_txn"
+                }
+            ],
+            "returns": {
+                "type": "string"
+            },
+            "actions": {
+                "create": [],
+                "call": [
+                    "DeleteApplication"
+                ]
+            },
+            "readonly": false,
+            "desc": "Delete the application",
+            "events": [],
+            "recommendations": {}
+        }
+    ],
+    "arcs": [
+        22,
+        28
+    ],
+    "networks": {},
+    "state": {
+        "schema": {
+            "global": {
+                "ints": 0,
+                "bytes": 0
+            },
+            "local": {
+                "ints": 0,
+                "bytes": 0
+            }
+        },
+        "keys": {
+            "global": {},
+            "local": {},
+            "box": {}
+        },
+        "maps": {
+            "global": {},
+            "local": {},
+            "box": {}
+        }
+    },
+    "bareActions": {
+        "create": [],
+        "call": [
+            "UpdateApplication"
+        ]
+    },
+    "sourceInfo": {
+        "approval": {
+            "sourceInfo": [
+                {
+                    "pc": [
+                        34
+                    ],
+                    "errorMessage": "OnCompletion is not DeleteApplication"
+                },
+                {
+                    "pc": [
+                        73
+                    ],
+                    "errorMessage": "OnCompletion is not NoOp"
+                },
+                {
+                    "pc": [
+                        77
+                    ],
+                    "errorMessage": "can only call when creating"
+                },
+                {
+                    "pc": [
+                        37,
+                        118
+                    ],
+                    "errorMessage": "can only call when not creating"
+                },
+                {
+                    "pc": [
+                        47,
+                        86
+                    ],
+                    "errorMessage": "transaction type is pay"
+                }
+            ],
+            "pcOffsetMethod": "cblocks"
+        },
+        "clear": {
+            "sourceInfo": [],
+            "pcOffsetMethod": "none"
+        }
+    },
+    "source": {
+        "approval": "I3ByYWdtYSB2ZXJzaW9uIDEwCiNwcmFnbWEgdHlwZXRyYWNrIGZhbHNlCgovLyBhbGdvcHkuYXJjNC5BUkM0Q29udHJhY3QuYXBwcm92YWxfcHJvZ3JhbSgpIC0+IHVpbnQ2NDoKbWFpbjoKICAgIGludGNibG9jayAxIFRNUExfVVBEQVRBQkxFIFRNUExfREVMRVRBQkxFCiAgICAvLyBjb250cmFjdC5weTo0CiAgICAvLyBjbGFzcyBhcHBsaWNhdGlvbihBUkM0Q29udHJhY3QpOgogICAgdHhuIE51bUFwcEFyZ3MKICAgIGJ6IG1haW5fYmFyZV9yb3V0aW5nQDcKICAgIHB1c2hieXRlc3MgMHhjNjY5NWYzOSAweDg4ZDZjZTlkIC8vIG1ldGhvZCAiY3JlYXRlKHBheSlzdHJpbmciLCBtZXRob2QgImRlbGV0ZShwYXkpc3RyaW5nIgogICAgdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAogICAgbWF0Y2ggbWFpbl9jcmVhdGVfcm91dGVAMyBtYWluX2RlbGV0ZV9yb3V0ZUA0CgptYWluX2FmdGVyX2lmX2Vsc2VAMTE6CiAgICAvLyBjb250cmFjdC5weTo0CiAgICAvLyBjbGFzcyBhcHBsaWNhdGlvbihBUkM0Q29udHJhY3QpOgogICAgcHVzaGludCAwIC8vIDAKICAgIHJldHVybgoKbWFpbl9kZWxldGVfcm91dGVANDoKICAgIC8vIGNvbnRyYWN0LnB5OjE0CiAgICAvLyBAYXJjNC5hYmltZXRob2QoYWxsb3dfYWN0aW9ucz1bIkRlbGV0ZUFwcGxpY2F0aW9uIl0pCiAgICB0eG4gT25Db21wbGV0aW9uCiAgICBwdXNoaW50IDUgLy8gRGVsZXRlQXBwbGljYXRpb24KICAgID09CiAgICBhc3NlcnQgLy8gT25Db21wbGV0aW9uIGlzIG5vdCBEZWxldGVBcHBsaWNhdGlvbgogICAgdHhuIEFwcGxpY2F0aW9uSUQKICAgIGFzc2VydCAvLyBjYW4gb25seSBjYWxsIHdoZW4gbm90IGNyZWF0aW5nCiAgICAvLyBjb250cmFjdC5weTo0CiAgICAvLyBjbGFzcyBhcHBsaWNhdGlvbihBUkM0Q29udHJhY3QpOgogICAgdHhuIEdyb3VwSW5kZXgKICAgIGludGNfMCAvLyAxCiAgICAtCiAgICBkdXAKICAgIGd0eG5zIFR5cGVFbnVtCiAgICBpbnRjXzAgLy8gcGF5CiAgICA9PQogICAgYXNzZXJ0IC8vIHRyYW5zYWN0aW9uIHR5cGUgaXMgcGF5CiAgICAvLyBjb250cmFjdC5weToxNAogICAgLy8gQGFyYzQuYWJpbWV0aG9kKGFsbG93X2FjdGlvbnM9WyJEZWxldGVBcHBsaWNhdGlvbiJdKQogICAgY2FsbHN1YiBkZWxldGUKICAgIGR1cAogICAgbGVuCiAgICBpdG9iCiAgICBleHRyYWN0IDYgMgogICAgc3dhcAogICAgY29uY2F0CiAgICBwdXNoYnl0ZXMgMHgxNTFmN2M3NQogICAgc3dhcAogICAgY29uY2F0CiAgICBsb2cKICAgIGludGNfMCAvLyAxCiAgICByZXR1cm4KCm1haW5fY3JlYXRlX3JvdXRlQDM6CiAgICAvLyBjb250cmFjdC5weTo1CiAgICAvLyBAYXJjNC5hYmltZXRob2QoY3JlYXRlPSJyZXF1aXJlIikKICAgIHR4biBPbkNvbXBsZXRpb24KICAgICEKICAgIGFzc2VydCAvLyBPbkNvbXBsZXRpb24gaXMgbm90IE5vT3AKICAgIHR4biBBcHBsaWNhdGlvbklECiAgICAhCiAgICBhc3NlcnQgLy8gY2FuIG9ubHkgY2FsbCB3aGVuIGNyZWF0aW5nCiAgICAvLyBjb250cmFjdC5weTo0CiAgICAvLyBjbGFzcyBhcHBsaWNhdGlvbihBUkM0Q29udHJhY3QpOgogICAgdHhuIEdyb3VwSW5kZXgKICAgIGludGNfMCAvLyAxCiAgICAtCiAgICBndHhucyBUeXBlRW51bQogICAgaW50Y18wIC8vIHBheQogICAgPT0KICAgIGFzc2VydCAvLyB0cmFuc2FjdGlvbiB0eXBlIGlzIHBheQogICAgLy8gY29udHJhY3QucHk6NQogICAgLy8gQGFyYzQuYWJpbWV0aG9kKGNyZWF0ZT0icmVxdWlyZSIpCiAgICBwdXNoYnl0ZXMgMHgxNTFmN2M3NTAwMDc2MzcyNjU2MTc0NjU2NAogICAgbG9nCiAgICBpbnRjXzAgLy8gMQogICAgcmV0dXJuCgptYWluX2JhcmVfcm91dGluZ0A3OgogICAgLy8gY29udHJhY3QucHk6NAogICAgLy8gY2xhc3MgYXBwbGljYXRpb24oQVJDNENvbnRyYWN0KToKICAgIHB1c2hpbnQgNCAvLyA0CiAgICB0eG4gT25Db21wbGV0aW9uCiAgICBtYXRjaCBtYWluX3VwZGF0ZUA4CiAgICBiIG1haW5fYWZ0ZXJfaWZfZWxzZUAxMQoKbWFpbl91cGRhdGVAODoKICAgIC8vIGNvbnRyYWN0LnB5OjEwCiAgICAvLyBAYXJjNC5iYXJlbWV0aG9kKGFsbG93X2FjdGlvbnM9WyJVcGRhdGVBcHBsaWNhdGlvbiJdKQogICAgdHhuIEFwcGxpY2F0aW9uSUQKICAgIGFzc2VydCAvLyBjYW4gb25seSBjYWxsIHdoZW4gbm90IGNyZWF0aW5nCiAgICBjYWxsc3ViIHVwZGF0ZQogICAgaW50Y18wIC8vIDEKICAgIHJldHVybgoKCi8vIGNvbnRyYWN0LmFwcGxpY2F0aW9uLnVwZGF0ZSgpIC0+IHZvaWQ6CnVwZGF0ZToKICAgIC8vIGNvbnRyYWN0LnB5OjEyCiAgICAvLyBhc3NlcnQgVGVtcGxhdGVWYXJbYm9vbF0oIlVQREFUQUJMRSIpCiAgICBpbnRjXzEgLy8gVE1QTF9VUERBVEFCTEUKICAgIGFzc2VydAogICAgcmV0c3ViCgoKLy8gY29udHJhY3QuYXBwbGljYXRpb24uZGVsZXRlKHBheV90eG46IHVpbnQ2NCkgLT4gYnl0ZXM6CmRlbGV0ZToKICAgIC8vIGNvbnRyYWN0LnB5OjE0LTE1CiAgICAvLyBAYXJjNC5hYmltZXRob2QoYWxsb3dfYWN0aW9ucz1bIkRlbGV0ZUFwcGxpY2F0aW9uIl0pCiAgICAvLyBkZWYgZGVsZXRlKHNlbGYsIHBheV90eG46IGd0eG4uUGF5bWVudFRyYW5zYWN0aW9uKSAtPiBTdHJpbmc6CiAgICBwcm90byAxIDEKICAgIC8vIGNvbnRyYWN0LnB5OjE3CiAgICAvLyBhc3NlcnQgVGVtcGxhdGVWYXJbVUludDY0XSgiREVMRVRBQkxFIikKICAgIGludGNfMiAvLyBUTVBMX0RFTEVUQUJMRQogICAgYXNzZXJ0CiAgICAvLyBjb250cmFjdC5weToxOAogICAgLy8gcmV0dXJuIFN0cmluZygiZGVsZXRlZCIpCiAgICBwdXNoYnl0ZXMgImRlbGV0ZWQiCiAgICByZXRzdWIK",
+        "clear": "I3ByYWdtYSB2ZXJzaW9uIDEwCiNwcmFnbWEgdHlwZXRyYWNrIGZhbHNlCgovLyBhbGdvcHkuYXJjNC5BUkM0Q29udHJhY3QuY2xlYXJfc3RhdGVfcHJvZ3JhbSgpIC0+IHVpbnQ2NDoKbWFpbjoKICAgIHB1c2hpbnQgMSAvLyAxCiAgICByZXR1cm4K"
+    },
+    "byteCode": {
+        "approval": "CiADAQAAMRtBAGSCAgTGaV85BIjWzp02GgCOAgAsAAOBAEMxGYEFEkQxGEQxFiIJSTgQIhJEiABMSRUWVwYCTFCABBUffHVMULAiQzEZFEQxGBREMRYiCTgQIhJEgA0VH3x1AAdjcmVhdGVksCJDgQQxGY4BAANC/6YxGESIAAIiQyNEiYoBASREgAdkZWxldGVkiQ==",
+        "clear": "CoEBQw=="
+    },
+    "compilerInfo": {
+        "compiler": "puya",
+        "compilerVersion": {
+            "major": 4,
+            "minor": 10,
+            "patch": 0
+        }
+    },
+    "events": [],
+    "templateVariables": {
+        "UPDATABLE": {
+            "type": "AVMUint64"
+        },
+        "DELETABLE": {
+            "type": "AVMUint64"
+        }
+    }
+}

crates/algokit_test_artifacts/contracts/abi-create-and-delete/contract.py

@@ -0,0 +1,18 @@
+from algopy import ARC4Contract, arc4, gtxn, TemplateVar, UInt64, String
+
+
+class application(ARC4Contract):
+    @arc4.abimethod(create="require")
+    def create(self, pay_txn: gtxn.PaymentTransaction) -> String:
+        """Create the application"""
+        return String("created")
+
+    @arc4.baremethod(allow_actions=["UpdateApplication"])
+    def update(self) -> None:
+        assert TemplateVar[bool]("UPDATABLE")
+
+    @arc4.abimethod(allow_actions=["DeleteApplication"])
+    def delete(self, pay_txn: gtxn.PaymentTransaction) -> String:
+        """Delete the application"""
+        assert TemplateVar[UInt64]("DELETABLE")
+        return String("deleted")

crates/algokit_test_artifacts/src/lib.rs

@@ -226,3 +226,9 @@ pub mod box_map_test {
     /// Contract for testing box map operations and complex data handling.
     pub const APPLICATION_ARC56: &str = include_str!("../contracts/boxmap/application.arc56.json");
 }
+
+pub mod abi_create_and_delete {
+    /// Simple contract that create and delete by ABI method (ARC56)
+    pub const APPLICATION_ARC56: &str =
+        include_str!("../contracts/abi-create-and-delete/application.arc56.json");
+}

crates/algokit_utils/src/applications/app_client/error.rs

@@ -1,8 +1,8 @@
+use crate::ComposerError;
 use crate::applications::app_client::types::LogicError;
 use crate::clients::app_manager::AppManagerError;
 use crate::clients::client_manager::ClientManagerError;
 use crate::transactions::TransactionSenderError;
-use crate::{ComposerError, TransactionResultError};
 use algokit_abi::error::ABIError;
 use algokit_transact::AlgoKitTransactError;
 use snafu::Snafu;
@@ -49,6 +49,4 @@ pub enum AppClientError {
     DecodeError { message: String },
     #[snafu(display("Client manager error: {source}"))]
     ClientManagerError { source: ClientManagerError },
-    #[snafu(display("Transaction result error: {source}"))]
-    TransactionResultError { source: TransactionResultError },
 }

crates/algokit_utils/src/applications/app_client/error_transformation.rs

@@ -1,7 +1,7 @@
 use super::types::LogicError;
 use super::{AppClient, AppSourceMaps};
 use crate::AlgorandClient;
-use crate::transactions::TransactionResultError;
+use crate::{AppClientError, TransactionSenderError};
 use algokit_abi::{Arc56Contract, arc56_contract::PcOffsetMethod};
 use lazy_static::lazy_static;
 use regex::Regex;
@@ -63,19 +63,18 @@ impl LogicErrorContext<'_> {
     /// Create an enhanced LogicError from a transaction error, applying source maps if available.
     pub(crate) fn expose_logic_error(
         &self,
-        error: &TransactionResultError,
+        error_message: &str,
         is_clear_state_program: bool,
     ) -> LogicError {
-        let err_str = format!("{}", error);
-        let parsed_logic_error_data = extract_logic_error_data(&err_str);
+        let parsed_logic_error_data = extract_logic_error_data(error_message);
         let (mut line_no_opt, mut listing) =
-            self.apply_source_map_for_message(&err_str, is_clear_state_program);
+            self.apply_source_map_for_message(error_message, is_clear_state_program);
         let source_map = self.get_source_map(is_clear_state_program).cloned();
-        let transaction_id = Self::extract_transaction_id(&err_str);
-        let pc_opt = Self::extract_pc(&err_str);
+        let transaction_id = Self::extract_transaction_id(error_message);
+        let pc_opt = Self::extract_pc(error_message);
 
         let mut logic = LogicError {
-            message: err_str.clone(),
+            message: error_message.to_string(),
             program: None,
             source_map,
             transaction_id,
@@ -87,7 +86,7 @@ impl LogicErrorContext<'_> {
                 Some(listing.clone())
             },
             traces: None,
-            logic_error_str: Some(err_str.clone()),
+            logic_error_str: Some(error_message.to_string()),
         };
 
         let (tx_id, parsed_pc, msg_msg) = if let Some(p) = parsed_logic_error_data {
@@ -162,7 +161,7 @@ impl LogicErrorContext<'_> {
         }
 
         if let Some(emsg) = arc56_error_message.or(msg_msg) {
-            let app_id_from_msg = Self::extract_app_id(&err_str);
+            let app_id_from_msg = Self::extract_app_id(error_message);
             let app_id = app_id_from_msg
                 .or_else(|| Some(self.app_id.to_string()))
                 .unwrap_or_else(|| "N/A".to_string());
@@ -396,19 +395,40 @@ impl LogicErrorContext<'_> {
 }
 
 impl AppClient {
-    /// Create an enhanced LogicError from a transaction error, applying source maps if available.
-    pub fn expose_logic_error(
+    pub(crate) fn transform_transaction_error(
         &self,
-        error: &TransactionResultError,
+        err: TransactionSenderError,
         is_clear_state_program: bool,
-    ) -> LogicError {
-        let context = LogicErrorContext {
-            app_id: self.app_id(),
-            app_spec: self.app_spec(),
-            algorand: self.algorand(),
-            source_maps: self.source_maps.as_ref(),
-        };
+    ) -> AppClientError {
+        let error_message = err.to_string();
+
+        // Only transform errors that are for this app (when app_id is known)
+        if self.app_id() != 0 {
+            let app_tag = format!("app={}", self.app_id());
+            if !error_message.contains(&app_tag) {
+                return AppClientError::TransactionSenderError { source: err };
+            }
+        }
 
-        context.expose_logic_error(error, is_clear_state_program)
+        let parsed_logic_error_data = extract_logic_error_data(&error_message);
+
+        match parsed_logic_error_data {
+            Some(_) => {
+                let context = LogicErrorContext {
+                    app_id: self.app_id(),
+                    app_spec: self.app_spec(),
+                    algorand: self.algorand(),
+                    source_maps: self.source_maps.as_ref(),
+                };
+
+                let logic_error =
+                    context.expose_logic_error(&error_message, is_clear_state_program);
+                AppClientError::LogicError {
+                    message: logic_error.message.clone(),
+                    logic: Box::new(logic_error),
+                }
+            }
+            None => AppClientError::TransactionSenderError { source: err },
+        }
     }
 }

crates/algokit_utils/src/applications/app_client/mod.rs

@@ -3,7 +3,7 @@ use crate::clients::app_manager::{AppState, BoxName};
 use crate::clients::network_client::NetworkDetails;
 use crate::transactions::{TransactionComposerConfig, TransactionSigner};
 use crate::{AlgorandClient, clients::app_manager::BoxIdentifier};
-use crate::{SendParams, SendTransactionResult};
+use crate::{SendParams, SendResult};
 use algokit_abi::{ABIType, ABIValue, Arc56Contract};
 use algokit_transact::Address;
 use std::collections::HashMap;
@@ -39,7 +39,7 @@ pub use transaction_builder::TransactionBuilder;
 pub use transaction_sender::TransactionSender;
 pub use types::{
     AppClientBareCallParams, AppClientMethodCallParams, AppClientParams, AppSourceMaps,
-    CompilationParams, FundAppAccountParams,
+    CompilationParams, FundAppAccountParams, LogicError,
 };
 
 type BoxNameFilter = Box<dyn Fn(&BoxName) -> bool>;
@@ -262,7 +262,7 @@ impl AppClient {
         &self,
         params: FundAppAccountParams,
         send_params: Option<SendParams>,
-    ) -> Result<SendTransactionResult, AppClientError> {
+    ) -> Result<SendResult, AppClientError> {
         self.send().fund_app_account(params, send_params).await
     }
 

crates/algokit_utils/src/applications/app_client/params_builder.rs

@@ -365,12 +365,12 @@ impl<'app_client> ParamsBuilder<'app_client> {
 
                 let app_call_result =
                     Box::pin(self.client.send().call(method_call_params, None, None)).await?;
+
                 let abi_return = app_call_result.abi_return.ok_or_else(|| {
                     AppClientError::ParamsBuilderError {
                         message: "Method call did not return a value".to_string(),
                     }
                 })?;
-
                 match abi_return.return_value {
                     None => Err(AppClientError::ParamsBuilderError {
                         message: "Method call did not return a value".to_string(),