1 files changed, 71 insertions, 59 deletions
diff --git a/GeneralStateTests/stSystemOperationsTest/extcodecopy.json b/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
index 1bd35a39f..05ddeb32a 100644
--- a/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
+++ b/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
@@ -2,87 +2,99 @@
     "extcodecopy" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/extcodecopyFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "0x4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82",
+            "currentCoinbase" : "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x58272e28",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0xd30f77155de00f207ad60109897e790f73e9f3431be25717bf3651d91949f041"
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "d30f77155de00f207ad60109897e790f73e9f3431be25717bf3651d91949f041"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Frontier",
+                    "Homestead"
+                ],
+                "result" : {
+                    "00000000002147c39fd6b5c19b7b89fc003e6b16" : {
+                        "balance" : "0x2a6bb607",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82" : {
+                        "balance" : "0x06c5a7f85ff0",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x4f6ca0f3404f688d",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x19cf4c2d1e51b64210c6fe4b0094f8e592a5ac333234495a948f6a3c694453e3",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x19cf4c2d1e51b64210c6fe4b0094f8e592a5ac333234495a948f6a3c694453e3",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "EIP150",
+                    "EIP158"
+                ],
+                "result" : {
+                    "00000000002147c39fd6b5c19b7b89fc003e6b16" : {
+                        "balance" : "0x2a6bb607",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82" : {
+                        "balance" : "18122589774504",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "5723115516504122837",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x05c81eb0",
                 "code" : "0x7f15688566a82f5f946c68028bf626b349e495daa43e33529a76437ac416cd1b7d6e7dae7454bb193b1c28e64a6a935bc373cea0c5cc171fa61277e5604a3bc8aef4de3d38820658600b80797ada6e82e95f6520383f95f5c7dae56b4dc13b6f22ecabfce07c3cff51",
                 "nonce" : "0xfe",
                 "storage" : {
                 }
             },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x4d6769f8",
                 "code" : "0x5a60106017601160116018601c600f601b601d5f60026013600f601a8d5a5b7679177b5dd41a23db52998c4dcd14e88390dcc9f3ed5783601660145f6013600d601f60016011600e600c600d601f60138c7a58f20fd882eb51408a52e569ce80e93270ab53ae9de3fec5498a5c72ce1fcd11bb1553736959df779a616b738c1f407c12459490afe302da311a673488d09e71041d0761dee4829e3c38e0b1b1787810f2e11e2289983c1ab47cf5ebd38c12f1719232b5f3a7b27a9ea8858a071c4169392ec725646311235cbd9534e5d7cd8cb5e2287738a43f803384f4e62fe6629ea2e609a71759edab5c3a58b87e94c95f710aa6059b0663c9f374ce6ea0a000c5d594c41252d4a74d64896a987cc57c24df2ce8ffb85adcc27dce2d19f7006fbc1c5a7b79a319418fd6c27ddebcf170192262d82c1053333f6115c8b258b81e2e84d723c98dbd4535de7f922723a15827bbcfd07f9e2c5027c7736ed68c61b332059d7ec1bae1c1fd41a361d35b996d9740a588b6abf3293236afb927717328c014846148ce67eaf2b33d90672366dafeaae0714eb39e7fd5076a831d8eb4a3546288a3e1a0087aebe80b6bbfa4041330b05d094a697236fe7654d8a7ce630f83a832620125d781666e898f7fdcfd0031",
                 "nonce" : "0xdd",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4f6ca7b90ceb5fd4",
-                "code" : "",
+                "code" : "0x",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -97,8 +109,8 @@
             ],
             "gasPrice" : "0x1cd49878",
             "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x24a39757"
             ]