Merge pull request #525 from ethereum/disableEip

Fix BLOCKHASH cost in Constantinople

1 files changed, 26 insertions, 26 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
index 2233e5182..9a7e56ce9 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
@@ -2,10 +2,10 @@
     "randomStatetest317BC_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/randomStatetest317BCFiller.json",
-            "sourceHash" : "2fd1630ad691888b1a0610cd88e267b30b8321cea2d79162714ecbe050aea900"
+            "sourceHash" : "391e4f2cba891635ac9837e910967f3937783992cda7b1e81a3f8b6144417269"
         },
         "blocks" : [
             {
@@ -117,10 +117,10 @@
     "randomStatetest317BC_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/randomStatetest317BCFiller.json",
-            "sourceHash" : "2fd1630ad691888b1a0610cd88e267b30b8321cea2d79162714ecbe050aea900"
+            "sourceHash" : "391e4f2cba891635ac9837e910967f3937783992cda7b1e81a3f8b6144417269"
         },
         "blocks" : [
             {
@@ -130,19 +130,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x050a23",
-                    "hash" : "0x7a4f6c2c91c6310e446e58a943be4b601fcf8b2a51cc6431dda17848888887c5",
+                    "gasUsed" : "0x050bb4",
+                    "hash" : "0x9b636ba4988b563ce2b8ed31b6a05c0d10c2c377dcefa8496736592341c0e05f",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
-                    "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
-                    "stateRoot" : "0x9509d452d8b55f30488071539704a58c8de62c26b4e4e406fc0a452ed9a1b66d",
+                    "receiptTrie" : "0xe5adcdb6ced3e55272fc594d741d48c978e7e60b4dddf77bcd74ec30e64baf53",
+                    "stateRoot" : "0x2bcbff896e40596bd963fe7b254b0484756f5d09098cd39ebfd3d1c35439dce5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09509d452d8b55f30488071539704a58c8de62c26b4e4e406fc0a452ed9a1b66da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02bcbff896e40596bd963fe7b254b0484756f5d09098cd39ebfd3d1c35439dce5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e5adcdb6ced3e55272fc594d741d48c978e7e60b4dddf77bcd74ec30e64baf53b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -179,7 +179,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a4f6c2c91c6310e446e58a943be4b601fcf8b2a51cc6431dda17848888887c5",
+        "lastblockhash" : "0x9b636ba4988b563ce2b8ed31b6a05c0d10c2c377dcefa8496736592341c0e05f",
         "network" : "Constantinople",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -190,14 +190,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x1bc16d674ecd0a51",
+                "balance" : "0x1bc16d674ecd0be2",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75d6f3d",
+                "balance" : "0x0de0b6b3a75d6dac",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -232,10 +232,10 @@
     "randomStatetest317BC_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/randomStatetest317BCFiller.json",
-            "sourceHash" : "2fd1630ad691888b1a0610cd88e267b30b8321cea2d79162714ecbe050aea900"
+            "sourceHash" : "391e4f2cba891635ac9837e910967f3937783992cda7b1e81a3f8b6144417269"
         },
         "blocks" : [
             {
@@ -347,10 +347,10 @@
     "randomStatetest317BC_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/randomStatetest317BCFiller.json",
-            "sourceHash" : "2fd1630ad691888b1a0610cd88e267b30b8321cea2d79162714ecbe050aea900"
+            "sourceHash" : "391e4f2cba891635ac9837e910967f3937783992cda7b1e81a3f8b6144417269"
         },
         "blocks" : [
             {
@@ -462,10 +462,10 @@
     "randomStatetest317BC_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/randomStatetest317BCFiller.json",
-            "sourceHash" : "2fd1630ad691888b1a0610cd88e267b30b8321cea2d79162714ecbe050aea900"
+            "sourceHash" : "391e4f2cba891635ac9837e910967f3937783992cda7b1e81a3f8b6144417269"
         },
         "blocks" : [
             {
@@ -577,10 +577,10 @@
     "randomStatetest317BC_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/randomStatetest317BCFiller.json",
-            "sourceHash" : "2fd1630ad691888b1a0610cd88e267b30b8321cea2d79162714ecbe050aea900"
+            "sourceHash" : "391e4f2cba891635ac9837e910967f3937783992cda7b1e81a3f8b6144417269"
         },
         "blocks" : [
             {