Add more dynamic argument test cases to cover non-existent accounts, precompiles (existing and non-existing) and empty accounts.

2 files changed, 135 insertions, 60 deletions

diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument.json b/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument.json
index 3e1db65d5..31f3da013 100644
--- a/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument.json
+++ b/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument.json
@@ -5,7 +5,7 @@
             "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
             "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
             "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json",
-            "sourceHash" : "e2709b0f48dd2fe2d301ab2ec8be79e17c9670070d313fe974bcd0ecdd711c70"
+            "sourceHash" : "a5964baf916ec15a0e3ffa1493619be6f63353ce13c1009d7eb4125ed55f4501"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -16,66 +16,47 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "Byzantium" : [
-                {
-                    "hash" : "0x2ffec9d4b7c1064dc9e9180bdcfe021b7f59cd0fee6c00767146407121f118e0",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Constantinople" : [
                 {
-                    "hash" : "0xa62cbeb822ef70fd8572382d509fa76186025e04643a288121f40294f377f504",
+                    "hash" : "0x2ceab025ea1bcf156d3b82dcd37082bbd7550c50933057550a55a7dce4c06df0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "EIP150" : [
+                },
                 {
-                    "hash" : "0x2ffec9d4b7c1064dc9e9180bdcfe021b7f59cd0fee6c00767146407121f118e0",
+                    "hash" : "0xb0878015195f42a2ad9d9cda16d17dbde5d829f67fe0652584b033536812d461",
                     "indexes" : {
-                        "data" : 0,
+                        "data" : 1,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "EIP158" : [
+                },
                 {
-                    "hash" : "0x2ffec9d4b7c1064dc9e9180bdcfe021b7f59cd0fee6c00767146407121f118e0",
+                    "hash" : "0x83d0fe0139e0eede930502f5e71ff83850d01487bd5507facac250cf71ee1a55",
                     "indexes" : {
-                        "data" : 0,
+                        "data" : 2,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
+                },
                 {
-                    "hash" : "0x2ffec9d4b7c1064dc9e9180bdcfe021b7f59cd0fee6c00767146407121f118e0",
+                    "hash" : "0x12770950f6dfcf23bd78a684e8389f6dbdabc4944a98b044f9e4b34e22b2cf4d",
                     "indexes" : {
-                        "data" : 0,
+                        "data" : 3,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Homestead" : [
+                },
                 {
-                    "hash" : "0x2ffec9d4b7c1064dc9e9180bdcfe021b7f59cd0fee6c00767146407121f118e0",
+                    "hash" : "0x31ff8223ef2320fc851caa4ee45137b1cf8f0b1a516ea4d05c650aeec4abf4b8",
                     "indexes" : {
-                        "data" : 0,
+                        "data" : 4,
                         "gas" : 0,
                         "value" : 0
                     },
@@ -84,6 +65,13 @@
             ]
         },
         "pre" : {
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "",
@@ -105,11 +93,22 @@
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xdeadbeef00000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x000000000000000000000000deadbeef00000000000000000000000000000001"
+                "0x0000000000000000000000000000000000000000000000000000000000000001",
+                "0x0000000000000000000000000000000000000000000000000000000000000002",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000001",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000002",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000005"
             ],
             "gasLimit" : [
                 "0x061a80"
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json
index 5ae89827e..adb71f04a 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json
@@ -1,22 +1,60 @@
 {
-    "extCodeHashDynamicArgument" : {
-	"_info" : {
-	    "comment": "EXTCODEHASH/EXTCODESIZE with address from a dynamic argument"
-	},
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    "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": -1,
-                    "gas": -1,
-                    "value": -1
+                    "data": 0,
+                    "gas": 0,
+                    "value": 0
+                },
+                "network": [
+                    ">Byzantium"
+                ],
+                "result": {
+                    "deadbeef00000000000000000000000000000000": {
+                        "balance": "1000000000000000001",
+                        "storage": {
+                            "0x00": "0x00",
+                            "0x01": "0x00"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes": {
+                    "data": 1,
+                    "gas": 0,
+                    "value": 0
+                },
+                "network": [
+                    ">Byzantium"
+                ],
+                "result": {
+                    "deadbeef00000000000000000000000000000000": {
+                        "balance": "1000000000000000001",
+                        "storage": {
+                            "0x00": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                            "0x01": "0x00"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes": {
+                    "data": 2,
+                    "gas": 0,
+                    "value": 0
                 },
                 "network": [
                     ">Byzantium"
@@ -33,24 +71,51 @@
             },
             {
                 "indexes": {
-                    "data": -1,
-                    "gas": -1,
-                    "value": -1
+                    "data": 3,
+                    "gas": 0,
+                    "value": 0
                 },
                 "network": [
-                    "<=Byzantium"
+                    ">Byzantium"
+                ],
+                "result": {
+                    "deadbeef00000000000000000000000000000000": {
+                        "balance": "1000000000000000001",
+                        "storage": {
+                            "0x00": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                            "0x01": "0x00"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes": {
+                    "data": 4,
+                    "gas": 0,
+                    "value": 0
+                },
+                "network": [
+                    ">Byzantium"
                 ],
                 "result": {
                     "deadbeef00000000000000000000000000000000": {
-                        "balance": "1000000000000000000",
+                        "balance": "1000000000000000001",
                         "storage": {
-                            "0x00": "0xdeadbeef"
+                            "0x00": "0x00",
+                            "0x01": "0x00"
                         }
                     }
                 }
             }
         ],
         "pre": {
+            "0000000000000000000000000000000000000002": {
+                "balance": "10",
+                "code": "",
+                "nonce": "0",
+                "storage": {
+                }
+            },
             "deadbeef00000000000000000000000000000000": {
                 "balance": "1000000000000000000",
                 "code": "{  [[0]] (EXTCODEHASH (CALLDATALOAD 0)) [[1]] (EXTCODESIZE (CALLDATALOAD 0)) }",
@@ -59,11 +124,18 @@
                     "0x00": "0xdeadbeef"
                 }
             },
-            "deadbeef00000000000000000000000000000001" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x1234",
-                "nonce" : "0",
-                "storage" : {
+            "deadbeef00000000000000000000000000000001": {
+                "balance": "1000000000000000000",
+                "code": "0x1234",
+                "nonce": "0",
+                "storage": {
+                }
+            },
+            "deadbeef00000000000000000000000000000002": {
+                "balance": "1000000000000000000",
+                "code": "",
+                "nonce": "0",
+                "storage": {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
@@ -76,7 +148,11 @@
         },
         "transaction": {
             "data": [
-                "0x000000000000000000000000deadbeef00000000000000000000000000000001"
+                "0x0000000000000000000000000000000000000000000000000000000000000001",
+                "0x0000000000000000000000000000000000000000000000000000000000000002",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000001",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000002",
+                "0x000000000000000000000000deadbeef00000000000000000000000000000005"
             ],
             "gasLimit": [
                 "400000"