commit 5e7222e4bc0401ef8c6d8049b12a62d4854ac85c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:20:51 2018 +0200
Cleanup
commit 2e1bc7a7cd6c72e7c3d2ff74cb30f7a56515006c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:19:53 2018 +0200
Cleanup
commit edd7fa87fb2c839c17457ff004d258a049df832f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:18:57 2018 +0200
Cleanup
commit ee34e1433806655a7123f0617802aa4771507dff
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:18:10 2018 +0200
Cleanup
commit 20779e4021b8ab95a87289d2741ad2f0fbc7fb39
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:16:52 2018 +0200
Cleanup
commit 084e1aa563807f5625ad3aaff376b598e139f2a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 18:42:49 2018 +0200
Fix typo
commit c61a7c2319d3b9b96d1b5ad52ecf9d4f2fd92658
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 18:37:43 2018 +0200
Cleanup
commit e435c0229b0cbe3f4a77f43b01ca87ed0552d405
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 18:17:58 2018 +0200
Fix typos
commit e05bff3fea8915e95a473fe3266b2b1f727deca0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:59:32 2018 +0200
Fix typo
commit 8c55c7840232cef7fa4389a12f6f220e86f5f581
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:46:33 2018 +0200
Fix typos
commit a1edfcc5cc29d815ba7e8c4baaf14c23ef93af64
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:39:41 2018 +0200
Fix typos
commit 2ce2c4d180e936ccc5c10745a6430fda5de38a9b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:14:10 2018 +0200
Fix typo
commit 5bdc6cd5bc9cff93aa48fbdeda36d4d9774bfa18
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:12:14 2018 +0200
Fix typo
commit d08749f549575efc6f44a7f80850bc439c12ad5c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:54:06 2018 +0200
Revert one change
commit a734bb1191c692f09f58bcc8e85160ce7c839905
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:52:45 2018 +0200
Fix typo
commit 95fbc8d94bbefc0db989c83d0f053111bfed45e7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:51:33 2018 +0200
Fix typos
commit d17d540a83d035cf9a200f9a8b19f0fab6084728
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:49:36 2018 +0200
Fix typo
commit c4bf4402210bcb926ccfb3928afeb3a8a7490b42
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:48:09 2018 +0200
Fix typo
commit 25e7990848a1d723702e2d041c04bc68a6c1275f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:47:01 2018 +0200
Fix typo
commit d72ffb5b0253e0d7b992ffe13c40695421378dc3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:45:20 2018 +0200
Fix typo
commit 705e6f271192a575cc99d794545b0efe75d964c4
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:41:19 2018 +0200
Revert one change
commit 4fd26cd29e21c42b027e37da2616761ebc399d16
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:39:41 2018 +0200
Revert commit
commit 8a5cc627b1048368fe8807973d1f542bab2e045f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:28:56 2018 +0200
Fix typo
commit 0a24baa7258c0ae0f244d82af8d0831b148ab012
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:15:45 2018 +0200
Fix typo
commit 38f93ecd90171fb881243f0de55b3452daccff20
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 15:56:49 2018 +0200
Fix typos
commit 15446fd62400c36c2a51f7e6f13725cc8adfd924
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 15:48:00 2018 +0200
Fix typos
commit 76533b41986bbc5826070a1e644215a74757c1db
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 15:04:38 2018 +0200
Fix typo
commit aea330c2b0bf76975ec69142a732288cc8b192bd
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 14:46:29 2018 +0200
Fix typo
commit 8b1b1d0be1dc44f36c22c54d1a3d56d84d456b92
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 14:40:23 2018 +0200
Fix typo
commit 46ea76785a26cf20a664ed211c8f3fb9a283e127
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 14:14:17 2018 +0200
Fix typo
commit e0d7c5748545dd0975507ad603623072fcc6bdea
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 14:08:24 2018 +0200
Fix typo
commit 604d5a244323b17ba596b12d245407e1cf63a375
Merge: 6c081ca 1c65b2b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:03:23 2018 +0200
Merge pull request #36 from rex4539/patch-36
Fix typo
commit 6c081caf28b7cef9e62ed523284dff90e4add16d
Merge: 899e5d2 88fa2d9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:02:49 2018 +0200
Merge pull request #35 from rex4539/patch-35
Fix typo
commit 899e5d2c343ac7ea5069b8548e5df86c8e963e21
Merge: 6380c7f 40e73e2
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:02:16 2018 +0200
Merge pull request #34 from rex4539/patch-34
Fix typo
commit 6380c7f740246474c69d8145bde61688551efe83
Merge: f592274 4567667
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:01:47 2018 +0200
Merge pull request #33 from rex4539/patch-33
Fix typos
commit f592274a713162da0083bd6d22fb47cb1afcdba9
Merge: d86ef7e 4aeaa3a
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:01:14 2018 +0200
Merge pull request #32 from rex4539/patch-32
Fix typo
commit d86ef7e5e4f7e9c2014358ec5b647d1815eb304d
Merge: fe0b432 5cdd1b2
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:00:41 2018 +0200
Merge pull request #31 from rex4539/patch-31
Fix typo
commit fe0b432ee125ae0b876af2c26139dfc979005a3b
Merge: 6fd6d0d 70130d0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:00:12 2018 +0200
Merge pull request #30 from rex4539/patch-30
Fix typos
commit 6fd6d0dcf3714118a623c0d8d84aabb4578410a8
Merge: 389660f 3377426
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:59:42 2018 +0200
Merge pull request #29 from rex4539/patch-29
Fix typo
commit 389660f856cb60ff475a8757aad3873b99213cc0
Merge: a0b85ce 40643eb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:59:15 2018 +0200
Merge pull request #28 from rex4539/patch-28
Fix typo
commit a0b85ce3b4d2e6596da0727e05c1fe15c289b1e7
Merge: 6f9a1c7 23ead80
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:58:42 2018 +0200
Merge pull request #27 from rex4539/patch-27
Fix typo
commit 6f9a1c71a680bb3ed1c249dd42bf0a54663d0af3
Merge: b880547 3612eab
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:58:06 2018 +0200
Merge pull request #26 from rex4539/patch-26
Patch 26
commit b880547415afeae36bd19867388e60a3040a15ca
Merge: a3b7da2 5c3177f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:57:24 2018 +0200
Merge pull request #25 from rex4539/patch-25
Fix typo
commit a3b7da2c6d6691f38751292e1aea63498a325788
Merge: edd8586 60026ef
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:56:52 2018 +0200
Merge pull request #24 from rex4539/patch-24
Fix typo
commit edd8586fdf8c112f4c513804610c237d7e2e80ef
Merge: 0c28eb7 f979c00
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:56:12 2018 +0200
Merge pull request #23 from rex4539/patch-23
Fix typo
commit 0c28eb7717821b1d68016f40911d07f2a7231b4f
Merge: 775beb6 c900722
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:55:42 2018 +0200
Merge pull request #22 from rex4539/patch-22
Fix typo
commit 775beb625beb1fc5f72388c076b295de4b8ff039
Merge: a0cf889 1027543
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:55:16 2018 +0200
Merge pull request #21 from rex4539/patch-21
Fix typo
commit a0cf88971e756c37c406bab3066c11d6fc7f6d74
Merge: 4504b48 f3fa89b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:54:44 2018 +0200
Merge pull request #20 from rex4539/patch-20
Fix typo
commit 4504b4824b3438e931ca8d24a56b1887657e87cd
Merge: dd0bcbf 2699eca
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:54:20 2018 +0200
Merge pull request #19 from rex4539/patch-19
Fix typo
commit dd0bcbfc89293e9760156d5534f3a558451e1f29
Merge: abfb65a f02ef2e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:53:46 2018 +0200
Merge pull request #18 from rex4539/patch-18
Fix typos
commit abfb65afaed49c34b9875df79f6fe6eb2b7bf769
Merge: 68b46b7 6485c90
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:53:08 2018 +0200
Merge pull request #17 from rex4539/patch-17
Fix typo
commit 68b46b75d2e5b7ae97e83fc5541c46b4907a7899
Merge: a131e84 fcc0828
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:52:39 2018 +0200
Merge pull request #16 from rex4539/patch-16
Fix typo
commit a131e844652e58aff78fa8952e7547a9ba82b8a1
Merge: 8487c0e 8a688ff
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:51:54 2018 +0200
Merge pull request #15 from rex4539/patch-15
Fix typo
commit 8487c0e39092b74e977c7a60f4a07a27606756a8
Merge: bcc4cb4 bb60b83
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:51:28 2018 +0200
Merge pull request #14 from rex4539/patch-14
Fix typos
commit bcc4cb46130e789faa9adae9b159ca818f67ec52
Merge: 23e66e9 53539bb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:51:00 2018 +0200
Merge pull request #13 from rex4539/patch-13
Fix typos
commit 23e66e956bff2d6935c7a4dd570d457294018a77
Merge: 56956cf 0808445
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:50:27 2018 +0200
Merge pull request #12 from rex4539/patch-12
Fix typo
commit 56956cf23ba1208aa39cb3ab1ef60375c6630263
Merge: 77007d4 7a4f064
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:49:59 2018 +0200
Merge pull request #11 from rex4539/patch-11
Fix typo
commit 77007d49fa1d8cb80aef02bea1dd15e522a47c90
Merge: e78ad0c 48c33fb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:49:16 2018 +0200
Merge pull request #10 from rex4539/patch-10
Fix typo
commit e78ad0cf0d91955a848f5e953a042eabdcdac198
Merge: 38a3e08 809f01c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:48:33 2018 +0200
Merge pull request #9 from rex4539/patch-9
Fix typo
commit 38a3e08699fe4c4ec715b1783dba18bff6b829fb
Merge: eee3c28 fec279c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:48:05 2018 +0200
Merge pull request #8 from rex4539/patch-8
Fix typo
commit eee3c286eb84f994310142a9e7fdbd36a671e593
Merge: 702635b cf81b4e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:47:33 2018 +0200
Merge pull request #7 from rex4539/patch-7
Fix typo
commit 702635bb34abb2f83ded27ae95deefd5b6e7df93
Merge: d7497ea 3bbcc3d
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:47:01 2018 +0200
Merge pull request #6 from rex4539/patch-6
Fix typo
commit d7497ea070e03380cf1d4f533b7dc4b881f724f8
Merge: bfcc1e8 f639727
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:45:33 2018 +0200
Merge pull request #5 from rex4539/patch-5
Fix typos
commit bfcc1e8ae2094ca4e9837f623999705f538aff04
Merge: f4440ec 55262fe
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:45:05 2018 +0200
Merge pull request #4 from rex4539/patch-4
Remove space for word "backup"
commit f4440ecd4a7367e6bc4a5f75bea112290017ed2b
Merge: f8b487f 61d5279
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:44:31 2018 +0200
Merge pull request #3 from rex4539/patch-3
Fix typos in zmq.md
commit f8b487f5699990fabc7fc383d02bc728db3cb9aa
Merge: 60104a7 f2ce50f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:42:51 2018 +0200
Merge pull request #2 from rex4539/patch-2
Fix typo in security-warnings.md
commit 60104a7034f55284afb814e81a1430a8b2b0d8d1
Merge: be262f0 af7dfe0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:41:48 2018 +0200
Merge pull request #1 from rex4539/patch-1
Fix typos
commit 1c65b2bd0c49f7f392d0e3a2db14ce1366a87171
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 07:35:26 2018 +0200
Fix typo
commit 88fa2d966a3b462ed34a9a4659fc390711cc0276
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 07:21:00 2018 +0200
Fix typo
commit 40e73e258671f21d2b2205509e9cae1f50294752
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 07:14:21 2018 +0200
Fix typo
commit 4567667fcc8b4197dfd51da34fe82b0f2fb78127
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 06:44:40 2018 +0200
Fix typos
commit 4aeaa3a3d6335302c53c0f5f4ef81de05e266479
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 05:55:25 2018 +0200
Fix typo
commit 5cdd1b29b4c90492aa15fed7940984e1d675052f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 05:36:46 2018 +0200
Fix typo
commit 70130d05f1646c8b9fb1f33c4efbe2a5fcf7138b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 05:28:21 2018 +0200
Fix typos
commit 33774261b1c63e5640aa1dd251edb67892ed7a5b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 05:00:56 2018 +0200
Fix typo
commit 40643ebfcd85ee257a4576e85d2fb6c73dad17b5
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:51:57 2018 +0200
Fix typo
commit 23ead80e05116ebfeaac0a00d5bd4a158fbeb54e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:29:53 2018 +0200
Fix typo
commit 3612eaba2dcf273e94cac9ad889723776ce55108
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:19:36 2018 +0200
Fix typos
commit 5c3177f5d191d1f4e4d9f78ae4b75381010f7768
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:13:03 2018 +0200
Fix typo
commit 60026efe27a39300e428879ad8dba94f19934870
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:08:09 2018 +0200
Fix typo
commit f979c0074efd66804f229c8b3cc6e812d7f26406
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:01:44 2018 +0200
Fix typo
commit c9007220a8a727c1cfe3b25b453c178eacd431f3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:52:33 2018 +0200
Fix typo
commit 1027543bd30701c4b09aa66226281a10563db910
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:36:19 2018 +0200
Fix typo
commit f3fa89bcd30e0cb45ff4391e78d02452c9227be0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:34:37 2018 +0200
Fix typo
commit 2699eca938f1e413a29d4408a271aaafd27969cc
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:30:29 2018 +0200
Fix typo
commit f02ef2e495fe43142d305f5c4f40dcfa3d2cb423
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:22:36 2018 +0200
Fix typos
commit 6485c908433bb91fd70d7e18cf3611c9a96115a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:10:06 2018 +0200
Fix typo
commit fcc082850564b14b86b1932dfc5a099816c72ef1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:06:26 2018 +0200
Fix typo
commit 8a688ff7405d67bd4c77b0aa0ebdd4b4a8a9a6a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:02:50 2018 +0200
Fix typo
commit bb60b83853ed0a82ca47dd58d55f1849ddcf23ab
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 02:59:25 2018 +0200
Fix typos
commit 53539bb720c7676b9d37e25dde3423db3aa7bfa1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 02:50:55 2018 +0200
Fix typos
commit 080844581d6488ab797ac188acae9c4b2e1d0c59
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 01:05:54 2018 +0200
Fix typo
commit 7a4f0649ac5e71f39f0bef7f2e1fcb6fafad0291
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 00:16:31 2018 +0200
Fix typo
commit 48c33fb3f9ab1ad287987d147ee4bbe186f7ade1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 00:07:42 2018 +0200
Fix typo
commit 809f01ca4f785a7b5bc9cc2c388e0ae814ecaa95
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 00:02:34 2018 +0200
Fix typo
commit fec279cac89aa917be929447c81177811728361a
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 23:55:27 2018 +0200
Fix typo
commit cf81b4e12399570545372d4c9daceca8e70142d5
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 23:48:43 2018 +0200
Fix typo
commit 3bbcc3d9986caf8df99bec5d8a18d0f0c8990e06
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 23:28:52 2018 +0200
Fix typo
commit f639727525dbd23f5f2d0f89e7be13d868e984c3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 23:13:12 2018 +0200
Fix typos
commit 55262fe9c5e1e127c6b817a0c2ab3f9db3ac35b9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 22:46:52 2018 +0200
Remove space for word "backup"
commit 61d52797d4d26a90dcc15e2bcd6f19a5f36faac3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 22:23:31 2018 +0200
Fix typos in zmq.md
commit f2ce50f10e67b4265e559a432681bc44828ae59b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 22:12:58 2018 +0200
Fix typo in security-warnings.md
commit af7dfe046c12109e44ddc18dff07ede8755cf4f9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 21:59:24 2018 +0200
Fix typos
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
771 lines
28 KiB
C++
771 lines
28 KiB
C++
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-2014 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include "miner.h"
|
|
#ifdef ENABLE_MINING
|
|
#include "pow/tromp/equi_miner.h"
|
|
#endif
|
|
|
|
#include "amount.h"
|
|
#include "base58.h"
|
|
#include "chainparams.h"
|
|
#include "consensus/consensus.h"
|
|
#include "consensus/upgrades.h"
|
|
#include "consensus/validation.h"
|
|
#ifdef ENABLE_MINING
|
|
#include "crypto/equihash.h"
|
|
#endif
|
|
#include "hash.h"
|
|
#include "main.h"
|
|
#include "metrics.h"
|
|
#include "net.h"
|
|
#include "pow.h"
|
|
#include "primitives/transaction.h"
|
|
#include "random.h"
|
|
#include "timedata.h"
|
|
#include "ui_interface.h"
|
|
#include "util.h"
|
|
#include "utilmoneystr.h"
|
|
#ifdef ENABLE_WALLET
|
|
#include "wallet/wallet.h"
|
|
#endif
|
|
|
|
#include "sodium.h"
|
|
|
|
#include <boost/thread.hpp>
|
|
#include <boost/tuple/tuple.hpp>
|
|
#ifdef ENABLE_MINING
|
|
#include <functional>
|
|
#endif
|
|
#include <mutex>
|
|
|
|
using namespace std;
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// BitcoinMiner
|
|
//
|
|
|
|
//
|
|
// Unconfirmed transactions in the memory pool often depend on other
|
|
// transactions in the memory pool. When we select transactions from the
|
|
// pool, we select by highest priority or fee rate, so we might consider
|
|
// transactions that depend on transactions that aren't yet in the block.
|
|
// The COrphan class keeps track of these 'temporary orphans' while
|
|
// CreateBlock is figuring out which transactions to include.
|
|
//
|
|
class COrphan
|
|
{
|
|
public:
|
|
const CTransaction* ptx;
|
|
set<uint256> setDependsOn;
|
|
CFeeRate feeRate;
|
|
double dPriority;
|
|
|
|
COrphan(const CTransaction* ptxIn) : ptx(ptxIn), feeRate(0), dPriority(0)
|
|
{
|
|
}
|
|
};
|
|
|
|
uint64_t nLastBlockTx = 0;
|
|
uint64_t nLastBlockSize = 0;
|
|
|
|
// We want to sort transactions by priority and fee rate, so:
|
|
typedef boost::tuple<double, CFeeRate, const CTransaction*> TxPriority;
|
|
class TxPriorityCompare
|
|
{
|
|
bool byFee;
|
|
|
|
public:
|
|
TxPriorityCompare(bool _byFee) : byFee(_byFee) { }
|
|
|
|
bool operator()(const TxPriority& a, const TxPriority& b)
|
|
{
|
|
if (byFee)
|
|
{
|
|
if (a.get<1>() == b.get<1>())
|
|
return a.get<0>() < b.get<0>();
|
|
return a.get<1>() < b.get<1>();
|
|
}
|
|
else
|
|
{
|
|
if (a.get<0>() == b.get<0>())
|
|
return a.get<1>() < b.get<1>();
|
|
return a.get<0>() < b.get<0>();
|
|
}
|
|
}
|
|
};
|
|
|
|
void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev)
|
|
{
|
|
pblock->nTime = std::max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
|
|
}
|
|
|
|
CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
|
|
{
|
|
const CChainParams& chainparams = Params();
|
|
// Create new block
|
|
std::unique_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
|
|
if(!pblocktemplate.get())
|
|
return NULL;
|
|
CBlock *pblock = &pblocktemplate->block; // pointer for convenience
|
|
|
|
// -regtest only: allow overriding block.nVersion with
|
|
// -blockversion=N to test forking scenarios
|
|
if (Params().MineBlocksOnDemand())
|
|
pblock->nVersion = GetArg("-blockversion", pblock->nVersion);
|
|
|
|
// Add dummy coinbase tx as first transaction
|
|
pblock->vtx.push_back(CTransaction());
|
|
pblocktemplate->vTxFees.push_back(-1); // updated at end
|
|
pblocktemplate->vTxSigOps.push_back(-1); // updated at end
|
|
|
|
// Largest block you're willing to create:
|
|
unsigned int nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
|
|
// Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
|
|
nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
|
|
|
|
// How much of the block should be dedicated to high-priority transactions,
|
|
// included regardless of the fees they pay
|
|
unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", DEFAULT_BLOCK_PRIORITY_SIZE);
|
|
nBlockPrioritySize = std::min(nBlockMaxSize, nBlockPrioritySize);
|
|
|
|
// Minimum block size you want to create; block will be filled with free transactions
|
|
// until there are no more or the block reaches this size:
|
|
unsigned int nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE);
|
|
nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);
|
|
|
|
// Collect memory pool transactions into the block
|
|
CAmount nFees = 0;
|
|
|
|
{
|
|
LOCK2(cs_main, mempool.cs);
|
|
CBlockIndex* pindexPrev = chainActive.Tip();
|
|
const int nHeight = pindexPrev->nHeight + 1;
|
|
uint32_t consensusBranchId = CurrentEpochBranchId(nHeight, chainparams.GetConsensus());
|
|
pblock->nTime = GetAdjustedTime();
|
|
const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast();
|
|
CCoinsViewCache view(pcoinsTip);
|
|
|
|
// Priority order to process transactions
|
|
list<COrphan> vOrphan; // list memory doesn't move
|
|
map<uint256, vector<COrphan*> > mapDependers;
|
|
bool fPrintPriority = GetBoolArg("-printpriority", false);
|
|
|
|
// This vector will be sorted into a priority queue:
|
|
vector<TxPriority> vecPriority;
|
|
vecPriority.reserve(mempool.mapTx.size());
|
|
for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin();
|
|
mi != mempool.mapTx.end(); ++mi)
|
|
{
|
|
const CTransaction& tx = mi->GetTx();
|
|
|
|
int64_t nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST)
|
|
? nMedianTimePast
|
|
: pblock->GetBlockTime();
|
|
|
|
if (tx.IsCoinBase() || !IsFinalTx(tx, nHeight, nLockTimeCutoff) || IsExpiredTx(tx, nHeight))
|
|
continue;
|
|
|
|
COrphan* porphan = NULL;
|
|
double dPriority = 0;
|
|
CAmount nTotalIn = 0;
|
|
bool fMissingInputs = false;
|
|
BOOST_FOREACH(const CTxIn& txin, tx.vin)
|
|
{
|
|
// Read prev transaction
|
|
if (!view.HaveCoins(txin.prevout.hash))
|
|
{
|
|
// This should never happen; all transactions in the memory
|
|
// pool should connect to either transactions in the chain
|
|
// or other transactions in the memory pool.
|
|
if (!mempool.mapTx.count(txin.prevout.hash))
|
|
{
|
|
LogPrintf("ERROR: mempool transaction missing input\n");
|
|
if (fDebug) assert("mempool transaction missing input" == 0);
|
|
fMissingInputs = true;
|
|
if (porphan)
|
|
vOrphan.pop_back();
|
|
break;
|
|
}
|
|
|
|
// Has to wait for dependencies
|
|
if (!porphan)
|
|
{
|
|
// Use list for automatic deletion
|
|
vOrphan.push_back(COrphan(&tx));
|
|
porphan = &vOrphan.back();
|
|
}
|
|
mapDependers[txin.prevout.hash].push_back(porphan);
|
|
porphan->setDependsOn.insert(txin.prevout.hash);
|
|
nTotalIn += mempool.mapTx.find(txin.prevout.hash)->GetTx().vout[txin.prevout.n].nValue;
|
|
continue;
|
|
}
|
|
const CCoins* coins = view.AccessCoins(txin.prevout.hash);
|
|
assert(coins);
|
|
|
|
CAmount nValueIn = coins->vout[txin.prevout.n].nValue;
|
|
nTotalIn += nValueIn;
|
|
|
|
int nConf = nHeight - coins->nHeight;
|
|
|
|
dPriority += (double)nValueIn * nConf;
|
|
}
|
|
nTotalIn += tx.GetJoinSplitValueIn();
|
|
|
|
if (fMissingInputs) continue;
|
|
|
|
// Priority is sum(valuein * age) / modified_txsize
|
|
unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
|
|
dPriority = tx.ComputePriority(dPriority, nTxSize);
|
|
|
|
uint256 hash = tx.GetHash();
|
|
mempool.ApplyDeltas(hash, dPriority, nTotalIn);
|
|
|
|
CFeeRate feeRate(nTotalIn-tx.GetValueOut(), nTxSize);
|
|
|
|
if (porphan)
|
|
{
|
|
porphan->dPriority = dPriority;
|
|
porphan->feeRate = feeRate;
|
|
}
|
|
else
|
|
vecPriority.push_back(TxPriority(dPriority, feeRate, &(mi->GetTx())));
|
|
}
|
|
|
|
// Collect transactions into block
|
|
uint64_t nBlockSize = 1000;
|
|
uint64_t nBlockTx = 0;
|
|
int nBlockSigOps = 100;
|
|
bool fSortedByFee = (nBlockPrioritySize <= 0);
|
|
|
|
TxPriorityCompare comparer(fSortedByFee);
|
|
std::make_heap(vecPriority.begin(), vecPriority.end(), comparer);
|
|
|
|
while (!vecPriority.empty())
|
|
{
|
|
// Take highest priority transaction off the priority queue:
|
|
double dPriority = vecPriority.front().get<0>();
|
|
CFeeRate feeRate = vecPriority.front().get<1>();
|
|
const CTransaction& tx = *(vecPriority.front().get<2>());
|
|
|
|
std::pop_heap(vecPriority.begin(), vecPriority.end(), comparer);
|
|
vecPriority.pop_back();
|
|
|
|
// Size limits
|
|
unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
|
|
if (nBlockSize + nTxSize >= nBlockMaxSize)
|
|
continue;
|
|
|
|
// Legacy limits on sigOps:
|
|
unsigned int nTxSigOps = GetLegacySigOpCount(tx);
|
|
if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
|
|
continue;
|
|
|
|
// Skip free transactions if we're past the minimum block size:
|
|
const uint256& hash = tx.GetHash();
|
|
double dPriorityDelta = 0;
|
|
CAmount nFeeDelta = 0;
|
|
mempool.ApplyDeltas(hash, dPriorityDelta, nFeeDelta);
|
|
if (fSortedByFee && (dPriorityDelta <= 0) && (nFeeDelta <= 0) && (feeRate < ::minRelayTxFee) && (nBlockSize + nTxSize >= nBlockMinSize))
|
|
continue;
|
|
|
|
// Prioritise by fee once past the priority size or we run out of high-priority
|
|
// transactions:
|
|
if (!fSortedByFee &&
|
|
((nBlockSize + nTxSize >= nBlockPrioritySize) || !AllowFree(dPriority)))
|
|
{
|
|
fSortedByFee = true;
|
|
comparer = TxPriorityCompare(fSortedByFee);
|
|
std::make_heap(vecPriority.begin(), vecPriority.end(), comparer);
|
|
}
|
|
|
|
if (!view.HaveInputs(tx))
|
|
continue;
|
|
|
|
CAmount nTxFees = view.GetValueIn(tx)-tx.GetValueOut();
|
|
|
|
nTxSigOps += GetP2SHSigOpCount(tx, view);
|
|
if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
|
|
continue;
|
|
|
|
// Note that flags: we don't want to set mempool/IsStandard()
|
|
// policy here, but we still have to ensure that the block we
|
|
// create only contains transactions that are valid in new blocks.
|
|
CValidationState state;
|
|
PrecomputedTransactionData txdata(tx);
|
|
if (!ContextualCheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, txdata, Params().GetConsensus(), consensusBranchId))
|
|
continue;
|
|
|
|
UpdateCoins(tx, view, nHeight);
|
|
|
|
// Added
|
|
pblock->vtx.push_back(tx);
|
|
pblocktemplate->vTxFees.push_back(nTxFees);
|
|
pblocktemplate->vTxSigOps.push_back(nTxSigOps);
|
|
nBlockSize += nTxSize;
|
|
++nBlockTx;
|
|
nBlockSigOps += nTxSigOps;
|
|
nFees += nTxFees;
|
|
|
|
if (fPrintPriority)
|
|
{
|
|
LogPrintf("priority %.1f fee %s txid %s\n",
|
|
dPriority, feeRate.ToString(), tx.GetHash().ToString());
|
|
}
|
|
|
|
// Add transactions that depend on this one to the priority queue
|
|
if (mapDependers.count(hash))
|
|
{
|
|
BOOST_FOREACH(COrphan* porphan, mapDependers[hash])
|
|
{
|
|
if (!porphan->setDependsOn.empty())
|
|
{
|
|
porphan->setDependsOn.erase(hash);
|
|
if (porphan->setDependsOn.empty())
|
|
{
|
|
vecPriority.push_back(TxPriority(porphan->dPriority, porphan->feeRate, porphan->ptx));
|
|
std::push_heap(vecPriority.begin(), vecPriority.end(), comparer);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
nLastBlockTx = nBlockTx;
|
|
nLastBlockSize = nBlockSize;
|
|
LogPrintf("CreateNewBlock(): total size %u\n", nBlockSize);
|
|
|
|
// Create coinbase tx
|
|
CMutableTransaction txNew = CreateNewContextualCMutableTransaction(chainparams.GetConsensus(), nHeight);
|
|
txNew.vin.resize(1);
|
|
txNew.vin[0].prevout.SetNull();
|
|
txNew.vout.resize(1);
|
|
txNew.vout[0].scriptPubKey = scriptPubKeyIn;
|
|
txNew.vout[0].nValue = GetBlockSubsidy(nHeight, chainparams.GetConsensus());
|
|
// Set to 0 so expiry height does not apply to coinbase txs
|
|
txNew.nExpiryHeight = 0;
|
|
|
|
if ((nHeight > 0) && (nHeight <= chainparams.GetConsensus().GetLastFoundersRewardBlockHeight())) {
|
|
// Founders reward is 20% of the block subsidy
|
|
auto vFoundersReward = txNew.vout[0].nValue / 5;
|
|
// Take some reward away from us
|
|
txNew.vout[0].nValue -= vFoundersReward;
|
|
|
|
// And give it to the founders
|
|
txNew.vout.push_back(CTxOut(vFoundersReward, chainparams.GetFoundersRewardScriptAtHeight(nHeight)));
|
|
}
|
|
|
|
// Add fees
|
|
txNew.vout[0].nValue += nFees;
|
|
txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
|
|
|
|
pblock->vtx[0] = txNew;
|
|
pblocktemplate->vTxFees[0] = -nFees;
|
|
|
|
// Randomise nonce
|
|
arith_uint256 nonce = UintToArith256(GetRandHash());
|
|
// Clear the top and bottom 16 bits (for local use as thread flags and counters)
|
|
nonce <<= 32;
|
|
nonce >>= 16;
|
|
pblock->nNonce = ArithToUint256(nonce);
|
|
|
|
// Fill in header
|
|
pblock->hashPrevBlock = pindexPrev->GetBlockHash();
|
|
pblock->hashReserved = uint256();
|
|
UpdateTime(pblock, Params().GetConsensus(), pindexPrev);
|
|
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus());
|
|
pblock->nSolution.clear();
|
|
pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]);
|
|
|
|
CValidationState state;
|
|
if (!TestBlockValidity(state, *pblock, pindexPrev, false, false))
|
|
throw std::runtime_error("CreateNewBlock(): TestBlockValidity failed");
|
|
}
|
|
|
|
return pblocktemplate.release();
|
|
}
|
|
|
|
#ifdef ENABLE_WALLET
|
|
boost::optional<CScript> GetMinerScriptPubKey(CReserveKey& reservekey)
|
|
#else
|
|
boost::optional<CScript> GetMinerScriptPubKey()
|
|
#endif
|
|
{
|
|
CKeyID keyID;
|
|
CBitcoinAddress addr;
|
|
if (addr.SetString(GetArg("-mineraddress", ""))) {
|
|
addr.GetKeyID(keyID);
|
|
} else {
|
|
#ifdef ENABLE_WALLET
|
|
CPubKey pubkey;
|
|
if (!reservekey.GetReservedKey(pubkey)) {
|
|
return boost::optional<CScript>();
|
|
}
|
|
keyID = pubkey.GetID();
|
|
#else
|
|
return boost::optional<CScript>();
|
|
#endif
|
|
}
|
|
|
|
CScript scriptPubKey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;
|
|
return scriptPubKey;
|
|
}
|
|
|
|
#ifdef ENABLE_WALLET
|
|
CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey)
|
|
{
|
|
boost::optional<CScript> scriptPubKey = GetMinerScriptPubKey(reservekey);
|
|
#else
|
|
CBlockTemplate* CreateNewBlockWithKey()
|
|
{
|
|
boost::optional<CScript> scriptPubKey = GetMinerScriptPubKey();
|
|
#endif
|
|
|
|
if (!scriptPubKey) {
|
|
return NULL;
|
|
}
|
|
return CreateNewBlock(*scriptPubKey);
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Internal miner
|
|
//
|
|
|
|
#ifdef ENABLE_MINING
|
|
|
|
void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce)
|
|
{
|
|
// Update nExtraNonce
|
|
static uint256 hashPrevBlock;
|
|
if (hashPrevBlock != pblock->hashPrevBlock)
|
|
{
|
|
nExtraNonce = 0;
|
|
hashPrevBlock = pblock->hashPrevBlock;
|
|
}
|
|
++nExtraNonce;
|
|
unsigned int nHeight = pindexPrev->nHeight+1; // Height first in coinbase required for block.version=2
|
|
CMutableTransaction txCoinbase(pblock->vtx[0]);
|
|
txCoinbase.vin[0].scriptSig = (CScript() << nHeight << CScriptNum(nExtraNonce)) + COINBASE_FLAGS;
|
|
assert(txCoinbase.vin[0].scriptSig.size() <= 100);
|
|
|
|
pblock->vtx[0] = txCoinbase;
|
|
pblock->hashMerkleRoot = pblock->BuildMerkleTree();
|
|
}
|
|
|
|
#ifdef ENABLE_WALLET
|
|
static bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
|
|
#else
|
|
static bool ProcessBlockFound(CBlock* pblock)
|
|
#endif // ENABLE_WALLET
|
|
{
|
|
LogPrintf("%s\n", pblock->ToString());
|
|
LogPrintf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue));
|
|
|
|
// Found a solution
|
|
{
|
|
LOCK(cs_main);
|
|
if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash())
|
|
return error("ZcashMiner: generated block is stale");
|
|
}
|
|
|
|
#ifdef ENABLE_WALLET
|
|
if (GetArg("-mineraddress", "").empty()) {
|
|
// Remove key from key pool
|
|
reservekey.KeepKey();
|
|
}
|
|
|
|
// Track how many getdata requests this block gets
|
|
{
|
|
LOCK(wallet.cs_wallet);
|
|
wallet.mapRequestCount[pblock->GetHash()] = 0;
|
|
}
|
|
#endif
|
|
|
|
// Process this block the same as if we had received it from another node
|
|
CValidationState state;
|
|
if (!ProcessNewBlock(state, NULL, pblock, true, NULL))
|
|
return error("ZcashMiner: ProcessNewBlock, block not accepted");
|
|
|
|
TrackMinedBlock(pblock->GetHash());
|
|
|
|
return true;
|
|
}
|
|
|
|
#ifdef ENABLE_WALLET
|
|
void static BitcoinMiner(CWallet *pwallet)
|
|
#else
|
|
void static BitcoinMiner()
|
|
#endif
|
|
{
|
|
LogPrintf("ZcashMiner started\n");
|
|
SetThreadPriority(THREAD_PRIORITY_LOWEST);
|
|
RenameThread("zcash-miner");
|
|
const CChainParams& chainparams = Params();
|
|
|
|
#ifdef ENABLE_WALLET
|
|
// Each thread has its own key
|
|
CReserveKey reservekey(pwallet);
|
|
#endif
|
|
|
|
// Each thread has its own counter
|
|
unsigned int nExtraNonce = 0;
|
|
|
|
unsigned int n = chainparams.EquihashN();
|
|
unsigned int k = chainparams.EquihashK();
|
|
|
|
std::string solver = GetArg("-equihashsolver", "default");
|
|
assert(solver == "tromp" || solver == "default");
|
|
LogPrint("pow", "Using Equihash solver \"%s\" with n = %u, k = %u\n", solver, n, k);
|
|
|
|
std::mutex m_cs;
|
|
bool cancelSolver = false;
|
|
boost::signals2::connection c = uiInterface.NotifyBlockTip.connect(
|
|
[&m_cs, &cancelSolver](const uint256& hashNewTip) mutable {
|
|
std::lock_guard<std::mutex> lock{m_cs};
|
|
cancelSolver = true;
|
|
}
|
|
);
|
|
miningTimer.start();
|
|
|
|
try {
|
|
while (true) {
|
|
if (chainparams.MiningRequiresPeers()) {
|
|
// Busy-wait for the network to come online so we don't waste time mining
|
|
// on an obsolete chain. In regtest mode we expect to fly solo.
|
|
miningTimer.stop();
|
|
do {
|
|
bool fvNodesEmpty;
|
|
{
|
|
LOCK(cs_vNodes);
|
|
fvNodesEmpty = vNodes.empty();
|
|
}
|
|
if (!fvNodesEmpty && !IsInitialBlockDownload())
|
|
break;
|
|
MilliSleep(1000);
|
|
} while (true);
|
|
miningTimer.start();
|
|
}
|
|
|
|
//
|
|
// Create new block
|
|
//
|
|
unsigned int nTransactionsUpdatedLast = mempool.GetTransactionsUpdated();
|
|
CBlockIndex* pindexPrev = chainActive.Tip();
|
|
|
|
#ifdef ENABLE_WALLET
|
|
unique_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey));
|
|
#else
|
|
unique_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey());
|
|
#endif
|
|
if (!pblocktemplate.get())
|
|
{
|
|
if (GetArg("-mineraddress", "").empty()) {
|
|
LogPrintf("Error in ZcashMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n");
|
|
} else {
|
|
// Should never reach here, because -mineraddress validity is checked in init.cpp
|
|
LogPrintf("Error in ZcashMiner: Invalid -mineraddress\n");
|
|
}
|
|
return;
|
|
}
|
|
CBlock *pblock = &pblocktemplate->block;
|
|
IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
|
|
|
|
LogPrintf("Running ZcashMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(),
|
|
::GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION));
|
|
|
|
//
|
|
// Search
|
|
//
|
|
int64_t nStart = GetTime();
|
|
arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits);
|
|
|
|
while (true) {
|
|
// Hash state
|
|
crypto_generichash_blake2b_state state;
|
|
EhInitialiseState(n, k, state);
|
|
|
|
// I = the block header minus nonce and solution.
|
|
CEquihashInput I{*pblock};
|
|
CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
|
|
ss << I;
|
|
|
|
// H(I||...
|
|
crypto_generichash_blake2b_update(&state, (unsigned char*)&ss[0], ss.size());
|
|
|
|
// H(I||V||...
|
|
crypto_generichash_blake2b_state curr_state;
|
|
curr_state = state;
|
|
crypto_generichash_blake2b_update(&curr_state,
|
|
pblock->nNonce.begin(),
|
|
pblock->nNonce.size());
|
|
|
|
// (x_1, x_2, ...) = A(I, V, n, k)
|
|
LogPrint("pow", "Running Equihash solver \"%s\" with nNonce = %s\n",
|
|
solver, pblock->nNonce.ToString());
|
|
|
|
std::function<bool(std::vector<unsigned char>)> validBlock =
|
|
#ifdef ENABLE_WALLET
|
|
[&pblock, &hashTarget, &pwallet, &reservekey, &m_cs, &cancelSolver, &chainparams]
|
|
#else
|
|
[&pblock, &hashTarget, &m_cs, &cancelSolver, &chainparams]
|
|
#endif
|
|
(std::vector<unsigned char> soln) {
|
|
// Write the solution to the hash and compute the result.
|
|
LogPrint("pow", "- Checking solution against target\n");
|
|
pblock->nSolution = soln;
|
|
solutionTargetChecks.increment();
|
|
|
|
if (UintToArith256(pblock->GetHash()) > hashTarget) {
|
|
return false;
|
|
}
|
|
|
|
// Found a solution
|
|
SetThreadPriority(THREAD_PRIORITY_NORMAL);
|
|
LogPrintf("ZcashMiner:\n");
|
|
LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", pblock->GetHash().GetHex(), hashTarget.GetHex());
|
|
#ifdef ENABLE_WALLET
|
|
if (ProcessBlockFound(pblock, *pwallet, reservekey)) {
|
|
#else
|
|
if (ProcessBlockFound(pblock)) {
|
|
#endif
|
|
// Ignore chain updates caused by us
|
|
std::lock_guard<std::mutex> lock{m_cs};
|
|
cancelSolver = false;
|
|
}
|
|
SetThreadPriority(THREAD_PRIORITY_LOWEST);
|
|
|
|
// In regression test mode, stop mining after a block is found.
|
|
if (chainparams.MineBlocksOnDemand()) {
|
|
// Increment here because throwing skips the call below
|
|
ehSolverRuns.increment();
|
|
throw boost::thread_interrupted();
|
|
}
|
|
|
|
return true;
|
|
};
|
|
std::function<bool(EhSolverCancelCheck)> cancelled = [&m_cs, &cancelSolver](EhSolverCancelCheck pos) {
|
|
std::lock_guard<std::mutex> lock{m_cs};
|
|
return cancelSolver;
|
|
};
|
|
|
|
// TODO: factor this out into a function with the same API for each solver.
|
|
if (solver == "tromp") {
|
|
// Create solver and initialize it.
|
|
equi eq(1);
|
|
eq.setstate(&curr_state);
|
|
|
|
// Initialization done, start algo driver.
|
|
eq.digit0(0);
|
|
eq.xfull = eq.bfull = eq.hfull = 0;
|
|
eq.showbsizes(0);
|
|
for (u32 r = 1; r < WK; r++) {
|
|
(r&1) ? eq.digitodd(r, 0) : eq.digiteven(r, 0);
|
|
eq.xfull = eq.bfull = eq.hfull = 0;
|
|
eq.showbsizes(r);
|
|
}
|
|
eq.digitK(0);
|
|
ehSolverRuns.increment();
|
|
|
|
// Convert solution indices to byte array (decompress) and pass it to validBlock method.
|
|
for (size_t s = 0; s < eq.nsols; s++) {
|
|
LogPrint("pow", "Checking solution %d\n", s+1);
|
|
std::vector<eh_index> index_vector(PROOFSIZE);
|
|
for (size_t i = 0; i < PROOFSIZE; i++) {
|
|
index_vector[i] = eq.sols[s][i];
|
|
}
|
|
std::vector<unsigned char> sol_char = GetMinimalFromIndices(index_vector, DIGITBITS);
|
|
|
|
if (validBlock(sol_char)) {
|
|
// If we find a POW solution, do not try other solutions
|
|
// because they become invalid as we created a new block in blockchain.
|
|
break;
|
|
}
|
|
}
|
|
} else {
|
|
try {
|
|
// If we find a valid block, we rebuild
|
|
bool found = EhOptimisedSolve(n, k, curr_state, validBlock, cancelled);
|
|
ehSolverRuns.increment();
|
|
if (found) {
|
|
break;
|
|
}
|
|
} catch (EhSolverCancelledException&) {
|
|
LogPrint("pow", "Equihash solver cancelled\n");
|
|
std::lock_guard<std::mutex> lock{m_cs};
|
|
cancelSolver = false;
|
|
}
|
|
}
|
|
|
|
// Check for stop or if block needs to be rebuilt
|
|
boost::this_thread::interruption_point();
|
|
// Regtest mode doesn't require peers
|
|
if (vNodes.empty() && chainparams.MiningRequiresPeers())
|
|
break;
|
|
if ((UintToArith256(pblock->nNonce) & 0xffff) == 0xffff)
|
|
break;
|
|
if (mempool.GetTransactionsUpdated() != nTransactionsUpdatedLast && GetTime() - nStart > 60)
|
|
break;
|
|
if (pindexPrev != chainActive.Tip())
|
|
break;
|
|
|
|
// Update nNonce and nTime
|
|
pblock->nNonce = ArithToUint256(UintToArith256(pblock->nNonce) + 1);
|
|
UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
|
|
}
|
|
}
|
|
}
|
|
catch (const boost::thread_interrupted&)
|
|
{
|
|
miningTimer.stop();
|
|
c.disconnect();
|
|
LogPrintf("ZcashMiner terminated\n");
|
|
throw;
|
|
}
|
|
catch (const std::runtime_error &e)
|
|
{
|
|
miningTimer.stop();
|
|
c.disconnect();
|
|
LogPrintf("ZcashMiner runtime error: %s\n", e.what());
|
|
return;
|
|
}
|
|
miningTimer.stop();
|
|
c.disconnect();
|
|
}
|
|
|
|
#ifdef ENABLE_WALLET
|
|
void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads)
|
|
#else
|
|
void GenerateBitcoins(bool fGenerate, int nThreads)
|
|
#endif
|
|
{
|
|
static boost::thread_group* minerThreads = NULL;
|
|
|
|
if (nThreads < 0)
|
|
nThreads = GetNumCores();
|
|
|
|
if (minerThreads != NULL)
|
|
{
|
|
minerThreads->interrupt_all();
|
|
delete minerThreads;
|
|
minerThreads = NULL;
|
|
}
|
|
|
|
if (nThreads == 0 || !fGenerate)
|
|
return;
|
|
|
|
minerThreads = new boost::thread_group();
|
|
for (int i = 0; i < nThreads; i++) {
|
|
#ifdef ENABLE_WALLET
|
|
minerThreads->create_thread(boost::bind(&BitcoinMiner, pwallet));
|
|
#else
|
|
minerThreads->create_thread(&BitcoinMiner);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
#endif // ENABLE_MINING
|