Wladimir J. van der Laan
72c54e3883
Merge #7863 : getblockchaininfo: make bip9_softforks an object, not an array.
...
d12760b
rpc-tests: handle KeyError nicely in test_framework.py (Rusty Russell)
85c807c
getblockchaininfo: make bip9_softforks an object, not an array. (Rusty Russell)
2016-04-14 12:14:42 +02:00
Wladimir J. van der Laan
b778e5993a
Merge #7855 : [doc] gitian: Replace precise with trusty
...
fa6399d
[doc] gitian: Replace precise with trusty (MarcoFalke)
2016-04-14 12:09:58 +02:00
Wladimir J. van der Laan
536b75e946
Merge #7796 : [amount] Add support for negative fee rates
...
facf5a4
[amount] tests: Fix off-by-one mistake (MarcoFalke)
fa2da2c
[amount] Add support for negative fee rates (MarcoFalke)
11114a6
[amount] test negative fee rates and full constructor (MarcoFalke)
2016-04-14 12:07:52 +02:00
Wladimir J. van der Laan
8bb5d3dff4
Merge #7838 : [Doc] Update gitian build guide to debian 8.4.0
...
4a1d5c1
[Doc] Update gitian build guide to debian 8.4.0 (fanquake)
2016-04-14 09:26:21 +02:00
Rusty Russell
d12760b16a
rpc-tests: handle KeyError nicely in test_framework.py
...
btcdrak wrote this for me.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2016-04-13 16:54:07 +09:30
Rusty Russell
85c807c9ea
getblockchaininfo: make bip9_softforks an object, not an array.
...
We can't change "softforks", but it seems far more logical to use tags
in an object rather than using an "id" field in an array.
For example, to get the csv status before, you need to iterate the
array to find the entry with 'id' field equal to "csv":
jq '.bip9_softforks | map(select(.id == "csv"))[] | .status'
Now:
jq '.bip9_softforks.csv.status'
There is no issue with fork names being incompatible with JSON tags,
since we're selecting them ourselves.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2016-04-13 16:53:52 +09:30
Pieter Wuille
514993554c
Merge #7828 : Trivial: Globals: Explicitly pass const CChainParams& to ProcessMessage()
...
bf477bc
Trivial: Globals: Explicitly pass const CChainParams& to ProcessMessage() (Jorge Timón)
2016-04-12 15:51:16 +02:00
Wladimir J. van der Laan
934f2b5e76
Merge #7858 : Add jl2012 public key for gitian build
...
64c22be
Add jl2012 public key for gitian build (Johnson Lau)
2016-04-11 12:57:31 +02:00
Johnson Lau
64c22be7a9
Add jl2012 public key for gitian build
2016-04-11 17:31:25 +08:00
fanquake
4a1d5c19ee
[Doc] Update gitian build guide to debian 8.4.0
2016-04-11 17:19:01 +08:00
MarcoFalke
fa6399d918
[doc] gitian: Replace precise with trusty
2016-04-10 20:46:33 +02:00
MarcoFalke
facf5a4947
[amount] tests: Fix off-by-one mistake
2016-04-09 15:28:22 +02:00
Wladimir J. van der Laan
065c6b443f
Merge #7786 : Doc: Update isStandardTx comment
...
03c77fd
Doc: Update isStandardTx comment (Matthew English)
2016-04-09 12:13:21 +02:00
Matthew English
03c77fdc14
Doc: Update isStandardTx comment
2016-04-08 23:22:39 +02:00
MarcoFalke
fa2da2cb60
[amount] Add support for negative fee rates
...
Currently negative fee rates are not supported on archs of 64-bit or
more
2016-04-08 19:59:53 +02:00
MarcoFalke
11114a69c8
[amount] test negative fee rates and full constructor
2016-04-08 19:59:44 +02:00
Wladimir J. van der Laan
0afac87e81
Merge #7835 : Version 2 transactions remain non-standard until CSV activates
...
da5fdbb
Test relay of version 2 transactions (Suhas Daftuar)
5cb1d8a
Tests: move get_bip9_status to util.py (Suhas Daftuar)
e4ba9f6
Version 2 transactions remain non-standard until CSV activates (Suhas Daftuar)
2016-04-08 14:17:54 +02:00
Wladimir J. van der Laan
232592a71f
Merge #7570 : Net: Add IPv6 Link-Local Address Support
...
eda3d92
Net: Add IPv6 Link-Local Address Support (mruddy)
2016-04-08 14:12:54 +02:00
Suhas Daftuar
da5fdbb3a2
Test relay of version 2 transactions
2016-04-07 14:59:50 -04:00
Suhas Daftuar
5cb1d8a207
Tests: move get_bip9_status to util.py
2016-04-07 14:54:50 -04:00
Suhas Daftuar
e4ba9f6b04
Version 2 transactions remain non-standard until CSV activates
...
Before activation, such transactions might not be mined, so don't
allow into the mempool.
2016-04-07 14:33:08 -04:00
Wladimir J. van der Laan
5851915a00
Merge #7832 : Reduce block timeout to 10 minutes
...
62b9a55
Reduce block timeout to 10 minutes (Wladimir J. van der Laan)
2016-04-07 13:52:39 +02:00
Wladimir J. van der Laan
62b9a557fc
Reduce block timeout to 10 minutes
...
Now that #7804 fixed the timeout handling, reduce the block timeout from
20 minutes to 10 minutes. 20 minutes is overkill.
2016-04-07 13:22:27 +02:00
Wladimir J. van der Laan
1ddf0cee67
Merge #7804 : Track block download times per individual block
...
0e24bbf
Self check after the last peer is removed (Pieter Wuille)
2d1d658
Track block download times per individual block (Pieter Wuille)
2016-04-07 13:07:11 +02:00
Wladimir J. van der Laan
bbaf5976af
Merge #7821 : init: allow shutdown during 'Activating best chain...'
...
07398e8
init: allow shutdown during 'Activating best chain...' (Wladimir J. van der Laan)
2016-04-07 12:59:10 +02:00
Pieter Wuille
0e24bbf679
Self check after the last peer is removed
2016-04-07 12:13:10 +02:00
Pieter Wuille
2d1d6581ec
Track block download times per individual block
...
Currently, we're keeping a timeout for each requested block, starting
from when it is requested, with a correction factor for the number of
blocks in the queue.
That's unnecessarily complicated and inaccurate.
As peers process block requests in order, we can make the timeout for each
block start counting only when all previous ones have been received, and
have a correction based on the number of peers, rather than the total number
of blocks.
2016-04-07 12:13:10 +02:00
Jorge Timón
bf477bcc79
Trivial: Globals: Explicitly pass const CChainParams& to ProcessMessage()
2016-04-06 16:00:25 +02:00
Wladimir J. van der Laan
3bc71e1572
Merge #7802 : [qa] httpbasics: Actually test second connection
...
fa24456
[qa] httpbasics: Actually test second connection (MarcoFalke)
2016-04-06 14:14:14 +02:00
Wladimir J. van der Laan
401c65c6b3
Merge #7803 : [qa] maxblocksinflight: Actually enable test
...
fac724c
[qa] maxblocksinflight: Actually enable test (MarcoFalke)
2016-04-06 14:13:38 +02:00
Wladimir J. van der Laan
70ac71b877
Merge #7801 : [qa] Remove misleading "errorString syntax"
...
ffff866
[qa] Remove misleading "errorString syntax" (MarcoFalke)
2016-04-06 14:12:44 +02:00
Wladimir J. van der Laan
07398e8e9d
init: allow shutdown during 'Activating best chain...'
...
Two-line patch to make it possible to shut down bitcoind cleanly during
the initial ActivateBestChain.
Fixes #6459 (among other complaints).
To reproduce:
- shutdown bitcoind
- copy chainstate
- start bitcoind
- let the chain sync a bit
- shutdown bitcoind
- copy back old chainstate
- start bitcoind
- bitcoind will catch up with all blocks during Init()
(the `boost::this_thread::interruption_point` / `ShutdownRequested()`
dance is ugly, this should be refactored all over bitcoind at some point
when moving from boost::threads to c++11 threads, but it works...)
2016-04-06 10:33:19 +02:00
mruddy
eda3d92489
Net: Add IPv6 Link-Local Address Support
2016-04-05 22:26:38 +00:00
Wladimir J. van der Laan
1b2460bd58
Merge #7793 : [doxygen] Fix member comments
...
fada0c4
[doc] Fix doxygen comments for members (MarcoFalke)
2016-04-05 17:49:47 +02:00
Wladimir J. van der Laan
4dc1b3a296
Merge #7788 : Use relative paths instead of absolute paths in protoc calls
...
0087f26
Use relative paths instead of absolute paths (Pavel Janík)
2016-04-05 17:38:41 +02:00
Wladimir J. van der Laan
e30a5b0aaa
Merge #7791 : Doc: change Precise to Trusty in gitian-building.md
...
190c1e2
Doc: change Precise to Trusty in gitian-building.md (JeremyRand)
2016-04-05 16:21:21 +02:00
Wladimir J. van der Laan
916b15a87a
Merge #7774 : RPC: add versionHex in getblock and getblockheader JSON results
...
92107d5
RPC: add versionHex in getblock and getblockheader JSON results; expand data in getblockchaininfo bip9_softforks field. (mruddy)
2016-04-05 16:09:17 +02:00
Wladimir J. van der Laan
3cc0fb3a23
Merge #7776 : build: Remove unnecessary executables from gitian release
...
f063863
build: Remove unnecessary executables from gitian release (Wladimir J. van der Laan)
2016-04-05 15:44:48 +02:00
Wladimir J. van der Laan
55db5f07b1
Merge #7781 : devtools: Auto-set branch to merge to in github-merge
...
10d3ae1
devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)
2016-04-05 15:41:34 +02:00
Wladimir J. van der Laan
214ec0b5e8
Merge #7813 : [doc] Update port in tor.md
...
3373c43
[doc] Update port in tor.md (Adam Brown)
2016-04-05 15:40:10 +02:00
Adam Brown
3373c43505
[doc] Update port in tor.md
...
Tor Browser Bundle spawns the Tor process and listens on port 9150, it doesn't randomly pick a port.
[ci skip]
(cherry picked from commit 1b63cf98347b2a62915425576930f55c2126c2ff)
2016-04-05 14:54:39 +02:00
mruddy
92107d574d
RPC: add versionHex in getblock and getblockheader JSON results; expand data in getblockchaininfo bip9_softforks field.
2016-04-04 22:21:00 +00:00
Pavel Janík
0087f26848
Use relative paths instead of absolute paths
2016-04-04 19:56:59 +02:00
Jonas Schnelli
a9149688f8
Merge #7707 : [RPC][QT] UI support for abandoned transactions
...
8efed3b
[Qt] Support for abandoned/abandoning transactions (Jonas Schnelli)
2016-04-04 09:58:33 +02:00
Jonas Schnelli
8efed3bc93
[Qt] Support for abandoned/abandoning transactions
2016-04-04 09:25:34 +02:00
MarcoFalke
ffff866da8
[qa] Remove misleading "errorString syntax"
2016-04-03 21:33:56 +02:00
MarcoFalke
fac724c78f
[qa] maxblocksinflight: Actually enable test
2016-04-03 20:49:32 +02:00
MarcoFalke
fa24456d0c
[qa] httpbasics: Actually test second connection
2016-04-03 20:43:56 +02:00
Wladimir J. van der Laan
e662a76288
Merge #7797 : RPC: fix generatetoaddress failing to parse address
...
60361ca
RPC: fix generatetoaddress failing to parse address and add unit test (mruddy)
2016-04-03 17:34:00 +02:00
mruddy
60361ca481
RPC: fix generatetoaddress failing to parse address and add unit test
2016-04-03 14:30:00 +00:00