github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-20 06:08:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,266 Commits 6 Branches 150 Tags
ee932c6e35f40360fbc3bce44840a82b19599ea2
Commit Graph
2266 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 AndresenandLuke Dashjr 6a89317f62 Check earlier for blocks with duplicate transactions. Fixes #1167 2012-05-04 18:55:05 +00:00
Gavin AndresenandLuke Dashjr ad5a4c7c47 Check earlier for blocks with duplicate transactions. Fixes #1167 2012-05-04 18:52:16 +00:00
Philip KaufmannandLuke Dashjr cae1a68267 remove obsolete BackupWallet() entry in wallet.h 2012-05-04 17:41:13 +00:00
Philip KaufmannandLuke Dashjr 6789e99e4f add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator) 2012-05-02 19:39:46 -04:00
Philip KaufmannandLuke Dashjr 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 KaufmannandLuke Dashjr 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 KaufmannandLuke Dashjr e6578e7fa7 remove unused typedef in serialize.h 2012-05-01 23:09:22 -04:00
Philip KaufmannandLuke Dashjr 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 AndresenandLuke Dashjr 813dc92cdc fix compiler error in bitcoinrpc RE: boost::system 
(Partial of 2232717cba)
 2012-04-27 15:00:57 -04:00
Gavin AndresenandLuke Dashjr 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 AndresenandLuke Dashjr 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 AndresenandLuke Dashjr b7a2b6e1aa Windows build: compile against openssl 1.0.1b 2012-04-27 13:51:12 -04:00
Gavin AndresenandLuke Dashjr 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
freewilandLuke Dashjr 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
freewilandLuke Dashjr aff6456e8a remove strange debug message from listsinceblock 2012-04-27 10:46:36 -04:00
Timothy RedaelliandLuke Dashjr ea22a380de We should include netinet/in.h to use sockaddr_in (POSIX.1-2001) 2012-04-27 10:45:58 -04:00
Timothy RedaelliandLuke Dashjr dfac636fd7 We should include netinet/in.h to use sockaddr_in (POSIX.1-2001) 2012-04-27 10:42:37 -04:00
Timothy RedaelliandLuke Dashjr 282e3ffe6e We should include netinet/in.h to use sockaddr_in (POSIX.1-2001) 2012-04-27 10:41:52 -04:00
Jeff GarzikandLuke Dashjr 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 GarzikandLuke Dashjr 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
Timothy RedaelliandLuke Dashjr d0fe14ffec Add missing includes. (Fix bulding under GCC 4.7) 
(Note: GCC 4.7 build NOT tested with backports -Luke)
 2012-04-22 09:41:51 -04:00
Dwayne C. LitzenbergerandLuke Dashjr c43a9ea77d Fix bugs on 'unsigned char' platforms. 
In ISO C++, the signedness of 'char' is undefined.  On some platforms (e.g.
ARM), 'char' is an unsigned type, but some of the code relies on 'char' being
signed (as it is on x86).  This is indicated by compiler warnings like this:

 bignum.h: In constructor 'CBigNum::CBigNum(char)':
 bignum.h:81:59: warning: comparison is always true due to limited range of data type [-Wtype-limits]

 util.cpp: In function 'bool IsHex(const string&)':
 util.cpp:427:28: warning: comparison is always false due to limited range of data type [-Wtype-limits]

In particular, IsHex erroneously returned true regardless of the input
characters, as long as the length of the string was a positive multiple of 2.

Note: For testing, it's possible using GCC to force char to be unsigned by
adding the -funsigned-char parameter to xCXXFLAGS.
 2012-04-22 09:38:37 -04:00
Dwayne C. LitzenbergerandLuke Dashjr e5b980d72f Fix bugs on 'unsigned char' platforms. 
In ISO C++, the signedness of 'char' is undefined.  On some platforms (e.g.
ARM), 'char' is an unsigned type, but some of the code relies on 'char' being
signed (as it is on x86).  This is indicated by compiler warnings like this:

 bignum.h: In constructor 'CBigNum::CBigNum(char)':
 bignum.h:81:59: warning: comparison is always true due to limited range of data type [-Wtype-limits]

 util.cpp: In function 'bool IsHex(const string&)':
 util.cpp:427:28: warning: comparison is always false due to limited range of data type [-Wtype-limits]

In particular, IsHex erroneously returned true regardless of the input
characters, as long as the length of the string was a positive multiple of 2.

Note: For testing, it's possible using GCC to force char to be unsigned by
adding the -funsigned-char parameter to xCXXFLAGS.
 2012-04-22 09:38:27 -04:00
Dwayne C. LitzenbergerandLuke Dashjr 8104274701 Fix phexdigits[255] is undefined. 2012-04-22 09:26:30 -04:00
Dwayne C. LitzenbergerandLuke Dashjr bd043f19c8 Fix phexdigits[255] is undefined. 2012-04-22 09:26:11 -04:00
Pieter WuilleandLuke Dashjr e401e5eb79 Add missing breaks in optionmodel's switch case 2012-04-17 20:30:31 -04:00
Pieter WuilleandLuke Dashjr 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 GarzikandLuke Dashjr 7f34351910 Fix misc. minor sign-comparison warnings 2012-04-17 15:08:18 -04:00
Jeff GarzikandLuke Dashjr 1b7e5cbcad CNode's nHeaderStart may be negative, so change its type (PARTIAL) 2012-04-17 15:03:05 -04:00
Jeff GarzikandLuke Dashjr 2abd083ea4 Fix sign-compare warnings: netbase's Lookup* max-solutions may be unsigned 2012-04-17 15:00:15 -04:00
Jeff GarzikandLuke Dashjr 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 GarzikandLuke Dashjr 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 GarzikandLuke Dashjr ef2f3ddaf7 The string class returns string::npos, when find() fails. 
Noticed when sign-comparison warnings were enabled.
 2012-04-17 14:50:26 -04:00
Wladimir J. van der LaanandLuke Dashjr d506c160eb Add forgotten initializer 2012-04-17 14:49:36 -04:00
Jeff GarzikandLuke Dashjr 1175d8f6a1 AlreadyHave(): only hold lock during mapTransactions access 2012-04-17 14:40:58 -04:00
Jeff GarzikandLuke Dashjr 12570da46f Locking fix for AlreadyHave() 
Access to mapTransactions[] must be guarded by cs_mapTransactions lock.
 2012-04-17 13:20:29 -04:00