qmake build system improvements #542
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
laanwj
commented
Sep 29, 2011
laanwj
commented
- USE_SSL=1 to support RPC SSL
- BDB_LIB_SUFFIX= to link against specific BDB version
- Fix typo
- Start lrelease during qmake phase to prevent errors/warnings
- USE_SSL=1 to support RPC SSL - BDB_LIB_SUFFIX= to link against specific BDB version - Fix typo - Start lrelease during qmake phase to prevent errors/warnings
gavinandresen
added a commit
that referenced
this pull request
Sep 29, 2011
qmake build system improvements
coblee
referenced
this pull request
in litecoin-project/litecoin
Jul 17, 2012
qmake build system improvements
ptschip
pushed a commit
to ptschip/bitcoin
that referenced
this pull request
May 19, 2017
…tfix_abandonconflict Whitelist test nodes to prevent banning in abandonconflict test
KolbyML
pushed a commit
to KolbyML/bitcoin
that referenced
this pull request
Sep 4, 2020
* Depencies, change to macOS and macOS version bump
* Update MacOSX to macOS
* Fix typo and unneeded var
* Added Make Deploy for Portable Installs
* Build System Fix(Gitain)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* Build System Fix(Gitain) (#31)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* Updates + crash fixes (#34)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* [Model] Invalid iterator position crash fix.
* background loading crash fixed.
* random: fix crash on some 64bit platforms
rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash
in particular, it was holding a stack canary which was not properly restored
after the cpuid.
Split out the x86+PIC case so that x86_64 doesn't have to worry about it.
* random: Add fallback if getrandom syscall not available
If the code was compiled with newer (>=3.17) kernel headers but executed
on a system without the system call, every use of random would crash the
program. Add a fallback for that case.
* Don't assert if we were beaten to the block
A timing window exists where a wallet could be creating a new block from within the miner thread when a new block is received to the wallet. This window will create a situation where TestBlockValidity() fails because the chain tip has changed between the time it created the new block and the time it tested the validity of the block.
This situation would result in the wallet being asserted; however this is a little overkill. rather than asserting if the tip has changed, it is better to throw the block away.
This problem was revealed during a testnet test of an altcoin, and very prevalent when multiple wallet existed with the exact same number of staking coins received in the same transaction; or when multiple wallets were staking the same coins via import private key. The problem happens significantly less in more normal circumstances, but was still observed in a testing environment with fast blocks.
It is likely that this scenario has been encountered but never determined to be root cause, as a crashed wallet could be restarted, re-indexed and never investigated further.
* [Wallet] Add some LOCK to avoid crash
Github-Pull: #625
Rebased-From: ed23d0d62054156e0c2cb632fecbd65588c50e8c
* Sync develop with master (#35)
* Build System Fix(Gitain)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* Fix for supply --dirty
dirty fix for moneysupply
* Revert "Fix for supply --dirty"
This reverts commit 8060c6c1f840f477cb7803000e91be8a632aa03f.
* Another attempt at syncing master and develop (#36)
* Build System Fix(Gitain)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* Fix for supply --dirty
dirty fix for moneysupply
* Revert "Fix for supply --dirty"
This reverts commit 8060c6c1f840f477cb7803000e91be8a632aa03f.
* Mining Fixes (#37)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* [Model] Invalid iterator position crash fix.
* background loading crash fixed.
* random: fix crash on some 64bit platforms
rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash
in particular, it was holding a stack canary which was not properly restored
after the cpuid.
Split out the x86+PIC case so that x86_64 doesn't have to worry about it.
* random: Add fallback if getrandom syscall not available
If the code was compiled with newer (>=3.17) kernel headers but executed
on a system without the system call, every use of random would crash the
program. Add a fallback for that case.
* Don't assert if we were beaten to the block
A timing window exists where a wallet could be creating a new block from within the miner thread when a new block is received to the wallet. This window will create a situation where TestBlockValidity() fails because the chain tip has changed between the time it created the new block and the time it tested the validity of the block.
This situation would result in the wallet being asserted; however this is a little overkill. rather than asserting if the tip has changed, it is better to throw the block away.
This problem was revealed during a testnet test of an altcoin, and very prevalent when multiple wallet existed with the exact same number of staking coins received in the same transaction; or when multiple wallets were staking the same coins via import private key. The problem happens significantly less in more normal circumstances, but was still observed in a testing environment with fast blocks.
It is likely that this scenario has been encountered but never determined to be root cause, as a crashed wallet could be restarted, re-indexed and never investigated further.
* [Wallet] Add some LOCK to avoid crash
Github-Pull: #625
Rebased-From: ed23d0d62054156e0c2cb632fecbd65588c50e8c
* testnet mining fixes
* Update developer-notes.md
* Update Copyright
* Fix compile error (#38)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* [Model] Invalid iterator position crash fix.
* background loading crash fixed.
* random: fix crash on some 64bit platforms
rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash
in particular, it was holding a stack canary which was not properly restored
after the cpuid.
Split out the x86+PIC case so that x86_64 doesn't have to worry about it.
* random: Add fallback if getrandom syscall not available
If the code was compiled with newer (>=3.17) kernel headers but executed
on a system without the system call, every use of random would crash the
program. Add a fallback for that case.
* Don't assert if we were beaten to the block
A timing window exists where a wallet could be creating a new block from within the miner thread when a new block is received to the wallet. This window will create a situation where TestBlockValidity() fails because the chain tip has changed between the time it created the new block and the time it tested the validity of the block.
This situation would result in the wallet being asserted; however this is a little overkill. rather than asserting if the tip has changed, it is better to throw the block away.
This problem was revealed during a testnet test of an altcoin, and very prevalent when multiple wallet existed with the exact same number of staking coins received in the same transaction; or when multiple wallets were staking the same coins via import private key. The problem happens significantly less in more normal circumstances, but was still observed in a testing environment with fast blocks.
It is likely that this scenario has been encountered but never determined to be root cause, as a crashed wallet could be restarted, re-indexed and never investigated further.
* [Wallet] Add some LOCK to avoid crash
Github-Pull: #625
Rebased-From: ed23d0d62054156e0c2cb632fecbd65588c50e8c
* testnet mining fixes
* fix placement of utxo signer
* dont sign twice
* prevent logging twice
* random files updates
* Add Chacha20 crypto files
* Merge #643: [Crypto] Use stronger rand for key generation
b7dda924cfc2405386968b0eaa32aa0e546f322c [Log] Replace a string by the function name in a log (warrows)
977f089d0d2883ca3ca1648b14423b738c9248ef [Refactor] Use arrays instead of unic vars in Chacha20 (warrows)
d8abe323bd4f5cff3ca23fc00f0093ab7b143ead [Random] Add a missing include (warrows)
27663b8f16dfaac75bae1ab0e4a0c465b838c826 Do not permit copying FastRandomContexts (Pieter Wuille)
64e03e6de1a65c8d934d8df65af48e2b92bf887a Bugfix: randbytes should seed when needed (non reachable issue) (Pieter Wuille)
e8f12aa3621e98588b82533edb56ed4865645862 Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
de85c7ae55681f8a9d322f4c48c6e9ba15ee0cf1 Add attribute [[noreturn]] (C++11) to functions that will not return (practicalswift)
df46c7ff5a2e6a71ba636fa39d77f58e018816a6 Fix resource leak (Dag Robole)
d426d856d23fe6c5d6ef3d57fe2c420b9a8e4e5e Clarify entropy source (Pieter Wuille)
30a320b3d12d3529dfca1daae0e477d76acd9ae7 Use cpuid intrinsics instead of asm code (Pieter Wuille)
0c21204e6dc714de6b917d9de12b1029d0bfb67b random: fix crash on some 64bit platforms (Cory Fields)
b8bbb9c68d996b1bea579956b3c91872d6d94b8f Use rdrand as entropy source on supported platforms (Pieter Wuille)
8e19443e41f748ad54d0f8aa25907bdad0815c19 [Tests] Fix compilation (warrows)
f53edec73901a91a6c4f595b248e4058e8be5468 [Rand/test] scripted-diff: Use new naming style for insecure_rand* functions (warrows)
272f3a5ac83ba0ab72a799ce524b6605b3555751 [Random / tests] scripted-diff: Use randbits/bool instead of randrange (warrows)
0173ee3332990ac1eea134cca5c21cc451b81d92 Replace rand() & ((1 << N) - 1) with randbits(N) (Pieter Wuille)
250de7426e8317f86fc25fe60e960c2e9e903b69 Replace more rand() % NUM by randranges (Pieter Wuille)
d6904136030d94e844074fb75b9cafda46253ce0 [Random / tests] scripted-diff: use insecure_rand256/randrange more (warrows)
4a811ff9542439d43e3df3460114d9a24f849a36 Merge test_random.h into test_bitcoin.h (Pieter Wuille)
f275e638bf0a752d9f231f2e4a781432deafbfe8 Add various insecure_rand wrappers for tests (Pieter Wuille)
602af4fb3ef45a2a821f1b76d0dbd418ec852683 Add FastRandomContext::rand256() and ::randbytes() (Pieter Wuille)
90549785824f4c13ee8cf36e77f737b5d89d0f02 Add perf counter data to GetStrongRandBytes state in scheduler (Matt Corallo)
17dd13e746b567f44015fbefaa634b278010fccf Add internal method to add new random data to our internal RNG state (Matt Corallo)
c7a1602879aff2ae72bdefe959d4026ee8c0aefc Use sanity check timestamps as entropy (Pieter Wuille)
f671fe99994cb220dede903459307c61475aeef8 Test that GetPerformanceCounter() increments (Pieter Wuille)
dcb536fb2cef719abef9bb4104242410987bfd3d Use hardware timestamps in RNG seeding (Pieter Wuille)
7c3f290b50d32a3290a2c49542d72a3a7466da58 [Random] Fix compilation (warrows)
22b78957cc90252c958bc66439c098001d47b8fc random: only use getentropy on openbsd (Cory Fields)
e5750e5c9831edf01026643deed249e0efb28f0b Add a FastRandomContext::randrange and use it (Pieter Wuille)
2a0f6cd1ca2224e2ba30aea4ab312a1919dedc0c Switch FastRandomContext to ChaCha20 (Pieter Wuille)
401ca7db468939184681b73f4b346aebcfc378c6 Introduce FastRandomContext::randbool() (Pieter Wuille)
3d056d6ed478c5bbd42d7dde4f1ab0a75ffd42b1 Add ChaCha20 (Pieter Wuille)
3c97f3f2cb1b3dc2f5d642877d9a2de0a85c06bf Kill insecure_random and associated global state (Wladimir J. van der Laan)
68ba16c78593bf221844dae95fc5edacbf69ba62 Maintain state across GetStrongRandBytes calls (Pieter Wuille)
c3c399e199c2d25d10e782dca2ef17f55b6939d0 random: Add fallback if getrandom syscall not available (Wladimir J. van der Laan)
7a8111f915fc7ed23aaec86cd95904bf5d5972fd sanity: Move OS random to sanity check function (Wladimir J. van der Laan)
387c2e9574b56ae941b7723c561ed39488891782 squashme: comment that NUM_OS_RANDOM_BYTES should not be changed lightly (Wladimir J. van der Laan)
9e8c266b158c26b361d68a3cccdbcfd7bee0b376 util: Specific GetOSRandom for Linux/FreeBSD/OpenBSD (Wladimir J. van der Laan)
f989b865f215c797e77483a04cc7fe9026904517 Don't use assert for catching randomness failures (Pieter Wuille)
a15419e13204d96416b0cce9aad2ae4e35ea5ed5 Always require OS randomness when generating secret keys (Pieter Wuille)
Pull request description:
Since #576 hasn't changed in over a month, here is a reworked version of it.
So in this PR:
-We add the memory_cleanse function from upstream, to remove a number of OpenSSL calls.
-We use OS randomness in addition to OpenSSL randomness (see #576 for why it's needed).
ACKs for top commit:
random-zebra:
ACK https://github.com/PIVX-Project/PIVX/pull/643/commits/b7dda924cfc2405386968b0eaa32aa0e546f322c
furszy:
ACK [`b7dda92`](https://github.com/PIVX-Project/PIVX/commit/b7dda924cfc2405386968b0eaa32aa0e546f322c)
Tree-SHA512: d92cbc14d844263ced753248e646f5cd4f03ec37546f50ff1b558fc3076b6d777c7efcb899c0400bc510e21311b5bd93d9aca26d811033fedb370f8457204035
* Revert "Merge #643: [Crypto] Use stronger rand for key generation"
This reverts commit ae3e2562220577420e37a6367feeaa3cfedc67e9.
* Revert "Add Chacha20 crypto files"
This reverts commit ddd102fca86499062dac0ea3a40a8d8b26d039f5.
* Revert "random files updates"
This reverts commit f29e0844099487811d4f3c7af7f6d089adc2f6cf.
* Revert "random: fix crash on some 64bit platforms"
This reverts commit 5a5241452e1515fbd554ee99cc14e552fcb98051.
* Revert "random: Add fallback if getrandom syscall not available"
This reverts commit b46c1cb2b466f4bce60db364bf26f2cf791cdf38.
* fix redeclaration
* fix signing code
* do not return in void func
* remove unused funcs
* remove on error
* revert "Refactor miner"
* Fix name collision + mac crashes (#39)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* [Model] Invalid iterator position crash fix.
* background loading crash fixed.
* random: fix crash on some 64bit platforms
rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash
in particular, it was holding a stack canary which was not properly restored
after the cpuid.
Split out the x86+PIC case so that x86_64 doesn't have to worry about it.
* random: Add fallback if getrandom syscall not available
If the code was compiled with newer (>=3.17) kernel headers but executed
on a system without the system call, every use of random would crash the
program. Add a fallback for that case.
* Don't assert if we were beaten to the block
A timing window exists where a wallet could be creating a new block from within the miner thread when a new block is received to the wallet. This window will create a situation where TestBlockValidity() fails because the chain tip has changed between the time it created the new block and the time it tested the validity of the block.
This situation would result in the wallet being asserted; however this is a little overkill. rather than asserting if the tip has changed, it is better to throw the block away.
This problem was revealed during a testnet test of an altcoin, and very prevalent when multiple wallet existed with the exact same number of staking coins received in the same transaction; or when multiple wallets were staking the same coins via import private key. The problem happens significantly less in more normal circumstances, but was still observed in a testing environment with fast blocks.
It is likely that this scenario has been encountered but never determined to be root cause, as a crashed wallet could be restarted, re-indexed and never investigated further.
* [Wallet] Add some LOCK to avoid crash
Github-Pull: #625
Rebased-From: ed23d0d62054156e0c2cb632fecbd65588c50e8c
* testnet mining fixes
* fix placement of utxo signer
* dont sign twice
* prevent logging twice
* random files updates
* Add Chacha20 crypto files
* Merge #643: [Crypto] Use stronger rand for key generation
b7dda924cfc2405386968b0eaa32aa0e546f322c [Log] Replace a string by the function name in a log (warrows)
977f089d0d2883ca3ca1648b14423b738c9248ef [Refactor] Use arrays instead of unic vars in Chacha20 (warrows)
d8abe323bd4f5cff3ca23fc00f0093ab7b143ead [Random] Add a missing include (warrows)
27663b8f16dfaac75bae1ab0e4a0c465b838c826 Do not permit copying FastRandomContexts (Pieter Wuille)
64e03e6de1a65c8d934d8df65af48e2b92bf887a Bugfix: randbytes should seed when needed (non reachable issue) (Pieter Wuille)
e8f12aa3621e98588b82533edb56ed4865645862 Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
de85c7ae55681f8a9d322f4c48c6e9ba15ee0cf1 Add attribute [[noreturn]] (C++11) to functions that will not return (practicalswift)
df46c7ff5a2e6a71ba636fa39d77f58e018816a6 Fix resource leak (Dag Robole)
d426d856d23fe6c5d6ef3d57fe2c420b9a8e4e5e Clarify entropy source (Pieter Wuille)
30a320b3d12d3529dfca1daae0e477d76acd9ae7 Use cpuid intrinsics instead of asm code (Pieter Wuille)
0c21204e6dc714de6b917d9de12b1029d0bfb67b random: fix crash on some 64bit platforms (Cory Fields)
b8bbb9c68d996b1bea579956b3c91872d6d94b8f Use rdrand as entropy source on supported platforms (Pieter Wuille)
8e19443e41f748ad54d0f8aa25907bdad0815c19 [Tests] Fix compilation (warrows)
f53edec73901a91a6c4f595b248e4058e8be5468 [Rand/test] scripted-diff: Use new naming style for insecure_rand* functions (warrows)
272f3a5ac83ba0ab72a799ce524b6605b3555751 [Random / tests] scripted-diff: Use randbits/bool instead of randrange (warrows)
0173ee3332990ac1eea134cca5c21cc451b81d92 Replace rand() & ((1 << N) - 1) with randbits(N) (Pieter Wuille)
250de7426e8317f86fc25fe60e960c2e9e903b69 Replace more rand() % NUM by randranges (Pieter Wuille)
d6904136030d94e844074fb75b9cafda46253ce0 [Random / tests] scripted-diff: use insecure_rand256/randrange more (warrows)
4a811ff9542439d43e3df3460114d9a24f849a36 Merge test_random.h into test_bitcoin.h (Pieter Wuille)
f275e638bf0a752d9f231f2e4a781432deafbfe8 Add various insecure_rand wrappers for tests (Pieter Wuille)
602af4fb3ef45a2a821f1b76d0dbd418ec852683 Add FastRandomContext::rand256() and ::randbytes() (Pieter Wuille)
90549785824f4c13ee8cf36e77f737b5d89d0f02 Add perf counter data to GetStrongRandBytes state in scheduler (Matt Corallo)
17dd13e746b567f44015fbefaa634b278010fccf Add internal method to add new random data to our internal RNG state (Matt Corallo)
c7a1602879aff2ae72bdefe959d4026ee8c0aefc Use sanity check timestamps as entropy (Pieter Wuille)
f671fe99994cb220dede903459307c61475aeef8 Test that GetPerformanceCounter() increments (Pieter Wuille)
dcb536fb2cef719abef9bb4104242410987bfd3d Use hardware timestamps in RNG seeding (Pieter Wuille)
7c3f290b50d32a3290a2c49542d72a3a7466da58 [Random] Fix compilation (warrows)
22b78957cc90252c958bc66439c098001d47b8fc random: only use getentropy on openbsd (Cory Fields)
e5750e5c9831edf01026643deed249e0efb28f0b Add a FastRandomContext::randrange and use it (Pieter Wuille)
2a0f6cd1ca2224e2ba30aea4ab312a1919dedc0c Switch FastRandomContext to ChaCha20 (Pieter Wuille)
401ca7db468939184681b73f4b346aebcfc378c6 Introduce FastRandomContext::randbool() (Pieter Wuille)
3d056d6ed478c5bbd42d7dde4f1ab0a75ffd42b1 Add ChaCha20 (Pieter Wuille)
3c97f3f2cb1b3dc2f5d642877d9a2de0a85c06bf Kill insecure_random and associated global state (Wladimir J. van der Laan)
68ba16c78593bf221844dae95fc5edacbf69ba62 Maintain state across GetStrongRandBytes calls (Pieter Wuille)
c3c399e199c2d25d10e782dca2ef17f55b6939d0 random: Add fallback if getrandom syscall not available (Wladimir J. van der Laan)
7a8111f915fc7ed23aaec86cd95904bf5d5972fd sanity: Move OS random to sanity check function (Wladimir J. van der Laan)
387c2e9574b56ae941b7723c561ed39488891782 squashme: comment that NUM_OS_RANDOM_BYTES should not be changed lightly (Wladimir J. van der Laan)
9e8c266b158c26b361d68a3cccdbcfd7bee0b376 util: Specific GetOSRandom for Linux/FreeBSD/OpenBSD (Wladimir J. van der Laan)
f989b865f215c797e77483a04cc7fe9026904517 Don't use assert for catching randomness failures (Pieter Wuille)
a15419e13204d96416b0cce9aad2ae4e35ea5ed5 Always require OS randomness when generating secret keys (Pieter Wuille)
Pull request description:
Since #576 hasn't changed in over a month, here is a reworked version of it.
So in this PR:
-We add the memory_cleanse function from upstream, to remove a number of OpenSSL calls.
-We use OS randomness in addition to OpenSSL randomness (see #576 for why it's needed).
ACKs for top commit:
random-zebra:
ACK https://github.com/PIVX-Project/PIVX/pull/643/commits/b7dda924cfc2405386968b0eaa32aa0e546f322c
furszy:
ACK [`b7dda92`](https://github.com/PIVX-Project/PIVX/commit/b7dda924cfc2405386968b0eaa32aa0e546f322c)
Tree-SHA512: d92cbc14d844263ced753248e646f5cd4f03ec37546f50ff1b558fc3076b6d777c7efcb899c0400bc510e21311b5bd93d9aca26d811033fedb370f8457204035
* Revert "Merge #643: [Crypto] Use stronger rand for key generation"
This reverts commit ae3e2562220577420e37a6367feeaa3cfedc67e9.
* Revert "Add Chacha20 crypto files"
This reverts commit ddd102fca86499062dac0ea3a40a8d8b26d039f5.
* Revert "random files updates"
This reverts commit f29e0844099487811d4f3c7af7f6d089adc2f6cf.
* Revert "random: fix crash on some 64bit platforms"
This reverts commit 5a5241452e1515fbd554ee99cc14e552fcb98051.
* Revert "random: Add fallback if getrandom syscall not available"
This reverts commit b46c1cb2b466f4bce60db364bf26f2cf791cdf38.
* fix redeclaration
* fix signing code
* do not return in void func
* remove unused funcs
* remove on error
* revert "Refactor miner"
* fix repeat of masternode in fundamental node payment log
* fix name collision
* [Wallet] Look at last CoinsView block for corruption fix process
* Fix crashes
* Merge #941: [Refactor] Move ThreadStakeMinter out of net.cpp
42fe4040acff08450168416ccf35413abdc1747a [Refactor] Move ThreadStakeMinter out of net.cpp (Fuzzbawls)
Pull request description:
This moves the implementation function and thread creation to a more
appropriate file (`miner.cpp`).
Resolves #938
ACKs for top commit:
CaveSpectre11:
ACK https://github.com/PIVX-Project/PIVX/commit/42fe4040acff08450168416ccf35413abdc1747a
random-zebra:
ACK https://github.com/PIVX-Project/PIVX/pull/941/commits/42fe4040acff08450168416ccf35413abdc1747a
furszy:
utACK [42fe404](https://github.com/PIVX-Project/PIVX/pull/941/commits/42fe4040acff08450168416ccf35413abdc1747a)
Tree-SHA512: d3417f03cab63aa41b1ff0fb4d391d42f4448b83efe70391d4014407008af34eb265a23b5807ebecb90cf9637fb74e5b330b02c92e7038e5400a5f16608800ee
* Merge #865: [Main] Don't return an invalid state when shutting down the wallet
8126729 Don't return an invalid state when shutting down the wallet (Fuzzbawls)
Tree-SHA512: b7042df42af620faca5d415382ad0a6ae973e9dbad7e527957c2ac3c7d0cb5470fcca555b3fe262f5f06e334504ded657db879c2471ecc290247e0f7e2bbf5f3
* Merge #958: [Staking] Modify miner and staking thread for efficiency
b7a9a9cdb20cdee869906fb24e2bc984e8a93802 [Staking] Modify miner and staking thread for efficency (Cave Spectre)
Pull request description:
### **Release notes**
- [Mining] Unnecessary mining threads now exit after PoS has begun
- [Staking] The staking thread dormancy is more efficient during PoW
- [Performance] Some unnecessary processing in the mining thread removed
- [RPC] setgenerate errors if attempted to turn on after end of PoW
- [Build] Wallet only routines conditionalized in miner.h
- [Refactoring] Log messages with bitcoin named routines changed for easier rename of routines in the future.
In order to better explain the changes in this PR, a review of the existing code would be helpful.
### **Backstory**
When fixing a PIVX forked coin's transition from PoW to PoS, it was observed that mining threads go into tight infinite loops after the switch to proof of stake. This can be seen with a simple `pivx-qt -testnet -gen`, and watching the debug log.
This observation triggered the below code review (re-written for the current release; some of the
findings in the code originally reviewed had already been addressed in PIVX).
### **Code Review**
_BitcoinMiner()_
This routine is a worker routine for both staking and mining threads; fProofOfStake is set to true when running in the staking thread, false when running in the mining thread. fGeneratedBitcoins is set when mining is started; and cleared on shutdown or when mining is stopped.
_In the initial fProofOfStake section:_
```
if ((GetTime() - nMintableLastCheck > 5 * 60)) // 5 minute check time
{
nMintableLastCheck = GetTime();
fMintableCoins = pwallet->MintableCoins();
}
if (chainActive.Tip()->nHeight < Params().LAST_POW_BLOCK()) {
MilliSleep(5000);
continue;
}
```
Every 5 minutes this code will scan through the wallet and look to see if mintable coins exist. After it's done that, it checks if the network is still in the proof of work phase. It doesn't make sense to scan the wallet until after the proof of work phase is ending.
If it is in the proof of work phase; the staking thread sleeps for 5 seconds (`MilliSleep(5000)`). This only makes sense if the block time is 5 seconds. Technically the thread could determine the number of blocks remaining in the proof of work phase, and use that to calculate a hibernation of sorts. Using the target spacing to wait for the block to pass is a 91% reduction in the number of passes through the loop (12 vs. 1 when the target spacing is one minute), and doesn't run into issues where adjustments to the actual spacing throw the timing of a hibernation off.
```
if (!fMintableCoins) {
if (GetTime() - nMintableLastCheck > 1 * 60) // 1 minute check time
{
nMintableLastCheck = GetTime();
fMintableCoins = pwallet->MintableCoins();
}
}
MilliSleep(5000);
```
We come to this section of code in the waiting while loop; if we don't have mintable coins yet, or our wallet is locked, or we're not synched; or a host of other potential things that would prevent staking. However, we check again for mintable coins; and then we wait 5 seconds after that check before we come out.
Since the first time we come into this loop; we have already checked mintable coins (within the last 5 minutes); we should sleep first, and then do the check closer to the time we're actually going to go around the loop again; so we're working with the most recent data.
```
if (!fGenerateBitcoins && !fProofOfStake)
continue;
```
This check is buried in a `if (fProofOfStake)` conditional, where fProofOfStake is a parameter that is passed in by the caller to BitcoinMiner(). `!fProofOfStake` will never be true; so this condition will never be true. Removing it we are left with !fGenerateBitcoins; which is unrelated to this section of code anyway. If we're down to this point, we're not in PoW mode anymore, so there shouldn't be a mining thread (more on that later). But the most compelling part of this condition,whether it passes or not, is that it "continues" the while loop it's in; and since it's at the end of the actual while loop, it's going to iterate into another round of the while loop as soon as it finishes with this conditional anyway. Long story short; the code doesn't do anything.
_Overall logic_
The mining thread will run until mining is turned off (`setgenerate false`, or the mining flags taken off the invocation). However, there is no need to continue to mine with proof of work after the proof of stake phase begins. In fact, there really is no consideration of that at all; PoW will continue to try to generate blocks well after PoS has begun. Yes, it's within the users control to stop mining; but it's within the power of the code to take care of that for the user, and stop the mining thread(s) after the transition to proof of stake.
### **This PR:**
The logical issues above have been corrected. The dormancy for the proof of stake thread is held for just one block rather than any extreme hibernation. Combined with moving that code to be the first thing in the while loop; it also removes the processing done to search through the wallets looking for stakeable coins.
Since a significant amount of code assumes there will not be a transition from PoS to PoW; code was added to BitcoinMiner() to exit the mining threads if it's transitioned into the PoS phase. The threads will continue for a little bit, in case there is any rewind on the chain; but after 6 PoS blocks are accepted, the miner threads will exit.
To prevent the PoW thread from trying to generate blocks after the PoS phase has begun, logic was added in CreateNewBlockWithKey() to return quickly. Rather than create a situation where the mining thread ends up in a tight loop in the initial phases of PoS, the mining thread will be held for 1/2 of the target spacing before returning.
Lastly; Some tweaks were made to the logging; removing hardcoded references to "BitcoinMiner()", in case refactoring in the future changes the name of the routine. Similarly, since there is a log message when the mining thread starts "PIVXMiner started"; rather than reporting thread exits or errors as "ThreadBitcoinMiner", they have been changed to PIVXMiner to match.
Much of this can be observed with an errant `pivx-qt -gen`. With this PR, it simply tries to start the miner, and then exits.
_With PR code - `pivx-qt -gen -testnet`_
```
2019-07-21 20:04:22 PIVXMiner started
2019-07-21 20:04:22 BitcoinMiner: Exiting Proof of Work Mining Thread at height: 1160732
2019-07-21 20:04:22 PIVXMiner exiting
```
_Current release:_
```
2019-07-21 19:37:06 CreateNewBlock(): total size 1000
2019-07-21 19:37:06 ERROR: CheckProofOfWork() : hash doesn't match nBits
2019-07-21 19:37:06 ERROR: CheckBlockHeader() : proof of work failed
2019-07-21 19:37:06 ERROR: CheckBlock() : CheckBlockHeader failed
2019-07-21 19:37:06 CreateNewBlock() : TestBlockValidity failed
```
is repeated in a tight loop.
ACKs for top commit:
furszy:
ACK [b7a9a9c](https://github.com/PIVX-Project/PIVX/commit/b7a9a9cdb20cdee869906fb24e2bc984e8a93802)
random-zebra:
ACK https://github.com/PIVX-Project/PIVX/pull/958/commits/b7a9a9cdb20cdee869906fb24e2bc984e8a93802 and merging...
Tree-SHA512: 064619ce1fde75f1baf35ddb202b4573f2a8c0effc5d2939a678612e3f1d56b08d5c5d7c7bb30ce919e5a648f3f406cca35093b9a3a04c799f746fff5c6a35b6
* remove duplicate stake thread code
* add missing include
* remove zvitae pos validator
* Refine signblock code
* revert zerocoin added check
* Miner reference updates
* revert miner changes
* fix fundamentalnode sync checker
* [Refactor] Move rpc files to its own folder
* update includes
* fix rpcserver include to rpc/server.h
* [Refactor] Move wallet files to wallet dir
* [Trivial] Fix db.h path
* Merge #982: [Miner] Don't create new keys when generating PoS blocks
74e7fc7d432c7f6d586d54ff276d6babad0fe505 [Miner] Don't create new keys when generating PoS blocks (random-zebra)
Pull request description:
This fixes the calls to `CreateNewBlockWithKey` with PoS blocks, which are not needed.
We simply call `CreateNewBlock` with an empy script for coinbase.
It should prevent the problem described in https://github.com/PIVX-Project/PIVX/pull/956#issuecomment-520166966
ACKs for top commit:
CaveSpectre11:
utACK https://github.com/PIVX-Project/PIVX/pull/982/commits/74e7fc7d432c7f6d586d54ff276d6babad0fe505
akshaynexus:
utACK https://github.com/PIVX-Project/PIVX/commit/74e7fc7d432c7f6d586d54ff276d6babad0fe505
furszy:
utACK [74e7fc7](https://github.com/PIVX-Project/PIVX/pull/982/commits/74e7fc7d432c7f6d586d54ff276d6babad0fe505)
Warrows:
Pretty straightforward indeed, utACK 74e7fc7
Tree-SHA512: bcb9752a689a058b6c33317136d16afd694b5da66c69cdd32a8b89b71059c5b2c5dc20c88045c52429fae99d45f508ea223f1b7d1afa5db3c77eb59befd48d51
* Merge #549: [Crypto] Switch to libsecp256k1 signature verification and update the lib
f10439c [Crypto] Add ctx initialisation for bip38 (warrows)
21234db [Crypto] Bring back function CKey.SetPrivKey for zPIV (warrows)
65e009a [Tests] Add new auto generated script tests (warrows)
6839f3b [Crypto] Switch from openssl to secp256k1 for consensus (warrows)
8a901f9 Squashed 'src/secp256k1/' content from commit 452d8e4d2 (warrows)
d98a584 [Refactor] Delete secp256k1 folder for subtreefication (warrows)
Tree-SHA512: f0f6777be57777ba86f83af1b891a6c0f384e6b059afc9249599269c71e5d3bf46a6498325488878af71b6685c6dac6cb672d0147c2ebf43b36f6d786fc38a10
* fix keystore refs
* update libscepk265k1
* [RPC/REST] Migrate to libevent based httpd server
* fix mempooltojson and misc erroros
* Merge #769: [Main] Unify shutdown proceedure in init rather than per-app
518542f [Main] Unify shutdown proceedure in init rather than per-app (Fuzzbawls)
Tree-SHA512: 6e734ce002e236c3c2c59c2e8e93d87f5fe577b3f5546804b117a71255266cc4012d847d6a1d9b019a7b763124b45987c2dc3f95294670489cac269beceb2e3a
* Merge #542: [Network] Remove vfReachable and modify IsReachable to only use vfLimited.
38ed737 Remove vfReachable and modify IsReachable to only use vfLimited. (Patrick Strateman)
Tree-SHA512: 8aa61f9abd8356522f3ba71b35497aac07e10333a39ff4b98bb635d1246e6b1be6b0ee0b236944fbfaa558af0e6c0cc219e540eacb2232bc05db393e4a72b088
* [Refactor] Refactor bignum header file into several files
* [zerocoin] Free memory from ToString()
Simple fix for a minor memory leak
* Revert "[Refactor] Refactor bignum header file into several files"
This reverts commit c9aa98fe451e27d2bb4564747ffb0768cce56d53.
* fix delays in mining code in testnet (#40)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* [Model] Invalid iterator position crash fix.
* background loading crash fixed.
* random: fix crash on some 64bit platforms
rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash
in particular, it was holding a stack canary which was not properly restored
after the cpuid.
Split out the x86+PIC case so that x86_64 doesn't have to worry about it.
* random: Add fallback if getrandom syscall not available
If the code was compiled with newer (>=3.17) kernel headers but executed
on a system without the system call, every use of random would crash the
program. Add a fallback for that case.
* Don't assert if we were beaten to the block
A timing window exists where a wallet could be creating a new block from within the miner thread when a new block is received to the wallet. This window will create a situation where TestBlockValidity() fails because the chain tip has changed between the time it created the new block and the time it tested the validity of the block.
This situation would result in the wallet being asserted; however this is a little overkill. rather than asserting if the tip has changed, it is better to throw the block away.
This problem was revealed during a testnet test of an altcoin, and very prevalent when multiple wallet existed with the exact same number of staking coins received in the same transaction; or when multiple wallets were staking the same coins via import private key. The problem happens significantly less in more normal circumstances, but was still observed in a testing environment with fast blocks.
It is likely that this scenario has been encountered but never determined to be root cause, as a crashed wallet could be restarted, re-indexed and never investigated further.
* [Wallet] Add some LOCK to avoid crash
Github-Pull: #625
Rebased-From: ed23d0d62054156e0c2cb632fecbd65588c50e8c
* testnet mining fixes
* fix placement of utxo signer
* dont sign twice
* prevent logging twice
* random files updates
* Add Chacha20 crypto files
* Merge #643: [Crypto] Use stronger rand for key generation
b7dda924cfc2405386968b0eaa32aa0e546f322c [Log] Replace a string by the function name in a log (warrows)
977f089d0d2883ca3ca1648b14423b738c9248ef [Refactor] Use arrays instead of unic vars in Chacha20 (warrows)
d8abe323bd4f5cff3ca23fc00f0093ab7b143ead [Random] Add a missing include (warrows)
27663b8f16dfaac75bae1ab0e4a0c465b838c826 Do not permit copying FastRandomContexts (Pieter Wuille)
64e03e6de1a65c8d934d8df65af48e2b92bf887a Bugfix: randbytes should seed when needed (non reachable issue) (Pieter Wuille)
e8f12aa3621e98588b82533edb56ed4865645862 Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
de85c7ae55681f8a9d322f4c48c6e9ba15ee0cf1 Add attribute [[noreturn]] (C++11) to functions that will not return (practicalswift)
df46c7ff5a2e6a71ba636fa39d77f58e018816a6 Fix resource leak (Dag Robole)
d426d856d23fe6c5d6ef3d57fe2c420b9a8e4e5e Clarify entropy source (Pieter Wuille)
30a320b3d12d3529dfca1daae0e477d76acd9ae7 Use cpuid intrinsics instead of asm code (Pieter Wuille)
0c21204e6dc714de6b917d9de12b1029d0bfb67b random: fix crash on some 64bit platforms (Cory Fields)
b8bbb9c68d996b1bea579956b3c91872d6d94b8f Use rdrand as entropy source on supported platforms (Pieter Wuille)
8e19443e41f748ad54d0f8aa25907bdad0815c19 [Tests] Fix compilation (warrows)
f53edec73901a91a6c4f595b248e4058e8be5468 [Rand/test] scripted-diff: Use new naming style for insecure_rand* functions (warrows)
272f3a5ac83ba0ab72a799ce524b6605b3555751 [Random / tests] scripted-diff: Use randbits/bool instead of randrange (warrows)
0173ee3332990ac1eea134cca5c21cc451b81d92 Replace rand() & ((1 << N) - 1) with randbits(N) (Pieter Wuille)
250de7426e8317f86fc25fe60e960c2e9e903b69 Replace more rand() % NUM by randranges (Pieter Wuille)
d6904136030d94e844074fb75b9cafda46253ce0 [Random / tests] scripted-diff: use insecure_rand256/randrange more (warrows)
4a811ff9542439d43e3df3460114d9a24f849a36 Merge test_random.h into test_bitcoin.h (Pieter Wuille)
f275e638bf0a752d9f231f2e4a781432deafbfe8 Add various insecure_rand wrappers for tests (Pieter Wuille)
602af4fb3ef45a2a821f1b76d0dbd418ec852683 Add FastRandomContext::rand256() and ::randbytes() (Pieter Wuille)
90549785824f4c13ee8cf36e77f737b5d89d0f02 Add perf counter data to GetStrongRandBytes state in scheduler (Matt Corallo)
17dd13e746b567f44015fbefaa634b278010fccf Add internal method to add new random data to our internal RNG state (Matt Corallo)
c7a1602879aff2ae72bdefe959d4026ee8c0aefc Use sanity check timestamps as entropy (Pieter Wuille)
f671fe99994cb220dede903459307c61475aeef8 Test that GetPerformanceCounter() increments (Pieter Wuille)
dcb536fb2cef719abef9bb4104242410987bfd3d Use hardware timestamps in RNG seeding (Pieter Wuille)
7c3f290b50d32a3290a2c49542d72a3a7466da58 [Random] Fix compilation (warrows)
22b78957cc90252c958bc66439c098001d47b8fc random: only use getentropy on openbsd (Cory Fields)
e5750e5c9831edf01026643deed249e0efb28f0b Add a FastRandomContext::randrange and use it (Pieter Wuille)
2a0f6cd1ca2224e2ba30aea4ab312a1919dedc0c Switch FastRandomContext to ChaCha20 (Pieter Wuille)
401ca7db468939184681b73f4b346aebcfc378c6 Introduce FastRandomContext::randbool() (Pieter Wuille)
3d056d6ed478c5bbd42d7dde4f1ab0a75ffd42b1 Add ChaCha20 (Pieter Wuille)
3c97f3f2cb1b3dc2f5d642877d9a2de0a85c06bf Kill insecure_random and associated global state (Wladimir J. van der Laan)
68ba16c78593bf221844dae95fc5edacbf69ba62 Maintain state across GetStrongRandBytes calls (Pieter Wuille)
c3c399e199c2d25d10e782dca2ef17f55b6939d0 random: Add fallback if getrandom syscall not available (Wladimir J. van der Laan)
7a8111f915fc7ed23aaec86cd95904bf5d5972fd sanity: Move OS random to sanity check function (Wladimir J. van der Laan)
387c2e9574b56ae941b7723c561ed39488891782 squashme: comment that NUM_OS_RANDOM_BYTES should not be changed lightly (Wladimir J. van der Laan)
9e8c266b158c26b361d68a3cccdbcfd7bee0b376 util: Specific GetOSRandom for Linux/FreeBSD/OpenBSD (Wladimir J. van der Laan)
f989b865f215c797e77483a04cc7fe9026904517 Don't use assert for catching randomness failures (Pieter Wuille)
a15419e13204d96416b0cce9aad2ae4e35ea5ed5 Always require OS randomness when generating secret keys (Pieter Wuille)
Pull request description:
Since #576 hasn't changed in over a month, here is a reworked version of it.
So in this PR:
-We add the memory_cleanse function from upstream, to remove a number of OpenSSL calls.
-We use OS randomness in addition to OpenSSL randomness (see #576 for why it's needed).
ACKs for top commit:
random-zebra:
ACK https://github.com/PIVX-Project/PIVX/pull/643/commits/b7dda924cfc2405386968b0eaa32aa0e546f322c
furszy:
ACK [`b7dda92`](https://github.com/PIVX-Project/PIVX/commit/b7dda924cfc2405386968b0eaa32aa0e546f322c)
Tree-SHA512: d92cbc14d844263ced753248e646f5cd4f03ec37546f50ff1b558fc3076b6d777c7efcb899c0400bc510e21311b5bd93d9aca26d811033fedb370f8457204035
* Revert "Merge #643: [Crypto] Use stronger rand for key generation"
This reverts commit ae3e2562220577420e37a6367feeaa3cfedc67e9.
* Revert "Add Chacha20 crypto files"
This reverts commit ddd102fca86499062dac0ea3a40a8d8b26d039f5.
* Revert "random files updates"
This reverts commit f29e0844099487811d4f3c7af7f6d089adc2f6cf.
* Revert "random: fix crash on some 64bit platforms"
This reverts commit 5a5241452e1515fbd554ee99cc14e552fcb98051.
* Revert "random: Add fallback if getrandom syscall not available"
This reverts commit b46c1cb2b466f4bce60db364bf26f2cf791cdf38.
* fix redeclaration
* fix signing code
* do not return in void func
* remove unused funcs
* remove on error
* revert "Refactor miner"
* fix repeat of masternode in fundamental node payment log
* fix name collision
* [Wallet] Look at last CoinsView block for corruption fix process
* Fix crashes
* Merge #941: [Refactor] Move ThreadStakeMinter out of net.cpp
42fe4040acff08450168416ccf35413abdc1747a [Refactor] Move ThreadStakeMinter out of net.cpp (Fuzzbawls)
Pull request description:
This moves the implementation function and thread creation to a more
appropriate file (`miner.cpp`).
Resolves #938
ACKs for top commit:
CaveSpectre11:
ACK https://github.com/PIVX-Project/PIVX/commit/42fe4040acff08450168416ccf35413abdc1747a
random-zebra:
ACK https://github.com/PIVX-Project/PIVX/pull/941/commits/42fe4040acff08450168416ccf35413abdc1747a
furszy:
utACK [42fe404](https://github.com/PIVX-Project/PIVX/pull/941/commits/42fe4040acff08450168416ccf35413abdc1747a)
Tree-SHA512: d3417f03cab63aa41b1ff0fb4d391d42f4448b83efe70391d4014407008af34eb265a23b5807ebecb90cf9637fb74e5b330b02c92e7038e5400a5f16608800ee
* Merge #865: [Main] Don't return an invalid state when shutting down the wallet
8126729 Don't return an invalid state when shutting down the wallet (Fuzzbawls)
Tree-SHA512: b7042df42af620faca5d415382ad0a6ae973e9dbad7e527957c2ac3c7d0cb5470fcca555b3fe262f5f06e334504ded657db879c2471ecc290247e0f7e2bbf5f3
* Merge #958: [Staking] Modify miner and staking thread for efficiency
b7a9a9cdb20cdee869906fb24e2bc984e8a93802 [Staking] Modify miner and staking thread for efficency (Cave Spectre)
Pull request description:
### **Release notes**
- [Mining] Unnecessary mining threads now exit after PoS has begun
- [Staking] The staking thread dormancy is more efficient during PoW
- [Performance] Some unnecessary processing in the mining thread removed
- [RPC] setgenerate errors if attempted to turn on after end of PoW
- [Build] Wallet only routines conditionalized in miner.h
- [Refactoring] Log messages with bitcoin named routines changed for easier rename of routines in the future.
In order to better explain the changes in this PR, a review of the existing code would be helpful.
### **Backstory**
When fixing a PIVX forked coin's transition from PoW to PoS, it was observed that mining threads go into tight infinite loops after the switch to proof of stake. This can be seen with a simple `pivx-qt -testnet -gen`, and watching the debug log.
This observation triggered the below code review (re-written for the current release; some of the
findings in the code originally reviewed had already been addressed in PIVX).
### **Code Review**
_BitcoinMiner()_
This routine is a worker routine for both staking and mining threads; fProofOfStake is set to true when running in the staking thread, false when running in the mining thread. fGeneratedBitcoins is set when mining is started; and cleared on shutdown or when mining is stopped.
_In the initial fProofOfStake section:_
```
if ((GetTime() - nMintableLastCheck > 5 * 60)) // 5 minute check time
{
nMintableLastCheck = GetTime();
fMintableCoins = pwallet->MintableCoins();
}
if (chainActive.Tip()->nHeight < Params().LAST_POW_BLOCK()) {
MilliSleep(5000);
continue;
}
```
Every 5 minutes this code will scan through the wallet and look to see if mintable coins exist. After it's done that, it checks if the network is still in the proof of work phase. It doesn't make sense to scan the wallet until after the proof of work phase is ending.
If it is in the proof of work phase; the staking thread sleeps for 5 seconds (`MilliSleep(5000)`). This only makes sense if the block time is 5 seconds. Technically the thread could determine the number of blocks remaining in the proof of work phase, and use that to calculate a hibernation of sorts. Using the target spacing to wait for the block to pass is a 91% reduction in the number of passes through the loop (12 vs. 1 when the target spacing is one minute), and doesn't run into issues where adjustments to the actual spacing throw the timing of a hibernation off.
```
if (!fMintableCoins) {
if (GetTime() - nMintableLastCheck > 1 * 60) // 1 minute check time
{
nMintableLastCheck = GetTime();
fMintableCoins = pwallet->MintableCoins();
}
}
MilliSleep(5000);
```
We come to this section of code in the waiting while loop; if we don't have mintable coins yet, or our wallet is locked, or we're not synched; or a host of other potential things that would prevent staking. However, we check again for mintable coins; and then we wait 5 seconds after that check before we come out.
Since the first time we come into this loop; we have already checked mintable coins (within the last 5 minutes); we should sleep first, and then do the check closer to the time we're actually going to go around the loop again; so we're working with the most recent data.
```
if (!fGenerateBitcoins && !fProofOfStake)
continue;
```
This check is buried in a `if (fProofOfStake)` conditional, where fProofOfStake is a parameter that is passed in by the caller to BitcoinMiner(). `!fProofOfStake` will never be true; so this condition will never be true. Removing it we are left with !fGenerateBitcoins; which is unrelated to this section of code anyway. If we're down to this point, we're not in PoW mode anymore, so there shouldn't be a mining thread (more on that later). But the most compelling part of this condition,whether it passes or not, is that it "continues" the while loop it's in; and since it's at the end of the actual while loop, it's going to iterate into another round of the while loop as soon as it finishes with this conditional anyway. Long story short; the code doesn't do anything.
_Overall logic_
The mining thread will run until mining is turned off (`setgenerate false`, or the mining flags taken off the invocation). However, there is no need to continue to mine with proof of work after the proof of stake phase begins. In fact, there really is no consideration of that at all; PoW will continue to try to generate blocks well after PoS has begun. Yes, it's within the users control to stop mining; but it's within the power of the code to take care of that for the user, and stop the mining thread(s) after the transition to proof of stake.
### **This PR:**
The logical issues above have been corrected. The dormancy for the proof of stake thread is held for just one block rather than any extreme hibernation. Combined with moving that code to be the first thing in the while loop; it also removes the processing done to search through the wallets looking for stakeable coins.
Since a significant amount of code assumes there will not be a transition from PoS to PoW; code was added to BitcoinMiner() to exit the mining threads if it's transitioned into the PoS phase. The threads will continue for a little bit, in case there is any rewind on the chain; but after 6 PoS blocks are accepted, the miner threads will exit.
To prevent the PoW thread from trying to generate blocks after the PoS phase has begun, logic was added in CreateNewBlockWithKey() to return quickly. Rather than create a situation where the mining thread ends up in a tight loop in the initial phases of PoS, the mining thread will be held for 1/2 of the target spacing before returning.
Lastly; Some tweaks were made to the logging; removing hardcoded references to "BitcoinMiner()", in case refactoring in the future changes the name of the routine. Similarly, since there is a log message when the mining thread starts "PIVXMiner started"; rather than reporting thread exits or errors as "ThreadBitcoinMiner", they have been changed to PIVXMiner to match.
Much of this can be observed with an errant `pivx-qt -gen`. With this PR, it simply tries to start the miner, and then exits.
_With PR code - `pivx-qt -gen -testnet`_
```
2019-07-21 20:04:22 PIVXMiner started
2019-07-21 20:04:22 BitcoinMiner: Exiting Proof of Work Mining Thread at height: 1160732
2019-07-21 20:04:22 PIVXMiner exiting
```
_Current release:_
```
2019-07-21 19:37:06 CreateNewBlock(): total size 1000
2019-07-21 19:37:06 ERROR: CheckProofOfWork() : hash doesn't match nBits
2019-07-21 19:37:06 ERROR: CheckBlockHeader() : proof of work failed
2019-07-21 19:37:06 ERROR: CheckBlock() : CheckBlockHeader failed
2019-07-21 19:37:06 CreateNewBlock() : TestBlockValidity failed
```
is repeated in a tight loop.
ACKs for top commit:
furszy:
ACK [b7a9a9c](https://github.com/PIVX-Project/PIVX/commit/b7a9a9cdb20cdee869906fb24e2bc984e8a93802)
random-zebra:
ACK https://github.com/PIVX-Project/PIVX/pull/958/commits/b7a9a9cdb20cdee869906fb24e2bc984e8a93802 and merging...
Tree-SHA512: 064619ce1fde75f1baf35ddb202b4573f2a8c0effc5d2939a678612e3f1d56b08d5c5d7c7bb30ce919e5a648f3f406cca35093b9a3a04c799f746fff5c6a35b6
* remove duplicate stake thread code
* add missing include
* remove zvitae pos validator
* Refine signblock code
* revert zerocoin added check
* Miner reference updates
* revert miner changes
* fix fundamentalnode sync checker
* [Refactor] Move rpc files to its own folder
* update includes
* fix rpcserver include to rpc/server.h
* [Refactor] Move wallet files to wallet dir
* [Trivial] Fix db.h path
* Merge #982: [Miner] Don't create new keys when generating PoS blocks
74e7fc7d432c7f6d586d54ff276d6babad0fe505 [Miner] Don't create new keys when generating PoS blocks (random-zebra)
Pull request description:
This fixes the calls to `CreateNewBlockWithKey` with PoS blocks, which are not needed.
We simply call `CreateNewBlock` with an empy script for coinbase.
It should prevent the problem described in https://github.com/PIVX-Project/PIVX/pull/956#issuecomment-520166966
ACKs for top commit:
CaveSpectre11:
utACK https://github.com/PIVX-Project/PIVX/pull/982/commits/74e7fc7d432c7f6d586d54ff276d6babad0fe505
akshaynexus:
utACK https://github.com/PIVX-Project/PIVX/commit/74e7fc7d432c7f6d586d54ff276d6babad0fe505
furszy:
utACK [74e7fc7](https://github.com/PIVX-Project/PIVX/pull/982/commits/74e7fc7d432c7f6d586d54ff276d6babad0fe505)
Warrows:
Pretty straightforward indeed, utACK 74e7fc7
Tree-SHA512: bcb9752a689a058b6c33317136d16afd694b5da66c69cdd32a8b89b71059c5b2c5dc20c88045c52429fae99d45f508ea223f1b7d1afa5db3c77eb59befd48d51
* Merge #549: [Crypto] Switch to libsecp256k1 signature verification and update the lib
f10439c [Crypto] Add ctx initialisation for bip38 (warrows)
21234db [Crypto] Bring back function CKey.SetPrivKey for zPIV (warrows)
65e009a [Tests] Add new auto generated script tests (warrows)
6839f3b [Crypto] Switch from openssl to secp256k1 for consensus (warrows)
8a901f9 Squashed 'src/secp256k1/' content from commit 452d8e4d2 (warrows)
d98a584 [Refactor] Delete secp256k1 folder for subtreefication (warrows)
Tree-SHA512: f0f6777be57777ba86f83af1b891a6c0f384e6b059afc9249599269c71e5d3bf46a6498325488878af71b6685c6dac6cb672d0147c2ebf43b36f6d786fc38a10
* fix keystore refs
* update libscepk265k1
* [RPC/REST] Migrate to libevent based httpd server
* fix mempooltojson and misc erroros
* Merge #769: [Main] Unify shutdown proceedure in init rather than per-app
518542f [Main] Unify shutdown proceedure in init rather than per-app (Fuzzbawls)
Tree-SHA512: 6e734ce002e236c3c2c59c2e8e93d87f5fe577b3f5546804b117a71255266cc4012d847d6a1d9b019a7b763124b45987c2dc3f95294670489cac269beceb2e3a
* Merge #542: [Network] Remove vfReachable and modify IsReachable to only use vfLimited.
38ed737 Remove vfReachable and modify IsReachable to only use vfLimited. (Patrick Strateman)
Tree-SHA512: 8aa61f9abd8356522f3ba71b35497aac07e10333a39ff4b98bb635d1246e6b1be6b0ee0b236944fbfaa558af0e6c0cc219e540eacb2232bc05db393e4a72b088
* [Refactor] Refactor bignum header file into several files
* [zerocoin] Free memory from ToString()
Simple fix for a minor memory leak
* Revert "[Refactor] Refactor bignum header file into several files"
This reverts commit c9aa98fe451e27d2bb4564747ffb0768cce56d53.
* fix delay in mining blocks
* Vitaefy Debian Docs
* Fix error when trying to stop mining process (#41)
* Give error if pow phase is finished
* Force Sync to allow for staking without mnsync
* Fix error
* Update rpcmisc.cpp
* Update rpcmisc.cpp
* more ignore
* Update fundamentalnode-sync.cpp
* Add gitian build python script
* Update Univalue
* add missing gencpp
* Add missing includes
* Fix Gitian build
Update Univalue
add missing gencpp
Add missing includes
* Revert "Update fundamentalnode-sync.cpp"
This reverts commit 323b13fc599b03982b0ca7c3f32342537a6b992f
* Fix gitian build and minor updates
* remove forcesync
* [Model] Invalid iterator position crash fix.
* background loading crash fixed.
* random: fix crash on some 64bit platforms
rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash
in particular, it was holding a stack canary which was not properly restored
after the cpuid.
Split out the x86+PIC case so that x86_64 doesn't have to worry about it.
* random: Add fallback if getrandom syscall not available
If the code was compiled with newer (>=3.17) kernel headers but executed
on a system without the system call, every use of random would crash the
program. Add a fallback for that case.
* Don't assert if we were beaten to the block
A timing window exists where a wallet could be creating a new block from within the miner thread when a new block is received to the wallet. This window will create a situation where TestBlockValidity() fails because the chain tip has changed between the time it created the new block and the time it tested the validity of the block.
This situation would result in the wallet being asserted; however this is a little overkill. rather than asserting if the tip has changed, it is better to throw the block away.
This problem was revealed during a testnet test of an altcoin, and very prevalent when multiple wallet existed with the exact same number of staking coins received in the same transaction; or when multiple wallets were staking the same coins via import private key. The problem happens significantly less in more normal circumstances, but was still observed in a testing environment with fast blocks.
It is likely that this scenario has been encountered but never determined to be root cause, as a crashed wallet could be restarted, re-indexed and never investigated further.
* [Wallet] Add some LOCK to avoid crash
Github-Pull: #625
Rebased-From: ed23d0d62054156e0c2cb632fecbd65588c50e8c
* testnet mining fixes
* fix placement of utxo signer
* dont sign twice
* prevent logging twice
* random files updates
* Add Chacha20 crypto files
* Merge #643: [Crypto] Use stronger rand for key generation
b7dda924cfc2405386968b0eaa32aa0e546f322c [Log] Replace a string by the function name in a log (warrows)
977f089d0d2883ca3ca1648b14423b738c9248ef [Refactor] Use arrays instead of unic vars in Chacha20 (warrows)
d8abe323bd4f5cff3ca23fc00f0093ab7b143ead [Random] Add a missing include (warrows)
27663b8f16dfaac75bae1ab0e4a0c465b838c826 Do not permit copying FastRandomContexts (Pieter Wuille)
64e03e6de1a65c8d934d8df65af48e2b92bf887a Bugfix: randbytes should seed when needed (non reachable issue) (Pieter Wuille)
e8f12aa3621e98588b82533edb56ed4865645862 Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
de85c7ae55681f8a9d322f4c48c6e9ba15ee0cf1 Add attribute [[noreturn]] (C++11) to functions that will not return (practicalswift)
df46c7ff5a2e6a71ba636fa39d77f58e018816a6 Fix resource leak (Dag Robole)
d426d856d23fe6c5d6ef3d57fe2c420b9a8e4e5e Clarify entropy source (Pieter Wuille)
30a320b3d12d3529dfca1daae0e477d76acd9ae7 Use cpuid intrinsics instead of asm code (Pieter Wuille)
0c21204e6dc714de6b917d9de12b1029d0bfb67b random: fix crash on some 64bit platforms (Cory Fields)
b8bbb9c68d996b1bea579956b3c91872d6d94b8f Use rdrand as entropy source on supported platforms (Pieter Wuille)
8e19443e41f748ad54d0f8aa25907bdad0815c19 [Tests] Fix compilation (warrows)
f53edec73901a91a6c4f595b248e4058e8be5468 [Rand/test] scripted-diff: Use new naming style for insecure_rand* functions (warrows)
272f3a5ac83ba0ab72a799ce524b6605b3555751 [Random / tests] scripted-diff: Use randbits/bool instead of randrange (warrows)
0173ee3332990ac1eea134cca5c21cc451b81d92 Replace rand() & ((1 << N) - 1) with randbits(N) (Pieter Wuille)
250de7426e8317f86fc25fe60e960c2e9e903b69 Replace more rand() % NUM by randranges (Pieter Wuille)
d6904136030d94e844074fb75b9cafda46253ce0 [Random / tests] scripted-diff: use insecure_rand256/randrange more (warrows)
4a811ff9542439d43e3df3460114d9a24f849a36 Merge test_random.h into test_bitcoin.h (Pieter Wuille)
f275e638bf0a752d9f231f2e4a781432deafbfe8 Add various insecure_rand wrappers for tests (Pieter Wuille)
602af4fb3ef45a2a821f1b76d0dbd418ec852683 Add FastRandomContext::rand256() and ::randbytes() (Pieter Wuille)
90549785824f4c13ee8cf36e77f737b5d89d0f02 Add perf counter data to GetStrongRandBytes state in scheduler (Matt Corallo)
17dd13e746b567f44015fbefaa634b278010fccf Add internal method to add new random data to our internal RNG state (Matt Corallo)
c7a1602879aff2ae72bdefe959d4026ee8c0aefc Use sanity check timestamps as entropy (Pieter Wuille)
f671fe99994cb220dede903459307c61475aeef8 Test that GetPerformanceCounter() increments (Pieter Wuille)
dcb536fb2cef719abef9bb4104242410987bfd3d Use hardware timestamps in RNG seeding (Pieter Wuille)
7c3f290b50d32a3290a2c49542d72a3a7466da58 [Random] Fix compilation (warrows)
22b78957cc90252c958bc66439c098001d47b8fc random: only use getentropy on openbsd (Cory Fields)
e5750e5c9831edf01026643deed249e0efb28f0b Add a FastRandomContext::randrange and use it (Pieter Wuille)
2a0f6cd1ca2224e2ba30aea4ab312a1919dedc0c Switch FastRandomContext to ChaCha20 (Pieter Wuille)
401ca7db468939184681b73f4b346aebcfc378c6 Introduce FastRandomContext::randbool() (Pieter Wuille)
3d056d6ed478c5bbd42d7dde4f1ab0a75ffd42b1 Add ChaCha20 (Pieter Wuille)
3c97f3f2cb1b3dc2f5d642877d9a2de0a85c06bf Kill insecure_random and associated global state (Wladimir J. van der Laan)
68ba16c78593bf221844dae95fc5edacbf69ba62 Maintain state across GetStrongRandBytes calls (Pieter Wuille)
c3c399e199c2d25d10e782dca2ef17f55b6939d0 random: Add fallback if getrandom syscall not available (Wladimir J. van der Laan)
7a8111f915fc7ed23aaec86cd95904bf5d5972fd sanity: Move OS random to sanity check function (Wladimir J. van der Laan)
387c2e9574b56ae941b7723c561ed39488891782 squashme: comment that NUM_OS_RANDOM_BYTES should not be changed lightly (Wladimir J. van der Laan)
9e8c266b158c26b361d68a3cccdbcfd7bee0b376 util: Specific GetOSRandom for Linux/FreeBSD/OpenBSD (Wladimir J. van der Laan)
f989b865f2…
KolbyML
pushed a commit
to KolbyML/bitcoin
that referenced
this pull request
Sep 4, 2020
* Updated from PIVX v3.1.1 (bitcoin#49) * Merge bitcoin#524: Add blocksizenotify command 44e4d2e Add blocksizenotify command (Jeremy) Tree-SHA512: 0deb5a883c5d52d0b4e4681fd5ea6c845363ede4299bb59f10a22b23f00aff4e5bb62a7954b752d7d33db5a422ec169f60360868296aa833849cc3e35145250b * Merge bitcoin#528: Readme changes 42fa274 Readme changes (Sieres) Tree-SHA512: d5112531283a9554fd6c01ba75bda532cf8cebffc98ea16e7432663f88a9fe1378ba40eb242e6daf8b1666ba1f276f885bdd7a4a8c3300a04cf855d2150749ec # Conflicts: # README.md * Merge bitcoin#518: [Wallet] Combine fees when possible and fix autocombine insufficient funds eb603b4 [Wallet] Fix autocombine (warrows) 3f9e746 [Wallet] Combine change to output when possible & provide it in autocombine (warrows) 10426c7 [Wallet] Increase fee margin to up to 10% of autocombine send (warrows) Tree-SHA512: e3452b0862b30c5c7f21697d12485e7b009dda3b4225e9685209425cb4a16baf35dd9d591b39ece077c3314f7c344f23b3810e5d0d840a8003c7d7d09f5c7ae4 # Conflicts: # src/wallet.cpp * Merge bitcoin#523: Give high priority to zerocoinspends to make it into the next block. 84a4f91 Give high priority to zerocoinspends to make it into the next block. (presstab) Tree-SHA512: d7bf91433a2059d8acc4b322dc21b98ca97af7e03d47a7225a8fe0ccb1265c625aaab758071d2b950b07b4d11814e1baca384c213c49215d976d7d9f323e3660 * Merge bitcoin#533: [Doc] Update OSX build notes: zmq, libevent, and notes to handle possible glibtoolize error fde9f94 osx build notes: libzmq -> zmq in brew install, add libevent (Tim Uy) Tree-SHA512: eb44a499c3f42da2a296161bc01be49cd63fbd928c513018010a564cd1192e1000beb1987d536f4ab93782cd2930527552108418e973448c80e6c5a59c2a78ef # Conflicts: # doc/build-osx.md * Merge bitcoin#532: [Depends] Update depends package versions. bc4ffd5 [Depends] Update depends package versions. (Fuzzbawls) Tree-SHA512: 814f769d65657e1bd02daca583dd5b63fc3ee9af53afcabeaafa661fe9e584c484ebfef7763a59d41ac81b4ade03a9d85d40b86b25ab873bf578cfe8063acdd6 # Conflicts: # depends/patches/zeromq/0001-fix-build-with-older-mingw64.patch * Merge bitcoin#538: [Qt] Fix warning dialog popup for the Blockchain Explorer 50088b8 [Qt] Fix warning dialog popup for the Blockchain Explorer (Fuzzbawls) Tree-SHA512: 5bef022ea6ebbe36dfd58ccc6e0c0b48a2f1268934f4fb0ec34100e05be38b325d0a832e650104b2e1e2741c9d118e7d9894e99dafeb2bf7b5a43f180e597fff # Conflicts: # src/qt/blockexplorer.cpp * Merge bitcoin#542: [Network] Remove vfReachable and modify IsReachable to only use vfLimited. 38ed737 Remove vfReachable and modify IsReachable to only use vfLimited. (Patrick Strateman) Tree-SHA512: 8aa61f9abd8356522f3ba71b35497aac07e10333a39ff4b98bb635d1246e6b1be6b0ee0b236944fbfaa558af0e6c0cc219e540eacb2232bc05db393e4a72b088 * Merge bitcoin#526: Refactor ConnectBlock() to segregate state tracking items 00cd668 Refactor ConnectBlock() to segregate state tracking items from the 'Just Check' section. (presstab) Tree-SHA512: 457019024cd8e786810611efb776dc16e12ed7cb71c9df79bc52d5cab9fe32d55cefaf1653d11e3d348b8008456c613c1fc5f17f53520de5c157a6cc861e8379 # Conflicts: # src/main.cpp * Rename coin name * Fixed compiling error * Merge bitcoin#535: [core] Minor refacturing + unused variable removed 7633516 [core] Minor refacturing + unused variable removed (Mrs-X) Tree-SHA512: aa43dec1f95b56bfd8ae51ec3ea8e1a23e6011262b39a2492b006802a9da7f52aec99afd3d4e4259067911557a986ba52e18838feb4c7b117345610c3234a16a * Merge bitcoin#543: [RPC] Segfault pivx-cli getinfo while loading block index 336e3d8 [RPC] Segfault pivx-cli getinfo while loading block index (Mrs-X) Tree-SHA512: 30bf65f7f527ba78bdcd0e2fef4da77f15a049f605a0cb3000b565c0e19e8dd274a137d1371435c0793617004591757b6b5e31029ed7a247d46bb6368cfec88b * Merge bitcoin#539: [RPC] Allow watchonly coins to be shown for listunspent c3671b5 Allow rpc listunspent to have options for watchonly transactions (blondfrogs) Tree-SHA512: 5c998c1c5d0da8c4245662e528cbee5f70855fb941baa82524610d6f52810df0a70b6c29677f3f666e33995bf823778a58b2cb3e7b4182a2c644f1b383ba8506 * Merge bitcoin#544: [Trivial] Add debug info for CWallet::ReconsiderZerocoins(). 993fcee Add debug info for CWallet::ReconsiderZerocoins(). (presstab) Tree-SHA512: 494803e04778eec487ae35e12efd2cf3b5acdc094c98913998563d8386d98142b7525d6703a41dabba10e5126041d56c6ddd61e2130ae6f439d23439b7c6ee2c * Merge bitcoin#552: [Trivial] Fix errant LogPrint in UpdateZPIVSupply 2d5aa5b [Trivial] Fix errant LogPrint in UpdateZPIVSupply (Fuzzbawls) Tree-SHA512: b514a5aaa04b573af991c2eec518db0593dedd26e917f6275d308719b83059728d51fb9f50b721011393f4a73412998f88315d0587008a1f0cb940a272df6ceb * Merge bitcoin#551: [Consensus] Require standard transactions for testnet d3c60aa [Consensus] Require standard transactions for testnet (Fuzzbawls) Tree-SHA512: ef0d1ed46623ce15d59f63f0c857fbdda7d9cf52825957f631548908cfe03d79f18b9fc5c7cfb01ff14e90b1a6e2f41e190bc64d7f4561a83b5ab2e287ef75a9 * Merge bitcoin#554: [Docs] Added release notes for autocombine and proxy GUI. 68e1a20 [Docs] Added release notes for autocombine and proxy GUI. (warrows) Tree-SHA512: 59baa3bfe46489c288cc06d4dc9d3fc5486c9d2de5e41574333f1ada5438a9087f754a0c33eabf6bfb92b91ec71ae60464db48b7bed27c00cf7fb683e6e86904 * Merge bitcoin#558: [Core] Remove Gitan-OSX warning for High Sierra builds 390e49b [Core] Remove Gitan-OSX warning for High Sierra builds (Mrs-X) Tree-SHA512: d914f13ff8f8b4d15334ba4aaea21fa43035489bb2c5932c168a6299095b4e85a9f1bd54cc85a287251956a24bfa384b1998ca051ebc4a75510e4568b891c3d8 * Merge bitcoin#447: [Consensus] Fix compilation with OpenSSL 1.1 094fa11 [Compilation] Add additional information to compile with unsupported SSL (warrows) 903c4f1 [Consensus] Allow for compilation with OpenSSL 1.1 (warrows) Tree-SHA512: 9c843279cb889e72bb44b019a7859510f4fe39f3a358f18c4d09a35a9bede1d940a07c2c3781f388fdab42bd0e5acd51160e5e0b07a33050e293214b3e4db0a4 * Merge bitcoin#559: [Bug] Segfault with -enableswifttx=0 / -enableswifttx=false 0bc66f3 [Bug] Segfault with -enableswifttx=0 / -enableswifttx=false (Mrs-X) Tree-SHA512: e71de283ae5708bc7f844ebc7d5cf2a62a2c3928d5164661d66ed0b770eccfa9f84cf69de3d7bdd1dee6160439d916563045dc7d5173e0d70e6c7ec51ac1cbb7 * Merge bitcoin#562: [Wallet/RPC] Add argument to mint zerocoin from specific UTXO a5123c2 [Documentation] Improve help for mintzerocoin rpc command (warrows) 9a0b734 [Wallet/RPC] Add argument to mint zerocoin from specific UTXO (warrows) Tree-SHA512: fb5056eb7d81e06b66ced7ea8e92f053a04c0ad71df0eb84a08180ced2edd4313c5fa15fde7345dd1d8f65b1c93480e141049a570abec9dd7c14ecb6f8cde0e3 # Conflicts: # src/rpcwallet.cpp * Merge bitcoin#568: [Qt] Connect automint icon to the UI automint setting change 28466e2 [Qt] connect automint icon to the UI automint setting change (warrows) Tree-SHA512: 1107b842a0d0a9a7044922a6c997b05fb030dc5e6014217f09e6b769ad685bd5b7bdc32699eb2b6514259d719bdef8bc89b2fe1dd5b59beb0c64185a00783501 * Merge bitcoin#571: [Qt] Update privacy tab info about zeromint on config change c0ffe24 [Qt] Update privacy tab info about zeromint on config change (warrows) Tree-SHA512: 54016bef392a010541d1ab3373a0144100dc0b99f3cfed804b395dc0ab08f60bb93c22b52decdfbbabd6e5e39ffcba1d80bd23a92fb9986c722062de1f47ddd7 * Merge bitcoin#570: [Wallet] Add a check on zPIV spend to avoid a segfault b8185ae [Wallet] Add a check on zPIV spend to avoid a segfault (warrows) Tree-SHA512: 960c0d06a5fc040e290be334224fd224cf78f698cc99e4db7b618f25085091e19b2e02d906114008bb2e6315d343a46960b5f1f817c5975ac46d62fe498a8843 * Merge bitcoin#572: [Qt] Refresh zPIV balance after resetting mints or spends 992763b [Qt] Refresh zPIV balance after resetting mints or spends (warrows) Tree-SHA512: bea53d1632e6410144613f4a83de3ed232dc21c05b5eb091b5f6dcde55f67057190708d3493b54a7b243a60c6701054bdc85239625c41d3d5a32c630192b4b54 * Staking zPiv. # Conflicts: # src/chainparams.cpp # src/kernel.cpp # src/main.cpp # src/main.h # src/miner.cpp # src/qt/forms/zpivcontroldialog.ui # src/qt/transactionrecord.cpp # src/qt/transactiontablemodel.cpp # src/wallet.cpp # src/wallet.h # src/walletdb.cpp * Fixed compiling error * Add libzerocoin::SpendType enum. This allows for more transaction types using zPIV, including using zPIV without actually spending it (for example if needing to show proof of zPIV for voting or for masternode collateral). * Validate that the correct spend type is used for zPIV spend and zPIV stake. * V2 zPIV must have serials that have the 1st byte as 00. Requiring that v2 zPIV use serials that have the first byte as 00 will make zPIV v2 serials unique from v1 serials. This prevents a 'serial troller' from reminting with someone elses v2 serial and simply changing the version flag to v1 when they spend the zerocoin, which would negate any of the additional v2 requirements. It is unlikely that many (if any) serials were minted with the first byte as 00. Note that if there are existing v1 zPIV with 00 prefixed serials, it would make them unspendable since the owner would not have an associated private key. * change to using first nibble as 0xF for v2 serial mark. * Switch to a new accumulator with the correct modulus. # Conflicts: # src/libzerocoin/Commitment.cpp # src/miner.cpp # src/wallet.cpp * Fixed compiling error * Change zpiv stake to use serial hash. # Conflicts: # src/init.cpp # src/qt/transactiontablemodel.cpp # src/wallet.cpp * Fixed compiling error * Add description for -pivstake= and -zpivstake=. * Make RPC export/import zerocoins compatible with v2. * [P2P] Update ActiveProtocol for 70913 protocol version # Conflicts: # src/main.cpp # src/version.h * [Wallet] Add missing variable to 2 AvailableCoins() calls This is mostly depreciated code since the removal of coinjoin style privacy (Obfuscation), but the missing boolean variable in these two calls was causing compiler warnings on newer versions of gcc for always evaluating to true. The use of a static `false` was taken from upstream DASH. * [zPIV] Adjust testnet v2 starting block * Fix coinbase check. Add override specifiers. Proper init for SetDec. * [Budget] Change finalization collateral to 5 PIV * Merge bitcoin#513: [core] Fix masternode broadcast for networks != MAINNET bc8be7c [core] Fix masternode broadcast for networks != MAINNET (update) (Mrs-X) Tree-SHA512: de1a713e166a45d26848d45d656ab36d68dc0d52810e0a66865c635442d4ac75a5602dbf39455b986356f17d3552e697607bb4464657b727ebaef0a8580f5657 # Conflicts: # src/activemasternode.cpp # src/masternode.cpp # src/masternode.h * implemented masternode_broadcast # Conflicts: # src/activemasternode.cpp # src/activemasternode.h # src/masternode.cpp # src/masternode.h # src/masternodeman.cpp # src/masternodeman.h # src/rpcserver.cpp # src/rpcserver.h * Updated fundamental node * broke up the RPC commands in create/decode/relay # Conflicts: # src/masternode.cpp # src/rpcserver.cpp # src/rpcserver.h * Updated fundamental node * restore protocolVersion (lowered for testing purposes) # Conflicts: # src/masternode.cpp * factor out GetStrMessage() - define MIN_PEER_MNANNOUNCE # Conflicts: # src/masternode.cpp # src/masternode.h * Updated fundamental node * use error() instead of LogPrintf() # Conflicts: # src/masternode.cpp * Style Changes - don't print masternode ip in the logs - join fHelp and wrong command clauses - use more descriptive names for pubkeys variables - change "result" to "success" and make it a boolean value - use array for resultsObj in createmasternode all - use lowercase for json objects - add detailed output example to decodemasternodebroadcast help - fix rpcserver.cpp indentation # Conflicts: # src/masternodeman.cpp # src/rpcserver.cpp * Updated fundamental node * [P2P] Add new spork key and handling logic - New spork key added - Sporks signed with the old key are valid until a pre-determined time - No NEW spork changes can be signed with the old key # Conflicts: # src/chainparams.cpp # src/spork.cpp * [Wallet] use GetTime() for nStartupTime `nStartupTime` is initalized before the P2P network initialization takes place, making the use of `GetAdjustedTime()` cause a lock ordering segfault under certain situations. * Clean up lockorder data of destroyed mutexes # Conflicts: # src/sync.h * Clean up apparent locking issues These locks address compiler warnings when compiling with clang's `-Wthread-safety-analysis` * Remove extra typedef This slipped in from some other testing i was doing, shouldn't be included yet. * [Build] Add missing files to src/Makefile.am These were left out, and break Travis/Gigian building due to them not being included in the dist tarball. * Load mint version based on serial parsing. * Fix typo in ban reason output * [RPC] Fix spork command input length Sporks are uint64, but the input variable was being parsed as an int, causing an out-of-range error for larger values. * [Qt] Show correct data for MN reward on a zPIV stake block * [Wallet] Stop removing spent zPIV hashes from map * [QT] Fix zPIV stake transaction record # Conflicts: # src/qt/transactionrecord.cpp * GetOldStrMessage() / GetNewStrMessage(): check against both # Conflicts: # src/masternode.cpp # src/masternode.h * Merge bitcoin#513: [core] Fix masternode broadcast for networks != MAINNET bc8be7c [core] Fix masternode broadcast for networks != MAINNET (update) (Mrs-X) Tree-SHA512: de1a713e166a45d26848d45d656ab36d68dc0d52810e0a66865c635442d4ac75a5602dbf39455b986356f17d3552e697607bb4464657b727ebaef0a8580f5657 # Conflicts: # src/activemasternode.cpp # src/masternode.cpp # src/masternode.h * Sign "old" strMessage before nBlockZerocoinV2 # Conflicts: # src/masternode.cpp * minor style change (replace 'LogPrintf'+'return false' with 'return error') # Conflicts: # src/masternode.cpp * Fix zPIV mint databasing. * [Budget] Finalization fixes # Conflicts: # src/masternode-budget.cpp * Working model for deterministic zPIV. Deterministic zPIV minting. Unit test added to zerocoin_implementation_tests.cpp. This deterministic generation model will likely be changed with further testing. Update mapSerialHashes each time SelectStakeCoins() is called. Better tracking of zPIV mint status updates. - Removed several walletdb ListMintedCoins reads and replaced them with iterating over the serialhashes map. - Disconnect block will now update a mint's status that is part of the disconnected block. - Shorten CTxIn.ToString() print out when it is a zerocoinspend. - Remove several stake logging items that were flagged with any debug type. - Use a larger mintpool of 20 mints which will be more likely to see any blockchain mints that are ours. - Refactor zPIVWallet::SyncWithChain() to not get stuck in an infinite loop. - Remove locking of cs_main on GetUnconfirmedZerocoinBalance() because it now loops over mapSerialHashes and does not grab any chain data. - LOCK cs_wallet in CreateCoinStake() once a stake has been found. - LOCK cs_main when generating accumulator witness. # Conflicts: # src/Makefile.am # src/init.cpp # src/wallet.cpp * Fixed compile error and coin name. * Add zpivTracker. Add mint maturity filtering. Directly add wallet transactions from zpiv found on IBD. Fix ResetZerocoins. Use pubcoin hashes for mintpool instead of CBigNum. CBigNum may be a bit slower to iterate. # Conflicts: # src/Makefile.am # src/init.cpp # src/wallet.h * Fixed compile error * Database mints generated by the mintpool. - Load all generated mints on initialization. Then remove mints from the mintpool that are already known. * Do not database zerocoinmint too early. - A mint should only be recorded when it is added to the blockchain, not when it is simply checked for validity. - Remove a database of zPIV spend that should not be done as well (it is done later in connectblock). * Check for existence of zpivTracker in ListMintedCoins(). * Use unique databasing for dzpiv and do not database private info. -Feed majority of zpiv read/write/update operations through zpivTracker. fix # Conflicts: # src/denomination_functions.cpp # src/main.cpp # src/qt/privacydialog.cpp # src/qt/zVitcontroldialog.cpp # src/wallet.cpp # src/wallet.h # src/walletdb.h # src/zvittracker.cpp * [Qt] Fix zPIV transactions details * [Core] Guard against a segfault in serialization * [GUI] Update GUI depending on SPORK_16 without restart # Conflicts: # src/qt/privacydialog.cpp * Fixed coin name * [Staking] Fix MintableCoins and fMintableCoins This fixes an edge case where `fMintableCoins` evaluates to `false` during initialization, which was causing an infinate loop in the staking thread. Also refactor `MintableCoins()` to allow for cases when PIV balance is 0 but zPIV balance is not (and wallet has eligible zPIV mints) # Conflicts: # src/miner.cpp * [Wallet] Fix GetImmatureZerocoinBalance need to use `GetUnconfirmedZerocoinBalance()` instead of `GetUnconfirmedBalance()` here. * [P2P] Guard CInv::ToString against unknown types * Fix parsing of QT transaction records on fresh import of seed. # Conflicts: # src/qt/transactionrecord.cpp * Fixed compile error * Correct confirmation count on qt transaction records. * Use 1 second GUI update time. * Handle generating witness from mint less than checkpointed value. * Fix segfault on chainparams. * Remove AddToWallet() from miner.cpp. * Remove uneeded lock on createcoinstake(). * Make zPiv wallet consistently use nCount as the last count used and remove comparison against nCountLastGenerated that resulted in adding to the mintpool every time the wallet got opened. # Conflicts: # src/zvitwallet.cpp * Make sure mints are added to zerocoinDB even when it is a zcspend. * Add -reindexzerocoin arg to wipe zerocoindb and reindex blockchain. # Conflicts: # src/init.cpp * Fix mature zPIV balance calculation Overview and Privacy tabs were missing the subtraction of unconfirmed zPIV in their calculation. # Conflicts: # src/qt/overviewpage.cpp * Don't exit early in ReconsiderZerocoins Only exit if **BOTH** listMints and listDMints are empty. * Fix timing inconsistency with mature/unconfirmed zpiv balances This fixes a timing issue where a zPIV mint that had not yet been included in a block was being incorrectly accounted for in the "Mature/Spendable/Available" balance until it was included in a block. Now, the new mint is correctly accounted as "Unconfirmed" right away. * Load only the mintpool for the current seed, prevent the generation of mints already in the mintpool, and prevent the zpivwallet count from being updated when an error occurs during zpiv minting. * Fix MintPool logprint. * Do not try to add all zpiv stakes on init. * Fix QT transaction record when staking zpiv that was not deterministic. - Also add full information about merkle tree to the WalletTx. # Conflicts: # src/qt/transactionrecord.cpp * zpivTracker better check for orphans. Also no redundant adding wtx's. * Remove balance check from CreateCoinStake(). * Use correct params for spend when checking serial in miner. * Fix checking if mint is in chain. * Fixed compile error * [Qt] Properly set involvesWatchAddress in the transaction record This prevents "the eye" from watching you when it shouldn't * [Qt] Fix mn reward showing as zPIV stake # Conflicts: # src/qt/transactionrecord.cpp * [Qt] Fix normal PIV transaction record amount * [Wallet] Fix compilation on windows * Encryption of zpiv seeds seed routed through wallet before db to be encrypted (if IsCrypted()) when crypting, the hash of the vMasterKey is used as nIV # Conflicts: # src/init.cpp # src/qt/multisigdialog.cpp # src/walletdb.cpp # src/walletdb.h # src/zvitwallet.cpp * Fixed compile error * [Qt] Fix another instance of a wayward eye # Conflicts: # src/qt/transactionrecord.cpp * [Budget] Add debug to find 'Couldn't find opReturn' error * [Budget] Fix 'Couldn't find opReturn' error 1 # Conflicts: # src/masternode-budget.cpp * Updated fundamental node * [Budget] Remove obsolete finalized budgets + better debug info * Updated fundamental node * [Budget] Add debug info to CBudgetManager::IsTransactionValid() * Updated fundamental node * [Budget] Add debug info to CFinalizedBudget::IsTransactionValid() * Updated fundamental node * Mark orphan zPIV stake input as not used. Change listMints() to std::set. Add mapPendingSpends to track spends. -Change to set to reduce BigO complexity. -add mapPendingSpends to keep track of spends that were made so that they do not get considered as falsly marked as not used while they are in the mempool. Check mempool for pending spends. # Conflicts: # src/miner.cpp # src/qt/privacydialog.cpp # src/qt/zVitcontroldialog.cpp * Fixed compile error * [RPC] Fix clang error with vMintsToFind * Handle zPIV seed db transition. # Conflicts: # src/walletdb.cpp # src/walletdb.h * Fixed compile error * [Qt] Fix zPIV spend's nCount Actually increment `nCount` in the loop when displaying the transaction details so it doesn't stay at `0`. * Require v1 zPIV to use security level 100. * More description for spend that fails without using zpiv control dialog. # Conflicts: # src/wallet.h * Fixed compile error * Add better help text to all zerocoin related RPC commands Each command now includes the following: - Numbered arguments (if any) - Result example - Sample call execution `listzerocoinamounts` was also changed to return propper JSON # Conflicts: # src/rpcwallet.cpp * Fixed compile error * Make all RPC commands use the same styling format Added some missing help output, used EnsureWalletIsLocked where applicable (more in the next commit), and improved code readability for the help sections for each command. # Conflicts: # src/rpcdump.cpp # src/rpcmisc.cpp # src/rpcwallet.cpp * Teach EnsureWalletIsUnlocked() to accept unlock for anon only Add an optional bool paramater to `EnsureWalletIsUnlocked()` that defaults to `false` (current bahavior). If passed `true`, then only require a partial unlock. * [Staking] Fix Stake Split Threshold for PIV staking This reintroduces the calculation on wither or not the wallet should "split" the PIV stake input. Note: zPIV staking never splits, and it shouldn't. * [tests] Fix zPIV determinism test * Make zpiv unarchiving work with zpivtracker. * [Budget] Fix double-payment issue and replace "zPiv" by "zPIV" strings # Conflicts: # src/init.cpp # src/libzerocoin/Denominations.cpp # src/main.cpp # src/masternode-budget.cpp # src/miner.cpp # src/qt/forms/privacydialog.ui # src/qt/pivxstrings.cpp # src/qt/privacydialog.cpp # src/qt/transactiontablemodel.cpp # src/qt/transactionview.cpp # src/rpcwallet.cpp # src/wallet.cpp * Updated fundamental node * [Budget] Additional log for Budget debugging # Conflicts: # src/masternode-budget.cpp * Updated fundamental node * [Crypto] Bignum getcompact return correct result * [Crypto] Remove BigNum constructor implicitly calling SetHex * [Crypto] Fix %= and /= bignum operators * [Crypto] minor changes on BigNum uses * dzpivstate RPC call. Displays state of deterministic zpiv wallet. * Do not archive zpiv orphans on IDB. - Do not archive zpiv orphans on IDB. This should handle most problems with zpiv being archived when resyncing. - Speed up CzPIVWallet::SyncWithChain() by reducing calls to GetTransaction(). - Speed up CzPIVWallet::SyncWithChain() by adding a LOCK(cs_main). - Do not remove mints from the mint pool from init, let the syncing process do it naturally. * Make sure that mintpool checks all mints. * Readd zPIV tx's during -zapwallettxs # Conflicts: # src/init.cpp * Fix segfault on importzerocoins RPC. * More efficient scanning during zapwallettxes. # Conflicts: # src/init.cpp * Add multithreading to RPC searchdzpiv. * Save searched dzpiv to DB. Less verbosity. * [Budget] Improved double-payment-handling. # Conflicts: # src/masternode-budget.cpp * Updated fundamental node * [Wallet] Fix ListMints when returning only unused mints Needed to move up the logic/checks for filtering out unused mints to get a propper output with `exportzerocoins false`. * custom wallet backup paths # Conflicts: # src/wallet.cpp * Fixed compile error * Fix first run initialization of zwallet with encrypted wallet.dat file When running the client with a `wallet.dat` file that has never initialized it's zwallet or dzPIV, there is an incorrect code pathway that leads to the dzPIV seed hash never being written to the wallet file. Instead, we copy the seed generation code into `crypter.cpp` which will allow for proper dzPIV seed generation upon first unlock. * Use smart pointers to keep better track of memory. - Convert the raw ptr to zpivTracker in CWallet to unique_ptr. - Change the CheckProofOfStake() process to use unique_ptr. * [Fix] fix translation build error # Conflicts: # src/qt/walletmodel.cpp * Do not rely on chainActive with contextual checks. This can lead to situations of rejecting valid blocks that are from a competing fork. * Use unique_ptr for stake input list. * [Wallet] Refactor ListMints to more quickly detect orphan/failed stakes * [Staking] Exit CreateCoinStake loop if wallet locked/shutdown If the wallet gets locked or a shutdown is requested in the middle of the stakeinput loop, there is no sense in continuing. * [Output] Log network message receives as "net" debug category These messages spam the log constantly and should be classified in the "net" debug category instead of uncategorized. * Remove/replace logging that is not necessary. * [Budget] Handling of too few votes for finalized budget fixed * Updated fundamental node * Fix compilation * Add minimum zPIV maturity consideration to GetMintMaturityHeight(). The zPIV should not be considered mature unless it has 1 mint that occured after it AND the mint is at least two checkpoints deep. * Factor out components of ListMints() so that it is more legible. * Simplify and document -custombackupthreshold Also move -backuppath and -zpivbackuppath to more appropriate areas in the help output. # Conflicts: # src/init.cpp * Cleanup log spam & add additional check to archive zpiv stake orphans. My log was showing stake orphans getting stuck with the message "Found orphanded mint txid=.....". This is supposed to ignore it for the existing iteration and then clean it up next time ListMints() is called. This was not happening to stake transactions, so logic is added to archive the mint if it is coinstake. * [Budget] Spread out voting on finalized budget for testnet also. # Conflicts: # src/masternode-budget.cpp * Updated fundamental node * Display -backuppath, -zpivbackuppath, -custombackupthreshold in wallet repair menu also fix segfault when permission denied since trying to create directories before checking permissions * Guard against non-integer input for GUI's custombackupthreshold * [Core] Initialzed seed for rand() (trivial change) * Change spork key validity period. Minor spork code refactor. * Merge bitcoin#583: [Docs] Update release notes for v3.1.0 53fc2dd [Docs] Update release notes for v3.1.0 (Fuzzbawls) Tree-SHA512: 2df4411b3376aea24956f8c3e602bece66c92f6f74488bb5a22005bfaa7fab272a93417a76c520aae26a29dd2714270b73f72f3e7922377410a870ee68669c1b # Conflicts: # doc/release-notes.md * Merge bitcoin#584: [Doc] Update to zPIV staking and Thank you's e46e49b Update to zPIV staking and Thank you's (Sieres) Tree-SHA512: 21a43784106ea774e362c2b7d0ca7c1dfb8cb28460a9d7b56057c8becb68599b263510e6f838c441cef13835b722af49c497707b02c80f874432f8c5e7c2e8a6 # Conflicts: # doc/release-notes.md * PIVX Core v3.1.0 # Conflicts: # configure.ac * [Bug] Fix CMasternodeConfig::read rebase from upstream. Windows doesn't initialize CService properly during startup before the masternode.conf file is read. # Conflicts: # src/masternodeconfig.cpp * Updated fundamental node * Fixed compile error * Bump version to 3.1.0.1 Bugfix for Windows MN Controllers * Merge bitcoin#593: 3.1.0.2 backport 43f6f1b Add unit test for budget value. (presstab) 9ee7d98 Update protocol to 70914. (presstab) ebc4527 [Budget] Fix wrong budget amount (Mrs-X) Tree-SHA512: 6d813ee5e9cc548ffd8b3c816f669a9b79a6b8118de73941fd3fc6d7be46ae2dbfa935d94d1b62c32c1700165ad5a637f87eeaa8cd36927d4d281193b9c84ada # Conflicts: # src/version.h * Bump version to 3.1.0.2 * Bump to 3.1.0.3 one-line change for `listtransactions`, this won't be a full release with gitian builds, but a tag that exchanges/services can use as a fixed-point reference if they need `listtransactions` compatibility. * Merge bitcoin#584: [Doc] Update to zPIV staking and Thank you's e46e49b Update to zPIV staking and Thank you's (Sieres) Tree-SHA512: 21a43784106ea774e362c2b7d0ca7c1dfb8cb28460a9d7b56057c8becb68599b263510e6f838c441cef13835b722af49c497707b02c80f874432f8c5e7c2e8a6 # Conflicts: # doc/release-notes.md * Merge bitcoin#585: [Doc] Change aarch assert sign output folder a810714 [Doc] Change aarch assert sign output folder (Warrows) Tree-SHA512: 1b454a87f526ec8edf96f28952f4dccce444bbedd7512a21188d155ab5e57e494d8306529eccc0a280417895dc0e4b7718a233b883cfcffd84fd89f5c9d4e280 # Conflicts: # doc/release-process.md * Merge bitcoin#595: [Tests] Fix chain ordering in budget tests 3a6b152 [Tests] Fix chain ordering in budget tests (Fuzzbawls) Tree-SHA512: c94c7511d088bffc9568045b48b5fac8f10cceb4561e1d3a58fda3cb64227aee163280e9ad553157b206bd36257f516c34c697e8df4eeea153ffc8a44753a17a * Merge bitcoin#596: [Build] Bump master to 3.1.99 5d73f63 [Build] Bump master to 3.1.99 (Fuzzbawls) Tree-SHA512: 7d421685e1f3b90dfc4f536b679436f0d8bbd82614996aa7e76541ff9ad572e729063fb699d70778ea3f4acb2576713ebd3bbb49966d8e82a79945723419b256 # Conflicts: # configure.ac # contrib/gitian-descriptors/gitian-aarch64.yml # contrib/gitian-descriptors/gitian-linux.yml # contrib/gitian-descriptors/gitian-osx.yml # contrib/gitian-descriptors/gitian-win.yml * Merge bitcoin#597: [Wallet] Write new transactions to wtxOrdered properly b2fdbbf [Wallet] Write new transactions to wtxOrdered properly (Fuzzbawls) Tree-SHA512: b0bd54c9bd7fb44c18d7d4d84213b96b48dc22b35825c0a0f268b3f99086e8beeea7de5aed07cc575ee7dae0ce095e0438eb7e89454bae54551478ea5f81661d * [Refactor] Delete secp256k1 folder for subtreefication # Conflicts: # src/secp256k1/.gitignore # src/secp256k1/.travis.yml # src/secp256k1/COPYING # src/secp256k1/Makefile.am # src/secp256k1/README.md # src/secp256k1/TODO # src/secp256k1/configure.ac # src/secp256k1/include/secp256k1.h # src/secp256k1/libsecp256k1.pc.in # src/secp256k1/obj/.gitignore # src/secp256k1/src/bench_inv.c # src/secp256k1/src/bench_sign.c # src/secp256k1/src/bench_verify.c # src/secp256k1/src/ecdsa.h # src/secp256k1/src/ecdsa_impl.h # src/secp256k1/src/eckey.h # src/secp256k1/src/eckey_impl.h # src/secp256k1/src/ecmult.h # src/secp256k1/src/ecmult_gen.h # src/secp256k1/src/ecmult_gen_impl.h # src/secp256k1/src/ecmult_impl.h # src/secp256k1/src/field.h # src/secp256k1/src/field_10x26.h # src/secp256k1/src/field_10x26_impl.h # src/secp256k1/src/field_5x52.h # src/secp256k1/src/field_5x52_asm.asm # src/secp256k1/src/field_5x52_asm_impl.h # src/secp256k1/src/field_5x52_impl.h # src/secp256k1/src/field_5x52_int128_impl.h # src/secp256k1/src/field_gmp.h # src/secp256k1/src/field_gmp_impl.h # src/secp256k1/src/field_impl.h # src/secp256k1/src/group.h # src/secp256k1/src/group_impl.h # src/secp256k1/src/java/org/bitcoin/NativeSecp256k1.java # src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.c # src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.h # src/secp256k1/src/num.h # src/secp256k1/src/num_gmp.h # src/secp256k1/src/num_gmp_impl.h # src/secp256k1/src/num_impl.h # src/secp256k1/src/scalar.h # src/secp256k1/src/scalar_4x64.h # src/secp256k1/src/scalar_4x64_impl.h # src/secp256k1/src/scalar_8x32.h # src/secp256k1/src/scalar_8x32_impl.h # src/secp256k1/src/scalar_impl.h # src/secp256k1/src/secp256k1.c # src/secp256k1/src/testrand.h # src/secp256k1/src/testrand_impl.h # src/secp256k1/src/tests.c # src/secp256k1/src/util.h * Merge commit '8a901f93d505af3516353837600fd71a0c53a692' as 'src/secp256k1' * [Crypto] Switch from openssl to secp256k1 for consensus [Refactoring] Moved and removed some stuff -Removed duplicated arith uint files -Removed unused variables -Move keystore impls to .cpp instead of .h -Removed useless function in key.cpp [Crypto] fix bip38 compilation for latest libsecp256k1 [Compilation] Change compilation and some code to use libsec instead of sslcrypto [Crypto] Update keys to comply with latest secp256k1 lib # Conflicts: # src/Makefile.am # src/arith_uint256.cpp # src/arith_uint256.h # src/eccryptoverify.cpp # src/eccryptoverify.h # src/ecwrapper.cpp # src/ecwrapper.h # src/key.cpp # src/key.h # src/pubkey.cpp # src/pubkey.h # src/uint512.h * [Tests] Add new auto generated script tests * [Crypto] Bring back function CKey.SetPrivKey for zPIV * Fixed compile error * [Crypto] Add ctx initialisation for bip38 * [Tests] Fix chain ordering in budget tests check testnet params first, then check mainnet so as to not interfere with subsequent unit tests that rely on mainnet params. Also clean up include ordering. Github-Pull: bitcoin#595 Rebased-From: 3a6b152 * Only enable/disable PrivacyDialog zPIV elements if needed. Currently the zPIV buttons are constantly updated to enabled or disabled even if they are already in the correct state. Github-Pull: bitcoin#600 Rebased-From: 2b76f31 # Conflicts: # src/qt/privacydialog.cpp * Fix spending for v1 zPIV created before block 1050020. The transition to v2 zPIV and reset of the accumulators caused blocks 1050000 - 1050010 to be accumulated twice. This was causing many v1 zPIV to not create valid witnesses. This problem is fixed by double accumulating blocks 1050000-1050010 when creating the witness. Github-Pull: bitcoin#603 Rebased-From: abee3d9 * Add getaccumulatorvalues RPC. Return the accumulator values associated with a particular block height. Github-Pull: bitcoin#603 Rebased-From: 8a6d425 * Remove log spam and ensure proper zpiv version is used. Github-Pull: bitcoin#603 Rebased-From: ccf6c77 # Conflicts: # src/wallet.cpp * [GUI] Fix wrongly displayed balance on Overview tab Github-Pull: bitcoin#598 Rebased-From: 6030877 # Conflicts: # src/qt/overviewpage.cpp * Fixed Multisend dialog to show settings properly Multisend will display a message if it has only been enabled for masternodes and if its enabled for both (Displaying this didnt work if multisend was only enabled for masternodes) Github-Pull: bitcoin#580 Rebased-From: 40baa7d # Conflicts: # src/qt/multisenddialog.cpp * Update multisenddialog.cpp Github-Pull: bitcoin#580 Rebased-From: 8dca829 # Conflicts: # src/qt/multisenddialog.cpp * [Build] Remove unnecessary BOOST dependency Github-Pull: bitcoin#605 Rebased-From: da3a6a5 * [Budget] Make sorting of finalized budgets deterministic Github-Pull: bitcoin#608 Rebased-From: 93e637f * Updated fundamental node * Remove zPIV code from main.cpp Github-Pull: bitcoin#609 Rebased-From: 873ef19 # Conflicts: # src/Makefile.am * Renamed zpivchain to zvitchain * Fixed compile error * [Output] Properly log reason(s) for increasing a peer's DoS score. Many of the MN related DoS checks had their log messages output only if the client was running in debug mode, leading to unexplained peer bans. Github-Pull: bitcoin#611 Rebased-From: fe14f5f # Conflicts: # src/masternode-budget.cpp # src/masternodeman.cpp * [Build] Make sure Boost headers are included for libzerocoin Custom boost locations not using pkg_config can result in a header include not being found when compiling the libzerocoin library. This quick fix ensures that the `BOOST_CPPFLAGS` are explicitely included. Github-Pull: bitcoin#622 Rebased-From: 811785c # Conflicts: # src/Makefile.am * Update zPIV stake set more frequently. Github-Pull: bitcoin#617 Rebased-From: 355e2d3 * Lower stake hashdrift to 30 seconds. Lower the hash drift which should reduce the amount of orphans. Github-Pull: bitcoin#617 Rebased-From: 4c862f2 * [UI] Remove useless help button from QT dialogs Github-Pull: bitcoin#629 Rebased-From: 4dc636c # Conflicts: # src/qt/askpassphrasedialog.cpp # src/qt/zVitcontroldialog.cpp * Merge bitcoin#521: [GUI] Make "For anonymization and staking only" checked by default 4e5b73e [GUI] Make "For anonymization and staking only" checked by default (Mrs-X) Tree-SHA512: 53d5aa663269efdb82cb2d8961f2eae4aebc03a6d96d15d990b357385584e365935f012eb9410b81de891a1d1ed75fbfe88937b2e87df12db148b1d6e3c015a5 # Conflicts: # src/qt/askpassphrasedialog.cpp # src/qt/masternodelist.cpp # src/qt/walletview.h * Fixed compile error * [Wallet] Add some LOCK to avoid crash Github-Pull: bitcoin#625 Rebased-From: ed23d0d * [Qt] Show progress percent for zpiv reindex operations `-reindexaccumulators` and `-reindexzerocoin` can take a considerable time to complete depending on system hardware. Lets show a progress percent similar to `VerifyDB()` on the splashscreen. Github-Pull: bitcoin#612 Rebased-From: 48e502a # Conflicts: # src/main.cpp * Guard against division by zero for reindex zerocoin/accumulators in the event that the local chainActive is equal or below that of the relevant zerocoin block heights, there is nothing to do, so bypass the internal process. Github-Pull: bitcoin#612 Rebased-From: bed79e2 # Conflicts: # src/main.cpp * Move ReindexAccumulators() call to be inside parent conditional Not much point in checking if the listAccCheckpointsNoDB list is empty outside of when the wallet is started using `-reindexaccumulators`, as it is always empty outside of that case. Github-Pull: bitcoin#612 Rebased-From: 5127486 # Conflicts: # src/init.cpp * [Travis] Add separate job to check doc/logprint/subtree Break out a new job to do the basic linting that check-dock.py and logprint-scanner.py did. Also add new scripts to check the sanity of any git subtrees and to check that new pull requests don't contain any trailing whitespace. Also, remove the outdated slack notification callback Github-Pull: bitcoin#639 Rebased-From: 6f695b5 # Conflicts: # .travis.yml * [Main] Write to the zerocoinDB in batches instead of using a separate write operation for each and every bit of data that needs to be flushed to disk, utilize leveldb's batch writing capability. Github-Pull: bitcoin#636 Rebased-From: cd672cd * Remove unnecessary whitespaces Github-Pull: bitcoin#646 Rebased-From: a554259 # Conflicts: # src/qt/privacydialog.cpp * [Utils] Add copyright header to logprint-scanner.py Github-Pull: bitcoin#649 Rebased-From: 79d618f * [Doc] Change aarch assert sign output folder Github-Pull: bitcoin#585 Rebased-From: a810714 # Conflicts: # doc/release-process.md * Check whether tx is in chain in ContextualCheckZerocoinMint(). Github-Pull: bitcoin#610 Rebased-From: c4141aa * Merge bitcoin#651: [Doc] Release notes for v3.1.1 6bdef7a [Doc] Release notes for v3.1.1 (Fuzzbawls) Tree-SHA512: 8fb6c3ef52064b5542c5acdd2b93165fd2f1054b9e2ba607fcdfde3c5c4bbd6e6b8f05ac2fff53e97791c23be6366d60af1957e6e76786daecad591d3d4f8f9b # Conflicts: # doc/release-notes.md * Bump version to 3.1.1 # Conflicts: # configure.ac * Fixed coin name * Fixed coin name * Fixed coin name * Fixed coin name * Fixed coin name * Fixed coin name * Fixed wrongly replaced coin names * Update Nomenclature CzPIVWallet to CzVITWallet * More Nomenclature Fixes CzPIVWallet to CzVITTracker * Fixed compile error Co-authored-by: Mrs-X <Mrs-X@users.noreply.github.com> Co-authored-by: Fuzzbawls <fuzzbawls@gmail.com> Co-authored-by: presstab <presstab1337@gmail.com> Co-authored-by: gpdionisio <gianpiero.dionisio@protonmail.ch> Co-authored-by: warrows <warrows@gamer666.fr> Co-authored-by: Anthony Posselli <anthony@paddington.services> Co-authored-by: Warrows <Warrows@users.noreply.github.com> Co-authored-by: rejectedpromise <rejectedpromise@gmail.com> Co-authored-by: SHTDJ <36552562+SHTDJ@users.noreply.github.com> Co-authored-by: Crypto Pliskin <13294167+2a5A1Ghu1@users.noreply.github.com> * Fixed testnet * Update testnet spork key * Fixed travis error that caused by check-doc.py * Removed unused check in travis * Fixed travis error * Disabled some unit tests to pass travis * Disabled some unit tests to pass travis * Fixed missing bracket in rpcwallet.cpp from merge * Incremented version to v4.5.0 * Updated spork and zerocoin chain parameters * Incremented protocol and swapped protocol spork from 18 to 14 * Removed seesaw * Added spork for enabling removal of seesaw reward algorithm * Added spork for enabling removal of seesaw reward algorithm & updated spork parameters * Updated DNS and fixed seeds * Updated DNS and fixed seeds * Updated spork parameters * Adjusted spork parameters * Fixes for OSX builds on newer OS versions * Updated release copyright year * Updated release-nodes.md * Updated macro name in blocksignature.h * Updated MIN_PEER_MNANNOUNCE protocol version * Fixed references to zerocoin spork * Fixed wrong balance displayed in overview * Removed unused function SliceHash * Fixed references to Spork 16 * Fixing compiler warning for rpcfundamentalnode.cpp * Updated macro names * Fixed naming for staking rewards * Fixed references to zVITAE * Fix FN Label There may be some compatability issues with this fix and upstream. * Added checkpoint * Added checkpoint * Updated release-notes.md * Reject blocks that have no previous block * Adding const to exception catching * Set AA_EnableHighDpiScaling attribute early * Updated VITAE copyright string * Fixed wrongly removed code about mapStakeSpent * [Wallet] Increase valid range for automint percentage * [Docs] OSX Build - Instructions on how to make the Homebrew OpenSSL headers visible * [Qt] Remove Growl support Growl hasn't been free nor needed for many years. MacOS versions since 10.8 have the OS notification center, which is still supported after this. * [Qt] Add Tor service icon to status bar Tor Icon is displayed when the client is initialized with a successful tor service connection. Icon is hidden otherwise. * Updated naming for zvitaebackuppath * Updated exception to const in rpcwallet.cpp * Updated spork key dates for testnet * Added checkpoint Co-authored-by: Wang Qi <wqking@users.noreply.github.com> Co-authored-by: Mrs-X <Mrs-X@users.noreply.github.com> Co-authored-by: Fuzzbawls <fuzzbawls@gmail.com> Co-authored-by: presstab <presstab1337@gmail.com> Co-authored-by: gpdionisio <gianpiero.dionisio@protonmail.ch> Co-authored-by: warrows <warrows@gamer666.fr> Co-authored-by: Anthony Posselli <anthony@paddington.services> Co-authored-by: Warrows <Warrows@users.noreply.github.com> Co-authored-by: rejectedpromise <rejectedpromise@gmail.com> Co-authored-by: SHTDJ <36552562+SHTDJ@users.noreply.github.com> Co-authored-by: Crypto Pliskin <13294167+2a5A1Ghu1@users.noreply.github.com> Co-authored-by: wqking <wqking@outlook.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.