Merge pull request #195 from ethereum/correctStatic

correct staticcall tests

13 files changed, 460 insertions, 20 deletions

diff --git a/GeneralStateTests/stStaticCall/static_Call1024BalanceTooLow.json b/GeneralStateTests/stStaticCall/static_Call1024BalanceTooLow.json
index 844a31b13..8d949da6d 100644
--- a/GeneralStateTests/stStaticCall/static_Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stStaticCall/static_Call1024BalanceTooLow.json
@@ -1,5 +1,10 @@
 {
     "static_Call1024BalanceTooLow" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.d239486b.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json"
+        },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -91,11 +96,57 @@
                     }
                 },
                 {
-                    "hash" : "0xb971f1cef2521c89482bdae065a73a1e66450d1e6958694b63eb6b221d7782f3",
+                    "hash" : "0xb02ff201d96fed0845c416053cfd28c239653041b732838ce42b0fbb954255c5",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x1000000000000000000000000000000000000000" : {
+                            "balance" : "0x00",
+                            "code" : "0x6000600060006000346000355af16000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x01",
+                                "0x01" : "0x0ffffff458dd"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x0cccce",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xfffffffffffffffffffffffffff33327",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x1b58",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0400",
+                            "code" : "0x60016000540160005560006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffffa600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x040a",
+                            "code" : "0x60016000510160005260006000600060005173cbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffffa602052",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ]
diff --git a/GeneralStateTests/stStaticCall/static_Call1024BalanceTooLow2.json b/GeneralStateTests/stStaticCall/static_Call1024BalanceTooLow2.json
index b8e69ef52..1d4ac1b12 100644
--- a/GeneralStateTests/stStaticCall/static_Call1024BalanceTooLow2.json
+++ b/GeneralStateTests/stStaticCall/static_Call1024BalanceTooLow2.json
@@ -1,5 +1,10 @@
 {
     "static_Call1024BalanceTooLow2" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.d239486b.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json"
+        },
         "env" : {
             "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
@@ -91,7 +96,7 @@
                     }
                 },
                 {
-                    "hash" : "0xdcaba9531dd58af253e2d3803c9dd0365878a74062a30b38159c3a34083e1c5e",
+                    "hash" : "0x286a8f834d47eae85a92d2e14062c0d930388ac53384b1a17a9c14aec7863699",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
diff --git a/GeneralStateTests/stStaticCall/static_ReturnTest.json b/GeneralStateTests/stStaticCall/static_ReturnTest.json
index 0b8b5f02b..4a02954fb 100644
--- a/GeneralStateTests/stStaticCall/static_ReturnTest.json
+++ b/GeneralStateTests/stStaticCall/static_ReturnTest.json
@@ -1,5 +1,10 @@
 {
     "static_ReturnTest" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.d239486b.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTestFiller.json"
+        },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -51,7 +56,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x74aae4d5b5d99a68dedd68e6512dadc53b9469ac6dd7473fd1430e246a617806",
+                    "hash" : "0x1bf1cf36b2124a96efb8d31b1b47f721a804adec9b05a4b1ef4c2c6e00f3b59f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json b/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json
index 2e01063e7..6b19c3b97 100644
--- a/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json
+++ b/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json
@@ -1,5 +1,10 @@
 {
     "static_callToDelCallOpCodeCheck" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.53be05a3.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json"
+        },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -11,7 +16,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0xf7dcb003a72d0ad885880b24e6241d85c890775d07269f2959bbd8514cd9b116",
+                    "hash" : "0x4a05e190ca9b2aa6ea6bb26553943e38bc7d0fc5720214d0cede65006c02c5b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +26,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0xf7dcb003a72d0ad885880b24e6241d85c890775d07269f2959bbd8514cd9b116",
+                    "hash" : "0x4a05e190ca9b2aa6ea6bb26553943e38bc7d0fc5720214d0cede65006c02c5b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +36,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0xf7dcb003a72d0ad885880b24e6241d85c890775d07269f2959bbd8514cd9b116",
+                    "hash" : "0x4a05e190ca9b2aa6ea6bb26553943e38bc7d0fc5720214d0cede65006c02c5b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +46,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0xf7dcb003a72d0ad885880b24e6241d85c890775d07269f2959bbd8514cd9b116",
+                    "hash" : "0x4a05e190ca9b2aa6ea6bb26553943e38bc7d0fc5720214d0cede65006c02c5b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +56,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xf2b0f2957a6864f494e4f88ba73477ecf6d59666cce4ec7e280cc4922b1ee32e",
+                    "hash" : "0xf27b07631e1e35993285fd56e6e21dc79b16c4aa0710c20334773f1b9a4dc624",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +82,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000014604b5760026001556051565b60016001525b30731000000000000000000000000000000000000001146074576002600155607a565b60016001525b34620186a014608c5760026001556092565b60016001525b",
+                "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000014604b5760026001556051565b60016001525b30731000000000000000000000000000000000000001146074576002600155607a565b60016001525b34600014608a5760026001556090565b60016001525b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/GeneralStateTests/stStaticCall/static_callToStaticOpCodeCheck.json b/GeneralStateTests/stStaticCall/static_callToStaticOpCodeCheck.json
index 3b8cfe53d..c833728e3 100644
--- a/GeneralStateTests/stStaticCall/static_callToStaticOpCodeCheck.json
+++ b/GeneralStateTests/stStaticCall/static_callToStaticOpCodeCheck.json
@@ -1,5 +1,10 @@
 {
     "static_callToStaticOpCodeCheck" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.53be05a3.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json"
+        },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -11,7 +16,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0x51908849a3a398fb5c365a5fab81558e355499bc37386550e7681bbc0a939a90",
+                    "hash" : "0xf4fae6c9153d7bc9db07d90c1481e2d04fee420a1f5ce32eeeed2480907f7b1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +26,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0x51908849a3a398fb5c365a5fab81558e355499bc37386550e7681bbc0a939a90",
+                    "hash" : "0xf4fae6c9153d7bc9db07d90c1481e2d04fee420a1f5ce32eeeed2480907f7b1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +36,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0x51908849a3a398fb5c365a5fab81558e355499bc37386550e7681bbc0a939a90",
+                    "hash" : "0xf4fae6c9153d7bc9db07d90c1481e2d04fee420a1f5ce32eeeed2480907f7b1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +46,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0x51908849a3a398fb5c365a5fab81558e355499bc37386550e7681bbc0a939a90",
+                    "hash" : "0xf4fae6c9153d7bc9db07d90c1481e2d04fee420a1f5ce32eeeed2480907f7b1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +56,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xc7bfb8eee1d22e9f35f09a52d4c3bc927661eedd062495e607caa89404cc677d",
+                    "hash" : "0x84398cb8003abdfdfe57ab2377b14dbd83e4f7633e04f72784e45a387d5998c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +82,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000114604b5760026001556051565b60016001525b30731000000000000000000000000000000000000002146074576002600155607a565b60016001525b34620186a014608c5760026001556092565b60016001525b",
+                "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000114604b5760026001556051565b60016001525b30731000000000000000000000000000000000000002146074576002600155607a565b60016001525b34600014608a5760026001556090565b60016001525b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/GeneralStateTests/stStaticCall/static_call_value_inherit.json b/GeneralStateTests/stStaticCall/static_call_value_inherit.json
new file mode 100644
index 000000000..651d9074f
--- /dev/null
+++ b/GeneralStateTests/stStaticCall/static_call_value_inherit.json
@@ -0,0 +1,108 @@
+{
+    "static_call_value_inherit" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.5bca1594.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xc5d9e23a003e568560c82fdfd24f2bf6d127c46de7f72c54d9f778d62fa74fbf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xc5d9e23a003e568560c82fdfd24f2bf6d127c46de7f72c54d9f778d62fa74fbf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xc5d9e23a003e568560c82fdfd24f2bf6d127c46de7f72c54d9f778d62fa74fbf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc5d9e23a003e568560c82fdfd24f2bf6d127c46de7f72c54d9f778d62fa74fbf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x89ea1ffb32a55407e6ad55d9ec39a8a27edb0397a3c3a40ac2b84072cdea6f78",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350fa600055600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x3460005260206000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0704e0"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x0a"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_call_value_inherit_from_call.json b/GeneralStateTests/stStaticCall/static_call_value_inherit_from_call.json
new file mode 100644
index 000000000..d5e1c9379
--- /dev/null
+++ b/GeneralStateTests/stStaticCall/static_call_value_inherit_from_call.json
@@ -0,0 +1,115 @@
+{
+    "static_call_value_inherit_from_call" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.5bca1594.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x68a0e8cef995f94a37114ca57ad3b172c6de346f3cb333a806ebb7a0cd2b6005",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x68a0e8cef995f94a37114ca57ad3b172c6de346f3cb333a806ebb7a0cd2b6005",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x7fe3f4754897e3ffa189561ff6d94e43c6dc2fbaffa299037c73740099d9100f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x7fe3f4754897e3ffa189561ff6d94e43c6dc2fbaffa299037c73740099d9100f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xa029c69b1ece1e1d9b91446b4029a16f25e89aca3c78e66a39d16cf8ee71ad66",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350fa600055600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc8b90f8d999d9d9988209481999a9889098a89a0" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x3460005260206000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0704e0"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc8b90f8d999d9d9988209481999a9889098a89a0",
+            "value" : [
+                "0x0a"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
index 7aff2173a..784bebd69 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
@@ -40,7 +40,7 @@
 		    "1000000000000000000000000000000000000000" : {
 			"storage" : {
                             "0x00" : "0x01",
-			    "0x01" : "0x1000001848dd"
+			    "0x01" : "0x0ffffff458dd"
                         }
 		    }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json
index afd42b8c9..ade86c359 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json
@@ -48,7 +48,7 @@
 		    "1000000000000000000000000000000000000000" : {
 			"storage" : {
                             "0x00" : "0x01",
-			    "0x01" : "0x1000001848dd"
+			    "0x01" : "0x0ffffff458dd"
                         }
 		     } 
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
index 21b6484a8..6a041c17f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
@@ -24,7 +24,7 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"code" : "Static call succeed",
                 "code" : "{  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }",
                 "nonce" : "0",
                 "storage" : {
@@ -40,7 +40,7 @@
             },
 	    "1000000000000000000000000000000000000002" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0x0186a0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) )        }",
+                "code" : "{  (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) )        }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
index 4e1bf5c1b..7c8537f05 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
@@ -40,7 +40,7 @@
             },
 	    "1000000000000000000000000000000000000002" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0x0186a0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) )        }",
+                "code" : "{  (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) )        }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json
new file mode 100644
index 000000000..09c9a9748
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json
@@ -0,0 +1,70 @@
+{
+    "static_call_value_inherit" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Metropolis"],
+                "result" : {
+                    "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x0" : "0x1",
+                            "0x1" : "0x0"
+                        }
+                    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1",
+                "code" : "{ [[0]] (STATICCALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 32) [[1]] (MLOAD 0) }",
+                "nonce" : "0",
+                "storage" : {
+                    "0x1": "1"
+                }
+            },
+            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1",
+                "code" : "{ (MSTORE 0 (CALLVALUE)) (RETURN 0 32) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "460000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "10"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json
new file mode 100644
index 000000000..43183da30
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json
@@ -0,0 +1,76 @@
+{
+    "static_call_value_inherit_from_call" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Metropolis"],
+                "result" : {
+                    "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x0" : "0x1",
+                            "0x1" : "0x0"
+                        }
+                    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1",
+                "code" : "{ [[0]] (STATICCALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 32) [[1]] (MLOAD 0) }",
+                "nonce" : "0",
+                "storage" : {
+                    "0x1": "1"
+                }
+            },
+            "c8b90f8d999d9d9988209481999a9889098a89a0" : {
+                "balance" : "0",
+                "code" : "{ (CALL 100000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) }",
+                "nonce" : "0",
+                "storage" : {}
+            },
+            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1",
+                "code" : "{ (MSTORE 0 (CALLVALUE)) (RETURN 0 32) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "460000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "c8b90f8d999d9d9988209481999a9889098a89a0",
+            "value" : [
+                "10"
+            ]
+        }
+    }
+}