fix: remove indexed event params (#1048)

scaffold-eth · Feb 7, 2025 · 1100319 · 1100319
1 parent 90058a3
commit 1100319
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/packages/nextjs/hooks/scaffold-eth/useScaffoldEventHistory.ts b/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;
-};
diff --git a/packages/nextjs/hooks/scaffold-eth/useScaffoldWatchContractEvent.ts b/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,
   });
 };