regenerate hive tests

1 files changed, 92 insertions, 202 deletions

diff --git a/GeneralStateTests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json b/GeneralStateTests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
index c9409faf1..ed740d5f7 100644
--- a/GeneralStateTests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
+++ b/GeneralStateTests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
@@ -2,243 +2,133 @@
     "static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : {
         "_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_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.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" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "1"
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "1"
                     }
                 }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : 2,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0x233c1da90828a53adde2c86d53859e611abfc3d7807828f528a42ecc849fdef6",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "1"
                     }
                 }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x510b6a93c8820120b2a8e8bdf3ae473c41900cf4f722e6f6125d1c6674cd4413",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xdf8d9c168f81a12818f05f337061ae5b03a17c996d3b6b251f118c7cb8e18d3f",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x510b6a93c8820120b2a8e8bdf3ae473c41900cf4f722e6f6125d1c6674cd4413",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : 3,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0xaa09c6f8acf05b087bf49197368fb2edd90377dc93b608bfde9f4407bca116d4",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "1"
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600155",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "100000",
+                "code" : "{(SSTORE 1 1)}",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x2000000000000000000000000000000000000001" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600152",
-                "nonce" : "0x00",
+            "2000000000000000000000000000000000000001" : {
+                "balance" : "100000",
+                "code" : "{(MSTORE 1 1)}",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x3000000000000000000000000000000000000001" : {
-                "balance" : "0x0186a0",
-                "code" : "0x5b61c35060805110156018576001608051016080526000565b",
-                "nonce" : "0x00",
+            "3000000000000000000000000000000000000001" : {
+                "balance" : "100000",
+                "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x4000000000000000000000000000000000000001" : {
-                "balance" : "0x0186a0",
-                "code" : "0x600060006000600060007340000000000000000000000000000000000000046103e8f2",
-                "nonce" : "0x00",
+            "4000000000000000000000000000000000000001" : {
+                "balance" : "100000",
+                "code" : "{ (CALLCODE 1000 0x4000000000000000000000000000000000000004 0 0 0 0 0) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x4000000000000000000000000000000000000004" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600152",
-                "nonce" : "0x00",
+            "4000000000000000000000000000000000000004" : {
+                "balance" : "100000",
+                "code" : "{ (MSTORE 1 1) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x5000000000000000000000000000000000000001" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60006000600060006000734000000000000000000000000000000000000004620f4240f2",
-                "nonce" : "0x00",
+            "5000000000000000000000000000000000000001" : {
+                "balance" : "100000",
+                "code" : "{ (CALLCODE 1000000 0x4000000000000000000000000000000000000004 0 0 0 0 0) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1100000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000161c350fa",
-                "nonce" : "0x00",
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "{(STATICCALL 50000 0x1000000000000000000000000000000000000001 0 64 0 64)}",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -251,14 +141,14 @@
                 "0x604060006040600073400000000000000000000000000000000000000161c350fa"
             ],
             "gasLimit" : [
-                "0x017700"
+                "96000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0x00"
+                "0"
             ]
         }
     }