Merge branch 'dev' into dev-refactor-reentrancy

slither/core/slither_core.py

@@ -77,6 +77,8 @@ class Slither(Context):
     @property
     def solc_version(self):
         """str: Solidity version."""
+        if self.crytic_compile:
+            return self.crytic_compile.compiler_version.version
         return self._solc_version
 
     @property

slither/solc_parsing/declarations/contract.py

@@ -20,7 +20,7 @@ class ContractSolc04(Contract):
 
 
     def __init__(self, slitherSolc, data):
-        assert slitherSolc.solc_version.startswith('0.4')
+        #assert slitherSolc.solc_version.startswith('0.4')
         super(ContractSolc04, self).__init__()
 
         self.set_slither(slitherSolc)

slither/solc_parsing/slitherSolc.py

@@ -104,10 +104,7 @@ class SlitherSolc(Slither):
             return
 
         for contract_data in data_loaded[self.get_children()]:
-            # if self.solc_version == '0.3':
+
-            #     assert contract_data[self.get_key()] == 'Contract'
-            #     contract = ContractSolc03(self, contract_data)
-            if self.solc_version == '0.4':
             assert contract_data[self.get_key()] in ['ContractDefinition', 'PragmaDirective', 'ImportDirective']
             if contract_data[self.get_key()] == 'ContractDefinition':
                 contract = ContractSolc04(self, contract_data)

slither/visitors/expression/constants_folding.py

@@ -99,6 +99,13 @@ class ConstantFolding(ExpressionVisitor):
         raise NotConstant
 
     def _post_tuple_expression(self, expression):
+        if expression.expressions:
+            if len(expression.expressions) == 1:
+                cf = ConstantFolding(expression.expressions[0], self._type)
+                expr = cf.result()
+                assert isinstance(expr, Literal)
+                set_val(expression, int(expr.value))
+                return
         raise NotConstant
 
     def _post_type_conversion(self, expression):