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
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
Gavin Andresen
9e70bff67a
Merge pull request #3083 from sipa/chainlocator
...
CBlockLocator improvements & move to core
2013-10-15 16:31:46 -07: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
Philip Kaufmann
7dea6345e1
replace %zu with %"PRIszu" macro to prevent compiler warnings
2013-10-15 14:50:58 +02:00
Wladimir J. van der Laan
f0c25cf6ec
Merge pull request #2924 from sje397/TrafficGraph
...
[QT] Add network traffic graph to debug window
2013-10-15 03:48:22 -07:00
Philip Kaufmann
96b9603c01
misc spelling / space / style fixes
2013-10-15 12:13:54 +02:00
Pieter Wuille
f9b15a4fc9
Move CBlockLocator to core.h
...
As CBlockLocator is a P2P data structure, and independent from the
validation logic, it can be moved to core.
2013-10-15 11:09:29 +02:00
Pieter Wuille
e4daecda0b
Reimplement CBlockLocator's chain-related logic in CChain.
...
This removes a few unused CBlockLocator methods, and moves the
construction and fork-finding logic to CChain (which can do these
more efficiently, as it has a height-indexable chain available).
It also makes CBlockLocator independent from the validation code.
2013-10-15 11:09:29 +02:00
Gavin Andresen
b2ba55c42b
Avoid core dump if rpc port is in use.
...
The cleanup code needs to check for NULL rpcworkers thread group.
2013-10-15 15:30:20 +10:00
Gavin Andresen
b9beea6e9d
Merge pull request #3077 from sipa/chain
...
Refactor/encapsulate chain globals into a CChain class
2013-10-14 20:39:00 -07:00
Gavin Andresen
ae6601872b
Merge pull request #2933 from sipa/leveldb113
...
Merge upstream LevelDB 1.13
2013-10-14 19:54:27 -07:00
Scott Ellis
ce14345a89
Add network traffic graph
2013-10-14 19:02:03 +11:00
Pieter Wuille
9269d0e96e
Merge pull request #2937
...
971bb3e
Added ping time measurement. New RPC "ping" command to request ping. Implemented "pong" message handler. New "pingtime" field in getpeerinfo, to provide results to user. New "pingwait" field, to show pings still in flight, to better see newly lagging peers. (Josh Lehan)
2013-10-13 17:41:28 +02:00
phantomcircuit
bc68788317
comment explaining new wallet format for key/wkey entries
2013-10-12 23:44:28 -07:00
Pieter Wuille
4c6d41b8b6
Refactor/encapsulate chain globals into a CChain class
2013-10-11 23:25:50 +02:00
Philip Kaufmann
733511eda0
prevent compiler redefinition warnings
...
- I observed a massive amount of redefinition warnings after #3071 , which
are silenced by this patch
- uses the same style as we do in other places, where we define _WIN32_WINNT
2013-10-11 15:37:36 +02:00
Philip Kaufmann
48c011489b
don't touch addressbook when using secure payment-requests
...
- fixes #3006 by preventing addressbook changes when using
secure payment-requests
sq
2013-10-11 15:34:05 +02:00
Philip Kaufmann
06dfd23d41
paymentserver: use own HTML-esc / add new header const
...
- make processPaymentRequest() use our own HTML-escaping function from
GUIUtil
- make string "application/bitcoin-payment" a constant (below similar
constant strings in the .cpp file)
2013-10-11 14:40:08 +02:00
Philip Kaufmann
8a041f494f
sendcoinsdialog: display real failed address string
...
- display the real string (faulty address), which causes the valid address
check to fail, instead of a stringified "nonsense" CBitcoinAddress
2013-10-11 14:29:09 +02:00
Philip Kaufmann
057bf35bc5
sendcoinsentry: small clear() and setValue() changes
...
- clear(): clear all UI elements (for secure and insecure payments)
- setValue(): only modify UI elements, which need to be set (for secure
or insecure payments)
2013-10-11 14:22:43 +02:00
Wladimir J. van der Laan
56c0ba7a0f
Merge pull request #3071 from gavinandresen/windows_h
...
Remove include of windows.h from allocators.h
2013-10-11 05:11:21 -07:00
Wladimir J. van der Laan
a302c21e0b
Merge pull request #3066 from Diapolo/rem_global
...
make fCommandLine a local variable in AppInit()
2013-10-09 23:35:42 -07:00
Gavin Andresen
d8315d1650
Remove include of windows.h from allocators.h
...
Create an allocators.cpp, and move all of the #ifdef WIN32
code and the #include of windows.h into it.
Two motives for this cleanup:
1. I'm getting a weird error in windows.h in my smartfee branch.
2. allocators.h is included (indirectly) just about everywhere, so
this should speed up Windows compiles quite a lot.
2013-10-09 16:48:53 +10:00
Philip Kaufmann
c7b1d6bbc7
Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0
2013-10-08 12:27:57 +02:00
Philip Kaufmann
917ac1dcc1
make fCommandLine a local variable in AppInit()
2013-10-08 10:52:42 +02:00
Gavin Andresen
aa56d317a5
Merge pull request #3059 from Diapolo/Shutdown
...
add missing Boost Thread join_all() call during shutdown
2013-10-07 15:42:07 -07:00
Philip Kaufmann
5ea66c54fb
style-police: fixed badly readable code in ProcessMessage()
...
- I introduced the problem and fixed it with better readable code
2013-10-07 08:55:04 +02:00
Philip Kaufmann
c55d1600da
add missing Boost Thread join_all() call during shutdown
...
- fixes #3037 by adding missing join_all() call and brings bitcoind
shutdown code in line with Bitcoin-Qt shutdown code
- added a comment for the if (!fRet) case
2013-10-07 08:52:54 +02:00
Wladimir J. van der Laan
695a722003
Merge pull request #3056 from Diapolo/stuck_debug_window
...
Bitcoin-Qt: prevent stuck/unusable debug window on exit
2013-10-06 04:57:08 -07:00
Philip Kaufmann
a8d0c1e8cc
Bitcoin-Qt: prevent stuck/unusable debug window on exit
...
- when closing the client with an open debug window, that window could
become stuck/unsuable (it was still shown wherea the main window was
hidden already)
- fix this by hiding the debug window, when quitting the the client
2013-10-05 13:15:50 +02:00
David Hill
a5e685bcf8
Hurricane Electric uses block 2001:470::, not 2011:470::
2013-10-04 08:46:45 -04:00
Josh Lehan
971bb3e901
Added ping time measurement.
...
New RPC "ping" command to request ping.
Implemented "pong" message handler.
New "pingtime" field in getpeerinfo, to provide results to user.
New "pingwait" field, to show pings still in flight, to better see newly lagging peers.
2013-10-04 01:30:12 -07:00
Philip Kaufmann
fbed9c9d63
special case DoS value == 0 in ProcessMessage()
...
- prevents unneeded log messages, which could make users think something
bad was happening
2013-10-04 10:12:55 +02:00
Gavin Andresen
acb3ebc455
Merge pull request #2947 from gmaxwell/theyre_maturing_faster_these_days
...
[wallet] Consider generated coins mature at COINBASE_MATURITY+1
2013-10-03 22:52:38 -07:00
Gavin Andresen
a68fd1ca14
Merge pull request #3040 from Diapolo/Qt_misc2
...
Bitcoin-Qt: add missing change from branch Qt_misc
2013-10-03 21:42:27 -07:00
Gavin Andresen
af880e8d3a
Merge pull request #3050 from Diapolo/fix_IsRFC4193_comment
...
fix #3049 by changing comment for CNetAddr::IsRFC4193()
2013-10-03 21:12:48 -07:00
Gavin Andresen
fea7236ca3
Merge pull request #3051 from Diapolo/bitcoind-rc
...
rename bitcoin-res.rc to bitcoind-res.rc
2013-10-03 21:11:57 -07:00
Jeff Garzik
5ad5e2d836
Merge pull request #3038 from Diapolo/Log_Shutdown
...
log start and end of Shutdown()
2013-10-03 06:16:06 -07:00
Philip Kaufmann
cbf87fc4a6
rename bitcoin-res.rc to bitcoind-res.rc
...
- helps recognizing that the resource file belongs to bitcoind.exe
2013-10-03 15:06:31 +02:00
Philip Kaufmann
c1761a5df3
fix #3049 by changing comment for CNetAddr::IsRFC4193()
2013-10-03 15:03:33 +02:00
Jeff Garzik
28f6b8dbad
RPC validateaddress: test pwalletMain for NULL (no-wallet mode)
2013-10-02 05:51:13 -04:00
Philip Kaufmann
ced3c24816
log start and end of Shutdown()
...
- could be helpful when debugging shutdown related problems
2013-10-02 08:36:47 +02:00
Jeff Garzik
19e5ae7369
Merge branch 'pwalletmain' - checking pwalletMain for NULL,
...
a pre-req for no-wallet support.
2013-10-01 16:18:50 -04:00
Jeff Garzik
b0730874d9
Support absence of wallet (pwalletMain==NULL) in several locations,
...
notably RPC.
2013-10-01 16:14:37 -04:00
Wladimir J. van der Laan
b63ae2a534
Merge pull request #2991 from Diapolo/translation_fixes
...
Bitcoin-Qt: translation fixes in sendcoins
2013-10-01 08:18:48 -07:00