Merge pull request #482 from ethereum/sar

fix mining reward in sar test
ethereum · Aug 8, 2018 · 35cab46 · 35cab46
2 parents aebb8e9 + 560e2cd
commit 35cab46
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/BlockchainTests/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0.json
@@ -2,10 +2,10 @@
     "sar_2^256-1_0_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.4.0.dev1-116+commit.73ba70ba",
+            "filledwith" : "testeth 1.5.0.dev0+commit.c182096a.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.7.27+commit.bc51b0f6.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0Filler.json",
-            "sourceHash" : "067cab5994b06d68adbba02ef67083409f3516b5db87ca538a69c33e55ffd0ce"
+            "sourceHash" : "d55f389a6380e6d4748ecad6c856f054054bb1260b736abe6d034da53d5e272d"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb92707f76de502f4d5ae737c8c7e2d7d594ad97963a1e623090bf80846586192",
-                    "mixHash" : "0x88e4d8db4d386b50534309a74605672cc596848c488ab19e30c68df06e35a723",
-                    "nonce" : "0x5c42b00f9a876324",
+                    "hash" : "0x482c63046d5a852a443b4421d3add49ac65feb3dd04e4c42290bdb037b81e522",
+                    "mixHash" : "0xf93276b492d03cf4ff0bc6fa8e286c16ec29eb59e057a7735e7f4be774691154",
+                    "nonce" : "0xc329dfdd461e1f57",
                     "number" : "0x01",
                     "parentHash" : "0x793e42ddb37536ae0da064a0d56eb8daaef101ba4c7f217150e3d53bfb11064d",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb87e3005d1a70de244421b5cd0d29235ddae2a31b077396aaf498e4663286e60",
+                    "stateRoot" : "0x7202043b638baf0ad700854cd247986f85dc7e63a2d192a7f9a95c4536c31ed3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x93ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0793e42ddb37536ae0da064a0d56eb8daaef101ba4c7f217150e3d53bfb11064da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87e3005d1a70de244421b5cd0d29235ddae2a31b077396aaf498e4663286e60a093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a088e4d8db4d386b50534309a74605672cc596848c488ab19e30c68df06e35a723885c42b00f9a876324f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
+                "rlp" : "0xf90263f901f8a0793e42ddb37536ae0da064a0d56eb8daaef101ba4c7f217150e3d53bfb11064da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07202043b638baf0ad700854cd247986f85dc7e63a2d192a7f9a95c4536c31ed3a093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f93276b492d03cf4ff0bc6fa8e286c16ec29eb59e057a7735e7f4be77469115488c329dfdd461e1f57f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
                 "transactions" : [
                     {
                         "data" : "0x",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0469149e12979d810b70f7116f59dc4a104adc8807ebc81fa57a0b539ab908179a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb92707f76de502f4d5ae737c8c7e2d7d594ad97963a1e623090bf80846586192",
+        "lastblockhash" : "0x482c63046d5a852a443b4421d3add49ac65feb3dd04e4c42290bdb037b81e522",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -76,7 +76,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x061a80",
+                "balance" : "0x29a2241af6321a80",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -111,10 +111,10 @@
     "sar_2^256-1_0_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.4.0.dev1-116+commit.73ba70ba",
+            "filledwith" : "testeth 1.5.0.dev0+commit.c182096a.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.7.27+commit.bc51b0f6.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0Filler.json",
-            "sourceHash" : "067cab5994b06d68adbba02ef67083409f3516b5db87ca538a69c33e55ffd0ce"
+            "sourceHash" : "d55f389a6380e6d4748ecad6c856f054054bb1260b736abe6d034da53d5e272d"
         },
         "blocks" : [
             {
@@ -125,18 +125,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32ce",
-                    "hash" : "0xa6b7e207ad11b864fe34bfb3da27f59561fe796cac61c7247df54feff3ca38b1",
-                    "mixHash" : "0x2e44034625f80ca891aca0fc8e1d1206452be7886dec4ed622cbb1d959f07bee",
-                    "nonce" : "0x39f1162d21866905",
+                    "hash" : "0x0189d970c6104f4f531b603de02bd21b3b2c898fb561f4c5c70e2c23233b47b3",
+                    "mixHash" : "0x3a0912de9b267075a34b5667ccc8298a4db0a44280013ef892f3b54ea420b5ef",
+                    "nonce" : "0x35e5cde37d6a2286",
                     "number" : "0x01",
                     "parentHash" : "0x793e42ddb37536ae0da064a0d56eb8daaef101ba4c7f217150e3d53bfb11064d",
                     "receiptTrie" : "0xfd8140e3683d961b3a96b7b1f88a1f333e69daf18b210ef208c6d673634f3b5e",
-                    "stateRoot" : "0x560380c9e5fdd115ca014b0f2f12e7d4cba2097c08e888fa65ceee5c4d0e5dd8",
+                    "stateRoot" : "0x6401d178b4bd804c4ae3adcfb14c25d352e307240f91a492786800a46e1557d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x93ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0793e42ddb37536ae0da064a0d56eb8daaef101ba4c7f217150e3d53bfb11064da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0560380c9e5fdd115ca014b0f2f12e7d4cba2097c08e888fa65ceee5c4d0e5dd8a093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0fd8140e3683d961b3a96b7b1f88a1f333e69daf18b210ef208c6d673634f3b5eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232ce8203e880a02e44034625f80ca891aca0fc8e1d1206452be7886dec4ed622cbb1d959f07bee8839f1162d21866905f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
+                "rlp" : "0xf90262f901f7a0793e42ddb37536ae0da064a0d56eb8daaef101ba4c7f217150e3d53bfb11064da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06401d178b4bd804c4ae3adcfb14c25d352e307240f91a492786800a46e1557d4a093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0fd8140e3683d961b3a96b7b1f88a1f333e69daf18b210ef208c6d673634f3b5eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232ce8203e880a03a0912de9b267075a34b5667ccc8298a4db0a44280013ef892f3b54ea420b5ef8835e5cde37d6a2286f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
                 "transactions" : [
                     {
                         "data" : "0x",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0469149e12979d810b70f7116f59dc4a104adc8807ebc81fa57a0b539ab908179a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6b7e207ad11b864fe34bfb3da27f59561fe796cac61c7247df54feff3ca38b1",
+        "lastblockhash" : "0x0189d970c6104f4f531b603de02bd21b3b2c898fb561f4c5c70e2c23233b47b3",
         "network" : "Constantinople",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -184,7 +184,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x32ce",
+                "balance" : "0x29a2241af62c32ce",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {

diff --git a/GeneralStateTests/stShift/sar_2^256-1_0.json b/GeneralStateTests/stShift/sar_2^256-1_0.json
@@ -2,7 +2,7 @@
     "sar_2^256-1_0" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.4.0.dev1-116+commit.73ba70ba",
+            "filledwith" : "testeth 1.5.0.dev0+commit.c182096a.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.7.27+commit.bc51b0f6.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stShift/sar_2^256-1_0Filler.json",
             "sourceHash" : "b5547d2671a7afe885dc00130ad94dc7ed183cdd334cbb3b0c999f8b3a962fbf"

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0Filler.json
@@ -36,7 +36,7 @@
                         }
                     },
                     "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x061a80",
+                        "balance" : "0x29a2241af6321a80",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {