regenerate hive tests

1 files changed, 74 insertions, 195 deletions

diff --git a/GeneralStateTests/stStaticCall/static_CheckOpcodes4.json b/GeneralStateTests/stStaticCall/static_CheckOpcodes4.json
index 578c474b9..74ccb3311 100644
--- a/GeneralStateTests/stStaticCall/static_CheckOpcodes4.json
+++ b/GeneralStateTests/stStaticCall/static_CheckOpcodes4.json
@@ -2,215 +2,94 @@
     "static_CheckOpcodes4" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.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" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xede69fda9c1c0dcf74adce8ec2d48751400109627a3108c774db431a3f180fd6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xede69fda9c1c0dcf74adce8ec2d48751400109627a3108c774db431a3f180fd6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xede69fda9c1c0dcf74adce8ec2d48751400109627a3108c774db431a3f180fd6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xede69fda9c1c0dcf74adce8ec2d48751400109627a3108c774db431a3f180fd6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : 0
                 },
-                {
-                    "hash" : "0xede69fda9c1c0dcf74adce8ec2d48751400109627a3108c774db431a3f180fd6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xede69fda9c1c0dcf74adce8ec2d48751400109627a3108c774db431a3f180fd6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xede69fda9c1c0dcf74adce8ec2d48751400109627a3108c774db431a3f180fd6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xede69fda9c1c0dcf74adce8ec2d48751400109627a3108c774db431a3f180fd6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x06" : "0x1000000000000000000000000000000000000000"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
                     }
                 }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x34e26cce39fd7feded32b452f89afd3f4d61a0f291a0afa08c415042efc495f5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0x5d7b74ba57578008e50ef1260ecf0b21b054b8f77a0d602f1fff7a3a19a4484d",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : 1
                 },
-                {
-                    "hash" : "0x43f9fb389d635b799ceeb4177488ea6a0642018e6b9d9fb0d59c19ce5de333dc",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x04" : "0x64",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x06" : "0x1000000000000000000000000000000000000000"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x00",
-                "code" : "0x6000600060006000731000000000000000000000000000000000000001620186a0fa6001556000600060006000731000000000000000000000000000000000000002620186a0fa60025533600355346004553260055530600655",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0",
+                "code" : "{ [[1]] (STATICCALL 100000 0x1000000000000000000000000000000000000001 0 0 0 0) [[2]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0) [[3]] (CALLER) [[4]] (CALLVALUE) [[5]] (ORIGIN) [[6]] (ADDRESS) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000014604b5760026001556051565b60016001525b30731000000000000000000000000000000000000001146074576002600155607a565b60016001525b34600014608a5760026001556090565b60016001525b",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0",
+                "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000014604b5760026001556051565b60016001525b30731000000000000000000000000000000000000002146074576002600155607a565b60016001525b34600014608a5760026001556090565b60016001525b",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a51000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -220,16 +99,16 @@
                 ""
             ],
             "gasLimit" : [
-                "0xc350",
-                "0x051c98"
+                "50000",
+                "335000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
             "value" : [
-                "0x00",
-                "0x64"
+                "0",
+                "100"
             ]
         }
     }