refill tests with metropolis (wip)

43 files changed, 454 insertions, 0 deletions

diff --git a/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
index d553b9018..bc8140377 100644
--- a/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "d58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json b/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
index 7834f6090..978b3a4a3 100644
--- a/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
+++ b/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateMessageReverted.json b/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
index 70183aece..678de2f9d 100644
--- a/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
+++ b/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json b/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
index 5ddcb920f..43897ea96 100644
--- a/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json b/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
index e71ecabc7..a0a42bb82 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
index fdd577308..18abaafc2 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction.json b/GeneralStateTests/stTransactionTest/EmptyTransaction.json
index ac873b54c..bd48805ac 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
index b7c0fa4d7..b263c2f78 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
index c12b16d78..3e2b3b968 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/HighGasLimit.json b/GeneralStateTests/stTransactionTest/HighGasLimit.json
index 6ac0d79d9..3af38c7a9 100644
--- a/GeneralStateTests/stTransactionTest/HighGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/HighGasLimit.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
index ec03b092a..292bca0ba 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
index b1c7ac1f5..5bd323313 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
index cebb6f67b..d2d0bd84f 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
index 4c4ad00bc..13af8ee1e 100644
--- a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "c9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
index 59aa7cc2a..9b2e6fbcd 100644
--- a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
+++ b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
index 1c999e2de..ffd67b0a5 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
index 747a6617f..a3bcfa8f6 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/RefundOverflow.json b/GeneralStateTests/stTransactionTest/RefundOverflow.json
index 98966c566..655366bd8 100644
--- a/GeneralStateTests/stTransactionTest/RefundOverflow.json
+++ b/GeneralStateTests/stTransactionTest/RefundOverflow.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/RefundOverflow2.json b/GeneralStateTests/stTransactionTest/RefundOverflow2.json
index 2b1908996..42c2f9026 100644
--- a/GeneralStateTests/stTransactionTest/RefundOverflow2.json
+++ b/GeneralStateTests/stTransactionTest/RefundOverflow2.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
index d6bd01d4a..ef4ec7a07 100644
--- a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "e34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
index 30c05941b..0c917535b 100644
--- a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
+++ b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
index d96a30881..d359a47ea 100644
--- a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
+++ b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "f89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
index d159bc72c..d1cbab4f6 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
index c43dcaa79..a512da874 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
index 6ff01120d..3ef36ee6f 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "b9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
index d31c8f8db..8761b3944 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
@@ -80,6 +80,24 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "b09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json b/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
index 77e9b5256..ec4698bf7 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
index 381a767aa..371efeb0b 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
@@ -80,6 +80,24 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "ebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json b/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
index 3000a9af7..d07158fbd 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json b/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
index 421a146af..32aab8c36 100644
--- a/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
+++ b/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
index 0c95c800a..fb2e00a78 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
index 2f7dc65a1..b147a9f20 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
index 272c5204f..0ac982e34 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json b/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
index 1cf890031..bd7dd321c 100644
--- a/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
+++ b/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "fdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json b/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
index 37d84266e..b3597ef0f 100644
--- a/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
+++ b/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
index 4c73370e5..5bd3df0aa 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json b/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
index 334516cef..8856edb4b 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "b7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json b/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
index b11fff50f..fddf4a3d8 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "c406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToItself.json b/GeneralStateTests/stTransactionTest/TransactionToItself.json
index dab2d8f98..bf6b66094 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToItself.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToItself.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json b/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
index 15d875cec..6439ae0d7 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
index 4fbcd485d..fc3bda7bb 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
index 80fa1c387..c9a10954e 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
@@ -48,6 +48,16 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
index 0628e9d1d..0616b4402 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
@@ -80,6 +80,24 @@
                         "value" : 0
                     }
                 }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "a58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "a58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
+                }
             ]
         },
         "pre" : {