Merge pull request #319 from ethereum/updategasprice

Updategasprice with new rules

1 files changed, 134 insertions, 8 deletions

diff --git a/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192.json b/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192.json
index 82bf9f09c..b7af81679 100644
--- a/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192.json
+++ b/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192.json
@@ -2,8 +2,8 @@
     "ecadd_1-2_0-0_25000_192" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.b90fb307.Linux.g++",
-            "source" : "/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.4e336c9e.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json"
         },
         "env" : {
             "currentCoinbase" : "0x3535353535353535353535353535353535353535",
@@ -13,7 +13,6 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
-        "explanation" : "Puts the points (1, 2) and (0, 0) into the ECADD precompile, truncating or expanding the input data to 192 bytes. Gives the execution 25000 bytes",
         "post" : {
             "Byzantium" : [
                 {
@@ -24,14 +23,30 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Constantinople" : [
+                },
                 {
                     "hash" : "0x1e21dff3666bfdff87c1e794f92679810c6cbd0f5f7349376fc556404b65f0d8",
                     "indexes" : {
                         "data" : 0,
-                        "gas" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x1e21dff3666bfdff87c1e794f92679810c6cbd0f5f7349376fc556404b65f0d8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x1e21dff3666bfdff87c1e794f92679810c6cbd0f5f7349376fc556404b65f0d8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -46,6 +61,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x05b93242f6ee6bfcec06d44ba99ac5b3dc836091ffc931fce43124fb9e8bc48b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x05b93242f6ee6bfcec06d44ba99ac5b3dc836091ffc931fce43124fb9e8bc48b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x05b93242f6ee6bfcec06d44ba99ac5b3dc836091ffc931fce43124fb9e8bc48b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP158" : [
@@ -57,6 +99,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x05b93242f6ee6bfcec06d44ba99ac5b3dc836091ffc931fce43124fb9e8bc48b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x05b93242f6ee6bfcec06d44ba99ac5b3dc836091ffc931fce43124fb9e8bc48b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x05b93242f6ee6bfcec06d44ba99ac5b3dc836091ffc931fce43124fb9e8bc48b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Frontier" : [
@@ -68,6 +137,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x106d4d3d9900b4dd11c28b4ae9bf487c89bb1d72cedcf08769db1faff81355a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x58afd416b1ab9baa72c4539d16a28b1b823bc0df27fec83719820acaf4894c60",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x8bf2176ce2afe8c6676dd0a2b6fd3d3340eb11a5ed5f086f76ac4ca11debad51",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
@@ -79,6 +175,33 @@
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x106d4d3d9900b4dd11c28b4ae9bf487c89bb1d72cedcf08769db1faff81355a8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x58afd416b1ab9baa72c4539d16a28b1b823bc0df27fec83719820acaf4894c60",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x8bf2176ce2afe8c6676dd0a2b6fd3d3340eb11a5ed5f086f76ac4ca11debad51",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -230,7 +353,10 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0xb9c0"
+                "0xb9c0",
+                "0x015f90",
+                "0x01adb0",
+                "0x030d40"
             ],
             "gasPrice" : "0x1",
             "nonce" : "0x1c",