mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #4659 from ethereum/abiv2-fixedbytes
FixedBytes(0) is invalid, do not check for it in ABIEncoderV2
This commit is contained in:
commit
1858843908
@ -228,7 +228,8 @@ string ABIFunctions::cleanupFunction(Type const& _type, bool _revertOnFailure)
|
|||||||
if (type.numBytes() == 32)
|
if (type.numBytes() == 32)
|
||||||
templ("body", "cleaned := value");
|
templ("body", "cleaned := value");
|
||||||
else if (type.numBytes() == 0)
|
else if (type.numBytes() == 0)
|
||||||
templ("body", "cleaned := 0");
|
// This is disallowed in the type system.
|
||||||
|
solAssert(false, "");
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
size_t numBits = type.numBytes() * 8;
|
size_t numBits = type.numBytes() * 8;
|
||||||
|
@ -12489,6 +12489,44 @@ BOOST_AUTO_TEST_CASE(abi_encode_with_signaturev2)
|
|||||||
ABI_CHECK(callContractFunction("f4()"), expectation);
|
ABI_CHECK(callContractFunction("f4()"), expectation);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(abi_encode_empty_string)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
// Tests that this will not end up using a "bytes0" type
|
||||||
|
// (which would assert)
|
||||||
|
contract C {
|
||||||
|
function f() public pure returns (bytes memory, bytes memory) {
|
||||||
|
return (abi.encode(""), abi.encodePacked(""));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)";
|
||||||
|
compileAndRun(sourceCode, 0, "C");
|
||||||
|
ABI_CHECK(callContractFunction("f()"), encodeArgs(
|
||||||
|
0x40, 0xc0,
|
||||||
|
0x60, 0x20, 0x00, 0x00,
|
||||||
|
0x00
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(abi_encode_empty_string_v2)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
// Tests that this will not end up using a "bytes0" type
|
||||||
|
// (which would assert)
|
||||||
|
pragma experimental ABIEncoderV2;
|
||||||
|
contract C {
|
||||||
|
function f() public pure returns (bytes memory, bytes memory) {
|
||||||
|
return (abi.encode(""), abi.encodePacked(""));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)";
|
||||||
|
compileAndRun(sourceCode, 0, "C");
|
||||||
|
ABI_CHECK(callContractFunction("f()"), encodeArgs(
|
||||||
|
0x40, 0xa0,
|
||||||
|
0x40, 0x20, 0x00,
|
||||||
|
0x00
|
||||||
|
));
|
||||||
|
}
|
||||||
BOOST_AUTO_TEST_CASE(abi_encode_call)
|
BOOST_AUTO_TEST_CASE(abi_encode_call)
|
||||||
{
|
{
|
||||||
char const* sourceCode = R"T(
|
char const* sourceCode = R"T(
|
||||||
|
Loading…
Reference in New Issue
Block a user