Merge develop 0.12.3.1 into master #2159
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
… potentially referencing c36ea69 [wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call. (Karl-Johan Alm) Tree-SHA512: a14c9f3e1228bca91977bea821c56a377d80889b41d250050c9be67aa93e460319a7cf1d4b63ee40f23b5a34159590f0e3fe15dc88698dc694c0c8098bd2db4d
…ys/values 6c914ac [wallet] Securely erase potentially sensitive keys/values (Thomas Snider) Tree-SHA512: 071d88c4093108d4e4eced35a6ffcebe3f499798194f5b1be661ffa5b78b5f55311667f6d2a72758d85290f61f958381ee95d380b9045ca18e9e1875f0e686c8
661caf8 [doc] Minor corrections to osx dependencies (fanquake) Tree-SHA512: 61451807d6208002550d2e37d26094a5515b11daacab39eb508b6168eebcea86f93dcc7f853aab490baec3727740c90d404c481e11b3d03dcea9f76f8fc7be12
…wallet by default afc693d contrib/init/bitcoind.openrcconf: Don't disable wallet by default (Luke Dashjr) Tree-SHA512: 1763a9e91788485b079b96239cf09f1557b338e5045aa4ffbad3908f88c4e362b9b5d86a8a0f33734899de244e76e7ced02a6be8e52b3fb69258a5101d6445ef
dd07068 Fixed typo in documentation for merkleblock.h (Mikerah) Tree-SHA512: 92655c8022eb33852c116da517b12bd17b3b668713cd85fe185a15245ea9810605626b1d0955fa117f7b56863e0a52b3a86dab42409332452b5eb72a7d34f30d
3503716 Trivial: remove extra character from comment (CryptAxe) Tree-SHA512: 66ee474945b4f9fd098cee0d031c1860c0777d4b05c609c0eaba32234209356b630766de30235b49d22cc5ea7cf2bb93410dea4466396369a0cdc0b631512a33
ac9cd95 contrib: Update location of seeds.txt (Wladimir J. van der Laan) Tree-SHA512: c12a75787ba87f03707c21731da083b466762a7e0af9ca501107695ea1074025907cc24805c7c87f4a66daa7f4f13e574da16be1681e61deaf1acbd72176b3ff
…mpool help. 3a0a5bc [doc] Add hint about getmempoolentry to getrawmempool help. (Karl-Johan Alm) Tree-SHA512: 8327d7d7ad93296525fbf95b7a824e3525bde84653999f125afd845823eb39e3a03cd39725962ed949aa2b9ad207ecad6d287294fa321ff1a4d7fbd5a4b8560b
Until Bitcoin bitcoin#9908 gets backported
Also use S flag instead of W flag for the outpubkey test. Not really needed to fix the test, but we don't have the W flag in Dash so lets not confuse people.
…14-11 Backport missing PRs from Bitcoin 0.14 - Part 11
Setting PKG_CONFIG_SYSROOT_DIR environment variable to "/" for building Qt makes pkgconf behave strange (remove "/" prefix instead of adding it). And it makes no sense to set this variable for old pkgconfig anyway. Signed-off-by: Oleg Girko <[email protected]>
3498a8d depends: fix fontconfig with newer glibc (Cory Fields) Pull request description: Fixes build with newer gcc. Without this, depends builds fail with gcc7, maybe gcc6. Tree-SHA512: 3cfcebdb137c3e368c69d25012ceb32809890e67521aaa8b074f2092f847e3e7ae82ac9050b4600ba18f443d2a8fe1f8523c808d77642a1e7782d558cbad4a74
482f852 Implement NULLDUMMY softfork (Johnson Lau)
fa156c6 [qa] nulldummy: Don't run unused code (MarcoFalke)
46a4774 Fix nulldummy.py test (Johnson Lau)
2fa0063 Add NULLDUMMY verify flag in bitcoinconsensus.h (Johnson Lau)
from codablock/pr_missing_commits_from_1692
Backport BIP147 (nulldummy enforcement)
… connected (dashpay#1882) * Do not send dash-specific requests to masternodes before we are fully connected Open all masternode connections via CConnman::ThreadOpenMasternodeConnections only. Queue requests and process them after some timeout. * drop excessive `mnodeman.` * switch from queues to maps of pending requests * adjust few strings, add TODO for POOL_STATE_CONNECTING * fix * there can be only one pending dsa request per ps client
Turned out we actually need mixing collaterals charged as fees in our mempool for them to be relayed.
…fault (dashpay#2110) * [rpc] sendrawtransaction no longer bypasses minRelayTxFee The prioritisetransaction API can always be used if a transaction needs to be submitted that bypasses minRelayTxFee. * Allow to bypass transaction policy limits in sendrawtransaction Add new rpc param to sendrawtransaction to have an ability to tweak its behaviour. Default is `false` i.e. "do not bypass". * fix
* Update release notes * add 2118 * bump staging tree in README.md
* Fix typo in PS info dialog Also adjust translations accordingly. * Fix typo in PS low key warning * Fix typo in sendrawtransaction help * Fix sendtoaddress/sendmany help text * Fix listreceivedby* help text * Fix typo in listunspent help * Fix spelling "recieves"->"receives" Shame on me * transactions->transaction * receives->"incoming payments grouped"
…ut and version) (dashpay#2121) The initial ping is sent with defaults which switch MNs to SENTINEL_PING_EXPIRED state while they should really be in PRE_ENABLED state. The fix is to split this verification in two parts - this way sentinel version is only checked after at least one ping is received from the masternode itself and not from the cold wallet.
We don't relay mnb if sync is still in progress. Creating mnb without relaying it only increases inconsistency and leads to user confusion. Unifying conditions for creation and relaying fixes this.
Instead just mark them as MASTERNODE_UPDATE_REQUIRED and proceed further.
* Fix a crash when someone tries to update sporks without specifying `sporkkey` Before: Crashes with `Assertion failed: (fValid), function GetPubKey, file key.cpp, line 156.` After: Fails and prints rpc help for `spork` * Silence logging in CSporkMessage::CheckSignature() a bit CMessageSigner::VerifyMessage() failure is not really an error if CHashSigner::VerifyHash() below passes with no issues. No need to log this.
) * Throws an RPCError `RPC_WALLET_ERROR` when the command `dumphdinfo` is called and the wallet is not HD * Refactor based on @Udjin's post
This is needed to ensure masternode and governance cache cleanup on migration.
* PrepareDenominate fix * Fix conditions
CLIENT_VERSION_IS_RELEASE false->true
* Update release notes * add 2145
* update optimize-pngs.py with new paths * `python contrib/devtools/optimize-pngs.py` Total reduction: 22025 bytes * update share/pixmaps/*
Even the results were as expected, IsPayToPublicKeyHash() breaks at size checking step now, as was intended. Also removes compile time array-bounds warning.
…ashpay#2157) Messages should be serialized according the protocol of the peer who asked us or otherwise peers running on other protocols won't be able to deserialize the message correctly.
* Update release notes * add 2157
* update release notes * Bump to 0.12.3.1 * update Doxyfile
codablock
approved these changes
Jun 30, 2018
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.
Diff to develop: develop...UdjinM6:mergetomaster1231 or cf0ef9e...UdjinM6:mergetomaster1231