From 971554fe82b9facabdbf31792043df730cd15cd9 Mon Sep 17 00:00:00 2001
From: Willian Mitsuda <wmitsuda@gmail.com>
Date: Wed, 31 Aug 2022 17:20:02 -0300
Subject: [PATCH 1/2] Add support for partial match on Sourcify

---
 src/AddressMainPage.tsx                 | 10 ++--
 src/address/ContractFromRepo.tsx        |  7 ++-
 src/address/Contracts.tsx               | 45 +++++++++--------
 src/components/DecoratedAddressLink.tsx |  4 +-
 src/sourcify/useSourcify.ts             | 64 +++++++++++++++++++++----
 src/transaction/Details.tsx             |  3 +-
 src/transaction/LogEntry.tsx            | 10 ++--
 src/url.ts                              | 19 ++++----
 8 files changed, 110 insertions(+), 52 deletions(-)

diff --git a/src/AddressMainPage.tsx b/src/AddressMainPage.tsx
index 77a3e80..a00263a 100644
--- a/src/AddressMainPage.tsx
+++ b/src/AddressMainPage.tsx
@@ -55,7 +55,7 @@ const AddressMainPage: React.FC<AddressMainPageProps> = ({}) => {
 
   const { provider } = useContext(RuntimeContext);
   const hasCode = useHasCode(provider, checksummedAddress, "latest");
-  const addressMetadata = useSourcifyMetadata(
+  const match = useSourcifyMetadata(
     hasCode ? checksummedAddress : undefined,
     provider?.network.chainId
   );
@@ -110,18 +110,18 @@ const AddressMainPage: React.FC<AddressMainPageProps> = ({}) => {
                   <NavTab href={`/address/${addressOrName}/contract`}>
                     <span
                       className={`flex items-baseline space-x-2 ${
-                        addressMetadata === undefined ? "italic opacity-50" : ""
+                        match === undefined ? "italic opacity-50" : ""
                       }`}
                     >
                       <span>Contract</span>
-                      {addressMetadata === undefined ? (
+                      {match === undefined ? (
                         <span className="self-center">
                           <FontAwesomeIcon
                             className="animate-spin"
                             icon={faCircleNotch}
                           />
                         </span>
-                      ) : addressMetadata === null ? (
+                      ) : match === null ? (
                         <span className="self-center text-red-500">
                           <FontAwesomeIcon icon={faQuestionCircle} />
                         </span>
@@ -153,7 +153,7 @@ const AddressMainPage: React.FC<AddressMainPageProps> = ({}) => {
                     element={
                       <Contracts
                         checksummedAddress={checksummedAddress}
-                        rawMetadata={addressMetadata}
+                        match={match}
                       />
                     }
                   />
diff --git a/src/address/ContractFromRepo.tsx b/src/address/ContractFromRepo.tsx
index 568babf..12e0899 100644
--- a/src/address/ContractFromRepo.tsx
+++ b/src/address/ContractFromRepo.tsx
@@ -1,25 +1,28 @@
 import React from "react";
 import { SyntaxHighlighter, docco } from "../highlight-init";
-import { useContract } from "../sourcify/useSourcify";
+import { MatchType, useContract } from "../sourcify/useSourcify";
 import { useAppConfigContext } from "../useAppConfig";
 
 type ContractFromRepoProps = {
   checksummedAddress: string;
   networkId: number;
   filename: string;
+  type: MatchType;
 };
 
 const ContractFromRepo: React.FC<ContractFromRepoProps> = ({
   checksummedAddress,
   networkId,
   filename,
+  type,
 }) => {
   const { sourcifySource } = useAppConfigContext();
   const content = useContract(
     checksummedAddress,
     networkId,
     filename,
-    sourcifySource
+    sourcifySource,
+    type
   );
 
   return (
diff --git a/src/address/Contracts.tsx b/src/address/Contracts.tsx
index d3e4179..e5ba03d 100644
--- a/src/address/Contracts.tsx
+++ b/src/address/Contracts.tsx
@@ -8,39 +8,39 @@ import InfoRow from "../components/InfoRow";
 import Contract from "./Contract";
 import ContractFromRepo from "./ContractFromRepo";
 import { RuntimeContext } from "../useRuntime";
-import { Metadata } from "../sourcify/useSourcify";
+import { Match, MatchType } from "../sourcify/useSourcify";
 import ExternalLink from "../components/ExternalLink";
 import { openInRemixURL } from "../url";
 import ContractABI from "./ContractABI";
 
 type ContractsProps = {
   checksummedAddress: string;
-  rawMetadata: Metadata | null | undefined;
+  match: Match | null | undefined;
 };
 
-const Contracts: React.FC<ContractsProps> = ({
-  checksummedAddress,
-  rawMetadata,
-}) => {
+const Contracts: React.FC<ContractsProps> = ({ checksummedAddress, match }) => {
   const { provider } = useContext(RuntimeContext);
 
   const [selected, setSelected] = useState<string>();
   useEffect(() => {
-    if (rawMetadata) {
-      setSelected(Object.keys(rawMetadata.sources)[0]);
+    if (match) {
+      setSelected(Object.keys(match.metadata.sources)[0]);
     }
-  }, [rawMetadata]);
-  const optimizer = rawMetadata?.settings?.optimizer;
+  }, [match]);
+  const optimizer = match?.metadata.settings?.optimizer;
 
   return (
     <ContentFrame tabs>
-      {rawMetadata && (
+      {match && (
         <>
+          <InfoRow title="Match">
+            {match.type === MatchType.FULL_MATCH ? "Full" : "Partial"}
+          </InfoRow>
           <InfoRow title="Language">
-            <span>{rawMetadata.language}</span>
+            <span>{match.metadata.language}</span>
           </InfoRow>
           <InfoRow title="Compiler">
-            <span>{rawMetadata.compiler.version}</span>
+            <span>{match.metadata.compiler.version}</span>
           </InfoRow>
           <InfoRow title="Optimizer Enabled">
             {optimizer?.enabled ? (
@@ -58,19 +58,19 @@ const Contracts: React.FC<ContractsProps> = ({
         </>
       )}
       <div className="py-5">
-        {rawMetadata === undefined && (
+        {match === undefined && (
           <span>Getting data from Sourcify repository...</span>
         )}
-        {rawMetadata === null && (
+        {match === null && (
           <span>
             Address is not a contract or couldn't find contract metadata in
             Sourcify repository.
           </span>
         )}
-        {rawMetadata !== undefined && rawMetadata !== null && (
+        {match !== undefined && match !== null && (
           <>
-            {rawMetadata.output.abi && (
-              <ContractABI abi={rawMetadata.output.abi} />
+            {match.metadata.output.abi && (
+              <ContractABI abi={match.metadata.output.abi} />
             )}
             <div>
               <Menu>
@@ -96,7 +96,7 @@ const Contracts: React.FC<ContractsProps> = ({
                 </div>
                 <div className="relative">
                   <Menu.Items className="absolute border p-1 rounded-b bg-white flex flex-col">
-                    {Object.entries(rawMetadata.sources).map(([k]) => (
+                    {Object.entries(match.metadata.sources).map(([k]) => (
                       <Menu.Item key={k}>
                         <button
                           className={`flex text-sm px-2 py-1 ${
@@ -115,13 +115,16 @@ const Contracts: React.FC<ContractsProps> = ({
               </Menu>
               {selected && (
                 <>
-                  {rawMetadata.sources[selected].content ? (
-                    <Contract content={rawMetadata.sources[selected].content} />
+                  {match.metadata.sources[selected].content ? (
+                    <Contract
+                      content={match.metadata.sources[selected].content}
+                    />
                   ) : (
                     <ContractFromRepo
                       checksummedAddress={checksummedAddress}
                       networkId={provider!.network.chainId}
                       filename={selected}
+                      type={match.type}
                     />
                   )}
                 </>
diff --git a/src/components/DecoratedAddressLink.tsx b/src/components/DecoratedAddressLink.tsx
index 4659e68..c6c3fc2 100644
--- a/src/components/DecoratedAddressLink.tsx
+++ b/src/components/DecoratedAddressLink.tsx
@@ -38,7 +38,7 @@ const DecoratedAddressLink: React.FC<DecoratedAddressLinkProps> = ({
   eoa,
 }) => {
   const { provider } = useContext(RuntimeContext);
-  const metadata = useSourcifyMetadata(address, provider?.network.chainId);
+  const match = useSourcifyMetadata(address, provider?.network.chainId);
 
   const mint = addressCtx === AddressContext.FROM && address === ZERO_ADDRESS;
   const burn = addressCtx === AddressContext.TO && address === ZERO_ADDRESS;
@@ -78,7 +78,7 @@ const DecoratedAddressLink: React.FC<DecoratedAddressLinkProps> = ({
           <FontAwesomeIcon icon={faCoins} size="1x" />
         </span>
       )}
-      {metadata && (
+      {match && (
         <NavLink
           className="self-center shrink-0 flex items-center"
           to={`/address/${address}/contract`}
diff --git a/src/sourcify/useSourcify.ts b/src/sourcify/useSourcify.ts
index 1ef4150..69ccfff 100644
--- a/src/sourcify/useSourcify.ts
+++ b/src/sourcify/useSourcify.ts
@@ -82,16 +82,62 @@ export type Metadata = {
   };
 };
 
-const sourcifyFetcher = async (url: string) => {
+export enum MatchType {
+  FULL_MATCH,
+  PARTIAL_MATCH,
+}
+
+export type Match = {
+  type: MatchType;
+  metadata: Metadata;
+};
+
+const sourcifyFetcher = async (
+  _: "sourcify",
+  address: ChecksummedAddress,
+  chainId: number,
+  sourcifySource: SourcifySource
+): Promise<Match | null | undefined> => {
+  // Try full match
   try {
+    const url = sourcifyMetadata(
+      address,
+      chainId,
+      sourcifySource,
+      MatchType.FULL_MATCH
+    );
     const res = await fetch(url);
     if (res.ok) {
-      return res.json();
+      return {
+        type: MatchType.FULL_MATCH,
+        metadata: await res.json(),
+      };
+    }
+  } catch (err) {
+    console.info(
+      `error while getting Sourcify full_match metadata: chainId=${chainId} address=${address} err=${err}; falling back to partial_match`
+    );
+  }
+
+  // Fallback to try partial match
+  try {
+    const url = sourcifyMetadata(
+      address,
+      chainId,
+      sourcifySource,
+      MatchType.PARTIAL_MATCH
+    );
+    const res = await fetch(url);
+    if (res.ok) {
+      return {
+        type: MatchType.PARTIAL_MATCH,
+        metadata: await res.json(),
+      };
     }
     return null;
   } catch (err) {
     console.warn(
-      `error while getting Sourcify metadata: url=${url} err=${err}`
+      `error while getting Sourcify partial_match metadata: chainId=${chainId} address=${address} err=${err}`
     );
     return null;
   }
@@ -100,13 +146,13 @@ const sourcifyFetcher = async (url: string) => {
 export const useSourcifyMetadata = (
   address: ChecksummedAddress | undefined,
   chainId: number | undefined
-): Metadata | null | undefined => {
+): Match | null | undefined => {
   const { sourcifySource } = useAppConfigContext();
   const metadataURL = () =>
     address === undefined || chainId === undefined
       ? null
-      : sourcifyMetadata(address, chainId, sourcifySource);
-  const { data, error } = useSWRImmutable<Metadata>(
+      : ["sourcify", address, chainId, sourcifySource];
+  const { data, error } = useSWRImmutable<Match | null | undefined>(
     metadataURL,
     sourcifyFetcher
   );
@@ -128,14 +174,16 @@ export const useContract = (
   checksummedAddress: string,
   networkId: number,
   filename: string,
-  sourcifySource: SourcifySource
+  sourcifySource: SourcifySource,
+  type: MatchType
 ) => {
   const normalizedFilename = filename.replaceAll(/[@:]/g, "_");
   const url = sourcifySourceFile(
     checksummedAddress,
     networkId,
     normalizedFilename,
-    sourcifySource
+    sourcifySource,
+    type
   );
 
   const { data, error } = useSWRImmutable(url, contractFetcher);
diff --git a/src/transaction/Details.tsx b/src/transaction/Details.tsx
index 8801e7e..9c51b1b 100644
--- a/src/transaction/Details.tsx
+++ b/src/transaction/Details.tsx
@@ -80,7 +80,8 @@ const Details: React.FC<DetailsProps> = ({ txData }) => {
 
   const tokenTransfers = useTokenTransfers(txData);
 
-  const metadata = useSourcifyMetadata(txData?.to, provider?.network.chainId);
+  const match = useSourcifyMetadata(txData?.to, provider?.network.chainId);
+  const metadata = match?.metadata;
 
   const txDesc = useSourcifyTransactionDescription(metadata, txData);
   const userDoc = metadata?.output.userdoc;
diff --git a/src/transaction/LogEntry.tsx b/src/transaction/LogEntry.tsx
index 9f8d691..0024f87 100644
--- a/src/transaction/LogEntry.tsx
+++ b/src/transaction/LogEntry.tsx
@@ -17,14 +17,14 @@ type LogEntryProps = {
 
 const LogEntry: React.FC<LogEntryProps> = ({ log }) => {
   const { provider } = useContext(RuntimeContext);
-  const metadata = useSourcifyMetadata(log.address, provider?.network.chainId);
+  const match = useSourcifyMetadata(log.address, provider?.network.chainId);
 
   const logDesc = useMemo(() => {
-    if (!metadata) {
-      return metadata;
+    if (!match) {
+      return match;
     }
 
-    const abi = metadata.output.abi;
+    const abi = match.metadata.output.abi;
     const intf = new Interface(abi as any);
     try {
       return intf.parseLog({
@@ -35,7 +35,7 @@ const LogEntry: React.FC<LogEntryProps> = ({ log }) => {
       console.warn("Couldn't find function signature", err);
       return null;
     }
-  }, [log, metadata]);
+  }, [log, match]);
 
   const rawTopic0 = log.topics[0];
   const topic0 = useTopic0(rawTopic0);
diff --git a/src/url.ts b/src/url.ts
index 69d8397..b4ad6e2 100644
--- a/src/url.ts
+++ b/src/url.ts
@@ -1,4 +1,5 @@
 import { BlockTag } from "@ethersproject/abstract-provider";
+import { MatchType } from "./sourcify/useSourcify";
 import { ChecksummedAddress } from "./types";
 
 export const fourBytesURL = (
@@ -60,21 +61,23 @@ const resolveSourcifySource = (source: SourcifySource) => {
 export const sourcifyMetadata = (
   address: ChecksummedAddress,
   chainId: number,
-  source: SourcifySource
+  source: SourcifySource,
+  type: MatchType
 ) =>
-  `${resolveSourcifySource(
-    source
-  )}/contracts/full_match/${chainId}/${address}/metadata.json`;
+  `${resolveSourcifySource(source)}/contracts/${
+    type === MatchType.FULL_MATCH ? "full_match" : "partial_match"
+  }/${chainId}/${address}/metadata.json`;
 
 export const sourcifySourceFile = (
   address: ChecksummedAddress,
   chainId: number,
   filepath: string,
-  source: SourcifySource
+  source: SourcifySource,
+  type: MatchType
 ) =>
-  `${resolveSourcifySource(
-    source
-  )}/contracts/full_match/${chainId}/${address}/sources/${filepath}`;
+  `${resolveSourcifySource(source)}/contracts/${
+    type === MatchType.FULL_MATCH ? "full_match" : "partial_match"
+  }/${chainId}/${address}/sources/${filepath}`;
 
 export const openInRemixURL = (checksummedAddress: string, networkId: number) =>
   `https://remix.ethereum.org/#activate=sourcify&call=sourcify//fetchAndSave//${checksummedAddress}//${networkId}`;

From d3618c2691e0fbab1d090909c8222adad5720b8f Mon Sep 17 00:00:00 2001
From: Willian Mitsuda <wmitsuda@gmail.com>
Date: Wed, 31 Aug 2022 17:38:37 -0300
Subject: [PATCH 2/2] Reorg Sourcify code

---
 src/Main.tsx                |  2 +-
 src/SourcifyMenu.tsx        |  2 +-
 src/sourcify/useSourcify.ts | 50 ++++++++++++++++++++++++++++++++++++-
 src/url.ts                  | 50 -------------------------------------
 src/useAppConfig.ts         |  2 +-
 5 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/src/Main.tsx b/src/Main.tsx
index 1fe30e5..344e34c 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -2,7 +2,7 @@ import React, { useMemo, useState } from "react";
 import { Outlet } from "react-router-dom";
 import Header from "./Header";
 import { AppConfig, AppConfigContext } from "./useAppConfig";
-import { SourcifySource } from "./url";
+import { SourcifySource } from "./sourcify/useSourcify";
 
 const Main: React.FC = () => {
   const [sourcifySource, setSourcifySource] = useState<SourcifySource>(
diff --git a/src/SourcifyMenu.tsx b/src/SourcifyMenu.tsx
index ce23472..c4b60dd 100644
--- a/src/SourcifyMenu.tsx
+++ b/src/SourcifyMenu.tsx
@@ -2,8 +2,8 @@ import React, { PropsWithChildren } from "react";
 import { Menu } from "@headlessui/react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faBars } from "@fortawesome/free-solid-svg-icons/faBars";
-import { SourcifySource } from "./url";
 import { useAppConfigContext } from "./useAppConfig";
+import { SourcifySource } from "./sourcify/useSourcify";
 
 const SourcifyMenu: React.FC = () => {
   const { sourcifySource, setSourcifySource } = useAppConfigContext();
diff --git a/src/sourcify/useSourcify.ts b/src/sourcify/useSourcify.ts
index 69ccfff..12be76f 100644
--- a/src/sourcify/useSourcify.ts
+++ b/src/sourcify/useSourcify.ts
@@ -3,7 +3,6 @@ import { Interface } from "@ethersproject/abi";
 import { ErrorDescription } from "@ethersproject/abi/lib/interface";
 import useSWRImmutable from "swr/immutable";
 import { ChecksummedAddress, TransactionData } from "../types";
-import { sourcifyMetadata, SourcifySource, sourcifySourceFile } from "../url";
 import { useAppConfigContext } from "../useAppConfig";
 
 export type UserMethod = {
@@ -82,6 +81,55 @@ export type Metadata = {
   };
 };
 
+export enum SourcifySource {
+  // Resolve trusted IPNS for root IPFS
+  IPFS_IPNS,
+
+  // Centralized Sourcify servers
+  CENTRAL_SERVER,
+}
+
+const sourcifyIPNS =
+  "k51qzi5uqu5dll0ocge71eudqnrgnogmbr37gsgl12uubsinphjoknl6bbi41p";
+const defaultIpfsGatewayPrefix = `https://ipfs.io/ipns/${sourcifyIPNS}`;
+const sourcifyHttpRepoPrefix = `https://repo.sourcify.dev`;
+
+const resolveSourcifySource = (source: SourcifySource) => {
+  if (source === SourcifySource.IPFS_IPNS) {
+    return defaultIpfsGatewayPrefix;
+  }
+  if (source === SourcifySource.CENTRAL_SERVER) {
+    return sourcifyHttpRepoPrefix;
+  }
+
+  throw new Error(`Unknown Sourcify integration source code: ${source}`);
+};
+
+/**
+ * Builds a complete Sourcify metadata.json URL given the contract address
+ * and chain.
+ */
+export const sourcifyMetadata = (
+  address: ChecksummedAddress,
+  chainId: number,
+  source: SourcifySource,
+  type: MatchType
+) =>
+  `${resolveSourcifySource(source)}/contracts/${
+    type === MatchType.FULL_MATCH ? "full_match" : "partial_match"
+  }/${chainId}/${address}/metadata.json`;
+
+export const sourcifySourceFile = (
+  address: ChecksummedAddress,
+  chainId: number,
+  filepath: string,
+  source: SourcifySource,
+  type: MatchType
+) =>
+  `${resolveSourcifySource(source)}/contracts/${
+    type === MatchType.FULL_MATCH ? "full_match" : "partial_match"
+  }/${chainId}/${address}/sources/${filepath}`;
+
 export enum MatchType {
   FULL_MATCH,
   PARTIAL_MATCH,
diff --git a/src/url.ts b/src/url.ts
index b4ad6e2..236b3e9 100644
--- a/src/url.ts
+++ b/src/url.ts
@@ -1,5 +1,4 @@
 import { BlockTag } from "@ethersproject/abstract-provider";
-import { MatchType } from "./sourcify/useSourcify";
 import { ChecksummedAddress } from "./types";
 
 export const fourBytesURL = (
@@ -30,54 +29,5 @@ export const transactionURL = (txHash: string) => `/tx/${txHash}`;
 export const addressByNonceURL = (address: ChecksummedAddress, nonce: number) =>
   `/address/${address}?nonce=${nonce}`;
 
-export enum SourcifySource {
-  // Resolve trusted IPNS for root IPFS
-  IPFS_IPNS,
-
-  // Centralized Sourcify servers
-  CENTRAL_SERVER,
-}
-
-const sourcifyIPNS =
-  "k51qzi5uqu5dll0ocge71eudqnrgnogmbr37gsgl12uubsinphjoknl6bbi41p";
-const defaultIpfsGatewayPrefix = `https://ipfs.io/ipns/${sourcifyIPNS}`;
-const sourcifyHttpRepoPrefix = `https://repo.sourcify.dev`;
-
-const resolveSourcifySource = (source: SourcifySource) => {
-  if (source === SourcifySource.IPFS_IPNS) {
-    return defaultIpfsGatewayPrefix;
-  }
-  if (source === SourcifySource.CENTRAL_SERVER) {
-    return sourcifyHttpRepoPrefix;
-  }
-
-  throw new Error(`Unknown Sourcify integration source code: ${source}`);
-};
-
-/**
- * Builds a complete Sourcify metadata.json URL given the contract address
- * and chain.
- */
-export const sourcifyMetadata = (
-  address: ChecksummedAddress,
-  chainId: number,
-  source: SourcifySource,
-  type: MatchType
-) =>
-  `${resolveSourcifySource(source)}/contracts/${
-    type === MatchType.FULL_MATCH ? "full_match" : "partial_match"
-  }/${chainId}/${address}/metadata.json`;
-
-export const sourcifySourceFile = (
-  address: ChecksummedAddress,
-  chainId: number,
-  filepath: string,
-  source: SourcifySource,
-  type: MatchType
-) =>
-  `${resolveSourcifySource(source)}/contracts/${
-    type === MatchType.FULL_MATCH ? "full_match" : "partial_match"
-  }/${chainId}/${address}/sources/${filepath}`;
-
 export const openInRemixURL = (checksummedAddress: string, networkId: number) =>
   `https://remix.ethereum.org/#activate=sourcify&call=sourcify//fetchAndSave//${checksummedAddress}//${networkId}`;
diff --git a/src/useAppConfig.ts b/src/useAppConfig.ts
index 56007e0..1ba3c9d 100644
--- a/src/useAppConfig.ts
+++ b/src/useAppConfig.ts
@@ -1,5 +1,5 @@
 import React, { useContext } from "react";
-import { SourcifySource } from "./url";
+import { SourcifySource } from "./sourcify/useSourcify";
 
 export type AppConfig = {
   sourcifySource: SourcifySource;