Merge branch 'dev'

Author: montyly

.github/workflows/parser.yml

@@ -35,12 +35,11 @@ jobs:
 
           git clone https://github.com/crytic/solc-select.git
           cd solc-select
-          git checkout 857d6fa883d9283454be1cb2d869a8f9962b27b8
+          git checkout 119dd05f58341811cb02b546f25269a7e8a10875
+          python setup.py install
+          solc-select install all
+          solc-select use 0.8.0
           cd ..
-          ./solc-select/scripts/install.sh
-          export PATH=/home/runner/.solc-select:$PATH
-          echo "export PATH=/home/runner/.solc-select:$PATH" >> ~/.bashrc
-          solc use 0.7.3
 
       - name: Test with pytest
         run: |

CONTRIBUTING.md

@@ -51,6 +51,7 @@ To see the tests coverage, run `pytest  tests/test_detectors.py  --cov=slither/d
 
 ### Parser tests
 - Create a test in `tests/ast-parsing`
+- Run `python ./tests/test_ast_parsing.py --compile`. This will compile the artifact in `tests/compile`. Add the compiled artifact to git.
 - Run `python ./tests/test_ast_parsing.py --generate`. This will generate the json artifacts in `tests/expected_json`. Add the generated files to git.
 - Run `pytest ./tests/test_ast_parsing.py` and check that everything worked.
 

examples/scripts/convert_to_ir.py

@@ -11,8 +11,9 @@
 slither = Slither(sys.argv[1])
 
 # Get the contract
-contract = slither.get_contract_from_name("Test")
-assert contract
+contracts = slither.get_contract_from_name("Test")
+assert len(contracts) == 1
+contract = contracts[0]
 # Get the variable
 test = contract.get_function_from_signature("one()")
 assert test

examples/scripts/data_dependency.py

@@ -13,8 +13,9 @@
 
 slither = Slither(sys.argv[1])
 
-contract = slither.get_contract_from_name("Simple")
-assert contract
+contracts = slither.get_contract_from_name("Simple")
+assert len(contracts) == 1
+contract = contracts[0]
 destination = contract.get_state_variable_from_name("destination")
 source = contract.get_state_variable_from_name("source")
 
@@ -35,8 +36,9 @@
 print("{} is tainted {}".format(destination, is_tainted(destination, contract)))
 assert is_tainted(destination, contract)
 
-contract = slither.get_contract_from_name("Reference")
-assert contract
+contracts = slither.get_contract_from_name("Reference")
+assert len(contracts) == 1
+contract = contracts[0]
 destination = contract.get_state_variable_from_name("destination")
 assert destination
 source = contract.get_state_variable_from_name("source")
@@ -73,8 +75,9 @@
 
 print("SolidityVar contract")
 
-contract = slither.get_contract_from_name("SolidityVar")
-assert contract
+contracts = slither.get_contract_from_name("SolidityVar")
+assert len(contracts) == 1
+contract = contracts[0]
 addr_1 = contract.get_state_variable_from_name("addr_1")
 assert addr_1
 addr_2 = contract.get_state_variable_from_name("addr_2")
@@ -91,8 +94,9 @@
 
 
 print("Intermediate contract")
-contract = slither.get_contract_from_name("Intermediate")
-assert contract
+contracts = slither.get_contract_from_name("Intermediate")
+assert len(contracts) == 1
+contract = contracts[0]
 destination = contract.get_state_variable_from_name("destination")
 assert destination
 source = contract.get_state_variable_from_name("source")
@@ -106,8 +110,10 @@
 assert is_dependent(destination, source, contract)
 
 print("Base Derived contract")
-contract = slither.get_contract_from_name("Base")
-contract_derived = slither.get_contract_from_name("Derived")
+contracts = slither.get_contract_from_name("Base")
+assert len(contracts) == 1
+contract = contracts[0]
+contract_derived = slither.get_contract_from_name("Derived")[0]
 destination = contract.get_state_variable_from_name("destination")
 source = contract.get_state_variable_from_name("source")
 
@@ -125,8 +131,9 @@
 assert is_dependent(destination, source, contract_derived)
 
 print("PropagateThroughArguments contract")
-contract = slither.get_contract_from_name("PropagateThroughArguments")
-assert contract
+contracts = slither.get_contract_from_name("PropagateThroughArguments")
+assert len(contracts) == 1
+contract = contracts[0]
 var_tainted = contract.get_state_variable_from_name("var_tainted")
 assert var_tainted
 var_not_tainted = contract.get_state_variable_from_name("var_not_tainted")

examples/scripts/functions_called.py

@@ -9,8 +9,9 @@
 slither = Slither(sys.argv[1])
 
 # Get the contract
-contract = slither.get_contract_from_name("Contract")
-assert contract
+contracts = slither.get_contract_from_name("Contract")
+assert len(contracts) == 1
+contract = contracts[0]
 
 # Get the variable
 entry_point = contract.get_function_from_signature("entry_point()")

examples/scripts/functions_writing.py

@@ -9,8 +9,9 @@
 slither = Slither(sys.argv[1])
 
 # Get the contract
-contract = slither.get_contract_from_name("Contract")
-
+contracts = slither.get_contract_from_name("Contract")
+assert len(contracts) == 1
+contract = contracts[0]
 # Get the variable
 var_a = contract.get_state_variable_from_name("a")
 

examples/scripts/possible_paths.py

@@ -11,12 +11,12 @@ def resolve_function(contract_name, function_name):
     :return: Returns the resolved function, raises an exception otherwise.
     """
     # Obtain the target contract
-    contract = slither.get_contract_from_name(contract_name)
+    contracts = slither.get_contract_from_name(contract_name)
 
     # Verify the contract was resolved successfully
-    if contract is None:
+    if len(contracts) != 1:
         raise ValueError(f"Could not resolve target contract: {contract_name}")
-
+    contract = contracts[0]
     # Obtain the target function
     target_function = next(
         (function for function in contract.functions if function.name == function_name), None

examples/scripts/taint_mapping.py

@@ -14,7 +14,7 @@ def visit_node(node, visited):
         return
 
     visited += [node]
-    taints = node.function.slither.context[KEY]
+    taints = node.function.compilation_unit.context[KEY]
 
     refs = {}
     for ir in node.irs:
@@ -41,7 +41,7 @@ def visit_node(node, visited):
 
     taints = [v for v in taints if not isinstance(v, (TemporaryVariable, ReferenceVariable))]
 
-    node.function.slither.context[KEY] = list(set(taints))
+    node.function.compilation_unit.context[KEY] = list(set(taints))
 
     for son in node.sons:
         visit_node(son, visited)

examples/scripts/variable_in_condition.py

@@ -9,8 +9,9 @@
 slither = Slither(sys.argv[1])
 
 # Get the contract
-contract = slither.get_contract_from_name("Contract")
-
+contracts = slither.get_contract_from_name("Contract")
+assert len(contracts) == 1
+contract = contracts[0]
 # Get the variable
 var_a = contract.get_state_variable_from_name("a")
 

setup.py

@@ -11,10 +11,10 @@
     install_requires=[
         "prettytable>=0.7.2",
         "pysha3>=1.0.2",
-        "crytic-compile>=0.1.13",
-        # "crytic-compile",
+        # "crytic-compile>=0.1.13",
+        "crytic-compile",
     ],
-    # dependency_links=["git+https://github.com/crytic/crytic-compile.git@master#egg=crytic-compile"],
+    dependency_links=["git+https://github.com/crytic/crytic-compile.git@master#egg=crytic-compile"],
     license="AGPL-3.0",
     long_description=open("README.md").read(),
     entry_points={