Luke Dashjr
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
Gavin Andresen
1af97c95f3
Merge branch 'bugfix_bip14_ez' of https://github.com/luke-jr/bitcoin
2012-02-22 10:44:44 -05:00
Gavin Andresen
f246fc648a
Merge branch '201202_guiaddsuffix' of https://github.com/laanwj/bitcoin
2012-02-22 10:41:11 -05:00
Luke Dashjr
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
Pieter Wuille
0d56f11ada
Fix tests after 38067c18
2012-02-20 18:32:33 +01:00
Wladimir J. van der Laan
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
Wladimir J. van der Laan
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
Gregory Maxwell
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
Luke Dashjr
5a5cc6ac09
Sign message description changes discussed in #bitcoin-dev
2012-02-19 22:36:59 -05:00
Pieter Wuille
9fa042a96c
Typo fix
2012-02-20 04:17:00 +01:00
Pieter Wuille
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
Pieter Wuille
49355d9993
Merge pull request #868 from sipa/fix_650
...
Fix #650 : CKey::SetSecret BIGNUM leak
2012-02-19 18:04:46 -08:00
Wladimir J. van der Laan
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
Pieter Wuille
a09f101f14
Fix #650 : CKey::SetSecret BIGNUM leak
2012-02-19 18:45:56 +01:00
Pieter Wuille
e0b8d459b1
Merge pull request #863 from sipa/bn2mpifix
...
Workaround for BN_bn2mpi reading/writing out of bounds
2012-02-19 09:22:11 -08:00
Pieter Wuille
59b1b181e9
Merge pull request #865 from sipa/del_pwalletdb
...
Free pwalletdbEncryption after encryping wallet
2012-02-19 09:05:40 -08:00
Wladimir J. van der Laan
27a0ed8a0a
Hide tray icon in destructor, as deleting will let it linger until quit (on Ubuntu)
2012-02-19 12:07:07 +01:00
Pieter Wuille
fcfd7ff8f8
Free pwalletdbEncryption after encryping wallet
...
Fixes a memory leak.
2012-02-18 15:44:34 +01:00
Pieter Wuille
38067c18f8
Make compressed pubkeys require 0.6.0
2012-02-18 15:42:38 +01:00
Pieter Wuille
9976cf070f
Move GenerateNewKey back to CWallet
2012-02-18 15:42:38 +01:00
Pieter Wuille
0b807a417f
Add SetMinVersion to CWallet
2012-02-18 15:42:29 +01:00
Pieter Wuille
e9a041c536
Merge pull request #862 from TheBlueMatt/warnings
...
Fix compilation warning.
2012-02-18 04:56:58 -08:00
Pieter Wuille
a06113b0c5
Workaround for BN_bn2mpi reading/writing out of bounds
...
When OpenSSL's BN_bn2mpi is passed a buffer of size 4, valgrind
reports reading/writing one byte past it. I am unable to find
evidence of this behaviour in BN_bn2mpi's source code, so it may
be a spurious warning. However, this change is harmless, as only
the bignum with value 0 results in an mpi serialization of size 4.
2012-02-18 13:32:25 +01:00
Wladimir J. van der Laan
2d36b60f92
Merge pull request #859 from laanwj/2012_02_guilanguagearg
...
Make it possible to set UI language from commandline (implements #678 )
2012-02-18 01:33:56 -08:00
Matt Corallo
db1a5609a0
Fix compilation warning.
2012-02-18 01:22:22 -05:00
Wladimir J. van der Laan
328512876a
Merge pull request #854 from laanwj/2012_02_qtipc
...
Restructure IPC URL handling (fixes #851 )
2012-02-17 12:54:07 -08:00
Gavin Andresen
d3a4b85670
Merge branch 'nolisten_bitcoin_conf_2' of https://github.com/dooglus/bitcoin
2012-02-17 13:50:40 -05:00
Gavin Andresen
0a6b081cca
Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-git
2012-02-17 13:48:01 -05:00
Gavin Andresen
25bc37f8a2
Merge branch 'threadid' of https://github.com/sipa/bitcoin
2012-02-17 13:40:42 -05:00
Wladimir J. van der Laan
ec2ed58232
Merge pull request #834 from sje397/BackupWallet
...
Added 'Backup Wallet' menu option to GUI
2012-02-17 10:30:15 -08:00
Wladimir J. van der Laan
72075edafb
Allow setting UI language from commandline (implements #678 )
2012-02-17 18:47:31 +01:00
Wladimir J. van der Laan
f9f75f320e
Only fill in label from address book, if no label is filled in yet, fixes #840
2012-02-17 18:25:14 +01:00
Wladimir J. van der Laan
a3f3e54eee
Change #ifdef GUI to #ifdef QT_GUI, GUI is not defined anymore...
2012-02-17 18:01:01 +01:00
Wladimir J. van der Laan
bc5e6b9f21
On windows, show message box with help, as there is no stderr ( fixes #702 )
2012-02-17 17:55:46 +01:00
Wladimir J. van der Laan
23b3cf9d10
Restructure IPC URL handling ( fixes #851 )
2012-02-17 15:32:51 +01:00
Wladimir J. van der Laan
39231e9105
don't allow -daemon in bitcoin-qt (changes only #defines)
2012-02-17 14:47:56 +01:00
Wladimir J. van der Laan
d3896211d2
fix typo in CNetAddr::IsRFC4843() ( fixes #850 )
2012-02-17 14:40:21 +01:00
Chris Moore
d64e124cf4
Fix #846 . Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line.
2012-02-16 12:08:58 -08:00
Gavin Andresen
0f8cb5db73
Fix issue #848 : broken mining on testnet
2012-02-16 11:37:54 -05:00
Pieter Wuille
b7c25e0c13
Merge pull request #843 from TheBlueMatt/qrcodedoc
...
Fix one compile-time warning and fix libqrcode linking in releases
2012-02-16 03:50:59 -08:00
Pieter Wuille
c59881eaee
Symbolic names for threads
...
Introduce an enum threadId, and use symbolic indices when accessing
vnThreadsRunning.
2012-02-16 12:43:06 +01:00
Pieter Wuille
999b4cacaf
Merge pull request #844 from sipa/shutdownfix
...
Several shutdown-related fixes
2012-02-16 03:34:11 -08:00
Pieter Wuille
2030fc6bc2
Merge pull request #842 from sipa/checkaf
...
Do not create CAddress for invalid accepts
2012-02-16 03:31:14 -08:00
Pieter Wuille
711d5038f5
Merge pull request #828 from sipa/fixwalletlock
...
Fix wallet locking locking
2012-02-16 03:30:26 -08:00
Matt Corallo
7dcd200489
Properly include $*_LIB_PATH in makefile.unix
2012-02-15 16:39:02 -05:00
Matt Corallo
b03cb15789
Make bitcoin-qt static-link libqrcode and add it for debian pkgs.
2012-02-15 16:39:01 -05:00
Matt Corallo
32af6b16f1
Fix compilation warning.
2012-02-15 16:38:57 -05:00
Pieter Wuille
cc201e01f8
Several shutdown-related fixes
...
* do not let vnThreadsRunning[1] go negative
* do not perform locking operations while vnThreadsRunning[1] is decreased
* check vnThreadsRunning[1] at exit
2012-02-15 21:17:15 +01:00
Pieter Wuille
25ab17585e
Bugfix: do not create CAddress for invalid accepts
2012-02-15 20:56:29 +01:00
Wladimir J. van der Laan
303a47c095
fix default suffixes in save dialog in GNOME, make it more clear that PNG is used (solves #833 )
2012-02-15 17:22:00 +01:00
