Merge pull request #520 from ethereum/fixgaslimit

fix wrong difficulty tests on NoProof

1 files changed, 17 insertions, 17 deletions

diff --git a/BlockchainTests/bcUncleTest/uncleHeaderAtBlock2Constantinople.json b/BlockchainTests/bcUncleTest/uncleHeaderAtBlock2Constantinople.json
index c44313e3a..03d14cb3e 100644
--- a/BlockchainTests/bcUncleTest/uncleHeaderAtBlock2Constantinople.json
+++ b/BlockchainTests/bcUncleTest/uncleHeaderAtBlock2Constantinople.json
@@ -2,8 +2,8 @@
     "uncleHeaderAtBlock2Constantinople_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2-64+commit.944bda39.dirty",
-            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-69+commit.fd75a36d",
+            "lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ConstantinopleFiller.json",
             "sourceHash" : "522a5bbbcde1fe265a7baecba6bdf814f8ff1a91032268cc47f7336c34eca87a"
         },
@@ -14,20 +14,20 @@
                     "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
                     "difficulty" : "0x020000",
                     "extraData" : "",
-                    "gasLimit" : "0x2fefd8",
+                    "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x5208",
-                    "hash" : "0x47ebef0dffb7ea355511abe6fc7aec8cf54496cb5b1c94bf4a724d299741439e",
+                    "hash" : "0xe5161128bc230a369760690bb97c4b0a5137ebc79b00257dbcd05d56884fdc21",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
                     "parentHash" : "0x5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae",
                     "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
                     "stateRoot" : "0x9f975da0cdc4d5f074009af73873d83f3e29d9e7f33fee3f11a38133166034e5",
-                    "timestamp" : "0x54c98c82",
+                    "timestamp" : "0x5bbe4bb9",
                     "transactionsTrie" : "0x5c9151c2413d1cd25c51ffb4ac38948acc1359bf08c6b49f283660e9bcf0f516",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a09f975da0cdc4d5f074009af73873d83f3e29d9e7f33fee3f11a38133166034e5a05c9151c2413d1cd25c51ffb4ac38948acc1359bf08c6b49f283660e9bcf0f516a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefd88252088454c98c8280a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f86080018304cb2f94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba077c7cd36820c71821c1aed59de46e70e701c4a8dd89c9ba508ab722210f60da8a03f29825d40c7c3f7bff3ca69267e0f3fb74b2d18b8c2c4e3c135b5d3b06e288dc0",
+                "rlp" : "0xf90261f901f9a05a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a09f975da0cdc4d5f074009af73873d83f3e29d9e7f33fee3f11a38133166034e5a05c9151c2413d1cd25c51ffb4ac38948acc1359bf08c6b49f283660e9bcf0f516a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba825208845bbe4bb980a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f86080018304cb2f94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba077c7cd36820c71821c1aed59de46e70e701c4a8dd89c9ba508ab722210f60da8a03f29825d40c7c3f7bff3ca69267e0f3fb74b2d18b8c2c4e3c135b5d3b06e288dc0",
                 "transactions" : [
                     {
                         "data" : "0x",
@@ -48,22 +48,22 @@
                 "blockHeader" : {
                     "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                     "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-                    "difficulty" : "0x020000",
+                    "difficulty" : "0x020040",
                     "extraData" : "",
-                    "gasLimit" : "0x2fefd8",
+                    "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x5208",
-                    "hash" : "0x4704c59d077a7f5bdebedfc65cedbd80c3922ce7626461652d7778cc4c28040c",
+                    "hash" : "0xe673463bf8f6e5176182cd5123da5b616a444986757028c9742166bdf65fc166",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x02",
-                    "parentHash" : "0x47ebef0dffb7ea355511abe6fc7aec8cf54496cb5b1c94bf4a724d299741439e",
+                    "parentHash" : "0xe5161128bc230a369760690bb97c4b0a5137ebc79b00257dbcd05d56884fdc21",
                     "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
                     "stateRoot" : "0xb72dc47bc7672257c507ffa10abbcd36181b6cfc2ebf59e8654acb3db45b5159",
-                    "timestamp" : "0x54c98c83",
+                    "timestamp" : "0x5bbe4bbb",
                     "transactionsTrie" : "0xc673e076264c4669a5c2e479f1757b78e42511efe33b5fd2c0a23b929c7f87f5",
-                    "uncleHash" : "0x85918a565977f0e46f0afcc6a765e19df812229171709a1d9f0b5b08419c464c"
+                    "uncleHash" : "0x6117ed82a9ca809c8f60711c41fcbab768c5c6e4153b0cae6ac39bcd7e0781f4"
                 },
-                "rlp" : "0xf9045cf901f9a047ebef0dffb7ea355511abe6fc7aec8cf54496cb5b1c94bf4a724d299741439ea085918a565977f0e46f0afcc6a765e19df812229171709a1d9f0b5b08419c464c948888f1f195afa192cfee860698584c030f4c9db1a0b72dc47bc7672257c507ffa10abbcd36181b6cfc2ebf59e8654acb3db45b5159a0c673e076264c4669a5c2e479f1757b78e42511efe33b5fd2c0a23b929c7f87f5a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000002832fefd88252088454c98c8380a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f861f85f01018304cb2f94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba033c86e64d708c97c6b135cadff79dbf45985aa0b53694789e90d15f756765f239f1d0f8caa2a16405148c9d85581be5814960010f3cba938b5501590cea1f7cff901faf901f7a05a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefd8808454c98c8280a00000000000000000000000000000000000000000000000000000000000000000880000000000000000",
+                "rlp" : "0xf9045cf901f9a0e5161128bc230a369760690bb97c4b0a5137ebc79b00257dbcd05d56884fdc21a06117ed82a9ca809c8f60711c41fcbab768c5c6e4153b0cae6ac39bcd7e0781f4948888f1f195afa192cfee860698584c030f4c9db1a0b72dc47bc7672257c507ffa10abbcd36181b6cfc2ebf59e8654acb3db45b5159a0c673e076264c4669a5c2e479f1757b78e42511efe33b5fd2c0a23b929c7f87f5a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302004002832fefba825208845bbe4bbb80a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f861f85f01018304cb2f94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba033c86e64d708c97c6b135cadff79dbf45985aa0b53694789e90d15f756765f239f1d0f8caa2a16405148c9d85581be5814960010f3cba938b5501590cea1f7cff901faf901f7a05a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302004001832fefba808454c98c8280a00000000000000000000000000000000000000000000000000000000000000000880000000000000000",
                 "transactions" : [
                     {
                         "data" : "0x",
@@ -81,11 +81,11 @@
                     {
                         "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                         "coinbase" : "0x0000000000000000000000000000000000000000",
-                        "difficulty" : "0x020000",
+                        "difficulty" : "0x020040",
                         "extraData" : "",
-                        "gasLimit" : "0x2fefd8",
+                        "gasLimit" : "0x2fefba",
                         "gasUsed" : "0x00",
-                        "hash" : "0x593ac6782164eb84eef91d4f78f73e337c82939c42ef4402f6b3953259b48248",
+                        "hash" : "0x4e2c3420a4df6801390086ce9a7865d6955f3e8b0ec7d477634f3f5a806264fd",
                         "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                         "nonce" : "0x0000000000000000",
                         "number" : "0x01",
@@ -118,7 +118,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4704c59d077a7f5bdebedfc65cedbd80c3922ce7626461652d7778cc4c28040c",
+        "lastblockhash" : "0xe673463bf8f6e5176182cd5123da5b616a444986757028c9742166bdf65fc166",
         "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {