Skip to content

Commit b4b10b6

Browse files
committed
fix
1 parent fadf11a commit b4b10b6

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

faster_web3/_utils/events.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
Final,
1616
Iterable,
1717
List,
18+
Literal,
1819
Optional,
1920
Sequence,
2021
Tuple,
@@ -230,8 +231,8 @@ def get_event_abi_types_for_decoding(
230231
def get_event_data(
231232
abi_codec: ABICodec,
232233
event_abi: ABIEvent,
233-
log_entry: LogReceipt,
234-
) -> EventData:
234+
log_entry: Union[LogReceipt, AttributeDict],
235+
) -> Union[EventData, AttributeDict]:
235236
"""
236237
Given an event ABI and a log entry for that event, return the decoded
237238
event data
@@ -300,7 +301,7 @@ def get_event_data(
300301
)
301302

302303
if isinstance(log_entry, AttributeDict):
303-
return cast(EventData, AttributeDict.recursive(event_data))
304+
return AttributeDict.recursive(event_data)
304305

305306
return event_data
306307

@@ -383,7 +384,7 @@ def to_block(self, value: BlockIdentifier) -> None:
383384
)
384385

385386
@property
386-
def address(self) -> ChecksumAddress:
387+
def address(self) -> Optional[ChecksumAddress]:
387388
return self._address
388389

389390
@address.setter
@@ -536,7 +537,10 @@ def match_values(self) -> None:
536537
class DataArgumentFilter(BaseArgumentFilter):
537538
# type ignore b/c conflict with BaseArgumentFilter.match_values type
538539
@property
539-
def match_values(self) -> Tuple[TypeStr, Tuple[Any, ...]]: # type: ignore
540+
def match_values(self) -> Union[
541+
Tuple[TypeStr, Tuple[Any, ...]],
542+
Tuple[TypeStr, Literal[None]],
543+
]:
540544
return self.arg_type, self._match_values
541545

542546

0 commit comments

Comments
 (0)