diff options
190 files changed, 4645 insertions, 406 deletions
diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json index de436634d..4fca5fbac 100644 --- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json +++ b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json @@ -28,12 +28,25 @@ "gas" : 0, "value" : 0 }, - "network" : ["Homestead", "EIP158", ">=Byzantium"], + "network" : ["Homestead", "EIP158", "Byzantium"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "shouldnotexist": "1" } } + }, + { + "indexes" : { + "data" : [115], + "gas" : 0, + "value" : 0 + }, + "network" : [">=Constantinople"], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "99999" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json index 72fc7b9a7..6ee7e0c82 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json @@ -38,7 +38,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -62,6 +62,33 @@ "balance" : "568190" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x01" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575592" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json index e0617f7e4..c75d51f0f 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json @@ -38,7 +38,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -62,6 +62,33 @@ "balance" : "568190" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x01" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575592" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json index b5e3bbaad..81427e87b 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json @@ -38,7 +38,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -62,6 +62,33 @@ "balance" : "568190" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575592" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json index 87ea71d10..00ec6413e 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json @@ -38,7 +38,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -62,6 +62,33 @@ "balance" : "568190" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575592" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json index dbfa61441..ba348caa5 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcall_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "CALLCODE -> CALL1 -> CALL2 -> CALL1 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -38,7 +41,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -62,6 +65,33 @@ "balance" : "568190" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x01" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575592" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json index c2dd9ba13..6d8a4382d 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json @@ -38,7 +38,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -62,6 +62,33 @@ "balance" : "568190" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x01" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575592" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json index e09c04a98..e394e793b 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json @@ -38,7 +38,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -62,6 +62,34 @@ "balance" : "568190" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575592" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json index c52f3d838..b14449846 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcodecallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "CALLCODE -> CALLCODE2 -> CALLCODE3 -> CALLCODE2 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -38,7 +41,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -62,6 +65,34 @@ "balance" : "568190" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575592" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json index 70451ccfc..76d386642 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json @@ -10,7 +10,7 @@ }, "expect" : [ { - "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "indexes" : { "data" : -1, "gas" : 0, "value" : -1 }, "network" : ["Frontier"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -23,8 +23,21 @@ } }, { - "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium" ], + "indexes" : { "data" : -1, "gas" : 0, "value" : -1 }, + "network" : ["Byzantium" ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x85", + "0x01" : "0x01", + "0x02" : "0x020789" + } + } + } + }, + { + "indexes" : { "data" : -1, "gas" : 1, "value" : -1 }, + "network" : [">=Constantinople" ], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -64,7 +77,7 @@ "" ], "gasLimit" : [ - "15720826" + "15720826", "11220826" ], "gasPrice" : "1", "nonce" : "", diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json index 4f3ad1e73..11940319b 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json @@ -24,7 +24,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium" ], + "network" : ["Byzantium" ], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -35,6 +35,20 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople" ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x0401", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json index fdd6bb2f0..13842837a 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json @@ -24,7 +24,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium" ], + "network" : ["Byzantium" ], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -34,6 +34,19 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople" ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x9b", + "0x01" : "0x01", + "0x02" : "0x025d79" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json index bb67d9af3..86b790b4b 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json @@ -10,7 +10,7 @@ }, "expect" : [ { - "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "indexes" : { "data" : -1, "gas" : 0, "value" : -1 }, "network" : ["Frontier"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -22,8 +22,20 @@ } }, { - "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium" ], + "indexes" : { "data" : -1, "gas" : 0, "value" : -1 }, + "network" : ["Byzantium" ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x00", + "0x02" : "0x00" + } + } + } + }, + { + "indexes" : { "data" : -1, "gas" : 1, "value" : -1 }, + "network" : [">=Constantinople" ], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -62,7 +74,7 @@ "" ], "gasLimit" : [ - "166262" + "166262", "156262" ], "gasPrice" : "1", "nonce" : "", diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json index a1ec7c300..664ccff49 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json @@ -24,7 +24,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [ ">=Byzantium" ], + "network" : [ "Byzantium" ], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -34,6 +34,19 @@ "balance" : "33424" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [ ">=Constantinople" ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "28624" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json index c5335d4b9..99b16dcc8 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcallcallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "CALLCODE -> CALLCODE1 -> DELEGATECALL2 -> CALLCODE1 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -77,7 +80,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -101,6 +104,35 @@ "balance" : "568187" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json index 8b53ac4d3..3d1100005 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcallcodecall_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "CALLCODE -> DELEGATECALL -> CALLCODE2 -> DELEGATECALL -> CALLCODE2 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -77,7 +80,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -101,6 +104,35 @@ "balance" : "568187" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json index 065076b77..8c8d7da73 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcallcodecallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "CALLCODE -> DELEGATECALL1 -> DELEGATECALL2 -> DELEGATECALL1 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -77,7 +80,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -101,6 +104,35 @@ "balance" : "568184" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json index dfdbf1d9e..43951c45f 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcall_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "DELEGATE -> CALLCODE1 -> CALLCODE2 -> CALLCODE1 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -87,7 +90,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -116,6 +119,43 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "575589" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json index b067cb4e9..a1b4b5885 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "DELEGATECALL -> CALLCODE -> DELEGATECALL2 -> CALLCODE -> DELEGATECALL2 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -87,7 +90,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -116,6 +119,40 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json index b2426c2b9..8bc323f8f 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcodecall_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "DELEGATECALL -> DELEGATECALL2 -> CALLCODE -> DELEGATECALL2 -> .." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -87,7 +90,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -116,6 +119,40 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json index 86cb0b8f8..5faa65501 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcodecallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "DELEGATECALL -> DELEGATECALL1 -> DELEGATECALL2 -> DELEGATECAL1 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -87,7 +90,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -116,6 +119,40 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json index 28479066d..cc36a578e 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcallcallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "CALL -> CALL2 -> DELEGATECALL -> CALL2 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -46,7 +49,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -70,6 +73,34 @@ "balance" : "568187" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json index ec795ec68..62d37ee15 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcallcodecall_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "CALL -> DELEGATECALL -> CALL2 -> DELEGATECALL -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -46,7 +49,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -70,6 +73,34 @@ "balance" : "568187" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json index 978a769a0..aa37a207f 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcallcodecallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "" + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -46,7 +49,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -70,6 +73,34 @@ "balance" : "568184" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json index ff2eaf7ce..9577c73aa 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcall_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "DELEGATECALL -> CALL1 -> CALL2 -> CALL1 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -51,7 +54,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -80,6 +83,39 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x01" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json index 562d42589..0d73f5298 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "DELEGATECALL -> CALL -> DELEGATECALL2 -> CALL -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -51,7 +54,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -80,6 +83,39 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x01" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json index fc9e5b940..a653c259c 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcodecall_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "DELEGATECALL -> DELEGATECALL2 -> CALL -> DELEGATECALL2 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -51,7 +54,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -80,6 +83,40 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json index 97f534b28..45eddde47 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json @@ -1,5 +1,8 @@ { "callcodecallcodecallcode_ABCB_RECURSIVE" : { + "_info" : { + "comment" : "DELEGATECALL -> DELEGATECALL2 -> DELEGATECALl3 -> DELEGATECALL2 -> ..." + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -51,7 +54,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -80,6 +83,40 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json index a0f4e9728..9a678b788 100644 --- a/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json +++ b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=Byzantium"], + "network" : ["EIP150", "Byzantium"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -33,6 +33,24 @@ "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x0401", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["Homestead"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stCreate2/RevertInCreateInInitFiller.json b/src/GeneralStateTestsFiller/stCreate2/RevertInCreateInInitFiller.json deleted file mode 100644 index 509723405..000000000 --- a/src/GeneralStateTestsFiller/stCreate2/RevertInCreateInInitFiller.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "RevertInCreateInInit" : { - "_info" : { - "comment" : "RevertInCreateInInit for CREATE2" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0a00000000", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "expect" : [ - { "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [">=Constantinople"], - "result" : { - "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "storage" : { - "0x00" : "0x20", - "0x01" : "0x112233" - } - } - } - } - ], - "pre" : { - "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "balance" : "0", - "code" : "", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x01" - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x6400000000", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "{ (seq (address) (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0) 0) (SSTORE 0 (RETURNDATASIZE)) (returndatacopy 0 0 32) (sstore 1 (mload 0)) ) }" - ], - "gasLimit" : [ - "0x0a00000000" - ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "", - "value" : [ - "0x00" - ] - } - } -} diff --git a/src/GeneralStateTestsFiller/stCreate2/RevertOpcodeInCreateReturnsFiller.json b/src/GeneralStateTestsFiller/stCreate2/RevertOpcodeInCreateReturnsFiller.json deleted file mode 100644 index 85a15e254..000000000 --- a/src/GeneralStateTestsFiller/stCreate2/RevertOpcodeInCreateReturnsFiller.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "RevertOpcodeInCreateReturns" : { - "_info" : { - "comment" : "RevertOpcodeInCreateReturns for CREATE2" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0a00000000", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "expect" : [ - { "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [">=Constantinople"], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x20" - } - } - } - } - ], - "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x00", - "code" : "{ (seq (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0) 0) (SSTORE 0 (RETURNDATASIZE)) )}", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x01" - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x6400000000", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "" - ], - "gasLimit" : [ - "0x0a00000000" - ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "value" : [ - "0x00" - ] - } - } -} diff --git a/src/GeneralStateTestsFiller/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json b/src/GeneralStateTestsFiller/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json index b68e09125..6d62085e0 100644 --- a/src/GeneralStateTestsFiller/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json +++ b/src/GeneralStateTestsFiller/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json @@ -50,7 +50,7 @@ }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0x20) (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)) 0) 0) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0x20) (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0) 0) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json b/src/GeneralStateTestsFiller/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json index 5ede8fe2d..19719fdba 100644 --- a/src/GeneralStateTestsFiller/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json +++ b/src/GeneralStateTestsFiller/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json @@ -32,7 +32,7 @@ }, "network" : [">=Constantinople"], "result" : { - "5355afe749918b112bf6385abc4525f74c7c6c60" : { + "69c6738cb9ceec5b62ae47911b782e1af0b80a3c" : { "code" : "0x0000000000000000000000000000000000000000000000000000000000112233" }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -45,15 +45,15 @@ ], "pre" : { "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x00", - "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }", + "balance" : "0x00", + "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32) (STOP) ) }", "nonce" : "0x00", "storage" : { } }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)) 0) 0) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0) 0) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stCreate2/create2callPrecompilesFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2callPrecompilesFiller.json index a10ebd090..a9ab3cba8 100644 --- a/src/GeneralStateTestsFiller/stCreate2/create2callPrecompilesFiller.json +++ b/src/GeneralStateTestsFiller/stCreate2/create2callPrecompilesFiller.json @@ -23,7 +23,7 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" }, - "bf9998f0939b248f69a518dce4934ab1a86a31d3" : { + "f6e611c2fa0bc0325fa594bd321deb6326be2bbc" : { "storage" : { "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "0x01" : "0x01", @@ -43,7 +43,7 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" }, - "9c06286277651156d55c61e5cc2b3d1ad90e3a46" : { + "131ad76e70b036560ac81e281565a4d1e377be19" : { "storage" : { "0x00" : "0xcb39b3bde22925b2f931111130c774761d8895e0e08437c9b396c1e97d10f34d", "0x02" : "0x01" @@ -62,7 +62,7 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" }, - "9570ffa061841f4bda1956f7917da64403416207" : { + "603ccd7a4f8c0786903b5b6f6bd420273856f732" : { "storage" : { "0x00" : "0x9c1185a5c5e9fc54612808977ee8f548b2258d31", "0x02" : "0x01" @@ -81,7 +81,7 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" }, - "5ae48e644ae2492763d3823aed8ae0e97170579a" : { + "f90e50475342b85f48883b854ab635fabc5e1b6a" : { "storage" : { "0x00" : "0xf34578907f", "0x02" : "0x01" @@ -100,7 +100,7 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" }, - "fac8686b4109f50513df031ec5abda59a0854ee0" : { + "20a4a3d701e72f4bfaa31be00c5fc476c11b768f" : { "storage" : { "0x01" : "0x01", "0x02" : "0x162ead82cadefaeaf6e9283248fdf2f2845f6396f6f17c4d5a39f820b6f6b5f9" @@ -119,7 +119,7 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" }, - "1b2dbc94a4e3133ece76551789cc87653a16c275" : { + "4485e4bc412b3cbbf5d9750b8a3bac4e4e6b5c9b" : { "storage" : { "0x00" : "0x01", "0x02" : "0x00" @@ -138,7 +138,7 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" }, - "67a30f33af12014ba8cba40e0c6ff01c87595fef" : { + "a624596889b46d57b5b5bd524ec01bb86e9fd627" : { "storage" : { "0x00" : "0x01", "0x01" : "0x1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49", @@ -158,7 +158,7 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" }, - "eb2f39936de0b822aace8898ccfac1cbe7690b71" : { + "63db1a77a0a950783651aed20cdda3cb29071773" : { "storage" : { "0x00" : "0x01", "0x01" : "0x01", @@ -209,14 +209,14 @@ "7 - call ecmul" ], "data" : [ - "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) ) 0) 0) }", - "{ (CREATE2 0 0 (lll (seq (MSTORE 5 0xf34578907f) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0) ) 0) 0) }", - "{ (CREATE2 0 0 (lll (seq [[ 2 ]] (CALL 600 3 0 0 0 0 32) [[ 0 ]] (MLOAD 0) ) 0) 0) }", - "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 500 4 0 0 37 0 32) [[ 0 ]] (MLOAD 0) ) 0) 0) }", - "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000001) (MSTORE 32 0x0000000000000000000000000000000000000000000000000000000000000020) (MSTORE 64 0x0000000000000000000000000000000000000000000000000000000000000020) (MSTORE 96 0x03fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc) (MSTORE 128 0x2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc) (MSTORE 150 0x2f00000000000000000000000000000000000000000000000000000000000000)[[ 1 ]] (CALLCODE (GAS) 5 0 0 151 1000 32) [[ 2 ]](MLOAD 1000) ) 0) 0) }", - "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000001) [[ 2 ]](CALL 600000 6 0 0 256 0 32) [[ 0 ]] (MLOAD 0) ) 0) 0) }", - "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2) (MSTORE 32 0x16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba) (MSTORE 64 0x1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc286) (MSTORE 96 0x0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4) (CALLCODE 500000 0xaddf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 128 0 0)) 0) 0) }", - "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc286) (MSTORE 32 0x0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4) (MSTORE 64 0x0000000000000000000000000000000000000000000000000000000000000000) (MSTORE 96 0x0000000000000000000000000000000000000000000000000000000000000000) (MSTORE 128 0x1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc286) (MSTORE 160 0x0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4 ) (MSTORE 192 0x0000000000000000000000000000000000000000000000000000000000000001) (CALLCODE 500000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 224 0 0) ) 0) 0) }" + "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) (STOP) ) 0) 0) (STOP) }", + "{ (CREATE2 0 0 (lll (seq (MSTORE 5 0xf34578907f) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0) (STOP) ) 0) 0) (STOP) }", + "{ (CREATE2 0 0 (lll (seq [[ 2 ]] (CALL 600 3 0 0 0 0 32) [[ 0 ]] (MLOAD 0) (STOP) ) 0) 0) (STOP) }", + "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 500 4 0 0 37 0 32) [[ 0 ]] (MLOAD 0) (STOP) ) 0) 0) (STOP) }", + "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000001) (MSTORE 32 0x0000000000000000000000000000000000000000000000000000000000000020) (MSTORE 64 0x0000000000000000000000000000000000000000000000000000000000000020) (MSTORE 96 0x03fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc) (MSTORE 128 0x2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc) (MSTORE 150 0x2f00000000000000000000000000000000000000000000000000000000000000)[[ 1 ]] (CALLCODE (GAS) 5 0 0 151 1000 32) [[ 2 ]](MLOAD 1000) (STOP) ) 0) 0) (STOP) }", + "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000001) [[ 2 ]](CALL 600000 6 0 0 256 0 32) [[ 0 ]] (MLOAD 0) (STOP) ) 0) 0) (STOP) }", + "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2) (MSTORE 32 0x16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba) (MSTORE 64 0x1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc286) (MSTORE 96 0x0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4) (CALLCODE 500000 0xaddf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 128 0 0) (STOP) ) 0) 0) (STOP) }", + "{ (CREATE2 0 0 (lll (seq (MSTORE 0 0x1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc286) (MSTORE 32 0x0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4) (MSTORE 64 0x0000000000000000000000000000000000000000000000000000000000000000) (MSTORE 96 0x0000000000000000000000000000000000000000000000000000000000000000) (MSTORE 128 0x1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc286) (MSTORE 160 0x0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4 ) (MSTORE 192 0x0000000000000000000000000000000000000000000000000000000000000001) (CALLCODE 500000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 224 0 0) (STOP) ) 0) 0) (STOP) }" ], "gasLimit" : [ "15000000" diff --git a/src/GeneralStateTestsFiller/stCreate2/create2checkFieldsInInitcodeFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2checkFieldsInInitcodeFiller.json index 21bf14b61..f58671543 100644 --- a/src/GeneralStateTestsFiller/stCreate2/create2checkFieldsInInitcodeFiller.json +++ b/src/GeneralStateTestsFiller/stCreate2/create2checkFieldsInInitcodeFiller.json @@ -20,17 +20,17 @@ }, "network" : [">=Constantinople"], "result" : { - "8c2950f075c34756bfa06b21b13ce910113e5958" : { + "4d714d3c738b11337521200e35d1c452a087976f" : { "balance" : "0", "nonce" : "1", "storage" : { - "0x00" : "0x8c2950f075c34756bfa06b21b13ce910113e5958", + "0x00" : "0x4d714d3c738b11337521200e35d1c452a087976f", "0x01" : "0", "0x02" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "0x03" : "0xf000000000000000000000000000000000000000", "0x04" : "0", "0x05" : "0", - "0x06" : "0x21", + "0x06" : "0x22", "0x07" : "1" } }, @@ -47,17 +47,17 @@ }, "network" : [">=Constantinople"], "result" : { - "753d879541ef32dd404b5c296b3f90d5723b22e6" : { + "5a0015b27943d576fce2a4e604787235d79fa372" : { "balance" : "0", "nonce" : "1", "storage" : { - "0x00" : "0x753d879541ef32dd404b5c296b3f90d5723b22e6", + "0x00" : "0x5a0015b27943d576fce2a4e604787235d79fa372", "0x01" : "0", "0x02" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "0x03" : "0x2000000000000000000000000000000000000000", "0x04" : "0", "0x05" : "0", - "0x06" : "0x21", + "0x06" : "0x22", "0x07" : "1" } }, @@ -74,17 +74,17 @@ }, "network" : [">=Constantinople"], "result" : { - "262ddf6ce5b06776eaa045900e933d0be3074c26" : { + "6c530a06b78986396e0973b900c1698133c5877b" : { "balance" : "0", "nonce" : "1", "storage" : { - "0x00" : "0x262ddf6ce5b06776eaa045900e933d0be3074c26", + "0x00" : "0x6c530a06b78986396e0973b900c1698133c5877b", "0x01" : "0", "0x02" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "0x03" : "0x3000000000000000000000000000000000000000", "0x04" : "0", "0x05" : "0", - "0x06" : "0x21", + "0x06" : "0x22", "0x07" : "1" } }, @@ -114,17 +114,17 @@ }, "network" : [">=Constantinople"], "result" : { - "dd216ee8d9ec9d48768efa989e3c599b0327f1ba" : { + "2cda04bff28988e4aea926304671cd73094a2b96" : { "balance" : "0", "nonce" : "1", "storage" : { - "0x00" : "0xdd216ee8d9ec9d48768efa989e3c599b0327f1ba", + "0x00" : "0x2cda04bff28988e4aea926304671cd73094a2b96", "0x01" : "0", "0x02" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "0x03" : "0x1bebe06c0893a047ea4ce821f24668d9034e204f", + "0x03" : "0x851e9c5af287e520b832835c03179dc1d0d37659", "0x04" : "0", "0x05" : "0", - "0x06" : "0x21", + "0x06" : "0x22", "0x07" : "1" } }, @@ -141,17 +141,17 @@ }, "network" : [">=Constantinople"], "result" : { - "ce2c5c4667c2e59af5767b677a65e31fa14f62ad" : { + "14aebdf3e37234440836b67935de2edcf1c0f9a3" : { "balance" : "0", "nonce" : "1", "storage" : { - "0x00" : "0xce2c5c4667c2e59af5767b677a65e31fa14f62ad", + "0x00" : "0x14aebdf3e37234440836b67935de2edcf1c0f9a3", "0x01" : "0", "0x02" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "0x03" : "0xab166837a8bc12757f73555d296f726df214cd4c", + "0x03" : "0x3f02b295091b2926702cfebaacc2a689c51108f4", "0x04" : "0", "0x05" : "0", - "0x06" : "0x21", + "0x06" : "0x22", "0x07" : "1" } }, @@ -185,7 +185,7 @@ }, "1100000000000000000000000000000000000000" : { "balance" : "0x00", - "code" : "{ (CREATE2 0 0 (lll (seq (CALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0)) 0) 0) }", + "code" : "{ (CREATE2 0 0 (lll (seq (CALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) 0) 0) (STOP) }", "nonce" : "0", "storage" : { } @@ -199,21 +199,21 @@ }, "2200000000000000000000000000000000000000" : { "balance" : "0x00", - "code" : "{ (CREATE2 0 0 (lll (seq (CALLCODE (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) ) 0) 0) }", + "code" : "{ (CREATE2 0 0 (lll (seq (CALLCODE (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) 0) 0) (STOP) }", "nonce" : "0", "storage" : { } }, "3000000000000000000000000000000000000000" : { "balance" : "0x00", - "code" : "{ (DELEGATECALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0) }", + "code" : "{ (DELEGATECALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0) (STOP) }", "nonce" : "0", "storage" : { } }, "3300000000000000000000000000000000000000" : { "balance" : "0x00", - "code" : "{ (CREATE2 0 0 (lll (seq (DELEGATECALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0) ) 0) 0) }", + "code" : "{ (CREATE2 0 0 (lll (seq (DELEGATECALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0) (STOP) ) 0) 0) (STOP) }", "nonce" : "0", "storage" : { } @@ -227,21 +227,21 @@ }, "4400000000000000000000000000000000000000" : { "balance" : "0x00", - "code" : "{ (CREATE2 0 0 (lll (seq (STATICCALL (GAS) 0xf200000000000000000000000000000000000000 0 0 0 256) [[10]] (MLOAD 0) ) 0) 0 ) }", + "code" : "{ (CREATE2 0 0 (lll (seq (STATICCALL (GAS) 0xf200000000000000000000000000000000000000 0 0 0 256) [[10]] (MLOAD 0) (STOP) ) 0) 0 ) }", "nonce" : "0", "storage" : { } }, "f000000000000000000000000000000000000000" : { "balance" : "0x00", - "code" : "{ (CREATE2 0 0 (lll (seq [[0]] (ADDRESS) [[1]] (BALANCE (ADDRESS)) [[2]] (ORIGIN) [[3]] (CALLER) [[4]] (CALLVALUE) [[5]] (CALLDATASIZE) [[6]] (CODESIZE) [[7]] (GASPRICE) ) 0) 0) }", + "code" : "{ (CREATE2 0 0 (lll (seq [[0]] (ADDRESS) [[1]] (BALANCE (ADDRESS)) [[2]] (ORIGIN) [[3]] (CALLER) [[4]] (CALLVALUE) [[5]] (CALLDATASIZE) [[6]] (CODESIZE) [[7]] (GASPRICE) (STOP) ) 0) 0) (STOP) }", "nonce" : "0", "storage" : { } }, "f200000000000000000000000000000000000000" : { "balance" : "0x00", - "code" : "{ (CREATE2 0 0 (lll (seq [0] (ADDRESS) [32] (BALANCE (ADDRESS)) [64] (ORIGIN) [96] (CALLER) [128] (CALLVALUE) [160] (CALLDATASIZE) [192] (CODESIZE) [224] (GASPRICE) (RETURN 0 256) ) 0) 0) }", + "code" : "{ (CREATE2 0 0 (lll (seq [0] (ADDRESS) [32] (BALANCE (ADDRESS)) [64] (ORIGIN) [96] (CALLER) [128] (CALLVALUE) [160] (CALLDATASIZE) [192] (CODESIZE) [224] (GASPRICE) (RETURN 0 256) (STOP) ) 0) 0) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCreate2/returndatacopy_0_0_following_successful_createFiller.json b/src/GeneralStateTestsFiller/stCreate2/returndatacopy_0_0_following_successful_createFiller.json index 423fd56fa..38bf7109d 100644 --- a/src/GeneralStateTestsFiller/stCreate2/returndatacopy_0_0_following_successful_createFiller.json +++ b/src/GeneralStateTestsFiller/stCreate2/returndatacopy_0_0_following_successful_createFiller.json @@ -22,7 +22,7 @@ "0x00" : "0x00" } }, - "bd70f8d180fa7825cf80ec820740e80187f35db5" : { + "3eb9a86e9b126201a06aeeb36cc22ffdf4383672" : { "storage" : { "0x00" : "0x01" } @@ -33,7 +33,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (create2 0 0 (lll {(SSTORE 0 1)} 0) 0) (RETURNDATACOPY 0 0 0) (SSTORE 0 0) }", + "code" : "{ (create2 0 0 (lll (seq (SSTORE 0 1) (STOP) ) 0) 0) (RETURNDATACOPY 0 0 0) (SSTORE 0 0) (STOP) }", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stCreate2/returndatacopy_following_revert_in_createFiller.json b/src/GeneralStateTestsFiller/stCreate2/returndatacopy_following_revert_in_createFiller.json index af4eeb86e..dbd950aad 100644 --- a/src/GeneralStateTestsFiller/stCreate2/returndatacopy_following_revert_in_createFiller.json +++ b/src/GeneralStateTestsFiller/stCreate2/returndatacopy_following_revert_in_createFiller.json @@ -30,7 +30,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (REVERT 0 32)) 0) 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}", + "code" : "{ (seq (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (REVERT 0 32) (STOP) ) 0) 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stCreate2/returndatasize_following_successful_createFiller.json b/src/GeneralStateTestsFiller/stCreate2/returndatasize_following_successful_createFiller.json index 01ba68639..178f09875 100644 --- a/src/GeneralStateTestsFiller/stCreate2/returndatasize_following_successful_createFiller.json +++ b/src/GeneralStateTestsFiller/stCreate2/returndatasize_following_successful_createFiller.json @@ -31,7 +31,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)) 0) 0) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "{ (seq (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)) 0) 0) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json index 16a981211..510606cdd 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json @@ -120,7 +120,7 @@ "gas" : 0, "value" : -1 }, - "network" : ["EIP158", ">=Byzantium"], + "network" : ["EIP158", "Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" @@ -141,11 +141,36 @@ }, { "indexes" : { + "data" : 1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + }, + "2000000000000000000000000000000000000000" : { + "nonce" : "1", + "storage" : { + "0x01" : "0x00" + } + }, + "0bf4c804e0579073baf54ec4ec37cd04f3455c65" : { + "nonce" : "2", + "code" : "", + "storage" : { + } + } + } + }, + { + "indexes" : { "data" : 2, "gas" : 0, "value" : -1 }, - "network" : ["EIP158", ">=Byzantium"], + "network" : ["EIP158", "Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1" @@ -163,6 +188,31 @@ } } } + }, + { + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + }, + "3000000000000000000000000000000000000000" : { + "nonce" : "1", + "storage" : { + "0x01" : "0x00" + } + }, + "4b86c4ed99b87f0f396bc0c76885453c343916ed" : { + "nonce" : "0", + "code" : "0x1122334455", + "storage" : { + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json index 4825cd7f9..c847c5d71 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json @@ -32,7 +32,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -42,6 +42,23 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x9b", + "0x01" : "0x01", + "0x02" : "0x025d79" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json index 961ce032c..24620062d 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json @@ -32,7 +32,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -43,6 +43,24 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x0401", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json index 382e58ed4..11d40df81 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json @@ -12,10 +12,10 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 0, "value" : -1 }, - "network" : ["Frontier", ">=Byzantium"], + "network" : ["Frontier", "Byzantium"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -28,7 +28,7 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 0, "value" : -1 }, "network" : ["Homestead"], @@ -40,6 +40,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x00", + "0x02" : "0x00" + } + } + } } ], "pre" : { @@ -70,7 +86,7 @@ "" ], "gasLimit" : [ - "166262" + "166262", "156262" ], "gasPrice" : "1", "nonce" : "", diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json index 1d5d3b191..c123605f8 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json +++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json @@ -32,7 +32,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -42,6 +42,23 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x9b", + "0x01" : "0x01", + "0x02" : "0x025d79" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json index 9d32a597b..81a61eed4 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json @@ -38,7 +38,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -61,6 +61,29 @@ "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x12", + "0x01" : "0x20", + "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000", + "0x03" : "0xe8d49be840", + "0x04" : "0x12", + "0x07" : "0x01", + "0x08" : "0x01", + "0x0a" : "0x06699e", + "0x64" : "0x11" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["Homestead"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json index 5b19922f4..209d8c8a1 100644 --- a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json +++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=EIP158"], + "network" : ["EIP158", "Byzantium"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "//comment" : "https://etherpad.net/p/EIP158", @@ -43,6 +43,34 @@ "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "//comment" : "https://etherpad.net/p/EIP158", + "storage" : { + "0x00" : "0x08d5b6", + "0x02" : "0x088684", + "0x03" : "0x01", + "0x04" : "0x07ea2c", + "0x06" : "0x07999c", + "0x08" : "0x07477c", + "0x0a" : "0x06f23c", + "0x0b" : "0x01", + "0x0c" : "0x0655e4", + "0x0d" : "0x01", + "0x0e" : "0x05b98c", + "0x0f" : "0x01", + "0x64" : "0x051d34" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["EIP150"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json index 922a3f193..48a8dad8e 100644 --- a/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json +++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=EIP158"], + "network" : ["EIP158", "Byzantium"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", @@ -31,6 +31,29 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "nonce" : "0", + "code" : "", + "storage": { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x64" : "0x088407" + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json index 8f0b50897..5f2e056f8 100644 --- a/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json +++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=EIP158"], + "network" : ["EIP158", "Byzantium"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "shouldnotexist" : "1" @@ -27,6 +27,25 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "shouldnotexist" : "1" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x64" : "0x088407" + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json index 24da2545a..52573c67a 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json @@ -55,12 +55,25 @@ "gas" : 1, "value" : -1 }, - "network" : [">Frontier"], + "network" : ["Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "699771" } } + }, + { + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "771771" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json index 5ea9cfb85..870589994 100644 --- a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json +++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json @@ -45,7 +45,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=EIP158"], + "network" : ["EIP158", "Byzantium"], "result" : { "1000000000000000000000000000000000000010": { "balance": "111" @@ -75,6 +75,36 @@ "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000010": { + "balance": "111" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": { + "storage": { + "0x02": "0x1122334455667788991011121314151617181920000000000000000000000000", + "0x03": "0xe8d49be840", + "0x00": "0x12", + "0x01": "0x20", + "0x07": "0x01", + "0x04": "0x12", + "0x08": "0x01", + "0x0a": "0x066971", + "0x64": "0x11" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": { + "nonce": "1", + "balance": "999999800206" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["Frontier"], "result" : { "1000000000000000000000000000000000000010": { diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json index 5f0b1ab42..231fd972d 100644 --- a/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json @@ -46,7 +46,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Homestead"], + "network" : ["Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a764000a", @@ -70,6 +70,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x0de0b6b3a764000a", + "code" : "0x6201000051600155", + "nonce" : "0x00", + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "35556", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "175923205213354", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json index 02f9595c0..a6550c97f 100644 --- a/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json @@ -46,7 +46,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Homestead"], + "network" : ["Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a764000a", @@ -70,6 +70,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x0de0b6b3a764000a", + "code" : "0x61010051600155", + "nonce" : "0x00", + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "21236", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "429496708354", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json index d42baca7c..d9b4c1019 100644 --- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json +++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "EIP158"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "100" @@ -34,6 +34,25 @@ "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x64" : "0x0869c9" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["Frontier", "Homestead"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json index b339aa2b7..2451ebbd9 100644 --- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json +++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "EIP158", "Byzantium"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "100" @@ -34,6 +34,25 @@ "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x64" : "0x0869c9" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["Frontier", "Homestead"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json index e897bc0f0..09e582fa1 100644 --- a/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json +++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json @@ -47,7 +47,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=EIP158"], + "network" : ["EIP158", "Byzantium"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "46066" @@ -56,6 +56,22 @@ "storage" : {} } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "31666" + }, + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : {} + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json index 10465134b..6febd549c 100644 --- a/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json +++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json @@ -41,12 +41,25 @@ "gas" : -1, "value" : -1 }, - "network" : [">=EIP158"], + "network" : ["EIP158", "Byzantium"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "71066" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "56666" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json index b7fdcabba..61a19e7be 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json @@ -67,7 +67,6 @@ } }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "139425287", "code" : "0x", "nonce" : "0x00", "storage" : { diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json index 8a24803df..1488dda5b 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json @@ -69,7 +69,6 @@ } }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "6610454", "code" : "0x", "nonce" : "0x00", "storage" : { diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json index 699b51680..4a03921e2 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json @@ -69,7 +69,6 @@ } }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "3610754", "code" : "0x", "nonce" : "0x00", "storage" : { diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json index d2b9beb9f..1090cb81e 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json @@ -69,7 +69,6 @@ } }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "814104", "code" : "0x", "nonce" : "0x00", "storage" : { diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000ByzantiumFiller.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000ByzantiumFiller.json index 1454e572d..218c7ca8e 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000ByzantiumFiller.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000ByzantiumFiller.json @@ -4784,7 +4784,6 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xfffffffffffffffffffffffffdc95b6a", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -5162,7 +5161,6 @@ } }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0236a48b", "code" : "0x", "nonce" : "0x00", "storage" : { diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json index a6e17f94b..493c7b3ad 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json @@ -15,7 +15,7 @@ "gas" : 1, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead", "Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "code" : "0x", @@ -47,6 +47,43 @@ { "indexes" : { "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x600161c34f35f3", + "nonce" : "0x00", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "49770299", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x5b61c3506080511015603f576000600061c3506000600073aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61061cf16000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0xc350" + } + } + } + }, + { + "indexes" : { + "data" : -1, "gas" : 0, "value" : -1 }, diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json index 1f0817393..140be2f39 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json @@ -15,7 +15,7 @@ "gas" : 1, "value" : -1 }, - "network" : ["Homestead", ">=Byzantium"], + "network" : ["Homestead", "Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "code" : "0x", @@ -47,6 +47,43 @@ { "indexes" : { "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x61c34f356000526001600051f3", + "nonce" : "0x00", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "50370299", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x5b61c3506080511015603f576000600061c3506000600073aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61061cf16000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0xc350" + } + } + } + }, + { + "indexes" : { + "data" : -1, "gas" : 0, "value" : -1 }, diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest138Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest138Filler.json index 513e47481..e24953585 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest138Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest138Filler.json @@ -53,7 +53,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "0000000000000000000000000000000000020000" : { "balance" : "50000", @@ -83,6 +83,43 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "0000000000000000000000000000000000020000" : { + "balance" : "50000", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1998178906", + "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000000000000000000000000000000000000000000001f1595160005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "85707", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest139Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest139Filler.json index 43470def7..ab719ec57 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest139Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest139Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x409ceff3", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x409ceff3", + "code" : "0x33447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff434461334515455560005155", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x020000" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "47415", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998915925764", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest149Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest149Filler.json index d78aac353..2f91dfa26 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest149Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest149Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1968716197", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1968716197", + "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff099055510760005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "42280", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998031241569", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest159Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest159Filler.json index 0e5ee2de8..ea8cca291 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest159Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest159Filler.json @@ -47,7 +47,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x24a7152f", @@ -71,6 +71,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x24a7152f", + "code" : "0x324260e172acf6051580ff4e3ba75da449e7ab2b705cf75873b252caf4b51def86cf4988747e4b77d541c09d316acfebf3871d3a1944a5b975670f11d63a7d9c9b49750a0734d7313f746ba5fba6f3ff04148f4f39e4a28cc271e1ae0b89f2ad1413af2317c6a9628006d4157cdf7a3f30103f20611fe88431b16a79be995278aec271b56bc32543196c650621b66f1bfc718c0d9360cfb17a079aeca76a0b08cb4f0e5789426a6a26c3bef3710be80e4d646135f26076a178e17952f1667fa85f3b72ffa4c95bda9db87e2b8409a9b1c9e27346e5b9a49fd3689f943925eb4618577675acf6bf7b1b665940c32ef9086a95914496bc8bb76245fa2dc9cd3e29618e568966b2893ecd2e84766a8cf184a772e70b3e042b9584601e600b600760136304b1e2f273095e7baea6a6c7c4c2dfeb977efac326af552d876339570738f16df327f570c11aa84a7a5480b98c5175cbd00120239df2d03db2fdd9c233df848ead9d3c84d4556f6030a17e0f41dfce8be36a92b0d5e0d67a71c146187edefc7923a8aad22ca228ecee824c2d7c237ace7e52fd62bd649662a4fe5f78a0b34d84a28c14c9fea0f18d1d55870173546b3b99e17cae467e2f1667b7c9445b11382bf9d7ff632d1ccdc973ba913d9ebbb219ac7aa0f3b579caa81065e433d2b8cf8cbfb998ec52fe1eaea6d87bc7728315cc653ccf904948918741", + "nonce" : "0x00", + "storage" : { + "0xcbd00120239df2d03db2fdd9c233df848ead9d3c84d4" : "0xf327f570c11aa84a7a5480b98c51" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "37473674", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest171Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest171Filler.json index a22d0db38..97e8ef589 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest171Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest171Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1726364132", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1726364132", + "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe095560005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "28434", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998273607480", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest172Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest172Filler.json index 0fcce72b7..24dd92677 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest172Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest172Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "354059144", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "354059144", + "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0960005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "35467", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999645905435", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest190Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest190Filler.json index 66cb02e73..b5fa2187a 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest190Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest190Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "94912880", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "94912880", + "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0960005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "32203", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999905054963", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest194Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest194Filler.json index 7d65f8073..52cf8ff4c 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest194Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest194Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "827862267", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "827862267", + "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b55560005155", + "nonce" : "0", + "storage" : { + "0x00" : "0x01" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "50020", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999172087759", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest230Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest230Filler.json index 9c972c3c2..24fc35e45 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest230Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest230Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "856911811", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "856911811", + "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0960005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "30979", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999143057256", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest275Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest275Filler.json index 6620e41e3..2d7434426 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest275Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest275Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "4157391", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "4157391", + "code" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09656756323c597455", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "29209", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999995813446", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest309Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest309Filler.json index bdcd16c8d..301c38961 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest309Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest309Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000100000", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000100000", + "code" : "0x43454545085a55", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "21332", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999999878714", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest340Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest340Filler.json index 342d7dedf..1d804d495 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest340Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest340Filler.json @@ -46,7 +46,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "39040167", @@ -69,6 +69,36 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "39040167", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "32536", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest346Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest346Filler.json index 73e6ede19..d7adfbfe5 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest346Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest346Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "87977970", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "87977970", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe095560005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "32659", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999911989417", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest350Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest350Filler.json index a2d44ed3e..ad992e187 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest350Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest350Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1634268072", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1634268072", + "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff090860005155", + "nonce" : "0", + "storage" : { + "0x00" : "0x00" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "31702", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998365700272", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest365Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest365Filler.json index 2b205cba7..e1b8a5f8f 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest365Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest365Filler.json @@ -48,7 +48,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1219277154", @@ -73,6 +73,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1219277154", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000143b420785375560005155", + "nonce" : "0", + "storage" : { + "0x00" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5", + "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0x00" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "63647", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest42Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest42Filler.json index 9ae396c6c..db2ecd7e8 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest42Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest42Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x61b9caa3", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x61b9caa3", + "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3505a7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350356436f0f119011a5560005155", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x010000000000000000000000000000000000000000" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "47175", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998360386884", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest57Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest57Filler.json index 07d3a6a60..f2651eb1f 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest57Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest57Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "277972730", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "277972730", + "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000000000000000000000000000000000000000c350819055", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "29192", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999721998124", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest5Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest5Filler.json index 2b67f952e..6c7a9006c 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest5Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest5Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1016957738", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1016957738", + "code" : "0x427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "31626", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998983010682", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest82Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest82Filler.json index d9a348b30..08dccbbd2 100644 --- a/src/GeneralStateTestsFiller/stRandom/randomStatetest82Filler.json +++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest82Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1676520806", @@ -39,6 +39,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1676520806", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000000655", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "32388", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998323446852", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest418Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest418Filler.json index 60008e887..8d712806a 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest418Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest418Filler.json @@ -46,7 +46,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1705540168", @@ -69,6 +69,36 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1705540168", + "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff12a36234970658a03160005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "50583897", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest438Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest438Filler.json index 5931a86a4..6e48cfdd3 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest438Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest438Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1071528892", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1071528892", + "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5560005155", + "nonce" : "0", + "storage" : { + "0x00" : "0xc350" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "52836", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998928418318", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest447Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest447Filler.json index 405f3d84a..c60454e7b 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest447Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest447Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x1569eba8", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x1569eba8", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff085560005155", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x010000000000000000000000000000000000000000" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "53610", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999640683292", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest464Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest464Filler.json index af9af76b5..687c9cb3c 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest464Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest464Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "2396601", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "2396601", + "code" : "0x447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82095560005155", + "nonce" : "0", + "storage" : { + "0xffffffffffffffffffffffffffffffffffffffff" : "0xffffffffffffffffffffffffffffffffffffffff" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "48369", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999997555076", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest472Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest472Filler.json index a83230f36..b4d90c25c 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest472Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest472Filler.json @@ -46,7 +46,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1691421230", @@ -69,6 +69,36 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1691421230", + "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b541437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff090a60005155", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "32279", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest473Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest473Filler.json index 0cd5f4097..74d707fe6 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest473Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest473Filler.json @@ -47,7 +47,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1147652673", @@ -71,6 +71,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1147652673", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff317f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b59102095560005155", + "nonce" : "0", + "storage" : { + "0xffffffffffffffffffffffff6bacfb1469f9a4d5674a85b75f951d72d7a58e4a" : "0xc350" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "52232", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest498Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest498Filler.json index c81cd46a0..01fb6f4e5 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest498Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest498Filler.json @@ -47,7 +47,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x74c15a91", @@ -71,6 +71,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x74c15a91", + "code" : "0x6bd243dbcfdc6982733e4cd6261574fc6cdec93282ff50ef24d8be05d58be29301ddb00d7547f6b65997e73d232b76d6484c11eb15c87b01f89e2779c427711ba193e4e163967efd1b9315187c3227f67b9282fc7524692fbf851cb370d396d53f7a86353aacecc5c1eadeddbb3925522f935fc5ed03568fbf40261c056a124f1334cc9fa8eea2bdbf68f04c10cc08b6babcbb6ee8d3fb88dd42d06d445b5eab34cb5d64408cf652fd7568acaa81b573f66fa8781e83185438e42796631ae9a9987f714d986f94fc6354921a9367bb6b9e555f24107cb814557f8bd87547ad612c3e726f9f495b0ac9e37fbe5f23014c68d8d032bfae779a5213c33778af679417d77733645f87b6042be92c553dbb6d85a2c56b21a53c0e612ae0a8d78d60f162b52efea464ebb0472b3e7794198cdb286cd2f21f06659320130750e7aa2c83ceb2801555785c9f02455252560846587006e90cbffc955445d9ef1f55eeb07011c02cee02df12dc35b36702539873e4b766e4ae9e829a442460dd7f845cd37dc08f93bef98a4d5b53ecd4cf4dd1a5c416f92116160f0fb673c30b7873b85a2ff6331a5d371f3d109f5794d712e03493b17fc562ac7589411127e654ce32d273f8300cc8544e7bd782aa7828b543958dadf872d7f13401a51b13835cc8a36be87cc7347cdf0f7aa2df420bb03e925c117d4befbc7e69472fd75f01f3f6c966de818174aba3b7a43014c3dd39414fb3d239d72e06852ae48e6203c60a7e844d6fd61c5b519d43780d383d103989f9bfce5ed122804cba183c188f5ce47c348a96973eca904f096aed4fb77d40ca9139447527f267a028eae5e3706e1975fc3e38327505e81d0e8c9fab1f60ec7ece71cc87510f308984ebdcb8ab84e1905dfdc0a19ee3c5f37e88dc3a9f26497c51427da28f6d777d9585b4ec790722bacaa179b1dc5b086d945623f9d29f6013600c60096019634f4421eb73095e7baea6a6c7c4c2dfeb977efac326af552d87631ac754faf17506f9cc63229e7fe309b7a2f1acf074a43aa4dd2b75bf6dadf21aadb9a3e239a9592f576c9265eebd2420e2626d2b2f1f7ee7a56725d7d4fe23da45725e8b709d2976703147ef66a8fc9a6c1225df7b79eec95ddda5e91c6e19bbc55baf9d6c440cc805f0d229738d17a76f95e329f94d5bc48cc5964933f9597fb57a6f7290649722d68a72fa2d081c4547943b3bbca2edc5f4032c5c916e585fa6abd1b209e2b6fb64498a37b9796c95da3fdb8013c13ef99ed49b29282ae55458c651fdb8598b527024d2da1e8a7015f65ee4ab0178b68ab8c877d55f3c89a7f1f7bc6c0d86bc69688cbcc252972693993bf766aac4efb2b65b216cca2e721dea3f3b3df3abbbfb7b8d", + "nonce" : "0x00", + "storage" : { + "0x94198cdb286cd2f21f06659320130750e7aa2c83ceb28015" : "0xebb0472b3e" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "716626926", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest539Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest539Filler.json index bab714b05..be80fc4b0 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest539Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest539Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1428708105", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1428708105", + "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff096794200bf18b0b316e415560005155", + "nonce" : "0", + "storage" : { + "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : "0x94200bf18b0b316e" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "50775", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999998571241166", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest541Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest541Filler.json index 413dd91ec..c1b1191a8 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest541Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest541Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "525505301", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "525505301", + "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000004335696e089257368d07897d57350b105560005155", + "nonce" : "0", + "storage" : { + "0x00" : "0x01" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "44963", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999474449782", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest615Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest615Filler.json index dc1bfd2db..4eace9041 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest615Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest615Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium", "Homestead"], + "network" : ["Byzantium", "Homestead"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "2076977514", @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "2076977514", + "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe837f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009556c6f390a3054d7368a9a5560005155", + "nonce" : "0", + "storage" : { + "0xffffffffffffffffffffffff000000000000000000000000ffffffffffffffff" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "52305", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999997922970227", + "code" : "0x", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest636Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest636Filler.json index 7789b2896..cb1d96283 100644 --- a/src/GeneralStateTestsFiller/stRandom2/randomStatetest636Filler.json +++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest636Filler.json @@ -47,7 +47,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x74ff9009", @@ -71,6 +71,37 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x74ff9009", + "code" : "0x74619921c0750ac3268e7a6703ca2bf6c43308e6fc36607561af1ca16db843f7a2e05bfc2e46afc179930b7a8724a04f9f561bdc65bba0ad5797dde0a28d5e8aca56e1510b724f676a6d33dee473d74664561e49e3d86338c8dcf260f06cbfa6283966d2d0f2591f54088e6f36545c0d90fcdea10d5629629ffb1b16626c339f6490829f1b1675f0f2f62b0b7c9d3f070fafd53f99f90f31e19e81d3db688929213e34affc41116e6ae6f54ad5c2062b27a9fbec78a52f7a26c6347408631a6c0efcf33fe576953a4043e846b686471403f38a615a0a8e601d600a600e60146301019a5173095e7baea6a6c7c4c2dfeb977efac326af552d8763314bc0fef1600c7eb69785d3593d3a8552018a4faba5b591975e8b8056ebc01f5ce5f5f7c04eca9062b458a835649be8fbaa906f3c4d8f92f8c27517f0addd45e050bfcf55792d8bf87c39d39ed9b1ef6c8c070d8da4a624ce548b37d03ae8107ca6da49be4adffc9f5ae896c52b936a18bed4bd9fcbae531274706e9e9b9030619a40714bb4b22e7bef8cf7b01551327188ee4bb6247118d0e95549a92f7dd9305484cc054e5f206d70d008699a85896061427b05ae2a7f16230f66ab4dd548e03b0972010f5afff39a4f9a90e55e91584e86629f3e8775f53da16fceedd834103a50dbe72a6634e4dbf374c70e6bd041628dc8b30de3c3d7aa0e7bb48df927c78ed30b286e249c2cbe79fb55956f492e413e771d0cd63f7357ab1e9a38026a4ba9278427812728699a2c747189", + "nonce" : "0x00", + "storage" : { + "0x3c4d8f92f8c27517f0addd45e050bfcf" : "0x9be8fbaa90" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "7892354", + "code" : "0x6000355415600957005b60203560003555", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json index 6d05f5f2e..4b0162f70 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json @@ -59,7 +59,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=EIP158"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", @@ -74,6 +74,28 @@ "balance" : "61515" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", + "storage" : { + "0x0b" : "0x0de0b6b3a7640000" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "36085" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "63915" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json index 7be624f12..1f07c9109 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json @@ -43,7 +43,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000010", @@ -64,6 +64,34 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000010", + "storage" : { + "0x01" : "0x01" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "26929" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "73061", + "nonce" : "1" + }, + "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "storage" : { + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json index ee25ca7b4..49836191b 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json @@ -43,14 +43,14 @@ "pre" : { "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }", + "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32) (STOP) ) }", "nonce" : "0x00", "storage" : { } }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0x20) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0x20) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json index 64363e5a4..0db6c9138 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json @@ -42,15 +42,15 @@ ], "pre" : { "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x00", - "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }", + "balance" : "0x00", + "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32) (STOP) ) }", "nonce" : "0x00", "storage" : { } }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/create_callprecompile_returndatasizeFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/create_callprecompile_returndatasizeFiller.json index 4fea92cdc..1c2d37489 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/create_callprecompile_returndatasizeFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/create_callprecompile_returndatasizeFiller.json @@ -50,7 +50,7 @@ }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (CALL 0x9000 4 0 0 32 0 32) (SSTORE 0 (RETURNDATASIZE)) (RETURN 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (CALL 0x9000 4 0 0 32 0 32) (SSTORE 0 (RETURNDATASIZE)) (RETURN 0 32) (STOP) ) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json index d1fec78cf..474e60f00 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json @@ -50,7 +50,7 @@ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", "// code" : "create should succeed. RETURNDATACOPY should also succeed in Byzantium.", - "code" : "{ (create 0 0 (lll {(SSTORE 0 1)} 0)) (RETURNDATACOPY 0 0 0) (SSTORE 0 0) }", + "code" : "{ (CREATE 0 0 (lll (seq (SSTORE 0 1) (STOP)) 0)) (RETURNDATACOPY 0 0 0) (SSTORE 0 0) (STOP) }", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json index e672a86c0..e6a4053d5 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json @@ -41,7 +41,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CREATE 0 0 (lll (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (REVERT 0 32)) 0)) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}", + "code" : "{ (seq (CREATE 0 0 (lll (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (REVERT 0 32) (STOP) ) 0)) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_following_successful_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_following_successful_createFiller.json index 8a0c5e34c..3578da604 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_following_successful_createFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_following_successful_createFiller.json @@ -43,7 +43,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.json b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.json index 970d75e9a..03250c9d1 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.json @@ -36,7 +36,7 @@ "gas" : 0, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "a000000000000000000000000000000000000000" : { "storage" : { @@ -49,6 +49,26 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x9d" + } + }, + "b000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x9c" + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.json b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.json index 7e070a928..c93477580 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.json @@ -35,7 +35,7 @@ "gas" : 1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "a000000000000000000000000000000000000000" : { "storage" : { @@ -55,6 +55,26 @@ "gas" : 1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00" + } + }, + "b000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x0352" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, "network" : ["Homestead", "Frontier"], "result" : { "a000000000000000000000000000000000000000" : { @@ -101,7 +121,7 @@ "" ], "gasLimit" : [ - "10000000", "9000000" + "10000000", "8796770" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json b/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json index 07a174acd..7b9647623 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json @@ -36,7 +36,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=EIP158", "EIP150"], + "network" : ["Byzantium", "EIP150"], "result" : { "a000000000000000000000000000000000000000" : { "storage" : { @@ -48,6 +48,25 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x013a" + } + }, + "b000000000000000000000000000000000000000" : { + "storage" : { + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json index 049099b06..aa4e6811f 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json @@ -12,10 +12,48 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 0, "value" : -1 }, - "network" : [">Frontier"], + "network" : ["EIP158", "Byzantium"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "b000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "c000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00" + } + }, + "d000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], "result" : { "a000000000000000000000000000000000000000" : { "storage" : { @@ -92,7 +130,7 @@ "" ], "gasLimit" : [ - "170685" + "170685", "136685" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json index 10eab9334..7c128d383 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json @@ -58,7 +58,7 @@ }, "transaction" : { "data" : [ - "{ (seq (address) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (returndatacopy 0 0 32) (sstore 1 (mload 0)) ) }" + "{ (seq (address) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (returndatacopy 0 0 32) (sstore 1 (mload 0)) (STOP) ) }" ], "gasLimit" : [ "0x0a00000000" diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json index 45c0469e4..3cbf5fba0 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json @@ -318,7 +318,7 @@ "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b" ], "gasLimit" : [ - "460000", "88000" + "460000", "84000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json index ab9ebbba2..6947b0c59 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json @@ -102,7 +102,7 @@ "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b" ], "gasLimit" : [ - "460000", "68000" + "460000", "63000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCreateReturnsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCreateReturnsFiller.json index 387ffd009..fcd548b0d 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCreateReturnsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCreateReturnsFiller.json @@ -41,7 +41,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json index c0d0a370e..079b86347 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json @@ -442,7 +442,7 @@ "0x000000000000000000000000a300000000000000000000000000000000000000" ], "gasLimit" : [ - "800000", "140000", "160000", "50000" + "800000", "126200", "160000", "50000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json index ff15a7fb5..e6bd58148 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json @@ -95,7 +95,7 @@ "0xc0406226" ], "gasLimit" : [ - "66500", "181000" + "61500", "181000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json index 3357d301f..15da4469f 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json @@ -12,10 +12,27 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 0, "value" : -1 }, - "network" : [">Frontier"], + "network" : ["EIP158", "Byzantium"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], "result" : { "1000000000000000000000000000000000000000" : { "balance" : "", @@ -63,7 +80,7 @@ "" ], "gasLimit" : [ - "77400" + "77400", "55400" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json index 94e867cb5..9f956ae07 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json @@ -12,10 +12,10 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 0, "value" : -1 }, - "network" : [">Frontier"], + "network" : ["<=Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "balance" : "", @@ -25,6 +25,36 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "shouldnotexist" : "1" + } + } } ], "pre" : @@ -60,14 +90,14 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "storage": { } }, "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "storage": { } } @@ -77,7 +107,7 @@ "" ], "gasLimit" : [ - "82400" + "82400", "60000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json index 52ba2e709..3fa9c986e 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000100000", @@ -38,6 +38,33 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000100000", + "storage" : { + "0x24" : "0x00" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x26" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x0cf55d" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json index 0ff6f806e..ea021b3c3 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -37,6 +37,32 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01d8cadb" + } + }, + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x26" : "0x00" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x29" : "0x00" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json index cf9936eff..2730de5f9 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "storage" : { @@ -32,6 +32,27 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x26" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x963612" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CALL_OneVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CALL_OneVCallSuicideFiller.json index e241fe228..232ca4aff 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CALL_OneVCallSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CALL_OneVCallSuicideFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1" @@ -28,6 +28,26 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x00", + "0x64" : "0x079998" + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json index 8e0b8aaad..ec60a69a5 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : 0, "gas" : -1, "value" : -1 }, - "network" : [ ">=Byzantium" ], + "network" : [ "Byzantium" ], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -44,6 +44,24 @@ } } } + }, + { + "indexes" : { "data" : 0, "gas" : -1, "value" : -1 }, + "network" : [ ">=Constantinople" ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x7effffb2b4" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json index 404fe0d17..93740c795 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -33,6 +33,28 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x7effffb2b4" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024OOGFiller.json index 3435a1462..c3297d611 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024OOGFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024OOGFiller.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : 0, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium" ], + "network" : ["Byzantium" ], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -29,6 +29,25 @@ } }, { + "indexes" : { "data" : 0, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople" ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x03e9" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x06cd16" + } + } + } + }, + { "indexes" : { "data" : 1, "gas" : -1, "value" : -1 }, "network" : [">=Byzantium" ], "result" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCalls2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCalls2Filler.json index 5b3517d8e..49e244d94 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCalls2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCalls2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -35,6 +35,30 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x0400", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x7fffffffffcc0bfd" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCalls3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCalls3Filler.json index 727d5abf7..8dec7cc89 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCalls3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCalls3Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : 0, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium" ], + "network" : ["Byzantium" ], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -48,6 +48,26 @@ } } } + }, + { + "indexes" : { "data" : 0, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople" ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x01", + "0x03" : "0x01" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x7fffeffffffe48d7" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCallsFiller.json index 6548a6dc5..45879c2a8 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCallsFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCallsFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -35,6 +35,30 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x01", + "0x03" : "0x01" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x7fffeffffffe48d7" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json index 9bf4c2e6a..de4885784 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -33,6 +33,28 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x0a" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x7ffffffffffe5674" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json index e77314290..ae381a1a5 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -37,6 +37,32 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01" + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x60016000540160005561040060005410601b5760016002556045565b60006000620f4240600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03fa6001555b", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374606576630829820" + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000Filler.json index 25178471a..c8906420f 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "340282366920938463463374607431684514059", @@ -55,6 +55,52 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374607431719142308", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x1b58", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "49069137", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "4503599627370505", + "code" : "0x5b61c3506080511015603d576000600061c350600073aaaf5374fce5edbc8e2a8697c15331677e6ebf0b610640fa6000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0xc350" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x02249112" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_ecrecFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_ecrecFiller.json index 2431feb6e..c6ae99b09 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_ecrecFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_ecrecFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "340282366920938463463374607431675162497", @@ -48,6 +48,44 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374607431694162108", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "74049337", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374607431768211465", + "code" : "0x5b61c3506080511015602a576000600061c350600060016101f4fa6000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + "0x01" : "0xc350" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01385b8a" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_identity2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_identity2Filler.json index 3ceef2ec8..b62d6d0fc 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_identity2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_identity2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "340282366920938463463374607431681314841", @@ -45,6 +45,43 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374607431681319641", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "86891804", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0fffffffffffff", + "code" : "0x602a6001525b61c350608051101560305761c350600161c3506000600461061cfa6000556001608051016080526005565b608051600155600151600255", + "nonce" : "0x00", + "storage" : { + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x150797" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_identityFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_identityFiller.json index b4f34cd37..f5fa6984c 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_identityFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_identityFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "340282366920938463463374607431681314841", @@ -52,7 +52,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "340282366920938463463374607431681314841", @@ -82,6 +82,80 @@ } } } + }, + { + "indexes" : { + "data" : 1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374607431681319641", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "86891804", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0fffffffffffff", + "code" : "0x5b61c3506080511015602a576000600061c3506000600461061cfa6000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x150797" + } + } + } + }, + { + "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374607431681319641", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "86891804", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0fffffffffffff", + "code" : "0x5b61c3506080511015602a576000600061c3506000600461061cfa6000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x150797" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_rip160Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_rip160Filler.json index e9ce1a5c4..aa1ed65e8 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_rip160Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_rip160Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "340282366920938463463374607427904514059", @@ -47,6 +47,45 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374607427904518859", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "3863692586", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "4503599627370495", + "code" : "0x5b61c3506080511015602b576000600061c3506000600362013178fa6000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x03a7c839" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_sha256Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_sha256Filler.json index 85d597823..1d565ed08 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_sha256Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000_sha256Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "0000000000000000000000000000000000000002" : { "shouldnotexist" : "1" @@ -53,6 +53,48 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "0000000000000000000000000000000000000002" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "340282366920938463463374607430778342308", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "989869137", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "4503599627370505", + "code" : "0x5b61c3506080511015602b576000600061c3506000600262013178fa6000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0xc350" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0xaef2d912" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_1Filler.json index d30faafde..b9333b864 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_1Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x01", @@ -53,6 +53,48 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x00", + "storage" : { + "0x00" : "0x00" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "868710958211", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "4503599627370495", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x0335e462a0" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_2Filler.json index 27cded607..4865dc20a 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_2Filler.json @@ -58,7 +58,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x01", @@ -94,6 +94,49 @@ } } } + }, + { + "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0fffffffffffff", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x00" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "868710958211", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "4503599627370495", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x0335e462a0" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_3Filler.json index 32bcfe50c..9d825ca66 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_3Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x01", @@ -53,6 +53,48 @@ }, { "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0fffffffffffff", + "storage" : { + "0x00" : "0x00" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "868710958211", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "4503599627370495", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x0335e462a0" + } + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_NoGasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_NoGasFiller.json index ca05ad0f9..17c6f050c 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_NoGasFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_NoGasFiller.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "37063" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Constantinople"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "22663" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLog2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLog2Filler.json index cd0d6ac80..4d6cd2893 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLog2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLog2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -27,6 +27,25 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x09502d6f" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLogFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLogFiller.json index 58b775b6e..340826666 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLogFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLogFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x09502d6f" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevertFiller.json index 51662c5bf..c20917256 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevertFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevertFiller.json @@ -15,7 +15,7 @@ "gas" : 0, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x960a86" + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json index 96215644f..9c19ec534 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json @@ -15,7 +15,7 @@ "gas" : 0, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -30,7 +30,7 @@ "gas" : 1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -38,6 +38,36 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x026039" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x022330" + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Return50000_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Return50000_2Filler.json index f70af606f..0b87a7ba3 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_Return50000_2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_Return50000_2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "10bf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x00", @@ -30,6 +30,31 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "10bf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x0243f890" + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0fffffffffffff", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0xc350" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json index 87d82243b..b1f671acf 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a000000000000000000000000000000000000000" : { "storage" : { @@ -46,6 +46,44 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "b000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "c000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00" + } + }, + "d000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json index cf426c2f3..8c208a5aa 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : [0, 1], "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -22,6 +22,18 @@ } }, { + "indexes" : { "data" : [0, 1], "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x0d64fa" + } + } + } + }, + { "indexes" : { "data" : [2], "gas" : -1, "value" : -1 }, "network" : [">=Byzantium"], "result" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json index 360ef876b..f40d7f3d0 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -22,6 +22,20 @@ "balance" : "46751" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x01" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "41951" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json index a04992727..0878533a2 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -41,6 +41,39 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00", + "0x6f" : "0x016f77" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json index 4696c72ae..567feef18 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -45,6 +45,43 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00", + "0x6f" : "0x015f41" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json index c8cea457f..e9ff6795b 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json index 36a0379e2..261c98dc7 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -52,6 +52,50 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json index 925733d3a..b212840e3 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -52,6 +52,50 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json index 4583adbaf..a1647191f 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -44,6 +44,42 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json index e465a5796..eb87a8589 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", @@ -28,6 +28,26 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x2b2727" + } + + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x02" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json index 2a181da35..7f0917137 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x2b2727" + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000" + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json index 2947e72a8..30ad56ae8 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -20,6 +20,18 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json index 8ce41a0e1..96253f95b 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -26,6 +26,24 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e", + "0x02" : "0x00", + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json index df7d35c16..8060d53e3 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -26,6 +26,24 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e", + "0x02" : "0x00", + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json index e5da55998..732a51be9 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -26,6 +26,24 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e", + "0x02" : "0x00", + "0x03" : "0x00" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json index 80119a94b..b7077ba44 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -20,6 +20,18 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json index acfe88268..6ea719f94 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e48" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json index 559dd0cfa..d5a4bc17f 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e48" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json index 9fb296b69..ff4a76fd1 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3e" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json index eb8d73d7b..ea154c657 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : [0] }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -23,7 +23,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : [1] }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -32,6 +32,30 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : [0] }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015e3c" + } + } + } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : [1] }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x013b14" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json index 2950947ba..840fa74c1 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f41" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json index e963f2fed..60d46e531 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f41" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json index b957fb02f..af896826c 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : [0] }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -29,9 +29,25 @@ "indexes" : { "data" : -1, "gas" : -1, + "value" : [0] + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f3f" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, "value" : [1] }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -40,6 +56,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : [1] + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x013c17" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json index 1588ba916..2a890628b 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : 0 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -23,7 +23,7 @@ }, { "indexes" : { "data" : -1, "gas" : -1, "value" : 1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -32,6 +32,30 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : 0 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f3f" + } + } + } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : 1 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x013c17" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json index fd5b214e7..07d830d7e 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f41" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json index 9bb78aa51..5f2675644 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a000000000000000000000000000000000000000" : { "storage" : { @@ -31,7 +31,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "a000000000000000000000000000000000000000" : { "storage" : { @@ -40,6 +40,38 @@ } } } + }, + { + "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0xbf66" + } + } + } + }, + { + "indexes" : { + "data" : 1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x015675" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json index 4d7b2354e..c52da2940 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : 0 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -22,8 +22,20 @@ } }, { + "indexes" : { "data" : -1, "gas" : -1, "value" : 0 }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f3f" + } + } + } + }, + { "indexes" : { "data" : -1, "gas" : -1, "value" : [1,2] }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -32,6 +44,18 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : [1,2] }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x013c17" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json index 27983c7ea..7b545d53a 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f41" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json index 1b0ef0895..5fc603201 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f41" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json index d0e9738d1..b9675a6ef 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x015f3f" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_emptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_log0_emptyMemFiller.json index 2639e3491..23aa9d364 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_emptyMemFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_log0_emptyMemFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -24,6 +24,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x02dac5" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json index 903dbe9e7..a00e9eea1 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -28,6 +28,26 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x24" : "0x01" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x26" : "0x02" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json index 790a29187..62fb7fb1c 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json @@ -35,7 +35,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -48,6 +48,26 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0xc2" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x00" : "0xc2" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json index 4f07774e0..84c207c4b 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json @@ -35,7 +35,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -48,6 +48,26 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x30" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x00" : "0x30" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json index 58571f641..fe1bf7aba 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json @@ -34,7 +34,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "storage" : { @@ -46,6 +46,25 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x00" : "0x0172", + "0x01" : "0x01" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json index 46e7248e3..4598672ae 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json @@ -31,7 +31,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -40,6 +40,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x02ed", + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json index c72aa8f3e..f2fb05a48 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json @@ -31,7 +31,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -40,6 +40,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0xfc", + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json index b8784bbe5..c243aaf0f 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json @@ -31,7 +31,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -40,6 +40,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0xfc", + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json index a9409ac58..e31b117e9 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json @@ -29,7 +29,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -38,6 +38,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x18", + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json index be8e6736d..6180f6d25 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json @@ -34,7 +34,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "storage" : { @@ -46,6 +46,25 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x00" : "0x0140", + "0x01" : "0x01" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json index cb52e2238..1f9c949b5 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json @@ -34,7 +34,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", ">=EIP158"], + "network" : ["EIP150", "Byzantium"], "result" : { "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "storage" : { @@ -46,6 +46,25 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x00" : "0x0140", + "0x01" : "0x01" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json index 68ef1e41b..d228184b6 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "nonce" : "0", @@ -23,6 +23,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "nonce" : "0", + "storage" : { + "0x00" : "0x01" + } + } + } } ], "pre" : { @@ -53,7 +69,7 @@ "" ], "gasLimit" : [ - "300000" + "290000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json index 32e2fb15b..a6ca22370 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "nonce" : "0", @@ -23,6 +23,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "nonce" : "0", + "storage" : { + "0x00" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json index 4ab291aae..ae322ea72 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json @@ -15,13 +15,28 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Frontier"], + "network" : ["<=Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json index a01c4e345..305b0c383 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json @@ -91,7 +91,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "99999999884878", @@ -122,6 +122,44 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999913678", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x03", + "0x0107" : "0x0c22e4", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x05" : "0xbbb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x3412a0f379bad2d2f891e4db16a42d964dd63a031e22596f10b4dab2aaa1d252" : "0x03", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json index 0f91d16a3..d8f5de471 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json @@ -87,7 +87,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "99999999891702", @@ -116,6 +116,42 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999920502", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x02", + "0x0107" : "0x0c22e4", + "0x03" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa", + "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x62ce4f671906be9a217487bb98e428b08e12100fb0007df10572ca00206e7d73" : "0x01", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json index e78478cd8..312a53d9f 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json @@ -87,7 +87,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "99999999906141", @@ -116,6 +116,42 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999934941", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x02", + "0x01" : "0x02", + "0x0107" : "0x0c22e4", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json index 2490d8af4..34d2797e1 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json @@ -103,7 +103,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "99999999950052", @@ -140,6 +140,50 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999954852", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "aaaf5374fce5edbc8e2a8697c15331677e6ebaaa" : { + "balance" : "0x09", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x5b", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x02", + "0x01" : "0x02", + "0x0104" : "0x01", + "0x0107" : "0x0c22e4", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json index c5a89d019..503f76fbe 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json @@ -17,13 +17,6 @@ }, "network" : ["Frontier"], "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "380223", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "999999999999288044", "code" : "0x", @@ -53,13 +46,6 @@ }, "network" : ["EIP158"], "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "1210063", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "999999999998458204", "code" : "0x", @@ -87,17 +73,39 @@ "gas" : 1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "1210063", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999998458204", "code" : "0x", - "nonce" : "0x00", + "nonce" : "0x02", "storage" : { } }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "1", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0107" : "0x00", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999999999998458204", + "balance" : "999999999998463004", "code" : "0x", "nonce" : "0x02", "storage" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json index f8690793e..7e54052ad 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json @@ -83,7 +83,7 @@ "gas" : -1, "value" : -1 }, - "network" : [">=Byzantium"], + "network" : ["Byzantium"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "99999999882172", @@ -110,6 +110,40 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999920872", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0107" : "0x0c22e4", + "0x03" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json index a06bc18ff..6c93c7559 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json @@ -620,7 +620,7 @@ }, { "indexes" : { - "data" : [10,11,13,14,15,16,18,19,20,22,23,24,25,27,28,29,32,33,35,36,37], + "data" : [10,11,13,14,15,16,18,19,22,23,25,27,28,29,32,35,36], "gas" : [3], "value" : -1 }, @@ -635,6 +635,46 @@ }, { "indexes" : { + "data" : [37], + "gas" : [3], + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0b" : "0x1176f11fbb6e80611a7b04154401f4a4158681bca8f923dcb1e7e614db7e53cc", + "0x15" : "0x0e5345847fdd0656d7af3479dfd8ffba497c0af3c59ebc1ed16cf9668ee8b2b5", + "0x0a" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b", + "0x14" : "0x08e2142845db159bd105879a109fe7a6f254ed3ddae0e9cd8a2aeae05e5f647b" + } + } + } + }, + { + "indexes" : { + "data" : [33], + "gas" : [3], + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0b" : "0x069610f239e3c41640045a90b6e1988d4ede443735aad701aa1a7fc644dc15a0", + "0x15" : "0x2e54101a155ea5a936da1173d63a95f2fc0118a7b82806f8af930f08c4e09f08", + "0x0a" : "0x1fd3b816d9951dcb9aa9797d25e51a865987703ae83cd69c4658679f0350ae2b", + "0x14" : "0x2c15ed1902e189486ab6b625aa982510aef6246b21a1e1bcea382da4d735e8ba" + } + } + } + }, + { + "indexes" : { "data" : [0,1,2,3,4,5,6,7,8,9,12], "gas" : [3], "value" : -1 |