feat: move to revert_decoder level

crates/evm/core/src/decode.rs

@@ -181,6 +181,16 @@ impl RevertDecoder {
             return Some(std::str::from_utf8(err).unwrap().to_string());
         }
 
+        // Generic custom error.
+        Some(format!(
+            "custom error {}:{}",
+            hex::encode(selector),
+            std::str::from_utf8(data).map_or_else(|_| trimmed_hex(data), String::from)
+        ))
+    }
+
+    pub fn may_decode_using_open_chain(&self, err: &[u8]) -> Option<String> {
+        let (selector, data) = err.split_at(SELECTOR_LEN);
         // try from https://openchain.xyz
         if let Some(client) = self.open_chain_client.clone() {
             if let Ok(handle) = Handle::try_current() {
@@ -214,13 +224,7 @@ impl RevertDecoder {
                 }
             }
         }
-
-        // Generic custom error.
-        Some(format!(
-            "custom error {}:{}",
-            hex::encode(selector),
-            std::str::from_utf8(data).map_or_else(|_| trimmed_hex(data), String::from)
-        ))
+        None
     }
 }
 

crates/evm/traces/src/decoder/mod.rs

@@ -573,7 +573,15 @@ impl CallTraceDecoder {
 
     /// The default decoded return data for a trace.
     fn default_return_data(&self, trace: &CallTrace) -> Option<String> {
-        (!trace.success).then(|| self.revert_decoder.decode(&trace.output, Some(trace.status)))
+        (!trace.success).then(|| {
+            let err_str = self.revert_decoder.decode(&trace.output, Some(trace.status));
+            if err_str.contains("custom error") {
+                if let Some(err) = self.revert_decoder.may_decode_using_open_chain(&trace.output) {
+                    return err;
+                }
+            }
+            err_str
+        })
     }
 
     /// Decodes an event.