refill tests with metropolis (wip)

39 files changed, 398 insertions, 0 deletions

diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
index c8a531434..8cd46e765 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "db8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
index 3c69d3770..85e2dc85d 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
index 1e832576c..833da55cf 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
index b057e84b8..a8d9683c8 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json b/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
index 86c3c2742..819b6552b 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
index 5b67a8bdd..822a4038e 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "d80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
index 8c839de1c..c03fbf14f 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "b099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
index 4288d7d09..e7318ebff 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
index 44fca542f..12473e101 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "798d1e55defeabefb8e2625b6429f7ab0d47474b6624a013ec0b385cf031e772",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
index e6bf45eff..906fc6012 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "c0c87377411f756fa0ba9a8e0024811e84e9cf31c5967f50a04d3834ab32b4e1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
index bfb95e077..cff0c0eca 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "5c0033c83177273d0ac13a79006fee34e001d9acd58e9f56e7841751a20e1c43",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
index 5823c66f4..cfb6639b8 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "4548d282d5e76a7944f0ca0c562eff40124678658f1cc3420ad04bf64a926717",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
index bd42717a3..5953b6d21 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "f1758b5f24c9a06ccf2d242198e3b8813aef83cfa386c933a45b861cac7c2e07",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
index 137646e56..481eeb7fa 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "ac14bbcd134a728e66846cf35c68f5c762ebb86519f152ba3172b4e8e3d0c88b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
index dc3aeee4c..37d2e4fa0 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
index 4ea414173..0ab9a000a 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
index 3385f6129..4bb5e5e5c 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "f67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
index 42ecbf1ad..aa2f71e3e 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
index b3a302ad6..58ef34460 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "c19c1d77d2fa6f03c16c3e0a2b21f32a6d6fd6e5c42d74a205ef3cacbcd20533",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
index d1612f712..aaccb14b1 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "ff93a7763fb845955fac90917658906a99591d1fed6839bf9990df1eeb6aa9e2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
index cce61cf36..8bd9f87a5 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "cef78b273dc327acbe1104b428ea54e20358c1787f712ca76c3116024b347a03",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
index fdf0d5dae..c26eb2005 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "633b052741568a84cdda76bcdf140e188bfb89775935668c13c76769212520af",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
index 9fdd2ec2f..bfa902a06 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "62e67a9eefce8bc4256ade3264a52606e421505048397736cec05454afd65ace",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
index b9b253418..f59e350ab 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "6dde5c3897639f0a36ccdba1addcee240c47c55fc04c90ffa0663ac4668dd2af",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
index cec8459f6..c9636978d 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
index 3d7bf35d9..f70e7a9a9 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
index 2e5a608e0..a75cdf0af 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
index ac888fd26..154af8ab0 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
index 4f1dfc07f..5e0a9e65c 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
index f825072d0..2667e739c 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
index 9b30ad968..e19bfa1f8 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
index f105a57cd..0453b1a2a 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
index a7a0d2b64..d978f30bf 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "b61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
index 194dc0514..a814889b0 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "e2008905f4a23c83700e68796fcc26a6226605bab8ab75e382f3f4f133862667",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
index 110a56605..8a98a182b 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
index f6ddfdcb4..4e49bb9f4 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
index cde91b304..332336f77 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
@@ -80,6 +80,24 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
index 5de510dbc..a3b60c3d8 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
index 51c4592e7..eb4d120fc 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "cf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {