mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 18:49:30 +01:00
Code Issues Projects Releases Wiki Activity
11,398 Commits 6 Branches 318 Tags 3.2 GiB
53f8f226bd
Commit Graph

11398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Wuille
53f8f226bd
Merge #8462: Move AdvertiseLocal debug output to net category 
f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)
 2016-08-25 15:15:16 +02:00
Jonas Schnelli
0606f95b1e
Merge #7579: [Qt] show network/chain errors in the GUI 
2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
 2016-08-25 14:55:26 +02:00
Pieter Wuille
9d0f43b7ca
Merge #8226: contributing.md: Fix formatting (line lengths and smart quotes) 
be1d451 contributing.md: Fix formatting (Will Binns)
 2016-08-25 14:14:31 +02:00
Jonas Schnelli
d26234a9e2
Merge #8487: Persist the datadir after option reset 
57acb82 Load choose datadir dialog after options reset (Andrew Chow)
15df3c1 Persist the datadir after option reset (Andrew Chow)
 2016-08-25 11:42:57 +02:00
MarcoFalke
95a983d56d
Merge #8578: [test] Remove unused code 
fa1cf9e [test] Remove unused code (MarcoFalke)
 2016-08-25 11:00:21 +02:00
Wladimir J. van der Laan
026c6edac9
Merge #8282: net: Feeler connections to increase online addrs in the tried table. 
dbb1f64 Added feeler connections increasing good addrs in the tried table. (Ethan Heilman)
 2016-08-25 10:48:24 +02:00
MarcoFalke
fa1cf9e7b8 [test] Remove unused code 2016-08-24 20:21:31 +02:00
Andrew Chow
57acb82e70 Load choose datadir dialog after options reset 2016-08-24 09:40:48 -04:00
Jonas Schnelli
62a5a8a018
Merge #8463: [qt] Remove Priority from coincontrol dialog 
fa8dd78 [qt] Remove Priority from coincontrol dialog (MarcoFalke)
 2016-08-24 13:58:43 +02:00
Wladimir J. van der Laan
85d4e21a61
Merge #8567: Add default port numbers to REST doc 
c911035 Add default port numbers to REST doc (djpnewton)
 2016-08-24 13:56:30 +02:00
Wladimir J. van der Laan
21857d2bf7
Merge #8450: [Test] Replace rpc_wallet_tests.cpp with python RPC unit tests 
9578333 Remove rpc_wallet_tests.cpp (Patrick Strateman)
25400c4 Account wallet feature RPC tests. (Patrick Strateman)
 2016-08-24 12:10:42 +02:00
MarcoFalke
fa8dd785a2 [qt] Remove Priority from coincontrol dialog 2016-08-24 11:37:30 +02:00
Pieter Wuille
f12d2b5a8a
Merge #8560: Trivial: Fix two VarInt examples in serialize.h 
7bd5ff4 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas)
 2016-08-24 10:42:08 +02:00
Wladimir J. van der Laan
f9167003d9
Merge #8445: Move CWallet::setKeyPool to private section of CWallet. 
8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman)
e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)
 2016-08-24 10:33:16 +02:00
djpnewton
c91103573b Add default port numbers to REST doc 2016-08-24 08:41:42 +12:00
Ethan Heilman
dbb1f640e6 Added feeler connections increasing good addrs in the tried table. 
Tests if addresses are online or offline by briefly connecting to them. These short lived connections are referred to as feeler connections. Feeler connections are designed to increase the number of fresh online addresses in tried by selecting and connecting to addresses in new. One feeler connection is attempted on average once every two minutes.

This change was suggested as Countermeasure 4 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.
 2016-08-23 16:26:42 -04:00
Wladimir J. van der Laan
9358893518
doc: Add historical release notes for 0.12.1 0.13.0 2016-08-23 17:47:06 +02:00
Christian Barcenas
7bd5ff4623 Trivial: Fix two VarInt examples in serialize.h 2016-08-22 20:49:36 -04:00
Wladimir J. van der Laan
41d8e78f94
Merge #8539: CDB: fix debug output 
fab2e26 CDB: fix debug output (crowning-)
 2016-08-22 16:40:08 +02:00
Wladimir J. van der Laan
37e77c106c
Merge #8554: trivial: remove unused variable 
4207630 trivial: remove unused variable (Daniel Kraft)
 2016-08-22 10:36:37 +02:00
Wladimir J. van der Laan
bb0f763a25
Merge #8558: Add copyright header to wallet_text_fixture.cpp 
653bb3d Add copyright header to wallet_text_fixture.cpp (Wladimir J. van der Laan)
 2016-08-22 10:32:30 +02:00
MarcoFalke
760741a008
Merge #8551: [qa] Remove unused code 
faaec13 [qa] Remove unused code (MarcoFalke)
 2016-08-22 10:21:00 +02:00
Wladimir J. van der Laan
a55a018d5f
Merge #8548: [wallet] Use __func__ to get function name for output printing 
fa785d1 Use __func__ to get function name for output printing (MarcoFalke)
 2016-08-22 09:58:28 +02:00
Wladimir J. van der Laan
653bb3d640 Add copyright header to wallet_text_fixture.cpp 
I created the file but forgot to add this header.
 2016-08-22 09:24:50 +02:00
Patrick Strateman
8680d3aa80 Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet 2016-08-20 14:03:47 -07:00
Daniel Kraft
4207630f5a trivial: remove unused variable 
Remove the unused variable "blockTmp" in CMerkleTx::SetMerkleBranch.  It
was previously used to read the block from disk if not provided as
argument, but is no longer needed.
 2016-08-20 10:28:06 +02:00
MarcoFalke
faaec1377c [qa] Remove unused code 2016-08-19 22:43:05 +02:00
MarcoFalke
fa785d1211 Use __func__ to get function name for output printing 2016-08-19 18:59:00 +02:00
Jonas Schnelli
2468292a03
Merge #8517: [Qt] show wallet HD state in statusbar 
914154f [Qt] add HD enabled/disabled icon to the status bar (Jonas Schnelli)
 2016-08-19 18:47:49 +02:00
Jonas Schnelli
56ac046960
Merge #8443: [Wallet] Trivial cleanup of HD wallet changes 
7e5d94d [Wallet] Trivial cleanup of HD wallet changes (Jonas Schnelli)
 2016-08-19 18:39:19 +02:00
Jonas Schnelli
7e5d94df1f
[Wallet] Trivial cleanup of HD wallet changes 2016-08-19 16:23:37 +02:00
Wladimir J. van der Laan
f4e777819c
Merge #8461: document return value of networkhashps for getmininginfo RPC endpoint 
65f4532 document return value of networkhashps for getmininginfo RPC endpoint (Jameson Lopp)
 2016-08-19 12:18:42 +02:00
Wladimir J. van der Laan
36404aeec8
Merge #8540: qt: Fix random segfault when closing "Choose data directory" dialog 
b4a9aa5 qt: Fix random segfault when closing "Choose data directory" dialog (Wladimir J. van der Laan)
 2016-08-19 11:33:19 +02:00
Jonas Schnelli
914154f0cc
[Qt] add HD enabled/disabled icon to the status bar 2016-08-19 09:21:04 +02:00
Wladimir J. van der Laan
b4a9aa511c qt: Fix random segfault when closing "Choose data directory" dialog 
The `pickDataDirectory()` function was calling `exit(0)` to quit
the application when the user closes the dialog without choosing
a data directory.

This is a bad idea because a background thread is created (to
check free space on the drive of the currently selected datadir).
The thread is not stopped and unwound properly, resulting in a potential
race condition somewhere deep in Qt.

So replace the `exit()` by a boolean return value, and let the
stack unwind normally.
 2016-08-18 16:58:25 +02:00
crowning-
fab2e26d20 CDB: fix debug output 
It doesn't really help to clear a variable before printing it to the debug log.
 2016-08-18 16:52:38 +02:00
Pieter Wuille
8250de1358
Merge #8453: Bring secp256k1 subtree up to date with master 
b213535 Squashed 'src/secp256k1/' changes from 6c527ec..7a49cac (Wladimir J. van der Laan)
 2016-08-18 13:53:41 +02:00
Wladimir J. van der Laan
35f64e45c2
Revert "[qa] Adjust timeouts for micro-optimization of run time" 
This reverts commit fa2d68f79c.

Temporary revert - see discussion in #8532.
 2016-08-18 09:23:31 +02:00
Wladimir J. van der Laan
671fdae5f5
Merge #8534: [travis] Drop java 
fa0afde [travis] Drop java (MarcoFalke)
 2016-08-18 09:03:56 +02:00
Wladimir J. van der Laan
a78f95a976
Merge #8531: [qa] abandonconflict: Use assert_equal 
fa64306 [qa] abandonconflict: Use assert_equal (MarcoFalke)
 2016-08-18 08:43:35 +02:00
Patrick Strateman
e86eb71604 Move CWallet::setKeyPool to private section of CWallet 2016-08-17 15:24:57 -07:00
MarcoFalke
fa0afdee16 [travis] Drop java 2016-08-17 21:35:48 +02:00
MarcoFalke
fa64306520 [qa] abandonconflict: Use assert_equal 2016-08-17 13:25:25 +02:00
Wladimir J. van der Laan
733035bdb7
Merge #8504: test: Remove java comparison tool 
eb0c52e travis: Remove hostname hack (Wladimir J. van der Laan)
3c5251d test: Remove java comparison tool (Wladimir J. van der Laan)
 2016-08-17 13:12:23 +02:00
Wladimir J. van der Laan
e753eaeb34
Merge #8505: Trivial: Fix typos in various files 
1aacfc2 various typos (leijurv)
 2016-08-17 12:51:16 +02:00
Wladimir J. van der Laan
65e6444181
Merge #8513: Fix a type error that would not compile on OSX. 
8194a6e Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) (Jeremy Rubin)
 2016-08-17 12:32:58 +02:00
Wladimir J. van der Laan
740cff5808
Merge #8482: [qa] Use single cache dir for chains 
fad8cf6 [qa] Use single cache dir for chains (MarcoFalke)
fa2d68f [qa] Adjust timeouts for micro-optimization of run time (MarcoFalke)
fae596f [qa] Sort scripts by time for pull_tester and don't overwrite setup_chain (MarcoFalke)
 2016-08-17 12:23:45 +02:00
Wladimir J. van der Laan
eb0c52ec1d travis: Remove hostname hack 
This was required for java, and we no longer use java for the tests.
 2016-08-17 12:03:33 +02:00
Wladimir J. van der Laan
29496fc9e0
Merge #8512: Trivial: Corrected JSON typo on setban of net.cpp 
6ffd996 Corrected JSON typo on setban of net.cpp (Sev)
 2016-08-17 12:01:46 +02:00
Wladimir J. van der Laan
b41ac928b8
Merge #8521: qa: Remove duplicate hash160 implementation 
c1582d5 qa: Remove duplicate `hash160` implementation (Wladimir J. van der Laan)
 2016-08-17 12:00:47 +02:00