update test cases. fix delegatecall mistype

3 files changed, 192 insertions, 50 deletions

diff --git a/StateTests/EIP158/EIP150/stEIPsingleCodeGasPrices.json b/StateTests/EIP158/EIP150/stEIPsingleCodeGasPrices.json
index fb727df9c..c14deed5e 100644
--- a/StateTests/EIP158/EIP150/stEIPsingleCodeGasPrices.json
+++ b/StateTests/EIP158/EIP150/stEIPsingleCodeGasPrices.json
@@ -13,14 +13,14 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0xee52",
+                "balance" : "0xefe7",
                 "code" : "0x",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a421ae",
+                "balance" : "0xe8d4a42019",
                 "code" : "0x",
                 "nonce" : "0x01",
                 "storage" : {
@@ -28,15 +28,15 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a6000555a600155",
+                "code" : "0x5a60005573a94f5374fce5edbc8e2a8697c15331677e6ebf0b31505a600155",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x088791"
+                    "0x01" : "0x0885fc"
                 }
             }
         },
-        "postStateRoot" : "78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
+        "postStateRoot" : "9594eb0e3732854789880025219a4299899e42993f76597e94ace4e3dd676817",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
@@ -47,7 +47,7 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a6000555a600155",
+                "code" : "0x5a60005573a94f5374fce5edbc8e2a8697c15331677e6ebf0b31505a600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -2168,14 +2168,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0xee52",
+                "balance" : "0xf113",
                 "code" : "0x",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a421ae",
+                "balance" : "0xe8d4a41eed",
                 "code" : "0x",
                 "nonce" : "0x01",
                 "storage" : {
@@ -2183,15 +2183,15 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a6000555a600155",
+                "code" : "0x5a60005573094f5374fce5edbc8e2a8697c15331677e6ebf0b3b505a600155",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x088791"
+                    "0x01" : "0x0884d0"
                 }
             }
         },
-        "postStateRoot" : "f346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
+        "postStateRoot" : "3bd93804e5bf8b20f53cd9a157d13e83354a82868128d8814fd7bd382376885c",
         "pre" : {
             "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -2209,7 +2209,7 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a6000555a600155",
+                "code" : "0x5a60005573094f5374fce5edbc8e2a8697c15331677e6ebf0b3b505a600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/StateTests/EIP158/stEIP158SpecificTest.json b/StateTests/EIP158/stEIP158SpecificTest.json
index 6d673c9cf..7600fd693 100644
--- a/StateTests/EIP158/stEIP158SpecificTest.json
+++ b/StateTests/EIP158/stEIP158SpecificTest.json
@@ -155,14 +155,14 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x049828",
+                "balance" : "0x04a3af",
                 "code" : "0x",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a077d8",
+                "balance" : "0xe8d4a06c51",
                 "code" : "0x",
                 "nonce" : "0x01",
                 "storage" : {
@@ -170,26 +170,26 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60009081556001555a60025560016003555a60045560006005555a60065560006007555a60085560006009555a600a556001600b555a600c556001600d555a600e556001600f555a606455",
+                "code" : "0x5a600055600c60000a6001555a6002556000600c0a6003555a60045567ffffffffffffffff60000a6005555a6006556fffffffffffffffffffffffffffffffff60000a6007555a6008557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60000a6009555a600a55600067ffffffffffffffff0a600b555a600c5560006fffffffffffffffffffffffffffffffff0a600d555a600e5560007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0a600f555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x02" : "0x087400",
+                    "0x02" : "0x0873c4",
                     "0x03" : "0x01",
-                    "0x04" : "0x07d7b5",
-                    "0x06" : "0x077602",
-                    "0x08" : "0x07144f",
-                    "0x0a" : "0x06b29c",
+                    "0x04" : "0x07d76c",
+                    "0x06" : "0x07741c",
+                    "0x08" : "0x070f3c",
+                    "0x0a" : "0x06a73c",
                     "0x0b" : "0x01",
-                    "0x0c" : "0x061651",
+                    "0x0c" : "0x060ae4",
                     "0x0d" : "0x01",
-                    "0x0e" : "0x057a06",
+                    "0x0e" : "0x056e8c",
                     "0x0f" : "0x01",
-                    "0x64" : "0x04ddbb"
+                    "0x64" : "0x04d234"
                 }
             }
         },
-        "postStateRoot" : "1dea95f333439502364264b26efad62f0487c099c77dc5ea8858418c173f0e38",
+        "postStateRoot" : "41d83353455a43d5fffdc0ef1901a9861cb0cad2249da8883da516f1abb6b27b",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
@@ -200,7 +200,149 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60009081556001555a60025560016003555a60045560006005555a60065560006007555a60085560006009555a600a556001600b555a600c556001600d555a600e556001600f555a606455",
+                "code" : "0x5a600055600c60000a6001555a6002556000600c0a6003555a60045567ffffffffffffffff60000a6005555a6006556fffffffffffffffffffffffffffffffff60000a6007555a6008557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60000a6009555a600a55600067ffffffffffffffff0a600b555a600c5560006fffffffffffffffffffffffffffffffff0a600d555a600e5560007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0a600f555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "0x0927c0",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "0x00"
+        }
+    },
+    "EXTCODESIZE_toEpmty" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x3567e0",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x01049c",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40b64",
+                "code" : "0x",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60005573c94f5374fce5edbc8e2a8697c15331677e6ebf0b3b6001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x64" : "0x087147"
+                }
+            },
+            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "postStateRoot" : "34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a",
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60005573c94f5374fce5edbc8e2a8697c15331677e6ebf0b3b6001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "0x0927c0",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "0x00"
+        }
+    },
+    "EXTCODESIZE_toNonExistent" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x3567e0",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x01049c",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40b64",
+                "code" : "0x",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60005573c94f5374fce5edbc8e2a8697c15331677e6ebf0b3b6001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x64" : "0x087147"
+                }
+            }
+        },
+        "postStateRoot" : "61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1",
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60005573c94f5374fce5edbc8e2a8697c15331677e6ebf0b3b6001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/StateTests/EIP158/stZeroCallsTest.json b/StateTests/EIP158/stZeroCallsTest.json
index a61de9568..47971bc43 100644
--- a/StateTests/EIP158/stZeroCallsTest.json
+++ b/StateTests/EIP158/stZeroCallsTest.json
@@ -592,7 +592,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_DELEGATECODE" : {
+    "ZeroValue_DELEGATECALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -606,14 +606,14 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x013c78",
+                "balance" : "0x013f43",
                 "code" : "0x",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d388",
+                "balance" : "0xe8d4a3d0bd",
                 "code" : "0x",
                 "nonce" : "0x01",
                 "storage" : {
@@ -621,16 +621,16 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60005560806001555a606455",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x80",
-                    "0x64" : "0x08396b"
+                    "0x01" : "0x01",
+                    "0x64" : "0x0836a0"
                 }
             }
         },
-        "postStateRoot" : "e00e11fb4603632d351bbdeb4a52e165af8b55138528577ddd4ab61171366d61",
+        "postStateRoot" : "fc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
@@ -641,7 +641,7 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60005560806001555a606455",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -657,7 +657,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_DELEGATECODE_ToEmpty" : {
+    "ZeroValue_DELEGATECALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -671,14 +671,14 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x013c78",
+                "balance" : "0x013f43",
                 "code" : "0x",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d388",
+                "balance" : "0xe8d4a3d0bd",
                 "code" : "0x",
                 "nonce" : "0x01",
                 "storage" : {
@@ -686,12 +686,12 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60005560806001555a606455",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x80",
-                    "0x64" : "0x08396b"
+                    "0x01" : "0x01",
+                    "0x64" : "0x0836a0"
                 }
             },
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -702,7 +702,7 @@
                 }
             }
         },
-        "postStateRoot" : "d789084cbd2c84d580408281ea705678a1dc16bfa2354e4da21e9c7293138f1c",
+        "postStateRoot" : "55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
@@ -713,7 +713,7 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60005560806001555a606455",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -736,7 +736,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_DELEGATECODE_ToNonZeroBalance" : {
+    "ZeroValue_DELEGATECALL_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -750,14 +750,14 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x013c78",
+                "balance" : "0x013f43",
                 "code" : "0x",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d388",
+                "balance" : "0xe8d4a3d0bd",
                 "code" : "0x",
                 "nonce" : "0x01",
                 "storage" : {
@@ -765,12 +765,12 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60005560806001555a606455",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x80",
-                    "0x64" : "0x08396b"
+                    "0x01" : "0x01",
+                    "0x64" : "0x0836a0"
                 }
             },
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -781,7 +781,7 @@
                 }
             }
         },
-        "postStateRoot" : "c935688613e51e7dc631b56ec0e3445de56a2b52e986e1ac6c0e80a97829d3d2",
+        "postStateRoot" : "a0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
@@ -792,7 +792,7 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60005560806001555a606455",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -815,7 +815,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_DELEGATECODE_ToOneStorageKey" : {
+    "ZeroValue_DELEGATECALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",