create-ponder 0.2.5 → 0.2.7

package/dist/index.js

@@ -16,7 +16,7 @@ import { default as prompts } from "prompts";
 // package.json
 var package_default = {
   name: "create-ponder",
-  version: "0.2.5",
+  version: "0.2.7",
   type: "module",
   description: "A CLI tool to create Ponder apps",
   license: "MIT",
@@ -115,22 +115,13 @@ var fromEtherscan = async ({
       `${pico.red("\u2717")} Invalid block explorer URL (${explorerUrl.href}). Expected path "/address/<contract-address>".`
     );
   }
-  let abiResult = void 0;
-  try {
-    abiResult = await getContractAbiAndName(contractAddress, apiUrl, apiKey);
-  } catch (e) {
-    const error = e;
-    throw new Error(
-      `${pico.red("\u2717")} Failed to fetch contract ABI from block explorer API: ${error.message}`
-    );
-  }
-  if (typeof abiResult.abi !== "string")
-    throw new Error(
-      `${pico.red(
-        "\u2717"
-      )} Invalid ABI returned from block explorer API. Is the contract verified?`
-    );
-  const baseAbi = JSON.parse(abiResult.abi);
+  const abiResult = await getContractAbiAndName(
+    contractAddress,
+    apiUrl,
+    apiKey
+  );
+  warnings.push(...abiResult.warnings);
+  const baseAbi = abiResult.abi;
   let contractName = abiResult.contractName;
   const abis = [
     { abi: baseAbi, contractName }
@@ -152,7 +143,11 @@ var fromEtherscan = async ({
       apiKey
     );
     blockNumber = contractCreationBlockNumber;
-  } catch (error) {
+  } catch (e) {
+    const error = e;
+    warnings.push(
+      `Unable to fetch contract deployment block number from block explorer. Error: ${error.message}`
+    );
   }
   if (baseAbi.find(
     (item) => item.type === "event" && item.name === "Upgraded" && item.inputs[0].name === "implementation"
@@ -168,18 +163,17 @@ var fromEtherscan = async ({
     for (const implAddress of implAddresses) {
       if (!apiKey)
         await wait(5e3);
-      const { abi, contractName: implContractName } = await getContractAbiAndName(implAddress, apiUrl, apiKey);
-      if (typeof abi !== "string") {
-        warnings.push(
-          `Unable to fetch ABI for implementation contract ${implAddress}. Please see the proxy contract documentation for more details: https://ponder.sh/docs/guides/add-contracts#multiple-abis`
-        );
-        continue;
-      }
-      contractName = implContractName;
+      const abiResult2 = await getContractAbiAndName(
+        implAddress,
+        apiUrl,
+        apiKey
+      );
+      warnings.push(...abiResult2.warnings);
       abis.push({
-        abi: JSON.parse(abi),
-        contractName: `${contractName}_${implAddress.slice(0, 6)}`
+        abi: abiResult2.abi,
+        contractName: `${abiResult2.contractName}_${implAddress.slice(0, 6)}`
       });
+      contractName = abiResult2.contractName;
     }
   }
   mkdirSync(path.join(rootDir, "abis"), { recursive: true });
@@ -281,10 +275,32 @@ var getContractAbiAndName = async (contractAddress, apiUrl, apiKey) => {
   });
   if (apiKey)
     searchParams.append("apikey", apiKey);
-  const data = await fetchEtherscan(`${apiUrl}?${searchParams.toString()}`);
-  const abi = data.result[0].ABI;
-  const contractName = data.result[0].ContractName;
-  return { abi, contractName };
+  const warnings = [];
+  let abi;
+  let contractName;
+  try {
+    const data = await fetchEtherscan(`${apiUrl}?${searchParams.toString()}`);
+    const rawAbi = data.result[0].ABI;
+    if (rawAbi === "Contract source code not verified") {
+      warnings.push(
+        `Contract ${contractAddress} is unverified or has an empty ABI.`
+      );
+      abi = [];
+    } else {
+      abi = JSON.parse(rawAbi);
+    }
+    contractName = data.result[0].ContractName ?? "";
+    if (contractName === "")
+      contractName = "UnverifiedContract";
+  } catch (e) {
+    const error = e;
+    warnings.push(
+      `Failed to fetch ABI for contract ${contractAddress}. Marking as unverified. Error: ${error.message}`
+    );
+    abi = [];
+    contractName = "UnverifiedContract";
+  }
+  return { abi, contractName, warnings };
 };
 var getProxyImplementationAddresses = async ({
   contractAddress,
@@ -343,6 +359,21 @@ var getPackageManager = ({
   throw Error(pico2.red("Undetectable package manager"));
 };
 
+// src/helpers/mergeAbis.ts
+import { formatAbiItem } from "viem/utils";
+var isAbiItemEqual = (a, b) => formatAbiItem(a) === formatAbiItem(b);
+var mergeAbis = (abis) => {
+  let merged = [];
+  for (const abi of abis) {
+    for (const item of abi) {
+      if (item.type !== "constructor" && item.type !== "receive" && item.type !== "fallback" && !merged.some((m) => isAbiItemEqual(m, item))) {
+        merged = [...merged, item];
+      }
+    }
+  }
+  return merged;
+};
+
 // src/helpers/notifyUpdate.ts
 import pico3 from "picocolors";
 import checkForUpdate from "update-check";
@@ -807,11 +838,11 @@ async function run({
       await prettier3.format(configContent, { parser: "typescript" })
     );
     for (const [name, contract] of Object.entries(config.contracts)) {
-      const abi = Array.isArray(contract.abi) ? contract.abi[1].abi : contract.abi.abi;
+      const abi = Array.isArray(contract.abi) ? mergeAbis(contract.abi.map((a) => a.abi)) : contract.abi.abi;
       const abiEvents = abi.filter(
         (item) => item.type === "event" && !item.anonymous
       );
-      const eventNamesToWrite = abiEvents.map((event) => event.name).slice(0, 2);
+      const eventNamesToWrite = abiEvents.map((event) => event.name).slice(0, 4);
       const indexingFunctionFileContents = `
       import { ponder } from '@/generated'
 
@@ -886,9 +917,9 @@ async function run({
       }
     );
   }
+  log2();
   for (const warning of warnings) {
-    log2();
-    log2(pico5.yellow(warning));
+    log2(`${pico5.yellow("\u26A0")} ${warning}`);
   }
   log2();
   log2("\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015\u2015");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ponder",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "type": "module",
   "description": "A CLI tool to create Ponder apps",
   "license": "MIT",