Gavin Andresen
10dc3c7473
Merge branch 'bugfix_unknownoutputs' of git://github.com/luke-jr/bitcoin
...
Conflicts:
src/wallet.cpp
Fixed LogPrint/printf merge conflict.
2013-10-22 15:34:11 +10:00
super3
14f870cee5
Prettify some /Contrib READMEs
...
SYN
Remove Dead Readme-Qt Links.
2013-10-21 20:07:31 -04:00
Wladimir J. van der Laan
0c1222ff84
Merge pull request #2929 from Krellan/addrlocal
...
Additional field to RPC getpeerinfo output: addrlocal
2013-10-21 04:13:11 -07:00
Josh Lehan
547c61f8d8
Adding new "addrlocal" field to RPC getpeerinfo.
...
The existing CNode::addrLocal member is revealed to the user,
as an address string, similar to the existing "addr" field.
Instead of showing garbage or empty string,
it simply will not appear in the output if local address not known yet.
2013-10-21 02:23:05 -07:00
Wladimir J. van der Laan
2a03a39020
Add separate bitcoin-rpc client
...
This adds an executable `bitcoin-rpc` that only serves as a Bitcoin RPC
client.
The commit does not remove RPC functionality from the `bitcoind` yet,
this functionality should be deprecated but is left for a later version
to give users some time to switch.
2013-10-21 09:22:48 +02:00
Gavin Andresen
cc7562b7d2
Merge pull request #3104 from Diapolo/rpcssl-defaultciphers
...
update default -rpcsslciphers to include TLSv1.2
2013-10-20 19:50:11 -07:00
Gavin Andresen
496c2a3542
Merge pull request #3074 from laanwj/2013_10_remove_default_key_1
...
Remove automatic update of default key
2013-10-20 19:40:43 -07:00
Gavin Andresen
749230d05c
Merge pull request #2840 from sipa/nosendlock
...
Allow SendMessages to run partially without cs_main
2013-10-20 19:06:53 -07:00
Gavin Andresen
34f72ad6ef
Merge pull request #3046 from sarchar/lockedpage-change
...
Changing LockedPageManager to use a managed instance
2013-10-20 16:14:26 -07:00
Gavin Andresen
dc03c2d584
Merge pull request #3117 from gavinandresen/debuglockprint
...
Make -DDEBUGLOCKORDER + -debug less noisy
2013-10-20 14:26:21 -07:00
Pieter Wuille
9b1200c23b
Merge pull request #3119
...
db0e8cc
Bump Year Number to 2013 (super3)
2013-10-20 22:25:44 +02:00
super3
db0e8ccd90
Bump Year Number to 2013
2013-10-20 15:25:06 -04:00
Wladimir J. van der Laan
76eb192076
Merge pull request #3108 from Diapolo/paymentserver_style
...
paymentserver: style fixes / cleanup
2013-10-20 01:01:38 -07:00
Wladimir J. van der Laan
00f198c9a5
Merge pull request #3109 from laanwj/2013_10_remove_walletstack
...
qt: merge walletstack and walletframe
2013-10-20 00:29:38 -07:00
Chuck
0b8f47dc53
Changing LockedPageManager to use a managed instance
...
This ensures the allocator is ready no matter when it's needed (as
some STL implementations allocate in constructors -- i.e., MSVC's STL
in debug builds).
Using boost::call_once to guarantee thread-safe static initialization.
Adding some comments describing why the change was made.
Addressing deinitialization of the LockedPageManager object
by initializing it in a local static initializer and adding
an assert in the base's destructor.
2013-10-20 14:29:24 +07:00
Gavin Andresen
896853a011
Merge pull request #3106 from super3/master
...
Added better WalletTools description.
2013-10-19 23:13:42 -07:00
Gavin Andresen
bd48a4fe49
Merge pull request #2945 from gmaxwell/fee-logic_encourage_sweeping
...
[Fee logic] Don't count txins for priority to encourage sweeping.
2013-10-19 23:05:04 -07:00
Gavin Andresen
f90b690a0d
Merge pull request #2884 from gavinandresen/canonicalsizes2
...
Reject non-canonically-encoded CompactSize
2013-10-19 23:03:04 -07:00
Gavin Andresen
d3b0fa1d82
Merge pull request #3008 from gavinandresen/CENTrule
...
Two small free transaction policy changes
2013-10-19 23:01:47 -07:00
Gavin Andresen
3b9ecfed82
Make -DDEBUGLOCKORDER + -debug less noisy
...
Print out every mutex lock/unlock if compiled -DDEBUGLOCKORDER
only if -debug=lock is set.
2013-10-20 15:41:15 +10:00
Wladimir J. van der Laan
163145938c
qt: remove awkward way of setting GUI pages
...
Selecting the button for a pages was going through bitcoingui->walletframe->walletview->bitcoingui.
Because of this, the actions for the pages had to be exposed on the BitcoinGUI object.
2013-10-19 17:51:26 +02:00
Philip Kaufmann
95d4a2be95
paymentserver: style fixes / cleanup
...
- rename reportError() into message() to be in line with our default
message() signal/slot naming (and can be used for all types of messages)
- rename some QStrings to not collide with message() function
- add a missing message for malformed URIs that IS also used in BitcoinGUI
- fix / extend some comments and misc style fixes
2013-10-19 16:27:04 +02:00
Gavin Andresen
e11107f234
Merge pull request #3103 from gavinandresen/appbundle
...
make appbundle target for OSX development
2013-10-18 22:45:47 -07:00
Wladimir J. van der Laan
26702e6930
qt: merge walletstack and walletframe
...
There were too many levels of indirection here, and the functionality of
walletframe and walletstack can easily be merged. This commit
merges the two which cuts a lot of lines of boilerplate code.
2013-10-18 18:06:19 +02:00
Wladimir J. van der Laan
81cab378cc
Merge pull request #3101 from Diapolo/sendcoinsentry
...
add SendCoinsEntry::updateLabel() function
2013-10-18 07:04:49 -07:00
super3
6e01daae43
Added better WalletTools description.
2013-10-17 19:42:56 -04:00
Philip Kaufmann
1728bf0873
update default -rpcsslciphers to include TLSv1.2
...
- this extends the accepted ciphersuites with TLSv1.2 ones
- also removes !AH, as I could not find documentation on it and the change
did not result in a changed ciphersuite list (checked via openssl
ciphers -v)
- closes #3096 (which also contains more details)
2013-10-17 16:11:25 +02:00
Wladimir J. van der Laan
13b1ecf0d0
Merge pull request #3084 from Diapolo/clientmodel
...
clientmodel: remove 2 hard-coded values, use CChainParams instead
2013-10-17 04:45:37 -07:00
Gavin Andresen
a5bba245a3
Merge pull request #2981 from gmaxwell/tor2onion
...
Rename -tor to -onion to better reflect what it does.
2013-10-16 20:14:46 -07:00
Gavin Andresen
796e7b7aec
Merge pull request #2950 from pstratem/walletload
...
Walletload
2013-10-16 20:12:38 -07:00
Gavin Andresen
5a8a4be289
Merge pull request #2645 from sipa/inlinesighash
...
Inline signature serializer
2013-10-16 17:53:31 -07:00
Philip Kaufmann
46b57eb500
add SendCoinsEntry::updateLabel() function
...
- makes the code for updating a label reusable
- no functional changes
2013-10-16 17:11:39 +02:00
Wladimir J. van der Laan
0487cc4137
Merge pull request #3098 from super3/master
...
Finished /Contrib Index. Standardized READMEs.
2013-10-16 07:17:00 -07:00
Wladimir J. van der Laan
a2bb571c4f
Merge pull request #3069 from Diapolo/fix_addressbook
...
don't touch addressbook when using secure payment-requests
2013-10-15 23:48:47 -07:00
Gavin Andresen
03db5c6112
Merge pull request #3094 from Diapolo/btcamountfield
...
make BitcoinAmountField::setReadOnly() usable
2013-10-15 22:12:55 -07:00
super3
27e2d8bfb5
Finished /Contrib Index. Standardized READMEs.
...
File and Link Fix.
2013-10-15 23:37:30 -04:00
Gavin Andresen
26ce1bb20d
Merge pull request #3097 from super3/master
...
Broken Link in /Doc README
2013-10-15 19:39:48 -07:00
Shawn Wilkinson
dd9bd863cf
Broken Link in /Doc README
...
#3092 removed readme-qt.md, but it was still listed in the index for the /doc README.
2013-10-15 21:38:06 -04:00
Gavin Andresen
e16c2b4422
Merge pull request #3085 from super3/master
...
Documentation Cleanup and Contrib Index
2013-10-15 18:27:54 -07:00
Gavin Andresen
5d36ff289b
Merge pull request #3086 from Michagogo/update-pgp
...
Update michagogo's gitian pgp key, adding UIDs
2013-10-15 16:33:31 -07:00
Gavin Andresen
8d3f0d099b
Merge pull request #3092 from laanwj/2013_10_remove_readme_qt
...
doc: remove readme-qt.md
2013-10-15 16:32:50 -07:00
Gavin Andresen
9e70bff67a
Merge pull request #3083 from sipa/chainlocator
...
CBlockLocator improvements & move to core
2013-10-15 16:31:46 -07:00
Pieter Wuille
7d38af3c49
Push down cs_main locking in ProcessMessage
2013-10-15 22:34:25 +02:00
Pieter Wuille
49d754d915
Run node deletions outside of cs_vNodes
2013-10-15 22:34:25 +02:00
Pieter Wuille
6055b9101b
Allow SendMessages to run partially without cs_main
...
SendMessages() tries to acquire a cs_main lock now, but this isn't nessecary
for much of its functionality. Move those parts out of the locked section,
so they can always be performed, and we hold cs_main for a shorter time.
2013-10-15 22:34:20 +02:00
Wladimir J. van der Laan
62568f9a1e
doc: build with qt5 is currently not possible
...
Add as a separate commit so that it can be easily reverted once
Qt5 is supported again.
2013-10-15 16:02:10 +02:00
Wladimir J. van der Laan
29a4146327
doc: remove readme-qt.md
...
Now that autotools is used as a build system there is nothing
special about building the GUI anymore. Merge the salvageable
parts into build-unix.md
2013-10-15 15:58:43 +02:00
Philip Kaufmann
75fa27eaca
make BitcoinAmountField::setReadOnly() usable
...
- use it for secure payment-requests (this change allows a copy&paste of
the amount and looks a little nicer than just a disabled GUI element)
2013-10-15 15:26:22 +02:00
Wladimir J. van der Laan
38d15d8b42
Merge pull request #3080 from Diapolo/sendcoins-paymentreq
...
Bitcoin-Qt: misc changes for sendcoins and paymentsever
2013-10-15 05:57:17 -07:00
Wladimir J. van der Laan
f12c09a45b
Merge pull request #3093 from Diapolo/printf_format
...
replace %zu with %"PRIszu" macro to prevent compiler warnings
2013-10-15 05:55:53 -07:00