regenerate hive tests

1 files changed, 100 insertions, 512 deletions

diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionOrigin.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionOrigin.json
index 47deb242c..3f21c6752 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionOrigin.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionOrigin.json
@@ -2,521 +2,109 @@
     "zeroSigTransactionOrigin" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionOriginFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 2
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 2
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : [
+                        0,
+                        3
+                    ],
+                    "value" : 0
+                },
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffff",
+                            "0x01" : "0xffffffffffffffffffffffffffffffffffffffff"
+                        }
+                    },
+                    "ffffffffffffffffffffffffffffffffffffffff" : {
+                        "balance" : "100000",
+                        "code" : "",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
                     }
                 }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 2
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 2
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : [
+                        1,
+                        2
+                    ],
+                    "value" : 0
+                },
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0",
+                            "0x01" : "0"
+                        }
+                    },
+                    "ffffffffffffffffffffffffffffffffffffffff" : {
+                        "balance" : "100000",
+                        "code" : "",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
                     }
                 }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0xf2399d4632dfd83a0e73d9612af1e7b9c251d135bc3aa2762a337f6f058bc780",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 2
-                    }
-                },
-                {
-                    "hash" : "0xf2399d4632dfd83a0e73d9612af1e7b9c251d135bc3aa2762a337f6f058bc780",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 2
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Frontier",
+                    "Homestead",
+                    "EIP150",
+                    "EIP158"
+                ],
+                "result" : {
+                    "ffffffffffffffffffffffffffffffffffffffff" : {
+                        "balance" : "100000",
+                        "code" : "",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0186a0",
-                "code" : "0x3260005533600155",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "100000",
+                "code" : "{ [[0]] (ORIGIN) [[1]] (CALLER) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xffffffffffffffffffffffffffffffffffffffff" : {
-                "balance" : "0x0186a0",
+            "ffffffffffffffffffffffffffffffffffffffff" : {
+                "balance" : "100000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -526,21 +114,21 @@
                 ""
             ],
             "gasLimit" : [
-                "0x011170",
-                "0x4e20",
-                "0x5208",
-                "0x01d8a8"
+                "70000",
+                "20000",
+                "21000",
+                "121000"
             ],
-            "gasPrice" : "0x00",
-            "nonce" : "0x00",
-            "r" : "0x00",
-            "s" : "0x00",
-            "to" : "0x1000000000000000000000000000000000000000",
-            "v" : "0x01",
+            "gasPrice" : "0",
+            "nonce" : "0",
+            "r" : "0",
+            "s" : "0",
+            "to" : "1000000000000000000000000000000000000000",
+            "v" : "1",
             "value" : [
-                "0x00",
-                "0x01",
-                "0x0186a0"
+                "0",
+                "1",
+                "100000"
             ]
         }
     }