Merge pull request #283 from ethereum/returndatasize_after_staticcall

Add new `returndatasize/returndatacopy` state tests

8 files changed, 772 insertions, 0 deletions

diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_after_successful_callcode.json b/GeneralStateTests/stReturnDataTest/returndatacopy_after_successful_callcode.json
new file mode 100644
index 000000000..b7a36ea41
--- /dev/null
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_after_successful_callcode.json
@@ -0,0 +1,117 @@
+{
+    "returndatacopy_after_successful_callcode" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.9cee17ad.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Byzantium" : [
+                {
+                    "hash" : "0x94c35cc8022cadf0e10586ceddb4f220188720397637b080e1d6491913f15f8f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x94c35cc8022cadf0e10586ceddb4f220188720397637b080e1d6491913f15f8f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP150" : [
+                {
+                    "hash" : "0x33c5952ac1202c1fc363f3fe3afade31fd9a76a2e4d4519ff733515b86b60060",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x33c5952ac1202c1fc363f3fe3afade31fd9a76a2e4d4519ff733515b86b60060",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x33c5952ac1202c1fc363f3fe3afade31fd9a76a2e4d4519ff733515b86b60060",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x33c5952ac1202c1fc363f3fe3afade31fd9a76a2e4d4519ff733515b86b60060",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073a94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2506020600060003e600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_after_successful_delegatecall.json b/GeneralStateTests/stReturnDataTest/returndatacopy_after_successful_delegatecall.json
new file mode 100644
index 000000000..5dbaa2378
--- /dev/null
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_after_successful_delegatecall.json
@@ -0,0 +1,117 @@
+{
+    "returndatacopy_after_successful_delegatecall" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.9cee17ad.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Byzantium" : [
+                {
+                    "hash" : "0xb302bd16178d189ef3c96a204d314b73bdaff25bb77af8f0b2519d3674839c86",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xb302bd16178d189ef3c96a204d314b73bdaff25bb77af8f0b2519d3674839c86",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP150" : [
+                {
+                    "hash" : "0xc78405c9e240de4f84a9dc9be4a4adbf58264d50327d2625d39d94ae4faefcd4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xc78405c9e240de4f84a9dc9be4a4adbf58264d50327d2625d39d94ae4faefcd4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xc78405c9e240de4f84a9dc9be4a4adbf58264d50327d2625d39d94ae4faefcd4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc78405c9e240de4f84a9dc9be4a4adbf58264d50327d2625d39d94ae4faefcd4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073a94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4506020600060003e600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "0x3360005260206000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stReturnDataTest/returndatasize_after_successful_delegatecall.json b/GeneralStateTests/stReturnDataTest/returndatasize_after_successful_delegatecall.json
new file mode 100644
index 000000000..034e75705
--- /dev/null
+++ b/GeneralStateTests/stReturnDataTest/returndatasize_after_successful_delegatecall.json
@@ -0,0 +1,117 @@
+{
+    "returndatasize_after_successful_delegatecall" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.9cee17ad.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Byzantium" : [
+                {
+                    "hash" : "0x11af271a012bcb4da8fee83c7268d38adeb1a97e5b495073b76445a4bfe1470e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x11af271a012bcb4da8fee83c7268d38adeb1a97e5b495073b76445a4bfe1470e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP150" : [
+                {
+                    "hash" : "0x7abce181934e9acd32e4cc1de7207f39e1844a7f9a97a039f70bab221db8ccb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x7abce181934e9acd32e4cc1de7207f39e1844a7f9a97a039f70bab221db8ccb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x7abce181934e9acd32e4cc1de7207f39e1844a7f9a97a039f70bab221db8ccb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x7abce181934e9acd32e4cc1de7207f39e1844a7f9a97a039f70bab221db8ccb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073a94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4503d600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "0x3360005260146000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stReturnDataTest/returndatasize_after_successful_staticcall.json b/GeneralStateTests/stReturnDataTest/returndatasize_after_successful_staticcall.json
new file mode 100644
index 000000000..2cbbfe356
--- /dev/null
+++ b/GeneralStateTests/stReturnDataTest/returndatasize_after_successful_staticcall.json
@@ -0,0 +1,117 @@
+{
+    "returndatasize_after_successful_staticcall" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.9cee17ad.Linux.g++",
+            "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Byzantium" : [
+                {
+                    "hash" : "0x46cd00fa9b0633b31d07e162cf6f0fc47f8dcbcb8ba2f22b7f6e816337c76a26",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x46cd00fa9b0633b31d07e162cf6f0fc47f8dcbcb8ba2f22b7f6e816337c76a26",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP150" : [
+                {
+                    "hash" : "0xde7f9d731b84dbbb597e8e31733165573df7b7c042f227c94a08428ee893de06",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xde7f9d731b84dbbb597e8e31733165573df7b7c042f227c94a08428ee893de06",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xde7f9d731b84dbbb597e8e31733165573df7b7c042f227c94a08428ee893de06",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xde7f9d731b84dbbb597e8e31733165573df7b7c042f227c94a08428ee893de06",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073a94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa503d600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260066000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json
new file mode 100644
index 000000000..2f1cdc3e4
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json
@@ -0,0 +1,76 @@
+{
+    "returndatacopy_after_successful_callcode" : {
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code": "{  (CALLCODE 60000 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) (SSTORE 0 (MLOAD 0))}",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "{ (MSTORE 0x0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (RETURN 0 32) }",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "expect": [
+            {   
+                "indexes" : { 
+                   "data" : -1, 
+                   "gas" : -1, 
+                   "value" : -1
+                },
+                "network" : ["Byzantium", "Constantinople"],
+                "result" : { 
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 
+                        "storage" : { 
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                        }
+                    }
+                }
+            },
+            {   
+                "indexes" : { 
+                   "data" : -1, 
+                   "gas" : -1, 
+                   "value" : -1
+                },
+                "network" : ["Frontier", "Homestead", "EIP158"],
+                "result" : { 
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 
+                        "storage" : { 
+                            "0x00" : "0xffffffffffff"
+                        }
+                    }
+                }
+            }
+        ],
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json
new file mode 100644
index 000000000..be657b531
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json
@@ -0,0 +1,76 @@
+{
+    "returndatacopy_after_successful_delegatecall" : {
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code": "{ (DELEGATECALL 60000 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) ( SSTORE 0 (MLOAD 0))}",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "{ (MSTORE 0x0 (CALLER)) (RETURN 0 32) }",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "expect": [
+            {   
+                "indexes" : { 
+                   "data" : -1, 
+                   "gas" : -1, 
+                   "value" : -1
+                },
+                "network" : ["Byzantium", "Constantinople"],
+                "result" : { 
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 
+                        "storage" : { 
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    }
+                }
+            },
+            {   
+                "indexes" : { 
+                   "data" : -1, 
+                   "gas" : -1, 
+                   "value" : -1
+                },
+                "network" : ["Frontier", "Homestead", "EIP158"],
+                "result" : { 
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 
+                        "storage" : { 
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                        }
+                    }
+                }
+            }
+        ],
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json
new file mode 100644
index 000000000..9e6f2f472
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json
@@ -0,0 +1,76 @@
+{
+    "returndatasize_after_successful_delegatecall" : {
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code": "{ (seq (DELEGATECALL 60000 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)))}",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "{ (MSTORE 0x0 (CALLER)) (RETURN 0 20) }",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "expect": [
+            {   
+                "indexes" : { 
+                   "data" : -1, 
+                   "gas" : -1, 
+                   "value" : -1
+                },
+                "network" : ["Byzantium", "Constantinople"],
+                "result" : { 
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 
+                        "storage" : { 
+                            "0x00" : "0x14"
+                        }
+                    }
+                }
+            },
+            {   
+                "indexes" : { 
+                   "data" : -1, 
+                   "gas" : -1, 
+                   "value" : -1
+                },
+                "network" : ["Frontier", "Homestead", "EIP158"],
+                "result" : { 
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 
+                        "storage" : { 
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                        }
+                    }
+                }
+            }
+        ],
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json
new file mode 100644
index 000000000..58b515592
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json
@@ -0,0 +1,76 @@
+{
+    "returndatasize_after_successful_staticcall" : {
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code": "{ (seq (STATICCALL 60000 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)))}",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "{ (MSTORE 0x0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (RETURN 0 6) }",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "expect": [
+            {   
+                "indexes" : { 
+                   "data" : -1, 
+                   "gas" : -1, 
+                   "value" : -1
+                },
+                "network" : ["Byzantium", "Constantinople"],
+                "result" : { 
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 
+                        "storage" : { 
+                            "0x00" : "0x06"
+                        }
+                    }
+                }
+            },
+            {   
+                "indexes" : { 
+                   "data" : -1, 
+                   "gas" : -1, 
+                   "value" : -1
+                },
+                "network" : ["Frontier", "Homestead", "EIP158"],
+                "result" : { 
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 
+                        "storage" : { 
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                        }
+                    }
+                }
+            }
+        ],
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}