Use Sourcify for Contract name and remove replaced Etherscan methods

Author: 0237h

packages/cli/src/command-helpers/abi.ts

@@ -17,43 +17,15 @@ export const loadAbiFromSourcify = async (
     `Failed to fetch ABI from Sourcify`,
     `Warnings while fetching ABI from Sourcify`,
     async () => {
-      const chainId = await getSourcifyChainId(network);
-      const result = await fetch(
-        `https://repo.sourcify.dev/contracts/full_match/${chainId}/${address}/metadata.json`,
-      );
-      const json = await result.json();
+      const json = await fetchMetadataFromSourcify(network, address);
 
-      if (result.ok) {
+      if (json) {
         return new ABICtor('Contract', undefined, immutable.fromJS(json.output.abi));
       }
       throw new Error('ABI not found, try loading it from a local file');
     },
   );
 
-export const loadAbiFromEtherscan = async (
-  ABICtor: typeof ABI,
-  network: string,
-  address: string,
-): Promise<ABI> =>
-  await withSpinner(
-    `Fetching ABI from Etherscan`,
-    `Failed to fetch ABI from Etherscan`,
-    `Warnings while fetching ABI from Etherscan`,
-    async () => {
-      const scanApiUrl = getEtherscanLikeAPIUrl(network);
-      const result = await fetch(`${scanApiUrl}?module=contract&action=getabi&address=${address}`);
-      const json = await result.json();
-
-      // Etherscan returns a JSON object that has a `status`, a `message` and
-      // a `result` field. The `status` is '0' in case of errors and '1' in
-      // case of success
-      if (json.status === '1') {
-        return new ABICtor('Contract', undefined, immutable.fromJS(JSON.parse(json.result)));
-      }
-      throw new Error('ABI not found, try loading it from a local file');
-    },
-  );
-
 export const loadStartBlockForContract = async (
   network: string,
   address: string,
@@ -74,7 +46,7 @@ export const loadContractNameForAddress = async (
   await withSpinner(
     `Fetching Contract Name`,
     `Failed to fetch Contract Name`,
-    `Warnings while fetching contract name from Etherscan`,
+    `Warnings while fetching contract name from Sourcify`,
     async () => {
       return getContractNameForAddress(network, address);
     },
@@ -147,28 +119,28 @@ export const fetchTransactionByHashFromRPC = async (
   }
 };
 
-export const fetchSourceCodeFromEtherscan = async (
+export const fetchMetadataFromSourcify = async (
   network: string,
   address: string,
 ): Promise<any> => {
-  const scanApiUrl = getEtherscanLikeAPIUrl(network);
+  const chainId = await getSourcifyChainId(network);
   const result = await fetch(
-    `${scanApiUrl}?module=contract&action=getsourcecode&address=${address}`,
+    `https://repo.sourcify.dev/contracts/full_match/${chainId}/${address}/metadata.json`,
   );
   const json = await result.json();
-  if (json.status === '1') {
+  if (result.ok) {
     return json;
   }
-  throw new Error('Failed to fetch contract source code');
+  throw new Error('Failed to fetch metadata for address');
 };
 
 export const getContractNameForAddress = async (
   network: string,
   address: string,
 ): Promise<string> => {
   try {
-    const contractSourceCode = await fetchSourceCodeFromEtherscan(network, address);
-    const contractName = contractSourceCode.result[0].ContractName;
+    const json = await fetchMetadataFromSourcify(network, address);
+    const contractName = Object.values(json.settings.compilationTarget)[0] as string;
     logger('Successfully getContractNameForAddress. contractName: %s', contractName);
     return contractName;
   } catch (error) {

packages/cli/src/commands/add.ts

@@ -4,7 +4,7 @@ import { Args, Command, Flags } from '@oclif/core';
 import { CLIError } from '@oclif/core/lib/errors';
 import {
   loadAbiFromBlockScout,
-  loadAbiFromEtherscan,
+  loadAbiFromSourcify,
   loadContractNameForAddress,
   loadStartBlockForContract,
 } from '../command-helpers/abi';
@@ -96,7 +96,7 @@ export default class AddCommand extends Command {
     } else if (network === 'poa-core') {
       ethabi = await loadAbiFromBlockScout(EthereumABI, network, address);
     } else {
-      ethabi = await loadAbiFromEtherscan(EthereumABI, network, address);
+      ethabi = await loadAbiFromSourcify(EthereumABI, network, address);
     }
 
     try {