[WIP] Remove share of functions and modifiers instances

examples/scripts/functions_called.py

@@ -16,7 +16,7 @@
 
 all_calls = entry_point.all_internal_calls()
 
-all_calls_formated = [f.contract.name + '.' + f.name for f in all_calls]
+all_calls_formated = [f.canonical_name for f in all_calls]
 
 # Print the result
 print('From entry_point the functions reached are {}'.format(all_calls_formated))

examples/scripts/possible_paths.py

@@ -69,7 +69,7 @@ def all_function_definitions(function):
     :return: Returns a list composed of the provided function definition and any base definitions.
     """
     return [function] + [f for c in function.contract.inheritance
-                         for f in c.functions_and_modifiers_not_inherited
+                         for f in c.functions_and_modifiers_declared
                          if f.full_name == function.full_name]
 
 
@@ -86,7 +86,7 @@ def __find_target_paths(target_function, current_path=[]):
 
     # Look through all functions
     for contract in slither.contracts:
-        for function in contract.functions_and_modifiers_not_inherited:
+        for function in contract.functions_and_modifiers_declared:
 
             # If the function is already in our path, skip it.
             if function in current_path:
@@ -179,12 +179,12 @@ def parse_args():
 
 # Print out all function names which can reach the targets.
 print(f"The following functions reach the specified targets:")
-for function_desc in sorted([f"{f.contract.name}.{f.full_name}" for f in reaching_functions]):
+for function_desc in sorted([f"{f.canonical_name}" for f in reaching_functions]):
     print(f"-{function_desc}")
 print("\n")
 
 # Format all function paths.
-reaching_paths_str = [' -> '.join([f"{f.contract.name}.{f.full_name}" for f in reaching_path]) for reaching_path in reaching_paths]
+reaching_paths_str = [' -> '.join([f"{f.canonical_name}" for f in reaching_path]) for reaching_path in reaching_paths]
 
 # Print a sorted list of all function paths which can reach the targets.
 print(f"The following paths reach the specified targets:")

examples/scripts/slithIR.py

@@ -15,7 +15,7 @@
     for function in contract.functions:
 
         # Dont explore inherited functions
-        if function.contract == contract:
+        if function.contract_declarer == contract:
 
             print('Function: {}'.format(function.name))
 

scripts/tests_generate_expected_json_4.sh

@@ -21,38 +21,38 @@ generate_expected_json(){
 }
 
 
-#generate_expected_json tests/deprecated_calls.sol "deprecated-standards"
-#generate_expected_json tests/erc20_indexed.sol "erc20-indexed"
-#generate_expected_json tests/incorrect_erc20_interface.sol "erc20-interface"
-#generate_expected_json tests/incorrect_erc721_interface.sol "erc721-interface"
-#generate_expected_json tests/uninitialized.sol "uninitialized-state"
-#generate_expected_json tests/backdoor.sol "backdoor"
-#generate_expected_json tests/backdoor.sol "suicidal"
-#generate_expected_json tests/pragma.0.4.24.sol "pragma"
-#generate_expected_json tests/old_solc.sol.json "solc-version"
-#generate_expected_json tests/reentrancy.sol "reentrancy-eth"
-#generate_expected_json tests/uninitialized_storage_pointer.sol "uninitialized-storage"
-#generate_expected_json tests/tx_origin.sol "tx-origin"
-#generate_expected_json tests/unused_state.sol "unused-state"
-#generate_expected_json tests/locked_ether.sol "locked-ether"
-#generate_expected_json tests/arbitrary_send.sol "arbitrary-send"
-#generate_expected_json tests/inline_assembly_contract.sol "assembly"
-#generate_expected_json tests/inline_assembly_library.sol "assembly"
-#generate_expected_json tests/low_level_calls.sol "low-level-calls"
-#generate_expected_json tests/const_state_variables.sol "constable-states"
-#generate_expected_json tests/external_function.sol "external-function"
-#generate_expected_json tests/external_function_2.sol "external-function"
-#generate_expected_json tests/naming_convention.sol "naming-convention"
-#generate_expected_json tests/uninitialized_local_variable.sol "uninitialized-local"
-#generate_expected_json tests/controlled_delegatecall.sol "controlled-delegatecall"
-#generate_expected_json tests/constant.sol "constant-function"
-#generate_expected_json tests/unused_return.sol "unused-return"
-#generate_expected_json tests/shadowing_state_variable.sol "shadowing-state"
-#generate_expected_json tests/shadowing_abstract.sol "shadowing-abstract"
-#generate_expected_json tests/timestamp.sol "timestamp"
-#generate_expected_json tests/multiple_calls_in_loop.sol "calls-loop"
-#generate_expected_json tests/shadowing_builtin_symbols.sol "shadowing-builtin"
-#generate_expected_json tests/shadowing_local_variable.sol "shadowing-local"
-#generate_expected_json tests/solc_version_incorrect.sol "solc-version"
-#generate_expected_json tests/right_to_left_override.sol "rtlo"
-#generate_expected_json tests/unchecked_lowlevel.sol "unchecked-lowlevel"
+generate_expected_json tests/deprecated_calls.sol "deprecated-standards"
+generate_expected_json tests/erc20_indexed.sol "erc20-indexed"
+generate_expected_json tests/incorrect_erc20_interface.sol "erc20-interface"
+generate_expected_json tests/incorrect_erc721_interface.sol "erc721-interface"
+generate_expected_json tests/uninitialized.sol "uninitialized-state"
+generate_expected_json tests/backdoor.sol "backdoor"
+generate_expected_json tests/backdoor.sol "suicidal"
+generate_expected_json tests/pragma.0.4.24.sol "pragma"
+generate_expected_json tests/old_solc.sol.json "solc-version"
+generate_expected_json tests/reentrancy.sol "reentrancy-eth"
+generate_expected_json tests/uninitialized_storage_pointer.sol "uninitialized-storage"
+generate_expected_json tests/tx_origin.sol "tx-origin"
+generate_expected_json tests/unused_state.sol "unused-state"
+generate_expected_json tests/locked_ether.sol "locked-ether"
+generate_expected_json tests/arbitrary_send.sol "arbitrary-send"
+generate_expected_json tests/inline_assembly_contract.sol "assembly"
+generate_expected_json tests/inline_assembly_library.sol "assembly"
+generate_expected_json tests/low_level_calls.sol "low-level-calls"
+generate_expected_json tests/const_state_variables.sol "constable-states"
+generate_expected_json tests/external_function.sol "external-function"
+generate_expected_json tests/external_function_2.sol "external-function"
+generate_expected_json tests/naming_convention.sol "naming-convention"
+generate_expected_json tests/uninitialized_local_variable.sol "uninitialized-local"
+generate_expected_json tests/controlled_delegatecall.sol "controlled-delegatecall"
+generate_expected_json tests/constant.sol "constant-function"
+generate_expected_json tests/unused_return.sol "unused-return"
+generate_expected_json tests/shadowing_state_variable.sol "shadowing-state"
+generate_expected_json tests/shadowing_abstract.sol "shadowing-abstract"
+generate_expected_json tests/timestamp.sol "timestamp"
+generate_expected_json tests/multiple_calls_in_loop.sol "calls-loop"
+generate_expected_json tests/shadowing_builtin_symbols.sol "shadowing-builtin"
+generate_expected_json tests/shadowing_local_variable.sol "shadowing-local"
+generate_expected_json tests/solc_version_incorrect.sol "solc-version"
+generate_expected_json tests/right_to_left_override.sol "rtlo"
+generate_expected_json tests/unchecked_lowlevel.sol "unchecked-lowlevel"

scripts/tests_generate_expected_json_5.sh

@@ -20,20 +20,20 @@ generate_expected_json(){
     sed "s|$CURRENT_PATH|$TRAVIS_PATH|g" "$output_filename_txt" -i
 }
 
-#generate_expected_json tests/solc_version_incorrect_05.ast.json "solc-version"
-#generate_expected_json tests/uninitialized-0.5.1.sol "uninitialized-state"
-#generate_expected_json tests/backdoor.sol "backdoor"
-#generate_expected_json tests/backdoor.sol "suicidal"
-#generate_expected_json tests/old_solc.sol.json "solc-version"
-#generate_expected_json tests/reentrancy-0.5.1.sol "reentrancy-eth"
-#generate_expected_json tests/tx_origin-0.5.1.sol "tx-origin"
-#generate_expected_json tests/locked_ether-0.5.1.sol "locked-ether"
-#generate_expected_json tests/arbitrary_send-0.5.1.sol "arbitrary-send"
-#generate_expected_json tests/inline_assembly_contract-0.5.1.sol "assembly"
-#generate_expected_json tests/inline_assembly_library-0.5.1.sol "assembly"
-#generate_expected_json tests/constant-0.5.1.sol "constant-function"
-#generate_expected_json tests/incorrect_equality.sol "incorrect-equality"
-#generate_expected_json tests/too_many_digits.sol "too-many-digits"
-#generate_expected_json tests/unchecked_lowlevel-0.5.1.sol "unchecked-lowlevel"
-#generate_expected_json tests/unchecked_send-0.5.1.sol "unchecked-send"
+generate_expected_json tests/solc_version_incorrect_05.ast.json "solc-version"
+generate_expected_json tests/uninitialized-0.5.1.sol "uninitialized-state"
+generate_expected_json tests/backdoor.sol "backdoor"
+generate_expected_json tests/backdoor.sol "suicidal"
+generate_expected_json tests/old_solc.sol.json "solc-version"
+generate_expected_json tests/reentrancy-0.5.1.sol "reentrancy-eth"
+generate_expected_json tests/tx_origin-0.5.1.sol "tx-origin"
+generate_expected_json tests/locked_ether-0.5.1.sol "locked-ether"
+generate_expected_json tests/arbitrary_send-0.5.1.sol "arbitrary-send"
+generate_expected_json tests/inline_assembly_contract-0.5.1.sol "assembly"
+generate_expected_json tests/inline_assembly_library-0.5.1.sol "assembly"
+generate_expected_json tests/constant-0.5.1.sol "constant-function"
+generate_expected_json tests/incorrect_equality.sol "incorrect-equality"
+generate_expected_json tests/too_many_digits.sol "too-many-digits"
+generate_expected_json tests/unchecked_lowlevel-0.5.1.sol "unchecked-lowlevel"
+generate_expected_json tests/unchecked_send-0.5.1.sol "unchecked-send"
 

scripts/travis_install.sh

@@ -24,5 +24,3 @@ function install_solc {
 
 install_solc
 
-
-

scripts/travis_test_4.sh

@@ -94,6 +94,7 @@ test_slither tests/external_function_2.sol "external-function"
 test_slither tests/naming_convention.sol "naming-convention"
 #test_slither tests/complex_func.sol "complex-function"
 test_slither tests/controlled_delegatecall.sol "controlled-delegatecall"
+test_slither tests/uninitialized_local_variable.sol "uninitialized-local"
 test_slither tests/constant.sol "constant-function"
 test_slither tests/unused_return.sol "unused-return"
 test_slither tests/shadowing_abstract.sol "shadowing-abstract"

scripts/travis_test_5.sh

@@ -88,7 +88,7 @@ test_slither tests/const_state_variables.sol "constable-states"
 test_slither tests/external_function.sol "external-function"
 test_slither tests/external_function_2.sol "external-function"
 test_slither tests/naming_convention.sol "naming-convention"
-##test_slither tests/complex_func.sol "complex-function"
+#test_slither tests/complex_func.sol "complex-function"
 test_slither tests/controlled_delegatecall.sol "controlled-delegatecall"
 test_slither tests/constant-0.5.1.sol "constant-function"
 test_slither tests/unused_return.sol "unused-return"

scripts/travis_test_upgradability.sh

@@ -8,8 +8,9 @@ slither-check-upgradeability "$DIR_TESTS/proxy.sol" Proxy "$DIR_TESTS/contractV1
 DIFF=$(diff test_1.txt "$DIR_TESTS/test_1.txt")
 if [  "$DIFF" != "" ] 
 then
-    echo "slither-check-upgradeability failed"
+    echo "slither-check-upgradeability 1 failed"
     cat test_1.txt
+    echo ""
     cat "$DIR_TESTS/test_1.txt"
     exit -1
 fi
@@ -18,8 +19,9 @@ slither-check-upgradeability "$DIR_TESTS/proxy.sol" Proxy "$DIR_TESTS/contractV1
 DIFF=$(diff test_2.txt "$DIR_TESTS/test_2.txt")
 if [  "$DIFF" != "" ] 
 then
-    echo "slither-check-upgradeability failed"
+    echo "slither-check-upgradeability 2 failed"
     cat test_2.txt
+    echo ""
     cat "$DIR_TESTS/test_2.txt"
     exit -1
 fi
@@ -28,8 +30,9 @@ slither-check-upgradeability "$DIR_TESTS/proxy.sol" Proxy "$DIR_TESTS/contractV1
 DIFF=$(diff test_3.txt "$DIR_TESTS/test_3.txt")
 if [  "$DIFF" != "" ] 
 then
-    echo "slither-check-upgradeability failed"
+    echo "slither-check-upgradeability 3 failed"
     cat test_3.txt
+    echo ""
     cat "$DIR_TESTS/test_3.txt"
     exit -1
 fi
@@ -38,8 +41,9 @@ slither-check-upgradeability "$DIR_TESTS/proxy.sol" Proxy "$DIR_TESTS/contractV1
 DIFF=$(diff test_4.txt "$DIR_TESTS/test_4.txt")
 if [  "$DIFF" != "" ] 
 then
-    echo "slither-check-upgradeability failed"
+    echo "slither-check-upgradeability 4 failed"
     cat test_4.txt
+    echo ""
     cat "$DIR_TESTS/test_4.txt"
     exit -1
 fi
@@ -48,9 +52,12 @@ slither-check-upgradeability "$DIR_TESTS/proxy.sol" Proxy "$DIR_TESTS/contract_i
 DIFF=$(diff test_5.txt "$DIR_TESTS/test_5.txt")
 if [  "$DIFF" != "" ] 
 then
-    echo "slither-check-upgradeability failed"
+    echo "slither-check-upgradeability 5 failed"
     cat test_5.txt
+    echo ""
     cat "$DIR_TESTS/test_5.txt"
+    echo ""
+    echo "$DIFF"
     exit -1
 fi
 

slither/core/children/child_contract.py

@@ -11,3 +11,4 @@ def set_contract(self, contract):
     @property
     def contract(self):
         return self._contract
+

slither/core/children/child_inheritance.py

@@ -0,0 +1,13 @@
+
+class ChildInheritance:
+
+    def __init__(self):
+        super(ChildInheritance, self).__init__()
+        self._contract_declarer = None
+
+    def set_contract_declarer(self, contract):
+        self._contract_declarer = contract
+
+    @property
+    def contract_declarer(self):
+        return self._contract_declarer