Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correctly combine address and contract address list in event filter param construction #3618

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: correctly combine address and contract address list in event filter param construction #3618

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a800f3
fix: correctly combine address and contract address list in event fil…
Aerilym Feb 16, 2025
94426b0
fix: handle list like and non list like possibilities for address and…
Aerilym Feb 16, 2025
fc45ff5
fix: deduplicate event filter params address when contract_address is…
Aerilym Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions web3/_utils/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@
def construct_event_filter_params(
event_abi: ABIEvent,
abi_codec: ABICodec,
contract_address: Optional[ChecksumAddress] = None,
contract_address: Optional[ChecksumAddress | Sequence[ChecksumAddress]] = None,
argument_filters: Optional[Dict[str, Any]] = None,
topics: Optional[Sequence[HexStr]] = None,
from_block: Optional[BlockIdentifier] = None,
to_block: Optional[BlockIdentifier] = None,
address: Optional[ChecksumAddress] = None,
address: Optional[ChecksumAddress | Sequence[ChecksumAddress]] = None,
) -> Tuple[List[List[Optional[HexStr]]], FilterParams]:
filter_params: FilterParams = {}
topic_set: Sequence[HexStr] = construct_event_topic_set(
Expand All @@ -94,7 +94,12 @@ def construct_event_filter_params(

if address and contract_address:
if is_list_like(address):
filter_params["address"] = [address] + [contract_address]
filter_params["address"] = address
if address != contract_address:
if is_list_like(contract_address):
filter_params["address"] += contract_address
else:
filter_params["address"] += [contract_address]
elif is_string(address):
filter_params["address"] = (
[address, contract_address]
Expand All @@ -108,7 +113,7 @@ def construct_event_filter_params(
elif address:
filter_params["address"] = address
elif contract_address:
filter_params["address"] = contract_address
filter_params["address"] = [contract_address]

if "address" not in filter_params:
pass
Expand Down