aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3000 from gmaxwell/more_osx_fsyncJeff Garzik2013-09-161-0/+2
|\ | | | | More fixes for blockchain corruption on OSX.
| * More fixes for blockchain corruption on OSX.Gregory Maxwell2013-09-151-0/+2
| | | | | | | | | | | | | | | | | | As we'd previously learned, OSX's fsync is a data eating lie. Since 0.8.4 we're still getting some reports of disk corruption on OSX but now all of it looks like the block files have gotten out of sync with the database. It turns out that we were still using fsync() on the block files, so this isn't surprising.
* | Merge pull request #3001 from theuni/fix-make-raceGavin Andresen2013-09-151-6/+5
|\ \ | |/ |/| autotools: fix a parallel build race condition spotted by the pull-tester
| * autotools: fix a parallel build race condition spotted by the pull-testerCory Fields2013-09-161-6/+5
|/ | | | | | | | | | | libleveldb.a and libmemenv.a should be able to build in parallel, but in practice calling the leveldb makefile ends up rewriting build_config.mk. If one target tries to build while the other is halfway through writing the .mk, the make ends up in an undefined state. Fix that by making one depend on the other. This also reorders the variables to be passed by param rather than via the environment, and combines the targets into a single rule to avoid needless duplication.
* Merge pull request #2996 from theuni/qt-translationGavin Andresen2013-09-145-23/+49
|\ | | | | Update translation process for autotools
| * autotools: update translation docsCory Fields2013-09-141-6/+5
| |
| * autotools: check for lupdate/xgettextCory Fields2013-09-141-0/+9
| |
| * autotools: add translate target for qt translationsCory Fields2013-09-142-0/+12
| |
| * autotools: teach extract_strings_qt.py to respect the XGETTEXT env variableCory Fields2013-09-141-1/+3
| |
| * autotools: rearrange qt sources to make them more flexibleCory Fields2013-09-141-16/+20
| | | | | | | | | | Add BITCOIN_MM QR_CPP and BITCOIN_CPP in order to better accomodate complicated targets. This is a no-op change.
* | Merge pull request #2830 from petertodd/p2sh-rpcGregory Maxwell2013-09-125-38/+69
|\ \ | |/ |/| P2SH related RPC improvements
| * Make validateaddress provide redeemScriptPeter Todd2013-09-121-0/+1
| |
| * Add RPC call decodescriptPeter Todd2013-09-124-5/+31
| |
| * Move Parse{Hash|Hex} to be usable by all RPC codePeter Todd2013-09-123-33/+37
|/
* Merge pull request #2979 from luke-jr/autoconfGregory Maxwell2013-09-1010-27/+98
|\ | | | | Autoconf fixes
| * Bugfix: Since test_bitcoin is being built and run inside src/test/, try ↵Luke Dashjr2013-09-103-3/+6
| | | | | | | | using relative directories from that point
| * configure: Prefer specific known-good versions of Qt metacompiler toolsLuke Dashjr2013-09-101-4/+4
| |
| * build-unix.md: Remove now-redundant and unnecessary Gentoo instructionsLuke Dashjr2013-09-101-16/+0
| |
| * configure: Check common include subdirectories for bdb headers, and refuse ↵Luke Dashjr2013-09-105-2/+86
| | | | | | | | to use any version other than 4.8 by default
| * autotools: use an absolute path to test dataCory Fields2013-09-101-2/+2
| |
* | Merge pull request #2982 from gmaxwell/20130908_ccoins_corruptGregory Maxwell2013-09-101-1/+6
|\ \ | |/ |/| Longer term workaround for chainstate corruption from negative versions.
| * Longer term workaround for chainstate corruption from negative versions.Gregory Maxwell2013-09-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also makes negative transaction versions non-standard. This avoids an issue triggered in block 256818 where transactions with negative version numbers were incorrectly serialized into the UTXO set. On restart nodes detect the inconsistency and refuse to start so long as a block with these transactions is inside the self-consistency check window, logging "coin database inconsistencies found". The software recommends reindexing, but reindexing does not correct the problem. This should be fixed by changing the chainstate serialization, but working around it seems harmless for now because the version is not used by any network rule currently. A patch free workaround is to start with -checklevel=2 which skips the consistency checks, but the IsStandard change is important for miners in order to protect unpatched nodes.
* | Merge pull request #2961 from Diapolo/cosmeticWladimir J. van der Laan2013-09-0911-37/+33
|\ \ | |/ |/| fix some cosmetic glitches in the codebase
| * fix some cosmetic glitches in the codebasePhilip Kaufmann2013-09-0911-37/+33
|/ | | | | | | | | | | - rename URL into URI in paymentserver where correct - add some missing Qt-coding-stuff in paymentserver - change QSpinBox to QLineEdit as base for BitcoinAmountField in .ui files (as this is the result when converting the BAF back into base) - remove some c_str() and replace with QString::fromStdString() - remove several new-lines - remove unneeded spaces - indentation fixes
* Merge pull request #2968 from TheBlueMatt/masterGavin Andresen2013-09-081-0/+5
|\ | | | | Don't warn about forks while fIsInitialDownload
| * Don't warn about forks while fIsInitialDownloadMatt Corallo2013-09-031-0/+5
| |
* | Merge pull request #2977 from laanwj/2013_09_release_process_protobufGavin Andresen2013-09-082-1/+5
|\ \ | | | | | | Add protobuf 2.5.0 download to gitian release process
| * | Qt 4.8.3 r2 in gitian and release processWladimir J. van der Laan2013-09-052-1/+2
| | | | | | | | | | | | | | | Also needed to add `unzip` package for the added unzip command for OpenSSL in the Qt build.
| * | Add protobuf 2.5.0 download to gitian release processWladimir J. van der Laan2013-09-051-0/+3
| | |
* | | configure.ac: remove superfluous bracketJeff Garzik2013-09-071-1/+1
| | | | | | | | | | | | Reported-by: Cory Fields
* | | Merge pull request #2943 from theuni/autotools-finalJeff Garzik2013-09-0659-1508/+3527
|\ \ \ | | | | | | | | Autotools buildsystem
| * | | autotools: switch to autotools buildsystemCory Fields2013-09-0559-1508/+3527
| |/ /
* | | Merge pull request #2976 from laanwj/2013_09_txid_detailsWladimir J. van der Laan2013-09-065-9/+19
|\ \ \ | | | | | | | | qt: add vout index to transaction id in transactions details dialog
| * | | qt: add vout index to transaction id in transactions details dialogWladimir J. van der Laan2013-09-065-9/+19
| | | |
* | | | Merge pull request #2973 from Diapolo/qDebugWladimir J. van der Laan2013-09-067-52/+67
|\ \ \ \ | |/ / / |/| | | Bitcoin-Qt: Use qDebug() for printing to debug.log
| * | | Bitcoin-Qt: Use qDebug() for printing to debug.logPhilip Kaufmann2013-09-067-52/+67
|/ / / | | | | | | | | | | | | - removes all usages of PrintDebugStringF from Qt code - ensure same format for all debug.log messages "functionname : Message"
* | | Merge pull request #2978 from gmaxwell/rpc_settxfee_docGavin Andresen2013-09-051-2/+2
|\ \ \ | |/ / |/| | Make settxfee clear that units are btc/kb.
| * | Make settxfee clear that units are btc/kb.Gregory Maxwell2013-09-051-2/+2
|/ /
* | Merge pull request #2944 from gavinandresen/acceptheaderGavin Andresen2013-09-031-0/+4
|\ \ | |/ |/| Set Accept: application/bitcoin-paymentrequest header
| * Set Accept: application/bitcoin-paymentrequest headerGavin Andresen2013-08-281-0/+4
| | | | | | | | | | Suggestion from BitPay: set an Accept: HTTP header when fetching payment requests / payment ACKs.
* | Merge pull request #2948 from jgarzik/changeaddrGregory Maxwell2013-09-023-0/+25
|\ \ | | | | | | RPC: add getrawchangeaddress, for raw transaction change destinations
| * | RPC: add getrawchangeaddress, for raw transaction change destinationsJeff Garzik2013-08-283-0/+25
| |/
* | Merge pull request #2958 from laanwj/2013_08_txfee2Wladimir J. van der Laan2013-09-027-47/+207
|\ \ | | | | | | [Qt] Display txfee in first sendCoinsDialog message box
| * | qt: Display txfee in first sendCoinsDialog message boxJonas Schnelli2013-08-317-47/+207
| | | | | | | | | | | | Signed-off-by: Jonas Schnelli <[email protected]>
* | | Merge pull request #2967 from tstranex/masterPieter Wuille2013-09-021-2/+2
|\ \ \ | | | | | | | | Fix typo in a comment: it's base58, not base48.
| * | | Fix typo in a comment: it's base58, not base48.Timothy Stranex2013-09-021-2/+2
|/ / /
* | | Merge pull request #2951 from laanwj/2013_08_addressbook_purposeWladimir J. van der Laan2013-09-027-33/+54
|\ \ \ | | | | | | | | [Qt] Handle address purpose in incremental updates
| * | | qt: Handle address purpose in incremental updatesWladimir J. van der Laan2013-08-297-33/+54
| | | | | | | | | | | | | | | | | | | | | | | | Correctly use the purpose of addresses that are added after the start of the client. Addresses with purpose "refund" and "change" should not be visible in the GUI. This is now handled correctly.
* | | | Merge pull request #2963 from Diapolo/log-qtWladimir J. van der Laan2013-09-021-9/+8
|\ \ \ \ | | | | | | | | | | Bitcoin-Qt: allow to differentiate Qt log entries from core
| * | | | Bitcoin-Qt: allow to differentiate Qt log entries from corePhilip Kaufmann2013-08-311-9/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | - prepend "Bitcoin-Qt" in front of debug.log entries, which come from Qt - move DebugMessageHandler installation upwards to the event handler installation, which fits much better