1 files changed, 78 insertions, 52 deletions
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
index 3f2680e48..a695caa35 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
@@ -6,61 +6,87 @@
             "source" : "/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x0f4240",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : "Frontier",
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x00"
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xe401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Homestead",
-                    "EIP158",
-                    "EIP150"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xe401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x421e15ae720639d82241626c9e33c4724a90b9606e030bd95ea29f5cf182abbc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x6ab445199097ad4916576058e1f45ea664254d2a185f7a6770f93f6249b67a6d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xe401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "1000",
-                "code" : "{ [[ 0 ]] (DELEGATECALL 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 64 0 64 )}",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x03e8",
+                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1100000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -70,14 +96,14 @@
                 ""
             ],
             "gasLimit" : [
-                "105044"
+                "0x019a54"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }