revert merge conflict

tserg · Feb 21, 2024 · f6c95b2 · f6c95b2
1 parent 9410901
commit f6c95b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/vyper/builtins/functions.py b/vyper/builtins/functions.py
@@ -49,7 +49,7 @@
     UnfoldableNode,
     ZeroDivisionException,
 )
-from vyper.semantics.analysis.base import Modifiability, VarInfo
+from vyper.semantics.analysis.base import Modifiability, StateMutability, VarInfo
 from vyper.semantics.analysis.utils import (
     get_common_types,
     get_exact_type_from_node,
@@ -1247,7 +1247,7 @@ class BlockHash(BuiltinFunctionT):
     _id = "blockhash"
     _inputs = [("block_num", UINT256_T)]
     _return_type = BYTES32_T
-    _modifiability = Modifiability.RUNTIME_CONSTANT
+    mutability = StateMutability.VIEW
 
     @process_inputs
     def build_IR(self, expr, args, kwargs, contact):

diff --git a/vyper/semantics/analysis/local.py b/vyper/semantics/analysis/local.py
@@ -743,6 +743,9 @@ def visit_Call(self, node: vy_ast.Call, typ: VyperType) -> None:
                 self.visit(arg, arg_type)
         else:
             # builtin functions
+            if self.function_analyzer:
+                self._check_call_mutability(func_type.mutability) # type: ignore
+
             arg_types = func_type.infer_arg_types(node, expected_return_typ=typ)  # type: ignore
             for arg, arg_type in zip(node.args, arg_types):
                 self.visit(arg, arg_type)