update general tests

1 files changed, 132 insertions, 78 deletions

diff --git a/GeneralStateTests/stStaticCall/static_Call1MB1024Calldepth.json b/GeneralStateTests/stStaticCall/static_Call1MB1024Calldepth.json
index 559f70711..9bafc5052 100644
--- a/GeneralStateTests/stStaticCall/static_Call1MB1024Calldepth.json
+++ b/GeneralStateTests/stStaticCall/static_Call1MB1024Calldepth.json
@@ -6,104 +6,158 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "882500000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0xcd79195900",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : 0,
-                    "gas" : -1,
-                    "value" : -1
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xbb49e60a0a9c224fa1ca6c5800fb429cfb15bdd05997bd22e14fd65e983d7342",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
+                {
+                    "hash" : "0xbb49e60a0a9c224fa1ca6c5800fb429cfb15bdd05997bd22e14fd65e983d7342",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "340282366920938463463374606576630825020"
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xbb49e60a0a9c224fa1ca6c5800fb429cfb15bdd05997bd22e14fd65e983d7342",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbb49e60a0a9c224fa1ca6c5800fb429cfb15bdd05997bd22e14fd65e983d7342",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x60016000540160005561040060005410601b5760016002556045565b60006000620f4240600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03fa6001555b",
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x00" : "0x01",
-                            "0x01" : "0x00"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 1,
-                    "gas" : -1,
-                    "value" : -1
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x5ec6d930391ee23d713ce66da97cbc366bf929411f5fb0d01c5dae5fea491455",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x5ec6d930391ee23d713ce66da97cbc366bf929411f5fb0d01c5dae5fea491455",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x5ec6d930391ee23d713ce66da97cbc366bf929411f5fb0d01c5dae5fea491455",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
+                {
+                    "hash" : "0x5ec6d930391ee23d713ce66da97cbc366bf929411f5fb0d01c5dae5fea491455",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x7a6ec2437e4f7f5affb760be1ab360de5221df61fefca20d798b5ea54e738291",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "340282366920938463463374607430644755785"
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xde79c963e0243f89748a78f8f39040f3047c77a9d70dcecb726ae683f54f7d73",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x60016000540160005561040060005410601b5760016002556045565b60006000620f4240600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03fa6001555b",
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0xfffffffffffff",
-                "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0)  }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0fffffffffffff",
+                "code" : "0x600060006000600060006000355af1600055",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffff",
+            "0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffff",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffff",
-                "code" : "{ (def 'i 0x80) [[ 0 ]] (+ @@0 1) (if (LT @@0 1024) [[ 1 ]] (STATICCALL (- (GAS) 1005000) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 1000000 0 0) [[ 2 ]] 1 )  }",
-                "nonce" : "0",
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffff",
+                "code" : "0x60016000540160005561040060005410601b5760016002556045565b60006000620f4240600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03fa6001555b",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "cbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffff",
-                "code" : "{ (def 'i 0x80) (MSTORE 0 (+ (MLOAD 0) 1)) (if (LT (MLOAD 0) 1024) (MSTORE 32 (STATICCALL (- (GAS) 1005000) 0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 1000000 0 0)) (MSTORE 64 1) )   }",
-                "nonce" : "0",
+            "0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffff",
+                "code" : "0x60016000510160005261040060005110601b5760016040526045565b60006000620f4240600073cbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03fa6020525b",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -114,14 +168,14 @@
                 "0x000000000000000000000000cbbf5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "882500000000"
+                "0xcd79195900"
             ],
-            "gasPrice" : "1",
-            "nonce" : "",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }