Changes for EIP-684

The change was agreed on the last coredev call and this morning I got an OK from @arkpar.

6 files changed, 22 insertions, 112 deletions

diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
index 6d0c74e97..54ff82d30 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
@@ -2,7 +2,7 @@
     "createJS_ExampleContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.b90fb307.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.b1ea1f1a.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json"
         },
         "env" : {
@@ -16,7 +16,7 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0x47997b31a4b872334cf7630b84b14385e84a56c3004147c8340cb221ee54a64c",
+                    "hash" : "0x461c87413f1515b197cc0607decd0871b9905251670b18e100090c527db61f13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -38,7 +38,7 @@
             ],
             "EIP150" : [
                 {
-                    "hash" : "0xcbd303b75efc04ae0d2eeb8cda08a086ece1f651b39338e42eb9d4446c118981",
+                    "hash" : "0x461c87413f1515b197cc0607decd0871b9905251670b18e100090c527db61f13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -49,7 +49,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0x47997b31a4b872334cf7630b84b14385e84a56c3004147c8340cb221ee54a64c",
+                    "hash" : "0x461c87413f1515b197cc0607decd0871b9905251670b18e100090c527db61f13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -60,7 +60,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0x6f601e073bf2d20e627cdf13f1e9976888658813d0f9425c57d07650bc1de7de",
+                    "hash" : "0x461c87413f1515b197cc0607decd0871b9905251670b18e100090c527db61f13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0xcbd303b75efc04ae0d2eeb8cda08a086ece1f651b39338e42eb9d4446c118981",
+                    "hash" : "0x461c87413f1515b197cc0607decd0871b9905251670b18e100090c527db61f13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
index 044b96ce4..2fe4a49bd 100644
--- a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
@@ -2,7 +2,7 @@
     "RevertDepthCreateAddressCollision" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.b90fb307.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.b1ea1f1a.Linux.clang",
             "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json"
         },
         "env" : {
@@ -70,7 +70,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x0c7b356c3b36ebac5243f47fccfe6f036e6fc039fdaa87696c897c42b79806f3",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -79,7 +79,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x4e6ed5a94aa24414b64250913a2450a9fdcfd07a585fb83083e6215b898cd7b9",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -218,7 +218,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x9406f62f8076b4aeda0df90dda740f7baf01a974a60a0e2f4a1c6d3b82d2dad0",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -227,7 +227,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x351e539bd904c6a9c1f78675c78b4263f58f6922dfc3c92cc05ee30ef36c5f6b",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -292,7 +292,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x0c7b356c3b36ebac5243f47fccfe6f036e6fc039fdaa87696c897c42b79806f3",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -301,7 +301,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x4e6ed5a94aa24414b64250913a2450a9fdcfd07a585fb83083e6215b898cd7b9",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
diff --git a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
index 540bf9165..0126e1472 100644
--- a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
+++ b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
@@ -2,7 +2,7 @@
     "CreateHashCollision" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.b90fb307.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.b1ea1f1a.Linux.clang",
             "source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json"
         },
         "env" : {
@@ -16,7 +16,7 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xd73594e1cf8108b5cb811ece843511874fea2a4536d12d08e92258b46be8f7f4",
+                    "hash" : "0xed83cfbd371641f3a30d68735ef254d558e8751dbc237d721b5704fa91e58e7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -38,7 +38,7 @@
             ],
             "EIP150" : [
                 {
-                    "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
+                    "hash" : "0xed83cfbd371641f3a30d68735ef254d558e8751dbc237d721b5704fa91e58e7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -49,7 +49,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0xd73594e1cf8108b5cb811ece843511874fea2a4536d12d08e92258b46be8f7f4",
+                    "hash" : "0xed83cfbd371641f3a30d68735ef254d558e8751dbc237d721b5704fa91e58e7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -60,7 +60,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
+                    "hash" : "0x73df31e79206a771ee1fe25af820f6723ee5ba6b77b17e829513960f39d867ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
+                    "hash" : "0x73df31e79206a771ee1fe25af820f6723ee5ba6b77b17e829513960f39d867ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
index 921a80f39..b65710c59 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
@@ -9,23 +9,9 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
-            {
-                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead", "EIP158", "EIP150", "Byzantium"],
-                "result" : {
-            	    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                	"storage" : {
-                        "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "0x01" : "0x42",
-                        "0x02" : "0x23",
-                        "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "0x05" : "0x03e8" }
-                     }
-            	}
-	    },
 	    {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Constantinople" ],
+                "network" : ["ALL"],
                 "result" : {
             	    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
 			"code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
index 115365cbf..22e183874 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
@@ -9,68 +9,13 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
-            {
-		"comment" : "NO OOG",
-                "indexes" : {
-                    "data" : 1,
-                    "gas" : 1,
-                    "value" : 0
-                },
-                "network" : ["EIP158"],
-                "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x06",
-                        "code" : "0x",
-                        "nonce" : "1",
-                        "storage" : {
-			    "0x00" : "0x01",
-                            "0x01" : "0x01",
-                            "0x04" : "0x0c"
-                        }
-		    },
-		    "b000000000000000000000000000000000000000" : {
-		        "storage" : {
-			    "0x02" : "0x08",
-                            "0x03" : "0x0c"
-		        }
-		    }
-                }
-            },
-	    {
-		"comment" : "NO OOG",
-                "indexes" : {
-                    "data" : 1,
-                    "gas" : 1,
-                    "value" : 0
-                },
-                "network" : ["EIP150"],
-                "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x06",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-			    "0x00" : "0x01",
-                            "0x01" : "0x01",
-                            "0x04" : "0x0c"
-                        }
-		    },
-		    "b000000000000000000000000000000000000000" : {
-		        "storage" : {
-			    "0x02" : "0x08",
-                            "0x03" : "0x0c"
-		        }
-		    }
-                }
-            },
 	    {
-		"comment" : "NO OOG",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 1,
                     "value" : 0
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
 		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
 		        "balance" : "0x05",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json
index f5affbd7b..fd2ae5835 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json
@@ -15,28 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead" , "EIP150" , "EIP158", "Byzantium"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                        }
-                    },
-                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                        "balance" : "65",
-                        "code" : "0x6000355415600957005b602035600035",
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Constantinople"],
+                "network" : ["ALL"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {