cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of structs of dynamic size as constructor parameters.

Browse Source
This commit is contained in:
chriseth
2019-05-16 17:10:54 +02:00
parent 9d291a86cc
commit f2ae30f620
7 changed files with 123 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/ABIEncoderTests.cpp
+75
View File
@@ -712,6 +712,81 @@ BOOST_AUTO_TEST_CASE(packed_structs)
)
}
BOOST_AUTO_TEST_CASE(struct_in_constructor)
{
string sourceCode = R"(
contract C {
struct S {
string a;
uint8 b;
string c;
}
S public x;
constructor(S memory s) public { x = s; }
}
)";
NEW_ENCODER(
compileAndRun(sourceCode, 0, "C", encodeArgs(0x20, 0x60, 0x03, 0x80, 0x00, 0x00));
ABI_CHECK(callContractFunction("x()"), encodeArgs(0x60, 0x03, 0x80, 0x00, 0x00));
)
}
BOOST_AUTO_TEST_CASE(struct_in_constructor_indirect)
{
string sourceCode = R"(
contract C {
struct S {
string a;
uint8 b;
string c;
}
S public x;
constructor(S memory s) public { x = s; }
}
contract D {
function f() public returns (string memory, uint8, string memory) {
C.S memory s;
s.a = "abc";
s.b = 7;
s.c = "def";
C c = new C(s);
return c.x();
}
}
)";
if (dev::test::Options::get().evmVersion().supportsReturndata())
{
NEW_ENCODER(
compileAndRun(sourceCode, 0, "D");
ABI_CHECK(callContractFunction("f()"), encodeArgs(0x60, 7, 0xa0, 3, "abc", 3, "def"));
)
}
}
BOOST_AUTO_TEST_CASE(struct_in_constructor_data_short)
{
string sourceCode = R"(
contract C {
struct S {
string a;
uint8 b;
string c;
}
S public x;
constructor(S memory s) public { x = s; }
}
)";
NEW_ENCODER(
BOOST_CHECK(
compileAndRunWithoutCheck(sourceCode, 0, "C", encodeArgs(0x20, 0x60, 0x03, 0x80, 0x00)).empty()
);
)
}
BOOST_AUTO_TEST_SUITE_END()
}
test/libsolidity/GasMeter.cpp
+2 -2
View File
@@ -176,8 +176,8 @@ BOOST_AUTO_TEST_CASE(store_keccak256)
char const* sourceCode = R"(
contract test {
bytes32 public shaValue;
constructor(uint a) public {
shaValue = keccak256(abi.encodePacked(a));
constructor() public {
shaValue = keccak256(abi.encodePacked(this));
}
}
)";
test/libsolidity/SolidityEndToEndTest.cpp
+1 -1
View File
@@ -9771,7 +9771,7 @@ BOOST_AUTO_TEST_CASE(calldata_offset)
}
}
)";
compileAndRun(sourceCode, 0, "CB", encodeArgs(u256(0x20)));
compileAndRun(sourceCode, 0, "CB", encodeArgs(u256(0x20), u256(0x00)));
ABI_CHECK(callContractFunction("last()", encodeArgs()), encodeDyn(string("nd")));
}