MarcoFalke 93d20a734d Merge #11309: Minor cleanups for AcceptToMemoryPool ...

bf64c3cb3 Ignore transactions added to mempool during a reorg for fee estimation purposes. (Alex Morcos)
04f78ab5b Do not reject based on mempool min fee when bypass_limits is set. (Alex Morcos)
fd849e1b0 Change AcceptToMemoryPool function signature (Alex Morcos)

Pull request description:

  First commit just removes default arguments from `AcceptToMemoryPool` and consolidates two arguments, it does not change behavior.

  Second commit finally fixes the fact that we're not meant to reject based on mempool min fee when adding a transaction from a disconnected block during a reorg as mentioned [here](https://github.com/bitcoin/bitcoin/pull/9602#issue-202197849)

  Third commit makes fee estimation ignore transactions added from a disconnected block during a reorg. I think this was another source of fee estimates returning estimates below 1000 sat/kB as in #11303.

Tree-SHA512: 30925ca8b341915bb214f1d2590b36b7931f2e125b7660150e38ae70338f00db5aa7f1608546dddb181446924177eb7cf62ea8bd2583068acc074d6c3f86bc0c

2017-09-29 15:07:57 +02:00

..

bench

Changing &vec[0] to vec.data(), what 9804 missed

2017-09-08 10:36:26 +12:00

compat

Merge #11144: Move local include to before system includes

2017-08-28 17:57:44 +02:00

config

…

consensus

Trivial: Fix validation comments

2017-09-15 14:07:41 +03:00

crypto

Merge #11143: Fix include path for bitcoin-config.h

2017-09-05 23:15:55 +02:00

leveldb

Update LevelDB with latest Bitcoin-specific patches

2017-08-01 12:40:42 -07:00

obj

…

obj-test

…

policy

Implement BIP173 addresses and tests

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

primitives

Merge #8330: Structure Packing Optimizations in C{,Mutable}Transaction

2017-09-06 20:14:52 +02:00

qt

Merge #11167: Full BIP173 (Bech32) support

2017-09-29 10:18:45 +02:00

rpc

Merge #11309: Minor cleanups for AcceptToMemoryPool

2017-09-29 15:07:57 +02:00

script

Implement BIP173 addresses and tests

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

secp256k1

Fixed multiple typos

2017-06-22 19:18:10 +03:00

support

Refactor: Modernize disallowed copy constructors/assignment

2017-09-16 13:06:05 +03:00

test

Merge #11309: Minor cleanups for AcceptToMemoryPool

2017-09-29 15:07:57 +02:00

univalue

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

wallet

Merge #11309: Minor cleanups for AcceptToMemoryPool

2017-09-29 15:07:57 +02:00

zmq

Merge #10809: optim: mark a few classes final

2017-08-21 18:25:48 +02:00

.clang-format

Merge #10193: scripted-diff: Remove #include <boost/foreach.hpp>

2017-07-04 18:05:18 +02:00

addrdb.cpp

Deduplicate addrdb.cpp and use CHashWriter/Verifier

2017-06-01 16:42:07 -07:00

addrdb.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

addrman.cpp

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

addrman.h

when clearing addrman clear mapInfo and mapAddr

2017-09-05 17:32:06 -07:00

amount.h

…

arith_uint256.cpp

Fix instantiation and array accesses in class base_uint<BITS>

2017-06-07 17:21:29 +00:00

arith_uint256.h

Prefer compile-time checking over run-time checking

2017-08-17 00:42:32 +02:00

base58.cpp

Implement BIP173 addresses and tests

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

base58.h

Implement {Encode,Decode}Destination without CBitcoinAddress

2017-09-23 14:45:01 -07:00

bech32.cpp

Import Bech32 C++ reference code & tests

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

bech32.h

Import Bech32 C++ reference code & tests

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

bitcoin-cli-res.rc

…

bitcoin-cli.cpp

rpc: Handle getinfo locally in bitcoin-cli w/ -getinfo

2017-09-27 21:53:07 -04:00

bitcoin-tx-res.rc

…

bitcoin-tx.cpp

Disallow uncompressed pubkeys in bitcoin-tx [multisig] output adds

2017-09-20 23:29:59 -04:00

bitcoind-res.rc

…

bitcoind.cpp

scripted-diff: stop using the gArgs wrappers

2017-08-14 17:02:10 +02:00

blockencodings.cpp

Fix typos

2017-07-15 14:28:40 +02:00

blockencodings.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

bloom.cpp

scripted-diff: Remove #include <boost/foreach.hpp>

2017-06-22 03:48:52 +02:00

bloom.h

…

chain.cpp

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

chain.h

Ensure that data types are consistent

2017-09-07 11:17:35 +08:00

chainparams.cpp

Implement BIP173 addresses and tests

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

chainparams.h

Implement BIP173 addresses and tests

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

chainparamsbase.cpp

Merge #10825: net: set regtest JSON-RPC port to 18443 to avoid conflict with testnet 18332

2017-09-06 01:18:35 +02:00

chainparamsbase.h

…

chainparamsseeds.h

p2p: Hardcoded seeds update pre-0.15 branch

2017-07-30 14:04:51 +02:00

checkpoints.cpp

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

checkpoints.h

…

checkqueue.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

clientversion.cpp

Correct typo in comments

2017-09-29 14:50:30 +08:00

clientversion.h

…

coins.cpp

Use nullptr instead of zero (0) as the null pointer constant

2017-08-16 10:24:18 +02:00

coins.h

Refactor: Modernize disallowed copy constructors/assignment

2017-09-16 13:06:05 +03:00

compat.h

Move CloseSocket out of SetSocketNonBlocking and pass SOCKET by const reference in SetSocket* functions

2017-07-22 09:11:55 +02:00

compressor.cpp

Fix subscript[0] in compressor.cpp

2017-07-08 13:33:01 -07:00

compressor.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

core_io.h

Pass serialization flags and whether to include hex to TxToUniv

2017-08-17 10:42:51 -07:00

core_memusage.h

Avoid dereference-of-casted-pointer

2017-07-07 10:45:31 -07:00

core_read.cpp

Fix signed/unsigned comparison warning introduced in c8e29d7ff0.

2017-07-12 14:03:42 -04:00

core_write.cpp

Introduce wrappers around CBitcoinAddress

2017-09-06 13:07:45 -07:00

cuckoocache.h

Fix header guards using reserved identifiers

2017-08-26 02:56:53 +03:00

dbwrapper.cpp

Merge #10701: Remove the virtual specifier for functions with the override specifier

2017-09-04 18:06:44 -07:00

dbwrapper.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

fs.cpp

Remove unused Boost includes

2017-06-09 10:25:26 +02:00

fs.h

[Trivial] Add BITCOIN_FS_H endif footer in fs.h

2017-05-19 02:01:28 -07:00

hash.cpp

Cleanup (safe, it was checked) subscript[0] in MurmurHash3 (and cleanup MurmurHash3 to be more clear).

2017-07-08 13:33:01 -07:00

hash.h

Remove some unused functions and methods

2017-09-21 23:40:33 -07:00

httprpc.cpp

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

httprpc.h

Remove unnecessary forward class declarations in header files

2017-06-12 20:37:43 +02:00

httpserver.cpp

Merge #10809: optim: mark a few classes final

2017-08-21 18:25:48 +02:00

httpserver.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

indirectmap.h

…

init.cpp

Merge #11031: [rpc] deprecate estimatefee

2017-09-27 14:38:13 +02:00

init.h

init: Factor out AppInitLockDataDirectory

2017-07-17 14:56:52 +02:00

key.cpp

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

key.h

Remove some unused functions and methods

2017-09-21 23:40:33 -07:00

keystore.cpp

Remove unused Boost includes

2017-06-09 10:25:26 +02:00

keystore.h

Merge #10916: add missing lock to crypter GetKeys()

2017-09-07 22:04:18 +02:00

limitedmap.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

Makefile.am

Import Bech32 C++ reference code & tests

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

Makefile.bench.include

leveldb: enable runtime-detected crc32 instructions

2017-06-09 19:25:36 -07:00

Makefile.leveldb.include

build: verify that the assembler can handle crc32 functions

2017-07-13 12:49:05 -04:00

Makefile.qt.include

leveldb: enable runtime-detected crc32 instructions

2017-06-09 19:25:36 -07:00

Makefile.qttest.include

Remove redundant testutil files

2017-09-05 15:02:17 +12:00

Makefile.test.include

Import Bech32 C++ reference code & tests

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

memusage.h

scripted-diff: Remove #include <boost/foreach.hpp>

2017-06-22 03:48:52 +02:00

merkleblock.cpp

Merge #9980: Fix mem access violation merkleblock

2017-07-17 15:12:39 -07:00

merkleblock.h

Add const to methods that do not modify the object for which it is called

2017-07-25 13:46:52 +02:00

miner.cpp

Deprecate confusing blockmaxsize, fix getmininginfo output

2017-09-11 15:51:25 -04:00

miner.h

Remove nBlockMaxSize from miner opt struct as it is no longer used.

2017-09-18 23:40:38 +00:00

net_processing.cpp

Change AcceptToMemoryPool function signature

2017-09-12 12:30:26 -04:00

net_processing.h

net: drop unused connman param

2017-09-06 19:32:04 -04:00

net.cpp

Merge #10663: net: split resolve out of connect

2017-09-28 17:05:47 +02:00

net.h

Merge #11301: add m_added_nodes to connman options

2017-09-22 16:05:50 -07:00

netaddress.cpp

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

netaddress.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

netbase.cpp

Merge #10663: net: split resolve out of connect

2017-09-28 17:05:47 +02:00

netbase.h

net: remove now-unused functions

2017-09-18 13:47:47 -04:00

netmessagemaker.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

noui.cpp

…

noui.h

…

pow.cpp

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

pow.h

…

prevector.h

Fix header guards using reserved identifiers

2017-08-26 02:56:53 +03:00

protocol.cpp

Merge #9544: [trivial] Add end of namespace comments. Improve consistency.

2017-06-26 13:40:26 +02:00

protocol.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

pubkey.cpp

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

pubkey.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

random.cpp

Merge #10843: Add attribute [[noreturn]] (C++11) to functions that will not return

2017-08-22 09:38:49 +02:00

random.h

Merge #10377: Use rdrand as entropy source on supported platforms

2017-06-14 15:22:15 +02:00

rest.cpp

Merge #10845: Remove unreachable code

2017-09-06 21:44:18 +02:00

reverse_iterator.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

reverselock.h

…

scheduler.cpp

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

scheduler.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

serialize.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

streams.h

Refactor: Modernize disallowed copy constructors/assignment

2017-09-16 13:06:05 +03:00

sync.cpp

Use nullptr instead of zero (0) as the null pointer constant

2017-08-16 10:24:18 +02:00

sync.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

threadinterrupt.cpp

…

threadinterrupt.h

…

threadsafety.h

…

timedata.cpp

scripted-diff: stop using the gArgs wrappers

2017-08-14 17:02:10 +02:00

timedata.h

…

tinyformat.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

torcontrol.cpp

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

torcontrol.h

…

txdb.cpp

Merge #10770: Drop upgrade-cancel callback registration for a generic "cancelable"

2017-09-07 09:21:04 -07:00

txdb.h

Refactor: Modernize disallowed copy constructors/assignment

2017-09-16 13:06:05 +03:00

txmempool.cpp

Remove redundant explicitly defined copy ctors

2017-08-28 01:29:48 +03:00

txmempool.h

Merge #11164: Fix boost headers included as user instead of system headers

2017-09-05 22:27:17 +02:00

ui_interface.cpp

…

ui_interface.h

Drop upgrade-cancel callback registration for a generic "resumeable"

2017-08-20 20:04:15 -04:00

uint256.cpp

Changing &vec[0] to vec.data(), what 9804 missed

2017-09-08 10:36:26 +12:00

uint256.h

Remove some unused functions and methods

2017-09-21 23:40:33 -07:00

undo.h

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

util.cpp

Merge #10901: Fix constness of ArgsManager methods

2017-08-16 16:09:27 +02:00

util.h

Merge #10901: Fix constness of ArgsManager methods

2017-08-16 16:09:27 +02:00

utilmoneystr.cpp

…

utilmoneystr.h

doc: Add comment to use ValueFromAmount/AmountFromValue for JSON, not utilmoneystr

2017-08-07 17:10:42 +02:00

utilstrencodings.cpp

Allow setting nMinimumChainWork on command line

2017-09-05 15:05:28 -04:00

utilstrencodings.h

Implement BIP173 addresses and tests

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

utiltime.cpp

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

utiltime.h

…

validation.cpp

Merge #11309: Minor cleanups for AcceptToMemoryPool

2017-09-29 15:07:57 +02:00

validation.h

Merge #11309: Minor cleanups for AcceptToMemoryPool

2017-09-29 15:07:57 +02:00

validationinterface.cpp

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

validationinterface.h

Remove declaration of unused function: void UpdatedTransaction(const uint256 &)

2017-07-15 20:04:04 +02:00

version.h

Remove unused constant MEMPOOL_GD_VERSION

2017-06-09 01:45:36 +02:00

versionbits.cpp

Declare single-argument (non-converting) constructors "explicit"

2017-08-16 16:33:25 +02:00

versionbits.h

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL

2017-08-07 07:36:37 +02:00

warnings.cpp

scripted-diff: stop using the gArgs wrappers

2017-08-14 17:02:10 +02:00

warnings.h

remove some unused functions

2017-07-22 09:55:57 +02:00