jnewbery
d51f182461
Don't return the address of a P2SH of a P2SH.
2016-10-05 08:58:18 -04:00
Wladimir J. van der Laan
223f4c2dd5
Merge #8884 : Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block
...
a78e542
Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block (Luke Dashjr)
2016-10-05 14:44:07 +02:00
Wladimir J. van der Laan
1df311118d
protocol.h: Make enums in GetDataMsg concrete values
...
This concretizes the numbers and adds a comment to make it clear that
these numbers are fixed by the protocol, and may avoid people forgetting
to claim numbers in the future (e.g. issue #8500 ).
Also gets rid of a weird unused `MSG_TYPE_MAX` in the middle of the
enumeration (thanks @paveljanik for noticing).
2016-10-05 13:32:20 +02:00
fanquake
f2e939bdbc
[Doc] Update Doxygen configuration file
2016-10-05 12:59:44 +08:00
Wladimir J. van der Laan
f92805025d
Merge #8879 : [doc] Rework docs
...
eeeebdd
[doc] Rework docs (MarcoFalke)
2016-10-05 05:07:19 +02:00
Cory Fields
cb78c60534
gui: fix ban from qt console
...
Rather than doing a circle and re-resolving the node's IP, just use the one
from nodestats directly.
This requires syncing the addr field from CNode.
2016-10-04 19:43:53 -04:00
Luke Dashjr
a78e5428ac
Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block
2016-10-04 22:22:07 +00:00
Luke Dashjr
178cd887ec
Qt/splash: Specifically keep track of which wallet(s) we are connected to for later disconnecting
2016-10-04 20:30:10 +00:00
Luke Dashjr
1880aeb033
Qt: Get the private key for signing messages via WalletModel
2016-10-04 20:30:10 +00:00
Suhas Daftuar
6976db2f46
[qa] Another attempt to fix race condition in p2p-compactblocks.py
...
sync_with_ping() only guarantees that the node has processed messages
it's received from the peer, not that block announcements from the node have
made it back to the peer. Replace sync_with_ping() with an explicit check that
the node's tip has been announced.
2016-10-04 15:17:19 -04:00
Matt Corallo
a9aec5c24d
Use BlockChecked signal to send reject messages from mapBlockSource
2016-10-04 13:54:29 -04:00
Matt Corallo
7565e03b96
Remove SyncWithWallets wrapper function
2016-10-04 13:53:04 -04:00
Matt Corallo
12ee1fe018
Always call UpdatedBlockTip, even if blocks were only disconnected
2016-10-04 13:52:57 -04:00
Matt Corallo
f5efa28393
Remove CConnman parameter from ProcessNewBlock/ActivateBestChain
2016-10-04 13:51:32 -04:00
Matt Corallo
fef1010199
Use CValidationInterface from chain logic to notify peer logic
...
This adds a new CValidationInterface subclass, defined in main.h,
to receive notifications of UpdatedBlockTip and use that to push
blocks to peers, instead of doing it directly from
ActivateBestChain.
2016-10-04 13:49:44 -04:00
Matt Corallo
aefcb7b70c
Move net-processing logic definitions together in main.h
2016-10-04 13:36:11 -04:00
Suhas Daftuar
27acfc1d2e
[qa] Update p2p-compactblocks.py for compactblocks v2
2016-10-04 19:10:49 +02:00
Suhas Daftuar
422fac649f
[qa] Add support for compactblocks v2 to mininode
2016-10-04 19:10:49 +02:00
Suhas Daftuar
f5b9b8f437
[qa] Fix bug in mininode witness deserialization
...
Also improve tx printing
2016-10-04 19:10:49 +02:00
Pieter Wuille
6aa28abf53
Use cmpctblock type 2 for segwit-enabled transfer
...
Contains version negotiation logic by Matt Corallo and bugfixes by
Suhas Daftuar.
2016-10-04 19:10:41 +02:00
Matt Corallo
0278fb5f48
Remove duplicate nBlocksEstimate cmp (we already checked IsIBD())
2016-10-04 12:35:07 -04:00
Matt Corallo
87e7d72807
Make validationinterface.UpdatedBlockTip more verbose
...
In anticipation of making all the callbacks out of block processing
flow through it. Note that vHashes will always have something in it
since pindexFork != pindexNewTip.
2016-10-04 12:35:07 -04:00
Matt Corallo
be7555f0c0
Fix overly-prescriptive p2p-segwit test for new fetch logic
2016-10-04 18:24:10 +02:00
Matt Corallo
06128da751
Make GetFetchFlags always request witness objects from witness peers
...
This fixes a bug where we might (in exceedingly rare circumstances)
accidentally ban a node for sending us the first (potentially few)
segwit blocks in non-segwit mode.
2016-10-04 18:24:10 +02:00
MarcoFalke
eeeebdd3cb
[doc] Rework docs
...
* Minor formatting such as adjusting links
* Move sections of `doc/multiwallet-qt.md` to the source code and delete
the file, as it is outdated
* Fix typo in the release notes
* Amend release process to mention update of BLOCK_CHAIN_SIZE
2016-10-04 13:27:38 +02:00
Wladimir J. van der Laan
2c09a5209a
protocol.h: Move MESSAGE_START_SIZE into CMessageHeader
...
Also move the enum to the top, and remove a deceptive TODO
comment.
2016-10-04 11:12:55 +00:00
Wladimir J. van der Laan
f9bd92d235
version.h: s/shord/short/ in comment
2016-10-04 11:11:21 +00:00
Wladimir J. van der Laan
d7615af34e
Merge #8848 : Add NULLDUMMY verify flag in bitcoinconsensus.h
...
2fa0063
Add NULLDUMMY verify flag in bitcoinconsensus.h (Johnson Lau)
2016-10-04 12:18:16 +02:00
Wladimir J. van der Laan
d93f0c6184
Merge #8862 : Fix a few cases where messages were sent after requested disconnect
...
905bc68
net: fix a few cases where messages were sent rather than dropped upon disconnection (Cory Fields)
2016-10-04 12:13:50 +02:00
Wladimir J. van der Laan
7dce175f5d
Merge #8850 : Implement (begin|end)_ptr in C++11 and add deprecation comment
...
f00705a
serialize: Deprecate `begin_ptr` / `end_ptr` (Wladimir J. van der Laan)
47314e6
prevector: add C++11-like data() method (Wladimir J. van der Laan)
2016-10-04 11:08:06 +02:00
Wladimir J. van der Laan
a7e5cbb209
Merge #8856 : Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
...
3450c18
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (Jorge Timón)
2016-10-03 15:25:09 +02:00
MarcoFalke
76f3c02fb0
Merge #8860 : [qa] util: Move wait_bitcoinds() into stop_nodes()
...
fa7c35c
[qa] util: Move wait_bitcoinds() into stop_nodes() (MarcoFalke)
2016-10-03 10:12:42 +02:00
Wladimir J. van der Laan
eafc5f4fae
Merge #8863 : univalue: Pull subtree
...
2ca7faa
Squashed 'src/univalue/' changes from daf1285..16a1f7f (MarcoFalke)
2016-10-03 08:45:13 +02:00
Wladimir J. van der Laan
6f3ef551fa
Merge #8858 : rpc: Generate auth cookie in hex instead of base64
...
1c80386
rpc: Generate auth cookie in hex instead of base64 (Wladimir J. van der Laan)
2016-10-03 07:57:41 +02:00
MarcoFalke
6013c73b33
Merge #8857 : [qa] mininode: Only allow named args in wait_until
...
fa66609
[qa] mininode: Only allow named args in wait_until (MarcoFalke)
2016-10-02 23:14:17 +02:00
MarcoFalke
fa666094cf
[qa] mininode: Only allow named args in wait_until
2016-10-02 12:21:14 +02:00
MarcoFalke
fa7c35c4ec
[qa] util: Move wait_bitcoinds() into stop_nodes()
2016-10-02 11:16:44 +02:00
Wladimir J. van der Laan
f00705ae7f
serialize: Deprecate `begin_ptr` / `end_ptr`
...
Implement `begin_ptr` and `end_ptr` in terms of C++11 code,
and add a comment that they are deprecated.
Follow-up to developer notes update in 654a211622
.
2016-10-02 09:50:25 +02:00
Cory Fields
905bc68d05
net: fix a few cases where messages were sent rather than dropped upon disconnection
...
75ead758 turned these into crashes in the event of a handshake failure, most
notably when a peer does not offer the expected services.
There are likely other cases that these assertions will find as well.
2016-10-01 19:13:10 -04:00
Wladimir J. van der Laan
1c80386bce
rpc: Generate auth cookie in hex instead of base64
...
Base64 contains '/', and the '/' character in credentials is problematic
for AuthServiceProxy which represents the RPC endpoint as an URI with
user and password embedded.
Closes #8399 .
2016-10-01 16:57:25 +02:00
MarcoFalke
6faffb8a83
Merge #8854 : [qa] Fix race condition in p2p-compactblocks test
...
b5fd666
[qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
2016-10-01 11:19:22 +02:00
Jorge Timón
3450c18a12
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
2016-10-01 08:12:19 +02:00
Suhas Daftuar
b5fd666984
[qa] Fix race condition in p2p-compactblocks test
...
Also fix a bug in the sync_with_ping() helper function
2016-09-30 20:54:30 -04:00
Wladimir J. van der Laan
7b784cc2bb
Merge #8852 : Mention Gitian building script in doc (Laudaa)
...
203e2dd
Mention Gitian building script in doc. (Lauda)
2016-09-30 20:50:44 +02:00
Lauda
203e2ddad8
Mention Gitian building script in doc.
2016-09-30 20:32:10 +02:00
MarcoFalke
e757115164
Merge commit '2ca7faab4205822b06dc2ab2bbda0a9a70fce7e0' into HEAD
2016-09-30 19:58:11 +02:00
MarcoFalke
2ca7faab42
Squashed 'src/univalue/' changes from daf1285..16a1f7f
...
16a1f7f Merge #3 : Pull upstream
3f03bfd Merge pull request #27 from laanwj/2016_09_const_refs
5668ca3 Return const references from getKeys, getValues, get_str
cedda14 Merge pull request #28 from MarcoFalke/patch-1
9f0b997 [travis] Work around osx libtool issue
git-subtree-dir: src/univalue
git-subtree-split: 16a1f7f6e9ed932bec7c7855003affea1e165fb5
2016-09-30 19:58:11 +02:00
Wladimir J. van der Laan
940748b4b0
Merge #8851 : [wallet] Move key derivation logic from GenerateNewKey to DeriveNewChildKey (pstratem)
...
e198c52
Move key derivation logic from GenerateNewKey to DeriveNewChildKey (Patrick Strateman)
2016-09-30 19:56:03 +02:00
Patrick Strateman
e198c521d3
Move key derivation logic from GenerateNewKey to DeriveNewChildKey
2016-09-30 19:11:00 +02:00
Wladimir J. van der Laan
fb24d7eeb4
Merge #8813 : bitcoind: Daemonize using daemon(3)
...
a92bf4a
bitcoind: Daemonize using daemon(3) (Matthew King)
2016-09-30 18:19:31 +02:00