Make ABI autocompletion work on any chain

Author: sembrestels

bun.lockb

@@ -140,13 +140,7 @@ export const act: ICommand<AragonOS> = {
     }
 
     const result = await tryAndCacheNotFound(
-      () =>
-        fetchAbi(
-          resolvedTargetAddress,
-          client,
-          // TODO: use etherscan API to fetch the abis
-          "",
-        ),
+      () => fetchAbi(resolvedTargetAddress, client),
       resolvedTargetAddress,
       ABI,
       cache,

packages/evmcrispr/src/modules/aragonos/commands/act.ts

@@ -75,13 +75,11 @@ export const exec: ICommand<Std> = {
 
         finalSignature = getFunctionFragment(func);
       } else {
-        const etherscanAPI = module.getConfigBinding("etherscanAPI");
         let fetchedAbi: Abi;
         try {
           [targetAddress, fetchedAbi] = await fetchAbi(
             contractAddress,
             await module.getClient(),
-            etherscanAPI,
           );
         } catch (err) {
           const err_ = err as Error;
@@ -217,13 +215,7 @@ export const exec: ICommand<Std> = {
     }
 
     const result = await tryAndCacheNotFound(
-      () =>
-        fetchAbi(
-          resolvedTargetAddress,
-          client,
-          // TODO: use etherscan API to fetch the abis
-          "",
-        ),
+      () => fetchAbi(resolvedTargetAddress, client),
       resolvedTargetAddress,
       ABI,
       cache,

packages/evmcrispr/src/modules/std/commands/exec.ts

@@ -1,56 +1,23 @@
 import type { PublicClient } from "viem";
 
-import { ErrorConnection, ErrorException } from "../errors";
+import { ErrorException } from "../errors";
 import type { Abi, Address } from "../types";
 import { fetchImplementationAddress } from "./proxies";
 
-async function getAbiEntries(
-  etherscanAPI: string,
-  address: string,
-  chainId: number,
-): Promise<Abi> {
-  let baseUrl: string;
-  // TODO: Do not rely on etherscan and use https://github.com/cdump/evmole
-  switch (chainId) {
-    case 1:
-      baseUrl = "https://api.etherscan.io/api";
-      break;
-    case 5:
-      baseUrl = "https://api-goerli.etherscan.io/api";
-      break;
-    case 10:
-      baseUrl = "https://api-optimistic.etherscan.io/api";
-      break;
-    case 100:
-      baseUrl = "https://blockscout.com/xdai/mainnet/api";
-      break;
-    default:
-      throw new ErrorException("network not supported in Etherscan.");
-  }
-
-  const apiKeySegment = chainId !== 100 ? `&apikey=${etherscanAPI}` : "";
-
-  const response = (await fetch(
-    `${baseUrl}?module=contract&action=getabi&address=${address}${apiKeySegment}`,
+async function getAbiEntries(address: string, chainId: number): Promise<Abi> {
+  return await fetch(
+    `https://abi.functions.on-fleek.app/v0/${chainId}/${address}`,
   )
-    .then((response) => response.json())
-    .then((data) => data)) as {
-    status: string;
-    message: string;
-    result: string;
-  };
-
-  if (response.status == "0") {
-    throw new ErrorConnection(response.result);
-  }
-
-  return JSON.parse(response.result);
+    .then((res) => res.json())
+    .catch((err) => {
+      console.error(err);
+      throw new ErrorException("Failed to fetch ABI");
+    });
 }
 
 export const fetchAbi = async (
   contractAddress: Address,
   client: PublicClient,
-  etherscanAPI: string,
 ): Promise<[Address, Abi]> => {
   const implementationAddress = await fetchImplementationAddress(
     contractAddress,
@@ -63,7 +30,7 @@ export const fetchAbi = async (
     throw new ErrorException("Chain id is not supported");
   }
 
-  const fetchedAbi = await getAbiEntries(etherscanAPI, targetAddress, chainId);
+  const fetchedAbi = await getAbiEntries(targetAddress, chainId);
 
   return [targetAddress, fetchedAbi];
 };

packages/evmcrispr/src/utils/abis.ts

@@ -16,8 +16,6 @@ import { expectThrowAsync } from "../../../test-helpers/expects";
 import { findStdCommandNode } from "../../../test-helpers/std";
 import { TEST_ACCOUNT_ADDRESS } from "../../../test-helpers/constants";
 
-const ETHERSCAN_API = process.env.ETHERSCAN_API;
-
 describe("Std > commands > exec <target> <fnSignature> [<...params>] [--from <sender>]", () => {
   let client: PublicClient;
 
@@ -127,7 +125,6 @@ describe("Std > commands > exec <target> <fnSignature> [<...params>] [--from <se
   it("should return exec action when receiving just the method's name", async () => {
     const interpreter = createInterpreter(
       `
-        set $std:etherscanAPI  ${ETHERSCAN_API}
         exec ${target} transfer @me 1500e18
         `,
       client,
@@ -178,7 +175,6 @@ describe("Std > commands > exec <target> <fnSignature> [<...params>] [--from <se
     const invalidSignature = "invalid(uint256,)";
     const interpreter = createInterpreter(
       `
-        set $std:etherscanAPI ${ETHERSCAN_API}
         exec ${target} ${invalidSignature} 1e18`,
       client,
     );