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

2332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Dashjr
d354f94241 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/net.cpp
	src/protocol.cpp
 2012-06-15 01:37:00 +00:00
Luke Dashjr
133bc2e5f0 Merge branch '0.4.x' into 0.5.x 2012-06-14 20:38:32 +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
Gavin Andresen
b0e508a0c0 Include limits, not climints (using std::numeric_limits now) 2012-06-14 20:12:53 +00:00
Gavin Andresen
5cd2a640a5 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 19:52:31 +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
Luke Dashjr
3703150d56 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	doc/release-process.txt
	src/serialize.h
 2012-06-14 18:07:11 +00:00
Wladimir J. van der Laan
1bc2f0a37b Fix build of testcases after commit 0f10b21719e1b0d9683a142f0a7105e65f095694 2012-06-14 17:59:31 +00:00
Philip Kaufmann
276cfd8530 Bugfix: Fix various places where Bitcoin-Qt was being shutdown improperly 
(Partial/merge of upstream 9247134eaba9a1d0fa74f22de238af1476663005, 1a3f0da9229a8e524d1010cdc8bd3b9da71fe529, and 3e343522226e6c249f5cb05436eec347b87c6361)
 2012-06-14 17:53:59 +00:00
Philip Kaufmann
0b1fda6f65 Don't call exit() in Shutdown() for Bitcoin-Qt (fixes a tray-icon issue) 
(partial of 9247134eaba9a1d0fa74f22de238af1476663005)
 2012-06-14 17:32:45 +00:00
Matt Corallo
ca39829ecb Update wiki changelog at doc/release-process.txt 2012-06-14 17:21:05 +00:00
Philip Kaufmann
a973e225e7 change initial Balance on overviewpage from "123.456 BTC" to "0 BTC" to not confuse users, which could see it before we init with the real wallet balance 2012-06-14 17:19:48 +00:00
Philip Kaufmann
5482b5d23b removed ability to translate "0 BTC" and "123.456 BTC" as this is only used as preview in the Qt Designer anyway 
(partial of 4295311da34ed8132351855f057decedfe434b44)
 2012-06-14 17:18:44 +00:00
Matt Corallo
1903033bad Fix broken config files 2012-06-14 17:13:29 +00:00
Wladimir J. van der Laan
b825e816e4 Do not select first address automatically in the address book 
This contributed to an accidental send (#1384), and has no clear advantage, better to disable it.
 2012-06-14 17:11:26 +00:00
Luke Dashjr
9849f50b68 Bump VERSION so we can differentiate between fixed 0.4.7rc2 and not-fixed 0.4.7rc1 2012-06-14 15:59:18 +00:00
Luke Dashjr
9a48f56fb0 Bugfix: Move IsStandard scriptSig size check out of IsPushOnly, since BIP16 verification uses the latter too 
This caused clients to reject block #177618 since it has a P2SH transaction with over 200 bytes in scriptSig.

(Upstream commit: e679ec969c8b22c676ebb10bea1038f6c8f13b33)
 2012-06-12 23:50:38 +00:00
Luke Dashjr
722ff53718 Bugfix: Allow tray icon to linger until Bitcoin-Qt shuts down completely. Fixes #908 
Upstream commit: 7cfbe1fee465e82ddbdc8ed17dfcce791bd765f5
 2012-06-06 20:00:22 +00:00
Philip Kaufmann
af413c0a0f fix an incorrect if-clause in net.cpp 2012-06-06 19:37:53 +00:00
Michael Hendricks
a0ea95d3ce Serialize access to debug.log stream 
Acquire an exclusive, advisory lock before sending output to debug.log
and release it when we're done. This should avoid output from multiple
threads being interspersed in the log file.

We can't use CRITICAL_SECTION machinery for this because the debug log
is written during startup and shutdown when that machinery is not
available.

(Thanks to Gavin for pointing out the CRITICAL_SECTION problems based
on his earlier work in this area)
 2012-06-06 19:29:28 +00:00
Matt Corallo
fdd907c9f1 Correct blockchain size in contrib/debian. 
* Updates package description to note that blockchain now takes
  2+ GB instead of 150+ MB.

(PARTIAL of 8f6111bb9cd598954e9634d9fe4500fcf5ae83de)
 2012-06-06 19:24:31 +00:00
Chris Moore
7c4de78a5c "USE_UPNP=-" is needed to remove UPnP support. 2012-06-06 19:21:15 +00:00
Jeff Garzik
82a227b263 .gitignore: add test_bitcoin 2012-05-26 02:25:16 +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
Jeff Garzik
a2de1ea2d5 Prevent crashes due to missing or corrupted blk????.dat records 2012-05-22 22:50:02 +00:00
Jeff Garzik
b6862f7b74 Prevent crashes due to missing or corrupted database records 
Any problems seen during deserialization will throw an uncaught
exception, crashing the entire bitcoin process.  Properly return an
error instead, so that we may at least log the error and gracefully
shutdown other portions of the app.
 2012-05-22 22:47:51 +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
Wladimir J. van der Laan
087fc28f7d Filter out whitespace and zero-width non-breaking spaces in validator 
- Fixes issues with copy/pasting from web or html emails (#1325)
 2012-05-22 22:33:41 +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
Philip Kaufmann
334668cde4 remove 2 ugly spaces from a message string 
(PARTIAL of 966ae00)
 2012-05-20 19:54:14 +00:00
R E Broadley
c45c2c380d Add build directory to .gitignore, so that it's not tracked. 2012-05-18 00:08:34 +00:00
Christian von Roques
fba681519a Fix typo. libarcode => libqrcode 2012-05-18 00:04:59 +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
Philip Kaufmann
10593f3be1 remove string "TextLabel" from warningLabel, as this is unneeded and as such is a silly translation less to do :) 2012-05-15 08:08:32 +00:00
Wladimir J. van der Laan
dc15d56b2d Properly escape " in strings when exporting CSV 2012-05-15 08:03:38 +00:00
Fordy
0d174e130b Correct Date 2012-05-15 08:02:57 +00:00
Fordy
182738e177 Correct Date 2012-05-15 08:02:30 +00:00
Philip Kaufmann
7515f00aa3 remove 2 ugly spaces from a string used in translations 2012-05-15 07:37:59 +00:00
Luke Dashjr
93b5eff274 Bitcoin-Qt: Remove redundant tooltip on optional transaction fee. Fixes #1218 2012-05-15 07:32:00 +00:00
Luke Dashjr
8fa3259664 Bump version to 0.6.0.8 2012-05-08 20:11:44 +00:00
Luke Dashjr
cd0527453b 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-05-08 20:10:20 +00:00
Luke Dashjr
35a07f8ec4 Bump version to 0.5.6 2012-05-08 20:09:43 +00:00
Luke Dashjr
fac3476993 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/serialize.h
 2012-05-08 20:08:19 +00:00
Luke Dashjr
18b4eccddb Bump version to 0.4.7 2012-05-08 19:53:29 +00:00
Luke Dashjr
b481373001 Update/fix translations 2012-05-07 05:34:18 +00:00