fix: patch merge, and add enums to event parser

starknet-io · Aug 10, 2023 · 00f8073 · 00f8073
1 parent 0f2f9c8
commit 00f8073
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/contract/default.ts b/src/contract/default.ts
@@ -339,7 +339,8 @@ export class Contract implements ContractInterface {
         []
       ) || [],
       this.events,
-      this.structs
+      this.structs,
+      CallData.getAbiEnum(this.abi)
     );
   }
 

diff --git a/src/types/contract.ts b/src/types/contract.ts
@@ -1,5 +1,4 @@
 import { CairoEnum } from './cairoEnum';
-
 import {
   BigNumberish,
   BlockIdentifier,

diff --git a/src/utils/calldata/responseParser.ts b/src/utils/calldata/responseParser.ts
@@ -6,7 +6,7 @@ import {
   Args,
   BigNumberish,
   CairoEnum,
-  EventEntry
+  EventEntry,
   ParsedStruct,
 } from '../../types';
 import { uint256ToBN } from '../uint256';

diff --git a/src/utils/events/index.ts b/src/utils/events/index.ts
@@ -1,5 +1,6 @@
 import {
   Abi,
+  AbiEnums,
   AbiEvents,
   AbiStructs,
   Cairo1Event,
@@ -37,7 +38,8 @@ export function getAbiEvents(abi: Abi): AbiEvents {
 export function parseEvents(
   providerReceivedEvents: Array<ProviderEvent>,
   abiEvents: AbiEvents,
-  abiStructs: AbiStructs
+  abiStructs: AbiStructs,
+  abiEnums: AbiEnums
 ): ParsedEvents {
   const ret = providerReceivedEvents.flat().reduce((acc, recEvent) => {
     const abiEvent: EventAbi = abiEvents[recEvent.keys[0]];
@@ -66,6 +68,7 @@ export function parseEvents(
         keysIter,
         key,
         abiStructs,
+        abiEnums,
         parsedEvent[abiEvent.name]
       );
     });
@@ -75,6 +78,7 @@ export function parseEvents(
         dataIter,
         data,
         abiStructs,
+        abiEnums,
         parsedEvent[abiEvent.name]
       );
     });