|
15 | 15 | Final, |
16 | 16 | Iterable, |
17 | 17 | List, |
| 18 | + Literal, |
18 | 19 | Optional, |
19 | 20 | Sequence, |
20 | 21 | Tuple, |
@@ -230,8 +231,8 @@ def get_event_abi_types_for_decoding( |
230 | 231 | def get_event_data( |
231 | 232 | abi_codec: ABICodec, |
232 | 233 | event_abi: ABIEvent, |
233 | | - log_entry: LogReceipt, |
234 | | -) -> EventData: |
| 234 | + log_entry: Union[LogReceipt, AttributeDict], |
| 235 | +) -> Union[EventData, AttributeDict]: |
235 | 236 | """ |
236 | 237 | Given an event ABI and a log entry for that event, return the decoded |
237 | 238 | event data |
@@ -300,7 +301,7 @@ def get_event_data( |
300 | 301 | ) |
301 | 302 |
|
302 | 303 | if isinstance(log_entry, AttributeDict): |
303 | | - return cast(EventData, AttributeDict.recursive(event_data)) |
| 304 | + return AttributeDict.recursive(event_data) |
304 | 305 |
|
305 | 306 | return event_data |
306 | 307 |
|
@@ -383,7 +384,7 @@ def to_block(self, value: BlockIdentifier) -> None: |
383 | 384 | ) |
384 | 385 |
|
385 | 386 | @property |
386 | | - def address(self) -> ChecksumAddress: |
| 387 | + def address(self) -> Optional[ChecksumAddress]: |
387 | 388 | return self._address |
388 | 389 |
|
389 | 390 | @address.setter |
@@ -536,7 +537,10 @@ def match_values(self) -> None: |
536 | 537 | class DataArgumentFilter(BaseArgumentFilter): |
537 | 538 | # type ignore b/c conflict with BaseArgumentFilter.match_values type |
538 | 539 | @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 | + ]: |
540 | 544 | return self.arg_type, self._match_values |
541 | 545 |
|
542 | 546 |
|
|
0 commit comments