Merge pull request #319 from ethereum/updategasprice

Updategasprice with new rules

1 files changed, 136 insertions, 10 deletions

diff --git a/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_9935_28000_128.json b/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_9935_28000_128.json
index 0f46e8c54..8e995b6ba 100644
--- a/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_9935_28000_128.json
+++ b/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_9935_28000_128.json
@@ -2,8 +2,8 @@
     "ecmul_7827-6598_9935_28000_128" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.b90fb307.Linux.g++",
-            "source" : "/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.4e336c9e.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json"
         },
         "env" : {
             "currentCoinbase" : "0x3535353535353535353535353535353535353535",
@@ -13,25 +13,40 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
-        "explanation" : "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes",
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xadc6908de8b5d54b79ea30cff49685c03d5d88b1b02483ff1f76c6d583136a21",
+                    "hash" : "0xa003939afd5746467dbf78dcf2c4bf2a2ce2b22319decb0aaf4d34e7c1b094ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Constantinople" : [
+                },
                 {
-                    "hash" : "0xadc6908de8b5d54b79ea30cff49685c03d5d88b1b02483ff1f76c6d583136a21",
+                    "hash" : "0x5cac3652724dcc03601383e8c9c066c0b1ffa90c8bdb28832d3d78a840036309",
                     "indexes" : {
                         "data" : 0,
-                        "gas" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x5cac3652724dcc03601383e8c9c066c0b1ffa90c8bdb28832d3d78a840036309",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x5cac3652724dcc03601383e8c9c066c0b1ffa90c8bdb28832d3d78a840036309",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -46,6 +61,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x507bd9112c93b2f58b84d414859d9327908922942c311a2debed849e7f0728c9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x507bd9112c93b2f58b84d414859d9327908922942c311a2debed849e7f0728c9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x507bd9112c93b2f58b84d414859d9327908922942c311a2debed849e7f0728c9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP158" : [
@@ -57,6 +99,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x507bd9112c93b2f58b84d414859d9327908922942c311a2debed849e7f0728c9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x507bd9112c93b2f58b84d414859d9327908922942c311a2debed849e7f0728c9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x507bd9112c93b2f58b84d414859d9327908922942c311a2debed849e7f0728c9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Frontier" : [
@@ -68,6 +137,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa5537823ea0d3fe1926f449ab2c78631cf058f2492a9d28c0c50ebe4d216ef17",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xf99925b6deb63c15d7769b366d439fc00bbe75135366d1c2ed07fb5e83326617",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xad2889ba9b7bfb3716599bcf909bd3f7049a2815c3b3cd0e9caaaf525cd8eaa9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
@@ -79,6 +175,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa5537823ea0d3fe1926f449ab2c78631cf058f2492a9d28c0c50ebe4d216ef17",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xf99925b6deb63c15d7769b366d439fc00bbe75135366d1c2ed07fb5e83326617",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xad2889ba9b7bfb3716599bcf909bd3f7049a2815c3b3cd0e9caaaf525cd8eaa9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -230,7 +353,10 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0xdbb8"
+                "0xdbb8",
+                "0x015f90",
+                "0x01adb0",
+                "0x030d40"
             ],
             "gasPrice" : "0x1",
             "nonce" : "0xbe",