1 files changed, 66 insertions, 10 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2checkFieldsInInitcode_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2checkFieldsInInitcode_d2g0v0.json
index 5b40e165b..9930faeb3 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2checkFieldsInInitcode_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2checkFieldsInInitcode_d2g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2checkFieldsInInitcode_d2g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "Check opcode values in create2 init code. Create2 called with different call types.",
+            "comment" : "Check opcode values in create2 init code. Create2 called with different call types. CREATE2 inside CRETE2 inside CALL, CALLCODE, DELEGATECALL, STATICCALL << test values of  SENDER,address and so on.",
             "filledwith" : "testeth 1.5.0.dev2+commit.253a2986.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2checkFieldsInInitcode_d2g0v0Filler.json",
-            "sourceHash" : "1c3e1fad9c1511e4f83f43aeae1c1e7e89f169618eda5aebf556f41f7d456850"
+            "sourceHash" : "42f271ae4f228aa6546403cd561326dcd5a0871d3b6fcafd09f633df983ac1e1"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x02603c",
-                    "hash" : "0x9a8b6eceffa65c0affe7e1d57f80ac90b6414921a9fcbd23fdba9167cd7a435b",
+                    "hash" : "0xbb99ab01be9d91377c6fdcf35094aaa5381caa02de7d894201fbc88e9a587bd8",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x541db14b16252a8ba4934494a24c2b8a7b4acf82777991fb2dfdfcdb1a88cd0e",
+                    "parentHash" : "0xe16e353dbc718e894e0103300c651f64df4d7449fae5a4b631e1a0fd30a4014b",
                     "receiptTrie" : "0xfc923681d1950500b5cdd58b26f5c2eefdadacdd113f7f41a07b7ae1fbcb2acd",
-                    "stateRoot" : "0x7116ee419bc4478d39df08286414fd5337d90d520c565a6409f6c27d07eb749a",
+                    "stateRoot" : "0xfdb42bf435db3ac6787293ed42ede7c62da1392b3ad2ac4b8d72995ca3db0930",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8877cbced3e2868a8b17d42f6b3ea5a32d0b78205e48235faf3ee5e17fe2501c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0541db14b16252a8ba4934494a24c2b8a7b4acf82777991fb2dfdfcdb1a88cd0ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07116ee419bc4478d39df08286414fd5337d90d520c565a6409f6c27d07eb749aa08877cbced3e2868a8b17d42f6b3ea5a32d0b78205e48235faf3ee5e17fe2501ca0fc923681d1950500b5cdd58b26f5c2eefdadacdd113f7f41a07b7ae1fbcb2acdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408302603c8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f882f8808001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a000000000000000000000000030000000000000000000000000000000000000001ca0f1638c0ee0025df9638929f06fa81d35af0ceeab0099952a9ff9438df08e12d7a06d55c7e2b3b620c9668a27fb16592c67aca2d41c2bfb1a1b5cc66013b69b4294c0",
+                "rlp" : "0xf90280f901f8a0e16e353dbc718e894e0103300c651f64df4d7449fae5a4b631e1a0fd30a4014ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb42bf435db3ac6787293ed42ede7c62da1392b3ad2ac4b8d72995ca3db0930a08877cbced3e2868a8b17d42f6b3ea5a32d0b78205e48235faf3ee5e17fe2501ca0fc923681d1950500b5cdd58b26f5c2eefdadacdd113f7f41a07b7ae1fbcb2acdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408302603c8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f882f8808001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a000000000000000000000000030000000000000000000000000000000000000001ca0f1638c0ee0025df9638929f06fa81d35af0ceeab0099952a9ff9438df08e12d7a06d55c7e2b3b620c9668a27fb16592c67aca2d41c2bfb1a1b5cc66013b69b4294c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000003000000000000000000000000000000000000000",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x541db14b16252a8ba4934494a24c2b8a7b4acf82777991fb2dfdfcdb1a88cd0e",
+            "hash" : "0xe16e353dbc718e894e0103300c651f64df4d7449fae5a4b631e1a0fd30a4014b",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x048c4ea0f9ce2f7051ac1e28b06c5f5d5e2ff308ae981169cde474ac003a31d8",
+            "stateRoot" : "0xe31351ad2653233bfaf3676f3769ae30245ac3a725f5b9229f882cfab25be9ed",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0048c4ea0f9ce2f7051ac1e28b06c5f5d5e2ff308ae981169cde474ac003a31d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a8b6eceffa65c0affe7e1d57f80ac90b6414921a9fcbd23fdba9167cd7a435b",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e31351ad2653233bfaf3676f3769ae30245ac3a725f5b9229f882cfab25be9eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbb99ab01be9d91377c6fdcf35094aaa5381caa02de7d894201fbc88e9a587bd8",
         "network" : "Constantinople",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -74,6 +74,13 @@
                 "storage" : {
                 }
             },
+            "0x1100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000602180601060003960006000f5006000600060006000600073f0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073f0000000000000000000000000000000000000005af2",
@@ -81,6 +88,13 @@
                 "storage" : {
                 }
             },
+            "0x2200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000602180601060003960006000f5006000600060006000600073f0000000000000000000000000000000000000005af2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x262ddf6ce5b06776eaa045900e933d0be3074c26" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -107,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x3300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000601f80601060003960006000f500600060006000600073f0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x4000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x61010060006000600073f2000000000000000000000000000000000000005afa50600051600a55",
@@ -114,6 +135,13 @@
                 "storage" : {
                 }
             },
+            "0x4400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000602780601060003960006000f50061010060006000600073f2000000000000000000000000000000000000005afa50600051600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7619fc4",
                 "code" : "",
@@ -151,6 +179,13 @@
                 "storage" : {
                 }
             },
+            "0x1100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000602180601060003960006000f5006000600060006000600073f0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073f0000000000000000000000000000000000000005af2",
@@ -158,6 +193,13 @@
                 "storage" : {
                 }
             },
+            "0x2200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000602180601060003960006000f5006000600060006000600073f0000000000000000000000000000000000000005af2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000600073f0000000000000000000000000000000000000005af4",
@@ -165,6 +207,13 @@
                 "storage" : {
                 }
             },
+            "0x3300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000601f80601060003960006000f500600060006000600073f0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x4000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x61010060006000600073f2000000000000000000000000000000000000005afa50600051600a55",
@@ -172,6 +221,13 @@
                 "storage" : {
                 }
             },
+            "0x4400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000602780601060003960006000f50061010060006000600073f2000000000000000000000000000000000000005afa50600051600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "",