Luke Dashjr [Sun, 6 May 2012 05:37:21 +0000]
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/bitcoinrpc.cpp
src/db.cpp
Luke Dashjr [Sun, 6 May 2012 05:35:58 +0000]
Merge branch '0.5.x' into 0.6.0.x
Luke Dashjr [Sun, 6 May 2012 05:35:50 +0000]
Merge branch '0.4.x' into 0.5.x
Pieter Wuille [Sat, 5 May 2012 19:27:52 +0000]
Bugfix: store source address in addrman
Pieter Wuille [Sat, 5 May 2012 19:22:55 +0000]
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
Peter Todd [Sat, 28 Apr 2012 20:29:27 +0000]
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)"
Peter Todd [Sat, 28 Apr 2012 20:29:27 +0000]
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)"
Luke Dashjr [Sat, 5 May 2012 02:41:43 +0000]
Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead
Luke Dashjr [Sun, 6 May 2012 05:27:08 +0000]
Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead
Conflicts:
src/walletdb.cpp
Philip Kaufmann [Wed, 4 Apr 2012 07:07:55 +0000]
remove HTML code around "Wallet" (displayed on overview page) and use Qt tags for font settings
Luke Dashjr [Sat, 5 May 2012 16:13:56 +0000]
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
bitcoin-qt.pro
contrib/gitian-descriptors/gitian-win32.yml
doc/README
doc/README_windows.txt
share/qt/make_windows_icon.sh
share/setup.nsi
src/bitcoinrpc.cpp
src/main.cpp
src/main.h
src/makefile.linux-mingw
src/net.cpp
src/net.h
src/netbase.h
src/noui.h
src/qt/addressbookpage.cpp
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/bitcoingui.h
src/qt/bitcoinstrings.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/optionsmodel.cpp
src/qt/qrcodedialog.cpp
src/qt/qtipcserver.cpp
src/script.cpp
src/serialize.h
src/ui_interface.h
src/uint256.h
Luke Dashjr [Fri, 4 May 2012 19:55:54 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
Luke Dashjr [Fri, 4 May 2012 19:54:24 +0000]
Bugfix: Remove redundant duplicate transaction check
Luke Dashjr [Fri, 4 May 2012 18:58:37 +0000]
Merge branch '0.6.0.x' of gitorious.org:+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.0.x
Luke Dashjr [Fri, 4 May 2012 18:57:03 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
src/serialize.h
Luke Dashjr [Fri, 4 May 2012 18:55:15 +0000]
Merge branch '0.4.x' into 0.5.x
Gavin Andresen [Mon, 30 Apr 2012 00:56:55 +0000]
Check earlier for blocks with duplicate transactions. Fixes #1167
Gavin Andresen [Mon, 30 Apr 2012 00:56:55 +0000]
Check earlier for blocks with duplicate transactions. Fixes #1167
Philip Kaufmann [Thu, 3 May 2012 09:30:52 +0000]
remove obsolete BackupWallet() entry in wallet.h
Gavin Andresen [Mon, 30 Apr 2012 17:06:30 +0000]
Bump version numbers for 0.6.1rc2
Gregory Maxwell [Thu, 3 May 2012 13:47:16 +0000]
Merge pull request #1188 from Diapolo/rem_BackupWallet_wallet_h
remove obsolete BackupWallet() entry in wallet.h
Philip Kaufmann [Thu, 3 May 2012 09:30:52 +0000]
remove obsolete BackupWallet() entry in wallet.h
Philip Kaufmann [Tue, 1 May 2012 20:26:33 +0000]
add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)
Wladimir J. van der Laan [Wed, 2 May 2012 06:57:02 +0000]
Merge pull request #1179 from Diapolo/project-file
add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)
Philip Kaufmann [Mon, 30 Apr 2012 23:46:03 +0000]
fix compiler warning "suggest parentheses around assignment used as truth
value [-Wparentheses]" in util.cpp
Philip Kaufmann [Tue, 1 May 2012 16:45:10 +0000]
fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice
Philip Kaufmann [Mon, 30 Apr 2012 23:56:47 +0000]
remove unused typedef in serialize.h
Jeff Garzik [Tue, 1 May 2012 22:02:41 +0000]
Merge pull request #1171 from Diapolo/fix_compiler_warn
fix 2 compiler warnings
Philip Kaufmann [Tue, 1 May 2012 20:26:33 +0000]
add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)
Wladimir J. van der Laan [Tue, 1 May 2012 19:38:56 +0000]
Merge pull request #1176 from Diapolo/project-file
fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice
Jeff Garzik [Tue, 1 May 2012 17:05:00 +0000]
Merge pull request #1177 from laanwj/2012_05_remove_duplicate_securestring
remove duplicate definition of SecureString in util.h
Wladimir J. van der Laan [Tue, 1 May 2012 16:52:38 +0000]
Merge pull request #1172 from Diapolo/serialize_h_rem_typedef
remove unused typedef in serialize.h
Wladimir J. van der Laan [Tue, 1 May 2012 16:49:50 +0000]
remove duplicate definition of SecureString in util.h
SecureString was moved to allocators.h in commit
6cb6d623479c5dd42d91de7a4d391078d0800e54
Philip Kaufmann [Tue, 1 May 2012 16:45:10 +0000]
fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice
Jeff Garzik [Tue, 1 May 2012 15:29:10 +0000]
Merge pull request #1173 from Diapolo/init_cpp_comment_upd
remove references to bitcoin-wx from comment in init.cpp
Philip Kaufmann [Mon, 30 Apr 2012 23:46:03 +0000]
fix compiler warning "suggest parentheses around assignment used as truth
value [-Wparentheses]" in util.cpp
Philip Kaufmann [Mon, 30 Apr 2012 23:44:59 +0000]
fix compiler warning "suggest explicit braces to avoid ambiguous "else"
[-Wparentheses]" in net.cpp
Philip Kaufmann [Mon, 30 Apr 2012 23:59:54 +0000]
remove references to bitcoin-wx from comment in init.cpp
Philip Kaufmann [Mon, 30 Apr 2012 23:56:47 +0000]
remove unused typedef in serialize.h
Gavin Andresen [Mon, 30 Apr 2012 00:56:55 +0000]
Check earlier for blocks with duplicate transactions. Fixes #1167
Philip Kaufmann [Sun, 22 Apr 2012 15:32:08 +0000]
change button tooltip on sign message page for copy to clipboard as it was missleading
Wladimir J. van der Laan [Sun, 29 Apr 2012 11:35:27 +0000]
Merge pull request #1139 from Diapolo/messagepage
change button tooltip on sign message page for copy to clipboard...
Wladimir J. van der Laan [Sun, 29 Apr 2012 11:34:42 +0000]
Merge pull request #1163 from laanwj/2012_04_uiperformanceissue
Fix critical UI performance issue (#1154)
Wladimir J. van der Laan [Sun, 29 Apr 2012 11:22:12 +0000]
Fix critical UI performance issue (#1154)
Luke Dashjr [Fri, 27 Apr 2012 20:28:00 +0000]
Merge branch '0.5.x' into 0.6.0.x
Gavin Andresen [Wed, 11 Apr 2012 18:00:48 +0000]
fix compiler error in bitcoinrpc RE: boost::system
(Partial of
2232717cba9e9f06a01e8f37bcea4e79ee65205f)
Gavin Andresen [Fri, 27 Apr 2012 15:53:11 +0000]
Bump win32.deps version number for new openssl
Luke Dashjr [Fri, 27 Apr 2012 17:57:43 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
contrib/gitian-descriptors/gitian-win32.yml
Gavin Andresen [Fri, 27 Apr 2012 14:52:14 +0000]
Windows build: compile against openssl 1.0.1b
Luke Dashjr [Fri, 27 Apr 2012 17:52:02 +0000]
Merge branch '0.4.x' into 0.5.x
Conflicts:
doc/build-msw.txt
src/makefile.linux-mingw
src/makefile.mingw
Gavin Andresen [Fri, 27 Apr 2012 14:52:14 +0000]
Windows build: compile against openssl 1.0.1b
Gavin Andresen [Fri, 27 Apr 2012 16:45:49 +0000]
Update openssl version
Gavin Andresen [Fri, 27 Apr 2012 15:53:11 +0000]
Bump win32.deps version number for new openssl
Gavin Andresen [Fri, 27 Apr 2012 14:52:14 +0000]
Windows build: compile against openssl 1.0.1b
Luke Dashjr [Fri, 27 Apr 2012 14:57:15 +0000]
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
Luke Dashjr [Fri, 27 Apr 2012 14:55:06 +0000]
Bump version to 0.5.5
Luke Dashjr [Fri, 27 Apr 2012 14:53:14 +0000]
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
Gavin Andresen [Fri, 27 Apr 2012 14:52:14 +0000]
Windows build: compile against openssl 1.0.1b
Luke Dashjr [Fri, 27 Apr 2012 14:50:24 +0000]
Bump version to 0.4.6
freewil [Thu, 26 Apr 2012 16:48:33 +0000]
listsinceblock: rpc param blockid -> blockhash
This is more consistent with the rest of the labeling seen
by the user when accessing the rpc commands.
freewil [Thu, 26 Apr 2012 17:12:44 +0000]
remove strange debug message from listsinceblock
Timothy Redaelli [Wed, 25 Apr 2012 12:07:24 +0000]
We should include netinet/in.h to use sockaddr_in (POSIX.1-2001)
Timothy Redaelli [Wed, 25 Apr 2012 12:07:24 +0000]
We should include netinet/in.h to use sockaddr_in (POSIX.1-2001)
Timothy Redaelli [Wed, 25 Apr 2012 12:07:24 +0000]
We should include netinet/in.h to use sockaddr_in (POSIX.1-2001)
Gavin Andresen [Fri, 27 Apr 2012 14:14:33 +0000]
Bump version numbers for 0.6.1rc1
Gavin Andresen [Thu, 26 Apr 2012 22:37:12 +0000]
Merge pull request #1151 from freewil/listsinceblock-blockhash
listsinceblock: rpc param blockid -> blockhash
Gavin Andresen [Thu, 26 Apr 2012 22:36:33 +0000]
Merge pull request #1150 from gavinandresen/NOPCH
Remove unused -DNOPCH
Gavin Andresen [Thu, 26 Apr 2012 22:36:15 +0000]
Merge pull request #1152 from freewil/remove-strange-debug
remove strange debug message from listsinceblock
Pieter Wuille [Thu, 26 Apr 2012 22:25:56 +0000]
Merge pull request #1146 from drizztbsd/posix-include
We should include netinet/in.h to use sockaddr_in (POSIX.1-2001)
freewil [Thu, 26 Apr 2012 17:12:44 +0000]
remove strange debug message from listsinceblock
freewil [Thu, 26 Apr 2012 16:48:33 +0000]
listsinceblock: rpc param blockid -> blockhash
This is more consistent with the rest of the labeling seen
by the user when accessing the rpc commands.
Gavin Andresen [Thu, 26 Apr 2012 15:20:44 +0000]
Define TEST_DATA_DIR so unit tests can be run from any current working directory
Gavin Andresen [Thu, 26 Apr 2012 14:18:35 +0000]
Undo part of
c2e8c8ac to fix issue#1148
Pieter Wuille [Thu, 26 Apr 2012 12:20:57 +0000]
Merge pull request #1119 from sipa/fastshutdown
Make lsn_reset ("detach databases") optional and off by default.
Gavin Andresen [Wed, 25 Apr 2012 23:40:44 +0000]
Remove unused -DNOPCH
Pieter Wuille [Tue, 17 Apr 2012 21:03:24 +0000]
Make lsn_reset ("detach databases") optional and off by default.
Add an option -detachdb (and entry in OptionDialog), without which no
lsn_reset is called on addr.dat and blkindex.dat. That means these
files cannot be moved to a new environment, but shutdown can be
significantly faster. The wallet file is always lsn_reset'ed.
-detachdb corresponds to the old behaviour, though it is off by
default now to speed up shutdowns.
Timothy Redaelli [Wed, 25 Apr 2012 12:07:24 +0000]
We should include netinet/in.h to use sockaddr_in (POSIX.1-2001)
Jeff Garzik [Sun, 22 Apr 2012 17:59:24 +0000]
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.
Jeff Garzik [Sun, 22 Apr 2012 17:44:12 +0000]
Test ScriptSigArgsExpected() for error, before accumulating return value
Jeff Garzik [Tue, 24 Apr 2012 04:33:29 +0000]
Merge pull request #1140 from jgarzik/sign-compare
Address many more sign comparison warnings
Jeff Garzik [Sun, 22 Apr 2012 18:01:25 +0000]
Change signed->unsigned at 3 code sites
This resolves signed/unsigned comparison warnings.
Jeff Garzik [Sun, 22 Apr 2012 17:59:24 +0000]
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.
Jeff Garzik [Sun, 22 Apr 2012 17:51:16 +0000]
Add casts for unavoidable signed/unsigned comparisons
At these code sites, it is preferable to cast rather than change
a variable's type.
Jeff Garzik [Sun, 22 Apr 2012 17:44:12 +0000]
Test ScriptSigArgsExpected() for error, before accumulating return value
Jeff Garzik [Mon, 23 Apr 2012 18:14:03 +0000]
SigOp and orphan-tx constants and counts are always unsigned.
Fixes several sign-comparison warnings.
Pieter Wuille [Sun, 22 Apr 2012 21:56:03 +0000]
Merge pull request #1133 from sipa/abspath
Make GetDataDir return absolute paths
Jeff Garzik [Sun, 22 Apr 2012 17:22:39 +0000]
Prefer 'unsigned int' for loop index variables tested against ::size()
C++ STL ::size() generally returns unsigned, which implies that "int idx"
style of loop variable will generate a signed-vs-unsigned comparison warning
when testing the loop exit condition "idx < blah.size()"
Update areas of the bitcoin code where loop variables may be more properly and
correctly defined as unsigned.
Philip Kaufmann [Sun, 22 Apr 2012 15:32:08 +0000]
change button tooltip on sign message page for copy to clipboard as it was missleading
Pieter Wuille [Sun, 22 Apr 2012 12:35:22 +0000]
Make GetDataDir return absolute paths
Luke Dashjr [Sun, 22 Apr 2012 14:07:24 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.h
src/net.cpp
src/util.cpp
Luke Dashjr [Sun, 22 Apr 2012 14:05:43 +0000]
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/main.cpp
Timothy Redaelli [Fri, 20 Apr 2012 10:50:57 +0000]
Add missing includes. (Fix bulding under GCC 4.7)
(Note: GCC 4.7 build NOT tested with backports -Luke)
Dwayne C. Litzenberger [Mon, 16 Apr 2012 05:32:55 +0000]
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.
Dwayne C. Litzenberger [Mon, 16 Apr 2012 05:32:55 +0000]
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.
Dwayne C. Litzenberger [Mon, 16 Apr 2012 05:31:38 +0000]
Fix phexdigits[255] is undefined.
Dwayne C. Litzenberger [Mon, 16 Apr 2012 05:31:38 +0000]
Fix phexdigits[255] is undefined.
Pieter Wuille [Sat, 21 Apr 2012 23:49:32 +0000]
Merge pull request #1124 from sipa/rpcobj3
extension of #1103: encapsulate mapCommands in CRPCTable
Pieter Wuille [Sat, 21 Apr 2012 23:47:02 +0000]
Merge pull request #1131 from laanwj/2012_04_hexstr
Integrate @JoelKatz's optimized ToHex (#562) into current HexStr function
Pieter Wuille [Sat, 21 Apr 2012 23:43:31 +0000]
Merge pull request #1129 from laanwj/2012_04_opcodes
Add explicit numeric constant value for all opcodes
Gavin Andresen [Sat, 21 Apr 2012 23:36:41 +0000]
Merge pull request #1121 from gavinandresen/scripttest
Data-driven script evaluation unit tests (rebased to fix compiler warning).