Alexander Block
997f9f795c
Dashify build-windows.md
2018-01-17 17:31:13 +01:00
Alexander Block
c0607af9da
Dashify part of developer-notes.md
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
5c860b3477
Merge #9330 : [Qt] Console: add security warning
...
ed6b377 [Qt] Console: add security warning (Jonas Schnelli)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
91dc005154
Merge #9344 : Do not run functions with necessary side-effects in assert()
...
da9cdd2 Do not run functions with necessary side-effects in assert() (Gregory Maxwell)
2018-01-17 17:31:12 +01:00
Alexander Block
11e27d7af5
Add missing null checks in wallet/crypto_tests.cpp
...
Align code with Bitcoin
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
0982d6d3c8
Merge #9305 : Refactor: Removed begin/end_ptr functions.
...
8c1dbc5 Refactor: Removed begin/end_ptr functions. (Karl-Johan Alm)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
3aee86d6fc
Merge #9334 : Update to latest libsecp256k1
...
7b49f22 Squashed 'src/secp256k1/' changes from 7a49cac..8225239 (Pieter Wuille)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
d0db70b01c
Merge #9302 : Return txid even if ATMP fails for new transaction
...
b3a7410 Return txid even if ATMP fails for new transaction (Pieter Wuille)
2018-01-17 17:31:12 +01:00
MarcoFalke
c0b0ae8be4
Merge #9309 : [qa] Wallet needs to stay unlocked for whole test
...
9359f8a Wallet needs to stay unlocked for whole test (Alex Morcos)
2018-01-17 17:31:12 +01:00
Pieter Wuille
04f6a7367d
Merge #9240 : Remove txConflicted
...
a874ab5 remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos)
bf663f8 remove external usage of mempool conflict tracking (Alex Morcos)
2018-01-17 17:31:12 +01:00
MarcoFalke
45727e7974
Merge #9303 : Update comments in ctaes
...
8501bed Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac (Pieter Wuille)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
b0c0046ef0
Merge #9291 : Remove mapOrphanTransactionsByPrev from DoS_tests
...
819ca3f Remove mapOrphanTransactionsByPrev from DoS_tests (Pieter Wuille)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
470b526d95
Merge #9299 : Remove no longer needed check for premature v2 txs
...
b919179 remove no longer needed check for premature v2 txs (Alex Morcos)
2018-01-17 17:31:12 +01:00
Alexander Block
7322489ca2
Merge #9276 : Some minor testing cleanups
...
30b620c remove obsolete run-bitcoind-for-test.sh (Alex Morcos)
2a99522 remove relaypriority from rpc tests (Alex Morcos)
e2184cc Reorder RPC tests for running time (Alex Morcos)
# Conflicts:
# qa/pull-tester/rpc-tests.py
# qa/pull-tester/run-bitcoind-for-test.sh.in
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
63d610d13a
Merge #9296 : Fix missed change to WalletTx structure
...
28f8ae8 Fix missed change to WalletTx structure (Alex Morcos)
2018-01-17 17:31:12 +01:00
MarcoFalke
19958fecf9
Merge #9274 : [qa] Use cached utxo set to fix performance regression
...
fab1af3 [qa] maxuploadtarget: Use cached utxo set (MarcoFalke)
fa2ecc4 [qa] pruning: Use cached utxo set to run faster (MarcoFalke)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
7d887dafb1
Merge #9282 : CMutableTransaction is defined as struct
...
c4b6fa8 CMutableTransaction is defined as struct. (Pavel Janík)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
386026e570
Merge #9165 : SendMoney: use already-calculated balance
...
ea83d00 SendMoney: use already-calculated balance (instagibbs)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
9782c18312
Merge #9269 : Align struct COrphan definition
...
2efc438 Align struct COrphan definition (Pieter Wuille)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
2feda90d5d
Merge #8613 : LevelDB 1.19
...
634ad51 Squashed 'src/leveldb/' changes from 20ca81f..a31c8aa (Pieter Wuille)
2018-01-17 17:31:11 +01:00
Wladimir J. van der Laan
b5389c09b3
Merge #9014 : Fix block-connection performance regression
...
dd0df81 Document ConnectBlock connectTrace postconditions (Matt Corallo)
2d6e561 Switch pblock in ProcessNewBlock to a shared_ptr (Matt Corallo)
2736c44 Make the optional pblock in ActivateBestChain a shared_ptr (Matt Corallo)
ae4db44 Create a shared_ptr for the block we're connecting in ActivateBCS (Matt Corallo)
fd9d890 Keep blocks as shared_ptrs, instead of copying txn in ConnectTip (Matt Corallo)
6fdd43b Add struct to track block-connect-time-generated info for callbacks (Matt Corallo)
2018-01-17 17:31:11 +01:00
Alexander Block
45ea6ba4dc
Fix invalid cast to CTransaction* in WalletModelTransaction
...
CWalletTx/CMerkleTx does not derive from CTransaction anymore.
This code is different in Bitcoin as it was touched by SegWit code,
resulting in an upfront fix.
2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
525c049316
Merge #8580 : Make CTransaction actually immutable
...
81e3228 Make CTransaction actually immutable (Pieter Wuille)
42fd8de Make DecodeHexTx return a CMutableTransaction (Pieter Wuille)
c3f5673 Make CWalletTx store a CTransactionRef instead of inheriting (Pieter Wuille)
a188353 Switch GetTransaction to returning a CTransactionRef (Pieter Wuille)
2018-01-17 17:30:38 +01:00
Alexander Block
1e62969fa6
Preparations for upcoming backport of Bitcoin #8580
...
Instead of deriving from CTransaction, we now have a CTransactionRef member
in CTxLockCandidate. This is needed for the next backported PR #8580 ,
which will make CTransaction immutable.
Also use CTransactionRef in CDarkSendEntry, CDarksendBroadcastTx and
CPrivateSendServer
2018-01-17 17:30:38 +01:00
MarcoFalke
cb61441e2e
Merge #9251 : Improvement of documentation of command line parameter 'whitelist'
...
8a70a9d Improvement of documentation of command line parameter 'whitelist' (wodry)
2018-01-17 17:30:38 +01:00
MarcoFalke
5d1f05afff
Merge #9221 : [qa] Get rid of duplicate code
...
facbfa5 [qa] Get rid of duplicate code (MarcoFalke)
2018-01-17 17:30:38 +01:00
MarcoFalke
5e09f275e2
Merge #9257 : [qa] Dump debug logs on travis failures.
...
0828619 [qa] Dump debug logs on travis failures. (Suhas Daftuar)
2018-01-17 17:30:38 +01:00
MarcoFalke
b390e8ee57
Merge #9246 : Developer docs about existing subtrees.
...
08ed8c1 Developer docs about existing subtrees. (Gregory Maxwell)
2018-01-17 17:30:38 +01:00
MarcoFalke
b8a81d435f
Merge #9223 : unification of Bloom filter representation
...
b7aa290 unification of Bloom filter representation (S. Matthew English)
2018-01-17 17:30:38 +01:00
MarcoFalke
5a6131a86b
Merge #9265 : bitcoin-cli: Make error message less confusing
...
fe37fbe bitcoin-cli: Make error message less confusing (Wladimir J. van der Laan)
2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
a95622c0b0
Merge #9239 : Disable fee estimates for 1 block target
...
e878689 Make GUI incapable of setting tx confirm target of 1 (Alex Morcos)
d824ad0 Disable fee estimates for a confirm target of 1 block (Alex Morcos)
2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
62ae4e6449
Merge #9229 : Remove calls to getaddrinfo_a
...
10ae7a7 Revert "Use async name resolving to improve net thread responsiveness" (Matt Corallo)
2018-01-17 17:30:38 +01:00
Alexander Block
b2fb586dec
Add missing comments to ProcessNewBlock and ProcessNewBlockHeaders
...
Lost while backporting #9183
2018-01-17 17:30:38 +01:00
Pieter Wuille
180e379e2d
Merge #9253 : Fix calculation of number of bound sockets to use
...
9e1f468 Fix calculation of number of bound sockets to use (Matt Corallo)
2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
3b2fd85b59
Merge #9230 : Fix some benign races in timestamp logging
...
8b22efb Make fStartedNewLine an std::atomic_bool (Matt Corallo)
507145d Fix race when accessing std::locale::classic() (Matt Corallo)
2018-01-17 17:30:38 +01:00
Pieter Wuille
d54ef6d7e3
Merge #9226 : Remove fNetworkNode and pnodeLocalHost.
...
bdb922b Remove pnodeLocalHost. (Gregory Maxwell)
083f203 Remove fNetworkNode. (Gregory Maxwell)
2018-01-17 17:30:36 +01:00
Pieter Wuille
a78e0e36c6
Merge #9244 : Trivial refactor: Remove extern keyword from function declarations
...
446a8f9 Trivial refactor: Remove extern keyword from function declarations, as they are extern by default. (Karl-Johan Alm)
2018-01-17 17:27:25 +01:00
Pieter Wuille
b07393709e
Merge #9010 : Split up AppInit2 into multiple phases, daemonize after datadir lock errors
...
deec83f init: Get rid of fServer flag (Wladimir J. van der Laan)
16ca0bf init: Try to aquire datadir lock before and after daemonization (Wladimir J. van der Laan)
0cc8b6b init: Split up AppInit2 into multiple phases (Wladimir J. van der Laan)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
27fcec08f8
Merge #9202 : bench: Add support for measuring CPU cycles
...
3532818 bench: Add support for measuring CPU cycles (Wladimir J. van der Laan)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
ab9bce2c3a
Merge #9225 : Fix some benign races
...
dfed983 Fix unlocked access to vNodes.size() (Matt Corallo)
3033522 Remove double brackets in addrman (Matt Corallo)
dbfaade Fix AddrMan locking (Matt Corallo)
047ea10 Make fImporting an std::atomic (Matt Corallo)
42071ca Make fDisconnect an std::atomic (Matt Corallo)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
b27c4b8e96
Merge #9224 : Prevent FD_SETSIZE error building on OpenBSD
...
498a1d7 Include select.h when WIN32 is not defined (Ivo van der Sangen)
2018-01-17 17:27:24 +01:00
MarcoFalke
df24dfd4bc
Merge #9233 : Fix some typos
...
15fa95d Fix some typos (fsb4000)
2018-01-17 17:27:24 +01:00
MarcoFalke
f8948de023
Merge #9219 : doc: Improve windows build instructions using Linux subsystem
...
dd34570 doc: Improve windows build instructions using Linux subsystem (Wladimir J. van der Laan)
2018-01-17 17:27:24 +01:00
Alexander Block
dadfc45b15
Add size() method to CVectorWriter
...
Needed by CMasternodePing
2018-01-17 17:27:24 +01:00
Pieter Wuille
5c0b55a7c0
Merge #9128 : net: Decouple CConnman and message serialization
...
c7be56d net: push only raw data into CConnman (Cory Fields)
2ec935d net: add CVectorWriter and CNetMsgMaker (Cory Fields)
b7695c2 net: No need to check individually for disconnection anymore (Cory Fields)
fedea8a net: don't send any messages before handshake or after requested disconnect (Cory Fields)
d74e352 net: Set feelers to disconnect at the end of the version message (Cory Fields)
2018-01-17 17:27:22 +01:00
MarcoFalke
c87c151426
Merge #9220 : Refactor: Stop using namespace std (bitcoin-cli/-tx).
...
2f2625a Removed using namespace std from bitcoin-cli/-tx and added std:: in appropriate places. (Karl-Johan Alm)
2018-01-17 17:25:36 +01:00
MarcoFalke
2c8fe46868
Merge #9100 : tx_valid: re-order inputs to how they are encoded
...
5262a15 tx_valid: re-order inputs to how they are encoded (Daniel Cousens)
2018-01-17 17:25:36 +01:00
MarcoFalke
d5f2f07961
Merge #9216 : Doc: Fix copypasted comment
...
f26da35 Fix copypasted comment. (Pavel Janík)
2018-01-17 17:25:36 +01:00
MarcoFalke
a71702e3e2
Merge #9144 : [Trivial] Correct waitforblockheight example help text
...
e3c4f7e Correct help output for waitfor RPC commands (fanquake)
2018-01-17 17:25:36 +01:00
Pieter Wuille
3a48d2b832
Merge #8930 : Move orphan processing to ActivateBestChain
...
d2b88f9 Move orphan-conflict removal from main logic into a callback (Matt Corallo)
97e2802 Erase orphans per-transaction instead of per-block (Matt Corallo)
ec4525c Move orphan processing to ActivateBestChain (Matt Corallo)
2018-01-17 17:25:36 +01:00