update general tests

1 files changed, 101 insertions, 130 deletions

diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000.json
index 1fc7c1bfe..43d3d51e3 100644
--- a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000.json
+++ b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000.json
@@ -10,176 +10,147 @@
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x5f5e100",
             "currentNumber" : "0x1",
-            "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" : {
-                        }
+        "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas",
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "0000000000000000000000000000000000000007" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "0000000000000000000000000000000000000008" : {
-                        "balance" : "1",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xe9695b10d5a72846382fba0293e877097bf8b14fc916029625b58e6ffb3a91b2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "3535353535353535353535353535353535353535" : {
-                        "balance" : "326730",
-                        "code" : "0x",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xe9695b10d5a72846382fba0293e877097bf8b14fc916029625b58e6ffb3a91b2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "999999999999673270",
-                        "code" : "0x",
-                        "nonce" : "2",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xe9695b10d5a72846382fba0293e877097bf8b14fc916029625b58e6ffb3a91b2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "c305c901078781c232a2a521c2af7980f8385ee9" : {
-                        "balance" : "0",
-                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
-                        "nonce" : "1",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
-        "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas",
+            ]
+        },
         "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" : {
                 }
             },
-            "3535353535353535353535353535353535353535" : {
-                "balance" : "131834",
-                "code" : "0x",
-                "nonce" : "0",
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "999999999999868166",
-                "code" : "0x",
-                "nonce" : "1",
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c305c901078781c232a2a521c2af7980f8385ee9" : {
-                "balance" : "0",
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
-                "nonce" : "1",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }