Wladimir J. van der Laan
d8368a07ba
Merge pull request #7095
...
4ec3561 Replace scriptnum_test's normative ScriptNum implementation (Wladimir J. van der Laan)
2015-11-27 14:16:55 +01:00
Wladimir J. van der Laan
9502b7f634
Merge pull request #7083
...
faf12bc OpenSSL 1.1.0: Fix text variant of the version number (MarcoFalke)
2015-11-27 14:08:40 +01:00
Wladimir J. van der Laan
2a94cd67e8
Merge pull request #6780
...
a46f87f Initialize logging before we do parameter interaction (Jonas Schnelli)
df66147 Move -blocksonly parameter interaction to the new ParameterInteraction() function (Jonas Schnelli)
68354e7 [QT] Call inits parameter interaction before we create the options model (Jonas Schnelli)
411b05a Refactor parameter interaction, call it before AppInit2() (Jonas Schnelli)
2015-11-27 13:45:14 +01:00
Wladimir J. van der Laan
9b63758974
util: Don't set strMiscWarning on every exception
...
Fixes #6809 - run-of-the-mill exceptions should not get into
strMiscWarning (which is reported by `getinfo`).
2015-11-27 13:36:11 +01:00
Wladimir J. van der Laan
5ca149a3db
Merge pull request #7053
...
2e29e7e Globals: Remove a bunch of Params() calls from main.cpp: (Jorge Timón)
2015-11-27 13:29:54 +01:00
Jonas Schnelli
a46f87f0c1
Initialize logging before we do parameter interaction
2015-11-27 13:26:28 +01:00
Jonas Schnelli
df66147613
Move -blocksonly parameter interaction to the new ParameterInteraction() function
2015-11-27 13:26:28 +01:00
Jonas Schnelli
68354e75e9
[QT] Call inits parameter interaction before we create the options model
2015-11-27 13:26:01 +01:00
Jonas Schnelli
411b05ac95
Refactor parameter interaction, call it before AppInit2()
2015-11-27 13:26:00 +01:00
Wladimir J. van der Laan
0e935865b9
Merge pull request #6871
...
63b5840 Fix usage of local python-bitcoinlib (Peter Todd)
16a2f93 Fix incorrect locking of mempool during RBF replacement (Peter Todd)
97203f5 Port test to rpc-test framework (Suhas Daftuar)
20367d8 Add test for max replacement limit (Suhas Daftuar)
73d9040 Improve RBF replacement criteria (Suhas Daftuar)
b272ecf Reject replacements that add new unconfirmed inputs (Peter Todd)
fc8c19a Prevent low feerate txs from (directly) replacing high feerate txs (Peter Todd)
0137e6f Add tests for transaction replacement (Peter Todd)
5891f87 Add opt-in full-RBF to mempool (Peter Todd)
2015-11-27 13:20:39 +01:00
Wladimir J. van der Laan
e92377fa7f
Merge pull request #6134
...
e304432 Pass reference to estimateSmartFee and cleanup whitespace (Suhas Daftuar)
56106a3 Expose RPC calls for estimatesmart functions (Alex Morcos)
e93a236 add estimateSmartFee to the unit test (Alex Morcos)
6303051 EstimateSmart functions consider mempool min fee (Alex Morcos)
f22ac4a Increase success threshold for fee estimation to 95% (Alex Morcos)
4fe2823 Change wallet and GUI code to use new smart fee estimation calls. (Alex Morcos)
22eca7d Add smart fee estimation functions (Alex Morcos)
2015-11-27 12:59:37 +01:00
Wladimir J. van der Laan
05d591839f
Merge pull request #5967
...
072e2f8 Alter assumptions in CCoinsViewCache::BatchWrite (Alex Morcos)
2015-11-27 12:44:00 +01:00
Wladimir J. van der Laan
9a3e1a59df
Merge pull request #7058
...
ffacd27 zmq: prepend zmq to debug messages (Daniel Cousens)
14075b1 init: add zmq to debug categories (Daniel Cousens)
cdcd816 init: amend ZMQ flag names (Daniel Cousens)
2015-11-27 10:12:43 +01:00
Pieter Wuille
a9f3d3db5c
Fix and improve relay from whitelisted peers
...
This makes sure that retransmits by a whitelisted peer also actually
result in a retransmit.
Further, this changes the logic to never relay in case we would assign
a DoS score, as we expect to get DoS banned ourselves as a result.
2015-11-26 23:44:57 +01:00
Wladimir J. van der Laan
f8a8e27a6a
Merge pull request #7069
...
fa472f3 [trivial] Fix -maxmempool InitError (MarcoFalke)
2015-11-26 11:18:31 +01:00
Peter Todd
cde857f2d9
Connect to Tor hidden services by default
...
Adds 127.0.0.1:9050 for the .onion proxy if we can succesfully connect
to the control port.
Natural followup to creating hidden services automatically.
2015-11-26 05:14:31 -05:00
Wladimir J. van der Laan
be281d8a83
Merge pull request #7087
...
9cf6688 Document both the peerbloomfilters and enforcenodebloom options. (Patick Strateman)
0f4dc53 Add enforcenodebloom option. (Patick Strateman)
b3caa9b Move bloom filter filtering logic outside of command "switch" (giant if/else). (Patick Strateman)
2015-11-26 08:43:21 +01:00
Wladimir J. van der Laan
4ec3561eb3
Replace scriptnum_test's normative ScriptNum implementation
...
Compare against the scriptnum from Bitcoin Core 0.10 instead of OpenSSL.
Closes #7086 .
2015-11-25 13:59:49 +01:00
Wladimir J. van der Laan
2b2ddc558e
Merge pull request #7088
...
5ad5463 Squashed 'src/secp256k1/' changes from 2bfb82b..6c527ec (MarcoFalke)
2015-11-25 11:31:59 +01:00
daniel
c434940e83
uint256::GetCheapHash bigendian compatibility
2015-11-25 16:19:24 +08:00
Jonas Schnelli
26af1ac7cb
Merge pull request #7006
...
f71bfef add UI help for -resetguisettings (Jonas Schnelli)
ae98388 [Qt] add startup option to reset Qt settings (Jonas Schnelli)
2015-11-25 09:05:19 +01:00
Patick Strateman
1bb289fe1b
Assert now > 0 in GetTime GetTimeMillis GetTimeMicros
...
Previously all of these functions could return negative values (for different
readons). Large portions of the codebase currently assume that these
functions return positive values.
2015-11-24 18:39:19 -08:00
Wladimir J. van der Laan
b19fe277dd
Merge pull request #7075
...
4846543 Move time data log print to 'net' category to reduce log noise (tulip)
2015-11-24 16:02:02 +01:00
Suhas Daftuar
e30443244a
Pass reference to estimateSmartFee and cleanup whitespace
2015-11-24 08:53:14 -05:00
MarcoFalke
fa472f330f
[trivial] Fix -maxmempool InitError
2015-11-24 12:40:59 +01:00
Patick Strateman
9cf668844e
Document both the peerbloomfilters and enforcenodebloom options.
2015-11-24 02:08:00 -08:00
Patick Strateman
0f4dc53fd6
Add enforcenodebloom option.
...
Previously peers which implement a protocol version less than NO_BLOOM_VERSION
would not be disconnected for sending a filter command, regardless of the
peerbloomfilter option.
Many node operators do not wish to provide expensive bloom filtering for SPV
clients, previously they had to cherry pick the commit which enabled the
disconnect logic.
The default should remain false until a sufficient percent of SPV clients
have updated.
2015-11-24 02:08:00 -08:00
Wladimir J. van der Laan
02a0f348c2
Merge pull request #7066
...
5c2fd38 Add missing "blocktime" description to listtransactions help, fix formatting. (Pavel Janík)
2015-11-24 10:55:36 +01:00
Patick Strateman
b3caa9b7fa
Move bloom filter filtering logic outside of command "switch" (giant if/else).
...
Moving this logic outside of the "switch" makes it far simpler to
enable the forced disconnect by a parameter.
2015-11-24 01:50:53 -08:00
Wladimir J. van der Laan
72dccfc29d
Merge pull request #7045
...
2aa49ce Bugfix: Use unique autostart filenames on Linux for testnet/regtest (Luke Dashjr)
2015-11-24 09:51:02 +01:00
MarcoFalke
fa63e49b35
Merge commit '5ad54630935d1f340666de7bc9ffef9b8a1df296' into HEAD
2015-11-24 09:22:18 +01:00
MarcoFalke
faf12bc283
OpenSSL 1.1.0: Fix text variant of the version number
2015-11-24 09:07:26 +01:00
Wladimir J. van der Laan
f91e29fd4d
Merge pull request #7065
...
3522f49 http: add Boost 1.49 compatibility (Wladimir J. van der Laan)
2015-11-24 08:42:29 +01:00
Jorge Timón
2e29e7e247
Globals: Remove a bunch of Params() calls from main.cpp:
...
1) Chainparams: Explicit CChainParams arg for main:
-AcceptBlock
-AcceptBlockHeader
-ActivateBestChain
-ConnectTip
-InitBlockIndex
-LoadExternalBlockFile
-VerifyDB parametric constructor
2) Also pickup more Params()\. in main.cpp
3) Pass nPruneAfterHeight explicitly to new FindFilesToPrune() in main.cpp
2015-11-23 12:14:40 +01:00
Gregory Maxwell
ebb25f4c23
Limit setAskFor and retire requested entries only when a getdata returns.
...
The setAskFor duplicate elimination was too eager and removed entries
when we still had no getdata response, allowing the peer to keep
INVing and not responding.
2015-11-23 01:54:23 +00:00
kazcw
5029698186
prevent peer flooding request queue for an inv
...
mapAlreadyAskedFor does not keep track of which peer has a request queued for a
particular tx. As a result, a peer can blind a node to a tx indefinitely by
sending many invs for the same tx, and then never replying to getdatas for it.
Each inv received will be placed 2 minutes farther back in mapAlreadyAskedFor,
so a short message containing 10 invs would render that tx unavailable for 20
minutes.
This is fixed by disallowing a peer from having more than one entry for a
particular inv in mapAlreadyAskedFor at a time.
2015-11-23 01:18:54 +00:00
Gregory Maxwell
c322652b71
Merge pull request #7046
...
80ae230 Improve log messages for blocks only violations. (Patick Strateman)
08843ed Add relaytxes status to getpeerinfo (Peter Todd)
d8aaa51 Bail early in processing transactions in blocks only mode. (Patick Strateman)
3587f6a Fix relay mechanism for whitelisted peers under blocks only mode. (Patick Strateman)
2015-11-22 14:01:33 -08:00
tulip
4846543ac5
Move time data log print to 'net' category to reduce log noise
2015-11-22 06:48:25 +00:00
Patick Strateman
80ae230a52
Improve log messages for blocks only violations.
2015-11-21 16:09:52 -08:00
Gregory Maxwell
31de2414c6
Merge pull request #7011
...
6531f17 Add mediantime field to getblock and getblockheader (Peter Todd)
7259769 Document new mediantime field in getblockchaininfo (Peter Todd)
c277a63 Clarify nLockTime-by-time comment in CheckFinalTx() (Peter Todd)
748321e Add mediantime field to getblockchaininfo RPC call (Peter Todd)
2015-11-21 14:00:55 -08:00
Gregory Maxwell
616d61b20d
Merge pull request #6851
...
3e7c891 Optimisation: Store transaction list order in memory rather than compute it every need (Luke Dashjr)
2015-11-20 18:52:44 -08:00
Luke Dashjr
3e7c89196c
Optimisation: Store transaction list order in memory rather than compute it every need
...
Huge performance improvement (450%) for zapwallettxes
2015-11-21 01:48:25 +00:00
Peter Todd
08843ed998
Add relaytxes status to getpeerinfo
2015-11-20 16:07:12 -08:00
Patick Strateman
d8aaa51bec
Bail early in processing transactions in blocks only mode.
...
Previously unsolicited transactions would be processed as normal.
2015-11-20 16:07:12 -08:00
Patick Strateman
3587f6a024
Fix relay mechanism for whitelisted peers under blocks only mode.
...
Previously in blocks only mode all inv messages where type!=MSG_BLOCK would be
rejected without regard for whitelisting or whitelistalwaysrelay.
As such whitelisted peers would never send the transaction (which would be
processed).
2015-11-20 16:07:12 -08:00
Wladimir J. van der Laan
776848acef
Merge pull request #6979
...
c197798 [Qt] simple mempool info in debug window (Jonas Schnelli)
2015-11-20 14:34:11 +01:00
Pavel Janík
5c2fd38d05
Add missing "blocktime" description to listtransactions help, fix formatting.
2015-11-20 12:51:36 +01:00
Wladimir J. van der Laan
3522f49f5a
http: add Boost 1.49 compatibility
...
`try_join_for` was introduced in Boost 1.50:
http://www.boost.org/doc/libs/1_50_0/doc/html/thread/thread_management.html#thread.thread_management.thread.try_join_for
1.49 has `timed_join`, one can accomplish the same with:
http://www.boost.org/doc/libs/1_49_0/doc/html/thread/thread_management.html#thread.thread_management.thread.timed_join
However, `timed_join` was deprecated in 1.50. So a conditional is
necessary.
This solution was tested in #7031 .
2015-11-20 10:14:21 +01:00
Jonas Schnelli
c197798d1b
[Qt] simple mempool info in debug window
2015-11-20 08:40:43 +01:00
Alex Morcos
c0353064dd
Change GetPriority calculation.
...
Compute the value of inputs that already are in the chain at time of mempool entry and only increase priority due to aging for those inputs. This effectively changes the CTxMemPoolEntry's GetPriority calculation from an upper bound to a lower bound.
2015-11-19 21:44:35 -05:00
Alex Morcos
71f1d9fd4a
Modify variable names for entry height and priority
2015-11-19 21:28:01 -05:00
Alex Morcos
5945819717
Remove default arguments for CTxMemPoolEntry()
2015-11-19 21:28:01 -05:00
Wladimir J. van der Laan
52c563710d
qt: Periodic translations update
2015-11-19 12:58:09 +01:00
Wladimir J. van der Laan
a1907772f0
Merge pull request #7051
...
b4f3e9c ui: Add "Copy raw transaction data" to transaction list context menu (Wladimir J. van der Laan)
2015-11-19 12:52:27 +01:00
Wladimir J. van der Laan
b4f3e9c09e
ui: Add "Copy raw transaction data" to transaction list context menu
...
Add a way to quickly copy transaction hex.
Primarily useful when manually submitting transactions,
e.g. `-walletbroadcast=0` is set.
2015-11-19 11:08:29 +01:00
Daniel Cousens
ffacd27def
zmq: prepend zmq to debug messages
2015-11-19 13:32:14 +11:00
Daniel Cousens
14075b189d
init: add zmq to debug categories
2015-11-19 13:17:36 +11:00
Daniel Cousens
cdcd816a1b
init: amend ZMQ flag names
2015-11-19 12:34:19 +11:00
Jonas Schnelli
f71bfefcb0
add UI help for -resetguisettings
2015-11-18 21:50:32 +01:00
Alex Morcos
072e2f8644
Alter assumptions in CCoinsViewCache::BatchWrite
...
Previously it would break if you flushed a parent cache while there was a child cache referring to it. This change will allow the flushing of parent caches.
2015-11-18 12:03:50 -05:00
Wladimir J. van der Laan
73fa5e6043
Merge pull request #6932
...
1cf3dd8 Add unit test for UpdateCoins (Alex Morcos)
03c8282 Make CCoinsViewTest behave like CCoinsViewDB (Alex Morcos)
14470f9 ModifyNewCoins saves database lookups (Alex Morcos)
2015-11-18 17:37:58 +01:00
Jonas Schnelli
03403d8c0f
Merge pull request #6951
...
513686d [qt] Use maxTxFee instead of 10000000 (MarcoFalke)
2015-11-18 14:28:21 +01:00
Jonas Schnelli
2a8e8c2e37
[Qt] don't allow to store invalid proxy ports
2015-11-18 14:02:14 +01:00
Alex Morcos
e855b0152f
Fix debug log message for block files
2015-11-17 22:23:39 -05:00
Luke Dashjr
2aa49ce9fe
Bugfix: Use unique autostart filenames on Linux for testnet/regtest
2015-11-17 20:31:00 +00:00
Alex Morcos
e587bc3fd9
Implement helper class for CTxMemPoolEntry constructor
...
This is only for unit tests.
2015-11-16 20:41:32 -05:00
Gregory Maxwell
87ee0e2dbc
Merge pull request #6986
...
6bc9e40 Chainparams: Explicit CChainParams arg for miner: (Jorge Timón)
598e494 Chainparams: Explicit CChainParams arg for main (pre miner): (Jorge Timón)
2015-11-16 17:00:11 -08:00
Gregory Maxwell
972bf9c529
Merge pull request #6999
...
f6d9d5e add (max)uploadtarget infos to getnettotals RPC help (Jonas Schnelli)
2015-11-16 16:39:33 -08:00
Gregory Maxwell
0a547d2d55
Merge pull request #7023
...
4d29032 Fixed integer comparison warning. (Eric Lombrozo)
2015-11-16 16:34:51 -08:00
Alex Morcos
56106a3300
Expose RPC calls for estimatesmart functions
...
Also add testing for estimatesmartfee in smartfees.py
2015-11-16 15:42:31 -05:00
Alex Morcos
e93a236d7a
add estimateSmartFee to the unit test
2015-11-16 15:33:06 -05:00
Alex Morcos
6303051470
EstimateSmart functions consider mempool min fee
2015-11-16 15:33:06 -05:00
Alex Morcos
f22ac4a22c
Increase success threshold for fee estimation to 95%
...
This provides more conservative estimates and reacts more quickly to a backlog.
Unfortunately the unit test for fee estimation depends on the success threshold (and the decay) chosen; also modify the unit test for the new default success thresholds.
2015-11-16 15:33:06 -05:00
Alex Morcos
4fe28236c0
Change wallet and GUI code to use new smart fee estimation calls.
2015-11-16 15:33:06 -05:00
Alex Morcos
22eca7da22
Add smart fee estimation functions
...
These are more useful fee and priority estimation functions. If there is no fee/pri high enough for the target you are aiming for, it will give you the estimate for the lowest target that you can reliably obtain. This is better than defaulting to the minimum. It will also pass back the target for which it returned an answer.
2015-11-16 15:33:06 -05:00
Wladimir J. van der Laan
e54ebbf600
Merge pull request #6954
...
6e18268 Switch to libsecp256k1-based validation for ECDSA (Pieter Wuille)
2015-11-16 13:25:18 +01:00
Wladimir J. van der Laan
dafefb7924
Merge pull request #7016
...
aee22bf Avoid a compile error on hosts with libevent too old for EVENT_LOG_WARN. (Gregory Maxwell)
2015-11-16 12:03:19 +01:00
Jonas Schnelli
d16d1b72d1
[Qt] refactor and optimize proxy settings behavior
2015-11-16 11:05:26 +01:00
Gregory Maxwell
aee22bf288
Avoid a compile error on hosts with libevent too old for EVENT_LOG_WARN.
...
This uses _EVENT_LOG_WARN instead, which appears to be defined in the
old versions of libevent that I have on some systems.
2015-11-16 09:21:54 +00:00
Gregory Maxwell
6876a78b86
Merge pull request #6991
...
9bd3f03 Clarify 'fee' field in fundrawtransaction help text (Peter Todd)
2015-11-16 00:38:08 -08:00
Jonas Schnelli
814697c556
Merge pull request #7000
...
773ae46 [Qt] add shortcurts for debug-/console-window (Jonas Schnelli)
2015-11-16 08:39:42 +01:00
Eric Lombrozo
4d29032a64
Fixed integer comparison warning.
2015-11-15 20:13:30 -05:00
Pieter Wuille
6e18268616
Switch to libsecp256k1-based validation for ECDSA
2015-11-15 16:06:57 +01:00
Gregory Maxwell
b632145ede
Merge pull request #6993
...
bbf49da Fix comment for blocksonly parameter interactions (Patick Strateman)
6a4982f Fix fRelayTxs comment (Patick Strateman)
59441a0 Display DEFAULT_WHITELISTALWAYSRELAY in help text (Patick Strateman)
71a2683 Use DEFAULT_BLOCKSONLY and DEFAULT_WHITELISTALWAYSRELAY constants (Patick Strateman)
762b13b Add help text for blocksonly and whitelistalwaysrelay (Patick Strateman)
3a96497 Add whitelistalwaysrelay option (Patick Strateman)
420fa81 Do not process tx inv's in blocksonly mode (Patick Strateman)
4044f07 Add blocksonly mode (Patick Strateman)
2015-11-14 05:23:00 -08:00
Patick Strateman
bbf49da408
Fix comment for blocksonly parameter interactions
2015-11-14 05:14:01 -08:00
Patick Strateman
6a4982fb83
Fix fRelayTxs comment
2015-11-14 05:12:31 -08:00
Patick Strateman
59441a0445
Display DEFAULT_WHITELISTALWAYSRELAY in help text
2015-11-14 05:12:05 -08:00
Patick Strateman
71a2683f4b
Use DEFAULT_BLOCKSONLY and DEFAULT_WHITELISTALWAYSRELAY constants
2015-11-14 05:10:59 -08:00
Patick Strateman
762b13b4d8
Add help text for blocksonly and whitelistalwaysrelay
2015-11-14 04:54:01 -08:00
Patick Strateman
3a964973fe
Add whitelistalwaysrelay option
2015-11-14 04:52:21 -08:00
Patick Strateman
420fa8143a
Do not process tx inv's in blocksonly mode
2015-11-14 04:52:21 -08:00
Patick Strateman
4044f07d1c
Add blocksonly mode
2015-11-14 04:52:21 -08:00
Gregory Maxwell
9ffc687288
Merge pull request #6984
...
e495ed5 add documentation for exluding whitelistes peer from maxuploadtarget (Jonas Schnelli)
5760749 [docs] rename reducetraffic.md to reduce-traffic.md (Jonas Schnelli)
d61fcff don't enforce maxuploadtargets disconnect for whitelisted peers (Jonas Schnelli)
2015-11-13 23:54:36 -08:00
Wladimir J. van der Laan
36baa9f475
Merge pull request #7013
...
b3ae384 Remove LOCK(cs_main) from decodescript (Peter Todd)
2015-11-14 08:24:44 +01:00
Peter Todd
b3ae384a8d
Remove LOCK(cs_main) from decodescript
...
Completely static RPC call that doesn't change or even look at mutable
state anywhere.
2015-11-13 17:19:33 -05:00
Peter Todd
6531f17a78
Add mediantime field to getblock and getblockheader
2015-11-13 16:57:10 -05:00
Peter Todd
7259769d7f
Document new mediantime field in getblockchaininfo
2015-11-13 16:49:47 -05:00
Peter Todd
c277a63ed7
Clarify nLockTime-by-time comment in CheckFinalTx()
2015-11-13 16:36:54 -05:00
Peter Todd
10953a7d32
Better error message for fundrawtransaction w/ empty vout
...
Previously this case failed deep in Cwallet::CreateTransaction() with
the error message "Transaction amounts must be positive"
2015-11-13 15:53:46 -05:00
Peter Todd
61e1eb2e1c
Actually use includeWatching value in fundrawtransaction
...
Previously if you called fundrawtransaction and set includeWatching to
false it'd act as through you set it to true.
2015-11-13 15:45:29 -05:00