Merge pull request #525 from ethereum/disableEip

Fix BLOCKHASH cost in Constantinople

1 files changed, 26 insertions, 26 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest128BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest128BC.json
index 098eec86c..9369c70da 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest128BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest128BC.json
@@ -2,10 +2,10 @@
     "randomStatetest128BC_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/randomStatetest128BCFiller.json",
-            "sourceHash" : "e7c3790b6ae4feedd3bf4d4127ac1d4fdedb28dd63dbd6d8100a7bdc6e7dd32e"
+            "sourceHash" : "08c9a75c21de619f63c98b6a694189ff7756bf7ca63fcb516adea6e8ff031daa"
         },
         "blocks" : [
             {
@@ -118,10 +118,10 @@
     "randomStatetest128BC_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/randomStatetest128BCFiller.json",
-            "sourceHash" : "e7c3790b6ae4feedd3bf4d4127ac1d4fdedb28dd63dbd6d8100a7bdc6e7dd32e"
+            "sourceHash" : "08c9a75c21de619f63c98b6a694189ff7756bf7ca63fcb516adea6e8ff031daa"
         },
         "blocks" : [
             {
@@ -131,19 +131,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xb246",
-                    "hash" : "0x0eeb05d5e26687164f718134e7cdfc7c9bbdad4ce7381388328eca79aca6b270",
+                    "gasUsed" : "0xaf3a",
+                    "hash" : "0x0f5c6b1671a2343efca961e5c229a219e66b5445c104ce7ab150be836f8c7e64",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
                     "parentHash" : "0xf0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61",
-                    "receiptTrie" : "0xca0009fc66080d392d9e3450e1a78ff1a385d965aeae4d726941681be09d6e08",
-                    "stateRoot" : "0xb9c6fdcdaf321e691462f2b9e1eb8b006af3b84657370a790e835e0be2f1a75d",
+                    "receiptTrie" : "0x83c102730c26769fd5f956a95d1d072f616c5ad1a307ef7040ec9f771b53c127",
+                    "stateRoot" : "0xe4e1706e4edca667aa170ab3df049eca9a13eff7b4a4aaf949bde4a862b460a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x62e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b9c6fdcdaf321e691462f2b9e1eb8b006af3b84657370a790e835e0be2f1a75da062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0ca0009fc66080d392d9e3450e1a78ff1a385d965aeae4d726941681be09d6e08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2468203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
+                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e4e1706e4edca667aa170ab3df049eca9a13eff7b4a4aaf949bde4a862b460a8a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a083c102730c26769fd5f956a95d1d072f616c5ad1a307ef7040ec9f771b53c127b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c61",
@@ -180,7 +180,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a295ae738d8d4748f6e1ad6829cab8626d56836a5475de8cc28f59b15f790d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0eeb05d5e26687164f718134e7cdfc7c9bbdad4ce7381388328eca79aca6b270",
+        "lastblockhash" : "0x0f5c6b1671a2343efca961e5c229a219e66b5445c104ce7ab150be836f8c7e64",
         "network" : "Constantinople",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -192,14 +192,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x1bc16d674ec8b274",
+                "balance" : "0x1bc16d674ec8af68",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3730f5708",
+                "balance" : "0x0de0b6b3730f5a14",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -234,10 +234,10 @@
     "randomStatetest128BC_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/randomStatetest128BCFiller.json",
-            "sourceHash" : "e7c3790b6ae4feedd3bf4d4127ac1d4fdedb28dd63dbd6d8100a7bdc6e7dd32e"
+            "sourceHash" : "08c9a75c21de619f63c98b6a694189ff7756bf7ca63fcb516adea6e8ff031daa"
         },
         "blocks" : [
             {
@@ -350,10 +350,10 @@
     "randomStatetest128BC_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/randomStatetest128BCFiller.json",
-            "sourceHash" : "e7c3790b6ae4feedd3bf4d4127ac1d4fdedb28dd63dbd6d8100a7bdc6e7dd32e"
+            "sourceHash" : "08c9a75c21de619f63c98b6a694189ff7756bf7ca63fcb516adea6e8ff031daa"
         },
         "blocks" : [
             {
@@ -466,10 +466,10 @@
     "randomStatetest128BC_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/randomStatetest128BCFiller.json",
-            "sourceHash" : "e7c3790b6ae4feedd3bf4d4127ac1d4fdedb28dd63dbd6d8100a7bdc6e7dd32e"
+            "sourceHash" : "08c9a75c21de619f63c98b6a694189ff7756bf7ca63fcb516adea6e8ff031daa"
         },
         "blocks" : [
             {
@@ -582,10 +582,10 @@
     "randomStatetest128BC_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/randomStatetest128BCFiller.json",
-            "sourceHash" : "e7c3790b6ae4feedd3bf4d4127ac1d4fdedb28dd63dbd6d8100a7bdc6e7dd32e"
+            "sourceHash" : "08c9a75c21de619f63c98b6a694189ff7756bf7ca63fcb516adea6e8ff031daa"
         },
         "blocks" : [
             {