highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-11 01:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,586 Commits 8 Branches 348 Tags
5e322a72f94e3c759bb37cec37d8c066766b6072
Commit Graph

249 Commits

Author SHA1 Message Date
Luke Dashjr
5e322a72f9 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	.gitignore
	src/bitcoinrpc.cpp
	src/main.cpp
	src/qt/bitcoingui.cpp
	src/ui_interface.h
	src/util.cpp
 2012-06-14 18:21:07 +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
Pieter Wuille
8f0c0c16d3 Use a 64-bit nonce in ping 
Former code sent '0' as nonce, which was serialized as 32-bit.
 2012-06-14 18:00:49 +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
a49927a46d Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/bitcoinrpc.h
	src/db.h
	src/headers.h
	src/init.cpp
	src/main.cpp
	src/main.h
	src/noui.h
	src/qt/bitcoin.cpp
	src/qt/locale/bitcoin_en.ts
	src/qt/walletmodel.cpp
	src/script.cpp
	src/ui_interface.h
	src/util.cpp
 2012-05-22 23:07:46 +00:00
Luke Dashjr
d67b0434f2 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.cpp
 2012-05-22 22:57:10 +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
R E Broadley
8a39b0d613 Correct debug.log output to show correct function the debug is coming from. 2012-05-22 22:42:13 +00:00
Fordy
58ac600b2c 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:15:41 +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
Fordy
e10622d129 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:00:26 +00:00
Philip Kaufmann
334668cde4 remove 2 ugly spaces from a message string 
(PARTIAL of 966ae00)
 2012-05-20 19:54:14 +00:00
Jeff Garzik
3a05f1d2ce Always check return values of TxnBegin() and TxnCommit() 2012-05-18 00:04:18 +00:00
Jeff Garzik
738592a002 Always check return values of TxnBegin() and TxnCommit() 
PARTIAL, since d68dcf7 isn't backported (yet)
 2012-05-18 00:03:32 +00:00
Pieter Wuille
c455aec699 Hopefully final fix for the stuck blockchain issue 
Immediately issue a "getblocks", instead of a "getdata" (which will
trigger the relevant "inv" to be sent anyway), and only do so when
the previous set of invs led us into a known and attached part of
the block tree.
 2012-05-17 23:45:49 +00:00
Pieter Wuille
60953d05c8 Prevent stuck download: correct solution 
Pull request #948 introduced a fix for nodes stuck on a long side branch
of the main chain. The fix was non-functional however, as the additional
getdata request was created in a first step of processing, but dropped
in a second step as it was considered redundant. This commits fixes it
by sending the request directly.
 2012-05-07 04:00:49 +00:00
Luke Dashjr
afff998ef0 Merge branch '0.4.x' into 0.5.x 2012-05-07 02:46:14 +00:00
Pieter Wuille
2403bb79bc Prevent stuck download: correct solution 
Pull request #948 introduced a fix for nodes stuck on a long side branch
of the main chain. The fix was non-functional however, as the additional
getdata request was created in a first step of processing, but dropped
in a second step as it was considered redundant. This commits fixes it
by sending the request directly.
 2012-05-07 02:45:08 +00:00
Pieter Wuille
eb3f661add Prevent stuck block download in large reorganisations 
In cases of very large reorganisations (hundreds of blocks), a situation
may appear where an 'inv' is sent as response to a 'getblocks', but the
last block mentioned in the inv is already known to the receiver node.
However, the supplying node uses a request for this last block as a
trigger to send the rest of the inv blocks. If it never comes, the block
chain download is stuck.

This commit makes the receiver node always request the last inv'ed block,
even if it is already known, to prevent this problem.
 2012-05-07 02:44:45 +00:00
Luke Dashjr
457ff3a437 Merge branch '0.5.x' into 0.6.0.x 2012-05-06 05:35:58 +00:00
Luke Dashjr
5da2dce524 Merge branch '0.4.x' into 0.5.x 2012-05-06 05:35:50 +00:00
Luke Dashjr
d41f22cb76 Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead 2012-05-06 05:27:38 +00:00
Luke Dashjr
607739befb Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead 
Conflicts:

	src/walletdb.cpp
 2012-05-06 05:27:08 +00:00
Luke Dashjr
ee932c6e35 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.cpp
 2012-05-04 19:55:54 +00:00
Luke Dashjr
c328c684c2 Bugfix: Remove redundant duplicate transaction check 2012-05-04 19:54:24 +00:00
Luke Dashjr
a1a5a89063 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.cpp
	src/serialize.h
 2012-05-04 18:57:03 +00:00
Luke Dashjr
b2e5f797b5 Merge branch '0.4.x' into 0.5.x 2012-05-04 18:55:15 +00:00
Gavin Andresen
6a89317f62 Check earlier for blocks with duplicate transactions. Fixes #1167 2012-05-04 18:55:05 +00:00
Gavin Andresen
ad5a4c7c47 Check earlier for blocks with duplicate transactions. Fixes #1167 2012-05-04 18:52:16 +00:00
Gavin Andresen
be8651dde7 Check earlier for blocks with duplicate transactions. Fixes #1167 2012-04-30 11:08:07 -04:00
Jeff Garzik
07d1a50aee Test ScriptSigArgsExpected() for error, before accumulating return value 2012-04-24 00:51:54 -04:00
Jeff Garzik
1d8c7a9557 Add casts for unavoidable signed/unsigned comparisons 
At these code sites, it is preferable to cast rather than change
a variable's type.
 2012-04-23 14:14:36 -04:00
Jeff Garzik
c0a0a93d02 Test ScriptSigArgsExpected() for error, before accumulating return value 2012-04-23 14:14:36 -04:00
Jeff Garzik
7bd9c3a3cf SigOp and orphan-tx constants and counts are always unsigned. 
Fixes several sign-comparison warnings.
 2012-04-23 14:14:03 -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
Pieter Wuille
dc588faf59 Fix potential deadlock 
Conflict:
* cs_main in ProcessMessages() (before calling ProcessMessages)
* cs_vSend in CNode::BeginMessage
versus:
* cs_vSend in ThreadMessageHandler2 (before calling SendMessages)
* cs_main in SendMessages

Even though cs_vSend is a try_lock, if it succeeds simultaneously with
the locking of cs_main in ProcessMessages(), it could cause a deadlock.
 2012-04-17 15:11:48 -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
Jeff Garzik
774e9b6dbb 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:57:42 -04:00
Jeff Garzik
1175d8f6a1 AlreadyHave(): only hold lock during mapTransactions access 2012-04-17 14:40:58 -04:00
Pieter Wuille
c23617fef3 Merge remote-tracking branch 'jgarzik/mempool' 2012-04-17 20:12:48 +02:00
Pieter Wuille
caeddc5d37 Merge pull request #1117 from sipa/deadlockfix 
Fix potential deadlock
 2012-04-17 11:05:02 -07:00
Pieter Wuille
6b6aaa1698 Further reduce header dependencies 
This commit removes the dependency of serialize.h on PROTOCOL_VERSION,
and makes this parameter required instead of implicit. This is much saner,
as it makes the places where changing a version number can have an
influence obvious.
 2012-04-17 20:03:42 +02:00
Pieter Wuille
ed6d0b5f85 Remove headers.h 2012-04-17 20:00:55 +02:00
Gavin Andresen
b97d54355e Merge pull request #1106 from jgarzik/sign-compare 
Fix many sign-comparison warnings found in bitcoin codebase
 2012-04-17 10:55:56 -07:00
Jeff Garzik
12570da46f Locking fix for AlreadyHave() 
Access to mapTransactions[] must be guarded by cs_mapTransactions lock.
 2012-04-17 13:20:29 -04:00
Pieter Wuille
c581cc16bb Fix potential deadlock 
Conflict:
* cs_main in ProcessMessages() (before calling ProcessMessages)
* cs_vSend in CNode::BeginMessage
versus:
* cs_vSend in ThreadMessageHandler2 (before calling SendMessages)
* cs_main in SendMessages

Even though cs_vSend is a try_lock, if it succeeds simultaneously with
the locking of cs_main in ProcessMessages(), it could cause a deadlock.
 2012-04-17 18:50:52 +02:00
Jeff Garzik
ce8c93498a main.cpp: replace tabs with spaces 
Sometimes they sneak in through the 'vi' door
 2012-04-17 12:31:51 -04:00
Jeff Garzik
8bff8ac079 AlreadyHave(): only hold lock during mapTransactions access 2012-04-17 12:30:00 -04:00