aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | use fee/sigop data in BlockTemplate struct instead of (not always correctly) ↵Forrest Voight2012-12-191-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calculating it ourselves
| * | | | | | | | | | | changed CreateNewBlock to return a CBlockTemplate object, which includes ↵Forrest Voight2012-12-194-47/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per-tx fee and sigop count data
* | | | | | | | | | | | Merge pull request #2153 from Diapolo/overviewpageWladimir J. van der Laan2013-01-061-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: fix small stylesheet glitch in overviewpage.ui
| * | | | | | | | | | | | Bitcoin-Qt: fix small stylesheet glitch in overviewpage.uiPhilip Kaufmann2013-01-061-2/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2151 from Diapolo/signmessageWladimir J. van der Laan2013-01-061-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: add a Signature label on sign message page
| * | | | | | | | | | | | | Bitcoin-Qt: add a Signature label on sign message pagePhilip Kaufmann2013-01-061-0/+10
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2147 from Diapolo/mq_name_testnetWladimir J. van der Laan2013-01-063-11/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: give testnet a unique IPC message queue name
| * | | | | | | | | | | | | Bitcoin-Qt: give testnet a unique IPC message queue namePhilip Kaufmann2013-01-063-11/+25
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this prevents an interference with the IPC message queue (which is used for URI processing) when running a testnet and mainnet instance in parallel - to check for testnet, I had to raise the ParseParameters() call in main() to the topmost position
* / / / / / / / / / / / / update noui_ThreadSafeMessageBox function to use strCaptionPhilip Kaufmann2013-01-061-2/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ensure we use strCaption for printf and fprintf, as before it could happen to have an error message in the debug.log, which had no "Error" (or whatever) in front
* | | | | | | | | | | | Merge pull request #2110 from Diapolo/addrbookWladimir J. van der Laan2013-01-052-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: comment out unused parameter in addressbookpage
| * | | | | | | | | | | | Bitcoin-Qt: comment out unused parameter in addressbookpagePhilip Kaufmann2012-12-152-2/+2
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2148 from Diapolo/est_block_countWladimir J. van der Laan2013-01-053-12/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: never display own block count > estimated block count
| * | | | | | | | | | | | Bitcoin-Qt: never display own block count > estimated block countPhilip Kaufmann2013-01-043-12/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - some users reported it as weird, that the estimated block count could be lower than our own nodes block number (which is indeed true and not good) - this pull adds a new default behaviour, which displays our own block number as estimated block number, if own >= est. block count - the pull raises space for nodes block counts in cPeerBlockCounts to 8 to be more accurate - also removes a reduntant setNumBlocks() call in RPCConsole and moves initialisation of numBlocksAtStartup in ClientModel, where it belongs
* | | | | | | | | | | | Merge pull request #1685 from Diapolo/Qt_add_options_resetWladimir J. van der Laan2013-01-055-2/+79
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: add a Reset button to the options dialog
| * | | | | | | | | | | | Bitcoin-Qt: add a Reset button to the options dialogPhilip Kaufmann2013-01-055-2/+79
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - a click on "Reset Options" sets all options to the default values by removing all stored settings (QSettings), loading the defaults and saving them as the new settings - before the reset is executed the user is presented a confirmation dialog - special casing was needed for StartAtStartup
* / / / / / / / / / / / translations update (bitcoinstrings.cpp + bitcoin_en.ts)Philip Kaufmann2013-01-052-101/+133
|/ / / / / / / / / / /
* | | / / / / / / / / test/util_tests.cpp: one more DateTimeStrFormat 'T' removalJeff Garzik2013-01-011-4/+4
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Remove 'T' from remaining date/time format strings.Jeff Garzik2013-01-013-7/+7
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2032 from burger2/fix_shortcutWladimir J. van der Laan2013-01-011-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix duplicate shortcut usage in sign/verify message dialog.
| * | | | | | | | | | Fix duplicate shortcut usage in sign/verify message dialog.burger22012-11-221-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #2133 from Diapolo/init_stringsGavin Andresen2012-12-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | update 2 command-line parameter help messages
| * | | | | | | | | | | update 2 command-line parameter help messagesPhilip Kaufmann2012-12-281-2/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - -checkpoints is now much more understandable and should be way easier to translate - -loadblock uses the same format (blk000??.dat) as -reindex
* / | | | | | | | | | Remove 'T' from debug log timestampsJeff Garzik2012-12-301-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Space separation between major fields is easier for human eyes and libs to parse.
* | | | | | | | | | Merge pull request #2116 from sipa/importrescanboolGavin Andresen2012-12-211-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Convert fRescan argument to importprivkey to bool
| * | | | | | | | | | Convert fRescan argument to importprivkey to boolPieter Wuille2012-12-191-0/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* / | | | | | | | | Split off hash.h from util.hPieter Wuille2012-12-186-107/+120
|/ / / / / / / / /
* | / / / / / / / Fix two typos in main.hfanquake2012-12-172-2/+4
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Break one long comment down into 3 lines so it's readable.
* | | | | | | | Merge pull request #2087 from gavinandresen/check210000Pieter Wuille2012-12-131-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Checkpoint at first 25-btc-reward block (210,000)
| * | | | | | | | Checkpoint at first 25-btc-reward block (210,000)Gavin Andresen2012-12-101-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #2096 from 94m3k1n9/fix-time-formatsPieter Wuille2012-12-135-12/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Change timestamps to use ISO8601 formatting
| * | | | | | | | Change timestamps to use ISO8601 formattingRichard Schwab2012-12-125-12/+12
| |/ / / / / / /
* | | | | | | | Merge pull request #2045 from Diapolo/use_messageWladimir J. van der Laan2012-12-122-31/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use new message() function in BitcoinGUI
| * | | | | | | | use new message() function in BitcoinGUIPhilip Kaufmann2012-12-032-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use it for displaying URI parsing warnings - use it for displaying error and information in backup wallet function (the information display is new and the error was a warning before) - cleanup BitcoinGUI::incomingTransaction() -- use message() + the information icon from message -- comment out an unused parameter in the function definition and declaration -- move all pre-checks at the beginning of the function
* | | | | | | | | LevelDB: build_detect_platform fix NATIVE_WINDOWS indentationPhilip Kaufmann2012-12-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix some indentation issues
* | | | | | | | | Merge pull request #2080 from mcassano/importprivkey_rescan_falseGavin Andresen2012-12-121-5/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add rescan bool to importprivkey to control whether to do a rescan after import
| * | | | | | | | | add rescan bool to importprivkey to control whether to do a rescan after importMike Cassano2012-12-061-5/+13
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2095 from al42and/upnpGavin Andresen2012-12-121-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | OptionsModel now has MapPortUPnP=false if UPNP is not supported
| * | | | | | | | | | OptionsModel now has MapPortUPnP=false if UPNP is not supportedAndrey Alekseenko2012-12-121-0/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2003 from alexanderkjeldaas/documented-locking-part-2Gavin Andresen2012-12-123-18/+82
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Documented locking part 1+2
| * | | | | | | | | | o Annotated lock-like functions in net.h.Alexander Kjeldaas2012-11-111-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Removed unused function EndMessageAbortIfEmpty
| * | | | | | | | | | o Added AnnotatedMixin which adds locking annotations to the mutexAlexander Kjeldaas2012-11-111-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API, compatible with clang's -Wthread-safety
| * | | | | | | | | | o Added threadsafety.h - a set of macros using the -Wthread-safetyAlexander Kjeldaas2012-11-111-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature in clang. These macros should primarily be used to document which locks protect a given piece of data. Secondary it can be used to document the set of held and excluded locks when entering a function.
* | | | | | | | | | | Merge pull request #1825 from roques/bignum2Gavin Andresen2012-12-122-14/+107
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bignum2
| * | | | | | | | | | | reimplement CBigNum's compact encoding of difficulty targetsChristian von Roques2012-09-171-14/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use shifts instead of going through the MPI representation of BIGNUMs. Be careful to keep the meaning of 0x00800000 as sign bit.
| * | | | | | | | | | | tests for SetCompact and GetCompact of CBigNumChristian von Roques2012-09-151-0/+53
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1940 from grimd34th/patch-1Gavin Andresen2012-12-121-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add NATIVE_WINDOWS
| * | | | | | | | | | | | Add NATIVE_WINDOWSgrimd34th2012-10-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a change of libs, and specifying NATIVE_WINDOWS as TARGET_OS it should compile libleveldb.a and libmemenv.a just fine, it did for me and Diapolo when testing.
* | | | | | | | | | | | | Merge pull request #2073 from grimd34th/patch-3Gavin Andresen2012-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update src/makefile.mingw
| * | | | | | | | | | | | | Update src/makefile.mingwgrimd34th2012-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With MinGW we use .a not .lib
* | | | | | | | | | | | | | Merge pull request #2048 from jgarzik/no-checkpointsGavin Andresen2012-12-122-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "checkpoints" option, to permit disabling of checkpoint logic.