Jonas Schnelli
a590da317c
Merge #9412 : build: Fix 'make deploy' for OSX
...
2fb98f6
Fix bug in dmg builder so that it actually reads in the configuration file (Don Patterson)
b01667c
Mention RSVG dependency when creating the disk image on OSX (Jonas Schnelli)
09aefb5
build: Fix 'make deploy' for OSX (Cory Fields)
2018-01-18 07:33:42 +01:00
MarcoFalke
b584f56304
Merge #9433 : Update the Windows build notes
...
b705a04
Update the Windows build notes (Douglas Roark)
2018-01-18 07:33:40 +01:00
Jonas Schnelli
e3fbe15208
Merge #9420 : Fix linker error when configured with --enable-lcov
...
e2b5c98
Fix linker error when configured with --enable-lcov (Douglas Roark)
2018-01-18 07:31:23 +01:00
Pieter Wuille
cbbab00c56
Merge #9349 : Make CScript (and prevector) c++11 movable.
...
2ddfcfd
Make CScript (and prevector) c++11 movable. (Pieter Wuille)
2018-01-18 07:31:23 +01:00
Alexander Block
465ceff3ba
Use ForceSetArg/ForceSetMultiArgs in debug rpc command
2018-01-18 07:31:23 +01:00
Pieter Wuille
aff4b6d2c5
Merge #9243 : Clean up mapArgs and mapMultiArgs Usage
...
c2f61be
Add a ForceSetArg method for testing (Matt Corallo)
4e04814
Lock mapArgs/mapMultiArgs access in util (Matt Corallo)
4cd373a
Un-expose mapArgs from utils.h (Matt Corallo)
71fde55
Get rid of mapArgs direct access in ZMQ construction (Matt Corallo)
0cf86a6
Introduce (and use) an IsArgSet accessor method (Matt Corallo)
2b5f085
Fix non-const mapMultiArgs[] access after init. (Matt Corallo)
c8042a4
Remove arguments to ParseConfigFile (Matt Corallo)
2018-01-18 07:31:23 +01:00
MarcoFalke
b9b3583353
Merge #9435 : Removed unused variable in test, fixing warning.
...
35356b4
Remove unused variable in test, fixing warning. (Russell Yanofsky)
2018-01-18 07:31:23 +01:00
MarcoFalke
7417a5b249
Merge #9407 : [Trivial] Added missing colons in when running help command
...
afe5b3f
Added missing colons in when running help command (Anditto Heristyo)
2018-01-18 07:31:23 +01:00
Wladimir J. van der Laan
199170e5d5
Merge #9390 : travis: make distdir
...
fad896d
gitignore: Wipe line after java comp tool removal (MarcoFalke)
fad632e
travis: make distdir (MarcoFalke)
2018-01-18 07:31:23 +01:00
Wladimir J. van der Laan
d8b07b96ab
Merge #9393 : build: Include cuckoocache header in Makefile
...
fa89581
build: Include cuckoocache header in Makefile (MarcoFalke)
2018-01-18 07:31:23 +01:00
Wladimir J. van der Laan
dc1df137e3
Merge #9262 : Prefer coins that have fewer ancestors, sanity check txn before ATMP
...
cee1612
reduce number of lookups in TransactionWithinChainLimit (Gregory Sanders)
af9bedb
Test for fix of txn chaining in wallet (Gregory Sanders)
5882c09
CreateTransaction: Don't return success with too-many-ancestor txn (Gregory Sanders)
0b2294a
SelectCoinsMinConf: Prefer coins with fewer ancestors (Gregory Sanders)
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
851febd889
Merge #9316 : [wallet] Disable free transactions when relay is disabled
...
faf4ca8
[wallet] Disable free transactions when relay is disabled (MarcoFalke)
2018-01-18 07:31:22 +01:00
Alexander Block
504fecfe63
Remove call to SetMiscWarning in util.cpp
...
For some reason, this fails while linking dash-cli.
I tried to add LIBBITCOIN_COMMON to dash-cli, but with no luck.
Removing the call for now, has to be fixed later.
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
dcc9dffae9
Merge #9236 : Fix races for strMiscWarning and fLargeWork*Found, make QT runawayException use GetWarnings
...
749be01
Move GetWarnings() into its own file. (Gregory Maxwell)
e3ba0ef
Eliminate data races for strMiscWarning and fLargeWork*Found. (Gregory Maxwell)
c63198f
Make QT runawayException call GetWarnings instead of directly access strMiscWarning. (Gregory Maxwell)
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
b42c722b64
Merge #9311 : Flush wallet after abandontransaction
...
0632939
Flush wallet after abandontransaction (Alex Morcos)
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
6e11b14913
Merge #9329 : [Qt] Console: allow empty arguments
...
390bd14
[Qt] Console: don't allow empty arguments when using the comma-syntax (Jonas Schnelli)
6a32c0f
Qt/Test: Check handling of empty arguments in RPC debug console (Luke Dashjr)
89c8d2c
[Qt] Console: allow empty arguments (Jonas Schnelli)
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
8fa6680c5e
Merge #9367 : If we don't allow free txs, always send a fee filter (take 2)
...
fa16b8f
If we don't allow free txs, always send a fee filter (take 2) (MarcoFalke)
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
bf3cc9ff90
Merge #9331 : [qa] Add test for rescan feature of wallet key import RPCs
...
d8c0b9f
[qa] Add test for rescan feature of wallet key import RPCs (Russell Yanofsky)
2018-01-18 07:31:22 +01:00
Pieter Wuille
c1811e5661
Merge #8895 : Better SigCache Implementation
...
67dac4e
Add unit tests for the CuckooCache (Jeremy Rubin)
c9e69fb
Add CuckooCache implementation and replace the sigcache map_type with it (Jeremy Rubin)
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
e34afa1067
Merge #9273 : Remove unused CDiskBlockPos* argument from ProcessNewBlock
...
a13fa4c
Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
2018-01-18 07:31:22 +01:00
Pieter Wuille
e6d05d71dd
Merge #9290 : Make RelayWalletTransaction attempt to AcceptToMemoryPool.
...
f692fce
Make RelayWalletTransaction attempt to AcceptToMemoryPool. (Gregory Maxwell)
2018-01-18 07:31:22 +01:00
UdjinM6
e8a710c320
Merge pull request #1856 from codablock/pr_backport_bitcoin_0.14-7
...
Backport missing PRs from Bitcoin 0.14 - Part 7
2018-01-17 23:09:07 +03:00
Alexander Block
87e9b59881
Remove AddRef call in CNode constructor and do AddRef in AcceptConnection
...
This was missed in #1857 . ConnectNode is doing the initial AddRef for
outgoing connections. AcceptConnection also has to do an initial AddRef
call for incoming connections.
2018-01-17 18:11:32 +01:00
Alexander Block
41ef1f98ea
Remove comment about masternode connections
...
This was related to the times we directly called ConnectNode from MN code
2018-01-17 17:40:44 +01:00
Matt Corallo
4ee0657f85
Do not add to vNodes until fOneShot/fFeeler/fAddNode have been set
2018-01-17 17:38:32 +01:00
Alexander Block
ea73614994
Use EXIT_FAILURE when calling exit()
2018-01-17 17:31:13 +01:00
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