update general tests

1 files changed, 138 insertions, 231 deletions

diff --git a/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_1.json b/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_1.json
index 82c6ce370..156e9783c 100644
--- a/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_1.json
+++ b/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_1.json
@@ -10,304 +10,211 @@
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x5f5e100",
             "currentNumber" : "0x01",
-            "currentTimestamp" : "1000",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : 0,
-                    "gas" : 0,
-                    "value" : 0
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "0000000000000000000000000000000000000001" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "0000000000000000000000000000000000000002" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "0000000000000000000000000000000000000003" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "0000000000000000000000000000000000000004" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "0000000000000000000000000000000000000005" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "0000000000000000000000000000000000000006" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "0000000000000000000000000000000000000007" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "0000000000000000000000000000000000000008" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "24143873e0e0815fdcbcffdbe09c979cbf9ad013" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "3535353535353535353535353535353535353535" : {
-                        "balance" : "2597774",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "598443f1880ef585b21f1d7585bd0577402861e5" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "77db2bebba79db42a978f896968f4afce746ea1f" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "7d577a597b2742b498cb5cf0c26cdcd726d39e6e" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "999999999997402226",
-                        "code" : "0x",
-                        "nonce" : "12",
-                        "storage" : {
-                        }
+        "explanation" : "Puts the given data into the ECPAIRING precompile",
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x8b2d49ea990fcfd5f96df501cb7b4f8976ce997dea39859f947259bc4e94a888",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x8b2d49ea990fcfd5f96df501cb7b4f8976ce997dea39859f947259bc4e94a888",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xc0eeb74f6e9d53e153c3f8a4ac80cfe77ea574c7894f6353960ee812a90c45b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "c305c901078781c232a2a521c2af7980f8385ee9" : {
-                        "balance" : "0",
-                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b",
-                        "nonce" : "1",
-                        "storage" : {
-                            "0x00" : "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6"
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc0eeb74f6e9d53e153c3f8a4ac80cfe77ea574c7894f6353960ee812a90c45b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "dceceaf3fc5c0a63d195d69b1a90011b7b19650d" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xf4a9c1a1bc442246e6f06473865abeefe0f736b8f282d65366f4785705c2b382",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "e0fc04fa2d34a66b779fd5cee748268032a146c0" : {
-                        "balance" : "1000000000000000000",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
-        "explanation" : "Puts the given data into the ECPAIRING precompile",
+            ]
+        },
         "pre" : {
-            "0000000000000000000000000000000000000001" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000002" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000003" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000004" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000005" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000006" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000007" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000008" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "24143873e0e0815fdcbcffdbe09c979cbf9ad013" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x24143873e0e0815fdcbcffdbe09c979cbf9ad013" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "3535353535353535353535353535353535353535" : {
-                "balance" : "2289069",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x22edad",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "598443f1880ef585b21f1d7585bd0577402861e5" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x598443f1880ef585b21f1d7585bd0577402861e5" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "77db2bebba79db42a978f896968f4afce746ea1f" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x77db2bebba79db42a978f896968f4afce746ea1f" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "7d577a597b2742b498cb5cf0c26cdcd726d39e6e" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "999999999997710931",
-                "code" : "0x",
-                "nonce" : "11",
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7411253",
+                "code" : "",
+                "nonce" : "0x0b",
                 "storage" : {
                 }
             },
-            "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c305c901078781c232a2a521c2af7980f8385ee9" : {
-                "balance" : "0",
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b",
-                "nonce" : "1",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
                 }
             },
-            "dceceaf3fc5c0a63d195d69b1a90011b7b19650d" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "e0fc04fa2d34a66b779fd5cee748268032a146c0" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0xe0fc04fa2d34a66b779fd5cee748268032a146c0" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }