update general tests

1 files changed, 158 insertions, 84 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1.json b/GeneralStateTests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1.json
index 3d1a46c0c..08ffb03d4 100644
--- a/GeneralStateTests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1.json
+++ b/GeneralStateTests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1.json
@@ -6,119 +6,193 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "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" : "0x77804caf96f8f25a8790a3d5b4d84fffb6640fd3404355049842709fc07169e9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x01",
-                            "0x01" : "0x010e48"
-                        }
-                    }
+                {
+                    "hash" : "0x77804caf96f8f25a8790a3d5b4d84fffb6640fd3404355049842709fc07169e9",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 1,
-                    "gas" : -1,
-                    "value" : -1
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x77804caf96f8f25a8790a3d5b4d84fffb6640fd3404355049842709fc07169e9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x01",
-                            "0x01" : "0x01a549"
-                        }
-                    }
+                {
+                    "hash" : "0x77804caf96f8f25a8790a3d5b4d84fffb6640fd3404355049842709fc07169e9",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x068eaa534d454e864eaac3367b7f65d6159de21ca9a3ef636b017af014c6f832",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x068eaa534d454e864eaac3367b7f65d6159de21ca9a3ef636b017af014c6f832",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x068eaa534d454e864eaac3367b7f65d6159de21ca9a3ef636b017af014c6f832",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x068eaa534d454e864eaac3367b7f65d6159de21ca9a3ef636b017af014c6f832",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x77804caf96f8f25a8790a3d5b4d84fffb6640fd3404355049842709fc07169e9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xa9658b697f24344632b4352c9ad6476d582d53d5242fe7e1225da9f14474c14f",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) (MSTORE 3 1) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2506001600352",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0",
-                "code" : "{  (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90fa505b61c3506080511015603a576001608051016080526022565b",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0",
-                "code" : "{  (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (MSTORE 3 1) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2506001600352",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0",
-                "code" : "{  (MSTORE 3 1) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600352",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2000000000000000000000000000000000000000" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  (CALLCODE 60150 0x2000000000000000000000000000000000000001 0 0 64 0 64 ) (MSTORE 3 1)}",
-                "nonce" : "0",
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073200000000000000000000000000000000000000161eaf6f2506001600352",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2000000000000000000000000000000000000001" : {
-                "balance" : "0",
-                "code" : "{  (STATICCALL 40080 0x2000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }",
-                "nonce" : "0",
+            "0x2000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000732000000000000000000000000000000000000002619c90fa506001600352",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2000000000000000000000000000000000000002" : {
-                "balance" : "0",
-                "code" : "{  (CALLCODE 20020 0x2000000000000000000000000000000000000003 0 0 64 0 64 ) (MSTORE 3 1) }",
-                "nonce" : "0",
+            "0x2000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000732000000000000000000000000000000000000003614e34f2506001600352",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2000000000000000000000000000000000000003" : {
-                "balance" : "0",
-                "code" : "{  (SSTORE 3 1) }",
-                "nonce" : "0",
+            "0x2000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] (GAS) }",
-                "nonce" : "0",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600060006000600060006000355af26000555a600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -129,14 +203,14 @@
                 "0x0000000000000000000000002000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }