Add more types #1624
Add more types #1624
Conversation
montyly
requested review from
elopez,
0xalpharush and
smonicas
as code owners
|
Still a lot of types are missing, but the PR is ready to be reviewed |
| def fix_phi(self, last_state_variables_instances, initial_state_variables_instances): | ||
| def fix_phi( | ||
| self, | ||
| last_state_variables_instances: Dict[ |
There was a problem hiding this comment.
Can this be simplified to List[Union[StateIRVariable", StateIRVariable"]]
|
|
||
| class NewArray(Expression): | ||
|
|
||
| # note: dont conserve the size of the array if provided | ||
| def __init__(self, depth, array_type): | ||
| def __init__( | ||
| self, depth: int, array_type: Union["TypeAliasTopLevel", "ElementaryType"] |
There was a problem hiding this comment.
This doesn't seem right but I'm not sure what it should be
| def __init__(self, t, length): | ||
| def __init__( | ||
| self, | ||
| t: Union["TypeAliasTopLevel", "ArrayType", "FunctionType", "ElementaryType"], |
There was a problem hiding this comment.
This doesn't seem right
| def __init__( | ||
| self, | ||
| t: Union["TypeAliasTopLevel", "ArrayType", "FunctionType", "ElementaryType"], | ||
| length: Optional[Union["Identifier", Literal, "BinaryOperation"]], |
|
|
||
| # pylint: disable=import-outside-toplevel | ||
| class UserDefinedType(Type): | ||
| def __init__(self, t): | ||
| def __init__( | ||
| self, t: Union["EnumContract", "StructureTopLevel", "Contract", "StructureContract"] |
There was a problem hiding this comment.
There's some confusion here about whether it's a Structure or Union[StructureTopLevel, StructureContract] between the type annotations and assertions
| Tuple[Node, StateVariable, FunctionContract], | ||
| Tuple[Node, LocalVariable, FunctionContract], | ||
| Any, | ||
| ] |
| @@ -36,7 +40,9 @@ class IncorrectERC20InterfaceDetection(AbstractDetector): | |||
| ) | |||
|
|
|||
| @staticmethod | |||
| def incorrect_erc20_interface(signature): | |||
| def incorrect_erc20_interface( | |||
| signature: Union[Tuple[str, List[str], List[Any]], Tuple[str, List[Any], List[Any]]] | |||
There was a problem hiding this comment.
f.signature is defined as Tuple[str, List[str]] so perhaps that can be used
| ) -> List[ | ||
| Union[ | ||
| Any, | ||
| Tuple[LocalVariable, List[Tuple[str, StateVariable]]], |
There was a problem hiding this comment.
Can this be simplified to a Union on the last second element of the tuple?
slither/slithir/convert.py
Outdated
| @@ -300,7 +322,7 @@ def _make_function_type(func: Function) -> FunctionType: | |||
| ################################################################################### | |||
|
|
|||
|
|
|||
| def integrate_value_gas(result): | |||
| def integrate_value_gas(result: List[Any]) -> List[Any]: | |||
There was a problem hiding this comment.
I believe should be Operation
slither/slithir/convert.py
Outdated
| @@ -1114,7 +1141,7 @@ def extract_tmp_call(ins: TmpCall, contract: Optional[Contract]): # pylint: dis | |||
| ################################################################################### | |||
|
|
|||
|
|
|||
| def can_be_low_level(ir): | |||
| def can_be_low_level(ir: slither.slithir.operations.high_level_call.HighLevelCall) -> bool: | |||
There was a problem hiding this comment.
Is there a reason to use this over just HighLevelCall?
| def convert_assignment(left, right, t, return_type): | ||
| def convert_assignment( | ||
| left: Union[LocalVariable, StateVariable, ReferenceVariable], | ||
| right: SourceMapping, |
There was a problem hiding this comment.
I don't think this should be SourceMapping
| @@ -146,10 +167,10 @@ def __init__(self, expression, node): # pylint: disable=super-init-not-called | |||
| for ir in self._result: | |||
| ir.set_node(node) | |||
|
|
|||
| def result(self): | |||
| def result(self) -> List[Any]: | |||
There was a problem hiding this comment.
This should probably be Operation
Results of monkeytype on the AST tests + manual edits
The PR is not ready for review, but I want to test the CI before doing more changes