1 files changed, 83 insertions, 40 deletions
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
index f91ad3997..58c7fbe86 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
@@ -6,51 +6,94 @@
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.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" : "ALL",
-                "result" : {
-                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
-                        "balance" : "0x05",
-                        "storage" : {
-                            "0x00" : "0x01",
-                            "0x02" : "0x01"
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xf12e898bcf64ff2fbc15cdd1455b9eed5b57d45b2e9daf5b5ce4446c5f02fc0e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "10000",
-                "code" : "{ (MSTORE 0 0x6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 5 0 64) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0",
-                "code" : "{ (SSTORE 2 1) }",
-                "nonce" : "0",
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -60,14 +103,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }