update general tests

1 files changed, 1657 insertions, 384 deletions

diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json b/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json
index 573bcac7b..acb62e22b 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json
@@ -6,413 +6,1686 @@
             "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "10000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : 0,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead",
-                    "EIP150",
-                    "EIP158"
-                ],
-                "result" : {
-                    "a000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x04" : "0x0c",
-                            "0x05" : "0x0c"
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "0x01"
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : 0,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a000000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x04" : "0x0c",
-                            "0x05" : "0x0c",
-                            "0x0a" : "0x00",
-                            "0x0b" : "0x00",
-                            "0x0c" : "0x00"
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "0x01"
-                    },
-                    "b000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "c000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "d000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : 1,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a100000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x04" : "0x0c",
-                            "0x05" : "0x0c",
-                            "0x0a" : "0x00",
-                            "0x0b" : "0x00",
-                            "0x0c" : "0x00"
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "0x01"
-                    },
-                    "b000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "c000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "d000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xd8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb6cc57520d9770d30f2ae303a3011772a6a92d1746b1a4ef6f6894ddefb8b78b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x5d50590051ccaf4888d6aaea2e67c3c221418e6d63ac08ccaeb83f8972cef939",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x34b72637b56181f53edcff598845763a878c55eeb2366ba4d1e4f3e6244c9062",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc5a643f1bfb926531f64c8bacaed120944594d9d40bb9623bab4da7b3a223f12",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe5636003a6a46f677815d577aa34d0327e1ffb059035e6d7bd1c0cde96bbcc68",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1afdbdfbba02f176a74a058ce687039fc418c16426ee072cf820edaa1136a20a",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4ad3d92aa98e194cb4b7bf8f889adc498f316c5a026fc36e4150b2cfa026a83c",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 2,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a200000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x04" : "0x0c",
-                            "0x05" : "0x0c",
-                            "0x0a" : "0x00",
-                            "0x0b" : "0x00",
-                            "0x0c" : "0x00"
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "0x01"
-                    },
-                    "b000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "c000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "d000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xd8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb6cc57520d9770d30f2ae303a3011772a6a92d1746b1a4ef6f6894ddefb8b78b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x5d50590051ccaf4888d6aaea2e67c3c221418e6d63ac08ccaeb83f8972cef939",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x34b72637b56181f53edcff598845763a878c55eeb2366ba4d1e4f3e6244c9062",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc5a643f1bfb926531f64c8bacaed120944594d9d40bb9623bab4da7b3a223f12",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe5636003a6a46f677815d577aa34d0327e1ffb059035e6d7bd1c0cde96bbcc68",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1afdbdfbba02f176a74a058ce687039fc418c16426ee072cf820edaa1136a20a",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4ad3d92aa98e194cb4b7bf8f889adc498f316c5a026fc36e4150b2cfa026a83c",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 3,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a300000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x04" : "0x0c",
-                            "0x05" : "0x0c",
-                            "0x0a" : "0x00",
-                            "0x0b" : "0x00",
-                            "0x0c" : "0x00"
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "0x01"
-                    },
-                    "b000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "c000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "d000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x1e6f2866ebc2ec3bd095dd5d1e0a9003dff8c46d740422e032564e23800e401c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1092feb631e5d2b0bb2ca83f9f68b54c53717f8ceda091616c67aa01bf2f6715",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x69e43bbf019adedcae45878e4efb53768e49d66b68fa4ed04f0e1e4568ca41a7",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xf6b3cbbd0610954032c6d46f6415ef5bff8742fbee55230fe12211ded4220c3d",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd82deee3a810865a30ee17dee27244ecc812f3270ae1eb67c40f7aaf80907622",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1a19c6ab26d1bc1fb3130c16132d82cc6bb770cc7e3f235be283a9c6a574d706",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd82deee3a810865a30ee17dee27244ecc812f3270ae1eb67c40f7aaf80907622",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1a19c6ab26d1bc1fb3130c16132d82cc6bb770cc7e3f235be283a9c6a574d706",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 0,
-                    "gas" : [
-                        2
-                    ],
-                    "value" : [
-                        1,
-                        0
-                    ]
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a000000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x04" : "0x0c",
-                            "0x05" : "0x0c",
-                            "0x0a" : "0x00",
-                            "0x0b" : "0x00",
-                            "0x0c" : "0x00"
-                        }
-                    },
-                    "a100000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "a200000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "a300000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "0x01"
-                    },
-                    "b000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "c000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "d000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x1e6f2866ebc2ec3bd095dd5d1e0a9003dff8c46d740422e032564e23800e401c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1092feb631e5d2b0bb2ca83f9f68b54c53717f8ceda091616c67aa01bf2f6715",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x69e43bbf019adedcae45878e4efb53768e49d66b68fa4ed04f0e1e4568ca41a7",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xf6b3cbbd0610954032c6d46f6415ef5bff8742fbee55230fe12211ded4220c3d",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xf831c6b1f491ca064a59088ac753fe9b9f6376112b08acd3ee9d7b2dd56ba209",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x5f9dbebae5fe583e47a8e4a2212dca465e4679785618107655e492a9c38f8397",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x06d00ec0437967bfa535b2c7830db5a63042d73368beb07d68d2ed93bc769f03",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x697f6c1e9bc4bcb230fa4a941c977d44e74245e9af445c132d83d9cced610adb",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : [
-                        1
-                    ],
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a000000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x04" : "0x00",
-                            "0x05" : "0x00",
-                            "0x0a" : "0x00",
-                            "0x0b" : "0x00",
-                            "0x0c" : "0x00"
-                        }
-                    },
-                    "a100000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "a200000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "a300000000000000000000000000000000000000" : {
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "0x01"
-                    },
-                    "b000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "c000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "d000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{ [[10]](CALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[11]](CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[12]](CALL 50000 0xd000000000000000000000000000000000000000 0 0 0 0 0) [[4]]12 [[5]]12 }",
-                "nonce" : "",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a100000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{ [[10]](CALLCODE 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[11]](CALLCODE 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[12]](CALLCODE 50000 0xd000000000000000000000000000000000000000 0 0 0 0 0) [[4]]12 [[5]]12 }",
-                "nonce" : "",
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a200000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{ [[10]](DELEGATECALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0) [[11]](DELEGATECALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0) [[12]](DELEGATECALL 50000 0xd000000000000000000000000000000000000000 0 0 0 0) [[4]]12 [[5]]12 }",
-                "nonce" : "",
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a300000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{ [[10]](CALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[11]](DELEGATECALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0) [[12]](CALLCODE 50000 0xd000000000000000000000000000000000000000 0 0 0 0 0) [[4]]12 [[5]]12 }",
-                "nonce" : "",
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ac00000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{ (CALL 260000 (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) }",
-                "nonce" : "0",
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{ [[1]] 12 (REVERT 0 1) }",
-                "nonce" : "",
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c000000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{ [[2]] 12 (REVERT 0 1) }",
-                "nonce" : "",
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d000000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{ [[3]] 12 (REVERT 0 1) }",
-                "nonce" : "",
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -425,18 +1698,18 @@
                 "000000000000000000000000a300000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "800000",
-                "140000",
-                "160000",
-                "50000"
+                "0x0c3500",
+                "0x0222e0",
+                "0x027100",
+                "0xc350"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ac00000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xac00000000000000000000000000000000000000",
             "value" : [
-                "0",
-                "10"
+                "0x00",
+                "0x0a"
             ]
         }
     }