aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | move most explicit getters in optionsmodel to headerPhilip Kaufmann2012-10-022-24/+4
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - is more consistent and saves quite some lines of code
* | | | | | | | | | | | | Merge pull request #1911 from Diapolo/fix_signed_unsignedWladimir J. van der Laan2012-10-112-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix wrong (signed/unsigned) printf format specifier in bitcoinrpc.cpp
| * | | | | | | | | | | | | fix wrong (signed/unsigned) printf format specifier in bitcoinrpc.cppPhilip Kaufmann2012-10-052-2/+2
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also includes the required bitcoinstrings.cpp update
* | | | | | | | | | | | | Merge pull request #1901 from laanwj/2012_10_remove_strlcpyWladimir J. van der Laan2012-10-115-124/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | get rid of strlcpy.h
| * | | | | | | | | | | | get rid of strlcpy.hWladimir J. van der Laan2012-10-075-124/+30
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use hand-rolled string manipulation routine with a fixed buffer in the bitcoin core, instead make use of c++ strings and boost.
* | | | | | | | | | | | Bump versions for 0.7.1 releaseGavin Andresen2012-10-091-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Fix bad merge, pszDataDir duplicationGavin Andresen2012-10-091-1/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'wallet_exceptions' of github.com:gavinandresen/bitcoin-gitGavin Andresen2012-10-098-204/+521
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't try to verify a non-existent wallet.datGavin Andresen2012-10-081-10/+13
| | | | | | | | | | | | |
| * | | | | | | | | | | | Handle corrupt wallets gracefully.Gavin Andresen2012-10-088-213/+518
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrupt wallets used to cause a DB_RUNRECOVERY uncaught exception and a crash. This commit does three things: 1) Runs a BDB verify early in the startup process, and if there is a low-level problem with the database: + Moves the bad wallet.dat to wallet.timestamp.bak + Runs a 'salvage' operation to get key/value pairs, and writes them to a new wallet.dat + Continues with startup. 2) Much more tolerant of serialization errors. All errors in deserialization are reported by tolerated EXCEPT for errors related to reading keypairs or master key records-- those are reported and then shut down, so the user can get help (or recover from a backup). 3) Adds a new -salvagewallet option, which: + Moves the wallet.dat to wallet.timestamp.bak + extracts ONLY keypairs and master keys into a new wallet.dat + soft-sets -rescan, to recreate transaction history This was tested by randomly corrupting testnet wallets using a little python script I wrote (https://gist.github.com/3812689)
| * | | | | | | | | | | | Handle incompatible BDB environmentsGavin Andresen2012-10-082-15/+19
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, opening a -datadir that was created with a new version of Berkeley DB would result in an un-caught DB_RUNRECOVERY exception. After these changes, the error is caught and the user is told that there is a problem and is told how to try to recover from it.
* | | | | | | | | | | | Merge branch 'crash_at_exit' of github.com:gavinandresen/bitcoin-gitGavin Andresen2012-10-091-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid crashes at shutdown due to printf() in global destructors.Gavin Andresen2012-10-041-2/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1915 from Diapolo/Qt5_compat_leftoverWladimir J. van der Laan2012-10-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)
| * | | | | | | | | | | | | change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)Philip Kaufmann2012-10-071-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I missed that one in my former pull
* | | | | | | | | | | | | Merge pull request #1834 from jgarzik/kickblocksJeff Garzik2012-10-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | P2P: Do not request blocks from peers with fewer blocks than us
| * | | | | | | | | | | | | P2P: Do not request blocks from peers with fewer blocks than usJeff Garzik2012-09-241-0/+1
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the remote node has a shorter chain, do not waste our special getblocks request on them.
* | | | | | | | | | | | | Revert "Send 'mempool' P2P command at the start of each P2P session"Jeff Garzik2012-10-082-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fat-fingered on github, and merged this too early. This reverts commit 22f9b069035c9ba0416a62714db167eea5ba762f.
* | | | | | | | | | | | | Merge pull request #1833 from jgarzik/mempool-queryJeff Garzik2012-10-082-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send 'mempool' P2P command at the start of each P2P session
| * | | | | | | | | | | | | Send 'mempool' P2P command at the start of each P2P sessionJeff Garzik2012-09-242-1/+18
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to query remote node mempool contents.
* | | | | | | | | | | | | Merge branch 'BDB_DOWNGRADE'Gavin Andresen2012-10-082-15/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Handle incompatible BDB environmentsGavin Andresen2012-10-082-15/+19
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, opening a -datadir that was created with a new version of Berkeley DB would result in an un-caught DB_RUNRECOVERY exception. After these changes, the error is caught and the user is told that there is a problem and is told how to try to recover from it.
* | | | | | | | | | | | Merge pull request #1859 from Diapolo/proxy_locksPieter Wuille2012-10-075-49/+77
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | add LOCK() for proxy related data-structures
| * | | | | | | | | | | add LOCK() for proxy related data-structuresPhilip Kaufmann2012-10-045-49/+77
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix #1560 by properly locking proxy related data-structures - update GetProxy() and introduce GetNameProxy() to be able to use a thread-safe local copy from proxyInfo and nameproxyInfo - update usage of GetProxy() all over the source to match the new behaviour, as it now fills a full proxyType object - rename GetNameProxy() into HaveNameProxy() to be more clear
* | | | | | | | | | | Merge pull request #1906 from laanwj/2012_10_help_stdoutWladimir J. van der Laan2012-10-052-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Send --help message to stdout i.s.o stderr
| * | | | | | | | | | Send --help message to stdout i.s.o stderrWladimir J. van der Laan2012-10-042-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows fun stuff such as `bitcoin --help | less`, and more easy piping to files. Looking at other tools such as bash, gcc, they all send their help text to stdout.
* | | | | | | | | | Merge pull request #1905 from laanwj/2012_10_startup_gui_errorWladimir J. van der Laan2012-10-041-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | When datadir missing, show messagebox instead of printing error to stderr
| * | | | | | | | | | When datadir missing, show messagebox instead of printing error to stderrWladimir J. van der Laan2012-10-041-1/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1908 from laanwj/2012_10_rpcerrorsPieter Wuille2012-10-047-112/+159
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Document RPC error codes
| * | | | | | | | | Add constants for HTTP status codesWladimir J. van der Laan2012-10-042-17/+28
| | | | | | | | | |
| * | | | | | | | | Document RPC error codesWladimir J. van der Laan2012-10-047-97/+133
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all "magic values" in RPCError(...) by constants.
* | | | | | | | | Pull changed translations from transifexWladimir J. van der Laan2012-10-049-318/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was also a new translation available, "ja" (Japanese), however almost nothing was filled in yet, so I'm not including it for this release.
* | | | | | | | | Translation update for 0.7.1Wladimir J. van der Laan2012-10-042-127/+168
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Also clarify translation process that the package `gettext` is needed to run string extractor.
* | | | | | | | Merge branch '2012_09_fixwformat' of github.com:laanwj/bitcoinGavin Andresen2012-10-0114-38/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Remove -Wformat* warnings from makefiles"Wladimir J. van der Laan2012-10-014-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 14ac0adcc7c0224a467e38bbd4ebf39d824ada8d.
| * | | | | | | | fix -Wformat warnings all over the sourcePhilip Kaufmann2012-10-019-32/+32
| | | | | | | | |
| * | | | | | | | Extend printf warnings to error()Wladimir J. van der Laan2012-10-011-2/+12
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:runeksvendsen/bitcoinGavin Andresen2012-10-011-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | When encrypting the wallet, warn user that old backups will become useless.Rune K. Svendsen2012-09-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't include HTML in translation strings. Do split the huge message over several lines. Prettier lines
* | | | | | | | | | Merge pull request #1893 from kjj2/issue1884Gavin Andresen2012-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Issue 1884: Add a backup warning to the encryptwallet RPC command
| * | | | | | | | | | Add a backup warning to the encryptwallet RPC commandkjj22012-09-301-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '2012_09_base58tests' of github.com:laanwj/bitcoinGavin Andresen2012-10-014-64/+854
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | data-driven base58 CBitcoinAddress/CBitcoinSecret testsWladimir J. van der Laan2012-10-014-64/+854
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arbitrary numbers of test vectors can be generated using the script `gen_base58_test_vectors.py`.
* | | | | | | | | | harmonize printf format charactersPhilip Kaufmann2012-09-301-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove the "%" character from format characters for (s)size_t and ptrdiff_t and harmonize them with the ones for int64 and uint64
* | | | | | | | | | Merge pull request #1875 from hsoft/masterWladimir J. van der Laan2012-09-291-2/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix compilation with clang under OS X
| * | | | | | | | | | Fixed compilation error with clang.Virgil Dupras2012-09-271-2/+7
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, trying to compile with clang would result in the error: assigning to 'objc_object *' from incompatible type 'DockIconClickEventHandler *'
* | | | | | | | | | Merge pull request #1881 from xanatos/TestsWladimir J. van der Laan2012-09-291-7/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Removed a duplicated identical if
| * | | | | | | | | | toHTML won't add empty wtx.mapValue elementsxanatos2012-09-281-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness. Removed a duplicated identical if There are two equal ifs, one inside another. If the first one is true, then the second one is true.
* | | | | | | | | | | Merge pull request #1851 from fanquake/OpenSSL-1.0.1cWladimir J. van der Laan2012-09-292-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update to use OpenSSL 1.0.1c
| * | | | | | | | | | | Update Bitcoin to use OpenSSL 1.0.1cfanquake2012-09-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump deps tp 0.0.5 Small docs corrections