diff options
| author | Dimitry <dimitry@ethereum.org> | 2018-09-25 20:40:09 +0800 |
|---|---|---|
| committer | Dimitry <dimitry@ethereum.org> | 2018-09-25 20:40:09 +0800 |
| commit | e77d3ba583810fd2a41248270fb36e08dfe5f38e (patch) | |
| tree | 544a9c05636acd53d5ef4972610a6877ddee9f38 /src/GeneralStateTestsFiller/stStaticCall | |
| parent | 3f5febc901913ef698f1b09dda8705babd729e4a (diff) | |
| download | dexon-tests-e77d3ba583810fd2a41248270fb36e08dfe5f38e.tar dexon-tests-e77d3ba583810fd2a41248270fb36e08dfe5f38e.tar.gz dexon-tests-e77d3ba583810fd2a41248270fb36e08dfe5f38e.tar.bz2 dexon-tests-e77d3ba583810fd2a41248270fb36e08dfe5f38e.tar.lz dexon-tests-e77d3ba583810fd2a41248270fb36e08dfe5f38e.tar.xz dexon-tests-e77d3ba583810fd2a41248270fb36e08dfe5f38e.tar.zst dexon-tests-e77d3ba583810fd2a41248270fb36e08dfe5f38e.zip | |
correct Constantinople expect section in state tests
Diffstat (limited to 'src/GeneralStateTestsFiller/stStaticCall')
58 files changed, 1572 insertions, 65 deletions
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" : { |