Gavin Andresen
8788221761
Bump version number for 0.7.0rc2
2012-09-05 12:38:37 -04:00
Gavin Andresen
91c218a1cb
Merge branch 'testnet_alert' of git://github.com/gavinandresen/bitcoin-git
2012-09-05 11:38:38 -04:00
xanatos
4f76be1dc5
Correct LoadWallet() return value (false -> DB_LOAD_OK)
...
Equivalent code. (false == 0 == DB_LOAD_OK). Fixes #1706 .
2012-09-05 11:32:13 +03:00
Jeff Garzik
e271c1d3d0
Merge pull request #1789 from Diapolo/fix_double_Startuptime
...
remove double logging of startup time, when !fLogTimestamps
2012-09-04 23:39:15 -07:00
Philip Kaufmann
274b7ab123
remove double logging of startup time, when !fLogTimestamps
2012-09-05 08:36:50 +02:00
Philip Kaufmann
8d367c7e66
fix signed/unsigned usage in BlockFilePath()
2012-09-05 08:34:41 +02:00
Jeff Garzik
42613c97d5
Add block file naming helper, BlockFilePath()
2012-09-04 21:40:26 -04:00
Jeff Garzik
dcb14198bb
init.cpp: fix build error, and possibly-uninit'd warning
2012-09-04 12:24:08 -04:00
Jeff Garzik
38e8f282d2
Merge pull request #1427 from rebroad/StartTimeFix
...
No need to log start time if it's already being done on every line.
2012-09-04 09:10:47 -07:00
Jeff Garzik
2fd6f067db
Merge pull request #1777 from laanwj/2012_09_eliminate_sprintf
...
Remove last occurrence of potentially insecure function sprintf
2012-09-04 09:00:02 -07:00
Jeff Garzik
bec02998b4
Merge pull request #1779 from xanatos/patch-15
...
Useless vector declaration
2012-09-04 08:59:05 -07:00
Jeff Garzik
8c7b6c05db
Merge pull request #1738 from laanwj/2012_08_boostthread
...
implement CreateThread with boost::thread
2012-09-04 08:53:05 -07:00
Wladimir J. van der Laan
9d7da11458
Merge pull request #1743 from xanatos/patch-14
...
Changed nprev->pprev
2012-09-03 08:11:36 -07:00
Wladimir J. van der Laan
acbe4a1f32
Merge pull request #1728 from xanatos/patch-11
...
Removed duplicated lock
2012-09-03 08:00:18 -07:00
xanatos
89fbd1f11c
Useless vector declaration
...
The vector isn't referenced in the small code block it's declared. I don't see any "useful" side effect in its declaration.
2012-09-03 17:53:27 +03:00
Wladimir J. van der Laan
9c80909452
Remove last occurrence of potentially insecure function sprintf.
...
%d can return up to 11 characters. Move away from fixed buffer completely and
use our own safe function strprintf.
2012-09-03 16:18:16 +02:00
Gavin Andresen
eaf00a3a5d
Merge pull request #1774 from luke-jr/refactor_times
...
Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
2012-09-02 16:47:58 -07:00
Wladimir J. van der Laan
4d0c2b6cf4
Merge pull request #1761 from Diapolo/timeout_desc
...
add default value in -timeout description
2012-09-02 06:19:10 -07:00
Luke Dashjr
ddb709e9de
Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
...
OrderedTxItems returns a multimap of pointers, but needs a place to store the actual CAccountingEntries it points to.
It had been using a stack item, which was clobbered as soon as it returned, resulting in undefined behaviour.
This fixes at least bug #1768 .
2012-09-02 08:02:46 +00:00
Jeff Garzik
0e1be81a4a
Merge pull request #1771 from luke-jr/bugfix_bip22_mode
...
Bugfix: getblocktemplate: Accept optional "mode" parameter not being provided
2012-09-01 12:30:13 -07:00
R E Broadley
016178132e
No need to log start time if it's already being done on every line.
2012-09-01 14:24:33 +01:00
Luke Dashjr
0689a7eb9c
Bugfix: getblocktemplate: Accept optional "mode" parameter not being provided
2012-09-01 07:12:56 +00:00
Wladimir J. van der Laan
9c94bdac06
RPC console: escaping within ' and " now handled differently
...
Should now mimic bash quoting and escaping (see http://wiki.bash-hackers.org/syntax/quoting ) exactly,
leaving out argument expansion and obscure syntax like $''.
2012-09-01 09:08:38 +02:00
Gregory Maxwell
ddbddcb31e
Merge pull request #1758 from laanwj/2012_08_uiconsole_parsing
...
Fix RPC console parser to handle escaped arguments more like bash
2012-08-31 22:50:23 -07:00
Wladimir J. van der Laan
b5c1467a7d
In RPC console, attempt to format errors
...
Try to display a nicer message instead of dumping raw JSON object when possible. If the error
somehow doesn't have the required 'code' and 'message' fields, fall back to printing raw JSON object.
2012-08-31 17:41:58 +02:00
Wladimir J. van der Laan
576b5efe93
Fix RPC console parser to handle escaped arguments more like bash
...
- Fix issue #1750
2012-08-31 17:23:48 +02:00
Philip Kaufmann
d93e5986d7
add default value in -timeout description
2012-08-30 23:28:19 +02:00
Philip Kaufmann
a4d4403a75
enable ASLR and DEP for bitcoind.exe via linker flags
...
- this is already active for bitcoin-qt.exe
2012-08-29 22:22:04 +02:00
Wladimir J. van der Laan
4d1d94c56c
Rename CreateThread to NewThread
...
Prevent clash with win32 API symbol
2012-08-29 20:25:37 +02:00
Jeff Garzik
4445434a2d
Merge pull request #1745 from gmaxwell/irc_fixes
...
Misc IRC fixes.
2012-08-29 11:02:21 -07:00
Wladimir J. van der Laan
61d8507140
implement CreateThread with boost::thread
...
I'm not sure why this wasn't done before.
- Removes typedef of pthread_t on Windows, which fixes a native compile issue on mingw.
2012-08-29 20:02:07 +02:00
Wladimir J. van der Laan
6117afeeaa
Update strings for 0.7.0rc2
2012-08-29 19:55:40 +02:00
Wladimir J. van der Laan
c7df832d7a
Merge pull request #1617 from Diapolo/Show_Hide_string
...
Update string for Show/Hide in the tray
2012-08-29 10:52:01 -07:00
Wladimir J. van der Laan
fc52af2736
Merge pull request #1720 from Diapolo/Qt_about
...
Qt: add copyrightLabel to aboutdialog.ui
2012-08-29 10:50:17 -07:00
Philip Kaufmann
e273c51287
Update string for Show/Hide in the tray
...
- be clear we don't "Show/Hide Bitcoins", but just the client window
- remove the tooltip for toggleHideAction as this is not shown anyway
- update a comment to be more general
2012-08-29 07:39:35 +02:00
Gregory Maxwell
6a60c64c6b
Don't retry a failing IRC nickname forever.
...
If our IRC nick is in use (because some other node thinks it has
the same address we think we have) don't fruitlessly try to reconnect
using that name forever. After three tries, give up and use a random
nick. Either we'll learn a new local address from IRC and switch
to that, or it was right and the other guy is advertising for us.
This avoids a pessimal case where a second testnet node behind
a nat is unable to get any peers because he can't get on IRC.
2012-08-28 22:04:38 -04:00
Gregory Maxwell
3595b18793
Don't force IRC off if not listening, do force it off if IPv4 is off.
...
Previously Bitcoin would refuse to use IRC if it was either not
accepting inbound connections or not making outbound. Instead this
changes it to not use IRC only if it's not doing either or if
IPv4 is off completely. If Bitcoin is not listening this will use
the default random nicks rather than the IP based ones.
2012-08-28 21:43:28 -04:00
Pieter Wuille
af4da4be3d
Bugfix: increase score, not port
2012-08-29 02:33:25 +02:00
Gavin Andresen
286dbba2d2
Give testnet it's own alert key.
2012-08-28 17:13:11 -04:00
Gavin Andresen
f35c6c4fb9
Refactor: move alert code from main to alert.cpp/h
2012-08-28 17:04:54 -04:00
xanatos
9eb7fc5842
Changed nprev->pprev
...
It should be pprev, because the next one is pnext, and it's printing the memory address of the CBlockIndex (so pSomething).
2012-08-28 23:25:52 +03:00
Wladimir J. van der Laan
ba7ba84f07
Add boost chrono lib for windows builds (required for boost 1.50)
2012-08-27 22:16:24 +02:00
Gavin Andresen
03fa53a640
Version numbers -> 0.7.0
2012-08-27 14:20:56 -04:00
Matt Corallo
a1755ec426
Upgrade to Boost 1.50
2012-08-27 14:20:56 -04:00
Gavin Andresen
fde5c34bd8
Merge branch 'alert_fix' of git://github.com/gavinandresen/bitcoin-git
2012-08-27 12:39:13 -04:00
Gavin Andresen
ef8e821cf2
Fix compiler warning on mac
2012-08-27 12:37:35 -04:00
Gavin Andresen
8cd98a9a26
Merge branch 'bugfix_gitian' of git://github.com/luke-jr/bitcoin
2012-08-27 11:52:56 -04:00
Gavin Andresen
ea2fda46c3
Special-case the last alert for alert-key-compromised case
...
Hard-code a special nId=max int alert, to be broadcast if the
alert key is ever compromised. It applies to all versions, never
expires, cancels all previous alerts, and has a fixed message:
URGENT: Alert key compromised, upgrade required
Variations are not allowed (ignored), so an attacker with
the private key cannot broadcast empty-message nId=max alerts.
2012-08-27 10:22:57 -04:00
xanatos
028ec224b8
Removed duplicated lock
...
Around line 167 there is already a LOCK(bitdb.cs_db) that covers everything. Re-locking is useless.
2012-08-27 15:08:20 +03:00
Luke Dashjr
1837696580
Bugfix: Move boost::interprocess Win32 workaround to Bitcoin-Qt sources, rather than hacking boost in gitian
2012-08-27 00:49:23 +00:00