Wladimir J. van der Laan 2ae58d5bfb

Merge #11864: Make CWallet::FundTransaction atomic ...

03a5dc9 [wallet] Make CWallet::FundTransaction atomic (João Barbosa)
95d4450 [wallet] Tidy up CWallet::FundTransaction (João Barbosa)

Pull request description:

  This PR fixes a race for `setLockedCoins` when `lockUnspents` is true. For instance, it should not be possible to use the same unspent in concurrent `fundrawtransaction` calls.

  Now the `cs_main` and `cs_wallet` locks are held during `CreateTransaction` and `LockCoin`(s). Also added some style nits around the change.

Tree-SHA512: ccf383c0c5f6db775655a3e9ccd200c3bd831a83afae2b7c389564c74f7227f5bea86a4775727de2c3603b188f383f8a12d3f9d6d94f7887865c31c94ce95ef6

2017-12-14 10:38:20 +01:00

..

bench

Merge #11558: Minimal code changes to allow msvc compilation

2017-12-13 14:05:25 +01:00

compat

Merge #11140: Trivial: Improve #endif comments

2017-11-17 15:34:51 +01:00

config

…

consensus

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

crypto

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

leveldb

…

obj

…

obj-test

…

policy

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

primitives

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

qt

Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included

2017-12-12 14:56:25 +01:00

rpc

Merge #11877: Improve createrawtransaction functional tests

2017-12-13 17:34:08 +01:00

script

Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included

2017-12-12 14:56:25 +01:00

secp256k1

Bump secp256k1 subtree

2017-09-29 16:02:39 +02:00

support

Merge #11558: Minimal code changes to allow msvc compilation

2017-12-13 14:05:25 +01:00

test

Merge #11558: Minimal code changes to allow msvc compilation

2017-12-13 14:05:25 +01:00

univalue

Bump univalue and fix json formatting in tests

2017-09-29 14:35:46 +02:00

wallet

Merge #11864: Make CWallet::FundTransaction atomic

2017-12-14 10:38:20 +01:00

zmq

Merge #10493: Use range-based for loops (C++11) when looping over map elements

2017-11-30 17:10:05 -05:00

.clang-format

…

addrdb.cpp

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

addrdb.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

addrman.cpp

Merge #10493: Use range-based for loops (C++11) when looping over map elements

2017-11-30 17:10:05 -05:00

addrman.h

Merge #10493: Use range-based for loops (C++11) when looping over map elements

2017-11-30 17:10:05 -05:00

amount.h

…

arith_uint256.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

arith_uint256.h

Merge #10749: Use compile-time constants instead of unnamed enumerations (remove "enum hack")

2017-11-11 18:07:28 -05:00

base58.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

base58.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

bech32.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

bech32.h

Import Bech32 C++ reference code & tests

2017-09-28 16:02:16 -07:00

bitcoin-cli-res.rc

…

bitcoin-cli.cpp

cli: Reject arguments to -getinfo

2017-11-17 15:11:50 +01:00

bitcoin-tx-res.rc

…

bitcoin-tx.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

bitcoind-res.rc

…

bitcoind.cpp

Create walletdir if datadir doesn't exist and fix tests

2017-11-18 00:50:59 +13:00

blockencodings.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

blockencodings.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

bloom.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

bloom.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

chain.cpp

Merge #11337: Fix code constness in CBlockIndex::GetAncestor() overloads

2017-12-01 15:19:07 +01:00

chain.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

chainparams.cpp

Merge #11558: Minimal code changes to allow msvc compilation

2017-12-13 14:05:25 +01:00

chainparams.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

chainparamsbase.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

chainparamsbase.h

…

chainparamsseeds.h

…

checkpoints.cpp

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

checkpoints.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

checkqueue.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

clientversion.cpp

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

clientversion.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

coins.cpp

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

coins.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

compat.h

Merge #11558: Minimal code changes to allow msvc compilation

2017-12-13 14:05:25 +01:00

compressor.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

compressor.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

core_io.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

core_memusage.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

core_read.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

core_write.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

cuckoocache.h

…

dbwrapper.cpp

Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included

2017-12-12 14:56:25 +01:00

dbwrapper.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

fs.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

fs.h

…

hash.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

hash.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

httprpc.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

httprpc.h

…

httpserver.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

httpserver.h

…

indirectmap.h

…

init.cpp

Merge #11831: Always return true if AppInitMain got to the end

2017-12-12 10:27:53 +01:00

init.h

…

key.cpp

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

key.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

keystore.cpp

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

keystore.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

limitedmap.h

…

Makefile.am

Add -walletdir parameter to specify custom wallet dir

2017-11-18 00:50:58 +13:00

Makefile.bench.include

build: Make "make clean" remove all files created when running "make check"

2017-10-04 14:54:41 +02:00

Makefile.leveldb.include

…

Makefile.qt.include

Merge #11621: [build] Add temp_bitcoin_locale_qrc to CLEAN_QT to fix make distcheck

2017-11-17 14:04:02 +01:00

Makefile.qttest.include

…

Makefile.test.include

[tests] Test that mempool rejects coinbase transactions

2017-11-18 00:48:34 -08:00

memusage.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

merkleblock.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

merkleblock.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

miner.cpp

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

miner.h

Make boost::multi_index comparators const

2017-12-07 10:06:38 -05:00

net_processing.cpp

Merge #11558: Minimal code changes to allow msvc compilation

2017-12-13 14:05:25 +01:00

net_processing.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

net.cpp

Merge #11363: net: Split socket create/connect

2017-12-13 05:42:32 +01:00

net.h

Add Clang thread safety analysis annotations

2017-11-23 07:59:58 +01:00

netaddress.cpp

Remove includes in .cpp files for things the corresponding .h file already included

2017-11-16 22:26:34 +01:00

netaddress.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

netbase.cpp

Merge #11363: net: Split socket create/connect

2017-12-13 05:42:32 +01:00

netbase.h

Merge #11363: net: Split socket create/connect

2017-12-13 05:42:32 +01:00

netmessagemaker.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

noui.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

noui.h

…

pow.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

pow.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

prevector.h

…

protocol.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

protocol.h

Add NODE_NETWORK_LIMITED flags and min block amount constants

2017-12-05 11:03:59 -10:00

pubkey.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

pubkey.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

random.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

random.h

Merge #11558: Minimal code changes to allow msvc compilation

2017-12-13 14:05:25 +01:00

rest.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

reverse_iterator.h

…

reverselock.h

…

scheduler.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

scheduler.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

serialize.h

Merge #10493: Use range-based for loops (C++11) when looping over map elements

2017-11-30 17:10:05 -05:00

streams.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

sync.cpp

threads: add a thread_local autoconf check

2017-11-27 15:01:47 -08:00

sync.h

Switched sync.{cpp,h} to std threading primitives.

2017-11-18 11:35:14 -08:00

threadinterrupt.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

threadinterrupt.h

…

threadsafety.h

…

timedata.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

timedata.h

…

tinyformat.h

[Util] Update tinyformat.h

2017-10-29 21:12:12 +08:00

torcontrol.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

torcontrol.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

txdb.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

txdb.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

txmempool.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

txmempool.h

Make boost::multi_index comparators const

2017-12-07 10:06:38 -05:00

ui_interface.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

ui_interface.h

…

uint256.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

uint256.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

undo.h

Remove trailing whitespace causing travis failure

2017-11-16 08:23:03 +13:00

util.cpp

Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included

2017-12-12 14:56:25 +01:00

util.h

Merge #11583: Do not make it trivial for inbound peers to generate log entries

2017-12-11 17:06:22 +01:00

utilmoneystr.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

utilmoneystr.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

utilstrencodings.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

utilstrencodings.h

Implement BIP173 addresses and tests

2017-09-28 16:24:30 -07:00

utiltime.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

utiltime.h

…

validation.cpp

Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included

2017-12-12 14:56:25 +01:00

validation.h

Merge #10279: Add a CChainState class to validation.cpp to take another step towards clarifying internal interfaces

2017-12-12 14:36:57 +01:00

validationinterface.cpp

Fix shutdown in case of errors during initialization

2017-11-28 12:12:05 +01:00

validationinterface.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

version.h

…

versionbits.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

versionbits.h

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

warnings.cpp

scripted-diff: Replace #include "" with #include <> (ryanofsky)

2017-11-16 08:23:01 +13:00

warnings.h

…