Merge pull request #211 from scaffold-eth/backmerge-10-02-24

backmerge 10-02-25

Author: technophile-04

.changeset/ten-pears-explode.md

@@ -0,0 +1,8 @@
+---
+"create-eth": patch
+---
+
+- fix typo in package.json scripts for lint
+- Add `hardhat:clean` command to root of monorepo (https://github.com/scaffold-eth/scaffold-eth-2/pull/1043)
+- Only render FaucetButton on localhost (https://github.com/scaffold-eth/scaffold-eth-2/pull/1047)
+- fix: remove indexed event params (https://github.com/scaffold-eth/scaffold-eth-2/pull/1048)

templates/base/packages/nextjs/components/Header.tsx.template.mjs

@@ -8,9 +8,10 @@ import React, { useCallback, useRef, useState } from "react";
 import Image from "next/image";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { hardhat } from "viem/chains";
 import { Bars3Icon, BugAntIcon } from "@heroicons/react/24/outline";
 import { FaucetButton, RainbowKitCustomConnectButton } from "~~/components/scaffold-eth";
-import { useOutsideClick } from "~~/hooks/scaffold-eth";
+import { useOutsideClick, useTargetNetwork } from "~~/hooks/scaffold-eth";
 ${menuIconImports.filter(Boolean).join("\n")}
 
 type HeaderMenuLink = {
@@ -62,6 +63,9 @@ export const HeaderMenuLinks = () => {
  * Site header
  */
 export const Header = () => {
+  const { targetNetwork } = useTargetNetwork();
+  const isLocalNetwork = targetNetwork.id === hardhat.id;
+
   const [isDrawerOpen, setIsDrawerOpen] = useState(false);
   const burgerMenuRef = useRef<HTMLDivElement>(null);
   useOutsideClick(
@@ -109,7 +113,7 @@ export const Header = () => {
       </div>
       <div className="navbar-end flex-grow mr-4">
         <RainbowKitCustomConnectButton />
-        <FaucetButton />
+        {isLocalNetwork && <FaucetButton />}
       </div>
     </div>
   );

templates/base/packages/nextjs/hooks/scaffold-eth/useScaffoldEventHistory.ts

@@ -142,8 +142,7 @@ export const useScaffoldEventHistory = <
       return nextBlock;
     },
     select: data => {
-      const events = data.pages.flat();
-      const eventHistoryData = events?.map(addIndexedArgsToEvent) as UseScaffoldEventHistoryData<
+      const events = data.pages.flat() as unknown as UseScaffoldEventHistoryData<
         TContractName,
         TEventName,
         TBlockData,
@@ -152,7 +151,7 @@ export const useScaffoldEventHistory = <
       >;
 
       return {
-        pages: eventHistoryData?.reverse(),
+        pages: events?.reverse(),
         pageParams: data.pageParams,
       };
     },
@@ -180,11 +179,3 @@ export const useScaffoldEventHistory = <
     refetch: query.refetch,
   };
 };
-
-export const addIndexedArgsToEvent = (event: any) => {
-  if (event.args && !Array.isArray(event.args)) {
-    return { ...event, args: { ...event.args, ...Object.values(event.args) } };
-  }
-
-  return event;
-};

templates/base/packages/nextjs/hooks/scaffold-eth/useScaffoldWatchContractEvent.ts

@@ -2,7 +2,7 @@ import { Abi, ExtractAbiEventNames } from "abitype";
 import { Log } from "viem";
 import { useWatchContractEvent } from "wagmi";
 import { useSelectedNetwork } from "~~/hooks/scaffold-eth";
-import { addIndexedArgsToEvent, useDeployedContractInfo } from "~~/hooks/scaffold-eth";
+import { useDeployedContractInfo } from "~~/hooks/scaffold-eth";
 import { AllowedChainIds } from "~~/utils/scaffold-eth";
 import { ContractAbi, ContractName, UseScaffoldEventConfig } from "~~/utils/scaffold-eth/contract";
 
@@ -30,14 +30,11 @@ export const useScaffoldWatchContractEvent = <
     chainId: selectedNetwork.id as AllowedChainIds,
   });
 
-  const addIndexedArgsToLogs = (logs: Log[]) => logs.map(addIndexedArgsToEvent);
-  const listenerWithIndexedArgs = (logs: Log[]) => onLogs(addIndexedArgsToLogs(logs) as Parameters<typeof onLogs>[0]);
-
   return useWatchContractEvent({
     address: deployedContractData?.address,
     abi: deployedContractData?.abi as Abi,
     chainId: selectedNetwork.id,
-    onLogs: listenerWithIndexedArgs,
+    onLogs: (logs: Log[]) => onLogs(logs as Parameters<typeof onLogs>[0]),
     eventName,
   });
 };

templates/solidity-frameworks/hardhat/package.json

@@ -12,6 +12,7 @@
     "hardhat:account": "yarn workspace @se-2/hardhat account",
     "hardhat:chain": "yarn workspace @se-2/hardhat chain",
     "hardhat:check-types": "yarn workspace @se-2/hardhat check-types",
+    "hardhat:clean": "yarn workspace @se-2/hardhat clean",
     "hardhat:compile": "yarn workspace @se-2/hardhat compile",
     "hardhat:deploy": "yarn workspace @se-2/hardhat deploy",
     "hardhat:flatten": "yarn workspace @se-2/hardhat flatten",
@@ -23,7 +24,7 @@
     "hardhat:lint-staged": "yarn workspace @se-2/hardhat lint-staged",
     "hardhat:test": "yarn workspace @se-2/hardhat test",
     "hardhat:verify": "yarn workspace @se-2/hardhat verify",
-    "lint": "yarn nextjs:lint && yarn hardhat:lint",
+    "lint": "yarn next:lint && yarn hardhat:lint",
     "test": "yarn hardhat:test",
     "verify": "yarn hardhat:verify"
   }

templates/solidity-frameworks/hardhat/packages/hardhat/package.json

@@ -8,6 +8,7 @@
     "chain": "hardhat node --network hardhat --no-deploy",
     "check-types": "tsc --noEmit --incremental",
     "compile": "hardhat compile",
+    "clean": "hardhat clean",
     "deploy": "ts-node scripts/runHardhatDeployWithPK.ts",
     "flatten": "hardhat flatten",
     "fork": "MAINNET_FORKING_ENABLED=true hardhat node --network hardhat --no-deploy",