correct Constantinople expect section in state tests

12 files changed, 165 insertions, 21 deletions

diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.json b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.json
index 970d75e9a..03250c9d1 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.json
@@ -36,7 +36,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["EIP150", ">=EIP158"],
+                "network" : ["EIP150", "Byzantium"],
                 "result" : {
 		    "a000000000000000000000000000000000000000" : {
 		        "storage" : {
@@ -49,6 +49,26 @@
 			}
 		    }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "a000000000000000000000000000000000000000" : {
+		        "storage" : {
+			    "0x00" : "0x9d"
+		        }
+		    },
+		    "b000000000000000000000000000000000000000" : {
+			"storage" : {
+			    "0x00" : "0x9c"
+			}
+		    }
+                }
             }
         ],
         "pre" :
diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.json b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.json
index 7e070a928..c93477580 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.json
@@ -35,7 +35,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["EIP150", ">=EIP158"],
+                "network" : ["EIP150", "Byzantium"],
                 "result" : {
 		    "a000000000000000000000000000000000000000" : {
 		        "storage" : {
@@ -55,6 +55,26 @@
                     "gas" : 1,
                     "value" : -1
                 },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "a000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00"
+		        }
+		    },
+		    "b000000000000000000000000000000000000000" : {
+			"storage" : {
+			    "0x00" : "0x0352"
+			}
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
                 "network" : ["Homestead", "Frontier"],
                 "result" : {
 		    "a000000000000000000000000000000000000000" : {
@@ -101,7 +121,7 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000", "9000000"
+                "10000000", "8796770"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json b/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json
index 07a174acd..7b9647623 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json
@@ -36,7 +36,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=EIP158", "EIP150"],
+                "network" : ["Byzantium", "EIP150"],
                 "result" : {
 		    "a000000000000000000000000000000000000000" : {
 		        "storage" : {
@@ -48,6 +48,25 @@
 			}
 		    }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "a000000000000000000000000000000000000000" : {
+		        "storage" : {
+			     "0x00" : "0x013a"
+		        }
+		    },
+		    "b000000000000000000000000000000000000000" : {
+			"storage" : {
+			}
+		    }
+                }
             }
         ],
         "pre" :
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json
index 049099b06..aa4e6811f 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json
@@ -12,10 +12,48 @@
             {
                 "indexes" : {
                     "data" : -1,
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">Frontier"],
+                "network" : ["EIP158", "Byzantium"],
+                "result" : {
+		    "a000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00",
+		            "0x01" : "0x00",
+		            "0x02" : "0x00"
+		        }
+		    },
+		    "b000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00",
+		            "0x01" : "0x00"
+		        }
+		    },
+		    "c000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00"
+		        }
+		    },
+		    "d000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00",
+		            "0x01" : "0x00",
+		            "0x02" : "0x00"
+		        }
+		    },
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"nonce" : "1"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
                 "result" : {
 		    "a000000000000000000000000000000000000000" : {
 		        "storage" : {
@@ -92,7 +130,7 @@
                 ""
             ],
             "gasLimit" : [
-                "170685"
+                "170685", "136685"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json
index 10eab9334..7c128d383 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json
@@ -58,7 +58,7 @@
         },
         "transaction" : {
             "data" : [
-                "{ (seq (address) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (returndatacopy 0 0 32) (sstore 1 (mload 0)) ) }"
+                "{ (seq (address) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (returndatacopy 0 0 32) (sstore 1 (mload 0)) (STOP) ) }"
             ],
             "gasLimit" : [
                 "0x0a00000000"
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
index 45c0469e4..3cbf5fba0 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
@@ -318,7 +318,7 @@
 		"0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "460000", "88000"
+                "460000", "84000"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json
index ab9ebbba2..6947b0c59 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json
@@ -102,7 +102,7 @@
 		"0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "460000", "68000"
+                "460000", "63000"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCreateReturnsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCreateReturnsFiller.json
index 387ffd009..fcd548b0d 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCreateReturnsFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCreateReturnsFiller.json
@@ -41,7 +41,7 @@
         "pre" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x00",
-                "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) )}",
+                "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json
index c0d0a370e..079b86347 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json
@@ -442,7 +442,7 @@
 		"0x000000000000000000000000a300000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "800000", "140000", "160000", "50000"
+                "800000", "126200", "160000", "50000"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json
index ff15a7fb5..e6bd58148 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json
@@ -95,7 +95,7 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "66500", "181000"
+                "61500", "181000"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json
index 3357d301f..15da4469f 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json
@@ -12,10 +12,27 @@
             {
                 "indexes" : {
                     "data" : -1,
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">Frontier"],
+                "network" : ["EIP158", "Byzantium"],
+                "result" : {
+		    "1000000000000000000000000000000000000000" : {
+			"balance" : "",
+		        "code" : "",
+		        "nonce" : "0",
+		        "storage" : {
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
                 "result" : {
 		    "1000000000000000000000000000000000000000" : {
 			"balance" : "",
@@ -63,7 +80,7 @@
                 ""
             ],
             "gasLimit" : [
-                "77400"
+                "77400", "55400"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json
index 94e867cb5..9f956ae07 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json
@@ -12,10 +12,10 @@
             {
                 "indexes" : {
                     "data" : -1,
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">Frontier"],
+                "network" : ["<=Byzantium"],
                 "result" : {
 		    "1000000000000000000000000000000000000000" : {
 			"balance" : "",
@@ -25,6 +25,36 @@
 		        }
 		    }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "1000000000000000000000000000000000000000" : {
+			"balance" : "",
+		        "code" : "",
+		        "nonce" : "0",
+		        "storage" : {
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "1000000000000000000000000000000000000000" : {
+			"shouldnotexist" : "1"
+		    }
+                }
             }
         ],
         "pre" :
@@ -60,14 +90,14 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-        "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
+        	"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
 		"storage": {
 		}
             },
 	    "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-        "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
+        	"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
 		"storage": {
 		}
             }
@@ -77,7 +107,7 @@
                 ""
             ],
             "gasLimit" : [
-                "82400"
+                "82400", "60000"
             ],
             "gasPrice" : "1",
             "nonce" : "0",