Skip to content

Commit

Permalink
stCreate update fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@winsvega
winsvega committed Oct 8, 2020
1 parent 9162eaf commit 94919b4
Show file tree
Hide file tree
Showing 25 changed files with 189 additions and 189 deletions.
4 changes: 2 additions & 2 deletions src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json
View file

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions src/GeneralStateTestsFiller/stCreate2/RevertDepthCreate2OOGFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
"0x01" : "0x01",
"0x04" : "0x0c"
}
},
"b000000000000000000000000000000000000000" : {
"storage" : {
"0x02" : "0x08",
},
"b000000000000000000000000000000000000000" : {
"storage" : {
"0x02" : "0x08",
"0x03" : "0x0c"
}
}
}
}
}
},
{
{
"//comment" : "OOG in subcall",
"indexes" : {
"data" : 0,
Expand All @@ -53,14 +53,14 @@
"0x00" : "0x01",
"0x04" : "0x0c"
}
},
"b000000000000000000000000000000000000000" : {
"storage" : {
}
}
},
"b000000000000000000000000000000000000000" : {
"storage" : {
}
}
}
},
{
{
"//comment" : "OOG after subcall / double OOG",
"indexes" : {
"data" : [1, 0],
Expand All @@ -69,17 +69,17 @@
},
"network" : [">=Istanbul"],
"result" : {
"05a28fc366483258507bcf739658573cb47e4fad" : {
"shouldnotexist" : "1"
},
"a000000000000000000000000000000000000000" : {
"storage" : {
"05a28fc366483258507bcf739658573cb47e4fad" : {
"shouldnotexist" : "1"
},
"a000000000000000000000000000000000000000" : {
"storage" : {
}
},
"b000000000000000000000000000000000000000" : {
"storage" : {
}
}
},
"b000000000000000000000000000000000000000" : {
"storage" : {
}
}
}
}
],
Expand All @@ -92,14 +92,14 @@
"storage" : {
}
},
"a000000000000000000000000000000000000000" : {
"a000000000000000000000000000000000000000" : {
"balance" : "5",
"code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
"nonce" : "54",
"storage" : {
}
},
"b000000000000000000000000000000000000000" : {
"b000000000000000000000000000000000000000" : {
"balance" : "",
"code" : "{ [[2]] 8 (CREATE2 0 0 0 0) [[3]] 12}",
"nonce" : "",
Expand All @@ -108,11 +108,11 @@
}
},
"transaction" : {
"//data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.",
"// data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG",
"//data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.",
"// data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG",
"data" : [
"0x000000000000000000000000000000000000000000000000000000000000ea60",
"0x000000000000000000000000000000000000000000000000000000000001ea60"
":raw 0x000000000000000000000000000000000000000000000000000000000000ea60",
":raw 0x000000000000000000000000000000000000000000000000000000000001ea60"
],
"gasLimit" : [
"110000", "160000"
Expand Down
4 changes: 2 additions & 2 deletions src/GeneralStateTestsFiller/stCreate2/RevertDepthCreateAddressCollisionFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@
"//0 data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.",
"//1 data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG",
"data" : [
"0x000000000000000000000000000000000000000000000000000000000000ea60",
"0x000000000000000000000000000000000000000000000000000000000001ea60"
":raw 0x000000000000000000000000000000000000000000000000000000000000ea60",
":raw 0x000000000000000000000000000000000000000000000000000000000001ea60"
],
"gasLimit" : [
"110000", "160000"
Expand Down
34 changes: 17 additions & 17 deletions src/GeneralStateTestsFiller/stCreate2/RevertOpcodeCreateFiller.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"RevertOpcodeCreate" : {
"_info" : {
"comment" : "RevertOpcodeCreate for CREATE2"
},
"_info" : {
"comment" : "RevertOpcodeCreate for CREATE2"
},
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
Expand All @@ -20,26 +20,26 @@
},
"network" : [">=Istanbul"],
"result" : {
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "1",
"storage" : {
"0x00" : "0x0c",
"0x01" : "0x00"
}
}
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "1",
"storage" : {
"0x00" : "0x0c",
"0x01" : "0x00"
}
}
}
},
{
{
"indexes" : {
"data" : -1,
"gas" : 1,
"value" : -1
},
"network" : [">=Istanbul"],
"result" : {
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "0"
}
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "0"
}
}
}
],
Expand All @@ -52,9 +52,9 @@
"storage" : {
}
},
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1",
"// code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }",
"// code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }",
"code" : "{ (MSTORE 0 0x600160005560016000fd6011600155 ) [[1]](CREATE2 1 17 15 0) [[0]] 12 }",
"nonce" : "0",
"storage" : {
Expand All @@ -63,7 +63,7 @@
},
"transaction" : {
"data" : [
"0x600160005560016000fe6011600155"
":raw 0x600160005560016000fe6011600155"
],
"gasLimit" : [
"460000", "70000"
Expand Down
16 changes: 8 additions & 8 deletions src/GeneralStateTestsFiller/stCreate2/create2checkFieldsInInitcodeFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,14 @@
},
"transaction" : {
"data" : [
"0x0000000000000000000000001000000000000000000000000000000000000000",
"0x0000000000000000000000002000000000000000000000000000000000000000",
"0x0000000000000000000000003000000000000000000000000000000000000000",
"0x0000000000000000000000004000000000000000000000000000000000000000",
"0x0000000000000000000000001100000000000000000000000000000000000000",
"0x0000000000000000000000002200000000000000000000000000000000000000",
"0x0000000000000000000000003300000000000000000000000000000000000000",
"0x0000000000000000000000004400000000000000000000000000000000000000"
":raw 0x0000000000000000000000001000000000000000000000000000000000000000",
":raw 0x0000000000000000000000002000000000000000000000000000000000000000",
":raw 0x0000000000000000000000003000000000000000000000000000000000000000",
":raw 0x0000000000000000000000004000000000000000000000000000000000000000",
":raw 0x0000000000000000000000001100000000000000000000000000000000000000",
":raw 0x0000000000000000000000002200000000000000000000000000000000000000",
":raw 0x0000000000000000000000003300000000000000000000000000000000000000",
":raw 0x0000000000000000000000004400000000000000000000000000000000000000"
],
"gasLimit" : [
"600000"
Expand Down
8 changes: 4 additions & 4 deletions src/GeneralStateTestsFiller/stCreate2/create2collisionCode2Filler.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"create2collisionCode2" : {
"_info" : {
"comment" : "collision with the contract that already has the same init code that we are about to create"
},
"_info" : {
"comment" : "collision with the contract that already has the same init code that we are about to create"
},
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
Expand Down Expand Up @@ -69,7 +69,7 @@
},
"0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
"balance" : "0x00",
"code" : "0x010203",
"code" : ":raw 0x010203",
"nonce" : "0x01",
"storage" : {
}
Expand Down
40 changes: 20 additions & 20 deletions src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@
"result" : {
"e2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0",
"nonce" : "0",
"code" : "0x010203",
"storage" : {}
"nonce" : "0",
"code" : "0x010203",
"storage" : {}
},
"af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
"af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
"balance" : "0",
"nonce" : "0",
"code" : "0x010203",
"storage" : {}
"nonce" : "0",
"code" : "0x010203",
"storage" : {}
},
"ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
"ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
"balance" : "0",
"nonce" : "0",
"code" : "0x010203",
"storage" : {}
"nonce" : "0",
"code" : "0x010203",
"storage" : {}
},
"6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
"balance" : "1",
"nonce" : "2",
"code" : ""
"code" : ""
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "1"
Expand All @@ -57,23 +57,23 @@
"storage" : {
}
},
"e2b35478fdd26477cc576dd906e6277761246a3c" : {
"e2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0",
"code" : "0x010203",
"code" : ":raw 0x010203",
"nonce" : "0",
"storage" : {
}
},
"af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
"af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
"balance" : "0",
"code" : "0x010203",
"code" : ":raw 0x010203",
"nonce" : "0",
"storage" : {
}
},
"ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
"ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
"balance" : "0",
"code" : "0x010203",
"code" : ":raw 0x010203",
"nonce" : "0",
"storage" : {
}
Expand All @@ -82,8 +82,8 @@
"transaction" : {
"data" : [
"{ (CREATE2 0 0 0 0) }",
"{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
"{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
"{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
"{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
],
"gasLimit" : [
"400000"
Expand Down
28 changes: 14 additions & 14 deletions src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructed2Filler.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"create2collisionSelfdestructed2" : {
"_info" : {
"comment" : "A contract which performs SUICIDE, and is then attempted to be recreated (different code, same init-code) during the same transaction. This ought to fail, since the code is not cleaned out until after the transaction is ended."
},
"_info" : {
"comment" : "A contract which performs SUICIDE, and is then attempted to be recreated (different code, same init-code) during the same transaction. This ought to fail, since the code is not cleaned out until after the transaction is ended."
},
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
Expand All @@ -23,15 +23,15 @@
"fce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
"shouldnotexist" : "1"
},
"0000000000000000000000000000000000000010" : {
"balance" : "0x01"
},
"0000000000000000000000000000000000000010" : {
"balance" : "0x01"
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "1"
}
}
},
{
{
"indexes" : {
"data" : 1,
"gas" : -1,
Expand All @@ -42,9 +42,9 @@
"cff64f4c5df8f436c4f2c1af4b2e3f9e3004c779" : {
"shouldnotexist" : "1"
},
"0000000000000000000000000000000000000010" : {
"balance" : "0x01"
},
"0000000000000000000000000000000000000010" : {
"balance" : "0x01"
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "1"
}
Expand All @@ -59,7 +59,7 @@
"storage" : {
}
},
"fce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
"fce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
"balance" : "1",
"code" : "{ (SELFDESTRUCT 0x10) }",
"nonce" : "0",
Expand All @@ -68,17 +68,17 @@
},
"0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779" : {
"balance" : "1",
"code" : "0x6010ff",
"code" : ":raw 0x6010ff",
"nonce" : "0x01",
"storage" : {
}
}
},
"transaction" : {
"//data" : "0 - different code, 1 - same code",
"//data" : "0 - different code, 1 - same code",
"data" : [
"{ (CALL 50000 0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3 0 0 0 0 0) (MSTORE 0 0x620102036000526003601df3) (CREATE2 0 20 12 0) }",
"{ (CALL 50000 0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779 0 0 0 0 0) (MSTORE 0 0x626010ff6000526003601df3) (CREATE2 0 20 12 0) }"
"{ (CALL 50000 0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779 0 0 0 0 0) (MSTORE 0 0x626010ff6000526003601df3) (CREATE2 0 20 12 0) }"
],
"gasLimit" : [
"400000"
Expand Down
Loading

0 comments on commit 94919b4

Please sign in to comment.