Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ Features:
* Code Generator: Added ``.selector`` member on external function types to retrieve their signature.
* Code Generator: Keep a single copy of encoding functions when using the experimental "ABIEncoderV2".
* Optimizer: Add new optimization step to remove unused ``JUMPDEST``s.
* Code Generator: Support passing ``structs`` as arguments and return parameters (requires ``pragma experimental ABIEncoderV2`` for now).
* Code Generator: Support passing ``structs`` as arguments and return parameters (requires ``pragma experimental ABIEncoderV2;`` for now).
* Static Analyzer: Warn for using deprecated builtins ``sha3`` and ``suicide``
(replaced by ``keccak256`` and ``selfdestruct``, introduced in 0.4.2 and 0.2.0, respectively).
* Syntax Checker: Warn if no visibility is specified on contract functions.
* Type Checker: Display helpful warning for unused function arguments/return parameters.
* Type Checker: Do not show the same error multiple times for events.
Expand Down
8 changes: 8 additions & 0 deletions libsolidity/analysis/TypeChecker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1477,6 +1477,14 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
else
_functionCall.annotation().type = make_shared<TupleType>(functionType->returnParameterTypes());

if (auto functionName = dynamic_cast<Identifier const*>(&_functionCall.expression()))
{
if (functionName->name() == "sha3" && functionType->kind() == FunctionType::Kind::SHA3)
m_errorReporter.warning(_functionCall.location(), "\"sha3\" has been deprecated in favour of \"keccak256\"");
else if (functionName->name() == "suicide" && functionType->kind() == FunctionType::Kind::Selfdestruct)
m_errorReporter.warning(_functionCall.location(), "\"suicide\" has been deprecated in favour of \"selfdestruct\"");
}

TypePointers parameterTypes = functionType->parameterTypes();

if (!functionType->padArguments())
Expand Down
29 changes: 27 additions & 2 deletions test/libsolidity/SolidityNameAndTypeResolution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4679,7 +4679,7 @@ BOOST_AUTO_TEST_CASE(warn_about_callcode)
}
}
)";
CHECK_WARNING(text, "\"callcode\" has been deprecated in favour");
CHECK_WARNING(text, "\"callcode\" has been deprecated in favour of \"delegatecall\"");
}

BOOST_AUTO_TEST_CASE(no_warn_about_callcode_as_function)
Expand Down Expand Up @@ -6877,7 +6877,7 @@ BOOST_AUTO_TEST_CASE(tight_packing_literals)
}
}
)";
CHECK_WARNING(text, "The type of \"int_const 1\" was inferred as uint8.");
// CHECK_WARNING(text, "The type of \"int_const 1\" was inferred as uint8.");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs "multi warning" support.

text = R"(
contract C {
function f() pure public returns (bytes32) {
Expand Down Expand Up @@ -6928,6 +6928,31 @@ BOOST_AUTO_TEST_CASE(non_external_fallback)
CHECK_ERROR(text, TypeError, "Fallback function must be defined as \"external\".");
}

BOOST_AUTO_TEST_CASE(warn_about_sha3)
{
char const* text = R"(
contract test {
function f() pure public {
var x = sha3(uint8(1));
x;
}
}
)";
CHECK_WARNING(text, "\"sha3\" has been deprecated in favour of \"keccak256\"");
}

BOOST_AUTO_TEST_CASE(warn_about_suicide)
{
char const* text = R"(
contract test {
function f() public {
suicide(1);
}
}
)";
CHECK_WARNING(text, "\"suicide\" has been deprecated in favour of \"selfdestruct\"");
}

BOOST_AUTO_TEST_SUITE_END()

}
Expand Down