Merge pull request #544 from ajsutton/extcodehashv6.0.0-beta.2

Add EXTCODEHASH tests

10 files changed, 982 insertions, 0 deletions

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d0g0v0Filler.json
new file mode 100644
index 000000000..87a1b3afb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d0g0v0Filler.json
@@ -0,0 +1,100 @@
+{
+    "extCodeHashDynamicArgument_d0g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE with address from a dynamic argument"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a3c69d4e01d1605a9efe4499613dbd9124b205207472bc9be7ca539530a0656",
+                        "s" : "0x717ac62ecea670d75968daeadc4a663621db6abb2e46b0e944fb12e72883a37d",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a7640001",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000353f6000556000353b600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdeadbeef"
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x1234",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d1g0v0Filler.json
new file mode 100644
index 000000000..e86fffc34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d1g0v0Filler.json
@@ -0,0 +1,101 @@
+{
+    "extCodeHashDynamicArgument_d1g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE with address from a dynamic argument"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c6dddb73f5ea8903570be2a3329eeb64c69b8ba1772ebfb35cab492f3c8a47a",
+                        "s" : "0x68d8debb4d74e91d71e26636481a1a2b67ac507692a8595c21b4e862588f7f92",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a7640001",
+                        "storage" : {
+                            "0x00" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000353f6000556000353b600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdeadbeef"
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x1234",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d2g0v0Filler.json
new file mode 100644
index 000000000..28fc3167e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d2g0v0Filler.json
@@ -0,0 +1,102 @@
+{
+    "extCodeHashDynamicArgument_d2g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE with address from a dynamic argument"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000deadbeef00000000000000000000000000000001",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a53d2201599589f6da089f041692c0ed7291bb9ea1f48241e9c5b282369ca32",
+                        "s" : "0x75d4272b5fe22ae4c0dae83fad0cecb886aab8d0d58c6aa584b8d21df7d0baa3",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a7640001",
+                        "storage" : {
+                            "0x00" : "0x56570de287d73cd1cb6092bb8fdee6173974955fdef345ae579ee9f475ea7432",
+                            "0x01" : "0x02"
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000353f6000556000353b600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdeadbeef"
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x1234",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d3g0v0Filler.json
new file mode 100644
index 000000000..1f00a44ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d3g0v0Filler.json
@@ -0,0 +1,101 @@
+{
+    "extCodeHashDynamicArgument_d3g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE with address from a dynamic argument"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000deadbeef00000000000000000000000000000002",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66be214592a45eda727029d4f12b58051c5bcd639ad93d71ad38606e20663062",
+                        "s" : "0x02784a56b926cae458dfadbab5dc82b29c00ce4acd67f161901c754dc4459c53",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a7640001",
+                        "storage" : {
+                            "0x00" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000353f6000556000353b600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdeadbeef"
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x1234",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d4g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d4g0v0Filler.json
new file mode 100644
index 000000000..3b48172ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument_d4g0v0Filler.json
@@ -0,0 +1,100 @@
+{
+    "extCodeHashDynamicArgument_d4g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE with address from a dynamic argument"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000deadbeef00000000000000000000000000000005",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5e140e4aea6c562519c3a7d8cf77c5d5be27ec70913519ef7dc4570bd22e5e6",
+                        "s" : "0x028a38ae922c383d55ab209522af4155de16860ab77a39864f4315b7363c75d8",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a7640001",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000353f6000556000353b600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdeadbeef"
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x1234",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashSelfInInit_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashSelfInInit_d0g0v0Filler.json
new file mode 100644
index 000000000..c10a0a819
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashSelfInInit_d0g0v0Filler.json
@@ -0,0 +1,86 @@
+{
+    "extCodeHashSelfInInit_d0g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE of the account currently being created"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc202f0d1337e2d44fa1bf35877e7278363f8a0870146a587e8f75bbd10df9240",
+                        "s" : "0x5cb792200832e3876d0213563d9dc7705e255718f25455ca28eec91736e98c55",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1f6476353a2bc11f88f20836f80d2ea1554dd4b5" : {
+                        "balance" : "0x00",
+                        "storage" : {
+                            "0x00" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+                        }
+                    },
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a7640001",
+                        "storage" : {
+                            "0x00" : "0xdeadbeef"
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6010600f80601260003960006000f55000fe303f600055303b60015560006000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdeadbeef"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashSelf_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashSelf_d0g0v0Filler.json
new file mode 100644
index 000000000..95c33614a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashSelf_d0g0v0Filler.json
@@ -0,0 +1,81 @@
+{
+    "extCodeHashSelf_d0g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE of the currently executing account"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc202f0d1337e2d44fa1bf35877e7278363f8a0870146a587e8f75bbd10df9240",
+                        "s" : "0x5cb792200832e3876d0213563d9dc7705e255718f25455ca28eec91736e98c55",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a7640001",
+                        "storage" : {
+                            "0x00" : "0x43c7c0889fcfd6f96372b271391c53786415d307790ee45f0897b0e47ed61c8b",
+                            "0x01" : "0x32"
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73deadbeef000000000000000000000000000000003f60005573deadbeef000000000000000000000000000000003b600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdeadbeef"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json
new file mode 100644
index 000000000..8c1c7948e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json
@@ -0,0 +1,169 @@
+{
+    "extCodeHashDynamicArgument": {
+        "_info": {
+            "comment": "EXTCODEHASH/EXTCODESIZE with address from a dynamic argument"
+        },
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x20000",
+            "currentGasLimit": "1000000",
+            "currentNumber": "1",
+            "currentTimestamp": "1000",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect": [
+            {
+                "indexes": {
+                    "data": 0,
+                    "gas": 0,
+                    "value": 0
+                },
+                "network": [
+                    ">=Constantinople"
+                ],
+                "result": {
+                    "deadbeef00000000000000000000000000000000": {
+                        "balance": "1000000000000000001",
+                        "storage": {
+                            "0x00": "0x00",
+                            "0x01": "0x00"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes": {
+                    "data": 1,
+                    "gas": 0,
+                    "value": 0
+                },
+                "network": [
+                    ">=Constantinople"
+                ],
+                "result": {
+                    "deadbeef00000000000000000000000000000000": {
+                        "balance": "1000000000000000001",
+                        "storage": {
+                            "0x00": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                            "0x01": "0x00"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes": {
+                    "data": 2,
+                    "gas": 0,
+                    "value": 0
+                },
+                "network": [
+                    ">=Constantinople"
+                ],
+                "result": {
+                    "deadbeef00000000000000000000000000000000": {
+                        "balance": "1000000000000000001",
+                        "storage": {
+                            "0x00": "0x56570de287d73cd1cb6092bb8fdee6173974955fdef345ae579ee9f475ea7432",
+                            "0x01": "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes": {
+                    "data": 3,
+                    "gas": 0,
+                    "value": 0
+                },
+                "network": [
+                    ">=Constantinople"
+                ],
+                "result": {
+                    "deadbeef00000000000000000000000000000000": {
+                        "balance": "1000000000000000001",
+                        "storage": {
+                            "0x00": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                            "0x01": "0x00"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes": {
+                    "data": 4,
+                    "gas": 0,
+                    "value": 0
+                },
+                "network": [
+                    ">=Constantinople"
+                ],
+                "result": {
+                    "deadbeef00000000000000000000000000000000": {
+                        "balance": "1000000000000000001",
+                        "storage": {
+                            "0x00": "0x00",
+                            "0x01": "0x00"
+                        }
+                    }
+                }
+            }
+        ],
+        "pre": {
+            "0000000000000000000000000000000000000002": {
+                "balance": "10",
+                "code": "",
+                "nonce": "0",
+                "storage": {
+                }
+            },
+            "deadbeef00000000000000000000000000000000": {
+                "balance": "1000000000000000000",
+                "code": "{  [[0]] (EXTCODEHASH (CALLDATALOAD 0)) [[1]] (EXTCODESIZE (CALLDATALOAD 0)) }",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0xdeadbeef"
+                }
+            },
+            "deadbeef00000000000000000000000000000001": {
+                "balance": "1000000000000000000",
+                "code": "0x1234",
+                "nonce": "0",
+                "storage": {
+                }
+            },
+            "deadbeef00000000000000000000000000000002": {
+                "balance": "1000000000000000000",
+                "code": "",
+                "nonce": "0",
+                "storage": {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+                "balance": "1000000000000000000",
+                "code": "0x",
+                "nonce": "0",
+                "storage": {
+                }
+            }
+        },
+        "transaction": {
+            "data": [
+                "0x0000000000000000000000000000000000000000000000000000000000000001",
+                "0x0000000000000000000000000000000000000000000000000000000000000002",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000001",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000002",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000005"
+            ],
+            "gasLimit": [
+                "400000"
+            ],
+            "gasPrice": "1",
+            "nonce": "0",
+            "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to": "deadbeef00000000000000000000000000000000",
+            "value": [
+                "1"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfFiller.json
new file mode 100644
index 000000000..a35198174
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfFiller.json
@@ -0,0 +1,68 @@
+{
+  "extCodeHashSelf": {
+    "_info": {
+      "comment": "EXTCODEHASH/EXTCODESIZE of the currently executing account"
+    },
+    "env": {
+      "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentDifficulty": "0x20000",
+      "currentGasLimit": "1000000",
+      "currentNumber": "1",
+      "currentTimestamp": "1000",
+      "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    },
+    "expect": [
+      {
+        "indexes": {
+          "data": -1,
+          "gas": -1,
+          "value": -1
+        },
+        "network": [
+          ">=Constantinople"
+        ],
+        "result": {
+          "deadbeef00000000000000000000000000000000": {
+            "balance": "1000000000000000001",
+            "storage": {
+              "0x00": "0x43c7c0889fcfd6f96372b271391c53786415d307790ee45f0897b0e47ed61c8b",
+              "0x01": "0x32"
+            }
+          }
+        }
+      }
+    ],
+    "pre": {
+      "deadbeef00000000000000000000000000000000": {
+        "balance": "1000000000000000000",
+        "code": "{  [[0]] (EXTCODEHASH 0xdeadbeef00000000000000000000000000000000) [[1]] (EXTCODESIZE 0xdeadbeef00000000000000000000000000000000) }",
+        "nonce": "0",
+        "storage": {
+          "0x00": "0xdeadbeef"
+        }
+      },
+      "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "1000000000000000000",
+        "code": "0x",
+        "nonce": "0",
+        "storage": {
+        }
+      }
+    },
+    "transaction": {
+      "data": [
+        ""
+      ],
+      "gasLimit": [
+        "400000"
+      ],
+      "gasPrice": "1",
+      "nonce": "0",
+      "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+      "to": "deadbeef00000000000000000000000000000000",
+      "value": [
+        "1"
+      ]
+    }
+  }
+}
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfInInitFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfInInitFiller.json
new file mode 100644
index 000000000..5d7b9cb89
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfInInitFiller.json
@@ -0,0 +1,74 @@
+{
+  "extCodeHashSelfInInit": {
+    "_info": {
+      "comment": "EXTCODEHASH/EXTCODESIZE of the account currently being created"
+    },
+    "env": {
+      "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentDifficulty": "0x20000",
+      "currentGasLimit": "1000000",
+      "currentNumber": "1",
+      "currentTimestamp": "1000",
+      "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    },
+    "expect": [
+      {
+        "indexes": {
+          "data": -1,
+          "gas": -1,
+          "value": -1
+        },
+        "network": [
+          ">=Constantinople"
+        ],
+        "result": {
+          "deadbeef00000000000000000000000000000000": {
+            "balance": "1000000000000000001",
+            "storage": {
+              "0x00": "0xdeadbeef"
+            }
+          },
+          "1f6476353a2bc11f88f20836f80d2ea1554dd4b5": {
+            "balance": "0",
+            "storage": {
+              "0x00": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+              "0x01": "0x00"
+            }
+          }
+        }
+      }
+    ],
+    "pre": {
+      "deadbeef00000000000000000000000000000000": {
+        "balance": "1000000000000000000",
+        "code": "{ (CREATE2 0 0 (lll {[[0]] (EXTCODEHASH (ADDRESS)) [[1]] (EXTCODESIZE (ADDRESS)) (RETURN 0 0)} 0) 0x10) (STOP) }",
+        "nonce": "0",
+        "storage": {
+          "0x00": "0xdeadbeef"
+        }
+      },
+      "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "1000000000000000000",
+        "code": "0x",
+        "nonce": "0",
+        "storage": {
+        }
+      }
+    },
+    "transaction": {
+      "data": [
+        ""
+      ],
+      "gasLimit": [
+        "400000"
+      ],
+      "gasPrice": "1",
+      "nonce": "0",
+      "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+      "to": "deadbeef00000000000000000000000000000000",
+      "value": [
+        "1"
+      ]
+    }
+  }
+}