From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001
From: Dimitry <winsvega@mail.ru>
Date: Tue, 1 Aug 2017 11:04:30 +0300
Subject: update general tests

---
 .../stStaticCall/static_callBasic.json             | 351 +++++++++++++++------
 1 file changed, 248 insertions(+), 103 deletions(-)

(limited to 'GeneralStateTests/stStaticCall/static_callBasic.json')

diff --git a/GeneralStateTests/stStaticCall/static_callBasic.json b/GeneralStateTests/stStaticCall/static_callBasic.json
index 6d34a94e4..f1d5d1b53 100644
--- a/GeneralStateTests/stStaticCall/static_callBasic.json
+++ b/GeneralStateTests/stStaticCall/static_callBasic.json
@@ -6,135 +6,280 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "10000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : [
-                        0,
-                        1
-                    ],
-                    "gas" : -1,
-                    "value" : -1
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x0d523a"
-                        }
-                    }
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : [
-                        2
-                    ],
-                    "gas" : -1,
-                    "value" : -1
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x01",
-                            "0x01" : "0x0dff20"
-                        }
-                    }
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : [
-                        3
-                    ],
-                    "gas" : -1,
-                    "value" : -1
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x01",
-                            "0x01" : "0x0e8125"
-                        }
-                    },
-                    "3000000000000000000000000000000000000003" : {
-                        "balance" : "23"
-                    }
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x878b80add1abb7af8d96df83bce06145d9fb66fa717d2cc1287f1b6c79bd2e9e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x9e7aa1a7c5c8d833eddc371a7f345164c71f351cdec57f88694a43e9808cb266",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9e7aa1a7c5c8d833eddc371a7f345164c71f351cdec57f88694a43e9808cb266",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xa36b307bf39fda51ee5d0e625576b54edffce138c72af2ac59ad89933af2f486",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9de54a362f7300bda55c9888c94c4b822c3db8a1a4913698622a63fbd629ec56",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) [[ 1 ]] (GAS) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600035620186a0fa6000555a600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "23",
-                "code" : " { [[ 1 ]] 1 } ",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "23",
-                "code" : " { [[ 1 ]] 0 } ",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x17",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x00"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "23",
-                "code" : " { (CALL 40000 0x2000000000000000000000000000000000000003 0 0 0 0 0) (MSTORE 1 1) } ",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x17",
+                "code" : "0x60006000600060006000732000000000000000000000000000000000000003619c40f1506001600152",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000004" : {
-                "balance" : "23",
-                "code" : " { (CALLCODE 40000 0x3000000000000000000000000000000000000003 1 0 0 0 0) (MSTORE 1 1) } ",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000004" : {
+                "balance" : "0x17",
+                "code" : "0x60006000600060006001733000000000000000000000000000000000000003619c40f2506001600152",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2000000000000000000000000000000000000003" : {
-                "balance" : "23",
-                "code" : " { (LOG0 1 10) (MSTORE 1 1) } ",
-                "nonce" : "0",
+            "0x2000000000000000000000000000000000000003" : {
+                "balance" : "0x17",
+                "code" : "0x600a6001a06001600152",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "3000000000000000000000000000000000000003" : {
-                "balance" : "23",
-                "code" : " { (MSTORE 1 1) } ",
-                "nonce" : "0",
+            "0x3000000000000000000000000000000000000003" : {
+                "balance" : "0x17",
+                "code" : "0x6001600152",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -147,14 +292,14 @@
                 "0x0000000000000000000000001000000000000000000000000000000000000004"
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
-- 
cgit