Merge pull request #525 from ethereum/disableEip

Fix BLOCKHASH cost in Constantinople

1 files changed, 26 insertions, 26 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest557BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest557BC.json
index 26396245f..a5edcb928 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest557BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest557BC.json
@@ -2,10 +2,10 @@
     "randomStatetest557BC_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/randomStatetest557BCFiller.json",
-            "sourceHash" : "157e93209b35d07169e2a3ecab6228fd3e3350c9ea7e4ec60c20108a560187b2"
+            "sourceHash" : "fbe6f28bfb25cb08d91998ffaef92ec96354df63e0ff40fcc0aa1f58a83e3049"
         },
         "blocks" : [
             {
@@ -118,10 +118,10 @@
     "randomStatetest557BC_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/randomStatetest557BCFiller.json",
-            "sourceHash" : "157e93209b35d07169e2a3ecab6228fd3e3350c9ea7e4ec60c20108a560187b2"
+            "sourceHash" : "fbe6f28bfb25cb08d91998ffaef92ec96354df63e0ff40fcc0aa1f58a83e3049"
         },
         "blocks" : [
             {
@@ -131,19 +131,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa524",
-                    "hash" : "0x45b4b553431b7827e6bd1737011e7c6bcc3e1b5a876a09916b188571f775ae7f",
+                    "gasUsed" : "0xa218",
+                    "hash" : "0x1ba881494706be82f4b470e60b5fb85e473d1b1576a01235a77a15e13ccf23bd",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
                     "parentHash" : "0x3713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49",
-                    "receiptTrie" : "0x0cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8",
-                    "stateRoot" : "0xebea2508c18b68febd3736e01ae1c09d434a7f580a2b70367e2780e2abac60db",
+                    "receiptTrie" : "0x6899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840",
+                    "stateRoot" : "0x658249479143b9b30473a6f652d34137bd654b69924d8021c5454b107765f2c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea2508c18b68febd3736e01ae1c09d434a7f580a2b70367e2780e2abac60dba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0658249479143b9b30473a6f652d34137bd654b69924d8021c5454b107765f2c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -180,7 +180,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d3558f1cfb62075fd716298628941c56f6bf454fffb387176e8af6079d8a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45b4b553431b7827e6bd1737011e7c6bcc3e1b5a876a09916b188571f775ae7f",
+        "lastblockhash" : "0x1ba881494706be82f4b470e60b5fb85e473d1b1576a01235a77a15e13ccf23bd",
         "network" : "Constantinople",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -192,14 +192,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x1bc16d674ec8a552",
+                "balance" : "0x1bc16d674ec8a246",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d43c",
+                "balance" : "0x0de0b6b3a761d748",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -234,10 +234,10 @@
     "randomStatetest557BC_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/randomStatetest557BCFiller.json",
-            "sourceHash" : "157e93209b35d07169e2a3ecab6228fd3e3350c9ea7e4ec60c20108a560187b2"
+            "sourceHash" : "fbe6f28bfb25cb08d91998ffaef92ec96354df63e0ff40fcc0aa1f58a83e3049"
         },
         "blocks" : [
             {
@@ -350,10 +350,10 @@
     "randomStatetest557BC_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/randomStatetest557BCFiller.json",
-            "sourceHash" : "157e93209b35d07169e2a3ecab6228fd3e3350c9ea7e4ec60c20108a560187b2"
+            "sourceHash" : "fbe6f28bfb25cb08d91998ffaef92ec96354df63e0ff40fcc0aa1f58a83e3049"
         },
         "blocks" : [
             {
@@ -466,10 +466,10 @@
     "randomStatetest557BC_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/randomStatetest557BCFiller.json",
-            "sourceHash" : "157e93209b35d07169e2a3ecab6228fd3e3350c9ea7e4ec60c20108a560187b2"
+            "sourceHash" : "fbe6f28bfb25cb08d91998ffaef92ec96354df63e0ff40fcc0aa1f58a83e3049"
         },
         "blocks" : [
             {
@@ -582,10 +582,10 @@
     "randomStatetest557BC_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/randomStatetest557BCFiller.json",
-            "sourceHash" : "157e93209b35d07169e2a3ecab6228fd3e3350c9ea7e4ec60c20108a560187b2"
+            "sourceHash" : "fbe6f28bfb25cb08d91998ffaef92ec96354df63e0ff40fcc0aa1f58a83e3049"
         },
         "blocks" : [
             {