mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Disallow payable internal functions.
This commit is contained in:
parent
f7a62c1e69
commit
925d674146
@ -95,7 +95,8 @@ void ReferencesResolver::endVisit(FunctionTypeName const& _typeName)
|
||||
typeError(_typeName.location(), "Invalid visibility, can only be \"external\" or \"internal\".");
|
||||
}
|
||||
|
||||
// Do we allow storage references for external functions?
|
||||
if (_typeName.isPayable() && _typeName.visibility() != VariableDeclaration::Visibility::External)
|
||||
fatalTypeError(_typeName.location(), "Only external function types can be payable.");
|
||||
|
||||
_typeName.annotation().type = make_shared<FunctionType>(_typeName);
|
||||
}
|
||||
|
@ -1704,7 +1704,7 @@ TypePointer TupleType::closestTemporaryType(TypePointer const& _targetType) cons
|
||||
FunctionType::FunctionType(FunctionDefinition const& _function, bool _isInternal):
|
||||
m_location(_isInternal ? Location::Internal : Location::External),
|
||||
m_isConstant(_function.isDeclaredConst()),
|
||||
m_isPayable(_function.isPayable()),
|
||||
m_isPayable(_isInternal ? false : _function.isPayable()),
|
||||
m_declaration(&_function)
|
||||
{
|
||||
TypePointers params;
|
||||
@ -1810,6 +1810,8 @@ FunctionType::FunctionType(FunctionTypeName const& _typeName):
|
||||
m_isConstant(_typeName.isDeclaredConst()),
|
||||
m_isPayable(_typeName.isPayable())
|
||||
{
|
||||
if (_typeName.isPayable())
|
||||
solAssert(m_location == Location::External, "Internal payable function type used.");
|
||||
for (auto const& t: _typeName.parameterTypes())
|
||||
{
|
||||
solAssert(t->annotation().type, "Type not set for parameter.");
|
||||
|
@ -4192,6 +4192,42 @@ BOOST_AUTO_TEST_CASE(public_function_type)
|
||||
BOOST_CHECK(expectError(text) == Error::Type::TypeError);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(payable_internal_function_type)
|
||||
{
|
||||
char const* text = R"(
|
||||
contract C {
|
||||
function (uint) internal payable returns (uint) x;
|
||||
}
|
||||
)";
|
||||
BOOST_CHECK(expectError(text) == Error::Type::TypeError);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(call_value_on_non_payable_function_type)
|
||||
{
|
||||
char const* text = R"(
|
||||
contract C {
|
||||
function (uint) external returns (uint) x;
|
||||
function f() {
|
||||
x.value(2)();
|
||||
}
|
||||
}
|
||||
)";
|
||||
BOOST_CHECK(expectError(text) == Error::Type::TypeError);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(call_value_on_payable_function_type)
|
||||
{
|
||||
char const* text = R"(
|
||||
contract C {
|
||||
function (uint) external payable returns (uint) x;
|
||||
function f() {
|
||||
x.value(2)(1);
|
||||
}
|
||||
}
|
||||
)";
|
||||
BOOST_CHECK(success(text));
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(internal_function_as_external_parameter)
|
||||
{
|
||||
// It should not be possible to give internal functions
|
||||
|
Loading…
Reference in New Issue
Block a user