cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-17 19:09:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,282 Commits 8 Branches 349 Tags
Commit Graph

2282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Dashjr
1fa846bbb6 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.cpp
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-05-07 04:10:54 +00:00
Luke Dashjr
b803009c84 Update/fix translations 2012-05-07 04:10:35 +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
6bcefc1338 Merge commit '293f264' into 0.6.0.x 2012-05-07 04:00:26 +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
Philip Kaufmann
293f2644ff fix #952 by checking if we have a new address or an updated label 2012-05-06 22:48:05 +00:00
Wladimir J. van der Laan
e38d492822 Hide UI immediately after leaving the main loop. 
Prevents it from seeming to hang during shutdown if shutdown is triggered while the window is open.
 2012-05-06 14:55:59 +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
Pieter Wuille
700e5a4d86 Bugfix: store source address in addrman 2012-05-06 05:33:38 +00:00
Pieter Wuille
adecb2ea00 Fix addrman crashes 
A function returned the element to remove from a bucket, instead of its
position in that bucket. This function was only called when a tried
bucket overflowed, which only happens after many outgoing connections
have been made.

Closes: #1065, #1156
 2012-05-06 05:32:44 +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
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
Philip Kaufmann
479c99022e remove HTML code around "Wallet" (displayed on overview page) and use Qt tags for font settings 2012-05-05 16:15:38 +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
57cd445e95 Merge branch '0.6.0.x' of gitorious.org:+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.0.x 2012-05-04 18:58:37 +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
Philip Kaufmann
cae1a68267 remove obsolete BackupWallet() entry in wallet.h 2012-05-04 17:41:13 +00:00
Philip Kaufmann
6789e99e4f add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator) 2012-05-02 19:39:46 -04:00
Philip Kaufmann
4898482915 fix compiler warning "suggest parentheses around assignment used as truth 
value [-Wparentheses]" in util.cpp
 2012-05-01 23:11:56 -04:00
Philip Kaufmann
8edec3f9d6 fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice 2012-05-01 23:11:07 -04:00
Philip Kaufmann
e6578e7fa7 remove unused typedef in serialize.h 2012-05-01 23:09:22 -04:00
Philip Kaufmann
1fb6e2d9bf change button tooltip on sign message page for copy to clipboard as it was missleading 2012-04-30 10:45:58 -04: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 2232717cba9e9f06a01e8f37bcea4e79ee65205f)
 2012-04-27 15:00:57 -04:00
Gavin Andresen
3a70f3a4ec Bump win32.deps version number for new openssl 2012-04-27 14:01:49 -04:00
Luke Dashjr
655b1b0cc2 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	contrib/gitian-descriptors/gitian-win32.yml
 2012-04-27 13:57:43 -04:00
Gavin Andresen
dd02f3ca6e Windows build: compile against openssl 1.0.1b 2012-04-27 13:57:17 -04:00
Luke Dashjr
824e8dde8b Merge branch '0.4.x' into 0.5.x 
Conflicts:
	doc/build-msw.txt
	src/makefile.linux-mingw
	src/makefile.mingw
 2012-04-27 13:52:02 -04:00
Gavin Andresen
b7a2b6e1aa Windows build: compile against openssl 1.0.1b 2012-04-27 13:51:12 -04:00
Gavin Andresen
5ad4028050 Windows build: compile against openssl 1.0.1b 2012-04-27 11:19:20 -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
Luke Dashjr
e5f43fe309 Bump version to 0.5.5 2012-04-27 10:55:06 -04:00
Luke Dashjr
ccfcdc2e3d Merge branch '0.4.x' into 0.5.x 
Conflicts:
	contrib/Bitcoin.app/Contents/Info.plist
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/protocol.h
	src/serialize.h
 2012-04-27 10:53:14 -04:00
Luke Dashjr
c18b82d5db Bump version to 0.4.6 2012-04-27 10:50:24 -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
Timothy Redaelli
ea22a380de We should include netinet/in.h to use sockaddr_in (POSIX.1-2001) 2012-04-27 10:45:58 -04:00
Timothy Redaelli
dfac636fd7 We should include netinet/in.h to use sockaddr_in (POSIX.1-2001) 2012-04-27 10:42:37 -04:00
Timothy Redaelli
282e3ffe6e We should include netinet/in.h to use sockaddr_in (POSIX.1-2001) 2012-04-27 10:41:52 -04:00
Jeff Garzik
c21121752d CBlock::WriteToDisk() properly checks ftell(3) for error return 
Rather than storing ftell(3)'s return value -- a long -- in an
unsigned int, we store and check a properly typed temp.  Then, assured a
non-negative value, we store in nBlockPosRet.
 2012-04-24 01:00:15 -04:00
Jeff Garzik
07d1a50aee Test ScriptSigArgsExpected() for error, before accumulating return value 2012-04-24 00:51:54 -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