Commit Graph

3008 Commits

Author SHA1 Message Date
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
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
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
90489ae977 Merge pull request #1770 from laanwj/2012_08_rpcconsoleparsing2
RPC console: escaping within ' and " now handled differently
2012-09-01 00:10:00 -07: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
Jeff Garzik
c2cd13faa4 release-notes.txt: mention getmemorypool removal 2012-08-30 19:44:57 -04:00
Philip Kaufmann
d93e5986d7 add default value in -timeout description 2012-08-30 23:28:19 +02:00
Wladimir J. van der Laan
f78fd6f397 Merge pull request #1752 from Diapolo/bitcoind_ASLR_DEP
enable ASLR and DEP for bitcoind.exe via linker flags
2012-08-30 11:07:11 -07:00
Wladimir J. van der Laan
a65b53bf06 Merge pull request #1756 from Diapolo/pro_add_netbase_h
add missing netbase.h to Qt project-file
2012-08-30 10:20:32 -07:00
Philip Kaufmann
c3856bb011 add missing netbase.h to Qt project-file 2012-08-30 19:11:41 +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
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
74d36d44f2 Merge pull request #1754 from laanwj/2012_08_stringsupdate2
Update strings for 0.7.0rc2
2012-08-29 10:58:11 -07: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
1b4bd4c976 Merge pull request #1731 from luke-jr/opt_ipv6
Optional IPv6 spaces cleanup
2012-08-29 10:50:46 -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
Wladimir J. van der Laan
29316f7bd0 Merge pull request #1751 from laanwj/2012_08_qtjsonspirit
Remove json/*.cpp from Qt build system
2012-08-28 23:30:46 -07:00
Wladimir J. van der Laan
3f37f20ddc Remove json/*.cpp from Qt build system
They are unneeded as jsonspirit is always used as template library,
the other makefiles don't include them either.
2012-08-29 08:02:55 +02: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
Jeff Garzik
5f38875807 Merge pull request #1748 from sipa/bugfix_portinc
Bugfix: increase score, not port
2012-08-28 17:43:38 -07:00
Pieter Wuille
af4da4be3d Bugfix: increase score, not port 2012-08-29 02:33:25 +02:00
Pieter Wuille
3588c91c7e Small update to release notes regarding -seednode 2012-08-28 23:52:33 +02:00
Jeff Garzik
06707dd610 Merge pull request #1741 from freewil/release-notes-remove-i2p
remove I2P support mention from release notes
2012-08-28 10:43:23 -07:00
Jeff Garzik
9c63fd8e76 Merge pull request #1739 from freewil/onlynet-release-notes
make use of -onlynet more clear in release notes
2012-08-28 10:41:55 -07:00
freewil
8ef51cf15c remove I2P support mention from release notes 2012-08-28 13:39:48 -04:00
freewil
41b2856bd4 make use of -onlynet more clear in release notes 2012-08-28 13:33:32 -04:00
Jeff Garzik
0d9556f948 Merge pull request #1733 from Diapolo/Qt_changelog
add Qt GUI part to release-notes.txt
2012-08-27 14:54:23 -07:00
Philip Kaufmann
4f6a85b3bd add Qt GUI part to release-notes.txt 2012-08-27 23:52:45 +02:00
Luke Dashjr
0eeb54cb89 I forgot to paint the bike shed 2012-08-27 20:18:37 +00: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
Jeff Garzik
f29eaee30a Update release notes 2012-08-27 15:06:40 -04: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
d0377a70e2 Bugfix: Adjust gitian-win32 to use Boost 1.49 for real 2012-08-27 00:49:27 +00: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
Gavin Andresen
d5a52d9b3e Alert system DoS prevention
This fixes two alert system vulnerabilities found by
Sergio Lerner; you could send peers unlimited numbers
of invalid alert message to try to either fill up their
debug.log with messages and/or keep their CPU busy
checking signatures.

Fixed by disconnecting/banning peers if they send 10 or more
bad (invalid/expired/cancelled) alerts.
2012-08-26 17:08:18 -04:00