Merge pull request #525 from ethereum/disableEip

Fix BLOCKHASH cost in Constantinople

1 files changed, 26 insertions, 26 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest289BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest289BC.json
index 0fc38c996..47b3389ed 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest289BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest289BC.json
@@ -2,10 +2,10 @@
     "randomStatetest289BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
-            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
+            "lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json",
-            "sourceHash" : "ec4797eb0f70de1ecc007b0d1d4e719a54cb4f40b1ab16aafa2d87dc7d185113"
+            "sourceHash" : "72b29506946b21389e9d42a45f23da5fc3d9aedfc24883080797636c596838c7"
         },
         "blocks" : [
             {
@@ -118,10 +118,10 @@
     "randomStatetest289BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
-            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
+            "lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json",
-            "sourceHash" : "ec4797eb0f70de1ecc007b0d1d4e719a54cb4f40b1ab16aafa2d87dc7d185113"
+            "sourceHash" : "72b29506946b21389e9d42a45f23da5fc3d9aedfc24883080797636c596838c7"
         },
         "blocks" : [
             {
@@ -131,19 +131,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xd089",
-                    "hash" : "0x57303946aba987c187b11ed75e53ccfe80a2f8b337ef0d66e20b04522f9cea5e",
+                    "gasUsed" : "0xcd7d",
+                    "hash" : "0x99242860e3d96605ddc6cc51106771135f82e77560331f2a982e4e8e6e5f3ed4",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
                     "parentHash" : "0x83e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564c",
-                    "receiptTrie" : "0xe8b501a5d072500b8093b3f901f847c6347e6721971b4b7af576dd2b85c25c48",
-                    "stateRoot" : "0xb1efe3b1e4d0f3083a52b71f89e13d16cab2a806d9d34d824885ed89784f4479",
+                    "receiptTrie" : "0xc45dd0f785a76da7a9a0ded20d856d9f57a8d8b91ed6d02f4a8e69eb0fbf4ad0",
+                    "stateRoot" : "0x0a8e15f9161c59566003edcf3461f1ffe8b6a05deae351d8536b2912552e381e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b1efe3b1e4d0f3083a52b71f89e13d16cab2a806d9d34d824885ed89784f4479a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0e8b501a5d072500b8093b3f901f847c6347e6721971b4b7af576dd2b85c25c48b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d0898203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
+                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a8e15f9161c59566003edcf3461f1ffe8b6a05deae351d8536b2912552e381ea0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0c45dd0f785a76da7a9a0ded20d856d9f57a8d8b91ed6d02f4a8e69eb0fbf4ad0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -180,7 +180,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a002935b487bec042de549c7389bbcd4ea7fc303d15e0f989dfe226a29d991d4bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57303946aba987c187b11ed75e53ccfe80a2f8b337ef0d66e20b04522f9cea5e",
+        "lastblockhash" : "0x99242860e3d96605ddc6cc51106771135f82e77560331f2a982e4e8e6e5f3ed4",
         "network" : "Constantinople",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -192,14 +192,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x1bc16d674ec8d0b7",
+                "balance" : "0x1bc16d674ec8cdab",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b342fc7f77",
+                "balance" : "0x0de0b6b342fc8283",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -234,10 +234,10 @@
     "randomStatetest289BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
-            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
+            "lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json",
-            "sourceHash" : "ec4797eb0f70de1ecc007b0d1d4e719a54cb4f40b1ab16aafa2d87dc7d185113"
+            "sourceHash" : "72b29506946b21389e9d42a45f23da5fc3d9aedfc24883080797636c596838c7"
         },
         "blocks" : [
             {
@@ -350,10 +350,10 @@
     "randomStatetest289BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
-            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
+            "lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json",
-            "sourceHash" : "ec4797eb0f70de1ecc007b0d1d4e719a54cb4f40b1ab16aafa2d87dc7d185113"
+            "sourceHash" : "72b29506946b21389e9d42a45f23da5fc3d9aedfc24883080797636c596838c7"
         },
         "blocks" : [
             {
@@ -466,10 +466,10 @@
     "randomStatetest289BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
-            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
+            "lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json",
-            "sourceHash" : "ec4797eb0f70de1ecc007b0d1d4e719a54cb4f40b1ab16aafa2d87dc7d185113"
+            "sourceHash" : "72b29506946b21389e9d42a45f23da5fc3d9aedfc24883080797636c596838c7"
         },
         "blocks" : [
             {
@@ -582,10 +582,10 @@
     "randomStatetest289BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
-            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
+            "lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json",
-            "sourceHash" : "ec4797eb0f70de1ecc007b0d1d4e719a54cb4f40b1ab16aafa2d87dc7d185113"
+            "sourceHash" : "72b29506946b21389e9d42a45f23da5fc3d9aedfc24883080797636c596838c7"
         },
         "blocks" : [
             {