update general tests

1 files changed, 634 insertions, 44 deletions

diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
index 38a4b713a..f9d1bf974 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
@@ -6,47 +6,637 @@
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionInvChainIDFiller.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" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "ALL"
-                ],
-                "result" : {
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x00"
-                        }
-                    },
-                    "ffffffffffffffffffffffffffffffffffffffff" : {
-                        "nonce" : "0"
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0",
-                "code" : "{ [[0]] 1 }",
-                "nonce" : "0",
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6001600055",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ffffffffffffffffffffffffffffffffffffffff" : {
-                "balance" : "100000",
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
+                "balance" : "0x0186a0",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -57,19 +647,19 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x5208",
+                "0x01d8a8"
             ],
-            "gasPrice" : "0",
-            "nonce" : "0",
-            "r" : "0",
-            "s" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "v" : "0",
+            "gasPrice" : "0x00",
+            "nonce" : "0x00",
+            "r" : "0x00",
+            "s" : "0x00",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "v" : "0x00",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }