1 files changed, 58 insertions, 70 deletions
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
index 5f578bd0b..f156ff9bd 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
@@ -2,88 +2,76 @@
     "RawExtCodeCopyMemoryGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "EIP150",
+                    "EIP158"
+                ],
+                "result" : {
+                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x08d5b6",
+                            "0x01" : "0x087bb5"
+                        }
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Frontier",
+                    "Homestead"
+                ],
+                "result" : {
+                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x08d5b6",
+                            "0x01" : "0x087e5d"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
+            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a51000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x5a600055612b706000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155",
-                "nonce" : "0x00",
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+                "code" : "{ [[0]] (GAS) (EXTCODECOPY 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 11120) [[1]] (GAS) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -93,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0927c0"
+                "600000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0x00"
+                "0"
             ]
         }
     }