Patrick Strateman
86029e72c9
Move CWalletDB::ReorderTransactions to CWallet
2016-10-30 02:15:49 -07:00
Wladimir J. van der Laan
d2143dc937
Merge #8989 : [Qt] overhaul smart-fee slider, adjust default confirmation target
...
cfe77ef
[Qt] overhaul smart-fee slider, adjust default confirmation target (Jonas Schnelli)
6f02899
[Qt] Hide nTxConfirmTarget behind WalletModel (Jonas Schnelli)
004168d
CoinControl: add option for custom confirmation target (Jonas Schnelli)
2016-10-28 14:14:55 +02:00
Wladimir J. van der Laan
0dcb888266
Merge #9016 : Return useful error message on ATMP failure
...
169bdab
Return useful error message on ATMP failure (instagibbs)
2016-10-28 13:49:15 +02:00
Jonas Schnelli
cfe77ef412
[Qt] overhaul smart-fee slider, adjust default confirmation target
2016-10-28 10:44:30 +02:00
Jonas Schnelli
6f0289967f
[Qt] Hide nTxConfirmTarget behind WalletModel
2016-10-28 10:44:30 +02:00
Jonas Schnelli
004168dcb7
CoinControl: add option for custom confirmation target
2016-10-28 10:44:30 +02:00
S. Matthew English
1c3ecc70c8
instance of 'mem pool' to 'mempool'
...
there was only one instance of 'mem pool' and not 'mempool', so I changed it to conform to the others
2016-10-27 16:45:09 +02:00
instagibbs
169bdabe14
Return useful error message on ATMP failure
2016-10-26 15:59:33 -04:00
Wladimir J. van der Laan
04c1c15544
rpc: Remove invalid explanation from wallet fee message
2016-10-26 11:57:27 +02:00
Wladimir J. van der Laan
9bdf5269f8
Merge #8515 : A few mempool removal optimizations
...
0334430
Add some missing includes (Pieter Wuille)
4100499
Return shared_ptr<CTransaction> from mempool removes (Pieter Wuille)
51f2783
Make removed and conflicted arguments optional to remove (Pieter Wuille)
f48211b
Bypass removeRecursive in removeForReorg (Pieter Wuille)
2016-10-25 14:21:57 +02:00
Wladimir J. van der Laan
f14f07cb94
Merge #9008 : [net] Remove assert(nMaxInbound > 0)
...
fa1c3c2
[net] Remove assert(nMaxInbound > 0) (MarcoFalke)
2016-10-25 12:37:05 +02:00
Wladimir J. van der Laan
e1d1f57b56
Merge #9002 : Make connect=0 disable automatic outbound connections.
...
515e264
Make connect=0 disable automatic outbound connections. (Gregory Maxwell)
2016-10-25 12:27:24 +02:00
Gregory Maxwell
515e2642eb
Make connect=0 disable automatic outbound connections.
...
Otherwise it just responds to this obvious bit of configuration by
trying to connect to "0" in a loop.
2016-10-25 06:17:43 +00:00
MarcoFalke
fa1c3c2eb0
[net] Remove assert(nMaxInbound > 0)
...
nMaxInbound might very well be 0 or -1, if the user prefers to keep
a small number of maxconnections.
Note: nMaxInbound of -1 means that the user set maxconnections
to 8 or less, but we still want to keep an additional slot for
the feeler connection.
2016-10-24 22:12:48 +02:00
Wladimir J. van der Laan
ced22d035a
Merge #8995 : Add missing cs_main lock to ::GETBLOCKTXN processing
...
dfe7906
Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
2016-10-24 11:17:07 +02:00
Pieter Wuille
0334430b39
Add some missing includes
2016-10-21 19:22:43 -07:00
Pieter Wuille
4100499db4
Return shared_ptr<CTransaction> from mempool removes
2016-10-21 19:22:43 -07:00
Pieter Wuille
51f278329d
Make removed and conflicted arguments optional to remove
2016-10-21 19:22:43 -07:00
Pieter Wuille
f48211b700
Bypass removeRecursive in removeForReorg
2016-10-21 19:22:43 -07:00
Pavel Janík
1d8e12ba48
Fix doxygen comment: the transaction is returned in txOut
2016-10-21 23:42:37 +02:00
MarcoFalke
f08222e882
Merge #8982 : Eliminating Inconsistencies in Textual Output
...
3a286ab
Eliminating Inconsistencies in Textual Output (S. Matthew English)
2016-10-21 19:39:46 +02:00
Matt Corallo
dfe79060a6
Add missing cs_main lock to ::GETBLOCKTXN processing
...
Note that this is not a major issue as, in order for the missing
lock to cause issues, you have to receive a GETBLOCKTXN message
while reindexing, adding a block header via RPC, etc, which results
in either a table rehash or an insert into the bucket which you are
currently looking at.
2016-10-21 12:15:19 -04:00
Wladimir J. van der Laan
3cf496d102
Merge #8968 : Don't hold cs_main when calling ProcessNewBlock from a cmpctblock
...
72ca7d9
Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
2016-10-21 16:58:44 +02:00
Wladimir J. van der Laan
5af9a7117c
Merge #8975 : Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/
...
6f2f639
Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/ (Jorge Timón)
2016-10-21 16:57:50 +02:00
Wladimir J. van der Laan
3fb3fade3c
Merge #8990 : moveonly: move coincontrol
to src/wallet
...
1ae5839
moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)
2016-10-21 15:30:28 +02:00
Jonas Schnelli
7b1bfa3a87
Merge #8985 : Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip()
...
3154d6e
[Qt] use NotifyHeaderTip's height and date for the progress update (Jonas Schnelli)
0a261b6
Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (Jonas Schnelli)
2016-10-21 14:30:02 +02:00
Wladimir J. van der Laan
1ae5839ff0
moveonly: move coincontrol
to src/wallet
2016-10-21 11:48:18 +02:00
Jonas Schnelli
3154d6e3a2
[Qt] use NotifyHeaderTip's height and date for the progress update
2016-10-20 19:02:59 +02:00
Jonas Schnelli
0a261b63fd
Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip()
2016-10-20 19:02:48 +02:00
S. Matthew English
3a286abf8f
Eliminating Inconsistencies in Textual Output
...
There were discrepancies between usage of "block chain" and "blockchain", I've changed them to the latter. The reason for this was that Wikipedia when describing this data structure writes "A blockchain — *originally block chain*", so it seemed the more appropriate term.
2016-10-20 12:39:48 +02:00
Luke Dashjr
7942d31d5f
RPC: importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions
2016-10-20 10:18:05 +00:00
Wladimir J. van der Laan
f2d705629b
Merge #7551 : Add importmulti RPC call
...
215caba
Add consistency check to RPC call importmulti (Pedro Branco)
cb08fdb
Add importmulti rpc call (Pedro Branco)
2016-10-20 09:04:32 +02:00
Jorge Timón
6f2f639cdf
Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/
2016-10-19 19:01:10 +02:00
Wladimir J. van der Laan
c587577356
Merge #8928 : Fix init segfault where InitLoadWallet() calls ATMP before genesis
...
37aefff
Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
2016-10-19 18:11:15 +02:00
Wladimir J. van der Laan
475d68252e
Merge #8927 : Add script tests for FindAndDelete in pre-segwit and segwit scripts
...
acf853d Add script tests for FindAndDelete in pre-segwit and segwit scripts (Johnson Lau)
2016-10-19 17:41:34 +02:00
Jonas Schnelli
3e942a7060
Merge #8774 : Qt refactors to better abstract wallet access
...
178cd88
Qt/splash: Specifically keep track of which wallet(s) we are connected to for later disconnecting (Luke Dashjr)
1880aeb
Qt: Get the private key for signing messages via WalletModel (Luke Dashjr)
2016-10-19 17:08:17 +02:00
Wladimir J. van der Laan
5d2c8e524e
Merge #7948 : RPC: augment getblockchaininfo bip9_softforks data
...
fc14609
RPC: augment getblockchaininfo bip9_softforks data (mruddy)
2016-10-19 16:41:59 +02:00
Pedro Branco
215caba4ed
Add consistency check to RPC call importmulti
2016-10-19 15:17:42 +01:00
Pedro Branco
cb08fdbf78
Add importmulti rpc call
2016-10-19 15:17:13 +01:00
mruddy
fc146095d2
RPC: augment getblockchaininfo bip9_softforks data
2016-10-19 09:08:39 -04:00
Jonas Schnelli
e7156ad61b
[RPC] pass HTTP basic authentication username to the JSONRequest object
2016-10-19 14:47:27 +02:00
Jonas Schnelli
69d1c25768
[RPC] Give RPC commands more information about the RPC request
2016-10-19 14:42:08 +02:00
Wladimir J. van der Laan
23c32a9694
rpc: Change JSONRPCRequest to JSONRPCRequestObj
...
This is more consistent with `JSONRPCReplyObj`.
2016-10-19 14:30:14 +02:00
Wladimir J. van der Laan
d736a6eb1f
Merge #8972 : [Qt] make warnings label selectable (jonasschnelli)
...
ef0c9ee
[Qt] make warnings label selectable (Jonas Schnelli)
2016-10-19 11:27:21 +02:00
Wladimir J. van der Laan
b2df292e34
Merge #8951 : RPC/Mining: getblocktemplate: Update and fix formatting of help
...
59daa58
RPC/Mining: getblocktemplate: Update and fix formatting of help (Luke Dashjr)
2016-10-19 10:59:11 +02:00
Jonas Schnelli
ef0c9ee296
[Qt] make warnings label selectable
2016-10-19 10:51:59 +02:00
Luke Dashjr
59daa58d6a
RPC/Mining: getblocktemplate: Update and fix formatting of help
2016-10-19 10:47:32 +02:00
Wladimir J. van der Laan
e44753c067
Merge #8949 : Be more agressive in getting connections to peers with relevant services.
...
4630479
Make dnsseed's definition of acute need include relevant services. (Gregory Maxwell)
9583477
Be more aggressive in connecting to peers with relevant services. (Gregory Maxwell)
2016-10-19 10:43:54 +02:00
Wladimir J. van der Laan
1230890a6d
Merge #8936 : Report NodeId in misbehaving debug
...
a1919ad
Report NodeId in misbehaving debug (R E Broadley)
2016-10-19 10:35:44 +02:00
Gregory Maxwell
4630479135
Make dnsseed's definition of acute need include relevant services.
...
We normally prefer to connect to peers offering the relevant services.
If we're not connected to enough peers with relevant services, we
probably don't know about them and could use dnsseed's help.
2016-10-19 08:07:02 +00:00