diff options
Diffstat (limited to 'src')
36 files changed, 804 insertions, 96 deletions
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json index 1b32847d8..a3bd2db11 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json @@ -10,12 +10,28 @@ }, "expect" : [ { - "indexes" : { "data" : -1, "gas" : [0], "value" : -1}, + "indexes" : { "data" : -1, "gas" : 0, "value" : -1}, "network" : ["Frontier"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "balance" : "1000000000000000000", "nonce" : "0x00" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { "data" : -1, "gas" : 1, "value" : -1}, + "network" : ["Frontier"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a761d192", + "nonce" : "0x01" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0xa7ce" } } }, @@ -26,6 +42,9 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a7640000", "nonce" : "0x00" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json index 470ed46d5..ac0aab6a4 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json @@ -15,22 +15,45 @@ "gas" : 0, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } }, @@ -44,14 +67,11 @@ "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "0x01" : "0x00" + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json index 97c6479d2..42ec59cc3 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json @@ -15,22 +15,45 @@ "gas" : 0, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } }, @@ -44,14 +67,11 @@ "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "0x01" : "0x00" + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json index 8afd4e469..6578d7c9b 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json @@ -15,18 +15,38 @@ "gas" : 0, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + }, + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -44,14 +64,11 @@ "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "0x01" : "0x00" + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json index 4219ed40c..d2086eb3b 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json @@ -15,21 +15,45 @@ "gas" : 0, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } }, @@ -48,8 +72,6 @@ }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json index 7598e7fb6..6389f4853 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json @@ -15,22 +15,45 @@ "gas" : 0, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } }, @@ -44,14 +67,11 @@ "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "0x01" : "0x00" + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json index e33e9b9a5..2c88d5ced 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json @@ -15,20 +15,43 @@ "gas" : 0, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" + }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0" } @@ -44,14 +67,11 @@ "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "0x01" : "0x00" + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" } }, "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json index 17cbf6a64..579d33db2 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json @@ -9,17 +9,37 @@ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Homestead"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : [">=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json index 686876f18..65bddbd13 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json index 72fa7ce3e..126b8e86f 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json index 4dc066443..481fd2454 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json @@ -15,7 +15,24 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json index d7a1b223b..08a892af5 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json index 180a4e0fb..a6992d5cf 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stExample/add11Filler.json b/src/GeneralStateTestsFiller/stExample/add11Filler.json index 90b18ed66..35ff4bb90 100644 --- a/src/GeneralStateTestsFiller/stExample/add11Filler.json +++ b/src/GeneralStateTestsFiller/stExample/add11Filler.json @@ -44,6 +44,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", + "//code" : "{ [[ 0 ]] (ADD 1 1) }", "code" : "0x6001600101600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json index acee81b7d..3edf8f15c 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json @@ -15,10 +15,30 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "22177" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "//comment" : "0 mining reward considered to be as a touch. empty account created and stays untill eip158", + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "22177" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json index 086e0ec2b..24da2545a 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json @@ -9,31 +9,58 @@ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : [ - { + { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 0, "value" : -1 }, "network" : ["Frontier"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "838000" + "balance" : "838000" } } }, { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 0, "value" : -1 }, - "network" : [">=Homestead"], + "network" : [">Frontier"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "//comment" : "Transaction should be rejected because creation + dataGas > trGas", "balance" : "1000000" } } + }, + { + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Frontier"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "550000" + } + } + }, + { + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : -1 + }, + "network" : [">Frontier"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "699771" + } + } } ], "pre" : { @@ -47,10 +74,11 @@ }, "transaction" : { "data" : [ - "0x600a80600c6000396000f200600160008035811a8100" + "0x600a80600c6000396000f200600160008035811a8100", + "0x600160015560026001556003600155600460015560056001556006600155" ], "gasLimit" : [ - "54000" + "54000", "150000" ], "gasPrice" : "3", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json index 59a0e33e9..19bda6b39 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json @@ -35,7 +35,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Homestead"], + "network" : [">=EIP158"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "shouldnotexist" : "1" @@ -44,6 +44,22 @@ "nonce" : "0x00" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Homestead", "EIP150"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x00" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest184Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest184Filler.json index 7c35a98c8..3fa7ce00b 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest184Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest184Filler.json @@ -9,6 +9,45 @@ "previousHash" : "a8228e05d900b890136bcc55628b479e172795042a90e18b673189b5f3a672fc" }, "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Homestead"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x070a217c02c8f2d4", + "code" : "0x6f823a02877cef7c1afb60663009def564608c557bad2ae05769b991313726edbfa0881d9cc955b0f5154751da315696ea7ce130184b64f2507582c502d450349ff24fb8aeb2a46146687b666bd7bd0364946cb720c76d483f5afea0049251fd9793c4b0376afbb4ebcdc42fdd42edcd4b619cec787638009cea26a1abe570e3186ab790b7dc7db36e4cda2570b0847adf6e39579c7c43a4ac976cd507d493cdfaebe09936078e31c71c4665d34a4b816b8004", + "nonce" : "0x75", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0x9740421ff0ff3ae3", + "code" : "0x", + "nonce" : "0x1d", + "storage" : { + } + }, + "6d6e40885310545835a5b582dbc23ef026404bda" : { + "//comment" : "Consider coinbase as touched account with 0 reward", + "balance" : "0x00", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xc1142f2b8e8eb058", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + } + } + }, { "indexes" : { "data" : -1, diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest347Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest347Filler.json index 885cab013..3bb430a95 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest347Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest347Filler.json @@ -9,13 +9,52 @@ "previousHash" : "f3907ec3d962d22b61d2618054c8252a7fe67b65f652a7b8fcc55cfe905a1caa" }, "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Homestead"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x33498455", + "code" : "0x64d552603c577e9a3805d8c55157a82b7660ef2a049cfbf79c15fa8e3261f121d213590fa3917d7d442a5e8734af2aaa4c859b452eed7860c2f7e051580427b6c3cc6d7fee617a0d64ef63e192256de5d2ea2689decfd971c7478effb06aa9e792747ce0492abde8c2f270e93d5ed0b213fed7ae59294537d4864c0e68bbe30ec5d1e6b854027862cfcbea15e8367dfaa080ee0da2b0d2ca892f5a764354370466ccddd03115ec8a7ad2e6c62c29425a45ec842fb74c369fb15a42e4b4e48b3eb70be2a0847469987980e6eaa539365a491d2366334f78f03acb177809e7525add39a234d3d2ef1cf8544a52389411ef846d3cd7f36d0d1db7f414860020171f07598cfb620e15a9681c843d60aee9fb8a4e7e37713afbf6ef9d1667513975c76f26ac35ce209b1e0a3bb7c19821368931537b4095ea42b32baf1ba596b9af5cce961ae705f8c9c5465e349633529871f64351169e7fe48ccbb866952fabbfcf40df723c564e109dbd4c9c15ee9ad625e96a5765f6f56ee0601677961da7ebad5f583f6eb6da7c8348425fe784f532f288963ccdbf9de3ac3ebc38b75a806b40e51b895c662d0bcab255a04b723f1e500517d17eb720e02f445cb046bd0fe7d2759438c79aa2dfcaef1cf57e4eb9c832f7ef449a9c32f673728f4b0dccdfa8fb1d447e2f681076ac51a98f76600a66b4692ca7e1e9c89f64cdf879cb0c625514977ebca28f2ec8bb3a092bd0c30849558fe16a4b7070cb05aec329c0286c26fff57795ce4ac7601160ea2d6656c8f2a554b43e263cc3a60e9fd0a26c0a5f7202f02888a731e84ab326610c77771f85025eb8c552943d2da5de48786015f5b8b5921d26c1e277d5a4cda5f1f77ec5f3a83e6ed6821ff025370e2fad05a0f364f58f3705c8761904d63e0f2e5bdbe2b0b1ddf82bb441c547634e8c1864737333e845ffa373c102303f727bfa14f4c445711f6f9695c36f3627df02a1fe2d7eca55faed6984000ab2a99545148bbe7369a47367bc24256acd6a3a22d5fb32434b1998297ae6b2edf08b72dc4598aa600e16707699a84e55ef611ea0e6da482f6c6e9d05d54bbb4ad06cd62622e469fbcd3e637a8f0d2ac9149b7076cce991cb5d4b4de1229e3decbcf46a3c7e46aa1fdc218d936e56f55b5a38bbd798361040e1badb1ab06adc38a723badfa07a95f78553de4df879855274a1904a31276d7938818021e69d8f5b9279478808a236deefd761df6bc151fded80bbe4ba725e7db7b9fc507f0b8121a009384c7bc4443747bd1ac9dc7682b32bec0937c7fb27ba3926acd0d67b41ba6c951788f1bb1b1168229d15cafdc63209c95df646566024013d766a01d6b8051c357243c9f464f423a2ae8efa4f9efd95777099eac9b0825d18018a5afcb6cecd9ab9a9655ae262db08a271d8adedbc3e7eb6acfd2d576ec297c09c4bd47a80dacd2b123e4e4e6232ef6d70acb10f2f44a62bbcef65a72576506ea119b051880b515f4414920badcd6f726c04e821516f6123c9c52f29e19bfe0fb10fab76536535cc0e01115c83369d4083db2d669654c2fe8c00e37bd78f663a2ce2425d2ce358e213d6c601208bb644fa656678de7633147fbd152c2ae682dec269245f07ba3c79f4e6e1978d40f42a494d44eba128b9d0228d637900cbab73455423156417fae331d26494d1ed4d06ecf206736f04292d5470d5091c48a80ba737372c35729c829af30db3625785ba0b3cfc4240d002276760f2770ead609b52db934a53063ec1c05488188fb37ce61059909b6c975c0e9401ef3b71b6d0ddae39867f3f0878bd172851a98a233fcafae289fc634c36c8b3064926d92deda3d8c5074d6a56daa511e7e693aab3d4347cebdd5b63238acdeedc3d8eb8f69ea18cb429ee8f09c26845507ba28eba916c74fd62cd9e587a8f013122d93579b6b7da091527251a4b70051be4f0f96f61e5dc4ab713c473174c7e2ebb463615b03c4787b74e8c204975399439fa553838f186ae028a47f3ccd46c5fcc46c11a36219f3ba1d34def7bee989fa61e60a2abd3652df9f8e5a1b53d9608e3bb04f5e852333d9c7d761836ef5761178bd07fde9a0ded16e1659a6c80281c259ce42e3fdbe23664ce783b58d595", + "nonce" : "0xe9", + "storage" : { + } + }, + "a7f7c8ef9bbbcfb0f7e81c1fd46bb732fba60592" : { + "//comment" : "touched account", + "balance" : "0x00", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0x4ea91708", + "code" : "0x36", + "nonce" : "0x59", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x24d289465fa51769", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + } + } + }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : [">=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x33498455", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json index 083e3ae4f..d759f0974 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json @@ -47,13 +47,35 @@ "gas" : 1, "value" : -1 }, - "network" : ["Homestead", "EIP158", "EIP150"], + "network" : ["EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "shouldnotexist" : "1" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : ["Homestead", "EIP150"], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" } } }, diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json index 58fc63354..049b91b11 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json @@ -50,14 +50,36 @@ "gas" : 1, "value" : -1 }, - "network" : ["Homestead", "EIP158", "EIP150"], + "network" : ["EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "shouldnotexist" : "1" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0" - } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : ["Homestead", "EIP150"], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } } }, { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json index be690d4d3..19c2131b5 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json @@ -20,6 +20,11 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1999999999999989498", "nonce" : "1" + }, + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0", + "code" : "", + "//comment" : "Coinbase is being touched after transaction execution" } } }, @@ -29,11 +34,14 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : [">=EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1999999999999986998", "nonce" : "1" + }, + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json index e18100db2..70fa987cc 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "132000", "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "132000", + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json index 2650602c6..541c51797 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "100000", "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json index ec9a841d1..8717d7a46 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935", "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935", + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json index c90e79fda..7f7090d5c 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "400", "nonce" : "0" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "400", + "nonce" : "0" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json index d8cdc0213..786a0ed1b 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "400", "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "400", + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json index ecedb6efb..5b238a719 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json @@ -24,7 +24,10 @@ "balance" : "1010" }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + "balance" : "0", + "nonce" : "0", + "code" : "", + "storage" : {} } } }, @@ -34,7 +37,7 @@ "gas" : 1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : [">=EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json index 1dfda2ea5..9e1a18c69 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json @@ -15,10 +15,29 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json index 763c18fcb..dc006e8c8 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json @@ -15,10 +15,29 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "10" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "10" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json index d6ce4ecc1..a6961ee20 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json @@ -15,10 +15,29 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "22000" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "22000" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json index f406cca9d..4a8a9f74d 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json @@ -15,11 +15,31 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "33000", "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "33000", + "nonce" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfterFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfterFiller.json index c2f0edd24..8a5e1444b 100644 --- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfterFiller.json +++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfterFiller.json @@ -33,7 +33,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP150", ">=EIP158"], + "network" : ["Homestead", "EIP150"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a7640000", @@ -41,6 +41,29 @@ "nonce" : "0x00", "storage" : { } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAtFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAtFiller.json index c8b5b3233..8883e5e78 100644 --- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAtFiller.json +++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAtFiller.json @@ -33,10 +33,29 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP150", ">=EIP158"], + "network" : ["Homestead", "EIP150"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBeforeFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBeforeFiller.json index 834aa0b43..f03699cff 100644 --- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBeforeFiller.json +++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBeforeFiller.json @@ -33,10 +33,29 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP150", ">=EIP158"], + "network" : ["Homestead", "EIP150"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json index 269a6e178..27bd88538 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json @@ -1,5 +1,8 @@ { "ecmul_0-3_5616_28000_96": { + "_info" : { + "comment" : "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" + }, "env": { "currentCoinbase": "0x3535353535353535353535353535353535353535", "currentDifficulty": "0x020000", @@ -60,7 +63,7 @@ "code": "0x" }, "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "balance" : "0", + "balance" : "150000", "storage": {}, "nonce": "173", "code": "0x" @@ -148,10 +151,29 @@ ] }, "expect": [ + { + "indexes": { + "data": 0, + "gas": [3], + "value": 0 + }, + "network": [ + ">=Byzantium" + ], + "result": { + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { + "nonce": "173", + "balance": "150000" + }, + "3535353535353535353535353535353535353535": { + "shouldnotexist": "1" + } + } + }, { "indexes": { "data": 0, - "gas": -1, + "gas": [0,1,2], "value": 0 }, "network": [ @@ -210,6 +232,7 @@ }, "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { "storage": {}, + "nonce": "174", "code": "0x" }, "0000000000000000000000000000000000000006": { @@ -248,11 +271,6 @@ "balance": "1000000000000000000", "code": "0x" }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, "0000000000000000000000000000000000000002": { "storage": {}, "nonce": "0", @@ -279,7 +297,6 @@ } } } - ], - "explanation": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" + ] } } |