Luke Dashjr
a68bb9f5e7
Merge branch 'master' into single_prodname
2016-02-03 05:41:13 +00:00
Luke Dashjr
027fdb83b4
When/if the copyright line does not mention Bitcoin Core developers, add a second line to copyrights in -version, About dialog, and splash screen
2016-02-03 05:38:51 +00:00
Luke Dashjr
cc2095ecae
Rewrite FormatParagraph to handle newlines within input strings correctly
2016-02-03 05:38:43 +00:00
MarcoFalke
fa79db2641
Move maxTxFee out of mempool
...
Also, remove default values in CMerkleTx::AcceptToMemoryPool()
2016-02-02 20:08:51 +01:00
Wladimir J. van der Laan
fd13fe7ca0
Merge #7091 : Consensus build package
...
cf82d05
Build: Consensus: Make libbitcoinconsensus_la_SOURCES fully dynamic and dependend on both crypto and consensus packages (Jorge Timón)
4feadec
Build: Libconsensus: Move libconsensus-ready files to the consensus package (Jorge Timón)
a3d5eec
Build: Consensus: Move consensus files from common to its own module/package (Jorge Timón)
2016-02-02 19:02:22 +01:00
Wladimir J. van der Laan
11d74f6a6b
Merge #7084 : mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee
...
fa1193e
[doxygen] Actually display comment (MarcoFalke)
fa331db
mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee (MarcoFalke)
2016-02-02 15:18:07 +01:00
Wladimir J. van der Laan
47ac04e8b1
Merge #7311 : MOVEONLY: Move non-consensus functions out of pow
...
e867561
MOVEONLY: non-consensus: from pow to chain: (Jorge Timón)
2016-02-02 14:16:16 +01:00
MarcoFalke
fa1193e254
[doxygen] Actually display comment
2016-02-02 13:39:23 +01:00
Luke Dashjr
b922fbe063
Rename replacebyfee=opt-in to mempoolreplacement=fee
2016-02-01 19:30:37 +00:00
Suhas Daftuar
dbb89dc793
Eliminate unnecessary call to CheckBlock
...
ProcessNewBlock would return failure early if CheckBlock failed, before
calling AcceptBlock. AcceptBlock also calls CheckBlock, and upon failure
would update mapBlockIndex to indicate that a block was failed. By returning
early in ProcessNewBlock, we were not marking blocks that fail a check in
CheckBlock as permanently failed, and thus would continue to re-request and
reprocess them.
2016-02-01 14:29:45 -05:00
Gregory Maxwell
1e05727072
Decide eviction group ties based on time.
...
This corrects a bug the case of tying group size where the code may
fail to select the group with the newest member. Since newest time
is the final selection criteria, failing to break ties on it
on the step before can undermine the final selection.
Tied netgroups are very common.
(cherry picked from commit 8e09f914f8ec66301257358b250e9a61befadd95)
2016-02-01 15:31:21 +01:00
Gregory Maxwell
1e9613ac09
Do not absolutely protect local peers from eviction.
...
With automatic tor HS support in place we should probably not be providing
absolute protection for local peers, since HS inbound could be used to
attack pretty easily. Instead, this counts on the latency metric inside
AttemptToEvictConnection to privilege actually local peers.
(cherry picked from commit 46dbcd4833115401fecbb052365b4c7725874414)
2016-02-01 15:31:17 +01:00
Pieter Wuille
5d743099b5
Get rid of inaccurate ScriptSigArgsExpected
...
(cherry picked from commit 52b29dca7670c3f6d2ab918c0fff1d17c4e494ad)
2016-02-01 15:28:25 +01:00
Wladimir J. van der Laan
58a8574400
Merge #7439 : Add whitelistforcerelay to control forced relaying. [ #7099 redux]
...
89d113e
Blacklist -whitelistalwaysrelay; replaced by -whitelistrelay. (Gregory Maxwell)
325c725
Add whitelistforcerelay to control forced relaying. (Gregory Maxwell)
2016-02-01 14:11:15 +01:00
Gregory Maxwell
89d113e02a
Blacklist -whitelistalwaysrelay; replaced by -whitelistrelay.
2016-02-01 12:32:57 +00:00
Wladimir J. van der Laan
31ec14b74b
Merge #7287 : Consensus: Remove calls to error() and FormatStateMessage()
...
93fc58c
Consensus: Remove calls to error() and FormatStateMessage() from some consensus code in main (Jorge Timón)
2016-02-01 10:21:53 +01:00
Peter Todd
2f19905324
Improve block validity/ConnectBlock() comments
...
Previously didn't make clear that the ContextualCheckBlock* functions
meant the block headers as context - not the UTXO set itself - and that
ConnectBlock() also did UTXO-related validity checks (in the future we
may split that functionality into a separate UTXO-specific contextual
check block function).
Also, reordered to put validity checks first for better readability.
2016-01-31 00:40:23 -05:00
Luke Dashjr
cdcad9fc5f
LDADD dependency order shuffling
2016-01-31 02:32:55 +00:00
Luke Dashjr
62f7f2ee21
Bugfix: Always include univalue in DIST_SUBDIRS
2016-01-31 02:32:00 +00:00
MarcoFalke
fa331db68b
mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee
2016-01-30 11:29:22 +01:00
Jorge Timón
93fc58c742
Consensus: Remove calls to error() and FormatStateMessage() from some consensus code in main
2016-01-29 18:38:39 +01:00
Wladimir J. van der Laan
019280617a
Merge #6842 : limitfreerelay edge case bugfix
...
2dfeaa1
limitfreerelay edge case bugfix: (ptschip)
2016-01-29 13:12:02 +01:00
Luke Dashjr
3b66e54457
Simplify check for replacebyfee=opt-in
2016-01-29 01:28:54 +00:00
Gregory Maxwell
325c725fb6
Add whitelistforcerelay to control forced relaying.
...
Also renames whitelistalwaysrelay.
Nodes relay all transactions from whitelisted peers, this
gets in the way of some useful reasons for whitelisting
peers-- for example, bypassing bandwidth limitations.
The purpose of this forced relaying is for specialized gateway
applications where a node is being used as a P2P connection
filter and multiplexer, but where you don't want it getting
in the way of (re-)broadcast.
This change makes it configurable with whitelistforcerelay.
2016-01-28 22:26:21 +00:00
Kefkius
8b3d8e3991
GUI: Disable tab navigation for peers tables.
...
Fix a bug in which the Peers tab of the debug window
does not allow navigation to other tabs via Ctrl[+Shift]+Tab.
2016-01-28 15:26:54 -05:00
Wladimir J. van der Laan
326ffed09b
Merge #7212 : Adds unittests for CAddrMan and CAddrinfo, removes source of non-determinism.
...
40c87b6
Increase test coverage for addrman and addrinfo (Ethan Heilman)
2016-01-28 13:14:07 +01:00
Wladimir J. van der Laan
62f2d769e4
Merge #7348 : MOVE ONLY: move rpc* to rpc/
...
d13f65e
rpc: update inline comments to refer to new file paths (Daniel Cousens)
a0eaff8
move rpc* to rpc/ (Daniel Cousens)
2016-01-28 11:28:24 +01:00
Wladimir J. van der Laan
4a46bdc0fe
Merge #7415 : net: Hardcoded seeds update January 2016
...
4818dba
net: Hardcoded seeds update January 2016 (Wladimir J. van der Laan)
2016-01-28 10:54:14 +01:00
Jonas Schnelli
cdcbc59a42
Merge #7396 : [Qt] Add option to increase/decrease font size in the console window
...
43abb02
[Qt] Add a new chevron/arrow icon for the console prompt line (Jonas Schnelli)
56c9e66
[Qt] keep scroll position in GUI console after changing font size (Jonas Schnelli)
3a3a927
[Qt] Add option to increase/decrease font size in the console window (Jonas Schnelli)
2016-01-28 10:23:31 +01:00
Luke Dashjr
d65dee961e
Accept replacebyfee=opt-in for turning on opt-in RBF
...
Basic forward-compatibility with more flexible parameters like fss
2016-01-28 06:10:35 +00:00
Luke Dashjr
77b55a00ed
Rename permitrbf to replacebyfee
...
"permit" is currently used to configure transaction filtering, whereas replacement is more to do with the memory pool state than the transaction itself.
2016-01-28 05:11:06 +00:00
Luke Dashjr
78ec83ddfe
splashscreen: Resize text to fit exactly
2016-01-27 20:29:18 +00:00
Ethan Heilman
40c87b6e69
Increase test coverage for addrman and addrinfo
...
Adds several unittests for CAddrMan and CAddrInfo.
Increases the accuracy of addrman tests.
Removes non-determinism in tests by overriding the random number generator.
Extracts testing code from addrman class to test class.
2016-01-27 10:50:58 -05:00
Wladimir J. van der Laan
9189e30b12
Merge #7300 : [trivial] Add missing copyright headers
...
fabcee1
Remove copyright header from autogenerated chainparamsseeds.h (MarcoFalke)
fa60d05
Add missing copyright headers (MarcoFalke)
fa7e4c0
Bump copyright headers to 2014 (MarcoFalke)
2016-01-27 12:06:31 +01:00
Cory Fields
f3d3eaf78e
release: add check-symbols and check-security make targets
...
These are not added to the default checks because some of them depend on
release-build configs.
2016-01-26 23:07:04 -05:00
Jonas Schnelli
43abb02aa2
[Qt] Add a new chevron/arrow icon for the console prompt line
2016-01-26 15:34:36 +01:00
Wladimir J. van der Laan
473ad1bb02
Merge #7391 : [init] Clarify help message
...
fae78fa
[init] Clarify permitrbf help message (MarcoFalke)
2016-01-25 17:44:58 +01:00
Wladimir J. van der Laan
4818dba900
net: Hardcoded seeds update January 2016
2016-01-25 16:14:14 +01:00
MarcoFalke
fae78fa818
[init] Clarify permitrbf help message
2016-01-23 22:46:24 +01:00
Jonas Schnelli
f281caac48
Merge #7384 : [qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH
...
faa9011
[qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH (MarcoFalke)
2016-01-23 14:17:18 +01:00
Jonas Schnelli
56c9e66a6d
[Qt] keep scroll position in GUI console after changing font size
2016-01-23 00:05:14 +01:00
Jonas Schnelli
3a3a927325
[Qt] Add option to increase/decrease font size in the console window
2016-01-22 21:46:42 +01:00
Wladimir J. van der Laan
fc08994000
Merge #7262 : Reduce inefficiency of GetAccountAddress()
...
2409865
Reduce inefficiency of GetAccountAddress() (Chris Moore)
2016-01-22 15:31:11 +01:00
Wladimir J. van der Laan
6a07208388
Merge #7056 : Save last db read
...
8504867
Save the last unnecessary database read (Alex Morcos)
2016-01-22 14:15:52 +01:00
Jonas Schnelli
f221fc1887
Merge #7364 : [qt] Windows: Make rpcconsole monospace font larger
...
fa6a59d
[qt] Windows: Make rpcconsole monospace font larger (MarcoFalke)
2016-01-22 09:47:51 +01:00
Wladimir J. van der Laan
b768108d9c
Add option -permitrbf
to set transaction replacement policy
...
Add a configuration option `-permitrbf` to set transaction replacement policy
for the mempool.
Enabling it will enable (opt-in) RBF, disabling it will refuse all
conflicting transactions.
2016-01-21 11:24:31 +01:00
Jonas Schnelli
ae2db67fee
Merge #7383 : [Qt] rename "amount" to "requested amount" in receive coins table
...
df6e8e1
[Qt] rename "amount" to "requested amount" in receive coins table (Jonas Schnelli)
2016-01-21 09:00:53 +01:00
MarcoFalke
faa9011d09
[qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH
2016-01-20 23:00:10 +01:00
Daniel Cousens
d13f65ebac
rpc: update inline comments to refer to new file paths
2016-01-21 08:39:04 +11:00
Daniel Cousens
a0eaff8a1d
move rpc* to rpc/
2016-01-21 08:36:55 +11:00
Jonas Schnelli
df6e8e17e4
[Qt] rename "amount" to "requested amount" in receive coins table
2016-01-20 17:30:06 +01:00
Wladimir J. van der Laan
b92ea98503
Merge #7183 : Improved readability of ApproximateBestSubset
...
96efcad
Improved readability of sorting for coin selection. (Murch)
2016-01-20 15:55:03 +01:00
Wladimir J. van der Laan
9982710e88
Merge #7307 : [RPC, Wallet] Move RPC dispatch table registration to wallet/ code
...
dd2dc40
[RPC, Wallet] Move RPC dispatch table registration to wallet/ code (Jonas Schnelli)
2016-01-20 15:15:51 +01:00
Jonas Schnelli
dd2dc400ee
[RPC, Wallet] Move RPC dispatch table registration to wallet/ code
...
Allow extending the rpc dispatch table by appending commands when server is not running.
2016-01-20 15:03:25 +01:00
Wladimir J. van der Laan
82429d0861
Merge #7222 : RPC: Indicate which transactions are signaling opt-in RBF
...
eaa8d27
RPC: indicate which transactions are replaceable (Suhas Daftuar)
2016-01-20 13:50:37 +01:00
Wladimir J. van der Laan
5578144413
Merge #7350 : Banlist updates
...
e8600c9
banlist (bugfix): allow CNode::SweepBanned() to run on interval (Philip Kaufmann)
2977c24
banlist: add more banlist infos to log / add GUI signal (Philip Kaufmann)
ce479aa
banlist: better handling of banlist in StartNode() (Philip Kaufmann)
57c77fe
banlist: update set dirty to be more fine grained (Philip Kaufmann)
2016-01-20 13:38:40 +01:00
MarcoFalke
fa6d4cc095
[walletdb] Fix syntax error in key parser
2016-01-20 09:44:53 +01:00
Suhas Daftuar
eaa8d2754b
RPC: indicate which transactions are replaceable
...
Add "bip125-replaceable" output field to listtransactions and gettransaction
which indicates if an unconfirmed transaction, or any unconfirmed parent, is
signaling opt-in RBF according to BIP 125.
2016-01-19 08:30:04 -05:00
Wladimir J. van der Laan
f9fd4c2884
Merge pull request #7281 : Improve CheckInputs() comment about sig verification
...
fd83615
Improve CheckInputs() comment about sig verification (Peter Todd)
2016-01-19 13:23:32 +01:00
Wladimir J. van der Laan
3b43cad9d0
Merge pull request #7164 : Do not download transactions during initial blockchain sync
...
39a525c
Do not download transactions during inital sync (ptschip)
2016-01-19 12:58:15 +01:00
Luke Dashjr
3cae14056a
Bugfix: Actually use _COPYRIGHT_HOLDERS_SUBSTITUTION everywhere
2016-01-19 08:42:05 +00:00
Wladimir J. van der Laan
e4e77ee55d
Merge pull request #7194
...
135d6ec
Add RPC tests for getblockheader. (James O'Beirne)
4745636
Add RPC documentation for getblockheader[chainwork]. (James O'Beirne)
16d4fce
Add assert_is_hex_string and assert_is_hash_string to RPC test utils. (James O'Beirne)
2016-01-18 12:24:01 +01:00
Wladimir J. van der Laan
ae20172941
Merge pull request #7232
...
94bdd71
Added help text for chainwork value (Gregory Sanders)
2016-01-18 12:20:13 +01:00
Wladimir J. van der Laan
47c5ed19f3
Merge pull request #7208
...
64360f1
Make max tip age an option instead of chainparam (Wladimir J. van der Laan)
2016-01-18 11:55:59 +01:00
Wladimir J. van der Laan
c851d8d71b
Merge pull request #7290
...
fa461df
Clarify mocktime help message (MarcoFalke)
faa572a
[init] Help Msg: Use Params(CBaseChainParams::MAIN) (MarcoFalke)
fa6ab96
[init] Add missing help for args (MarcoFalke)
fac11ea
[init] Fix error message of maxtxfee invalid amount (MarcoFalke)
2016-01-18 11:21:51 +01:00
Wladimir J. van der Laan
5e00147838
Merge pull request #7313
...
0331aa3
Fixing typos on security-check.py and torcontrol.cpp (calebogden)
2016-01-18 10:45:25 +01:00
Wladimir J. van der Laan
a8bd616fea
Merge pull request #7329
...
9d263bd
Typo fixes in comments (Chris Wheeler)
2016-01-18 10:41:32 +01:00
Wladimir J. van der Laan
2350ab28fb
Merge pull request #7363
...
bd34174
Update license year range to 2016 (Prayag Verma)
2016-01-18 10:30:22 +01:00
MarcoFalke
fa6a59dd39
[qt] Windows: Make rpcconsole monospace font larger
2016-01-17 19:28:49 +01:00
Prayag Verma
bd34174ebc
Update license year range to 2016
2016-01-17 23:38:11 +05:30
Chris Wheeler
9d263bd17c
Typo fixes in comments
2016-01-17 11:03:56 +00:00
MarcoFalke
fabcee1972
Remove copyright header from autogenerated chainparamsseeds.h
2016-01-16 15:31:22 +01:00
Wladimir J. van der Laan
fd9356ba4e
Merge pull request #7322
...
c0cf48d
c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally (Cory Fields)
2016-01-16 10:49:46 +01:00
Luke Dashjr
5bc4fb7b60
Merge branch 'master' into 20150703_banlist_updates
2016-01-15 05:17:15 +00:00
Luke Dashjr
ab22705a7b
Build against system UniValue when available
2016-01-15 04:34:06 +00:00
Luke Dashjr
2adf7e2c90
Bugfix: The var is LIBUNIVALUE,not LIBBITCOIN_UNIVALUE
2016-01-15 04:34:02 +00:00
Wladimir J. van der Laan
e1060c56cc
Merge pull request #7334
...
fa989fb
[qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5) (MarcoFalke)
2016-01-14 13:56:59 +01:00
Jonas Schnelli
c079d79c9a
Merge pull request #7327
...
30cdace
[Wallet] Transaction View: LastMonth calculation fixed (crowning-)
2016-01-13 21:24:43 +01:00
crowning-
30cdacea3c
[Wallet] Transaction View: LastMonth calculation fixed
2016-01-13 21:17:08 +01:00
MarcoFalke
fa989fbf57
[qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5)
2016-01-13 18:46:12 +01:00
Wladimir J. van der Laan
17ef279304
Merge pull request #7332
...
faf671b
[wallet] Clarify rpc help message with regard to rounding (MarcoFalke)
2016-01-13 16:01:28 +01:00
Wladimir J. van der Laan
be6d5a617d
Merge pull request #7312
...
d11fc16
[Wallet] Call notification signal when a transaction is abandoned (Jonas Schnelli)
df0e222
Add RPC test for abandoned and conflicted transactions. (Alex Morcos)
01e06d1
Add new rpc call: abandontransaction (Alex Morcos)
9e69717
Make wallet descendant searching more efficient (Alex Morcos)
2016-01-13 15:47:45 +01:00
Jonas Schnelli
d11fc1695c
[Wallet] Call notification signal when a transaction is abandoned
2016-01-13 08:42:04 -05:00
Alex Morcos
01e06d1fa3
Add new rpc call: abandontransaction
...
Unconfirmed transactions that are not in your mempool either due to eviction or other means may be unlikely to be mined. abandontransaction gives the wallet a way to no longer consider as spent the coins that are inputs to such a transaction. All dependent transactions in the wallet will also be marked as abandoned.
2016-01-13 08:42:04 -05:00
MarcoFalke
faf671bca6
[wallet] Clarify rpc help message with regard to rounding
2016-01-13 12:06:24 +01:00
Wladimir J. van der Laan
2cd004b123
Merge pull request #7326
...
3a9dfe9
Fix typo, wrong information in gettxout help text. (paveljanik)
2016-01-13 11:50:38 +01:00
Wladimir J. van der Laan
c49551886a
Merge pull request #7296
...
bebe58b
SQUASHME: Fix rpc tests that assumed fallback to minRelayTxFee (Alex Morcos)
e420a1b
Add sane fallback for fee estimation (Alex Morcos)
995b9f3
Always respect GetRequiredFee for wallet txs (Alex Morcos)
2016-01-13 11:04:31 +01:00
Jorge Timón
e86756193e
MOVEONLY: non-consensus: from pow to chain:
...
- GetBlockProof
- GetBlockProofEquivalentTime
2016-01-12 13:43:14 +01:00
Gregory Sanders
94bdd71f9b
Added help text for chainwork value
2016-01-11 12:06:55 -05:00
paveljanik
3a9dfe9d14
Fix typo, wrong information in gettxout help text.
2016-01-10 17:33:54 +01:00
Wladimir J. van der Laan
dd1304ec21
Merge pull request #7081
...
45b8e27
-bytespersigop option to additionally limit sigops in transactions we relay and mine (Luke Dashjr)
2016-01-09 18:01:54 +01:00
Luke Dashjr
fdc202f4b0
Merge branch bytespersigop
2016-01-09 16:53:12 +00:00
MarcoFalke
fa461df685
Clarify mocktime help message
2016-01-09 13:57:08 +01:00
calebogden
0331aa350c
Fixing typos on security-check.py and torcontrol.cpp
2016-01-08 13:31:42 -08:00
Cory Fields
c0cf48d1ac
c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally
...
Due to include ordering, defining in one place was not enough to ensure correct
usage. Use global defines so that we don't have to worry abou this ordering.
Also add a comment in configure about the test.
2016-01-08 13:32:00 -05:00
Wladimir J. van der Laan
9de541a9c9
Merge pull request #7306
...
f61766b
Make sure conflicted wallet tx's update balances (Alex Morcos)
2016-01-08 17:36:19 +01:00
Jonas Schnelli
8a7f0001be
[RPC] remove the option of having multiple timer interfaces
2016-01-08 11:18:28 +01:00
Jonas Schnelli
db198d51a6
Fix RPCTimerInterface ordering issue
...
Dispatching a QThread from a non Qt thread is not allowed. Always use the HTTPRPCTimerInterface (non QT) to dispatch RPCRunLater threads.
2016-01-08 11:15:00 +01:00
Alex Morcos
9e69717254
Make wallet descendant searching more efficient
2016-01-07 16:31:12 -05:00
Jonas Schnelli
b1cf0058d9
Merge pull request #7298
...
faf3299
[qt] Intro: Display required space (MarcoFalke)
2016-01-07 13:21:54 +01:00