PR #174 conflictions fix #193
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
Another removal of boost dependency as well as fixing up some `-Wthread-safety-analysis` issues.
Code to avoid calling Perfmon too often is only needed when perfmon is actually going to get called. This is not intended to make any functional difference in the addition of entropy to the random pool.
No need to define it for every CAddress, as it's memory only anyway.
[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
With C++11 these functions are not needed anymore and gracefully replaced
The zerocoin database should be wiped on reindex. If leftover information from a fork is left in the db it can lead to potential validation issues in the future and isolated forks.
rebase from upstream. Windows doesn't initialize CService properly during startup before the masternode.conf file is read.
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.
Tor Icon is displayed when the client is initialized with a successful tor service connection. Icon is hidden otherwise.
Instead of using boost::lexical_cast we can just use std::to_string
Use proper include ordering and only include the needed QStyle header.
Also use proper define in header file
Locked balances were being double counted in the total and available values. This fixes the issue once and for all. fixes PIVX-Project#654
caea417 Update QT to 5.9.7 (cevap) Tree-SHA512: 34197e7b92711f3f0392b071de58900592ab8bb2ed3e50cd853cf2da56ba2f6d9b3ee57e4d01f3c2cdce4710ebe0c079bba434263b9af65141363086b9213025
…ith gitian f6c1d4a Add check symbols for gitian-linux.yml (cevap) 4a3d3ea Use pivx in config lines (cevap) 321f0e0 Update linux descriptor (cevap) 4e0244b Update symbol check script (cevap) c251de5 Update glibc_compat.cpp with risc (cevap) fb0bdae Gitian: add risc build (cevap) Tree-SHA512: f91fa1da9c48e3ccb87cb1ddd825d353a15e439b778bd95eb53f22b8884ecb1ddda954a506553dbb8322e931d1b8b34211e1dc7e4b431eafa107d81bdd8e6faa
Addresses https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6250 Signed-off-by: cevap <dev@i2pmail.org>
Github-Pull: PIVX-Project#858 Rebased-From: 21f5078
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
Also for libsecp256k1 now that it has been updated
This changes the TravisCI behavior to use docker with a Bionic target. Provides consistency with gitian target.
…icts # Conflicts: # build-aux/m4/bitcoin_qt.m4 # configure.ac # depends/packages/qt.mk # src/Makefile.am # src/httpserver.cpp # src/init.cpp # src/kernel.cpp # src/keystore.cpp # src/main.cpp # src/masternodeconfig.cpp # src/phored.cpp # src/qt/macdockiconhandler.mm # src/qt/phore.cpp # src/qt/proposallist.cpp # src/rpc/blockchain.cpp # src/rpc/budget.cpp # src/rpc/client.cpp # src/rpc/masternode-budget.cpp # src/rpc/masternode.cpp # src/rpc/mining.cpp # src/rpc/misc.cpp # src/rpc/net.cpp # src/rpc/protocol.cpp # src/rpc/rawtransaction.cpp # src/rpc/server.cpp # src/rpc/server.h # src/rpcmasternode-budget.cpp # src/script/sigcache.cpp # src/sync.cpp # src/sync.h # src/wallet/wallet.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is based on PR #174. This solves all the merge conflicts, and it's able to be merged to branch master or airdrop.