Small improvements

pull/5/head
nambrot 2 years ago
parent 07b53fe0da
commit 4b4b4616d2
  1. 15
      src/features/debugger/TxDebugger.tsx
  2. 43
      src/features/debugger/debugMessage.ts

@ -3,7 +3,6 @@ import Image from 'next/future/image';
import { useState } from 'react'; import { useState } from 'react';
import { Fade } from '../../components/animation/Fade'; import { Fade } from '../../components/animation/Fade';
import { CopyButton } from '../../components/buttons/CopyButton';
import { SearchBar } from '../../components/search/SearchBar'; import { SearchBar } from '../../components/search/SearchBar';
import { import {
NoSearchError, NoSearchError,
@ -111,11 +110,21 @@ function DebugResult({ result }: { result: MessageDebugResult | null | undefined
{Array.from(m.properties.entries()).map(([key, val]) => ( {Array.from(m.properties.entries()).map(([key, val]) => (
<div className="flex mt-1" key={`message-${i}-prop-${key}`}> <div className="flex mt-1" key={`message-${i}-prop-${key}`}>
<label className="text-gray-600 w-32">{key}</label> <label className="text-gray-600 w-32">{key}</label>
{typeof val === 'string' ? (
<div className="relative ml-2 truncate max-w-xs sm:max-w-sm md:max-w-lg"> <div className="relative ml-2 truncate max-w-xs sm:max-w-sm md:max-w-lg">
{val} {val}
</div> </div>
{val.length > 20 && ( ) : (
<CopyButton copyValue={val} width={12} height={12} classes="ml-2" /> <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> </div>
))} ))}

@ -42,9 +42,14 @@ export interface DebugNoMessagesResult {
explorerLink?: string; explorerLink?: string;
} }
interface LinkProperty {
url: string;
text: string;
}
interface MessageDetails { interface MessageDetails {
status: MessageDebugStatus; status: MessageDebugStatus;
properties: Map<string, string>; properties: Map<string, string | LinkProperty>;
summary: string; summary: string;
} }
@ -146,11 +151,28 @@ async function checkMessage(
message: DispatchedMessage, message: DispatchedMessage,
) { ) {
logger.debug(JSON.stringify(message)); logger.debug(JSON.stringify(message));
const properties = new Map<string, string>(); 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()); properties.set('Sender', message.parsed.sender.toString());
properties.set('Recipient', 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 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 Domain', message.parsed.destination.toString());
properties.set('Destination Chain', DomainIdToChainName[message.parsed.destination] || 'Unknown');
properties.set('Leaf index', message.leafIndex.toString()); properties.set('Leaf index', message.leafIndex.toString());
properties.set('Raw Bytes', message.message); properties.set('Raw Bytes', message.message);
@ -173,7 +195,7 @@ async function checkMessage(
return { return {
status: MessageDebugStatus.UnknownDestChain, status: MessageDebugStatus.UnknownDestChain,
properties, 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); const processed = await destinationInbox.messages(messageHash);
if (processed === 1) { if (processed === 1) {
logger.info('Message has already been processed'); 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 { return {
status: MessageDebugStatus.NoErrorsFound, status: MessageDebugStatus.NoErrorsFound,
properties, properties,
summary: 'No errors found, this message has already been processed.', summary: 'No errors found, this message has already been processed.',
}; };
} else { } else {

Loading…
Cancel
Save