Merge pull request #1574 from crytic/contract-error-selector

resolve error referenced as member of contract

slither/slithir/convert.py

@@ -379,7 +379,7 @@ def integrate_value_gas(result):
 ###################################################################################
 
 
-def propagate_type_and_convert_call(result, node):
+def propagate_type_and_convert_call(result: List[Operation], node: "Node") -> List[Operation]:
     """
     Propagate the types variables and convert tmp call to real call operation
     """
@@ -664,7 +664,24 @@ def propagate_types(ir, node: "Node"):  # pylint: disable=too-many-locals
                 if ir.variable_right == "selector" and isinstance(ir.variable_left, (CustomError)):
                     assignment = Assignment(
                         ir.lvalue,
-                        Constant(str(get_function_id(ir.variable_left.solidity_signature))),
+                        Constant(
+                            str(get_function_id(ir.variable_left.solidity_signature)),
+                            ElementaryType("bytes4"),
+                        ),
+                        ElementaryType("bytes4"),
+                    )
+                    assignment.set_expression(ir.expression)
+                    assignment.set_node(ir.node)
+                    assignment.lvalue.set_type(ElementaryType("bytes4"))
+                    return assignment
+
+                if isinstance(ir.variable_right, (CustomError)):
+                    assignment = Assignment(
+                        ir.lvalue,
+                        Constant(
+                            str(get_function_id(ir.variable_left.solidity_signature)),
+                            ElementaryType("bytes4"),
+                        ),
                         ElementaryType("bytes4"),
                     )
                     assignment.set_expression(ir.expression)
@@ -736,7 +753,7 @@ def propagate_types(ir, node: "Node"):  # pylint: disable=too-many-locals
                             if f:
                                 ir.lvalue.set_type(f)
                             else:
-                                # Allow propgation for variable access through contract's nale
+                                # Allow propgation for variable access through contract's name
                                 # like Base_contract.my_variable
                                 v = next(
                                     (
@@ -1819,7 +1836,7 @@ def _find_source_mapping_references(irs: List[Operation]):
 ###################################################################################
 
 
-def apply_ir_heuristics(irs, node):
+def apply_ir_heuristics(irs: List[Operation], node: "Node"):
     """
     Apply a set of heuristic to improve slithIR
     """

slither/visitors/slithir/expression_to_slithir.py

@@ -460,14 +460,18 @@ def _post_member_access(self, expression):
             set_val(expression, expr)
             return
 
-        # Early lookup to detect user defined types from other contracts definitions
-        # contract A { type MyInt is int}
-        # contract B { function f() public{ A.MyInt test = A.MyInt.wrap(1);}}
-        # The logic is handled by _post_call_expression
         if isinstance(expr, Contract):
+            # Early lookup to detect user defined types from other contracts definitions
+            # contract A { type MyInt is int}
+            # contract B { function f() public{ A.MyInt test = A.MyInt.wrap(1);}}
+            # The logic is handled by _post_call_expression
             if expression.member_name in expr.file_scope.user_defined_types:
                 set_val(expression, expr.file_scope.user_defined_types[expression.member_name])
                 return
+            # Lookup errors referred to as member of contract e.g. Test.myError.selector
+            if expression.member_name in expr.custom_errors_as_dict:
+                set_val(expression, expr.custom_errors_as_dict[expression.member_name])
+                return
 
         val = ReferenceVariable(self._node)
         member = Member(expr, Constant(expression.member_name), val)

tests/ast-parsing/custom-error-selector.sol

@@ -0,0 +1,13 @@
+ contract Test {   
+    error myError();
+}
+
+interface VM  {
+    function expectRevert(bytes4) external;
+    function expectRevert(bytes calldata) external;
+}
+contract A {
+    function b(address c) public {
+        VM(c).expectRevert(Test.myError.selector);
+    }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.10-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.11-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.12-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.13-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.14-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.15-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.4-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.5-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.6-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.7-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.8-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/ast-parsing/expected/custom-error-selector.sol-0.8.9-compact.json

@@ -0,0 +1,10 @@
+{
+  "Test": {},
+  "VM": {
+    "expectRevert(bytes4)": "digraph{\n}\n",
+    "expectRevert(bytes)": "digraph{\n}\n"
+  },
+  "A": {
+    "b(address)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}

tests/test_ast_parsing.py

@@ -328,6 +328,7 @@ def make_version(minor: int, patch_min: int, patch_max: int) -> List[str]:
         ALL_VERSIONS,
     ),
     Test("custom_error-0.8.4.sol", make_version(8, 4, 15)),
+    Test("custom-error-selector.sol", make_version(8, 4, 15)),
     Test(
         "top-level-0.4.0.sol",
         VERSIONS_04 + VERSIONS_05 + VERSIONS_06 + ["0.7.0"],