highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-04 06:12:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,419 Commits 8 Branches 347 Tags
cd76166b4b37a9d2d5769127c137f1e8569d11ae
Commit Graph

122 Commits

Author SHA1 Message Date
Luke Dashjr
cd76166b4b Merge commit '52153a6' into 0.6.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-08-26 22:20:26 +00:00
Luke Dashjr
52153a6e08 Minimal adaptations to getmemorypool for BIP 34 
- As long as version 1 blocks are valid, provide them to getmemorypool clients (only)
- Include BIP 22 "height" key in getmemorypool output
 2012-08-26 21:51:41 +00:00
Luke Dashjr
cafa8f2879 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
 2012-08-12 17:19:48 +00:00
Luke Dashjr
89c5c381b7 Merge branch '0.5.x' into 0.6.0.x 2012-08-12 17:14:29 +00:00
Luke Dashjr
982f4fd301 Bugfix: Fix a variety of misspellings 2012-08-12 17:13:48 +00:00
Luke Dashjr
797d0b231b Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/net.cpp
 2012-08-12 17:02:38 +00:00
Luke Dashjr
5951d9fe32 Merge branch 'bugfix_CNBerr' into 0.5.x 2012-08-12 16:40:59 +00:00
Luke Dashjr
9b1b1a06a1 Merge branch '0.4.x' into 0.5.x 2012-08-12 16:39:46 +00:00
Gavin Andresen
0ce74bfaa5 Use std::numeric_limits<> for typesafe INT_MAX/etc 
(this fixes a Mac OS X gitian build error for 0.5.x)
 2012-06-14 20:38:25 +00:00
Luke Dashjr
6ec9d30905 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.h
	src/net.cpp
	src/serialize.h
 2012-06-14 18:13:46 +00:00
Philip Kaufmann
276cfd8530 Bugfix: Fix various places where Bitcoin-Qt was being shutdown improperly 
(Partial/merge of upstream 9247134eab, 1a3f0da922, and 3e34352222)
 2012-06-14 17:53:59 +00:00
Luke Dashjr
3b36da6d27 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/ui.cpp
	src/ui.h
	src/uibase.cpp
	src/xpm/about.xpm
 2012-05-22 22:55:49 +00:00
Fordy
b2de28c740 Update License in File Headers 
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
 2012-05-20 20:10:24 +00:00
Fordy
d11488abd0 Update License in File Headers 
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
 2012-05-20 20:06:11 +00:00
Jeff Garzik
3a05f1d2ce Always check return values of TxnBegin() and TxnCommit() 2012-05-18 00:04:18 +00:00
Luke Dashjr
5d53f48acb Bugfix: getmemorypool: NULL pindexPrev across CreateNewBlock, in case it fails 2012-05-09 18:12:01 +00:00
Luke Dashjr
5146599b01 Merge branch 'bugfix_CNBerr_daggy' into bugfix_CNBerr 
Conflicts:
	rpc.cpp
 2012-05-09 17:14:08 +00:00
Peter Todd
b94e6eb5a5 Fixed non-sensical error message 
Previously trying to create a multisig address that required less than
one signature would output something like the following:

"wrong number of keys(got 1, need at least 0)"
 2012-05-06 05:30:37 +00:00
Luke Dashjr
6c055e506d Merge branch '0.5.x' into 0.6.0.x 2012-04-27 16:28:00 -04:00
Gavin Andresen
813dc92cdc fix compiler error in bitcoinrpc RE: boost::system 
(Partial of 2232717cba)
 2012-04-27 15:00:57 -04:00
Luke Dashjr
8ba4282c3f Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
 2012-04-27 10:57:15 -04:00
freewil
3eb5fdbf5f listsinceblock: rpc param blockid -> blockhash 
This is more consistent with the rest of the labeling seen
by the user when accessing the rpc commands.
 2012-04-27 10:47:31 -04:00
freewil
aff6456e8a remove strange debug message from listsinceblock 2012-04-27 10:46:36 -04:00
Luke Dashjr
66116c3847 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.h
	src/net.cpp
	src/util.cpp
 2012-04-22 10:07:24 -04:00
Luke Dashjr
a93ab87787 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/main.cpp
 2012-04-22 10:05:43 -04:00
Jeff Garzik
0c3aa881e2 Fix loop index var types, fixing many minor sign comparison warnings 
foo.size() typically returns an unsigned integral type; make loop variables
match those types' signedness.
 2012-04-17 14:59:32 -04:00
Luke Dashjr
3374c3ef09 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/sendcoinsdialog.cpp
	src/qt/sendcoinsdialog.h
	src/util.cpp
 2012-04-15 21:15:48 -04:00
Luke Dashjr
e73b792b1a Merge branch '0.5.0.x' into 0.5.x 2012-04-15 21:06:10 -04:00
Luke Dashjr
79fc752b61 Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/keystore.h
 2012-04-15 21:05:54 -04:00
Wladimir J. van der Laan
1bdfa94a01 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] 2012-04-15 19:43:45 -04:00
Wladimir J. van der Laan
1f56046fd5 Show error message instead of exception crash when unable to bind RPC port 
Fixes issue #875
 2012-04-11 15:54:30 -04:00
Luke Dashjr
fe1725a141 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-04-04 15:43:29 -04:00
Luke Dashjr
658cf0b1be Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	src/qt/bitcoingui.h
 2012-04-04 15:41:07 -04:00
Wladimir J. van der Laan
91d7e847e0 Use a messagebox to display the error when -server is provided without providing a rpc password 
(plus part of 7cfbe1fee4)
 2012-04-04 13:57:32 -04:00
Pieter Wuille
439e1497e1 Introduce explicit -walletupgrade option 
Do not automatically change the wallet format unless the user takes an
explicit action that implies an upgrade (encrypting, for now), or uses
-walletupgrade.

-walletupgrade optionally takes an integer argument: the client version
up to which upgrading is allowed. Without an argument, it is upgraded
to latest supported version. If an argument to -walletupgrade is
provided at the time the wallet is created, the new wallet will initially
not use features beyond that version.

Third, the current wallet version number is reported in getinfo.
 2012-03-22 23:47:29 +01:00
Wladimir J. van der Laan
4a43dfbf3e replace call to PrintConsole with call to error() 
As these are equivalent functions, this cleans up the source a bit.
Also remove PrintConsole() as this was the only use.
 2012-03-21 20:33:53 +01:00
Luke Dashjr
eca170286e Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
 2012-03-16 16:45:32 -04:00
Gavin Andresen
27960a36de Fix issue #848 : broken mining on testnet 2012-03-16 16:40:38 -04:00
Luke Dashjr
d05c03ab4e Merge branch '0.5.0.x' into 0.5.x 2012-03-11 22:21:06 -04:00
Luke Dashjr
b4f8c8f5f9 Merge branch '0.4.x' into 0.5.0.x 2012-03-11 22:20:31 -04:00
Gregory Maxwell
82a10c8170 Resolves issue #922 - "wallet passphrase timeout of several years doesn't work" 
2^31 milliseconds is only about 25 days. Also clamps Sleep() to 10 years,
because it currently sleeps for 0 seconds when the sleep time would cross
2^31 seconds since the epoch. Hopefully boost will be fixed by 2028.
 2012-03-10 17:38:37 -05:00
Luke Dashjr
9cf600e6da Merge branch '0.5.0.x' into 0.5.x 2012-03-03 13:59:31 -05:00
Luke Dashjr
7013cc3d97 Merge branch '0.4.x' into 0.5.0.x 2012-03-03 13:59:19 -05:00
Gavin Andresen
972060ce0e bitcoind changes to stop storing settings in wallet.dat. 2012-02-26 23:21:33 +01:00
Luke Dashjr
34f8788915 Cleanup JSON-RPC getblock output to be consistent 
- Add "size" and "bits"
- Rename "blockcount" to "height"
- Rename "hashprevious" and "hashnext" to "previousblockhash" and "nextblockhash" (respectively)
 2012-02-22 12:31:28 -05:00
Gavin Andresen
0a6b081cca Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-git 2012-02-17 13:48:01 -05:00
Luke Dashjr
6fb186f4bb Merge branch '0.5.0.x' into 0.5.x 2012-02-17 09:40:00 -05:00
Luke Dashjr
fdb365df0e Merge branch '0.4.x' into 0.5.0.x 2012-02-17 09:39:54 -05:00
Gavin Andresen
0f8cb5db73 Fix issue #848 : broken mining on testnet 2012-02-16 11:37:54 -05:00
Pieter Wuille
c59881eaee Symbolic names for threads 
Introduce an enum threadId, and use symbolic indices when accessing
vnThreadsRunning.
 2012-02-16 12:43:06 +01:00