eth-prototype 1.4.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

{eth_prototype-1.4.0.dist-info → eth_prototype-1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.4.0
+Version: 1.4.1
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja

{eth_prototype-1.4.0.dist-info → eth_prototype-1.4.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-eth_prototype-1.4.0.dist-info/licenses/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
-eth_prototype-1.4.0.dist-info/licenses/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
+eth_prototype-1.4.1.dist-info/licenses/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
+eth_prototype-1.4.1.dist-info/licenses/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
 ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
 ethproto/aa_bundler.py,sha256=W47fIA_w7orUu7yczfHPaHpUJRFh5op0YZHPgW3Iwik,17420
 ethproto/build_artifacts.py,sha256=3t-MTSFZU1pQtDwf65zNJkceWleLRlzcEo8CFpu4_6s,10031
 ethproto/contracts.py,sha256=R9lWKPe77jkPBXx798qhnVPWSFF2nhz4AaYowipNIBc,22625
 ethproto/defender_relay.py,sha256=05A8TfRZwiBhCpo924Pf9CjfKSir2Wvgg1p_asFxJbw,1777
-ethproto/w3wrappers.py,sha256=aA5yQ25d01s8gtWkGSxSEZlVRdq6JM1ceS3cfvSj4uM,22614
+ethproto/w3wrappers.py,sha256=14_w4h_gxpLPvL18zbQRL9KvxXt4Tm5pCc9qZD4tLtM,22604
 ethproto/wadray.py,sha256=JBsu5KcyU9k70bDK03T2IY6qPVFO30WbYPhwrAHdXao,8262
 ethproto/wrappers.py,sha256=kqv6_1lPbRBlncaeMtXjas80GSxzErflN_KwawYyL3E,17725
 ethproto/test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ethproto/test_utils/factories.py,sha256=G8DnUDG_yThRxMTCkymzcjm9lR_ni0_ZmTsb3sEfIdI,1805
 ethproto/test_utils/hardhat.py,sha256=HzTqIznu6zVd_-doL96ftFJ235ktDCQen1QDQbNuwfM,2361
 ethproto/test_utils/vcr_utils.py,sha256=1FH2sgJlElSjWkJLuO3C7E2J-4HKyFvjAqkCnGRZJyk,797
-eth_prototype-1.4.0.dist-info/METADATA,sha256=HuMbngAMXmyOT_pWnyH7f3-uYJcE_1bNcvhT-Pw95eI,2695
-eth_prototype-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-eth_prototype-1.4.0.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
-eth_prototype-1.4.0.dist-info/RECORD,,
+eth_prototype-1.4.1.dist-info/METADATA,sha256=5AYCz9-qpNclDeljRLe4nRHZhTap4Ky1FhOHXUKwFyY,2695
+eth_prototype-1.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+eth_prototype-1.4.1.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
+eth_prototype-1.4.1.dist-info/RECORD,,

ethproto/w3wrappers.py

@@ -1,5 +1,5 @@
 import os
-from collections import defaultdict
+from itertools import groupby
 from typing import Iterator, List, Union
 
 from environs import Env
@@ -246,30 +246,27 @@ class ReceiptWrapper:
         self._receipt = receipt
         self._contract = contract
 
+    def _find_event(self, contract, topic0):
+        for event in contract.events:
+            evt = event()
+            if HexBytes(event_abi_to_log_topic(evt.abi)) == topic0:
+                return evt
+        return None  # Not found
+
     @property
     def events(self):
         if not hasattr(self, "_events"):
-            # Lookup the events in all known contracts
-            addresses = [log.address for log in self._receipt.logs]
-            contracts = {addr: _contract_map[addr] for addr in addresses if addr in _contract_map}
-            topic_map = {
-                HexBytes(event_abi_to_log_topic(event().abi)): event()
-                for contract in contracts.values()
-                for event in contract.events
+            addr_topic0 = [(log.address, log.topics[0] if log.topics else None) for log in self._receipt.logs]
+            # find uniq event types
+            events = {topic0: self._find_event(_contract_map[addr], topic0) for (addr, topic0) in addr_topic0}
+            parsed_logs = sum(
+                [list(evt.process_receipt(self._receipt)) for evt in events.values() if evt is not None], []
+            )
+            parsed_logs.sort(key=lambda x: x.event)
+            self._events = {
+                evt_name: EventItem(evt_name, [pl.args for pl in parsed_logs_for_evt_name])
+                for (evt_name, parsed_logs_for_evt_name) in groupby(parsed_logs, key=lambda x: x.event)
             }
-
-            parsed_logs = []
-            for log in self._receipt.logs:
-                for topic in log.topics:
-                    if topic in topic_map:
-                        parsed_logs += topic_map[topic].process_receipt(self._receipt)
-
-            evts = defaultdict(list)
-            for evt in parsed_logs:
-                evt_name = evt.event
-                evt_params = evt.args
-                evts[evt_name].append(evt_params)
-            self._events = {k: EventItem(k, v) for k, v in evts.items()}
         return self._events
 
     def __getattr__(self, attr_name):