Merge bitcoin/0.12 + few fixes #698
Conversation
This allows us to optimize CTxMemPool::removeForReorg.
d52fbf0 Added additional config option for multiple RPC users. (Gregory Sanders)
Make RPC tests have a default block priority size of 50000 (the old default) so we can still use free transactions in RPC tests. When priority is eliminated, we will have to make a different change if we want to continue allowing free txs.
996d311 [RPC] Add transaction size to JSON output (Nick)
9ac63d6 Keep track of explicit wallet conflicts instead of using mempool (Pieter Wuille)
fa3a38a [qa] pull-tester: Cleanup (run keypool, tidy stdout) (MarcoFalke)
ff723da [Qt] improve minimum absolute fee option - Only display the minimum absolute fee control if CoinControl is enabled (Jonas Schnelli) 31b508a [Qt] make use of the nMinimumTotalFee (absolute) in coincontrols fee calculation (Jonas Schnelli) 80462dd [Qt] use ASYMP_UTF8 (≈) whenever we show a fee that is not absolute (Jonas Schnelli) ecc7c82 Move fPayAtLeastCustomFee function to CC (Pieter Wuille)
But keep translating them in the GUI. This - necessarily - requires duplication of a few messages. Alternative take on bitcoin#7134, that keeps the translations from being wiped. Also document GetWarnings() input argument. Fixes #5895.
114b581 Prevector type (Pieter Wuille)
fa19a58 HelpMessage: Don't hide -mintxfee behind showDebug (MarcoFalke) faffc17 rpcwallet: Clarify what settxfee does (MarcoFalke) 9999cb0 Fix url in .travis.yml (MarcoFalke) fa22a10 contrib: Del. gitian downloader config and update gitian README (MarcoFalke) fad3035 [doc] Minor markdown fixes (MarcoFalke)
…tmodel It's surprising to me that Q_EMIT even worked for this. But it doesn't build in Qt4, so switch back to `QMetaObject::invokeMethod`. Fixes bitcoin#7138.
50947ef Change default block priority size to 0 (Alex Morcos)
2d8860e Fix removeForReorg to use MedianTimePast (Suhas Daftuar) b7fa4aa Don't call removeForReorg if DisconnectTip fails (Suhas Daftuar) 7e49f5f Track coinbase spends in CTxMemPoolEntry (Suhas Daftuar) bb8ea1f removeForReorg calls once-per-disconnect-> once-per-reorg (Matt Corallo) 474b84a Make indentation in ActivateBestChainStep readable (Matt Corallo) b0a064c Fix comment in removeForReorg (Matt Corallo) 9b060e5 Fix removal of time-locked transactions during reorg (Matt Corallo) 0c9959a Add failing test checking timelocked-txn removal during reorg (Matt Corallo)
The list of contributors is automatically generated from git, so people that use multiple author names will end up on the list multiple times.
ea52530 Fix duplicate names in release notes (fanquake)
…f chainparams, get rid of most `if(Params().NetworkIDString() == CBaseChainParams::MAIN)` and alike to unify formulas. Further improvements will require testnet restart (see TODO notes in changed code) so I'm keeping few things as they are till then.
…ants, log unknown commands (net debug category only)
|
Many thanks, I'll do some local build tests first to see if gitian/travis broke. |
|
Yay, thanks! |
Merge bitcoin/0.12 + few fixes
|
@UdjinM6 i have fixed the issue with --disable-hardening: x11 crypto was compiled without fPIC support, which made Dash client linking fail. I've commited the fix to 12.1 branch - can you retest on your side as well? |
|
@schinzelh Bingo! 👍 |
|
Gitian/Bamboo almost working again, only Windows build has i minor issue
|
|
Hope #700 help solving minor issue. |
|
@thelazier thanks, that solved it, gitian builds working now again. Travis is still failing due to some broken unittests, needs some more work. |
“why?” https://github.com/bitcoin/bitcoin/blob/0.12/doc/release-notes.md#notable-changes
What's inside:
if(Params().NetworkIDString() == CBaseChainParams::MAIN)and alike to unify formulas. Further improvements will require testnet restart (see TODO notes in changed code) so I'm keeping few things as they are till then.AcceptableInputs,AcceptToMemoryPool/AcceptToMemoryPoolWorkerhavefDryRunparameter insteadconsensus.nSubsidyHalvingInterval(210000 -> 210240)Params(CBaseChainParams::MAIN).GetDefaultPort()NetMsgType::constants, log unknown commands (netdebug category only)GetBlockSubsidyusing previous height, changed var names accordinglymasternodecategoryFew notes/todos:
falseby default (shall we remove RBF completely?)--disable-hardeningyet, it complains about x11 crypto (but as a side effect of--disable-hardening(?) - ubuntu recognize dash-qt as an executable again so maybe we should consider this as a default option?)