aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-05-08 04:34:31 +0800
committerchriseth <chris@ethereum.org>2018-05-16 15:48:03 +0800
commit894122c508c4de07553c7e2908ae36821e812a9f (patch)
tree694d7cccbe796d33f63bfca3c25eecb9021cb1a4 /libsolidity
parent8b98ff470ccb11fbe0e7c1729db5958355c2f84a (diff)
downloaddexon-solidity-894122c508c4de07553c7e2908ae36821e812a9f.tar.gz
dexon-solidity-894122c508c4de07553c7e2908ae36821e812a9f.tar.zst
dexon-solidity-894122c508c4de07553c7e2908ae36821e812a9f.zip
Warn/enforce single bytes argument for certain builtins (hashing functions).
In 0.5.0 mode, only accept a single bytes argument for ``.call``, ``keccak256`` and others and do not pad when encoding.
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/analysis/TypeChecker.cpp27
-rw-r--r--libsolidity/ast/Types.h16
2 files changed, 43 insertions, 0 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index e8694e88..f77cc60c 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1760,6 +1760,33 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
}
}
+ if (functionType->takesSinglePackedBytesParameter())
+ {
+ string generalMessage =
+ "This function only accepts a single \"bytes\" argument. Please use "
+ "\"abi.encodePacked(...)\" or a similar function to encode the data.";
+
+ if (arguments.size() > 1)
+ {
+ if (v050)
+ m_errorReporter.typeError(_functionCall.location(), generalMessage);
+ else
+ m_errorReporter.warning(_functionCall.location(), generalMessage);
+ }
+ else if (arguments.size() == 1 && !type(*arguments.front())->isImplicitlyConvertibleTo(ArrayType(DataLocation::Memory)))
+ {
+ string msg =
+ generalMessage +
+ " The provided argument of type " +
+ type(*arguments.front())->toString() +
+ " is not implicitly convertible to expected type bytes memory.";
+ if (v050)
+ m_errorReporter.typeError(_functionCall.location(), msg);
+ else
+ m_errorReporter.warning(_functionCall.location(), msg);
+ }
+ }
+
if (functionType->takesArbitraryParameters() && arguments.size() < parameterTypes.size())
{
solAssert(_functionCall.annotation().kind == FunctionCallKind::FunctionCall, "");
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 4884696d..95821634 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1058,6 +1058,22 @@ public:
/// true iff arguments are to be padded to multiples of 32 bytes for external calls
bool padArguments() const { return !(m_kind == Kind::SHA3 || m_kind == Kind::SHA256 || m_kind == Kind::RIPEMD160 || m_kind == Kind::ABIEncodePacked); }
bool takesArbitraryParameters() const { return m_arbitraryParameters; }
+ /// true iff the function takes a single bytes parameter and it is passed on without padding.
+ /// @todo until 0.5.0, this is just a "recommendation".
+ bool takesSinglePackedBytesParameter() const
+ {
+ // @todo add the call kinds here with 0.5.0 and perhaps also log0.
+ switch (m_kind)
+ {
+ case FunctionType::Kind::SHA3:
+ case FunctionType::Kind::SHA256:
+ case FunctionType::Kind::RIPEMD160:
+ return true;
+ default:
+ return false;
+ }
+ }
+
bool gasSet() const { return m_gasSet; }
bool valueSet() const { return m_valueSet; }
bool bound() const { return m_bound; }