Fix NamedEventInput type (#58)

* Fix `NamedEventInput` type * Add changeset * Parameterize `objectToArray` value type
delvtech · Apr 3, 2024 · 5c35487 · 5c35487
1 parent ea691e8
commit 5c35487
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.changeset/strange-hornets-punch.md b/.changeset/strange-hornets-punch.md
@@ -0,0 +1,5 @@
+---
+"@delvtech/evm-client": patch
+---
+
+Fix error with `NamedEventInput` type which was broken and causing broken downstream types such as `EventFilter`
diff --git a/packages/evm-client/src/contract/types/Event.ts b/packages/evm-client/src/contract/types/Event.ts
@@ -19,7 +19,7 @@ type NamedEventInput<
   TAbi extends Abi,
   TEventName extends EventName<TAbi>,
 > = Extract<
-  AbiParameters<TAbi, 'event', TEventName, 'inputs'>,
+  AbiParameters<TAbi, 'event', TEventName, 'inputs'>[number],
   NamedAbiParameter
 >;
 

diff --git a/packages/evm-client/src/contract/utils/objectToArray.ts b/packages/evm-client/src/contract/utils/objectToArray.ts
@@ -54,6 +54,7 @@ export function objectToArray<
   TItemType extends AbiItemType,
   TName extends AbiEntryName<TAbi, TItemType>,
   TParameterKind extends AbiParameterKind,
+  TValue extends AbiObjectType<TAbi, TItemType, TName, TParameterKind>,
 >({
   abi,
   type,
@@ -63,11 +64,9 @@ export function objectToArray<
 }: {
   abi: TAbi;
   name: TName;
-  value?: Abi extends TAbi
-    ? Record<string, unknown> // <- fallback for unknown ABI type
-    : Partial<AbiObjectType<TAbi, TItemType, TName, TParameterKind>>;
   kind: TParameterKind;
   type: TItemType;
+  value?: Abi extends TAbi ? Record<string, unknown> : TValue;
 }): AbiArrayType<TAbi, TItemType, TName, TParameterKind> {
   const abiEntry = getAbiEntry({ abi, type, name });