refill tests with new transaction create rules on Metropolis

35 files changed, 308 insertions, 106 deletions

diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
index d03f062d5..daff0bc7a 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xe2008905f4a23c83700e68796fcc26a6226605bab8ab75e382f3f4f133862667",
+                    "hash" : "0xb84372ab4edf2e0544b154f4d68cabd36620e2c71b9d378c344e5b4ae3e76761",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
index 94f4be121..9aa3f4412 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc",
+                    "hash" : "0x7ddb30dbf5e1fa3ca828054515e097c31778d7cad66bf77e2e37be2cd7f9083a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
index 7b48f1ee2..460605c49 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x0009340a7040854e76f28c7e87836d8b7eb15748c7c01e9554c60ab3f25feb22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
index 9114f0cec..157411bdb 100644
--- a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
+++ b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
@@ -17,6 +17,14 @@
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x300c3dcbb928cdde2440ae30efc403477bf180332c5c7cc66a393a7b2b7c14be",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ],
             "EIP158" : [
@@ -27,6 +35,14 @@
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x6c43348eb68de9bdb634ccf1100bc057055fbc061e09d9ea9affa3f08cded27b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ],
             "Frontier" : [
@@ -37,6 +53,14 @@
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x691a7195d6b0ac3628e8c660b3231ecaf2d49db9f02781a84ec680224558b65e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ],
             "Homestead" : [
@@ -47,16 +71,32 @@
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x691a7195d6b0ac3628e8c660b3231ecaf2d49db9f02781a84ec680224558b65e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
+                    "hash" : "0x78b3c1337550e6c9dfd13d0cedb8f721908ec6b9500907178d02d1f5a99ae62e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x5e6cead042145d6de84ceec67598796d16ba49d2134a178f6dfd7b549915e1fc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ]
         },
@@ -88,7 +128,8 @@
                 "0x6040600060406000600073100000000000000000000000000000000000000161c350f1"
             ],
             "gasLimit" : [
-                "0x017700"
+                "0x017700",
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
diff --git a/GeneralStateTests/stCodeSizeLimit/codesizeValid.json b/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
index af4132965..e2aa19dea 100644
--- a/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
+++ b/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x5de745f7ceaf31700c6ace69b00b6ac7586270a0d09455ef48529080cfc1cedc",
+                    "hash" : "0x2c26e45675083b97b40fc46f13884ff8abd894240557e3f8cfb9d576988271a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
index 083d5efd9..e073dac31 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
@@ -11,7 +11,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0xa138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
+                    "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0xa138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
+                    "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0xd64663da328381d656a93fe6be26d5e3b2ec79d62020d79dcbe09748d084fb41",
+                    "hash" : "0xcb312cfb389099b2c1f2de560878a9c6a1a4d4a97c31b4424f60bfb32f11410b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0xa287629b270c19f511e554e3737c0a3db3ef1cb2d9b172fe93c690e8f6d6eab7",
+                    "hash" : "0x2002743e54dee8add3d37611f23eecbfcfb9fe9f520ed9071d5a2a7dbc0fc0be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xa138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
+                    "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -78,7 +78,7 @@
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff"
+                "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005230ff"
             ],
             "gasLimit" : [
                 "0x0249f0"
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
index f51433a7f..66923ad95 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
+                    "hash" : "0xad9d419bd71dc576bef49ed23240ee72c8b1f52209a02d815b981a9b44e387b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
index ab25f2e6d..ce6f1816c 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
+                    "hash" : "0xd2ff5e63ba30abd1da8019117814faf68b81724c781f689cea88e518d3ec1a45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
index acf64ec01..b9f5177a4 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
+                    "hash" : "0xd2ff5e63ba30abd1da8019117814faf68b81724c781f689cea88e518d3ec1a45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
index 359f9e813..a4d26c7d5 100644
--- a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
+++ b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
+                    "hash" : "0xa29f3e8f73a270542e18cb97dfcbc4d9cbb7fc2e82861a109b28b37ddc1e709f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
index 7f91942ab..35c91d0f0 100644
--- a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
+++ b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xe3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275",
+                    "hash" : "0xcb03aea1f82bfd6485c616a1e87e2d6a539aa45854898838682e1a3cb98c968c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
index 8f2926828..db2334fcf 100644
--- a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
+++ b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x86631b9f3536a824efa412c3162885c8bbb1657e315b8dbbda6a24a8ae8ff868",
+                    "hash" : "0xea64919f65bfa0f178bad58511ccafabf508c844208ef4733f83a2f6a65ca355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json b/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
index 909b14a80..daa5e0690 100644
--- a/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
+++ b/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x655745d58a6f73f5249352cb41c876fcaa72cf7c08c503c21e4522698b7ce93a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
index 53495163c..11ec7acd3 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x3c443f320c10ef9b6ecc4db0ac9e6bc184ef4d924d03bc9be54e8c0850ef9138",
+                    "hash" : "0x34afa89005c43a98486677dc47095aeb094bd54532a6fa5061c0aab81de93846",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json b/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
index 97916448a..9b5eacb77 100644
--- a/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
+++ b/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
+                    "hash" : "0x8f6ced9178a82f811d2167c512bec3932c674813e3d1d6ff432a30e44975be31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/deploymentError.json b/GeneralStateTests/stSpecialTest/deploymentError.json
index 10c13afd3..11ad4834b 100644
--- a/GeneralStateTests/stSpecialTest/deploymentError.json
+++ b/GeneralStateTests/stSpecialTest/deploymentError.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
+                    "hash" : "0xfc4b43aa93d69b82597db0a14cf85d93c2bf107b2e7d7cc00c3c7fa53caa2100",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stStackTests/stackOverflowM1.json b/GeneralStateTests/stStackTests/stackOverflowM1.json
index a7fca8379..fbb0a62ac 100644
--- a/GeneralStateTests/stStackTests/stackOverflowM1.json
+++ b/GeneralStateTests/stStackTests/stackOverflowM1.json
@@ -531,7 +531,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x880622defaa3b4cb51344f2e1bd96ffb30eb59af31de2e42389ffce36726588d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x51c72d81600e557836273390abe7d9afe6b084f3f00fabfd3f6ccead54196238",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xab8d4b060707826788b975be412720316045d43b07101f3159478c02a136cd98",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x278b1a7fdeaed049ecf3044dd88a7cf0b88c8ea97dbdeb206d75359f0fdeec7f",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x5631c245fadcae6ab5c5eebe6a2624f064b027e77833fe5b6d5c4036c9974f6b",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x5e45f15d34a8ca9b6b9522199dd8bfc9c5cd5241f50d5842d474e796620fbdf4",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe6801b5bb8673d8e17719e889248f0067cabe5458ca8249c2ee952200a3681b9",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x3a11048cb3edc6701edb5a46753fc3dc21785bef110319125e5c028cca35b3e6",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xfa3941c435c482ddc715b9baad844f8fb12c98ee2f64e9978f679e77cddc9eba",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xef7f4284ffd00c3580b17f8c9eb94007b5d3fa0ffec03992c157fa52aae26742",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x364df4b99fd7197f1bcfbdfe1bcb72318ec44b081e694d15d49f9ef9856acbcb",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x08126c674be09dcbb26de5720661dcf6fe3030bd72e925051ba1ca33401144d5",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xde5ab919ecc4a0d133ab8bb0959ad95cc694648d86af109a7d2832ce57b3ee8e",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xdc2db3c05ba3a1db523a800150e8904ef299bfe158041c6d46072a8455bb979d",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0x57011df90e1a7657cfbc69a6a8143c77fa3bf478069d6047b981a18b65b8e3c3",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "0xf9df0dcf5161ca039992eae68ddf660001ae3119efae8a44d9cb1f18b0da093a",
+                    "hash" : "0x2ea1f258991a92b44afcaa46cf97c312afca9f48b8eda84869010db5b574f3f4",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
diff --git a/GeneralStateTests/stStackTests/stackOverflowM1DUP.json b/GeneralStateTests/stStackTests/stackOverflowM1DUP.json
index 9ec9ffe08..a9e7446fd 100644
--- a/GeneralStateTests/stStackTests/stackOverflowM1DUP.json
+++ b/GeneralStateTests/stStackTests/stackOverflowM1DUP.json
@@ -531,7 +531,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x6a2b1fce8d6f7cc86fd3cb28dd1d70f4b3218684db651c10df20ad89a6db8187",
+                    "hash" : "0x40fb71e189024f58394b74d43639a42773c1d31f59e5e8102cdad4be6d596d3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "0x50c49177df4a6826e582cf54f85cb42bfa62efab22ae99d3bce7c37c77825270",
+                    "hash" : "0x8f7f542038aa0e96d9899aa41a1cd1a79eacbd81527602f246ac45ce8ed71fb9",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "0x2f49836573b4bf385930c3ef17478b6709c7ed712f950f7fdaf2cac6ad02ee7b",
+                    "hash" : "0x3172e9d12318efb76879f3b406d9ca0e78b9d9babc74ff48f9d4dc31319a08f3",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "0x4dfeddb923a4c1a844cfb37e1be7db105b6c624fae60bb85b8e197d3a215c180",
+                    "hash" : "0x51c3f59db5ca07ea368e1fbf2e9a3942fa59e2e681c16e38b146f6d99ea6ab4a",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "0x5376fd136b98ee7b42b47c24db51c177625d5bd1859796b985b3141eb9e8099f",
+                    "hash" : "0x6ba1c934b7966acba7d192bb626e5d3a672bcfedead75c493ea845576951a6b5",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "0x0b80ab11ad5da5e789c464565d5ebf7879221265a7aeead6921f63df59dc27f2",
+                    "hash" : "0x08890e09bb17b491d726421467f15064f49abf44c6d33e416cf924b382527533",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "0x92ea0d7fb847dd7a084273eb26120559c77b1da506769bec6e9e323c594cf458",
+                    "hash" : "0xd23a2cecafd2035957a3a9d3438cb2c24a04cd01762264be7e49b3e369c57f9f",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "0x8a1cd80584c67d1c039dac6e19790e7eb07dc0876e5b47fad1d5386247f6ca4d",
+                    "hash" : "0xb4e6c7413bf1fae690201826383d19369dded150c6c42c51590bbf531caedd63",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "0xa394265a8e2d722986bd36e7eb337ef9c1b4810e82fa436e519a7420075080f9",
+                    "hash" : "0xc44bfddb4a522f6800b269b10f9ca142bbd0f2cfdc81b3eaf8061560bd7feeb9",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "0xeac2b4c212b8348dc7236c12611be9c7172168946b17f9dc3e64a448a2c166ad",
+                    "hash" : "0x7ccadb1c0143230289c8f0fbce560e5c897b8565533644eabd1f1978b93aac75",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "0xf679fa8443129f0757cce3d0b710301cdc285fe8dce9b02c3c17bc0080f37b37",
+                    "hash" : "0x2fde4594f110c3cab42eaf119bf91b53320e992106d5a8c450626bab82505fb6",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "0x1d108141df73a12a50b06e7e2f09f2715a02e2465117cf340c5b66d4103946b0",
+                    "hash" : "0xf60490fd65f28cea0522c9f3013c5ba908c3862624d7653a347376f256b46fb5",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "0x1e00f29606f2a7457ea0a837ba3e26786610cc0b22210f37e443e1db77503430",
+                    "hash" : "0x60b717eba84e94d5d1f957f4a9ee6d7aa2277feed2dd7e1e12b31ddc6ed02f91",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "0x3486d0d404fa8c3b6da05ddb4cdef0d234ab023bc2b5a900a31ec86d39238625",
+                    "hash" : "0xb04e0850c12655e6f511e04e3ceba1e9c40a2ed226858ade634af2dcb5b6f112",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "0xbaa263aa9da83b28be271fb4b63f53158eff9fefbf9e36454477dfd81c485145",
+                    "hash" : "0x26cffdae677235bb66498df237ddf347e656f5dbdf734c7cd0288af0d1bafc3d",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "0xf5cfc78a7ced012a553ed98d5e92e43ef626b138d30976632c908f740f3f00be",
+                    "hash" : "0x7cf376b7f1c87b439e8d751c7f239bb294de6c209d341e1d572d9c015b1ab940",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
diff --git a/GeneralStateTests/stStackTests/stackOverflowM1PUSH.json b/GeneralStateTests/stStackTests/stackOverflowM1PUSH.json
index f66613e55..2b6057b37 100644
--- a/GeneralStateTests/stStackTests/stackOverflowM1PUSH.json
+++ b/GeneralStateTests/stStackTests/stackOverflowM1PUSH.json
@@ -1011,7 +1011,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x23dde05f6f8db9d966f4444d7ed60a67edaa2f0cf719706b4bbd2f01b396dc97",
+                    "hash" : "0x2b5ecbd8ff293afc25ecfd8d9c339f85456826adcfd11c678258207b952ad678",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -1019,7 +1019,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd9ea2f9d61f3df9f9991a10f8e69197dca7be69d430208b7d4ad8417807171b0",
+                    "hash" : "0x4ba9920c7bdee49999ea81787e1f7b5bd383ac84e75e990524fb557f03a0b100",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -1027,7 +1027,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe304fd4ea5a8fc2271f372b260adc36ce48dd3800222f8837c10e77729b7d2d2",
+                    "hash" : "0x7abda431fa2a284c053390ab0c20bd4db030af80391cd5407a6df54c9c365e31",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -1035,7 +1035,7 @@
                     }
                 },
                 {
-                    "hash" : "0x69cd43963f23118b4ad6d96960c2c504840d7058773a451992df9a5fad1f7264",
+                    "hash" : "0x0ca5e972b4b097b632808592a5679f1859620588086123b48d9c7abca5da0ff5",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -1043,7 +1043,7 @@
                     }
                 },
                 {
-                    "hash" : "0xe5cc0e7eb12b59a9836635ec2a4ec39b2a95f58469d4ee66d2e76e356c5f6cdf",
+                    "hash" : "0x72954a34a667cc5533ea710aa2232b1b96b916b5d9a1396cbed2d7cd81cb203c",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -1051,7 +1051,7 @@
                     }
                 },
                 {
-                    "hash" : "0x4330037d6f2082e11643d31f46be8d6b72465ccf8f589e67823158e3432be070",
+                    "hash" : "0x43d77154598fec5e909f49b8e9f485c580ded23b7ef8f7da53f469d0fa47b4f7",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -1059,7 +1059,7 @@
                     }
                 },
                 {
-                    "hash" : "0x401275bc491763d1fbfbd9fcaee47f7ac3aac1f9207fb2d5cb114c9cb25286ed",
+                    "hash" : "0xce40c7ea7f630131cf9428d932cbbdf83d932937dcfffcc904c10782bbd569e4",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -1067,7 +1067,7 @@
                     }
                 },
                 {
-                    "hash" : "0x9e3f9e7c9656eee7699ee692a6c301a5d9bcc5148f61bd0297786e6bf600cee8",
+                    "hash" : "0x6bdaee445e1e90e75aed0e8d0f0b773349f83d6e4deb3cbd843361562dfe95d2",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -1075,7 +1075,7 @@
                     }
                 },
                 {
-                    "hash" : "0x901aa1a59147292fd8253422a45c0e554fe87f39af409cf6979ce56e3d63b0dd",
+                    "hash" : "0xd077d999371f5840faa2729a18a6b60dc9519750b4d9d0b2401769a8b0dcfdaa",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -1083,7 +1083,7 @@
                     }
                 },
                 {
-                    "hash" : "0x6b9aba9ffcf809bbb9fa0c70affd5f6c46457a5c5cd77c30c4804d8bfd10692f",
+                    "hash" : "0x42804e96f08c71046cc03cb0390ed6870bb40804c34bfef71a7e9a48ee9b3645",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -1091,7 +1091,7 @@
                     }
                 },
                 {
-                    "hash" : "0x23966147ea3cca8997f235aaffe3b2b4e0cf6cff28cff7cefdb4bc67db157e2f",
+                    "hash" : "0xb9166079c6234fb3e9d03769ac89682942747c4f509cacdd6bc299ef43452ee7",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -1099,7 +1099,7 @@
                     }
                 },
                 {
-                    "hash" : "0x1ce0ff63aac7caaf19dcad10d4fe88533cb384554723cd0864f0b4777ea32d96",
+                    "hash" : "0xd4ea3522f8594d02d7a2f7b3fa8477afbcdd28e945e26398b46fe500bebc49a3",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -1107,7 +1107,7 @@
                     }
                 },
                 {
-                    "hash" : "0x9dec73faa2fdcd98b3e9b9f4342f2ab4e79c759d803c8bee8b2d4df0f180189e",
+                    "hash" : "0x0c4d20d6bd7455f7915d7c9d415e986c9203184f91483b967d6db50c8f429b9d",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -1115,7 +1115,7 @@
                     }
                 },
                 {
-                    "hash" : "0x2b8cdd925b650b6924200da8fc7b9c9e4580ae9974e7bce7f88c833b5245220e",
+                    "hash" : "0x4bed002f634381ae3b7dc043c8de8d18b27e06d9ff3e494998b472c6bbe58c64",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -1123,7 +1123,7 @@
                     }
                 },
                 {
-                    "hash" : "0xdabf1846d46073b9318ff9c7c1e0cbbc44e075dfdf42f944be041c21d8141a34",
+                    "hash" : "0x24433f5d9eac44ac9196032596674251a5c90454186a6680ddff5bb729917193",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -1131,7 +1131,7 @@
                     }
                 },
                 {
-                    "hash" : "0x3958aeefb61579f0ae737d5c07e6bcf7881288c8e1232bedd21dd8b2c15bbe64",
+                    "hash" : "0x9950545f6d915e0ea3d958f58f85564359959e9ffc6f21f1e94460fdaa5b2ca9",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -1139,7 +1139,7 @@
                     }
                 },
                 {
-                    "hash" : "0x449c2d11973c9a1e66e8d942fd5845b600c60dde5fb7a040df3840d838005bdb",
+                    "hash" : "0x0ad6ddd559b88d1b320f0629b1d58d5f4e3e0fb328c0d97599bf9a5ed5653b0a",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -1147,7 +1147,7 @@
                     }
                 },
                 {
-                    "hash" : "0x3ea28b8364ae6c3af6b2e4ee8f149f945474834b94b35ddf801a22c2e97e574d",
+                    "hash" : "0xd3f5995016fb7c972f0ed009b446f028f1b6e91c578c889bca69b10fdc416d56",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -1155,7 +1155,7 @@
                     }
                 },
                 {
-                    "hash" : "0x9da72a91d1660eb4592c0c26f6023a6e6899d2ec9d97016ed7a1fdbbcf008357",
+                    "hash" : "0xd7b551a31583f25e130e60a0a778d8370f5a5f6c0fa6d05ca99f3a2f67f2515d",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -1163,7 +1163,7 @@
                     }
                 },
                 {
-                    "hash" : "0xeb50c19207750e7898adbe172795061cd490c766e4393ffc8ea6c0c6c69300da",
+                    "hash" : "0x5be2b1dae07d1529a4220b689141116bbb14bd848350c2e7e9f7933345e08c39",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -1171,7 +1171,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd4d6042ad13766f70208fcc0961e8446e853790fe1eb5504cb3241dae91ee7cd",
+                    "hash" : "0x444620cb8c9660fd5034d93317b158b37293e8a1e1f15078818e19b219eb8c0d",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -1179,7 +1179,7 @@
                     }
                 },
                 {
-                    "hash" : "0x025689ba9cd9154b08c72803dd12f7bc5fb06b103ec75139508a574aa0be5a46",
+                    "hash" : "0xd036b77d7283cdce8da3d6bfffaf0b48da93fe9895da397303279a3c6925029f",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -1187,7 +1187,7 @@
                     }
                 },
                 {
-                    "hash" : "0xb776176993392f8b1437bd92183c696210aee8ae2bfcf1889bc5a3441b55852e",
+                    "hash" : "0xcff014b37a40626ab1bc48a5417395213c91f0a26d992bdcf926a0c544067348",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -1195,7 +1195,7 @@
                     }
                 },
                 {
-                    "hash" : "0x197870ae1b3693d48ea477f961029ff3e570395a9211b68d873d15fb6ca1d796",
+                    "hash" : "0x3ca89aae7f82a62dfa68405e4d9eabfc305058fa290872d8029149e5246bb4ca",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -1203,7 +1203,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd83ffb7f1ad0cf6d1b0d4b26d83237ff099fd41a4eb4355ad9d610648271776d",
+                    "hash" : "0x8122ad39aa546dd202a3a33332f3005a3c7af0c6bb4876036fe1cfea1d5822ca",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -1211,7 +1211,7 @@
                     }
                 },
                 {
-                    "hash" : "0x98172dabd40334b238e30140c8f179a10c85b3c7958cddd79ffdbb9ef7a2187f",
+                    "hash" : "0x661ad4677b42ce088ebe5616144147b5142442178383885a493a6bce8323ae53",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -1219,7 +1219,7 @@
                     }
                 },
                 {
-                    "hash" : "0x4c6dd1f16747d49c3884be14a4911e98d91dfcfe65529d6c5aa581e40e5e9fb5",
+                    "hash" : "0x5a70a75c145add2c5b3c4404d6c386623a5a181dd595c23ce1d920fe7089a8e2",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -1227,7 +1227,7 @@
                     }
                 },
                 {
-                    "hash" : "0xef12f66c725ebdd4fd3d9540d56c05965b92cd5626a9e9dc1585f0412060f2cf",
+                    "hash" : "0x6e14a8f060f41fb5f8f38c1ca0f87a0d0fd86cd57908eeb828e4f39cde58b10d",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -1235,7 +1235,7 @@
                     }
                 },
                 {
-                    "hash" : "0xee0bb0accabecf0e71b0448549f25681241befe70a1e57f6f4d0e9fd48d22dd9",
+                    "hash" : "0x8da66f4973f282d728a03d22682840b059996ace0ad42137e714ab29bdb81798",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -1243,7 +1243,7 @@
                     }
                 },
                 {
-                    "hash" : "0x91f59d7b8547ce9f900c62f24304a84cdc36fd31f9ae3cdd8fc4dd55254767d0",
+                    "hash" : "0xa754fbb8cab5df72fc680be1c0da8ace9d672f972cd2199a53490bbee99e8a4e",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -1251,7 +1251,7 @@
                     }
                 },
                 {
-                    "hash" : "0x505e5c5d7cbdea634138c97f7d3b64a6c12e50b71d9f446ea1c0eb59a6779ad0",
+                    "hash" : "0x7bb885d88395d81bea8459833bdd96986c31678278b7825ecb6f657005e2f993",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
index 9b953c7a5..9e91490f6 100644
--- a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
+++ b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xd73594e1cf8108b5cb811ece843511874fea2a4536d12d08e92258b46be8f7f4",
+                    "hash" : "0xed83cfbd371641f3a30d68735ef254d558e8751dbc237d721b5704fa91e58e7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
index 8a32b1ddf..98b525586 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
+                    "hash" : "0x71a0e52a77a5f20041f8b0675acd49e102e87f0596eb55f0784775af918585c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
index b6d5cba65..fb075b490 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
+                    "hash" : "0x9f6d4fd8e8a4f84b056d199ee4dc23d9df8a1a26f9fa666b10b8f42639608912",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
index 3f683ecb1..4c7aae5c0 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x655745d58a6f73f5249352cb41c876fcaa72cf7c08c503c21e4522698b7ce93a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
index c5ee38142..8f9f44583 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x655745d58a6f73f5249352cb41c876fcaa72cf7c08c503c21e4522698b7ce93a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
index 6ba4934a3..d1d99e50e 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
@@ -275,7 +275,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
+                    "hash" : "0x5c1da21492baa25e3618c5b62b45da7da28d122e9cea4e29520cc6f5ef3400f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "hash" : "0x0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
+                    "hash" : "0x5c1da21492baa25e3618c5b62b45da7da28d122e9cea4e29520cc6f5ef3400f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
index c6f6718f2..f4d961d7f 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
@@ -73,6 +73,38 @@
                         "gas" : 3,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    }
                 }
             ],
             "EIP158" : [
@@ -139,6 +171,38 @@
                         "gas" : 3,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    }
                 }
             ],
             "Frontier" : [
@@ -205,6 +269,38 @@
                         "gas" : 3,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    }
                 }
             ],
             "Homestead" : [
@@ -271,11 +367,43 @@
                         "gas" : 3,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "hash" : "0x77d256471bec87ef2e01e58c604806e6479bc3815afeb8dcf024eba5a306f8b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -299,7 +427,7 @@
                     }
                 },
                 {
-                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "hash" : "0x77d256471bec87ef2e01e58c604806e6479bc3815afeb8dcf024eba5a306f8b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -337,6 +465,38 @@
                         "gas" : 3,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0x9cf6d8127d9a1f1ebf66dc2b5d7eb7cb2f0b1c39afc67861af79b0dbaac4858d",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0x9cf6d8127d9a1f1ebf66dc2b5d7eb7cb2f0b1c39afc67861af79b0dbaac4858d",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    }
                 }
             ]
         },
@@ -352,7 +512,8 @@
         "transaction" : {
             "data" : [
                 "",
-                "0x1122334455667788990011223344556677889910"
+                "0x1122334455667788990011223344556677889910",
+                "0x6000"
             ],
             "gasLimit" : [
                 "0xea60",
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
index e384a3a09..a8f6d6f8b 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x0009340a7040854e76f28c7e87836d8b7eb15748c7c01e9554c60ab3f25feb22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
index 0ad40961e..b6f2d159b 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x0009340a7040854e76f28c7e87836d8b7eb15748c7c01e9554c60ab3f25feb22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
index 278112d10..7adf378e9 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x0009340a7040854e76f28c7e87836d8b7eb15748c7c01e9554c60ab3f25feb22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstruction.json b/GeneralStateTests/stWalletTest/dayLimitConstruction.json
index d854fd634..928d898c8 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstruction.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstruction.json
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x67e4eff2eef20f854c33c7800bfc802814d86d94db0194b0522764ce3d4579df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x67e4eff2eef20f854c33c7800bfc802814d86d94db0194b0522764ce3d4579df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json b/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
index ff5dee487..a03196a5d 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x67e4eff2eef20f854c33c7800bfc802814d86d94db0194b0522764ce3d4579df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
index 404a11ecd..d9a277d8f 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xeecebde57798579723cf00394572c98e266d03475bc637b711b56a00a5c6a944",
+                    "hash" : "0xc8bfdc1a78be7f7c8d44a1a66ce59570c541fdc56e9c7c4e9bc5c60fc427f2c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletConstruction.json b/GeneralStateTests/stWalletTest/walletConstruction.json
index c722ec23e..633ebae5e 100644
--- a/GeneralStateTests/stWalletTest/walletConstruction.json
+++ b/GeneralStateTests/stWalletTest/walletConstruction.json
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x6a202eab7bfaec791068a91ffbf3f5070eab5dfebd9a107da25f563fa14db9fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x6a202eab7bfaec791068a91ffbf3f5070eab5dfebd9a107da25f563fa14db9fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/walletConstructionOOG.json b/GeneralStateTests/stWalletTest/walletConstructionOOG.json
index d16d183c2..3f6fdec2b 100644
--- a/GeneralStateTests/stWalletTest/walletConstructionOOG.json
+++ b/GeneralStateTests/stWalletTest/walletConstructionOOG.json
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x6a202eab7bfaec791068a91ffbf3f5070eab5dfebd9a107da25f563fa14db9fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/walletConstructionPartial.json b/GeneralStateTests/stWalletTest/walletConstructionPartial.json
index dc8352872..643061619 100644
--- a/GeneralStateTests/stWalletTest/walletConstructionPartial.json
+++ b/GeneralStateTests/stWalletTest/walletConstructionPartial.json
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x6a202eab7bfaec791068a91ffbf3f5070eab5dfebd9a107da25f563fa14db9fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,