Merge pull request #319 from ethereum/updategasprice

Updategasprice with new rules

1 files changed, 135 insertions, 9 deletions

diff --git a/GeneralStateTests/stZeroKnowledge/ecmul_1-3_9935_21000_96.json b/GeneralStateTests/stZeroKnowledge/ecmul_1-3_9935_21000_96.json
index 815aca431..90ca8ff03 100644
--- a/GeneralStateTests/stZeroKnowledge/ecmul_1-3_9935_21000_96.json
+++ b/GeneralStateTests/stZeroKnowledge/ecmul_1-3_9935_21000_96.json
@@ -2,8 +2,8 @@
     "ecmul_1-3_9935_21000_96" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.b90fb307.Linux.g++",
-            "source" : "/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_21000_96Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.4e336c9e.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_21000_96Filler.json"
         },
         "env" : {
             "currentCoinbase" : "0x3535353535353535353535353535353535353535",
@@ -13,7 +13,6 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
-        "explanation" : "Puts the point (1, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes",
         "post" : {
             "Byzantium" : [
                 {
@@ -24,14 +23,30 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Constantinople" : [
+                },
                 {
-                    "hash" : "0x65045f49b5935acc31ad7f739bd7a9072f47f15f17bb93bcb20d801e1f7b74f0",
+                    "hash" : "0xb8424d933809d3fb8938d2a4e24224e1454672184cd108e84d04c15aec475829",
                     "indexes" : {
                         "data" : 0,
-                        "gas" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa2dc5ef6bdc30dfc91eee3d5b3ab19b8817c65d365f1dc664c67a49c05cf91e9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x418e21114c5f4970250defd543a34a34d3c673b10ddf5847e6f537fb01fc4a2f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -46,6 +61,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0dbc9e26e49e8684e2caa2d59c38d323de57d9e8a5787cbfb42bfa545ccc51a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0dbc9e26e49e8684e2caa2d59c38d323de57d9e8a5787cbfb42bfa545ccc51a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0dbc9e26e49e8684e2caa2d59c38d323de57d9e8a5787cbfb42bfa545ccc51a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP158" : [
@@ -57,6 +99,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0dbc9e26e49e8684e2caa2d59c38d323de57d9e8a5787cbfb42bfa545ccc51a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0dbc9e26e49e8684e2caa2d59c38d323de57d9e8a5787cbfb42bfa545ccc51a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0dbc9e26e49e8684e2caa2d59c38d323de57d9e8a5787cbfb42bfa545ccc51a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Frontier" : [
@@ -68,6 +137,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xb8424d933809d3fb8938d2a4e24224e1454672184cd108e84d04c15aec475829",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa2dc5ef6bdc30dfc91eee3d5b3ab19b8817c65d365f1dc664c67a49c05cf91e9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x418e21114c5f4970250defd543a34a34d3c673b10ddf5847e6f537fb01fc4a2f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
@@ -79,6 +175,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xb8424d933809d3fb8938d2a4e24224e1454672184cd108e84d04c15aec475829",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa2dc5ef6bdc30dfc91eee3d5b3ab19b8817c65d365f1dc664c67a49c05cf91e9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x418e21114c5f4970250defd543a34a34d3c673b10ddf5847e6f537fb01fc4a2f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -229,7 +352,10 @@
                 "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
             ],
             "gasLimit" : [
-                "0xb0a0"
+                "0xb0a0",
+                "0x015f90",
+                "0x01adb0",
+                "0x030d40"
             ],
             "gasPrice" : "0x1",
             "nonce" : "0x5e",