Skip to content

Commit

Permalink
Merge pull request #603 from ethereum/fixes
Browse files Browse the repository at this point in the history
Fixes
  • Loading branch information
winsvega committed Jun 29, 2019
2 parents 0e8f3ed + f5d9a6d commit 0327d9f
Show file tree
Hide file tree
Showing 60 changed files with 320 additions and 1,090 deletions.
6 changes: 3 additions & 3 deletions GeneralStateTests/stCreate2/Create2OnDepth1023.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"Create2OnDepth1023" : {
"_info" : {
"comment" : "Create2OnDepth1023, 0x0400 indicates 1022 level.",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/Create2OnDepth1023Filler.json",
"sourceHash" : "58b980ba27ef83c1145bc119ce205e05dbed360978f50be641026bc55f356c52"
"sourceHash" : "5bd935cf51b0d4c3146e87e32a50077586078c5dfe8fdc6a9309b67bfc894ef1"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand Down Expand Up @@ -67,7 +67,7 @@
"0x"
],
"gasLimit" : [
"0x7ffffffffffffffe"
"0x7effffffffffffff"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
Expand Down
6 changes: 3 additions & 3 deletions GeneralStateTests/stCreate2/Create2OnDepth1024.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"Create2OnDepth1024" : {
"_info" : {
"comment" : "Create2OnDepth1024, 0x0400 indicates 1022 level.",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/Create2OnDepth1024Filler.json",
"sourceHash" : "5e2e8eaafd59a7d3fb362b149566d845649adf791d14c5912b72da9c1d87d85e"
"sourceHash" : "3a6a3716c1c47ab02b12c53e7768fd5e61f3a70d881a1906f40c449d3541b82c"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand Down Expand Up @@ -67,7 +67,7 @@
"0x"
],
"gasLimit" : [
"0x7ffffffffffffffe"
"0x7effffffffffffff"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
Expand Down
6 changes: 3 additions & 3 deletions GeneralStateTests/stCreate2/Create2Recursive.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"Create2Recursive" : {
"_info" : {
"comment" : "Create2 inside Create2 inside Create2....",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/Create2RecursiveFiller.json",
"sourceHash" : "0da75efbd946a262507fdf083cbae5fead6d7dc79771bebda2ffb753fe6c195c"
"sourceHash" : "b57f772d0bd580984116a492f9c3c1284ed7703bed555152f89844e915c5e7ef"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand Down Expand Up @@ -78,7 +78,7 @@
"0x"
],
"gasLimit" : [
"0x7ffffffffffffffe",
"0x7effffffffffffff",
"0x1240e9387c00"
],
"gasPrice" : "0x01",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"RevertDepthCreateAddressCollision" : {
"_info" : {
"comment" : "copy of this test for CREATE2",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0-17+commit.ff01d207",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/RevertDepthCreateAddressCollisionFiller.json",
"sourceHash" : "d7cdfdf13cee125d23792e16633f42dab1d16b73a2d7a1b4097e0a1a15714259"
"sourceHash" : "cb1673b08e780d375ef31596d8f81f901226684494ecae11224d599e2b21edf0"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
Expand Down
6 changes: 3 additions & 3 deletions GeneralStateTests/stCreate2/RevertInCreateInInitCreate2.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"RevertInCreateInInitCreate2" : {
"_info" : {
"comment" : "RevertInCreateInInit for CREATE2",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/RevertInCreateInInitCreate2Filler.json",
"sourceHash" : "a242140f42b00d676dff043f5e8662782fdba368e61828fdff232c8f02a7421e"
"sourceHash" : "3d8c4bd0758ae27c11c85e502e26db82615c8df0252764516a5c64399ac13b5e"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"RevertOpcodeInCreateReturnsCreate2" : {
"_info" : {
"comment" : "RevertOpcodeInCreateReturns for CREATE2",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/RevertOpcodeInCreateReturnsCreate2Filler.json",
"sourceHash" : "aff95ea4e207fb74b2aa3bc9bd75b6cf0e808755e62d0a145fd628ee56c47900"
"sourceHash" : "0d478a43101130c7078fd67f3851f394271541e953169ab949710165f155dfc8"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"call_outsize_then_create2_successful_then_returndatasize" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json",
"sourceHash" : "c3d3ed6e128d2aa728ae7163c619383c5125b4b85bc6f67d70452d8b01ecbcaf"
"sourceHash" : "687e04facd0057e4d9a9d67eb369e695e5539d1503e277d8cf6455b1ee3cad6e"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"call_then_create2_successful_then_returndatasize" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json",
"sourceHash" : "254ba9cbe1d292d4b38f39eb3576fff92c904bfb03c882c94a4c07149acea1eb"
"sourceHash" : "5541cba1342a149a43d157b33f3e13c8daf41834bd2c42765e5f010a12ade688"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
6 changes: 3 additions & 3 deletions GeneralStateTests/stCreate2/create2SmartInitCode.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"create2SmartInitCode" : {
"_info" : {
"comment" : "create2SmartInitCode. create2 works different each time you call it",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/create2SmartInitCodeFiller.json",
"sourceHash" : "41a5b6b8e9b598a01acb53030dc7eb1931103d9adbecd7cf8c40f1704a616fae"
"sourceHash" : "a1569cb7590abef768cbcbe1f0ee1035bbfdbcf093545c7d4e5172780f138ab3"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"returndatacopy_0_0_following_successful_create" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/returndatacopy_0_0_following_successful_createFiller.json",
"sourceHash" : "fa69b114d69ab3a6f723205c6be96e5edead2dc01111d28555c57679896ad83c"
"sourceHash" : "da54205fe4bb9e14c7ec8857c872f8b4868ff6fab6f982d556cb2b24a56a484a"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"returndatacopy_afterFailing_create" : {
"_info" : {
"comment" : "Returndatacopy after failing create case due to 0xfd code.",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/returndatacopy_afterFailing_createFiller.json",
"sourceHash" : "7ebe93e873ba7c0e641bae31d21e74ff7d2a8557c119d6f3b3f8d558567929bc"
"sourceHash" : "8957b19705cf2cd4638591ccbc363d0dfc770f0a784ccc05fbf7afddc5c2d9b7"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"returndatacopy_following_create" : {
"_info" : {
"comment" : "Check that create2 does not fill returndata buffer with its return opcode.",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/returndatacopy_following_createFiller.json",
"sourceHash" : "6c9d669af9e144dba5e0d3b5a7d9dbe190489a9430410b88392eede9e233fdb6"
"sourceHash" : "d80cc4026807742af5c7c5933786989542cde857df4fa523bd7a4eb8f6d6228c"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"returndatacopy_following_revert_in_create" : {
"_info" : {
"comment" : "returndatacopy_following_revert_in_create for CREATE2",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/returndatacopy_following_revert_in_createFiller.json",
"sourceHash" : "ec89def1f4f31fa14411195010d817f2abaa4cc4fce4f5ea0110dafca7a7cc99"
"sourceHash" : "883e1d47107cad4ecc93ca2b78b648a77ddc49f2636638bce45f54f99fca15bb"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"returndatacopy_following_successful_create" : {
"_info" : {
"comment" : "returndatacopy_following_successful_create for CREATE2",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/returndatacopy_following_successful_createFiller.json",
"sourceHash" : "c5bdd0dd9d43c7be33976cfde27b5fa843e2e27648d88c177d7020bc8755351c"
"sourceHash" : "6f6cd4285f03b62ec76f72557766f2c55fc7526f8c9841fa188bbbe8a5da9b78"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0c00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"returndatasize_following_successful_create" : {
"_info" : {
"comment" : "returndatasize_following_successful_create for create2",
"filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2",
"filledwith" : "testeth 1.7.0-alpha.0+commit.ec246b82.dirty",
"lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/returndatasize_following_successful_createFiller.json",
"sourceHash" : "54f52fc3669c0a86a8f0a622ffb041707683fe2927dfe73f92111d6cd3d89a87"
"sourceHash" : "67aabdbbeb2e5a938bbeb190c0d7d45c7792eb8f2aac3a657abd3bc6dcdf7c89"
},
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x0a00000000",
"currentGasLimit" : "0x0b00000000",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
Expand Down

0 comments on commit 0327d9f

Please sign in to comment.