Merge pull request #241 from ethereum/metrosplit

Metrosplit

1 files changed, 34 insertions, 12 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callcallcall_000.json b/GeneralStateTests/stStaticCall/static_callcallcall_000.json
index abe3b440b..7c3b27204 100644
--- a/GeneralStateTests/stStaticCall/static_callcallcall_000.json
+++ b/GeneralStateTests/stStaticCall/static_callcallcall_000.json
@@ -2,7 +2,7 @@
     "static_callcallcall_000" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423",
+                    "hash" : "0x869d1e38e0df70852bb9b7d1bce10247bf70998a291c86fb0763e1e744c23e34",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423",
+                    "hash" : "0x9c6e09a5bcec1aff2eae576af0a35a2955adc8fce906e914744fb14c07b5021d",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -36,7 +36,29 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0x869d1e38e0df70852bb9b7d1bce10247bf70998a291c86fb0763e1e744c23e34",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9c6e09a5bcec1aff2eae576af0a35a2955adc8fce906e914744fb14c07b5021d",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423",
                     "indexes" : {
@@ -58,9 +80,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf",
+                    "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +92,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf",
+                    "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -80,7 +102,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x869d1e38e0df70852bb9b7d1bce10247bf70998a291c86fb0763e1e744c23e34",
+                    "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x9c6e09a5bcec1aff2eae576af0a35a2955adc8fce906e914744fb14c07b5021d",
+                    "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,