722d9387be
Merge branch 'mruinventory' of https://github.com/sipa/bitcoin
2012-02-28 11:48:44 -05:00
6dd5ae41ac
Merge branch '2012_02_getspecialfolderpath_overflow' of https://github.com/laanwj/bitcoin
2012-02-28 11:45:14 -05:00
d8a80af84a
Merge pull request #910 from fanquake/master
...
Correct Spelling
2012-02-28 04:33:43 -08:00
27adfb2e0c
"February"
2012-02-28 20:31:56 +08:00
07ed49a472
Do not start bitcoin: thread on OSX. fixes #889
2012-02-27 16:08:08 -05:00
21503e4556
Merge branch 'nodosbip16' of https://github.com/sipa/bitcoin
2012-02-27 15:47:27 -05:00
c4341fa6ab
Add mruset and use it for setInventoryKnown
2012-02-27 21:04:32 +01:00
46aa2a6bdd
Move BIP16 switchover time to April 1
2012-02-27 11:41:20 -05:00
90d78142c0
Merge branch 'nooptionsinwallet+fixproxysetting' of https://github.com/sipa/bitcoin
2012-02-27 11:30:05 -05:00
fbbd42a535
Merge pull request #853 from laanwj/2012_02_altminimizetray
...
Yet another alternative "minimize to tray" implementation
Fixes problems with window positioning.
2012-02-26 22:27:25 -08:00
42c8b56f62
Store addrProxy port in settings
2012-02-26 23:39:32 +01:00
3f8cb2c565
Reworked QT settings
2012-02-26 23:38:28 +01:00
972060ce0e
bitcoind changes to stop storing settings in wallet.dat.
2012-02-26 23:21:33 +01:00
21ae37d215
Simplify MyGetSpecialFolderPath and fix possible buffer overflow ( #901 )
2012-02-26 17:11:38 +01:00
3d2b5c53cb
Merge pull request #900 from sipa/movebackupmenu
...
Move 'Backup Wallet' to file menu
2012-02-26 07:13:58 -08:00
88c41c43ea
Move 'Backup Wallet' to file menu
2012-02-26 03:04:25 +01:00
4a10d4c6dc
Fix addrProxy setting
...
Before 0.6 addrProxy was a CAddress, but netbase changed it to CService.
Retain compatibility by wrapping/unwrapping with a CAddress when saving
or loading.
This commit retains compatibility with 0.6.0rc1 (which wrote the setting
as a CService) by trying to parse twice.
2012-02-25 21:13:34 +01:00
da9ab62fb7
Merge pull request #897 from laanwj/2012_02_fixnegativesecs
...
In UI, handle cases in which the last received block was generated in the future
2012-02-25 10:14:37 -08:00
71ba9abba6
In UI, handle cases in which the last received block was generated in the future (secs<0)
...
Fixes #874 .
2012-02-25 19:11:25 +01:00
db9f2e0117
Do not invoke anti-DoS system for invalid BIP16 transactions
...
Doing so would allow an attack on old nodes, which would relay a
standard transaction spending a BIP16 output in an invalid way,
until reaching a new node, which will disconnect their peer.
Reported by makomk on IRC.
2012-02-25 19:05:50 +01:00
1168d30b0a
Merge pull request #894 from dooglus/nosplash
...
Add option "-splash" so we can disable the splash screen.
2012-02-24 23:51:50 -08:00
ec4efde40c
Add option "-splash" so we can disable the splash screen.
...
Don't show splash screen when -min is specified on the command line.
2012-02-24 19:17:22 -08:00
8c12851ed4
Checkpoint block 168,000
2012-02-23 13:33:30 -05:00
fc4f4c2e9a
Merge branch 'getblock_cleanup' of https://github.com/luke-jr/bitcoin
2012-02-23 12:41:26 -05:00
35b327a520
Merge pull request #887 from TheBlueMatt/gitian_deps
...
Make deps build deterministic and upgrade to libpng 1.5.9.
2012-02-23 04:08:08 -08:00
3d0a0a9b9e
Make deps build deterministic and upgrade to libpng 1.5.9.
2012-02-22 22:09:06 -05:00
34f8788915
Cleanup JSON-RPC getblock output to be consistent
...
- Add "size" and "bits"
- Rename "blockcount" to "height"
- Rename "hashprevious" and "hashnext" to "previousblockhash" and "nextblockhash" (respectively)
2012-02-22 12:31:28 -05:00
5c03282521
Merge branch 'testnetirc' of https://github.com/sipa/bitcoin
2012-02-22 11:26:19 -05:00
6fe8c45375
Merge branch 'fixnullpfrom' of https://github.com/sipa/bitcoin
2012-02-22 11:25:08 -05:00
e7e6ae2104
Merge branch 'postfeb20' of https://github.com/sipa/bitcoin
2012-02-22 11:06:44 -05:00
8c7358e1dd
Merge branch 'reorginfo' of https://github.com/sipa/bitcoin
2012-02-22 11:03:19 -05:00
e1bad25fee
Merge branch 'fix_616' of https://github.com/sipa/bitcoin
2012-02-22 11:00:38 -05:00
de737806b5
Merge branch 'fix_626' of https://github.com/sipa/bitcoin
2012-02-22 10:52:14 -05:00
1af97c95f3
Merge branch 'bugfix_bip14_ez' of https://github.com/luke-jr/bitcoin
2012-02-22 10:44:44 -05:00
f246fc648a
Merge branch '201202_guiaddsuffix' of https://github.com/laanwj/bitcoin
2012-02-22 10:41:11 -05:00
c170d03e03
Bugfix: Instead of reporting "bitcoin-qt" for both bitcoind and Bitcoin-Qt, report "Satoshi" which is at least correct
2012-02-22 10:36:19 -05:00
92d5864b80
Leave IRC enabled by default on testnet
...
As testnet has neither DNS seeds or built-in seed addresses to
bootstrap from.
2012-02-22 05:19:09 +01:00
18c0fa97d0
Post-feb20 simplifications
...
Now the entire network upgraded to (initial) protocol version 209,
crtainl simplifications in the source code are possible.
2012-02-21 20:46:39 +01:00
73aa0421a7
ProcessBlock is sometimes called with pfrom==NULL
2012-02-20 22:35:08 +01:00
0d56f11ada
Fix tests after 38067c18
2012-02-20 18:32:33 +01:00
f7b8f824de
Merge pull request #857 from laanwj/2012_02_fixhelpwindow
...
On windows, show message box with help, as there is no stderr (fixes #702 )
2012-02-20 08:56:41 -08:00
7b88a61706
Merge pull request #858 from laanwj/2012_02_uisendlabelfix
...
Only fill in label from address book if no label is filled in yet (fixes #840 )
2012-02-20 08:55:49 -08:00
f50f36d4db
Merge pull request #876 from luke-jr/signmsg_desc
...
Sign message description changes discussed in #bitcoin-dev
2012-02-19 21:24:20 -08:00
5a5cc6ac09
Sign message description changes discussed in #bitcoin-dev
2012-02-19 22:36:59 -05:00
9fa042a96c
Typo fix
2012-02-20 04:17:00 +01:00
3a4d81724e
Merge pull request #864 from sipa/fix_856
...
Make compressed pubkeys require client >=0.5.99
2012-02-19 18:21:19 -08:00
49355d9993
Merge pull request #868 from sipa/fix_650
...
Fix #650 : CKey::SetSecret BIGNUM leak
2012-02-19 18:04:46 -08:00
8a949dd6c3
Merge pull request #867 from laanwj/2012_02_hidetrayicononquit
...
Hide tray icon in destructor, as deleting will let it linger until quit (on ubuntu)
2012-02-19 11:30:32 -08:00
ceaa13eff2
Report number of (dis)connected blocks in reorganization
...
Also report old and new best, and fork point.
2012-02-19 20:06:04 +01:00
46245b4782
Fix #616 : remove base_uint::operator&=(uint64 b)
2012-02-19 19:12:41 +01:00
Gavin Andresen
Pieter Wuille
Michael Ford
Wladimir J. van der Laan
Chris Moore
Matt Corallo
Luke Dashjr
Gregory Maxwell