Skip to content

Commit

Permalink
Merge pull request #599 from ethereum/maintanace
Browse files Browse the repository at this point in the history
update and fix tests
  • Loading branch information
winsvega committed Jun 8, 2019
2 parents e4c9359 + 53e28a6 commit 2d74adc
Show file tree
Hide file tree
Showing 935 changed files with 3,459 additions and 6,571 deletions.
6 changes: 3 additions & 3 deletions GeneralStateTests/stBugs/staticcall_createfails.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"staticcall_createfails" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"filledwith" : "testeth 1.7.0-alpha.0+commit.1e771655.dirty",
"lllcversion" : "Version: 0.5.0-develop.2019.6.1+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stBugs/staticcall_createfailsFiller.json",
"sourceHash" : "8efe41054f7f61c7f5823578256b7e2a5772157278a6db1ec1c2bf9fb8ecc3e1"
"sourceHash" : "ade5fa171f89c6ea0a7e7e8e48d7ebf204f67b663591bc688cb5e97bad89cd46"
},
"env" : {
"currentCoinbase" : "0x1000000000000000000000000000000000000000",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"createJS_NoCollision" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"filledwith" : "testeth 1.7.0-alpha.0+commit.1e771655.dirty",
"lllcversion" : "Version: 0.5.0-develop.2019.6.1+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json",
"sourceHash" : "65c80aa08a609a511eac10d15280e0374af95f08a2e4c4a82669041464edf4db"
"sourceHash" : "0ef656fb1b2f88af6a21d303bd830da398a420bd4abf880db2d38a8d3b287b03"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"createNameRegistratorPerTxsNotEnoughGas" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"filledwith" : "testeth 1.7.0-alpha.0+commit.1e771655.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json",
"sourceHash" : "329ea8476675714607578e8430287eae33b511c476c22a9ddd597807ab081937"
"sourceHash" : "0d9e04325a727cde147e4f2d51c49369abe72c3366db3d4421c0352130a29b86"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand All @@ -27,13 +27,22 @@
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
"hash" : "0x28ee31066c9688edd5f4e79c8a01cfe1cbfc4f6ea8dde6406ac92b700ece848e",
"indexes" : {
"data" : 0,
"gas" : 1,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
"indexes" : {
"data" : 0,
"gas" : 2,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Constantinople" : [
Expand All @@ -47,13 +56,22 @@
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
"hash" : "0x28ee31066c9688edd5f4e79c8a01cfe1cbfc4f6ea8dde6406ac92b700ece848e",
"indexes" : {
"data" : 0,
"gas" : 1,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
"indexes" : {
"data" : 0,
"gas" : 2,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"ConstantinopleFix" : [
Expand All @@ -67,18 +85,27 @@
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
"hash" : "0x28ee31066c9688edd5f4e79c8a01cfe1cbfc4f6ea8dde6406ac92b700ece848e",
"indexes" : {
"data" : 0,
"gas" : 1,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
"indexes" : {
"data" : 0,
"gas" : 2,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Frontier" : [
{
"hash" : "0x29c73824becd004bed00de09919b81c17c32b53a0b4a12a59279699e4c5db146",
"hash" : "0xf7e45cb12d256eac240b4537e5d555d2efa8f4d0b0f5838b829d2f9999aa082e",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -87,13 +114,22 @@
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
"hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
"indexes" : {
"data" : 0,
"gas" : 1,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
"indexes" : {
"data" : 0,
"gas" : 2,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
]
},
Expand All @@ -111,8 +147,9 @@
"0x6001600155601080600c6000396000f3006000355415600957005b60203560003555"
],
"gasLimit" : [
"0x544d",
"0xb44d"
"0x5c1d",
"0xdb5d",
"0x01508d"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"filledwith" : "testeth 1.7.0-alpha.0+commit.1e771655.dirty",
"lllcversion" : "Version: 0.5.0-develop.2019.6.1+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json",
"sourceHash" : "2d324aba1f07bbab2ac7295245b18f0667bbf2e4c0b333320b66cd9e2b311078"
"sourceHash" : "e6e506368fb27a4427e50b28d8f655b45219d21fc28d60801759f4b1d5c1d1d7"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand Down
51 changes: 7 additions & 44 deletions GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"callOutput1" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"filledwith" : "testeth 1.7.0-alpha.0+commit.1e771655.dirty",
"lllcversion" : "Version: 0.5.0-develop.2019.6.1+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json",
"sourceHash" : "b2346aeb3e5a81dddbe871e39c5df67fe02164a764606643b6fb109653164d77"
"sourceHash" : "fbe66b55b690677447c39ab5432132b273ae49f31cc7f62b9864a68482039132"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand All @@ -17,80 +17,44 @@
},
"post" : {
"Byzantium" : [
{
"hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0xb30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47",
"indexes" : {
"data" : 0,
"gas" : 1,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Constantinople" : [
{
"hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0xb30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47",
"indexes" : {
"data" : 0,
"gas" : 1,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"ConstantinopleFix" : [
{
"hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0xb30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47",
"indexes" : {
"data" : 0,
"gas" : 1,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Homestead" : [
{
"hash" : "0x22155a0102cfa175021262a6b0e3afd7d610fff0a2af7e28e990cd73e77b2d74",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x068ae35f557da951c6407104a8a59d0bf8348710cf2c2f41d57107b18e8b9000",
"indexes" : {
"data" : 0,
"gas" : 1,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
Expand Down Expand Up @@ -125,7 +89,6 @@
"0x"
],
"gasLimit" : [
"0x10c8e0",
"0x0dbba0"
],
"gasPrice" : "0x00",
Expand Down
51 changes: 7 additions & 44 deletions GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"callOutput2" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"filledwith" : "testeth 1.7.0-alpha.0+commit.1e771655.dirty",
"lllcversion" : "Version: 0.5.0-develop.2019.6.1+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json",
"sourceHash" : "f8fb18b04b40054ecf58058a787354065a3267ab563dc64468fcd35c097b6f37"
"sourceHash" : "4e0a124e359a9f87c73476b9a85d80dc439500888f6eac1c32abbfcb4db19db3"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand All @@ -17,80 +17,44 @@
},
"post" : {
"Byzantium" : [
{
"hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x03962b53fdaea7ca84a2731cace90a5324f5d57a1560b465b9ff80e423aa1584",
"indexes" : {
"data" : 0,
"gas" : 1,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Constantinople" : [
{
"hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x03962b53fdaea7ca84a2731cace90a5324f5d57a1560b465b9ff80e423aa1584",
"indexes" : {
"data" : 0,
"gas" : 1,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"ConstantinopleFix" : [
{
"hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x03962b53fdaea7ca84a2731cace90a5324f5d57a1560b465b9ff80e423aa1584",
"indexes" : {
"data" : 0,
"gas" : 1,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Homestead" : [
{
"hash" : "0xdad06d27bece7774708da85e76c7f3d3ca83e687511e501720c7a251530ca4e6",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash" : "0x7c812ae27fb6114b03cf557d6a7a7a7ae2a64680d50e5493c024b65acd3509bd",
"indexes" : {
"data" : 0,
"gas" : 1,
"gas" : 0,
"value" : 0
},
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
Expand Down Expand Up @@ -125,7 +89,6 @@
"0x"
],
"gasLimit" : [
"0x10c8e0",
"0x0dbba0"
],
"gasPrice" : "0x00",
Expand Down

0 comments on commit 2d74adc

Please sign in to comment.