From 4b4b4616d23c992c0a4d0de401fa5bca6da99cd5 Mon Sep 17 00:00:00 2001
From: nambrot <nambrot@googlemail.com>
Date: Tue, 4 Oct 2022 17:14:56 -0400
Subject: [PATCH] Small improvements

---
 src/features/debugger/TxDebugger.tsx  | 21 +++++++++----
 src/features/debugger/debugMessage.ts | 45 +++++++++++++++++++++++----
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/features/debugger/TxDebugger.tsx b/src/features/debugger/TxDebugger.tsx
index e9fea08..af61cb6 100644
--- a/src/features/debugger/TxDebugger.tsx
+++ b/src/features/debugger/TxDebugger.tsx
@@ -3,7 +3,6 @@ import Image from 'next/future/image';
 import { useState } from 'react';
 
 import { Fade } from '../../components/animation/Fade';
-import { CopyButton } from '../../components/buttons/CopyButton';
 import { SearchBar } from '../../components/search/SearchBar';
 import {
   NoSearchError,
@@ -111,11 +110,21 @@ function DebugResult({ result }: { result: MessageDebugResult | null | undefined
               {Array.from(m.properties.entries()).map(([key, val]) => (
                 <div className="flex mt-1" key={`message-${i}-prop-${key}`}>
                   <label className="text-gray-600 w-32">{key}</label>
-                  <div className="relative ml-2 truncate max-w-xs sm:max-w-sm md:max-w-lg">
-                    {val}
-                  </div>
-                  {val.length > 20 && (
-                    <CopyButton copyValue={val} width={12} height={12} classes="ml-2" />
+                  {typeof val === 'string' ? (
+                    <div className="relative ml-2 truncate max-w-xs sm:max-w-sm md:max-w-lg">
+                      {val}
+                    </div>
+                  ) : (
+                    <div className="relative ml-2 truncate max-w-xs sm:max-w-sm md:max-w-lg">
+                      <a
+                        className="my-5 text-blue-600 hover:text-blue-500 underline underline-offset-4"
+                        href={val.url}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        {val.text}
+                      </a>
+                    </div>
                   )}
                 </div>
               ))}
diff --git a/src/features/debugger/debugMessage.ts b/src/features/debugger/debugMessage.ts
index 1a83c2d..b8318d5 100644
--- a/src/features/debugger/debugMessage.ts
+++ b/src/features/debugger/debugMessage.ts
@@ -42,9 +42,14 @@ export interface DebugNoMessagesResult {
   explorerLink?: string;
 }
 
+interface LinkProperty {
+  url: string;
+  text: string;
+}
+
 interface MessageDetails {
   status: MessageDebugStatus;
-  properties: Map<string, string>;
+  properties: Map<string, string | LinkProperty>;
   summary: string;
 }
 
@@ -146,11 +151,28 @@ async function checkMessage(
   message: DispatchedMessage,
 ) {
   logger.debug(JSON.stringify(message));
-  const properties = new Map<string, string>();
-  properties.set('Sender', message.parsed.sender.toString());
-  properties.set('Recipient', message.parsed.sender.toString());
+  const properties = new Map<string, string | LinkProperty>();
+
+  if (message.parsed.sender.toString().startsWith('0x000000000000000000000000')) {
+    const originChainName = DomainIdToChainName[message.parsed.origin];
+    const originCC = multiProvider.getChainConnection(originChainName);
+    const address = '0x' + message.parsed.sender.toString().substring(26);
+    properties.set('Sender', { url: await originCC.getAddressUrl(address), text: address });
+  } else {
+    properties.set('Sender', message.parsed.sender.toString());
+  }
+  if (message.parsed.recipient.toString().startsWith('0x000000000000000000000000')) {
+    const originChainName = DomainIdToChainName[message.parsed.origin];
+    const originCC = multiProvider.getChainConnection(originChainName);
+    const address = '0x' + message.parsed.recipient.toString().substring(26);
+    properties.set('Recipient', { url: await originCC.getAddressUrl(address), text: address });
+  } else {
+    properties.set('Recipient', message.parsed.recipient.toString());
+  }
   properties.set('Origin Domain', message.parsed.origin.toString());
+  properties.set('Origin Chain', DomainIdToChainName[message.parsed.origin] || 'Unknown');
   properties.set('Destination Domain', message.parsed.destination.toString());
+  properties.set('Destination Chain', DomainIdToChainName[message.parsed.destination] || 'Unknown');
   properties.set('Leaf index', message.leafIndex.toString());
   properties.set('Raw Bytes', message.message);
 
@@ -173,7 +195,7 @@ async function checkMessage(
     return {
       status: MessageDebugStatus.UnknownDestChain,
       properties,
-      summary: `Destination chain ${destinationChain} is not included in this message's environment. See https://docs.hyperlane.xyz/hyperlane-docs/developers/domains`,
+      summary: `Destination chain ${destinationChain} is not included in this message's environment. Did you set the right environment in the top right picker? See https://docs.hyperlane.xyz/hyperlane-docs/developers/domains`,
     };
   }
 
@@ -188,10 +210,21 @@ async function checkMessage(
   const processed = await destinationInbox.messages(messageHash);
   if (processed === 1) {
     logger.info('Message has already been processed');
-    // TODO: look for past events to find the exact tx in which the message was processed.
+
+    const filter = destinationInbox.filters.Process(messageHash);
+    const matchedEvents = await destinationInbox.queryFilter(filter);
+    if (matchedEvents.length > 0) {
+      const event = matchedEvents[0];
+      const url = multiProvider
+        .getChainConnection(destinationChain)
+        // @ts-ignore
+        .getTxUrl({ hash: event.transactionHash });
+      properties.set('Process TX', { url, text: event.transactionHash });
+    }
     return {
       status: MessageDebugStatus.NoErrorsFound,
       properties,
+
       summary: 'No errors found, this message has already been processed.',
     };
   } else {