fix: type issues in log params

ApeWorX · Oct 5, 2023 · ffbd120 · ffbd120
1 parent 17f3e4c
commit ffbd120
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/ape/api/providers.py b/src/ape/api/providers.py
@@ -1470,18 +1470,16 @@ def poll_logs(
         for block in self.poll_blocks(stop_block, required_confirmations, new_block_timeout):
             if block.number is None:
                 raise ValueError("Block number cannot be None")
-
-            log_filter = {
+            log_params: Dict[str, int | AddressType | List[Union[str, List[str]]]] = {
                 "fromBlock": block.number,
                 "toBlock": block.number,
             }
-
             if address is not None:
-                log_filter["address"] = address
+                log_params["address"] = address
             if topics is not None:
-                log_filter["topics"] = topics
-
-            for log in self.web3.eth.get_logs(log_filter):
+                log_params["topics"] = topics
+            log_params_obj = LogFilter(**log_params).dict()
+            for log in self.web3.eth.get_logs(log_params_obj):
                 yield ContractLog.parse_obj(log)
 
     def block_ranges(self, start=0, stop=None, page=None):

diff --git a/src/ape/contracts/base.py b/src/ape/contracts/base.py
@@ -694,7 +694,7 @@ def poll_logs(
         # NOTE: Now we process the rest
         yield from self.provider.poll_logs(
             stop_block=stop_block,
-            address=self.contract.address,
+            address=self.contract.contract_type.address,
             required_confirmations=required_confirmations,
             new_block_timeout=new_block_timeout,
         )