From 96f6b8aa04f0d0f3d407af00ce46cd894aaf759d Mon Sep 17 00:00:00 2001
From: ByteAtATime <byteatatime@proton.me>
Date: Tue, 11 Jun 2024 07:54:17 -0700
Subject: [PATCH 01/11] Better transaction result formatting in debug page
 (#853)

Co-authored-by: Shiv Bhonde <shivbhonde04@gmail.com>
---
 .../contract/ReadOnlyFunctionForm.tsx         |  10 +-
 .../debug/_components/contract/TxReceipt.tsx  |  17 +--
 .../_components/contract/utilsDisplay.tsx     | 108 ++++++++++++++----
 .../scaffold-eth/Input/IntegerInput.tsx       |   2 +-
 4 files changed, 99 insertions(+), 38 deletions(-)

diff --git a/packages/nextjs/app/debug/_components/contract/ReadOnlyFunctionForm.tsx b/packages/nextjs/app/debug/_components/contract/ReadOnlyFunctionForm.tsx
index 9ccc37fed..a0d097a53 100644
--- a/packages/nextjs/app/debug/_components/contract/ReadOnlyFunctionForm.tsx
+++ b/packages/nextjs/app/debug/_components/contract/ReadOnlyFunctionForm.tsx
@@ -76,17 +76,17 @@ export const ReadOnlyFunctionForm = ({
         <InheritanceTooltip inheritedFrom={inheritedFrom} />
       </p>
       {inputElements}
-      <div className="flex justify-between gap-2 flex-wrap">
-        <div className="flex-grow w-4/5">
+      <div className="flex flex-col md:flex-row justify-between gap-2 flex-wrap">
+        <div className="flex-grow w-full md:max-w-[80%]">
           {result !== null && result !== undefined && (
-            <div className="bg-secondary rounded-3xl text-sm px-4 py-1.5 break-words">
+            <div className="bg-secondary rounded-3xl text-sm px-4 py-1.5 break-words overflow-auto">
               <p className="font-bold m-0 mb-1">Result:</p>
-              <pre className="whitespace-pre-wrap break-words">{displayTxResult(result)}</pre>
+              <pre className="whitespace-pre-wrap break-words">{displayTxResult(result, "sm")}</pre>
             </div>
           )}
         </div>
         <button
-          className="btn btn-secondary btn-sm"
+          className="btn btn-secondary btn-sm self-end md:self-start"
           onClick={async () => {
             const { data } = await refetch();
             setResult(data);
diff --git a/packages/nextjs/app/debug/_components/contract/TxReceipt.tsx b/packages/nextjs/app/debug/_components/contract/TxReceipt.tsx
index 87e74f5b5..764faeb6c 100644
--- a/packages/nextjs/app/debug/_components/contract/TxReceipt.tsx
+++ b/packages/nextjs/app/debug/_components/contract/TxReceipt.tsx
@@ -2,11 +2,10 @@ import { useState } from "react";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import { TransactionReceipt } from "viem";
 import { CheckCircleIcon, DocumentDuplicateIcon } from "@heroicons/react/24/outline";
-import { displayTxResult } from "~~/app/debug/_components/contract";
+import { ObjectFieldDisplay } from "~~/app/debug/_components/contract";
+import { replacer } from "~~/utils/scaffold-eth/common";
 
-export const TxReceipt = (
-  txResult: string | number | bigint | Record<string, any> | TransactionReceipt | undefined,
-) => {
+export const TxReceipt = ({ txResult }: { txResult: TransactionReceipt }) => {
   const [txResultCopied, setTxResultCopied] = useState(false);
 
   return (
@@ -19,7 +18,7 @@ export const TxReceipt = (
           />
         ) : (
           <CopyToClipboard
-            text={displayTxResult(txResult) as string}
+            text={JSON.stringify(txResult, replacer, 2)}
             onCopy={() => {
               setTxResultCopied(true);
               setTimeout(() => {
@@ -39,8 +38,12 @@ export const TxReceipt = (
         <div className="collapse-title text-sm min-h-0 py-1.5 pl-1">
           <strong>Transaction Receipt</strong>
         </div>
-        <div className="collapse-content overflow-auto bg-secondary rounded-t-none rounded-3xl">
-          <pre className="text-xs pt-4">{displayTxResult(txResult)}</pre>
+        <div className="collapse-content overflow-auto bg-secondary rounded-t-none rounded-3xl !pl-0">
+          <pre className="text-xs">
+            {Object.entries(txResult).map(([k, v]) => (
+              <ObjectFieldDisplay name={k} value={v} size="xs" leftPad={false} key={k} />
+            ))}
+          </pre>
         </div>
       </div>
     </div>
diff --git a/packages/nextjs/app/debug/_components/contract/utilsDisplay.tsx b/packages/nextjs/app/debug/_components/contract/utilsDisplay.tsx
index f5d212993..3148affdf 100644
--- a/packages/nextjs/app/debug/_components/contract/utilsDisplay.tsx
+++ b/packages/nextjs/app/debug/_components/contract/utilsDisplay.tsx
@@ -1,5 +1,6 @@
-import { ReactElement } from "react";
-import { TransactionBase, TransactionReceipt, formatEther, isAddress } from "viem";
+import { ReactElement, useState } from "react";
+import { TransactionBase, TransactionReceipt, formatEther, isAddress, isHex } from "viem";
+import { ArrowsRightLeftIcon } from "@heroicons/react/24/solid";
 import { Address } from "~~/components/scaffold-eth";
 import { replacer } from "~~/utils/scaffold-eth/common";
 
@@ -13,44 +14,101 @@ type DisplayContent =
   | undefined
   | unknown;
 
+type ResultFontSize = "sm" | "base" | "xs" | "lg" | "xl" | "2xl" | "3xl";
+
 export const displayTxResult = (
   displayContent: DisplayContent | DisplayContent[],
-  asText = false,
+  fontSize: ResultFontSize = "base",
 ): string | ReactElement | number => {
   if (displayContent == null) {
     return "";
   }
 
   if (typeof displayContent === "bigint") {
-    try {
-      const asNumber = Number(displayContent);
-      if (asNumber <= Number.MAX_SAFE_INTEGER && asNumber >= Number.MIN_SAFE_INTEGER) {
-        return asNumber;
-      } else {
-        return "Ξ" + formatEther(displayContent);
-      }
-    } catch (e) {
-      return "Ξ" + formatEther(displayContent);
-    }
+    return <NumberDisplay value={displayContent} />;
   }
 
-  if (typeof displayContent === "string" && isAddress(displayContent)) {
-    return asText ? displayContent : <Address address={displayContent} />;
+  if (typeof displayContent === "string") {
+    if (isAddress(displayContent)) {
+      return <Address address={displayContent} size={fontSize} />;
+    }
+
+    if (isHex(displayContent)) {
+      return displayContent; // don't add quotes
+    }
   }
 
   if (Array.isArray(displayContent)) {
-    const mostReadable = (v: DisplayContent) =>
-      ["number", "boolean"].includes(typeof v) ? v : displayTxResultAsText(v);
-    const displayable = JSON.stringify(displayContent.map(mostReadable), replacer);
-
-    return asText ? (
-      displayable
-    ) : (
-      <span style={{ overflowWrap: "break-word", width: "100%" }}>{displayable.replaceAll(",", ",\n")}</span>
-    );
+    return <ArrayDisplay values={displayContent} size={fontSize} />;
+  }
+
+  if (typeof displayContent === "object") {
+    return <StructDisplay struct={displayContent} size={fontSize} />;
   }
 
   return JSON.stringify(displayContent, replacer, 2);
 };
 
-const displayTxResultAsText = (displayContent: DisplayContent) => displayTxResult(displayContent, true);
+const NumberDisplay = ({ value }: { value: bigint }) => {
+  const [isEther, setIsEther] = useState(false);
+
+  const asNumber = Number(value);
+  if (asNumber <= Number.MAX_SAFE_INTEGER && asNumber >= Number.MIN_SAFE_INTEGER) {
+    return String(value);
+  }
+
+  return (
+    <div className="flex items-baseline">
+      {isEther ? "Ξ" + formatEther(value) : String(value)}
+      <span
+        className="tooltip tooltip-secondary font-sans ml-2"
+        data-tip={isEther ? "Multiply by 1e18" : "Divide by 1e18"}
+      >
+        <button className="btn btn-ghost btn-circle btn-xs" onClick={() => setIsEther(!isEther)}>
+          <ArrowsRightLeftIcon className="h-3 w-3 opacity-65" />
+        </button>
+      </span>
+    </div>
+  );
+};
+
+export const ObjectFieldDisplay = ({
+  name,
+  value,
+  size,
+  leftPad = true,
+}: {
+  name: string;
+  value: DisplayContent;
+  size: ResultFontSize;
+  leftPad?: boolean;
+}) => {
+  return (
+    <div className={`flex flex-row items-baseline ${leftPad ? "ml-4" : ""}`}>
+      <span className="text-gray-500 dark:text-gray-400 mr-2">{name}:</span>
+      <span className="text-base-content">{displayTxResult(value, size)}</span>
+    </div>
+  );
+};
+
+const ArrayDisplay = ({ values, size }: { values: DisplayContent[]; size: ResultFontSize }) => {
+  return (
+    <div className="flex flex-col gap-y-1">
+      {values.length ? "array" : "[]"}
+      {values.map((v, i) => (
+        <ObjectFieldDisplay key={i} name={`[${i}]`} value={v} size={size} />
+      ))}
+    </div>
+  );
+};
+
+const StructDisplay = ({ struct, size }: { struct: Record<string, any>; size: ResultFontSize }) => {
+  return (
+    <div className="flex flex-col gap-y-1">
+      struct
+      {Object.entries(struct).map(([k, v]) => (
+        <ObjectFieldDisplay key={k} name={k} value={v} size={size} />
+      ))}
+    </div>
+  );
+};
diff --git a/packages/nextjs/components/scaffold-eth/Input/IntegerInput.tsx b/packages/nextjs/components/scaffold-eth/Input/IntegerInput.tsx
index f9b436124..4fde183e0 100644
--- a/packages/nextjs/components/scaffold-eth/Input/IntegerInput.tsx
+++ b/packages/nextjs/components/scaffold-eth/Input/IntegerInput.tsx
@@ -47,7 +47,7 @@ export const IntegerInput = ({
         !disableMultiplyBy1e18 && (
           <div
             className="space-x-4 flex tooltip tooltip-top tooltip-secondary before:content-[attr(data-tip)] before:right-[-10px] before:left-auto before:transform-none"
-            data-tip="Multiply by 10^18 (wei)"
+            data-tip="Multiply by 1e18 (wei)"
           >
             <button
               className={`${disabled ? "cursor-not-allowed" : "cursor-pointer"} font-semibold px-4 text-accent`}

From e23ab4dc0a3015e46ee0dc79034c2fa9de99e1e6 Mon Sep 17 00:00:00 2001
From: Mukul Kolpe <mukulkolpe45@gmail.com>
Date: Mon, 17 Jun 2024 12:00:08 +0530
Subject: [PATCH 02/11] fix: address components copy icon on small screens
 (#864)

Co-authored-by: Shiv Bhonde <shivbhonde04@gmail.com>
---
 packages/nextjs/app/page.tsx                        | 2 +-
 packages/nextjs/components/scaffold-eth/Address.tsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nextjs/app/page.tsx b/packages/nextjs/app/page.tsx
index fcca994c5..b91c22fe8 100644
--- a/packages/nextjs/app/page.tsx
+++ b/packages/nextjs/app/page.tsx
@@ -17,7 +17,7 @@ const Home: NextPage = () => {
             <span className="block text-2xl mb-2">Welcome to</span>
             <span className="block text-4xl font-bold">Scaffold-ETH 2</span>
           </h1>
-          <div className="flex justify-center items-center space-x-2">
+          <div className="flex justify-center items-center space-x-2 flex-col sm:flex-row">
             <p className="my-2 font-medium">Connected Address:</p>
             <Address address={connectedAddress} />
           </div>
diff --git a/packages/nextjs/components/scaffold-eth/Address.tsx b/packages/nextjs/components/scaffold-eth/Address.tsx
index 2241edc89..f24b4597a 100644
--- a/packages/nextjs/components/scaffold-eth/Address.tsx
+++ b/packages/nextjs/components/scaffold-eth/Address.tsx
@@ -91,7 +91,7 @@ export const Address = ({ address, disableAddressLink, format, size = "base" }:
   }
 
   return (
-    <div className="flex items-center">
+    <div className="flex items-center flex-shrink-0">
       <div className="flex-shrink-0">
         <BlockieAvatar
           address={checkSumAddress}
@@ -117,7 +117,7 @@ export const Address = ({ address, disableAddressLink, format, size = "base" }:
       )}
       {addressCopied ? (
         <CheckCircleIcon
-          className="ml-1.5 text-xl font-normal text-sky-600 h-5 w-5 cursor-pointer"
+          className="ml-1.5 text-xl font-normal text-sky-600 h-5 w-5 cursor-pointer flex-shrink-0"
           aria-hidden="true"
         />
       ) : (
@@ -131,7 +131,7 @@ export const Address = ({ address, disableAddressLink, format, size = "base" }:
           }}
         >
           <DocumentDuplicateIcon
-            className="ml-1.5 text-xl font-normal text-sky-600 h-5 w-5 cursor-pointer"
+            className="ml-1.5 text-xl font-normal text-sky-600 h-5 w-5 cursor-pointer flex-shrink-0"
             aria-hidden="true"
           />
         </CopyToClipboard>

From 35b4c671cf831cf9216731b4d5708e9aa7f00600 Mon Sep 17 00:00:00 2001
From: "Shiv Bhonde | shivbhonde.eth" <shivbhonde04@gmail.com>
Date: Mon, 24 Jun 2024 21:18:21 +0530
Subject: [PATCH 03/11] lock typescript and abitype version (#871)

---
 packages/nextjs/package.json |  4 ++--
 yarn.lock                    | 26 +++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 49d6d18aa..53f54b6a0 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -43,7 +43,7 @@
     "@types/react": "^18.0.9",
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@typescript-eslint/eslint-plugin": "^5.39.0",
-    "abitype": "^1.0.2",
+    "abitype": "1.0.2",
     "autoprefixer": "^10.4.12",
     "eslint": "^8.15.0",
     "eslint-config-next": "^14.0.4",
@@ -53,7 +53,7 @@
     "prettier": "^2.8.4",
     "tailwindcss": "^3.4.3",
     "type-fest": "^4.6.0",
-    "typescript": "^5.1.6",
+    "typescript": "5.1.6",
     "vercel": "^32.4.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 7fe422497..accc3ea22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2151,7 +2151,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^5.39.0
     "@uniswap/sdk-core": ^4.0.1
     "@uniswap/v2-sdk": ^3.0.1
-    abitype: ^1.0.2
+    abitype: 1.0.2
     autoprefixer: ^10.4.12
     blo: ^1.0.1
     burner-connector: ^0.0.8
@@ -2172,7 +2172,7 @@ __metadata:
     react-hot-toast: ^2.4.0
     tailwindcss: ^3.4.3
     type-fest: ^4.6.0
-    typescript: ^5.1.6
+    typescript: 5.1.6
     use-debounce: ^8.0.4
     usehooks-ts: ^2.13.0
     vercel: ^32.4.1
@@ -3847,7 +3847,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abitype@npm:^1.0.2":
+"abitype@npm:1.0.2":
   version: 1.0.2
   resolution: "abitype@npm:1.0.2"
   peerDependencies:
@@ -13923,6 +13923,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@npm:5.1.6":
+  version: 5.1.6
+  resolution: "typescript@npm:5.1.6"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: b2f2c35096035fe1f5facd1e38922ccb8558996331405eb00a5111cc948b2e733163cc22fab5db46992aba7dd520fff637f2c1df4996ff0e134e77d3249a7350
+  languageName: node
+  linkType: hard
+
 "typescript@npm:^5.1.6":
   version: 5.2.2
   resolution: "typescript@npm:5.2.2"
@@ -13943,6 +13953,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@5.1.6#~builtin<compat/typescript>":
+  version: 5.1.6
+  resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=a1c5e5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 21e88b0a0c0226f9cb9fd25b9626fb05b4c0f3fddac521844a13e1f30beb8f14e90bd409a9ac43c812c5946d714d6e0dee12d5d02dfc1c562c5aacfa1f49b606
+  languageName: node
+  linkType: hard
+
 "typescript@patch:typescript@^5.1.6#~builtin<compat/typescript>":
   version: 5.2.2
   resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=a1c5e5"

From a78be8761e1d039218cccf57d60a4de56261d859 Mon Sep 17 00:00:00 2001
From: "Shiv Bhonde | shivbhonde.eth" <shivbhonde04@gmail.com>
Date: Tue, 25 Jun 2024 20:03:35 +0530
Subject: [PATCH 04/11] rewrite useScaffoldEventHistory hook (#869)

---
 .../scaffold-eth/useScaffoldEventHistory.ts   | 220 ++++++++----------
 1 file changed, 102 insertions(+), 118 deletions(-)

diff --git a/packages/nextjs/hooks/scaffold-eth/useScaffoldEventHistory.ts b/packages/nextjs/hooks/scaffold-eth/useScaffoldEventHistory.ts
index 869bb5c11..48f8ed671 100644
--- a/packages/nextjs/hooks/scaffold-eth/useScaffoldEventHistory.ts
+++ b/packages/nextjs/hooks/scaffold-eth/useScaffoldEventHistory.ts
@@ -1,13 +1,10 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTargetNetwork } from "./useTargetNetwork";
+import { useInfiniteQuery } from "@tanstack/react-query";
 import { Abi, AbiEvent, ExtractAbiEventNames } from "abitype";
-import { useInterval } from "usehooks-ts";
-import { Hash } from "viem";
-import * as chains from "viem/chains";
-import { usePublicClient } from "wagmi";
+import { BlockNumber, GetLogsParameters } from "viem";
+import { Config, UsePublicClientReturnType, useBlockNumber, usePublicClient } from "wagmi";
 import { useDeployedContractInfo } from "~~/hooks/scaffold-eth";
-import scaffoldConfig from "~~/scaffold.config";
-import { replacer } from "~~/utils/scaffold-eth/common";
 import {
   ContractAbi,
   ContractName,
@@ -15,6 +12,44 @@ import {
   UseScaffoldEventHistoryData,
 } from "~~/utils/scaffold-eth/contract";
 
+const getEvents = async (
+  getLogsParams: GetLogsParameters<AbiEvent | undefined, AbiEvent[] | undefined, boolean, BlockNumber, BlockNumber>,
+  publicClient?: UsePublicClientReturnType<Config, number>,
+  Options?: {
+    blockData?: boolean;
+    transactionData?: boolean;
+    receiptData?: boolean;
+  },
+) => {
+  const logs = await publicClient?.getLogs({
+    address: getLogsParams.address,
+    fromBlock: getLogsParams.fromBlock,
+    args: getLogsParams.args,
+    event: getLogsParams.event,
+  });
+  if (!logs) return undefined;
+
+  const finalEvents = await Promise.all(
+    logs.map(async log => {
+      return {
+        ...log,
+        blockData:
+          Options?.blockData && log.blockHash ? await publicClient?.getBlock({ blockHash: log.blockHash }) : null,
+        transactionData:
+          Options?.transactionData && log.transactionHash
+            ? await publicClient?.getTransaction({ hash: log.transactionHash })
+            : null,
+        receiptData:
+          Options?.receiptData && log.transactionHash
+            ? await publicClient?.getTransactionReceipt({ hash: log.transactionHash })
+            : null,
+      };
+    }),
+  );
+
+  return finalEvents;
+};
+
 /**
  * Reads events from a deployed contract
  * @param config - The config settings
@@ -45,135 +80,84 @@ export const useScaffoldEventHistory = <
   watch,
   enabled = true,
 }: UseScaffoldEventHistoryConfig<TContractName, TEventName, TBlockData, TTransactionData, TReceiptData>) => {
-  const [events, setEvents] = useState<any[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
-  const [error, setError] = useState<string>();
-  const [fromBlockUpdated, setFromBlockUpdated] = useState<bigint>(fromBlock);
-
-  const { data: deployedContractData, isLoading: deployedContractLoading } = useDeployedContractInfo(contractName);
   const { targetNetwork } = useTargetNetwork();
   const publicClient = usePublicClient({
     chainId: targetNetwork.id,
   });
+  const [isFirstRender, setIsFirstRender] = useState(true);
 
-  const readEvents = useCallback(
-    async () => {
-      setIsLoading(true);
-      try {
-        if (!deployedContractData) {
-          throw new Error("Contract not found");
-        }
-
-        if (!enabled) {
-          throw new Error("Hook disabled");
-        }
+  const { data: blockNumber } = useBlockNumber({ watch: watch, chainId: targetNetwork.id });
 
-        if (!publicClient) {
-          throw new Error("Public client not found");
-        }
+  const { data: deployedContractData } = useDeployedContractInfo(contractName);
 
-        const event = (deployedContractData.abi as Abi).find(
-          part => part.type === "event" && part.name === eventName,
-        ) as AbiEvent;
+  const event =
+    deployedContractData &&
+    ((deployedContractData.abi as Abi).find(part => part.type === "event" && part.name === eventName) as AbiEvent);
 
-        const blockNumber = await publicClient.getBlockNumber({ cacheTime: 0 });
+  const isContractAddressAndClientReady = Boolean(deployedContractData?.address) && Boolean(publicClient);
 
-        if (blockNumber >= fromBlockUpdated) {
-          const logs = await publicClient.getLogs({
-            address: deployedContractData?.address,
-            event,
-            args: filters as any,
-            fromBlock: fromBlockUpdated,
-            toBlock: blockNumber,
-          });
-          setFromBlockUpdated(blockNumber + 1n);
-
-          const newEvents = [];
-          for (let i = logs.length - 1; i >= 0; i--) {
-            newEvents.push({
-              log: logs[i],
-              args: logs[i].args,
-              block:
-                blockData && logs[i].blockHash === null
-                  ? null
-                  : await publicClient.getBlock({ blockHash: logs[i].blockHash as Hash }),
-              transaction:
-                transactionData && logs[i].transactionHash !== null
-                  ? await publicClient.getTransaction({ hash: logs[i].transactionHash as Hash })
-                  : null,
-              receipt:
-                receiptData && logs[i].transactionHash !== null
-                  ? await publicClient.getTransactionReceipt({ hash: logs[i].transactionHash as Hash })
-                  : null,
-            });
-          }
-          setEvents([...newEvents, ...events]);
-          setError(undefined);
-        }
-      } catch (e: any) {
-        if (events.length > 0) {
-          setEvents([]);
-        }
-        setError(e);
-        console.error(e);
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      blockData,
-      deployedContractData,
-      enabled,
-      eventName,
-      events,
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      JSON.stringify(filters, replacer),
-      fromBlockUpdated,
-      publicClient,
-      receiptData,
-      transactionData,
+  const query = useInfiniteQuery({
+    queryKey: [
+      "eventHistory",
+      {
+        contractName,
+        address: deployedContractData?.address,
+        eventName,
+        fromBlock: fromBlock.toString(),
+        chainId: targetNetwork.id,
+      },
     ],
-  );
-
-  useEffect(() => {
-    if (!deployedContractLoading) {
-      readEvents();
-    }
-  }, [readEvents, deployedContractLoading]);
-
-  useEffect(() => {
-    // Reset the internal state when target network or fromBlock changed
-    setEvents([]);
-    setFromBlockUpdated(fromBlock);
-    setError(undefined);
-  }, [fromBlock, targetNetwork.id]);
-
-  useInterval(
-    async () => {
-      if (!deployedContractLoading) {
-        readEvents();
-      }
+    queryFn: async ({ pageParam }) => {
+      if (!isContractAddressAndClientReady) return undefined;
+      const data = await getEvents(
+        { address: deployedContractData?.address, event, fromBlock: pageParam, args: filters },
+        publicClient,
+        { blockData, transactionData, receiptData },
+      );
+
+      return data;
     },
-    watch && enabled ? (targetNetwork.id !== chains.hardhat.id ? scaffoldConfig.pollingInterval : 4_000) : null,
-  );
-
-  const eventHistoryData = useMemo(
-    () =>
-      events?.map(addIndexedArgsToEvent) as UseScaffoldEventHistoryData<
+    enabled: enabled && isContractAddressAndClientReady,
+    initialPageParam: fromBlock,
+    getNextPageParam: () => {
+      return blockNumber;
+    },
+    select: data => {
+      const events = data.pages.flat();
+      const eventHistoryData = events?.map(addIndexedArgsToEvent) as UseScaffoldEventHistoryData<
         TContractName,
         TEventName,
         TBlockData,
         TTransactionData,
         TReceiptData
-      >,
-    [events],
-  );
+      >;
+      return {
+        pages: eventHistoryData?.reverse(),
+        pageParams: data.pageParams,
+      };
+    },
+  });
+
+  useEffect(() => {
+    const shouldSkipEffect = !blockNumber || !watch || isFirstRender;
+    if (shouldSkipEffect) {
+      // skipping on first render, since on first render we should call queryFn with
+      // fromBlock value, not blockNumber
+      if (isFirstRender) setIsFirstRender(false);
+      return;
+    }
+
+    query.fetchNextPage();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [blockNumber, watch]);
 
   return {
-    data: eventHistoryData,
-    isLoading: isLoading,
-    error: error,
+    data: query.data?.pages,
+    status: query.status,
+    error: query.error,
+    isLoading: query.isLoading,
+    isFetchingNewEvent: query.isFetchingNextPage,
+    refetch: query.refetch,
   };
 };
 

From c4ae2eb5d6e94d83d8c21ddff6173520a8c2c67f Mon Sep 17 00:00:00 2001
From: Shiv Bhonde <shivbhonde04@gmail.com>
Date: Wed, 26 Jun 2024 13:11:58 +0530
Subject: [PATCH 05/11] add changeset

---
 .changeset/silver-lizards-begin.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .changeset/silver-lizards-begin.md

diff --git a/.changeset/silver-lizards-begin.md b/.changeset/silver-lizards-begin.md
new file mode 100644
index 000000000..1990e30f7
--- /dev/null
+++ b/.changeset/silver-lizards-begin.md
@@ -0,0 +1,8 @@
+---
+"create-eth": patch
+---
+
+- Better transaction result formatting in debug page (#853)
+- fix: address components copy icon on small screens (#864)
+- lock typescript and abitype version (#871)
+- rewrite useScaffoldEventHistory hook (#869)

From 0428f232f6adf073e8b69a12c1a2dc3a8d54be81 Mon Sep 17 00:00:00 2001
From: Carlos Ramos <88168831+jrcarlos2000@users.noreply.github.com>
Date: Wed, 26 Jun 2024 17:21:04 +0800
Subject: [PATCH 06/11] foundry: update VerifyAll.s.sol to match new foundry
 version (#70)

---
 .../extensions/foundry/packages/foundry/script/VerifyAll.s.sol  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/extensions/foundry/packages/foundry/script/VerifyAll.s.sol b/templates/extensions/foundry/packages/foundry/script/VerifyAll.s.sol
index 9990f9c6b..e1090711d 100644
--- a/templates/extensions/foundry/packages/foundry/script/VerifyAll.s.sol
+++ b/templates/extensions/foundry/packages/foundry/script/VerifyAll.s.sol
@@ -64,7 +64,7 @@ contract VerifyAll is Script {
         );
         bytes memory deployedBytecode = abi.decode(
             vm.parseJson(
-                content, searchStr(currTransactionIdx, "transaction.data")
+                content, searchStr(currTransactionIdx, "transaction.input")
             ),
             (bytes)
         );

From 8fc03029a0ba988ee931907e456951a279792fdb Mon Sep 17 00:00:00 2001
From: Shiv Bhonde <shivbhonde04@gmail.com>
Date: Wed, 26 Jun 2024 14:52:56 +0530
Subject: [PATCH 07/11] add changeset

---
 .changeset/many-pens-retire.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/many-pens-retire.md

diff --git a/.changeset/many-pens-retire.md b/.changeset/many-pens-retire.md
new file mode 100644
index 000000000..c5ebb10bf
--- /dev/null
+++ b/.changeset/many-pens-retire.md
@@ -0,0 +1,5 @@
+---
+"create-eth": patch
+---
+
+foundry: fix verification script failing in latest foundry version

From 4901edb30cd10b4cede2b19a6a7b25b43d01a0db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 17:20:14 +0530
Subject: [PATCH 08/11] Version Packages (#61)

---
 .changeset/breezy-seahorses-heal.md |  5 -----
 .changeset/eleven-masks-compete.md  |  5 -----
 .changeset/giant-carpets-poke.md    |  5 -----
 .changeset/giant-gifts-turn.md      |  5 -----
 .changeset/many-pens-retire.md      |  5 -----
 .changeset/silver-fishes-marry.md   |  5 -----
 .changeset/silver-lizards-begin.md  |  8 --------
 .changeset/yellow-ducks-retire.md   |  5 -----
 CHANGELOG.md                        | 16 ++++++++++++++++
 package.json                        |  2 +-
 10 files changed, 17 insertions(+), 44 deletions(-)
 delete mode 100644 .changeset/breezy-seahorses-heal.md
 delete mode 100644 .changeset/eleven-masks-compete.md
 delete mode 100644 .changeset/giant-carpets-poke.md
 delete mode 100644 .changeset/giant-gifts-turn.md
 delete mode 100644 .changeset/many-pens-retire.md
 delete mode 100644 .changeset/silver-fishes-marry.md
 delete mode 100644 .changeset/silver-lizards-begin.md
 delete mode 100644 .changeset/yellow-ducks-retire.md

diff --git a/.changeset/breezy-seahorses-heal.md b/.changeset/breezy-seahorses-heal.md
deleted file mode 100644
index 97ad54070..000000000
--- a/.changeset/breezy-seahorses-heal.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"create-eth": patch
----
-
-- Allow developing externalExtensions with --dev
diff --git a/.changeset/eleven-masks-compete.md b/.changeset/eleven-masks-compete.md
deleted file mode 100644
index 9380db39c..000000000
--- a/.changeset/eleven-masks-compete.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"create-eth": patch
----
-
-remove vercelignore from root dir + clean base package.json
diff --git a/.changeset/giant-carpets-poke.md b/.changeset/giant-carpets-poke.md
deleted file mode 100644
index d71ff7a41..000000000
--- a/.changeset/giant-carpets-poke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"create-eth": patch
----
-
-cli: help command
diff --git a/.changeset/giant-gifts-turn.md b/.changeset/giant-gifts-turn.md
deleted file mode 100644
index a99f6427d..000000000
--- a/.changeset/giant-gifts-turn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"create-eth": patch
----
-
-foundry: use forge to setup libraries + do early check for foundryup
diff --git a/.changeset/many-pens-retire.md b/.changeset/many-pens-retire.md
deleted file mode 100644
index c5ebb10bf..000000000
--- a/.changeset/many-pens-retire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"create-eth": patch
----
-
-foundry: fix verification script failing in latest foundry version
diff --git a/.changeset/silver-fishes-marry.md b/.changeset/silver-fishes-marry.md
deleted file mode 100644
index ebc6a1e33..000000000
--- a/.changeset/silver-fishes-marry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"create-eth": patch
----
-
-cli: solidity framework options
diff --git a/.changeset/silver-lizards-begin.md b/.changeset/silver-lizards-begin.md
deleted file mode 100644
index 1990e30f7..000000000
--- a/.changeset/silver-lizards-begin.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-"create-eth": patch
----
-
-- Better transaction result formatting in debug page (#853)
-- fix: address components copy icon on small screens (#864)
-- lock typescript and abitype version (#871)
-- rewrite useScaffoldEventHistory hook (#869)
diff --git a/.changeset/yellow-ducks-retire.md b/.changeset/yellow-ducks-retire.md
deleted file mode 100644
index cc9e5411b..000000000
--- a/.changeset/yellow-ducks-retire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"create-eth": patch
----
-
-fix bug foundry gh action fails
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d9714107..7ed8c720f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # create-eth
 
+## 0.0.48
+
+### Patch Changes
+
+- Allow developing externalExtensions with --dev
+- remove vercelignore from root dir + clean base package.json
+- cli: help command
+- foundry: use forge to setup libraries + do early check for foundryup
+- foundry: fix verification script failing in latest foundry version
+- cli: solidity framework options
+- Better transaction result formatting in debug page (#853)
+- fix: address components copy icon on small screens (#864)
+- lock typescript and abitype version (#871)
+- rewrite useScaffoldEventHistory hook (#869)
+- fix bug foundry gh action fails
+
 ## 0.0.47
 
 ### Patch Changes
diff --git a/package.json b/package.json
index 5963fa70a..6d721162f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-eth",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "description": "Create a Scaffold-ETH-2 app",
   "repository": {
     "type": "git",

From 5a65fb12403b675448826ee18d40a355f574d645 Mon Sep 17 00:00:00 2001
From: "Shiv Bhonde | shivbhonde.eth" <shivbhonde04@gmail.com>
Date: Fri, 28 Jun 2024 17:34:29 +0530
Subject: [PATCH 09/11] up prettier (#875)

Co-authored-by: Rinat <rinat@hey.com>
---
 packages/hardhat/deploy/99_generateTsAbis.ts  |  14 +-
 packages/hardhat/package.json                 |   6 +-
 packages/nextjs/.prettierrc.json              |   1 +
 .../debug/_components/contract/TupleArray.tsx |  21 +-
 packages/nextjs/package.json                  |   8 +-
 .../nextjs/utils/scaffold-eth/contract.ts     |  21 +-
 yarn.lock                                     | 270 +++++++++++++-----
 7 files changed, 234 insertions(+), 107 deletions(-)

diff --git a/packages/hardhat/deploy/99_generateTsAbis.ts b/packages/hardhat/deploy/99_generateTsAbis.ts
index 945ad2a61..351f599da 100644
--- a/packages/hardhat/deploy/99_generateTsAbis.ts
+++ b/packages/hardhat/deploy/99_generateTsAbis.ts
@@ -110,16 +110,14 @@ const generateTsAbis: DeployFunction = async function () {
   if (!fs.existsSync(TARGET_DIR)) {
     fs.mkdirSync(TARGET_DIR);
   }
-  fs.writeFileSync(
-    `${TARGET_DIR}deployedContracts.ts`,
-    prettier.format(
-      `${generatedContractComment} import { GenericContractsDeclaration } from "~~/utils/scaffold-eth/contract"; \n\n
+  const formattedContent = await prettier.format(
+    `${generatedContractComment} import { GenericContractsDeclaration } from "~~/utils/scaffold-eth/contract"; \n\n
  const deployedContracts = {${fileContent}} as const; \n\n export default deployedContracts satisfies GenericContractsDeclaration`,
-      {
-        parser: "typescript",
-      },
-    ),
+    {
+      parser: "typescript",
+    },
   );
+  fs.writeFileSync(`${TARGET_DIR}deployedContracts.ts`, formattedContent);
 
   console.log(`📝 Updated TypeScript contract definition file on ${TARGET_DIR}deployedContracts.ts`);
 };
diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json
index 0b619c59c..f29a3a844 100644
--- a/packages/hardhat/package.json
+++ b/packages/hardhat/package.json
@@ -33,14 +33,14 @@
     "@typescript-eslint/parser": "latest",
     "chai": "^4.3.6",
     "eslint": "^8.26.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "ethers": "^6.10.0",
     "hardhat": "^2.19.4",
     "hardhat-deploy": "^0.11.45",
     "hardhat-deploy-ethers": "^0.4.1",
     "hardhat-gas-reporter": "^1.0.9",
-    "prettier": "^2.8.4",
+    "prettier": "^3.3.2",
     "solidity-coverage": "^0.8.5",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.0",
diff --git a/packages/nextjs/.prettierrc.json b/packages/nextjs/.prettierrc.json
index 36fa5f31e..790388a77 100644
--- a/packages/nextjs/.prettierrc.json
+++ b/packages/nextjs/.prettierrc.json
@@ -1,4 +1,5 @@
 {
+  "plugins": ["@trivago/prettier-plugin-sort-imports"],
   "arrowParens": "avoid",
   "printWidth": 120,
   "tabWidth": 2,
diff --git a/packages/nextjs/app/debug/_components/contract/TupleArray.tsx b/packages/nextjs/app/debug/_components/contract/TupleArray.tsx
index 1eb23c258..3fa9ac84e 100644
--- a/packages/nextjs/app/debug/_components/contract/TupleArray.tsx
+++ b/packages/nextjs/app/debug/_components/contract/TupleArray.tsx
@@ -21,15 +21,18 @@ export const TupleArray = ({ abiTupleParameter, setParentForm, parentStateObject
 
   useEffect(() => {
     // Extract and group fields based on index prefix
-    const groupedFields = Object.keys(form).reduce((acc, key) => {
-      const [indexPrefix, ...restArray] = key.split("_");
-      const componentName = restArray.join("_");
-      if (!acc[indexPrefix]) {
-        acc[indexPrefix] = {};
-      }
-      acc[indexPrefix][componentName] = form[key];
-      return acc;
-    }, {} as Record<string, Record<string, any>>);
+    const groupedFields = Object.keys(form).reduce(
+      (acc, key) => {
+        const [indexPrefix, ...restArray] = key.split("_");
+        const componentName = restArray.join("_");
+        if (!acc[indexPrefix]) {
+          acc[indexPrefix] = {};
+        }
+        acc[indexPrefix][componentName] = form[key];
+        return acc;
+      },
+      {} as Record<string, Record<string, any>>,
+    );
 
     let argsArray: Array<Record<string, any>> = [];
 
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 53f54b6a0..951d78609 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -37,7 +37,7 @@
     "zustand": "^4.1.2"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^4.1.1",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/node": "^17.0.35",
     "@types/nprogress": "^0",
     "@types/react": "^18.0.9",
@@ -47,10 +47,10 @@
     "autoprefixer": "^10.4.12",
     "eslint": "^8.15.0",
     "eslint-config-next": "^14.0.4",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "postcss": "^8.4.16",
-    "prettier": "^2.8.4",
+    "prettier": "^3.3.2",
     "tailwindcss": "^3.4.3",
     "type-fest": "^4.6.0",
     "typescript": "5.1.6",
diff --git a/packages/nextjs/utils/scaffold-eth/contract.ts b/packages/nextjs/utils/scaffold-eth/contract.ts
index bf4580d1a..68e494c6c 100644
--- a/packages/nextjs/utils/scaffold-eth/contract.ts
+++ b/packages/nextjs/utils/scaffold-eth/contract.ts
@@ -154,16 +154,17 @@ type OptionalTupple<T> = T extends readonly [infer H, ...infer R] ? readonly [H
 type UseScaffoldArgsParam<
   TContractName extends ContractName,
   TFunctionName extends ExtractAbiFunctionNames<ContractAbi<TContractName>>,
-> = TFunctionName extends FunctionNamesWithInputs<TContractName>
-  ? {
-      args: OptionalTupple<UnionToIntersection<AbiFunctionArguments<ContractAbi<TContractName>, TFunctionName>>>;
-      value?: ExtractAbiFunction<ContractAbi<TContractName>, TFunctionName>["stateMutability"] extends "payable"
-        ? bigint | undefined
-        : undefined;
-    }
-  : {
-      args?: never;
-    };
+> =
+  TFunctionName extends FunctionNamesWithInputs<TContractName>
+    ? {
+        args: OptionalTupple<UnionToIntersection<AbiFunctionArguments<ContractAbi<TContractName>, TFunctionName>>>;
+        value?: ExtractAbiFunction<ContractAbi<TContractName>, TFunctionName>["stateMutability"] extends "payable"
+          ? bigint | undefined
+          : undefined;
+      }
+    : {
+        args?: never;
+      };
 
 export type UseScaffoldReadConfig<
   TContractName extends ContractName,
diff --git a/yarn.lock b/yarn.lock
index accc3ea22..346ac62a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33,7 +33,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.22.13":
+"@babel/code-frame@npm:^7.22.13":
   version: 7.22.13
   resolution: "@babel/code-frame@npm:7.22.13"
   dependencies:
@@ -43,6 +43,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/code-frame@npm:7.24.7"
+  dependencies:
+    "@babel/highlight": ^7.24.7
+    picocolors: ^1.0.0
+  checksum: 830e62cd38775fdf84d612544251ce773d544a8e63df667728cc9e0126eeef14c6ebda79be0f0bc307e8318316b7f58c27ce86702e0a1f5c321d842eb38ffda4
+  languageName: node
+  linkType: hard
+
 "@babel/generator@npm:7.17.7":
   version: 7.17.7
   resolution: "@babel/generator@npm:7.17.7"
@@ -54,50 +64,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.17.3":
-  version: 7.23.0
-  resolution: "@babel/generator@npm:7.23.0"
+"@babel/generator@npm:^7.23.0":
+  version: 7.24.7
+  resolution: "@babel/generator@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.23.0
-    "@jridgewell/gen-mapping": ^0.3.2
-    "@jridgewell/trace-mapping": ^0.3.17
+    "@babel/types": ^7.24.7
+    "@jridgewell/gen-mapping": ^0.3.5
+    "@jridgewell/trace-mapping": ^0.3.25
     jsesc: ^2.5.1
-  checksum: 8efe24adad34300f1f8ea2add420b28171a646edc70f2a1b3e1683842f23b8b7ffa7e35ef0119294e1901f45bfea5b3dc70abe1f10a1917ccdfb41bed69be5f1
+  checksum: 0ff31a73b15429f1287e4d57b439bba4a266f8c673bb445fe313b82f6d110f586776997eb723a777cd7adad9d340edd162aea4973a90112c5d0cfcaf6686844b
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.16.7":
-  version: 7.22.20
-  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
-  checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
+"@babel/helper-environment-visitor@npm:^7.22.20":
+  version: 7.24.7
+  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
+  dependencies:
+    "@babel/types": ^7.24.7
+  checksum: 079d86e65701b29ebc10baf6ed548d17c19b808a07aa6885cc141b690a78581b180ee92b580d755361dc3b16adf975b2d2058b8ce6c86675fcaf43cf22f2f7c6
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.16.7":
-  version: 7.23.0
-  resolution: "@babel/helper-function-name@npm:7.23.0"
+"@babel/helper-function-name@npm:^7.23.0":
+  version: 7.24.7
+  resolution: "@babel/helper-function-name@npm:7.24.7"
   dependencies:
-    "@babel/template": ^7.22.15
-    "@babel/types": ^7.23.0
-  checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
+    "@babel/template": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: 142ee08922074dfdc0ff358e09ef9f07adf3671ab6eef4fca74dcf7a551f1a43717e7efa358c9e28d7eea84c28d7f177b7a58c70452fc312ae3b1893c5dab2a4
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.16.7":
-  version: 7.22.5
-  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
+"@babel/helper-hoist-variables@npm:^7.22.5":
+  version: 7.24.7
+  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
+    "@babel/types": ^7.24.7
+  checksum: 6cfdcf2289cd12185dcdbdf2435fa8d3447b797ac75851166de9fc8503e2fd0021db6baf8dfbecad3753e582c08e6a3f805c8d00cbed756060a877d705bd8d8d
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.16.7":
-  version: 7.22.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
+"@babel/helper-split-export-declaration@npm:^7.22.6":
+  version: 7.24.7
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
+    "@babel/types": ^7.24.7
+  checksum: e3ddc91273e5da67c6953f4aa34154d005a00791dc7afa6f41894e768748540f6ebcac5d16e72541aea0c89bee4b89b4da6a3d65972a0ea8bfd2352eda5b7e22
   languageName: node
   linkType: hard
 
@@ -108,6 +120,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-string-parser@npm:7.24.7"
+  checksum: 09568193044a578743dd44bf7397940c27ea693f9812d24acb700890636b376847a611cdd0393a928544e79d7ad5b8b916bd8e6e772bc8a10c48a647a96e7b1a
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-validator-identifier@npm:7.22.20"
@@ -115,6 +134,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
+  checksum: 6799ab117cefc0ecd35cd0b40ead320c621a298ecac88686a14cffceaac89d80cdb3c178f969861bf5fa5e4f766648f9161ea0752ecfe080d8e89e3147270257
+  languageName: node
+  linkType: hard
+
 "@babel/highlight@npm:^7.22.13":
   version: 7.22.20
   resolution: "@babel/highlight@npm:7.22.20"
@@ -126,7 +152,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.17.3, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.22.15":
+"@babel/highlight@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/highlight@npm:7.24.7"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.24.7
+    chalk: ^2.4.2
+    js-tokens: ^4.0.0
+    picocolors: ^1.0.0
+  checksum: 5cd3a89f143671c4ac129960024ba678b669e6fc673ce078030f5175002d1d3d52bc10b22c5b916a6faf644b5028e9a4bd2bb264d053d9b05b6a98690f1d46f1
+  languageName: node
+  linkType: hard
+
+"@babel/parser@npm:^7.20.5":
   version: 7.23.0
   resolution: "@babel/parser@npm:7.23.0"
   bin:
@@ -135,6 +173,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/parser@npm:7.24.7"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: fc9d2c4c8712f89672edc55c0dc5cf640dcec715b56480f111f85c2bc1d507e251596e4110d65796690a96ac37a4b60432af90b3e97bb47e69d4ef83872dbbd6
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.20.7":
   version: 7.23.1
   resolution: "@babel/runtime@npm:7.23.1"
@@ -162,32 +209,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/template@npm:7.22.15"
+"@babel/template@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/template@npm:7.24.7"
   dependencies:
-    "@babel/code-frame": ^7.22.13
-    "@babel/parser": ^7.22.15
-    "@babel/types": ^7.22.15
-  checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
+    "@babel/code-frame": ^7.24.7
+    "@babel/parser": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: ea90792fae708ddf1632e54c25fe1a86643d8c0132311f81265d2bdbdd42f9f4fac65457056c1b6ca87f7aa0d6a795b549566774bba064bdcea2034ab3960ee9
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7.17.3":
-  version: 7.17.3
-  resolution: "@babel/traverse@npm:7.17.3"
+"@babel/traverse@npm:7.23.2":
+  version: 7.23.2
+  resolution: "@babel/traverse@npm:7.23.2"
   dependencies:
-    "@babel/code-frame": ^7.16.7
-    "@babel/generator": ^7.17.3
-    "@babel/helper-environment-visitor": ^7.16.7
-    "@babel/helper-function-name": ^7.16.7
-    "@babel/helper-hoist-variables": ^7.16.7
-    "@babel/helper-split-export-declaration": ^7.16.7
-    "@babel/parser": ^7.17.3
-    "@babel/types": ^7.17.0
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.0
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-function-name": ^7.23.0
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/parser": ^7.23.0
+    "@babel/types": ^7.23.0
     debug: ^4.1.0
     globals: ^11.1.0
-  checksum: 780d7ecf711758174989794891af08d378f81febdb8932056c0d9979524bf0298e28f8e7708a872d7781151506c28f56c85c63ea3f1f654662c2fcb8a3eb9fdc
+  checksum: 26a1eea0dde41ab99dde8b9773a013a0dc50324e5110a049f5d634e721ff08afffd54940b3974a20308d7952085ac769689369e9127dea655f868c0f6e1ab35d
   languageName: node
   linkType: hard
 
@@ -201,7 +248,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.17.0, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.8.3":
+"@babel/types@npm:^7.17.0, @babel/types@npm:^7.23.0, @babel/types@npm:^7.8.3":
   version: 7.23.0
   resolution: "@babel/types@npm:7.23.0"
   dependencies:
@@ -212,6 +259,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/types@npm:7.24.7"
+  dependencies:
+    "@babel/helper-string-parser": ^7.24.7
+    "@babel/helper-validator-identifier": ^7.24.7
+    to-fast-properties: ^2.0.0
+  checksum: 3e4437fced97e02982972ce5bebd318c47d42c9be2152c0fd28c6f786cc74086cc0a8fb83b602b846e41df37f22c36254338eada1a47ef9d8a1ec92332ca3ea8
+  languageName: node
+  linkType: hard
+
 "@chainsafe/as-sha256@npm:^0.3.1":
   version: 0.3.1
   resolution: "@chainsafe/as-sha256@npm:0.3.1"
@@ -879,6 +937,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
+  dependencies:
+    "@jridgewell/set-array": ^1.2.1
+    "@jridgewell/sourcemap-codec": ^1.4.10
+    "@jridgewell/trace-mapping": ^0.3.24
+  checksum: ff7a1764ebd76a5e129c8890aa3e2f46045109dabde62b0b6c6a250152227647178ff2069ea234753a690d8f3c4ac8b5e7b267bbee272bffb7f3b0a370ab6e52
+  languageName: node
+  linkType: hard
+
 "@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0":
   version: 3.1.1
   resolution: "@jridgewell/resolve-uri@npm:3.1.1"
@@ -893,6 +962,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10
+  languageName: node
+  linkType: hard
+
 "@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
@@ -910,7 +986,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
+"@jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
+  dependencies:
+    "@jridgewell/resolve-uri": ^3.1.0
+    "@jridgewell/sourcemap-codec": ^1.4.14
+  checksum: 9d3c40d225e139987b50c48988f8717a54a8c994d8a948ee42e1412e08988761d0754d7d10b803061cc3aebf35f92a5dbbab493bd0e1a9ef9e89a2130e83ba34
+  languageName: node
+  linkType: hard
+
+"@jridgewell/trace-mapping@npm:^0.3.9":
   version: 0.3.19
   resolution: "@jridgewell/trace-mapping@npm:0.3.19"
   dependencies:
@@ -1943,6 +2029,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@pkgr/core@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "@pkgr/core@npm:0.1.1"
+  checksum: 6f25fd2e3008f259c77207ac9915b02f1628420403b2630c92a07ff963129238c9262afc9e84344c7a23b5cc1f3965e2cd17e3798219f5fd78a63d144d3cceba
+  languageName: node
+  linkType: hard
+
 "@rainbow-me/rainbowkit@npm:2.1.0":
   version: 2.1.0
   resolution: "@rainbow-me/rainbowkit@npm:2.1.0"
@@ -2120,14 +2213,14 @@ __metadata:
     dotenv: ^16.0.3
     envfile: ^6.18.0
     eslint: ^8.26.0
-    eslint-config-prettier: ^8.5.0
-    eslint-plugin-prettier: ^4.2.1
+    eslint-config-prettier: ^9.1.0
+    eslint-plugin-prettier: ^5.1.3
     ethers: ^6.10.0
     hardhat: ^2.19.4
     hardhat-deploy: ^0.11.45
     hardhat-deploy-ethers: ^0.4.1
     hardhat-gas-reporter: ^1.0.9
-    prettier: ^2.8.4
+    prettier: ^3.3.2
     qrcode: ^1.5.1
     solidity-coverage: ^0.8.5
     ts-node: ^10.9.1
@@ -2143,7 +2236,7 @@ __metadata:
     "@heroicons/react": ^2.0.11
     "@rainbow-me/rainbowkit": 2.1.2
     "@tanstack/react-query": ^5.28.6
-    "@trivago/prettier-plugin-sort-imports": ^4.1.1
+    "@trivago/prettier-plugin-sort-imports": ^4.3.0
     "@types/node": ^17.0.35
     "@types/nprogress": ^0
     "@types/react": ^18.0.9
@@ -2158,13 +2251,13 @@ __metadata:
     daisyui: 4.5.0
     eslint: ^8.15.0
     eslint-config-next: ^14.0.4
-    eslint-config-prettier: ^8.5.0
-    eslint-plugin-prettier: ^4.2.1
+    eslint-config-prettier: ^9.1.0
+    eslint-plugin-prettier: ^5.1.3
     next: ^14.0.4
     next-themes: ^0.2.1
     nprogress: ^0.2.0
     postcss: ^8.4.16
-    prettier: ^2.8.4
+    prettier: ^3.3.2
     qrcode.react: ^3.1.0
     react: ^18.2.0
     react-copy-to-clipboard: ^5.1.0
@@ -2500,13 +2593,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@trivago/prettier-plugin-sort-imports@npm:^4.1.1":
-  version: 4.2.0
-  resolution: "@trivago/prettier-plugin-sort-imports@npm:4.2.0"
+"@trivago/prettier-plugin-sort-imports@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "@trivago/prettier-plugin-sort-imports@npm:4.3.0"
   dependencies:
     "@babel/generator": 7.17.7
     "@babel/parser": ^7.20.5
-    "@babel/traverse": 7.17.3
+    "@babel/traverse": 7.23.2
     "@babel/types": 7.17.0
     javascript-natural-sort: 0.7.1
     lodash: ^4.17.21
@@ -2516,7 +2609,7 @@ __metadata:
   peerDependenciesMeta:
     "@vue/compiler-sfc":
       optional: true
-  checksum: 2081ba9f1a2d33b9a3eeadeb3e713d404ee3d1a5cff3b20a23d94d6d915f0a8ff549616c1e77cd728f1b33733e0d7ab8e4c2512f344a612d81ece40025351160
+  checksum: 22bb311ca24f09eef25915a66727e7be113b703f196f6ea0589dc9730b11a6f1e5e4bcc468213101d138b570d310792c83abb8d9487c53f9e597942fea052b6e
   languageName: node
   linkType: hard
 
@@ -6506,14 +6599,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:^8.5.0":
-  version: 8.10.0
-  resolution: "eslint-config-prettier@npm:8.10.0"
+"eslint-config-prettier@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "eslint-config-prettier@npm:9.1.0"
   peerDependencies:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: 153266badd477e49b0759816246b2132f1dbdb6c7f313ca60a9af5822fd1071c2bc5684a3720d78b725452bbac04bb130878b2513aea5e72b1b792de5a69fec8
+  checksum: 9229b768c879f500ee54ca05925f31b0c0bafff3d9f5521f98ff05127356de78c81deb9365c86a5ec4efa990cb72b74df8612ae15965b14136044c73e1f6a907
   languageName: node
   linkType: hard
 
@@ -6611,18 +6704,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "eslint-plugin-prettier@npm:4.2.1"
+"eslint-plugin-prettier@npm:^5.1.3":
+  version: 5.1.3
+  resolution: "eslint-plugin-prettier@npm:5.1.3"
   dependencies:
     prettier-linter-helpers: ^1.0.0
+    synckit: ^0.8.6
   peerDependencies:
-    eslint: ">=7.28.0"
-    prettier: ">=2.0.0"
+    "@types/eslint": ">=8.0.0"
+    eslint: ">=8.0.0"
+    eslint-config-prettier: "*"
+    prettier: ">=3.0.0"
   peerDependenciesMeta:
+    "@types/eslint":
+      optional: true
     eslint-config-prettier:
       optional: true
-  checksum: b9e839d2334ad8ec7a5589c5cb0f219bded260839a857d7a486997f9870e95106aa59b8756ff3f37202085ebab658de382b0267cae44c3a7f0eb0bcc03a4f6d6
+  checksum: eb2a7d46a1887e1b93788ee8f8eb81e0b6b2a6f5a66a62bc6f375b033fc4e7ca16448da99380be800042786e76cf5c0df9c87a51a2c9b960ed47acbd7c0b9381
   languageName: node
   linkType: hard
 
@@ -11561,7 +11659,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.3.1, prettier@npm:^2.8.4":
+"prettier@npm:^2.3.1":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
   bin:
@@ -11570,6 +11668,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "prettier@npm:3.3.2"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: 5557d8caed0b182f68123c2e1e370ef105251d1dd75800fadaece3d061daf96b1389141634febf776050f9d732c7ae8fd444ff0b4a61b20535e7610552f32c69
+  languageName: node
+  linkType: hard
+
 "pretty-bytes@npm:5.6.0":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"
@@ -13353,6 +13460,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"synckit@npm:^0.8.6":
+  version: 0.8.8
+  resolution: "synckit@npm:0.8.8"
+  dependencies:
+    "@pkgr/core": ^0.1.0
+    tslib: ^2.6.2
+  checksum: 9ed5d33abb785f5f24e2531efd53b2782ca77abf7912f734d170134552b99001915531be5a50297aa45c5701b5c9041e8762e6cd7a38e41e2461c1e7fccdedf8
+  languageName: node
+  linkType: hard
+
 "table-layout@npm:^1.0.2":
   version: 1.0.2
   resolution: "table-layout@npm:1.0.2"
@@ -13729,6 +13846,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.6.2":
+  version: 2.6.3
+  resolution: "tslib@npm:2.6.3"
+  checksum: 74fce0e100f1ebd95b8995fbbd0e6c91bdd8f4c35c00d4da62e285a3363aaa534de40a80db30ecfd388ed7c313c42d930ee0eaf108e8114214b180eec3dbe6f5
+  languageName: node
+  linkType: hard
+
 "tsort@npm:0.0.1":
   version: 0.0.1
   resolution: "tsort@npm:0.0.1"

From a9545d5ec97f37acebf30a530910e52afba9fc6d Mon Sep 17 00:00:00 2001
From: Shiv Bhonde <shivbhonde04@gmail.com>
Date: Fri, 28 Jun 2024 17:58:15 +0530
Subject: [PATCH 10/11] add changeset

---
 .changeset/sweet-seas-raise.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/sweet-seas-raise.md

diff --git a/.changeset/sweet-seas-raise.md b/.changeset/sweet-seas-raise.md
new file mode 100644
index 000000000..f08b621d4
--- /dev/null
+++ b/.changeset/sweet-seas-raise.md
@@ -0,0 +1,5 @@
+---
+"create-eth": patch
+---
+
+up prettier (scaffold-eth#875)

From 4db51acd26de1a1af888feaff6bcc599948cd791 Mon Sep 17 00:00:00 2001
From: "Shiv Bhonde | shivbhonde.eth" <shivbhonde04@gmail.com>
Date: Fri, 28 Jun 2024 20:50:32 +0530
Subject: [PATCH 11/11] prettier format instance with cli itself (#55)

Co-authored-by: Rinat <rinat@hey.com>
---
 .changeset/angry-zoos-kneel.md                |   5 +
 package.json                                  |   6 +-
 src/main.ts                                   |  14 +-
 src/tasks/prettier-format.ts                  |  51 ++-
 .../base/packages/nextjs/.prettierrc.json     |   3 +-
 .../foundry/contracts/YourContract.sol        | 116 +++----
 .../foundry/packages/foundry/foundry.toml     |   6 +-
 .../foundry/script/DeployHelpers.s.sol        | 113 ++++---
 .../packages/foundry/script/VerifyAll.s.sol   | 161 +++++-----
 .../packages/foundry/test/YourContract.t.sol  |  34 +-
 yarn.lock                                     | 302 +++++++++++++++++-
 11 files changed, 567 insertions(+), 244 deletions(-)
 create mode 100644 .changeset/angry-zoos-kneel.md

diff --git a/.changeset/angry-zoos-kneel.md b/.changeset/angry-zoos-kneel.md
new file mode 100644
index 000000000..1dafff23a
--- /dev/null
+++ b/.changeset/angry-zoos-kneel.md
@@ -0,0 +1,5 @@
+---
+"create-eth": patch
+---
+
+cli: format instance with prettier from cli
diff --git a/package.json b/package.json
index 6d721162f..527bf98c3 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,6 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "lefthook": "^1.6.16",
-    "prettier": "3.2.5",
     "rollup": "3.21.0",
     "rollup-plugin-auto-external": "2.0.0",
     "tslib": "2.5.0",
@@ -48,6 +47,7 @@
   },
   "dependencies": {
     "@changesets/cli": "^2.26.2",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "arg": "5.0.2",
     "chalk": "5.2.0",
     "execa": "7.1.1",
@@ -55,7 +55,9 @@
     "listr2": "^8.2.1",
     "merge-packages": "^0.1.6",
     "ncp": "2.0.0",
-    "pkg-install": "1.0.0"
+    "pkg-install": "1.0.0",
+    "prettier": "3.3.2",
+    "prettier-plugin-solidity": "^1.3.1"
   },
   "packageManager": "yarn@3.5.0"
 }
diff --git a/src/main.ts b/src/main.ts
index 4e28af211..7dfdb0fae 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -35,6 +35,10 @@ export async function createProject(options: Options) {
         )}${options.externalExtension ? ` with the ${chalk.green.bold(options.dev ? options.externalExtension : getArgumentFromExternalExtensionOption(options.externalExtension))} extension` : ""}`,
         task: () => copyTemplateFiles(options, templateDirectory, targetDirectory),
       },
+      {
+        title: "🪄 Formatting files",
+        task: () => prettierFormat(targetDirectory, options),
+      },
       {
         title: `📦 Installing dependencies with yarn, this could take a while`,
         task: () => installPackages(targetDirectory),
@@ -45,16 +49,6 @@ export async function createProject(options: Options) {
           return false;
         },
       },
-      {
-        title: "🪄 Formatting files with prettier",
-        task: () => prettierFormat(targetDirectory),
-        skip: () => {
-          if (!options.install) {
-            return "Skipping because prettier install was skipped";
-          }
-          return false;
-        },
-      },
       {
         title: `📡 Initializing Git repository${options.extensions.includes(SOLIDITY_FRAMEWORKS.FOUNDRY) ? " and submodules" : ""}`,
         task: () => createFirstGitCommit(targetDirectory, options),
diff --git a/src/tasks/prettier-format.ts b/src/tasks/prettier-format.ts
index b126ce2e6..2bf6cb3da 100644
--- a/src/tasks/prettier-format.ts
+++ b/src/tasks/prettier-format.ts
@@ -1,15 +1,54 @@
 import { execa } from "execa";
+import path from "path";
+import { Options } from "../types";
+import { SOLIDITY_FRAMEWORKS } from "../utils/consts";
 
-// TODO: Instead of using execa, use prettier package from cli to format targetDir
-export async function prettierFormat(targetDir: string) {
+async function runPrettier(targetPath: string[], prettierConfigPath: string, prettierPlugins: string[]) {
+  console.log("the prettier config path is", prettierConfigPath);
+  const result = await execa("yarn", [
+    "prettier",
+    "--write",
+    ...targetPath,
+    "--config",
+    prettierConfigPath,
+    ...prettierPlugins,
+    "--no-editorconfig",
+  ]);
+  if (result.failed) {
+    throw new Error(`There was a problem running prettier in ${targetPath.join(" ")}`);
+  }
+}
+
+export async function prettierFormat(targetDir: string, options: Options) {
   try {
-    const result = await execa("yarn", ["format"], { cwd: targetDir });
+    const nextJsPath = path.join(targetDir, "packages", "nextjs");
+    const nextPrettierConfig = path.join(nextJsPath, ".prettierrc.json");
+
+    await runPrettier([nextJsPath], nextPrettierConfig, ["--plugin=@trivago/prettier-plugin-sort-imports"]);
+
+    if (options.extensions.includes(SOLIDITY_FRAMEWORKS.HARDHAT)) {
+      const hardhatPackagePath = path.join(targetDir, "packages", SOLIDITY_FRAMEWORKS.HARDHAT);
+      const hardhatPrettierConfig = path.join(hardhatPackagePath, ".prettierrc.json");
+      const hardhatPaths = [
+        `${hardhatPackagePath}/*.ts`,
+        `${hardhatPackagePath}/deploy/**/*.ts`,
+        `${hardhatPackagePath}/scripts/**/*.ts`,
+        `${hardhatPackagePath}/test/**/*.ts`,
+        `${hardhatPackagePath}/contracts/**/*.sol`,
+      ];
+
+      await runPrettier(hardhatPaths, hardhatPrettierConfig, ["--plugin=prettier-plugin-solidity"]);
+    }
 
-    if (result.failed) {
-      throw new Error("There was a problem running the format command");
+    if (options.extensions.includes(SOLIDITY_FRAMEWORKS.FOUNDRY)) {
+      const foundryPackagePath = path.resolve(targetDir, "packages", SOLIDITY_FRAMEWORKS.FOUNDRY);
+      const foundryResult = await execa("forge", ["fmt"], { cwd: foundryPackagePath });
+      if (foundryResult.failed) {
+        throw new Error("There was a problem running forge fmt in the foundry package");
+      }
     }
   } catch (error) {
-    throw new Error("Failed to create directory", { cause: error });
+    throw new Error("Failed to run prettier", { cause: error });
   }
 
   return true;
diff --git a/templates/base/packages/nextjs/.prettierrc.json b/templates/base/packages/nextjs/.prettierrc.json
index 790388a77..72781a493 100644
--- a/templates/base/packages/nextjs/.prettierrc.json
+++ b/templates/base/packages/nextjs/.prettierrc.json
@@ -5,5 +5,6 @@
   "tabWidth": 2,
   "trailingComma": "all",
   "importOrder": ["^react$", "^next/(.*)$", "<THIRD_PARTY_MODULES>", "^@heroicons/(.*)$", "^~~/(.*)$"],
-  "importOrderSortSpecifiers": true
+  "importOrderSortSpecifiers": true,
+  "plugins": ["@trivago/prettier-plugin-sort-imports"]
 }
diff --git a/templates/extensions/foundry/packages/foundry/contracts/YourContract.sol b/templates/extensions/foundry/packages/foundry/contracts/YourContract.sol
index 631b8b100..314277455 100644
--- a/templates/extensions/foundry/packages/foundry/contracts/YourContract.sol
+++ b/templates/extensions/foundry/packages/foundry/contracts/YourContract.sol
@@ -13,72 +13,72 @@ import "forge-std/console.sol";
  * @author BuidlGuidl
  */
 contract YourContract {
-    // State Variables
-    address public immutable owner;
-    string public greeting = "Building Unstoppable Apps!!!";
-    bool public premium = false;
-    uint256 public totalCounter = 0;
-    mapping(address => uint256) public userGreetingCounter;
+  // State Variables
+  address public immutable owner;
+  string public greeting = "Building Unstoppable Apps!!!";
+  bool public premium = false;
+  uint256 public totalCounter = 0;
+  mapping(address => uint256) public userGreetingCounter;
 
-    // Events: a way to emit log statements from smart contract that can be listened to by external parties
-    event GreetingChange(
-        address indexed greetingSetter,
-        string newGreeting,
-        bool premium,
-        uint256 value
-    );
+  // Events: a way to emit log statements from smart contract that can be listened to by external parties
+  event GreetingChange(
+    address indexed greetingSetter,
+    string newGreeting,
+    bool premium,
+    uint256 value
+  );
 
-    // Constructor: Called once on contract deployment
-    // Check packages/foundry/deploy/Deploy.s.sol
-    constructor(address _owner) {
-        owner = _owner;
-    }
-
-    // Modifier: used to define a set of rules that must be met before or after a function is executed
-    // Check the withdraw() function
-    modifier isOwner() {
-        // msg.sender: predefined variable that represents address of the account that called the current function
-        require(msg.sender == owner, "Not the Owner");
-        _;
-    }
+  // Constructor: Called once on contract deployment
+  // Check packages/foundry/deploy/Deploy.s.sol
+  constructor(address _owner) {
+    owner = _owner;
+  }
 
-    /**
-     * Function that allows anyone to change the state variable "greeting" of the contract and increase the counters
-     *
-     * @param _newGreeting (string memory) - new greeting to save on the contract
-     */
-    function setGreeting(string memory _newGreeting) public payable {
-        // Print data to the anvil chain console. Remove when deploying to a live network.
+  // Modifier: used to define a set of rules that must be met before or after a function is executed
+  // Check the withdraw() function
+  modifier isOwner() {
+    // msg.sender: predefined variable that represents address of the account that called the current function
+    require(msg.sender == owner, "Not the Owner");
+    _;
+  }
 
-        console.logString("Setting new greeting");
-        console.logString(_newGreeting);
+  /**
+   * Function that allows anyone to change the state variable "greeting" of the contract and increase the counters
+   *
+   * @param _newGreeting (string memory) - new greeting to save on the contract
+   */
+  function setGreeting(string memory _newGreeting) public payable {
+    // Print data to the anvil chain console. Remove when deploying to a live network.
 
-        greeting = _newGreeting;
-        totalCounter += 1;
-        userGreetingCounter[msg.sender] += 1;
+    console.logString("Setting new greeting");
+    console.logString(_newGreeting);
 
-        // msg.value: built-in global variable that represents the amount of ether sent with the transaction
-        if (msg.value > 0) {
-            premium = true;
-        } else {
-            premium = false;
-        }
+    greeting = _newGreeting;
+    totalCounter += 1;
+    userGreetingCounter[msg.sender] += 1;
 
-        // emit: keyword used to trigger an event
-        emit GreetingChange(msg.sender, _newGreeting, msg.value > 0, msg.value);
+    // msg.value: built-in global variable that represents the amount of ether sent with the transaction
+    if (msg.value > 0) {
+      premium = true;
+    } else {
+      premium = false;
     }
 
-    /**
-     * Function that allows the owner to withdraw all the Ether in the contract
-     * The function can only be called by the owner of the contract as defined by the isOwner modifier
-     */
-    function withdraw() public isOwner {
-        (bool success,) = owner.call{value: address(this).balance}("");
-        require(success, "Failed to send Ether");
-    }
+    // emit: keyword used to trigger an event
+    emit GreetingChange(msg.sender, _newGreeting, msg.value > 0, msg.value);
+  }
+
+  /**
+   * Function that allows the owner to withdraw all the Ether in the contract
+   * The function can only be called by the owner of the contract as defined by the isOwner modifier
+   */
+  function withdraw() public isOwner {
+    (bool success,) = owner.call{ value: address(this).balance }("");
+    require(success, "Failed to send Ether");
+  }
 
-    /**
-     * Function that allows the contract to receive ETH
-     */
-    receive() external payable {}
+  /**
+   * Function that allows the contract to receive ETH
+   */
+  receive() external payable { }
 }
diff --git a/templates/extensions/foundry/packages/foundry/foundry.toml b/templates/extensions/foundry/packages/foundry/foundry.toml
index c15273b23..feee8aa32 100644
--- a/templates/extensions/foundry/packages/foundry/foundry.toml
+++ b/templates/extensions/foundry/packages/foundry/foundry.toml
@@ -34,7 +34,11 @@ sepolia = { key = "${ETHERSCAN_API_KEY}" }
 
 
 [fmt]
-line_length = 80
 multiline_func_header = "params_first"
+line_length = 80
+tab_width = 2
+quote_style = "double"
+bracket_spacing = true
+int_types = "long"
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
diff --git a/templates/extensions/foundry/packages/foundry/script/DeployHelpers.s.sol b/templates/extensions/foundry/packages/foundry/script/DeployHelpers.s.sol
index b7d6620d2..7338ac1af 100644
--- a/templates/extensions/foundry/packages/foundry/script/DeployHelpers.s.sol
+++ b/templates/extensions/foundry/packages/foundry/script/DeployHelpers.s.sol
@@ -5,77 +5,74 @@ import "forge-std/Script.sol";
 import "forge-std/Vm.sol";
 
 contract ScaffoldETHDeploy is Script {
-    error InvalidChain();
+  error InvalidChain();
 
-    struct Deployment {
-        string name;
-        address addr;
-    }
+  struct Deployment {
+    string name;
+    address addr;
+  }
 
-    string root;
-    string path;
-    Deployment[] public deployments;
+  string root;
+  string path;
+  Deployment[] public deployments;
 
-    function setupLocalhostEnv()
-        internal
-        returns (uint256 localhostPrivateKey)
-    {
-        if (block.chainid == 31337) {
-            root = vm.projectRoot();
-            path = string.concat(root, "/localhost.json");
-            string memory json = vm.readFile(path);
-            bytes memory mnemonicBytes = vm.parseJson(json, ".wallet.mnemonic");
-            string memory mnemonic = abi.decode(mnemonicBytes, (string));
-            return vm.deriveKey(mnemonic, 0);
-        } else {
-            return vm.envUint("DEPLOYER_PRIVATE_KEY");
-        }
+  function setupLocalhostEnv() internal returns (uint256 localhostPrivateKey) {
+    if (block.chainid == 31337) {
+      root = vm.projectRoot();
+      path = string.concat(root, "/localhost.json");
+      string memory json = vm.readFile(path);
+      bytes memory mnemonicBytes = vm.parseJson(json, ".wallet.mnemonic");
+      string memory mnemonic = abi.decode(mnemonicBytes, (string));
+      return vm.deriveKey(mnemonic, 0);
+    } else {
+      return vm.envUint("DEPLOYER_PRIVATE_KEY");
     }
+  }
 
-    function exportDeployments() internal {
-        // fetch already existing contracts
-        root = vm.projectRoot();
-        path = string.concat(root, "/deployments/");
-        string memory chainIdStr = vm.toString(block.chainid);
-        path = string.concat(path, string.concat(chainIdStr, ".json"));
+  function exportDeployments() internal {
+    // fetch already existing contracts
+    root = vm.projectRoot();
+    path = string.concat(root, "/deployments/");
+    string memory chainIdStr = vm.toString(block.chainid);
+    path = string.concat(path, string.concat(chainIdStr, ".json"));
 
-        string memory jsonWrite;
+    string memory jsonWrite;
 
-        uint256 len = deployments.length;
+    uint256 len = deployments.length;
 
-        for (uint256 i = 0; i < len; i++) {
-            vm.serializeString(
-                jsonWrite, vm.toString(deployments[i].addr), deployments[i].name
-            );
-        }
+    for (uint256 i = 0; i < len; i++) {
+      vm.serializeString(
+        jsonWrite, vm.toString(deployments[i].addr), deployments[i].name
+      );
+    }
 
-        string memory chainName;
+    string memory chainName;
 
-        try this.getChain() returns (Chain memory chain) {
-            chainName = chain.name;
-        } catch {
-            chainName = findChainName();
-        }
-        jsonWrite = vm.serializeString(jsonWrite, "networkName", chainName);
-        vm.writeJson(jsonWrite, path);
+    try this.getChain() returns (Chain memory chain) {
+      chainName = chain.name;
+    } catch {
+      chainName = findChainName();
     }
+    jsonWrite = vm.serializeString(jsonWrite, "networkName", chainName);
+    vm.writeJson(jsonWrite, path);
+  }
 
-    function getChain() public returns (Chain memory) {
-        return getChain(block.chainid);
-    }
+  function getChain() public returns (Chain memory) {
+    return getChain(block.chainid);
+  }
 
-    function findChainName() public returns (string memory) {
-        uint256 thisChainId = block.chainid;
-        string[2][] memory allRpcUrls = vm.rpcUrls();
-        for (uint256 i = 0; i < allRpcUrls.length; i++) {
-            try vm.createSelectFork(allRpcUrls[i][1]) {
-                if (block.chainid == thisChainId) {
-                    return allRpcUrls[i][0];
-                }
-            } catch {
-                continue;
-            }
+  function findChainName() public returns (string memory) {
+    uint256 thisChainId = block.chainid;
+    string[2][] memory allRpcUrls = vm.rpcUrls();
+    for (uint256 i = 0; i < allRpcUrls.length; i++) {
+      try vm.createSelectFork(allRpcUrls[i][1]) {
+        if (block.chainid == thisChainId) {
+          return allRpcUrls[i][0];
         }
-        revert InvalidChain();
+      } catch {
+        continue;
+      }
     }
+    revert InvalidChain();
+  }
 }
diff --git a/templates/extensions/foundry/packages/foundry/script/VerifyAll.s.sol b/templates/extensions/foundry/packages/foundry/script/VerifyAll.s.sol
index e1090711d..275f49b97 100644
--- a/templates/extensions/foundry/packages/foundry/script/VerifyAll.s.sol
+++ b/templates/extensions/foundry/packages/foundry/script/VerifyAll.s.sol
@@ -11,45 +11,43 @@ import "solidity-bytes-utils/BytesLib.sol";
  * @notice will be deleted once the forge/std is updated
  */
 struct FfiResult {
-    int32 exit_code;
-    bytes stdout;
-    bytes stderr;
+  int32 exit_code;
+  bytes stdout;
+  bytes stderr;
 }
 
 interface tempVm {
-    function tryFfi(string[] calldata) external returns (FfiResult memory);
+  function tryFfi(string[] calldata) external returns (FfiResult memory);
 }
 
 contract VerifyAll is Script {
-    uint96 currTransactionIdx;
+  uint96 currTransactionIdx;
 
-    function run() external {
-        string memory root = vm.projectRoot();
-        string memory path = string.concat(
-            root,
-            "/broadcast/Deploy.s.sol/",
-            vm.toString(block.chainid),
-            "/run-latest.json"
-        );
-        string memory content = vm.readFile(path);
+  function run() external {
+    string memory root = vm.projectRoot();
+    string memory path = string.concat(
+      root,
+      "/broadcast/Deploy.s.sol/",
+      vm.toString(block.chainid),
+      "/run-latest.json"
+    );
+    string memory content = vm.readFile(path);
 
-        while (this.nextTransaction(content)) {
-            _verifyIfContractDeployment(content);
-            currTransactionIdx++;
-        }
+    while (this.nextTransaction(content)) {
+      _verifyIfContractDeployment(content);
+      currTransactionIdx++;
     }
+  }
 
-    function _verifyIfContractDeployment(string memory content) internal {
-        string memory txType = abi.decode(
-            vm.parseJson(
-                content, searchStr(currTransactionIdx, "transactionType")
-            ),
-            (string)
-        );
-        if (keccak256(bytes(txType)) == keccak256(bytes("CREATE"))) {
-            _verifyContract(content);
-        }
+  function _verifyIfContractDeployment(string memory content) internal {
+    string memory txType = abi.decode(
+      vm.parseJson(content, searchStr(currTransactionIdx, "transactionType")),
+      (string)
+    );
+    if (keccak256(bytes(txType)) == keccak256(bytes("CREATE"))) {
+      _verifyContract(content);
     }
+  }
 
     function _verifyContract(string memory content) internal {
         string memory contractName = abi.decode(
@@ -78,69 +76,62 @@ contract VerifyAll is Script {
             deployedBytecode.length - compiledBytecode.length
         );
 
-        string[] memory inputs = new string[](9);
-        inputs[0] = "forge";
-        inputs[1] = "verify-contract";
-        inputs[2] = vm.toString(contractAddr);
-        inputs[3] = contractName;
-        inputs[4] = "--chain";
-        inputs[5] = vm.toString(block.chainid);
-        inputs[6] = "--constructor-args";
-        inputs[7] = vm.toString(constructorArgs);
-        inputs[8] = "--watch";
+    string[] memory inputs = new string[](9);
+    inputs[0] = "forge";
+    inputs[1] = "verify-contract";
+    inputs[2] = vm.toString(contractAddr);
+    inputs[3] = contractName;
+    inputs[4] = "--chain";
+    inputs[5] = vm.toString(block.chainid);
+    inputs[6] = "--constructor-args";
+    inputs[7] = vm.toString(constructorArgs);
+    inputs[8] = "--watch";
 
-        FfiResult memory f = tempVm(address(vm)).tryFfi(inputs);
+    FfiResult memory f = tempVm(address(vm)).tryFfi(inputs);
 
-        if (f.stderr.length != 0) {
-            console.logString(
-                string.concat(
-                    "Submitting verification for contract: ",
-                    vm.toString(contractAddr)
-                )
-            );
-            console.logString(string(f.stderr));
-        } else {
-            console.logString(string(f.stdout));
-        }
-        return;
+    if (f.stderr.length != 0) {
+      console.logString(
+        string.concat(
+          "Submitting verification for contract: ", vm.toString(contractAddr)
+        )
+      );
+      console.logString(string(f.stderr));
+    } else {
+      console.logString(string(f.stdout));
     }
+    return;
+  }
 
-    function nextTransaction(string memory content)
-        external
-        view
-        returns (bool)
-    {
-        try this.getTransactionFromRaw(content, currTransactionIdx) {
-            return true;
-        } catch {
-            return false;
-        }
+  function nextTransaction(string memory content) external view returns (bool) {
+    try this.getTransactionFromRaw(content, currTransactionIdx) {
+      return true;
+    } catch {
+      return false;
     }
+  }
 
-    function _getCompiledBytecode(string memory contractName)
-        internal
-        view
-        returns (string memory compiledBytecode)
-    {
-        string memory root = vm.projectRoot();
-        string memory path = string.concat(
-            root, "/out/", contractName, ".sol/", contractName, ".json"
-        );
-        compiledBytecode = vm.readFile(path);
-    }
+  function _getCompiledBytecode(string memory contractName)
+    internal
+    view
+    returns (string memory compiledBytecode)
+  {
+    string memory root = vm.projectRoot();
+    string memory path =
+      string.concat(root, "/out/", contractName, ".sol/", contractName, ".json");
+    compiledBytecode = vm.readFile(path);
+  }
 
-    function getTransactionFromRaw(
-        string memory content,
-        uint96 idx
-    ) external pure {
-        abi.decode(vm.parseJson(content, searchStr(idx, "hash")), (bytes32));
-    }
+  function getTransactionFromRaw(
+    string memory content,
+    uint96 idx
+  ) external pure {
+    abi.decode(vm.parseJson(content, searchStr(idx, "hash")), (bytes32));
+  }
 
-    function searchStr(
-        uint96 idx,
-        string memory searchKey
-    ) internal pure returns (string memory) {
-        return
-            string.concat(".transactions[", vm.toString(idx), "].", searchKey);
-    }
+  function searchStr(
+    uint96 idx,
+    string memory searchKey
+  ) internal pure returns (string memory) {
+    return string.concat(".transactions[", vm.toString(idx), "].", searchKey);
+  }
 }
diff --git a/templates/extensions/foundry/packages/foundry/test/YourContract.t.sol b/templates/extensions/foundry/packages/foundry/test/YourContract.t.sol
index 2bb348efd..a6a2c10d0 100644
--- a/templates/extensions/foundry/packages/foundry/test/YourContract.t.sol
+++ b/templates/extensions/foundry/packages/foundry/test/YourContract.t.sol
@@ -5,24 +5,24 @@ import "forge-std/Test.sol";
 import "../contracts/YourContract.sol";
 
 contract YourContractTest is Test {
-    YourContract public yourContract;
+  YourContract public yourContract;
 
-    function setUp() public {
-        yourContract = new YourContract(vm.addr(1));
-    }
+  function setUp() public {
+    yourContract = new YourContract(vm.addr(1));
+  }
 
-    function testMessageOnDeployment() public view {
-        require(
-            keccak256(bytes(yourContract.greeting()))
-                == keccak256("Building Unstoppable Apps!!!")
-        );
-    }
+  function testMessageOnDeployment() public view {
+    require(
+      keccak256(bytes(yourContract.greeting()))
+        == keccak256("Building Unstoppable Apps!!!")
+    );
+  }
 
-    function testSetNewMessage() public {
-        yourContract.setGreeting("Learn Scaffold-ETH 2! :)");
-        require(
-            keccak256(bytes(yourContract.greeting()))
-                == keccak256("Learn Scaffold-ETH 2! :)")
-        );
-    }
+  function testSetNewMessage() public {
+    yourContract.setGreeting("Learn Scaffold-ETH 2! :)");
+    require(
+      keccak256(bytes(yourContract.greeting()))
+        == keccak256("Learn Scaffold-ETH 2! :)")
+    );
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index b2681772e..28c2393a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,6 +15,90 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/code-frame@npm:7.24.7"
+  dependencies:
+    "@babel/highlight": ^7.24.7
+    picocolors: ^1.0.0
+  checksum: 830e62cd38775fdf84d612544251ce773d544a8e63df667728cc9e0126eeef14c6ebda79be0f0bc307e8318316b7f58c27ce86702e0a1f5c321d842eb38ffda4
+  languageName: node
+  linkType: hard
+
+"@babel/generator@npm:7.17.7":
+  version: 7.17.7
+  resolution: "@babel/generator@npm:7.17.7"
+  dependencies:
+    "@babel/types": ^7.17.0
+    jsesc: ^2.5.1
+    source-map: ^0.5.0
+  checksum: e7344b9b4559115f2754ecc2ae9508412ea6a8f617544cd3d3f17cabc727bd30630765f96c8a4ebc8901ded1492a3a6c23d695a4f1e8f3042f860b30c891985c
+  languageName: node
+  linkType: hard
+
+"@babel/generator@npm:^7.23.0":
+  version: 7.24.7
+  resolution: "@babel/generator@npm:7.24.7"
+  dependencies:
+    "@babel/types": ^7.24.7
+    "@jridgewell/gen-mapping": ^0.3.5
+    "@jridgewell/trace-mapping": ^0.3.25
+    jsesc: ^2.5.1
+  checksum: 0ff31a73b15429f1287e4d57b439bba4a266f8c673bb445fe313b82f6d110f586776997eb723a777cd7adad9d340edd162aea4973a90112c5d0cfcaf6686844b
+  languageName: node
+  linkType: hard
+
+"@babel/helper-environment-visitor@npm:^7.22.20":
+  version: 7.24.7
+  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
+  dependencies:
+    "@babel/types": ^7.24.7
+  checksum: 079d86e65701b29ebc10baf6ed548d17c19b808a07aa6885cc141b690a78581b180ee92b580d755361dc3b16adf975b2d2058b8ce6c86675fcaf43cf22f2f7c6
+  languageName: node
+  linkType: hard
+
+"@babel/helper-function-name@npm:^7.23.0":
+  version: 7.24.7
+  resolution: "@babel/helper-function-name@npm:7.24.7"
+  dependencies:
+    "@babel/template": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: 142ee08922074dfdc0ff358e09ef9f07adf3671ab6eef4fca74dcf7a551f1a43717e7efa358c9e28d7eea84c28d7f177b7a58c70452fc312ae3b1893c5dab2a4
+  languageName: node
+  linkType: hard
+
+"@babel/helper-hoist-variables@npm:^7.22.5":
+  version: 7.24.7
+  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
+  dependencies:
+    "@babel/types": ^7.24.7
+  checksum: 6cfdcf2289cd12185dcdbdf2435fa8d3447b797ac75851166de9fc8503e2fd0021db6baf8dfbecad3753e582c08e6a3f805c8d00cbed756060a877d705bd8d8d
+  languageName: node
+  linkType: hard
+
+"@babel/helper-split-export-declaration@npm:^7.22.6":
+  version: 7.24.7
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
+  dependencies:
+    "@babel/types": ^7.24.7
+  checksum: e3ddc91273e5da67c6953f4aa34154d005a00791dc7afa6f41894e768748540f6ebcac5d16e72541aea0c89bee4b89b4da6a3d65972a0ea8bfd2352eda5b7e22
+  languageName: node
+  linkType: hard
+
+"@babel/helper-string-parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-string-parser@npm:7.24.7"
+  checksum: 09568193044a578743dd44bf7397940c27ea693f9812d24acb700890636b376847a611cdd0393a928544e79d7ad5b8b916bd8e6e772bc8a10c48a647a96e7b1a
+  languageName: node
+  linkType: hard
+
+"@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
+  checksum: 6799ab117cefc0ecd35cd0b40ead320c621a298ecac88686a14cffceaac89d80cdb3c178f969861bf5fa5e4f766648f9161ea0752ecfe080d8e89e3147270257
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-validator-identifier@npm:7.22.5"
@@ -33,6 +117,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/highlight@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/highlight@npm:7.24.7"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.24.7
+    chalk: ^2.4.2
+    js-tokens: ^4.0.0
+    picocolors: ^1.0.0
+  checksum: 5cd3a89f143671c4ac129960024ba678b669e6fc673ce078030f5175002d1d3d52bc10b22c5b916a6faf644b5028e9a4bd2bb264d053d9b05b6a98690f1d46f1
+  languageName: node
+  linkType: hard
+
+"@babel/parser@npm:^7.20.5, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/parser@npm:7.24.7"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: fc9d2c4c8712f89672edc55c0dc5cf640dcec715b56480f111f85c2bc1d507e251596e4110d65796690a96ac37a4b60432af90b3e97bb47e69d4ef83872dbbd6
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.5.5":
   version: 7.22.10
   resolution: "@babel/runtime@npm:7.22.10"
@@ -42,6 +147,56 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/template@npm:7.24.7"
+  dependencies:
+    "@babel/code-frame": ^7.24.7
+    "@babel/parser": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: ea90792fae708ddf1632e54c25fe1a86643d8c0132311f81265d2bdbdd42f9f4fac65457056c1b6ca87f7aa0d6a795b549566774bba064bdcea2034ab3960ee9
+  languageName: node
+  linkType: hard
+
+"@babel/traverse@npm:7.23.2":
+  version: 7.23.2
+  resolution: "@babel/traverse@npm:7.23.2"
+  dependencies:
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.0
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-function-name": ^7.23.0
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/parser": ^7.23.0
+    "@babel/types": ^7.23.0
+    debug: ^4.1.0
+    globals: ^11.1.0
+  checksum: 26a1eea0dde41ab99dde8b9773a013a0dc50324e5110a049f5d634e721ff08afffd54940b3974a20308d7952085ac769689369e9127dea655f868c0f6e1ab35d
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@babel/types@npm:7.17.0"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.16.7
+    to-fast-properties: ^2.0.0
+  checksum: 12e5a287986fe557188e87b2c5202223f1dc83d9239a196ab936fdb9f8c1eb0be717ff19f934b5fad4e29a75586d5798f74bed209bccea1c20376b9952056f0e
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:^7.17.0, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.7, @babel/types@npm:^7.8.3":
+  version: 7.24.7
+  resolution: "@babel/types@npm:7.24.7"
+  dependencies:
+    "@babel/helper-string-parser": ^7.24.7
+    "@babel/helper-validator-identifier": ^7.24.7
+    to-fast-properties: ^2.0.0
+  checksum: 3e4437fced97e02982972ce5bebd318c47d42c9be2152c0fd28c6f786cc74086cc0a8fb83b602b846e41df37f22c36254338eada1a47ef9d8a1ec92332ca3ea8
+  languageName: node
+  linkType: hard
+
 "@changesets/apply-release-plan@npm:^6.1.4":
   version: 6.1.4
   resolution: "@changesets/apply-release-plan@npm:6.1.4"
@@ -359,6 +514,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
+  dependencies:
+    "@jridgewell/set-array": ^1.2.1
+    "@jridgewell/sourcemap-codec": ^1.4.10
+    "@jridgewell/trace-mapping": ^0.3.24
+  checksum: ff7a1764ebd76a5e129c8890aa3e2f46045109dabde62b0b6c6a250152227647178ff2069ea234753a690d8f3c4ac8b5e7b267bbee272bffb7f3b0a370ab6e52
+  languageName: node
+  linkType: hard
+
+"@jridgewell/resolve-uri@npm:^3.1.0":
+  version: 3.1.2
+  resolution: "@jridgewell/resolve-uri@npm:3.1.2"
+  checksum: 83b85f72c59d1c080b4cbec0fef84528963a1b5db34e4370fa4bd1e3ff64a0d80e0cee7369d11d73c704e0286fb2865b530acac7a871088fbe92b5edf1000870
+  languageName: node
+  linkType: hard
+
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10
+  languageName: node
+  linkType: hard
+
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
+  version: 1.4.15
+  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
+  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
+  languageName: node
+  linkType: hard
+
+"@jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
+  dependencies:
+    "@jridgewell/resolve-uri": ^3.1.0
+    "@jridgewell/sourcemap-codec": ^1.4.14
+  checksum: 9d3c40d225e139987b50c48988f8717a54a8c994d8a948ee42e1412e08988761d0754d7d10b803061cc3aebf35f92a5dbbab493bd0e1a9ef9e89a2130e83ba34
+  languageName: node
+  linkType: hard
+
 "@manypkg/find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "@manypkg/find-root@npm:1.1.0"
@@ -474,6 +671,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@solidity-parser/parser@npm:^0.17.0":
+  version: 0.17.0
+  resolution: "@solidity-parser/parser@npm:0.17.0"
+  checksum: 2f47732c9a4f6b264ce6c8a0544bd5a0805f824d3c40a8a253e59d5dbe9a98163f55c06460232f57a6b389bb5235c18d0563f94425202ec2f859d88f2378e0ac
+  languageName: node
+  linkType: hard
+
 "@tootallnate/once@npm:2":
   version: 2.0.0
   resolution: "@tootallnate/once@npm:2.0.0"
@@ -481,6 +685,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@trivago/prettier-plugin-sort-imports@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "@trivago/prettier-plugin-sort-imports@npm:4.3.0"
+  dependencies:
+    "@babel/generator": 7.17.7
+    "@babel/parser": ^7.20.5
+    "@babel/traverse": 7.23.2
+    "@babel/types": 7.17.0
+    javascript-natural-sort: 0.7.1
+    lodash: ^4.17.21
+  peerDependencies:
+    "@vue/compiler-sfc": 3.x
+    prettier: 2.x - 3.x
+  peerDependenciesMeta:
+    "@vue/compiler-sfc":
+      optional: true
+  checksum: 22bb311ca24f09eef25915a66727e7be113b703f196f6ea0589dc9730b11a6f1e5e4bcc468213101d138b570d310792c83abb8d9487c53f9e597942fea052b6e
+  languageName: node
+  linkType: hard
+
 "@types/estree@npm:^1.0.0":
   version: 1.0.1
   resolution: "@types/estree@npm:1.0.1"
@@ -1298,6 +1522,7 @@ __metadata:
     "@changesets/cli": ^2.26.2
     "@eslint/js": ^9.3.0
     "@rollup/plugin-typescript": 11.1.0
+    "@trivago/prettier-plugin-sort-imports": ^4.3.0
     "@types/inquirer": 9.0.3
     "@types/ncp": 2.0.5
     "@types/node": 18.16.0
@@ -1313,7 +1538,8 @@ __metadata:
     merge-packages: ^0.1.6
     ncp: 2.0.0
     pkg-install: 1.0.0
-    prettier: 3.2.5
+    prettier: 3.3.2
+    prettier-plugin-solidity: ^1.3.1
     rollup: 3.21.0
     rollup-plugin-auto-external: 2.0.0
     tslib: 2.5.0
@@ -2247,6 +2473,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globals@npm:^11.1.0":
+  version: 11.12.0
+  resolution: "globals@npm:11.12.0"
+  checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e
+  languageName: node
+  linkType: hard
+
 "globals@npm:^14.0.0":
   version: 14.0.0
   resolution: "globals@npm:14.0.0"
@@ -2861,6 +3094,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"javascript-natural-sort@npm:0.7.1":
+  version: 0.7.1
+  resolution: "javascript-natural-sort@npm:0.7.1"
+  checksum: 161e2c512cc7884bc055a582c6645d9032cab88497a76123d73cb23bfb03d97a04cf7772ecdb8bd3366fc07192c2f996366f479f725c23ef073fffe03d6a586a
+  languageName: node
+  linkType: hard
+
 "jju@npm:^1.4.0":
   version: 1.4.0
   resolution: "jju@npm:1.4.0"
@@ -2898,6 +3138,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsesc@npm:^2.5.1":
+  version: 2.5.2
+  resolution: "jsesc@npm:2.5.2"
+  bin:
+    jsesc: bin/jsesc
+  checksum: 4dc190771129e12023f729ce20e1e0bfceac84d73a85bc3119f7f938843fe25a4aeccb54b6494dce26fcf263d815f5f31acdefac7cc9329efb8422a4f4d9fa9d
+  languageName: node
+  linkType: hard
+
 "json-buffer@npm:3.0.1":
   version: 3.0.1
   resolution: "json-buffer@npm:3.0.1"
@@ -3852,6 +4101,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picocolors@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "picocolors@npm:1.0.1"
+  checksum: fa68166d1f56009fc02a34cdfd112b0dd3cf1ef57667ac57281f714065558c01828cdf4f18600ad6851cbe0093952ed0660b1e0156bddf2184b6aaf5817553a5
+  languageName: node
+  linkType: hard
+
 "picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
@@ -3921,12 +4177,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:3.2.5":
-  version: 3.2.5
-  resolution: "prettier@npm:3.2.5"
+"prettier-plugin-solidity@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "prettier-plugin-solidity@npm:1.3.1"
+  dependencies:
+    "@solidity-parser/parser": ^0.17.0
+    semver: ^7.5.4
+    solidity-comments-extractor: ^0.0.8
+  peerDependencies:
+    prettier: ">=2.3.0"
+  checksum: 286bf3b5899d7fad66e49c78ebac164bacfbf419f874a932ed99e491d97d77e91fa03ca068197939d3696ba7991db9e5258390dd42dee8d2184fa8c2e11921e4
+  languageName: node
+  linkType: hard
+
+"prettier@npm:3.3.2":
+  version: 3.3.2
+  resolution: "prettier@npm:3.3.2"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 2ee4e1417572372afb7a13bb446b34f20f1bf1747db77cf6ccaf57a9be005f2f15c40f903d41a6b79eec3f57fff14d32a20fb6dee1f126da48908926fe43c311
+  checksum: 5557d8caed0b182f68123c2e1e370ef105251d1dd75800fadaece3d061daf96b1389141634febf776050f9d732c7ae8fd444ff0b4a61b20535e7610552f32c69
   languageName: node
   linkType: hard
 
@@ -4308,7 +4577,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.6.0":
+"semver@npm:^7.5.4, semver@npm:^7.6.0":
   version: 7.6.2
   resolution: "semver@npm:7.6.2"
   bin:
@@ -4445,6 +4714,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"solidity-comments-extractor@npm:^0.0.8":
+  version: 0.0.8
+  resolution: "solidity-comments-extractor@npm:0.0.8"
+  checksum: ad025fc968e2d744b4270710c2f7f55b43d8046ab3f155fd880a7768d6fd163a93ea98f62be3b1115a29ba815bd8b5736bb5ffd1feff79083eca1bf273108d07
+  languageName: node
+  linkType: hard
+
 "sort-object-keys@npm:^1.1.3":
   version: 1.1.3
   resolution: "sort-object-keys@npm:1.1.3"
@@ -4468,6 +4744,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map@npm:^0.5.0":
+  version: 0.5.7
+  resolution: "source-map@npm:0.5.7"
+  checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
+  languageName: node
+  linkType: hard
+
 "spawndamnit@npm:^2.0.0":
   version: 2.0.0
   resolution: "spawndamnit@npm:2.0.0"
@@ -4764,6 +5047,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-fast-properties@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "to-fast-properties@npm:2.0.0"
+  checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168
+  languageName: node
+  linkType: hard
+
 "to-regex-range@npm:^5.0.1":
   version: 5.0.1
   resolution: "to-regex-range@npm:5.0.1"