update general tests

1 files changed, 185 insertions, 84 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callCreate2.json b/GeneralStateTests/stStaticCall/static_callCreate2.json
index 2fbb4ee6b..0e558fd04 100644
--- a/GeneralStateTests/stStaticCall/static_callCreate2.json
+++ b/GeneralStateTests/stStaticCall/static_callCreate2.json
@@ -6,107 +6,208 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callCreate2Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "10000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : 0,
-                    "gas" : -1,
-                    "value" : -1
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x10b8cf99d89c7993a5c2162c68114522ddc549018f0512e9e96a1cee6c1d3ed6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x5fab2061f493c9343bbee1e7edc78914311aa34878145bc249c4e996bf7faf54",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x13136008b64ff592819b2fa6d43f2835c452020e",
-                            "0x01" : "0x01"
-                        }
-                    }
+                {
+                    "hash" : "0x5fab2061f493c9343bbee1e7edc78914311aa34878145bc249c4e996bf7faf54",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 1,
-                    "gas" : -1,
-                    "value" : -1
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x10b8cf99d89c7993a5c2162c68114522ddc549018f0512e9e96a1cee6c1d3ed6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x5fab2061f493c9343bbee1e7edc78914311aa34878145bc249c4e996bf7faf54",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x00" : "0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643",
-                            "0x01" : "0x00"
-                        }
+                {
+                    "hash" : "0x5fab2061f493c9343bbee1e7edc78914311aa34878145bc249c4e996bf7faf54",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
-                        "code" : "0x6001600155",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 2,
-                    "gas" : -1,
-                    "value" : -1
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xd059e3df4c5983e3eb2aefe4e21ddec38cfb7e50985722e901cb284cfafdc821",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    }
+                {
+                    "hash" : "0x4f054fdf16893de1522c1f59ec9a4fd439ae5d7589f782a97b1b42d7d9624efb",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4f054fdf16893de1522c1f59ec9a4fd439ae5d7589f782a97b1b42d7d9624efb",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xd059e3df4c5983e3eb2aefe4e21ddec38cfb7e50985722e901cb284cfafdc821",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4f054fdf16893de1522c1f59ec9a4fd439ae5d7589f782a97b1b42d7d9624efb",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4f054fdf16893de1522c1f59ec9a4fd439ae5d7589f782a97b1b42d7d9624efb",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x3a8606384958c04ab62190291bd59e34e7027ba675e7030167d6414465d3ff0e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9edc7af189337cc08709e50b3b1ebc8a57a6edb67681602c3aae95837708fae8",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x5fab2061f493c9343bbee1e7edc78914311aa34878145bc249c4e996bf7faf54",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (CREATE 1 0 0) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600060006001f06000556000600060006000600054620493e0fa600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  (MSTORE 0 0x6460016001556000526005601bf3 ) [[ 0 ]] (CREATE 1 18 14) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  (MSTORE 0 0x6460016001556000526005601bf3 ) [[ 0 ]] (CREATE 1 18 14) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  (CALL 600000 (CALLDATALOAD 0) 0 0 0 0 0) }",
-                "nonce" : "0",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60006000600060006000600035620927c0f1",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -118,14 +219,14 @@
                 "0x0000000000000000000000001000000000000000000000000000000000000002"
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }