fix: gas estimation for tron

Author: troykessler

rust/main/chains/hyperlane-ethereum/src/ism/interchain_security_module.rs

@@ -152,19 +152,10 @@ where
         if self.module_type().await? == ModuleType::Null {
             if let Some(sender) = self.contract.client().default_sender() {
                 let tr = ITrustedRelayerIsm::new(self.contract.address(), self.contract.client());
-                match tr.trusted_relayer().call().await {
-                    Ok(trusted_relayer) if trusted_relayer == sender => {
+                if let Ok(trusted_relayer) = tr.trusted_relayer().call().await {
+                    if trusted_relayer == sender {
                         return Ok(Some(U256::zero()));
                     }
-                    Ok(_) => {} // not the trusted relayer, return None below
-                    Err(err) => {
-                        warn!(
-                            ?err,
-                            ism_address = ?self.contract.address(),
-                            ?sender,
-                            "Failed to query trustedRelayer() on Null ISM"
-                        );
-                    }
                 }
             }
         }

rust/main/chains/hyperlane-tron/abis/ITrustedRelayerIsm.abi.json

@@ -0,0 +1,15 @@
+[
+  {
+    "inputs": [],
+    "name": "trustedRelayer",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

rust/main/chains/hyperlane-tron/src/ism/interchain_security_module.rs

@@ -15,6 +15,7 @@ use hyperlane_core::{
 use num_traits::cast::FromPrimitive;
 
 use crate::interfaces::i_interchain_security_module::IInterchainSecurityModule as TronInterchainSecurityModuleInternal;
+use crate::interfaces::i_trusted_relayer_ism::ITrustedRelayerIsm;
 use crate::TronProvider;
 
 /// A reference to an InterchainSecurityModule contract on some Tron chain
@@ -78,9 +79,21 @@ impl InterchainSecurityModule for TronInterchainSecurityModule {
         );
         let (verifies, gas_estimate) = try_join(tx.call(), tx.estimate_gas()).await?;
         if verifies {
-            Ok(Some(gas_estimate.into()))
-        } else {
-            Ok(None)
+            return Ok(Some(gas_estimate.into()));
+        }
+        // For Null-typed ISMs (e.g. TrustedRelayerIsm), verify() returns false
+        // during a dry run because it depends on mailbox state set during process().
+        // If we are the configured trusted relayer, include it with gas=0.
+        if self.module_type().await? == ModuleType::Null {
+            if let Some(sender) = self.contract.client().signer_address() {
+                let tr = ITrustedRelayerIsm::new(self.contract.address(), self.contract.client());
+                if let Ok(trusted_relayer) = tr.trusted_relayer().call().await {
+                    if trusted_relayer == sender {
+                        return Ok(Some(U256::zero()));
+                    }
+                }
+            }
         }
+        Ok(None)
     }
 }

rust/main/chains/hyperlane-tron/src/provider/tron.rs

@@ -84,6 +84,11 @@ impl TronProvider {
         })
     }
 
+    /// Returns the signer's Ethereum-style address, if a signer is configured.
+    pub fn signer_address(&self) -> Option<H160> {
+        self.signer.as_ref().map(|s| s.address())
+    }
+
     fn get_signer(&self) -> ChainResult<&TronSigner> {
         Ok(self
             .signer

rust/main/hyperlane-base/src/settings/chains.rs

@@ -1073,7 +1073,8 @@ impl ChainConf {
                 Ok(Box::new(ism) as Box<dyn InterchainSecurityModule>)
             }
             ChainConnectionConf::Tron(conf) => {
-                let provider = build_tron_provider(self, conf, metrics, &locator, None)?;
+                let signer = self.tron_signer().await.context(ctx)?;
+                let provider = build_tron_provider(self, conf, metrics, &locator, signer)?;
                 let ism = h_tron::TronInterchainSecurityModule::new(provider, &locator);
                 Ok(Box::new(ism) as Box<dyn InterchainSecurityModule>)
             }