aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Cleanup JSON-RPC getblock output to be consistentLuke Dashjr2012-02-221-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add "size" and "bits" - Rename "blockcount" to "height" - Rename "hashprevious" and "hashnext" to "previousblockhash" and "nextblockhash" (respectively)
* | | | | | Merge branch 'testnetirc' of https://github.com/sipa/bitcoinGavin Andresen2012-02-221-0/+5
|\ \ \ \ \ \
| * | | | | | Leave IRC enabled by default on testnetPieter Wuille2012-02-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As testnet has neither DNS seeds or built-in seed addresses to bootstrap from.
* | | | | | | Merge branch 'fixnullpfrom' of https://github.com/sipa/bitcoinGavin Andresen2012-02-221-2/+4
|\ \ \ \ \ \ \
| * | | | | | | ProcessBlock is sometimes called with pfrom==NULLPieter Wuille2012-02-201-2/+4
| |/ / / / / /
* | | | | | | Merge branch 'postfeb20' of https://github.com/sipa/bitcoinGavin Andresen2012-02-223-39/+27
|\ \ \ \ \ \ \
| * | | | | | | Post-feb20 simplificationsPieter Wuille2012-02-213-39/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the entire network upgraded to (initial) protocol version 209, crtainl simplifications in the source code are possible.
* | | | | | | | Merge branch 'reorginfo' of https://github.com/sipa/bitcoinGavin Andresen2012-02-221-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Report number of (dis)connected blocks in reorganizationPieter Wuille2012-02-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also report old and new best, and fork point.
* | | | | | | | | Merge branch 'fix_616' of https://github.com/sipa/bitcoinGavin Andresen2012-02-221-7/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix #616: remove base_uint::operator&=(uint64 b)Pieter Wuille2012-02-191-7/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix_626' of https://github.com/sipa/bitcoinGavin Andresen2012-02-224-52/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix #626: RecvLine wrong error messagePieter Wuille2012-02-194-52/+52
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Also moved RecvLine to net.cpp.
* | | | | | | | Merge branch 'bugfix_bip14_ez' of https://github.com/luke-jr/bitcoinGavin Andresen2012-02-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Bugfix: Instead of reporting "bitcoin-qt" for both bitcoind and Bitcoin-Qt, ↵Luke Dashjr2012-02-221-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | report "Satoshi" which is at least correct
* | | | | | | | Merge branch '201202_guiaddsuffix' of https://github.com/laanwj/bitcoinGavin Andresen2012-02-225-17/+80
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix default suffixes in save dialog in GNOME, make it more clear that PNG is ↵Wladimir J. van der Laan2012-02-155-11/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used (solves #833)
| * | | | | | | (trivial) regularize coding styleWladimir J. van der Laan2012-02-151-6/+10
| | | | | | | |
* | | | | | | | Fix tests after 38067c18Pieter Wuille2012-02-205-16/+16
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #857 from laanwj/2012_02_fixhelpwindowWladimir J. van der Laan2012-02-202-12/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | On windows, show message box with help, as there is no stderr (fixes #702)
| * | | | | | | On windows, show message box with help, as there is no stderr (fixes #702)Wladimir J. van der Laan2012-02-172-12/+9
| | | | | | | |
* | | | | | | | Merge pull request #858 from laanwj/2012_02_uisendlabelfixWladimir J. van der Laan2012-02-201-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Only fill in label from address book if no label is filled in yet (fixes #840)
| * | | | | | | | Only fill in label from address book, if no label is filled in yet, fixes #840Wladimir J. van der Laan2012-02-171-2/+3
| | | | | | | | |
* | | | | | | | | Sign message description changes discussed in #bitcoin-devLuke Dashjr2012-02-191-1/+1
| | | | | | | | |
* | | | | | | | | Typo fixPieter Wuille2012-02-201-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #864 from sipa/fix_856Pieter Wuille2012-02-197-15/+64
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make compressed pubkeys require client >=0.5.99
| * | | | | | | | | Make compressed pubkeys require 0.6.0Pieter Wuille2012-02-182-2/+9
| | | | | | | | | |
| * | | | | | | | | Move GenerateNewKey back to CWalletPieter Wuille2012-02-184-12/+12
| | | | | | | | | |
| * | | | | | | | | Add SetMinVersion to CWalletPieter Wuille2012-02-184-2/+44
| | | | | | | | | |
* | | | | | | | | | Merge pull request #868 from sipa/fix_650Pieter Wuille2012-02-191-1/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | Fix #650: CKey::SetSecret BIGNUM leak
| * | | | | | | | | Fix #650: CKey::SetSecret BIGNUM leakPieter Wuille2012-02-191-1/+4
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #867 from laanwj/2012_02_hidetrayicononquitWladimir J. van der Laan2012-02-191-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Hide tray icon in destructor, as deleting will let it linger until quit (on ubuntu)
| * | | | | | | | Hide tray icon in destructor, as deleting will let it linger until quit (on ↵Wladimir J. van der Laan2012-02-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ubuntu)
* | | | | | | | | Merge pull request #863 from sipa/bn2mpifixPieter Wuille2012-02-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Workaround for BN_bn2mpi reading/writing out of bounds
| * | | | | | | | | Workaround for BN_bn2mpi reading/writing out of boundsPieter Wuille2012-02-181-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge pull request #865 from sipa/del_pwalletdbPieter Wuille2012-02-191-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Free pwalletdbEncryption after encryping wallet
| * | | | | | | | Free pwalletdbEncryption after encryping walletPieter Wuille2012-02-181-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes a memory leak.
* | | | | | | | Merge pull request #862 from TheBlueMatt/warningsPieter Wuille2012-02-181-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix compilation warning.
| * | | | | | | Fix compilation warning.Matt Corallo2012-02-181-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #859 from laanwj/2012_02_guilanguageargWladimir J. van der Laan2012-02-182-2/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make it possible to set UI language from commandline (implements #678)
| * | | | | | | | Allow setting UI language from commandline (implements #678)Wladimir J. van der Laan2012-02-172-2/+7
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #854 from laanwj/2012_02_qtipcWladimir J. van der Laan2012-02-177-40/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Restructure IPC URL handling (fixes #851)
| * | | | | | | | Restructure IPC URL handling (fixes #851)Wladimir J. van der Laan2012-02-177-40/+39
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nolisten_bitcoin_conf_2' of https://github.com/dooglus/bitcoinGavin Andresen2012-02-171-11/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as ↵Chris Moore2012-02-161-11/+21
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | well as on the command line.
* | | | | | | | Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-gitGavin Andresen2012-02-173-4/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issue #848 : broken mining on testnetGavin Andresen2012-02-163-4/+21
| |/ / / / / / /
* | | | | | | | Merge branch 'threadid' of https://github.com/sipa/bitcoinGavin Andresen2012-02-174-70/+82
|\ \ \ \ \ \ \ \
| * | | | | | | | Symbolic names for threadsPieter Wuille2012-02-164-70/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce an enum threadId, and use symbolic indices when accessing vnThreadsRunning.
* | | | | | | | | Merge pull request #834 from sje397/BackupWalletWladimir J. van der Laan2012-02-177-5/+40
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Added 'Backup Wallet' menu option to GUI