From adc9b5454a63df0d99f1d224948264571d4c8355 Mon Sep 17 00:00:00 2001
From: Rinat <rinat@hey.com>
Date: Fri, 3 May 2024 20:25:59 +0200
Subject: [PATCH 1/2] fix: event arguments types

---
 packages/nextjs/utils/scaffold-eth/contract.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/nextjs/utils/scaffold-eth/contract.ts b/packages/nextjs/utils/scaffold-eth/contract.ts
index 2c5a3e8a4..c99a59d17 100644
--- a/packages/nextjs/utils/scaffold-eth/contract.ts
+++ b/packages/nextjs/utils/scaffold-eth/contract.ts
@@ -14,6 +14,7 @@ import type { MergeDeepRecord } from "type-fest/source/merge-deep";
 import {
   Address,
   Block,
+  ContractEventName,
   GetEventArgs,
   GetTransactionReceiptReturnType,
   GetTransactionReturnType,
@@ -220,12 +221,18 @@ export type UseScaffoldEventConfig<
       logs: Simplify<
         Omit<Log<bigint, number, any>, "args" | "eventName"> & {
           args: Record<string, unknown>;
-          eventName: string;
+          eventName: TEventName;
         }
       >[],
     ) => void;
   },
-  Omit<UseWatchContractEventParameters<ContractAbi<TContractName>>, "onLogs" | "address" | "abi"> & {
+  Omit<
+    UseWatchContractEventParameters<
+      ContractAbi<TContractName>,
+      TEventName extends ContractEventName<ContractAbi<TContractName>> ? TEventName : never
+    >,
+    "onLogs" | "address" | "abi"
+  > & {
     onLogs: (
       logs: Simplify<
         Omit<Log<bigint, number, false, TEvent, false, [TEvent], TEventName>, "args"> & {

From 4950b2b7074e908b372a6465536bc056c414eebd Mon Sep 17 00:00:00 2001
From: Rinat <rinat@hey.com>
Date: Mon, 6 May 2024 22:23:55 +0200
Subject: [PATCH 2/2] fix: types

---
 packages/nextjs/utils/scaffold-eth/contract.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/nextjs/utils/scaffold-eth/contract.ts b/packages/nextjs/utils/scaffold-eth/contract.ts
index c99a59d17..bf4580d1a 100644
--- a/packages/nextjs/utils/scaffold-eth/contract.ts
+++ b/packages/nextjs/utils/scaffold-eth/contract.ts
@@ -14,7 +14,6 @@ import type { MergeDeepRecord } from "type-fest/source/merge-deep";
 import {
   Address,
   Block,
-  ContractEventName,
   GetEventArgs,
   GetTransactionReceiptReturnType,
   GetTransactionReturnType,
@@ -215,24 +214,19 @@ export type UseScaffoldEventConfig<
   >,
 > = {
   contractName: TContractName;
+  eventName: TEventName;
 } & IsContractDeclarationMissing<
-  Omit<UseWatchContractEventParameters, "onLogs" | "address" | "abi"> & {
+  Omit<UseWatchContractEventParameters, "onLogs" | "address" | "abi" | "eventName"> & {
     onLogs: (
       logs: Simplify<
         Omit<Log<bigint, number, any>, "args" | "eventName"> & {
           args: Record<string, unknown>;
-          eventName: TEventName;
+          eventName: string;
         }
       >[],
     ) => void;
   },
-  Omit<
-    UseWatchContractEventParameters<
-      ContractAbi<TContractName>,
-      TEventName extends ContractEventName<ContractAbi<TContractName>> ? TEventName : never
-    >,
-    "onLogs" | "address" | "abi"
-  > & {
+  Omit<UseWatchContractEventParameters<ContractAbi<TContractName>>, "onLogs" | "address" | "abi" | "eventName"> & {
     onLogs: (
       logs: Simplify<
         Omit<Log<bigint, number, false, TEvent, false, [TEvent], TEventName>, "args"> & {