Add one-less and one-more numbers

2 files changed, 99 insertions, 10 deletions

diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
index f220cfff1..f7c23f161 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
@@ -2,7 +2,7 @@
     "returndatacopy_initial_256" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.a2db987f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.29c877a3.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json"
         },
         "env" : {
@@ -16,59 +16,139 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0x852874c92035359cba22282e4e1c044bdc7fcd295c9c33695b0bdf4293a9df36",
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "0x852874c92035359cba22282e4e1c044bdc7fcd295c9c33695b0bdf4293a9df36",
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "0x852874c92035359cba22282e4e1c044bdc7fcd295c9c33695b0bdf4293a9df36",
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "0x852874c92035359cba22282e4e1c044bdc7fcd295c9c33695b0bdf4293a9df36",
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x852874c92035359cba22282e4e1c044bdc7fcd295c9c33695b0bdf4293a9df36",
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
                 }
             ]
         },
         "pre" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6e112233445566778899aabbccddeeff6000526020600060206000033e600051600055",
+                "code" : "0x60206000600037606460006000516000033e6e112233445566778899aabbccddeeff600052600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -84,7 +164,9 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x0000000000000000000000000000000000000000000000000000000000000064",
+                "0x0000000000000000000000000000000000000000000000000000000000000063",
+                "0x0000000000000000000000000000000000000000000000000000000000000065"
             ],
             "gasLimit" : [
                 "0x0a00000000"
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json
index 6896c6a34..d47e256c8 100644
--- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json
@@ -27,7 +27,7 @@
         "pre" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "{ (MSTORE 0 0x112233445566778899aabbccddeeff) (RETURNDATACOPY (- 0 32) 0 32) (SSTORE 0 (MLOAD 0)) }",
+                "code" : "{ (CALLDATACOPY 0 0 32) (RETURNDATACOPY (- 0 (MLOAD 0)) 0 0x64) (MSTORE 0 0x112233445566778899aabbccddeeff) (SSTORE 0 (MLOAD 0)) }",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -43,7 +43,14 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0: the sum of RETURNDATACOPY's first and third arguments is 2^256",
+                "1: one smaller",
+                "2: one bigger", "anyway the RETURNDATACOPY should cause an exceptional halt."
+            ],
+            "data" : [
+                "0x0000000000000000000000000000000000000000000000000000000000000064",
+                "0x0000000000000000000000000000000000000000000000000000000000000063",
+                "0x0000000000000000000000000000000000000000000000000000000000000065"
             ],
             "gasLimit" : [
                 "0x0a00000000"