1 files changed, 79 insertions, 57 deletions
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
index 75d544b69..03e3583ed 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
@@ -6,72 +6,94 @@
             "source" : "/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "EIP158",
-                    "EIP150"
-                ],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Homestead"
-                ],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x" : "0x01",
-                            "0x02" : "0x03e9"
-                        }
-                    }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x68c34a88a0fe3b7334b8c67a33f46ba7aae6c38a73ec7f35a6ce5e656122d7f9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1024",
-                "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL (ADD 1(MUL @@0 100000)) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }",
-                "nonce" : "0",
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -81,14 +103,14 @@
                 ""
             ],
             "gasLimit" : [
-                "166262"
+                "0x028976"
             ],
-            "gasPrice" : "1",
-            "nonce" : "",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }