Jonas Schnelli
2342b2ac00
Merge #9094 : qt: Use correct conversion function for boost::path datadir
...
e760b30 qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan)
2018-01-15 06:13:44 +01:00
Wladimir J. van der Laan
293333481e
Merge #8981 : Wshadow: Do not shadow argument with a local variable
...
ff6639b Do not shadow local variable (Pavel Janík)
2018-01-15 06:13:44 +01:00
UdjinM6
a3325fc068
Merge pull request #1851 from codablock/pr_backport_bitcoin_0.14-5
...
Backport missing PRs from Bitcoin 0.14 - Part 5
2018-01-14 20:34:04 +03:00
Alexander Block
4a19af7bd1
Use correct version for fee estimates db
2018-01-14 14:13:39 +01:00
Alexander Block
fc95cbb49f
Use nPowTargetSpacing in SendCoinsDialog::updateGlobalFeeVariables
2018-01-14 14:12:30 +01:00
Alexander Block
c5bfd21570
Fix version check in CBlockPolicyEstimator::Read
2018-01-14 14:06:46 +01:00
Alexander Block
12d8ed437c
Dashify DIST_CONTRIB in Makefile.am
2018-01-14 14:04:38 +01:00
Alexander Block
d452018961
Dashify generatetoaddress help string
2018-01-13 18:34:53 +01:00
Wladimir J. van der Laan
6eaafa86b6
Merge #7730 : Remove priority estimation
...
0bd581a add release notes for removal of priority estimation (Alex Morcos)
b2322e0 Remove priority estimation (Alex Morcos)
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
9be592806d
Merge #8709 : Allow filterclear messages for enabling TX relay only.
...
1f951c6 Allow filterclear messages for enabling TX relay only. (R E Broadley)
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
84559c0569
Merge #9052 : Use RelevantServices instead of node_network in AttemptToEvict.
...
d32036a Use RelevantServices instead of node_network in AttemptToEvict. (Gregory Maxwell)
2018-01-13 13:44:40 +01:00
Alexander Block
29a59e518f
Remove NodeEvictionCandidate constructor and revert to struct initializion
...
Matches Bitcoins style and makes upcoming backports easier
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
05b34f49b4
Merge #8568 : new var DIST_CONTRIB adds useful things for packagers from contrib
...
1ee6f91 new var DIST_CONTRIB adds useful things for packagers from contrib/ to EXTRA_DIST (nomnombtc)
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
1188dd28ac
Merge #9093 : [doc] release-process: Mention GitHub release and archived release notes
...
faead5e [doc] release-process: Mention GitHub release and archived release notes (MarcoFalke)
2018-01-13 13:44:40 +01:00
MarcoFalke
47a7ec79fe
Merge #9083 : Enforcing consistency, 'gitian' to 'Gitian'
...
66ca6cd Enforcing consistency, 'gitian' to 'Gitian' (S. Matthew English)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
9d661f4337
Merge #8675 : Make copyright header lines uniform
...
4b04e32 [copyright] copyright header style uniform (isle2983)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
921730d97a
Merge #9070 : Lockedpool fixes
...
b3ddc5e LockedPool: avoid quadratic-time allocation (Kaz Wesley)
0b59f80 LockedPool: fix explosion for illegal-sized alloc (Kaz Wesley)
21b8f3d LockedPool: test handling of invalid allocations (Kaz Wesley)
2018-01-13 13:44:39 +01:00
Pieter Wuille
188a2d98f7
Merge #9085 : Remove unused CTxOut::GetHash()
...
190fd32 Remove unused CTxOut::GetHash() (Matt Corallo)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
92f0f67c0c
Merge #9069 : Clean up bctest.py and bitcoin-util-test.py
...
2b175d4 Clean up bctest.py and bitcoin-util-test.py (John Newbery)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
5adb5b8e8a
Merge #9073 : Trivial: Add common failure cases for rpc server connection failure
...
8f329f9 Add common failure cases for rpc server connection failure (instagibbs)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
dd7669bc7c
Merge #9050 : net: make a few values immutable, and use deterministic randomness for the localnonce
...
59ac5c5 net: Use deterministic randomness for CNode's nonce, and make it const (Cory Fields)
aff6584 net: constify a few CNode vars to indicate that they're threadsafe (Cory Fields)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
6f8720b7f5
Merge #9071 : Declare wallet.h functions inline
...
2ca882a Declare wallet.h functions inline (Pieter Wuille)
2018-01-13 13:44:39 +01:00
Pieter Wuille
cd7c5bd75c
Merge #9036 : wallet: Change default confirm target from 2 to 6
...
0fdf810 wallet: Change default confirm target from 2 to 6 (Wladimir J. van der Laan)
2018-01-13 13:44:39 +01:00
MarcoFalke
70c86db4ef
Merge #9065 : Merge doc/unit-tests.md
into src/test/README.md
...
eedc461 Merge `doc/unit-tests.md` into `src/test/README.md` (Wladimir J. van der Laan)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
9b9f86a59b
Merge #8977 : [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread)
...
cab1da7 [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread) (Jonas Schnelli)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
2999d097f6
Merge #9013 : Trivial: Explicitly pass const CChainParams& to LoadBlockIndexDB()
...
d0b01f3 Explicitly pass const CChainParams& to LoadBlockIndexDB() (Geoffrey Tsui)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
42fa46f859
Merge #9042 : [rpc] ParseHash: Fail when length is not 64
...
fa32619 [rpc] ParseHash: Fail when length is not 64 (MarcoFalke)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
0a6bf096dc
Merge #9066 : tests: Remove variable unused after refactoring
...
f91afe9 trivial: Remove variable unused after refactoring (Daniel Kraft)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
07f406fd67
Merge #9023 : Add logging to bitcoin-util-test.py
...
32c0d6e Add logging to bitcoin-util-test.py (jnewbery)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
b720415189
Merge #8828 : Move CWalletDB::ReorderTransactions to CWallet
...
86029e7 Move CWalletDB::ReorderTransactions to CWallet (Patrick Strateman)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
0b93a58947
Merge #8674 : tools for analyzing, updating and adding copyright headers in source files
...
159597a [devtools] script support for managing source file copyright headers (isle2983)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
85c5aea08b
Merge #9063 : Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is not defined
...
4a9f3c5 Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is not defined. (Pavel Janík)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
bc3b9294e8
Merge #8753 : Locked memory manager
...
444c673 bench: Add benchmark for lockedpool allocation/deallocation (Wladimir J. van der Laan)
6567999 rpc: Add `getmemoryinfo` call (Wladimir J. van der Laan)
4536148 support: Add LockedPool (Wladimir J. van der Laan)
f4d1fc2 wallet: Get rid of LockObject and UnlockObject calls in key.h (Wladimir J. van der Laan)
999e4c9 wallet: Change CCrypter to use vectors with secure allocator (Wladimir J. van der Laan)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
88f9dc2f16
Merge #9032 : test: Add format-dependent comparison to bctest
...
6c5cd9d test: Add format-dependent comparison to bctest (Wladimir J. van der Laan)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
0a0e60c1fb
Merge #8448 : Store mempool and prioritization data to disk
...
582068a Add mempool.dat to doc/files.md (Pieter Wuille)
3f78562 Add DumpMempool and LoadMempool (Pieter Wuille)
ced7c94 Add AcceptToMemoryPoolWithTime function (Pieter Wuille)
c3efb58 Add feedelta to TxMempoolInfo (Pieter Wuille)
2018-01-13 13:44:38 +01:00
Jonas Schnelli
b2229356b5
Merge #9043 : [qt] Return useful error message on ATMP failure
...
3333e5a [qt] Return useful error message on ATMP failure (MarcoFalke)
2018-01-13 13:44:38 +01:00
MarcoFalke
ade67c91e7
Merge #9041 : keypoololdest denote Unix epoch, not GMT
...
7f61b49 Change all instance of 'GMT epoch' to 'Unix epoch' (matthias)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
77b888a069
Merge #8989 : [Qt] overhaul smart-fee slider, adjust default confirmation target
...
cfe77ef [Qt] overhaul smart-fee slider, adjust default confirmation target (Jonas Schnelli)
6f02899 [Qt] Hide nTxConfirmTarget behind WalletModel (Jonas Schnelli)
004168d CoinControl: add option for custom confirmation target (Jonas Schnelli)
2018-01-13 13:44:38 +01:00
Alexander Block
8d62e3f80e
Throw exception in gobject prepare when CommitTransaction fails
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
848f3389b4
Merge #9016 : Return useful error message on ATMP failure
...
169bdab Return useful error message on ATMP failure (instagibbs)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
01389bc330
Merge #9029 : instance of 'mem pool' to 'mempool'
...
1c3ecc7 instance of 'mem pool' to 'mempool' (S. Matthew English)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
55208b7598
Merge #9033 : Update build notes for dropping osx 10.7 support (fanquake)
...
ba26d41 Update build notes for dropping osx 10.7 support (Michael Ford)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
2d72e91b56
doc: Add release notes for 0.13.1 release
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
d38c7f1d4c
Merge #9020 : rpc: Remove invalid explanation from wallet fee message
...
04c1c15 rpc: Remove invalid explanation from wallet fee message (Wladimir J. van der Laan)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
fd364841a3
Merge #9015 : release: bump required osx version to 10.8. (jonasschnelli)
...
339c4b6 release: bump required osx version to 10.8. Credit jonasschnelli. (Cory Fields)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
5bcd438b13
Merge #8515 : A few mempool removal optimizations
...
0334430 Add some missing includes (Pieter Wuille)
4100499 Return shared_ptr<CTransaction> from mempool removes (Pieter Wuille)
51f2783 Make removed and conflicted arguments optional to remove (Pieter Wuille)
f48211b Bypass removeRecursive in removeForReorg (Pieter Wuille)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
4d0f28545e
Merge #8948 : [TRIVIAL] reorder Windows gitian build order to match Linux
...
3f7581d [TRIVIAL] reorder Windows gitian build order to match Linux (Micha)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
00f4d887a2
Merge #9002 : Make connect=0 disable automatic outbound connections.
...
515e264 Make connect=0 disable automatic outbound connections. (Gregory Maxwell)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
55cabaa213
Merge #9004 : Clarify listenonion
...
3421e74 Clarify `listenonion` (unsystemizer)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
e9f250d681
Merge #8993 : Trivial: Fix doxygen comment: the transaction is returned in txOut
...
1d8e12b Fix doxygen comment: the transaction is returned in txOut (Pavel Janík)
2018-01-13 13:44:38 +01:00