From fc08501f2f692f893e5c98a40ac5b14f0495ab23 Mon Sep 17 00:00:00 2001
From: Ben Hauser <ben@hauser.id>
Date: Sat, 28 May 2022 20:33:37 +0000
Subject: [PATCH] fix: vyper pcMap generation, better solution

---
 brownie/project/compiler/vyper.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/brownie/project/compiler/vyper.py b/brownie/project/compiler/vyper.py
index 27e7b34b9..5bcba3349 100644
--- a/brownie/project/compiler/vyper.py
+++ b/brownie/project/compiler/vyper.py
@@ -365,11 +365,7 @@ def _generate_coverage_data(
         if pc_list[-1]["op"] not in ("JUMPI", "REVERT"):
             continue
 
-        try:
-            node = _find_node_by_offset(ast_json, offset)
-        except StopIteration:
-            # TODO in vyper >0.3.3 this sometimes fails - unsure if the issue is in brownie or vyper
-            continue
+        node = _find_node_by_offset(ast_json, offset)
 
         if pc_list[-1]["op"] == "REVERT" or _is_revert_jump(pc_list[-2:], revert_pc):
             # custom revert error strings
@@ -422,14 +418,18 @@ def _convert_src(src: str) -> Tuple[int, int]:
 
 
 def _find_node_by_offset(ast_json: List, offset: Tuple) -> Dict:
-    node = next(i for i in ast_json if is_inside_offset(offset, _convert_src(i["src"])))
-    if _convert_src(node["src"]) == offset:
-        return node
-    node_list = [i for i in node.values() if isinstance(i, dict) and "ast_type" in i]
-    node_list.extend([x for i in node.values() if isinstance(i, list) for x in i])
-    if node_list:
-        return _find_node_by_offset(node_list, offset)
-    return _find_node_by_offset(ast_json[ast_json.index(node) + 1 :], offset)
+    for node in [i for i in ast_json if is_inside_offset(offset, _convert_src(i["src"]))]:
+        if _convert_src(node["src"]) == offset:
+            return node
+        node_list = [i for i in node.values() if isinstance(i, dict) and "ast_type" in i]
+        node_list.extend([x for i in node.values() if isinstance(i, list) for x in i])
+        if node_list:
+            result = _find_node_by_offset(node_list, offset)
+        else:
+            result = _find_node_by_offset(ast_json[ast_json.index(node) + 1 :], offset)
+        if result is not None:
+            return result
+    return None
 
 
 def _get_statement_nodes(ast_json: List) -> List: