phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-14 05:42:36 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions
11918 commits 6 branches 321 tags 2.2 GiB
Commit graph

7978 commits

Author SHA1 Message Date
Pieter Wuille
248f3a76a8 Fix ismine and addwitnessaddress: no uncompressed keys in segwit 2016-10-17 00:34:37 +08:00
Johnson Lau
4c0c25a604 Require compressed keys in segwit as policy and disable signing with uncompressed keys for segwit scripts 2016-10-16 23:53:35 +08:00
Johnson Lau
3ade2f64cf Add standard limits for P2WSH with tests 2016-10-16 23:53:35 +08:00
Matt Corallo
37aefff5fc Fix init segfault where InitLoadWallet() calls ATMP before genesis 2016-10-15 13:19:16 -04:00
Johnson Lau
acf853df91 Add script tests for FindAndDelete in pre-segwit and segwit scripts 2016-10-16 00:30:50 +08:00
R E Broadley
1724a405c9 Display minimum ping in debug window. 2016-10-15 20:43:11 +07:00
Wladimir J. van der Laan
49c5910372
Merge #8880: protocol.h: Move MESSAGE_START_SIZE into CMessageHeader 
1df3111 protocol.h: Make enums in GetDataMsg concrete values (Wladimir J. van der Laan)
2c09a52 protocol.h: Move MESSAGE_START_SIZE into CMessageHeader (Wladimir J. van der Laan)
f9bd92d version.h: s/shord/short/ in comment (Wladimir J. van der Laan)
 2016-10-15 10:27:46 +02:00
Wladimir J. van der Laan
088d1f4413
Merge #8906: [qt] sync-overlay: Don't show progress twice 
fafeec3 [qt] sync-overlay: Don't show progress twice (MarcoFalke)
 2016-10-15 09:44:20 +02:00
Luke Dashjr
21f5a6364d Qt: Add "Copy URI" to payment request context menu 2016-10-13 23:27:43 +00:00
Wladimir J. van der Laan
e2b8c394d6
Merge #8817: update bitcoin-tx to output witness data 
4408558 Update bitcoin-tx to output witness data. (jonnynewbs)
 2016-10-13 18:56:43 +02:00
Wladimir J. van der Laan
8d46429c83
Merge #8911: qt: Translate all files, even if wallet disabled 
8aed5f6 qt: Translate all files, even if wallet disabled (Wladimir J. van der Laan)
 2016-10-13 10:30:38 +02:00
Wladimir J. van der Laan
8aed5f6c23 qt: Translate all files, even if wallet disabled 
This passes all QT cpp files to the lupdate executable which extracts
translations, no matter what conditional functionality is enabled.
 2016-10-11 17:46:46 +02:00
MarcoFalke
fafeec3cf2 [qt] sync-overlay: Don't show progress twice 
* Don't show integer progress in progress bar. (Already shown in front
  of progress bar)

* Also, use non-static method to get current msecs
 2016-10-10 17:07:43 +02:00
Jonas Schnelli
bf8e68aba6
Merge #8821: [qt] sync-overlay: Don't block during reindex 
fa85e86 [qt] sync-overlay: Don't show estimated number of headers left (MarcoFalke)
faa4de2 [qt] sync-overlay: Don't block during reindex (MarcoFalke)
 2016-10-10 16:52:44 +02:00
Pieter Wuille
6429cfa8a7
Merge #8393: Support for compact blocks together with segwit 
27acfc1 [qa] Update p2p-compactblocks.py for compactblocks v2 (Suhas Daftuar)
422fac6 [qa] Add support for compactblocks v2 to mininode (Suhas Daftuar)
f5b9b8f [qa] Fix bug in mininode witness deserialization (Suhas Daftuar)
6aa28ab Use cmpctblock type 2 for segwit-enabled transfer (Pieter Wuille)
be7555f Fix overly-prescriptive p2p-segwit test for new fetch logic (Matt Corallo)
06128da Make GetFetchFlags always request witness objects from witness peers (Matt Corallo)
 2016-10-10 13:16:40 +02:00
MarcoFalke
e66cc1d58e
Merge #8881: Add some verbose logging to bitcoin-util-test.py 
621441a add verbose mode to bitcoin-util-test.py (jnewbery)
 2016-10-08 21:23:42 +02:00
Jonas Schnelli
b2fec4e9a1
Merge #8885: gui: fix ban from qt console 
cb78c60 gui: fix ban from qt console (Cory Fields)
 2016-10-08 16:43:15 +02:00
jnewbery
621441a7a7 add verbose mode to bitcoin-util-test.py 2016-10-05 09:16:08 -04:00
jonnynewbs
4408558843 Update bitcoin-tx to output witness data. 2016-10-05 09:00:34 -04:00
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
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
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
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
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
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
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
Jorge Timón
3450c18a12
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs 2016-10-01 08:12:19 +02:00
MarcoFalke
e757115164 Merge commit '2ca7faab4205822b06dc2ab2bbda0a9a70fce7e0' into HEAD 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
Wladimir J. van der Laan
47314e6daa prevector: add C++11-like data() method 
This returns a pointer to the beginning of the vector's data.
 2016-09-30 17:19:51 +02:00
Wladimir J. van der Laan
9bc6a6bd7b
Merge #8822: net: Consistent checksum handling 
305087b net: Hardcode protocol sizes and use fixed-size types (Wladimir J. van der Laan)
41e58fa net: Consistent checksum handling (Wladimir J. van der Laan)
 2016-09-30 17:10:58 +02:00
Johnson Lau
2fa0063c26 Add NULLDUMMY verify flag in bitcoinconsensus.h 2016-09-30 23:09:19 +08:00
Wladimir J. van der Laan
ef0801bd13
Merge #8830: [test] Add option to run bitcoin-util-test.py manually 
b82f493 Add option to run bitcoin-util-test.py manually (jnewbery)
 2016-09-30 17:03:21 +02:00
Wladimir J. van der Laan
90adfabd5d
Merge #8836: bitcoin-util-test.py should fail if the output file is empty 
da94697 bitcoin-util-test.py should fail if the output file is empty (jnewbery)
 2016-09-30 12:36:02 +02:00
Wladimir J. van der Laan
f560d9564f
Merge #8826: Do not include env_win.cc on non-Windows systems 
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
 2016-09-29 17:27:28 +02:00
jnewbery
da94697708 bitcoin-util-test.py should fail if the output file is empty 2016-09-29 10:16:56 -04:00
Wladimir J. van der Laan
9b94cca41f
Merge #8658: Remove unused statements in serialization 
64d9507 [WIP] Remove unused statement in serialization (Pavel Janík)
 2016-09-29 15:00:22 +02:00
jnewbery
b82f493938 Add option to run bitcoin-util-test.py manually 2016-09-29 08:54:56 -04:00
MarcoFalke
fa85e860a9 [qt] sync-overlay: Don't show estimated number of headers left 2016-09-29 13:24:29 +02:00
MarcoFalke
8ca69a2a88
Merge #8829: Add bitcoin-tx JSON tests 
54e5d7c Add bitcoin-tx JSON tests (jnewbery)
 2016-09-29 10:50:05 +02:00
Wladimir J. van der Laan
7d563cc16d
Merge #8832: [rpc] throw JSONRPCError when utxo set can not be read 
fa05cfd [rpc] throw JSONRPCError when utxo set can not be read (MarcoFalke)
 2016-09-29 08:12:55 +02:00
Wladimir J. van der Laan
d675984fdf
Merge #8784: Copyright headers for build scripts 
0c4e6ce Add MIT license to build-aux/m4 scripts (Luke Dashjr)
3f8a5d8 Trivial: build-aux/m4/l_atomic: Fix typo (Luke Dashjr)
3b4b6dc Add MIT license to autogen.sh and share/genbuild.sh (Luke Dashjr)
f4dffdd Add MIT license to Makefiles (Luke Dashjr)
 2016-09-29 07:58:08 +02:00
MarcoFalke
fa05cfdf25 [rpc] throw JSONRPCError when utxo set can not be read 2016-09-28 21:00:58 +02:00
jnewbery
54e5d7c1b8 Add bitcoin-tx JSON tests 2016-09-28 13:38:42 -04:00
Pavel Janík
7e5fd7198e Do not include env_win.cc on non-Windows systems 2016-09-28 16:40:20 +02:00
Wladimir J. van der Laan
305087bdf6 net: Hardcode protocol sizes and use fixed-size types 
The P2P network uses a fixed protocol, these sizes shouldn't change
based on what happens to be the architecture.
 2016-09-28 15:33:45 +02:00
Wladimir J. van der Laan
41e58faf04 net: Consistent checksum handling 
In principle, the checksums of P2P packets are simply 4-byte blobs which
are the first four bytes of SHA256(SHA256(payload)).

Currently they are handled as little-endian 32-bit integers half of the
time, as blobs the other half, sometimes copying the one to the other,
resulting in somewhat confused code.

This PR changes the handling to be consistent both at packet creation
and receiving, making it (I think) easier to understand.
 2016-09-28 12:44:13 +02:00
Wladimir J. van der Laan
14b7b3fb9f
Merge #8814: [wallet, policy] ParameterInteraction: Don't allow 0 fee 
fa4bfb4 [wallet, policy] ParameterInteraction: Don't allow 0 fee (MarcoFalke)
 2016-09-28 08:09:42 +02:00
Johnson Lau
e41bd449ab Add policy: null signature for failed CHECK(MULTI)SIG 2016-09-27 23:40:59 +08:00
Wladimir J. van der Laan
5a4f6d72e6
Merge #8526: Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH 
c72c5b1 Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH (Johnson Lau)
 2016-09-27 17:10:15 +02:00
Wladimir J. van der Laan
e9d5f6fec8
Merge #8357: [mempool] Fix relaypriority calculation error 
94a34a5 Fix relaypriority calculation error (maiiz)
 2016-09-27 16:33:32 +02:00
Pavel Janík
4731cab8fb Do not shadow variables 2016-09-27 09:25:15 +02:00
MarcoFalke
faa4de2a2a [qt] sync-overlay: Don't block during reindex 2016-09-26 22:29:45 +02:00
MarcoFalke
2f71490d21
Merge #8805: Trivial: Grammar and capitalization 
c9ce17b Trivial: Grammar and capitalization (Derek Miller)
 2016-09-26 22:27:45 +02:00
Wladimir J. van der Laan
8f1fbf36a7
Merge #8796: [trivial] fix mempool comment (outdated by BIP125) 
c14ffd5 [trivial] fix mempool comment (outdated by BIP125) (jonnynewbs)
 2016-09-26 15:11:02 +02:00
Wladimir J. van der Laan
dd20ed1223
Merge #8780: [rpc] Deprecate getinfo 
fa6e71b [qa] Add getinfo smoke tests and rework versionbits test (MarcoFalke)
ddddaaf [rpc] Deprecate getinfo (MarcoFalke)
 2016-09-26 15:03:06 +02:00
Wladimir J. van der Laan
bb843adc8d
Merge #8722: bitcoin-cli: More detailed error reporting 
381826d bitcoin-cli: More detailed error reporting (Wladimir J. van der Laan)
 2016-09-26 14:53:38 +02:00
jonnynewbs
c14ffd524b [trivial] fix mempool comment (outdated by BIP125) 2016-09-26 08:52:52 -04:00
MarcoFalke
fa4bfb4819 [wallet, policy] ParameterInteraction: Don't allow 0 fee 2016-09-26 14:44:24 +02:00
Wladimir J. van der Laan
ab0b411868
Merge #8486: [wallet] Add high transaction fee warnings 
faef293 [wallet] Add high transaction fee warnings (MarcoFalke)
 2016-09-26 13:57:10 +02:00
Matthew King
a92bf4af66 bitcoind: Daemonize using daemon(3) 
Simplified version of #8278. Assumes that every OS that (a) is supported
by Bitcoin Core (b) supports daemonization has the `daemon()` function
in its C library.

- Removes the fallback path for operating systems that support
  daemonization but not `daemon()`. This prevents never-exercised code from
  ending up in the repository (see discussion here:
  https://github.com/bitcoin/bitcoin/pull/8278#issuecomment-242704745).

- Removes the windows-specific path. Windows doesn't support `daemon()`,
  so it don't support daemonization there, automatically.

Original code by Matthew King, adapted by Wladimir van der Laan.
 2016-09-26 13:37:44 +02:00
MarcoFalke
faef293cf3 [wallet] Add high transaction fee warnings 2016-09-26 01:11:27 +02:00
Wladimir J. van der Laan
37871f216e
Merge #8807: [univalue] Pull subtree from upstream 
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
 2016-09-25 16:21:43 +02:00
MarcoFalke
9bf41af708 Merge commit '3650668cdbbf369dd8f30c8e8eb5bb883325942d' into HEAD 2016-09-25 15:19:23 +02:00
Wladimir J. van der Laan
b8d10fd4ef
Merge #8802: Fix future copyright year 
edeaf24 Fix future copyright year (Mitchell Cash)
 2016-09-25 13:12:01 +02:00
Derek Miller
c9ce17beed Trivial: Grammar and capitalization 2016-09-24 12:22:47 -05:00
MarcoFalke
08cc5fd666
Merge #8790: [test] Remove redundant debug print in addrman_tests 
3333bd2 [test] Remove redundant print in addrman_tests (MarcoFalke)
 2016-09-24 15:38:38 +02:00
Mitchell Cash
edeaf24e4c Fix future copyright year 2016-09-24 13:46:08 +10:00
Jonas Schnelli
24f72e9f3f
Merge #8371: [Qt] Add out-of-sync modal info layer 
08827df [Qt] modalinfolayer: removed unused comments, renamed signal, code style overhaul (Jonas Schnelli)
d8b062e [Qt] only update "amount of blocks left" when the header chain is in-sync (Jonas Schnelli)
e3245b4 [Qt] add out-of-sync modal info layer (Jonas Schnelli)
e47052f [Qt] ClientModel add method to get the height of the header chain (Jonas Schnelli)
a001f18 [Qt] Always pass the numBlocksChanged signal for headers tip changed (Jonas Schnelli)
bd44a04 [Qt] make Out-Of-Sync warning icon clickable (Jonas Schnelli)
0904c3c [Refactor] refactor function that forms human readable text out of a timeoffset (Jonas Schnelli)
 2016-09-23 18:22:48 +02:00
Jonas Schnelli
08827df3ec
[Qt] modalinfolayer: removed unused comments, renamed signal, code style overhaul 2016-09-23 16:07:21 +02:00
Wladimir J. van der Laan
d2e46558ba
Merge #8661: Do not set an addr time penalty when a peer advertises itself. 
6d0ced1 Do not set an addr time penalty when a peer advertises itself. (Gregory Maxwell)
 2016-09-23 13:56:01 +02:00
Wladimir J. van der Laan
5d0219d983
Merge #8793: Do not shadow in src/qt 
f839350 Do not shadow in src/qt (Pavel Janík)
 2016-09-23 12:44:35 +02:00
Pavel Janík
f839350420 Do not shadow in src/qt 2016-09-23 12:42:00 +02:00
Johnson Lau
c72c5b1e3b Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH 2016-09-23 13:07:38 +08:00
Wladimir J. van der Laan
2b514aa2ea
Merge #8785: Comment on CNode::nLocalServices meaning 
b5ccded Comment on CConnman::nLocalServices meaning (instagibbs)
 2016-09-22 16:41:02 +02:00
instagibbs
b5ccded57f Comment on CConnman::nLocalServices meaning 2016-09-22 08:19:44 -04:00