aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1569Riccardo Spagni2017-01-156-17/+207
|\ | | | | | | 16b8b66a specify restore height by YYYY-MM-DD format (kenshi84)
| * specify restore height by YYYY-MM-DD formatkenshi842017-01-166-17/+207
| |
* | Change logging to easylogging++moneromooo-monero2017-01-1665-996/+785
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the epee and data_loggers logging systems with a single one, and also adds filename:line and explicit severity levels. Categories may be defined, and logging severity set by category (or set of categories). epee style 0-4 log level maps to a sensible severity configuration. Log files now also rotate when reaching 100 MB. To select which logs to output, use the MONERO_LOGS environment variable, with a comma separated list of categories (globs are supported), with their requested severity level after a colon. If a log matches more than one such setting, the last one in the configuration string applies. A few examples: This one is (mostly) silent, only outputting fatal errors: MONERO_LOGS=*:FATAL This one is very verbose: MONERO_LOGS=*:TRACE This one is totally silent (logwise): MONERO_LOGS="" This one outputs all errors and warnings, except for the "verify" category, which prints just fatal errors (the verify category is used for logs about incoming transactions and blocks, and it is expected that some/many will fail to verify, hence we don't want the spam): MONERO_LOGS=*:WARNING,verify:FATAL Log levels are, in decreasing order of priority: FATAL, ERROR, WARNING, INFO, DEBUG, TRACE Subcategories may be added using prefixes and globs. This example will output net.p2p logs at the TRACE level, but all other net* logs only at INFO: MONERO_LOGS=*:ERROR,net*:INFO,net.p2p:TRACE Logs which are intended for the user (which Monero was using a lot through epee, but really isn't a nice way to go things) should use the "global" category. There are a few helper macros for using this category, eg: MGINFO("this shows up by default") or MGINFO_RED("this is red"), to try to keep a similar look and feel for now. Existing epee log macros still exist, and map to the new log levels, but since they're used as a "user facing" UI element as much as a logging system, they often don't map well to log severities (ie, a log level 0 log may be an error, or may be something we want the user to see, such as an important info). In those cases, I tried to use the new macros. In other cases, I left the existing macros in. When modifying logs, it is probably best to switch to the new macros with explicit levels. The --log-level options and set_log commands now also accept category settings, in addition to the epee style log levels.
* Merge pull request #1578Riccardo Spagni2017-01-151-1/+2
|\ | | | | | | ce866d1c macro to define core RPC version for avoiding future mistake (kenshi84)
| * macro to define core RPC version for avoiding future mistakekenshi842017-01-161-1/+2
| |
* | Merge pull request #1581Riccardo Spagni2017-01-151-1/+1
|\ \ | | | | | | | | | 6da9335a blockchain_import: fix build after tx_pool::add_tx changes (moneromooo-monero)
| * | blockchain_import: fix build after tx_pool::add_tx changesmoneromooo-monero2017-01-151-1/+1
| |/
* | Merge pull request #1561Riccardo Spagni2017-01-157-75/+70
|\ \ | |/ |/| | | | | | | | | | | | | | | d561f4ad enable clang checks that were disabled (Chris Vickio) 0aefb2f6 remove std::move from return statements (pessimizing-move warning) (Chris Vickio) 629d5b76 change counter from bool to int (deprecated-increment-bool warning) (Chris Vickio) fb76d439 add extra braces around subobjects (missing-braces warning) (Chris Vickio) 3b6d5f25 make struct/class declarations consistent (mismatched-tags warning) (Chris Vickio) fcf66925 remove unused fields from network_throttle (unused-private-field warning) (Chris Vickio) 296f8c16 inline unused function (for unused-function warning) (Chris Vickio)
| * remove std::move from return statements (pessimizing-move warning)Chris Vickio2017-01-151-2/+2
| |
| * change counter from bool to int (deprecated-increment-bool warning)Chris Vickio2017-01-151-1/+1
| |
| * add extra braces around subobjects (missing-braces warning)Chris Vickio2017-01-141-64/+64
| |
| * make struct/class declarations consistent (mismatched-tags warning)Chris Vickio2017-01-144-5/+3
| |
| * remove unused fields from network_throttle (unused-private-field warning)Chris Vickio2017-01-141-3/+0
| |
* | Merge pull request #1579Riccardo Spagni2017-01-151-1/+26
|\ \ | | | | | | | | | f5f4109f mnemonics: fix language detection with checksum word (moneromooo-monero)
| * | mnemonics: fix language detection with checksum wordmoneromooo-monero2017-01-151-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a checksum word is present, language detection would use just the word prefixes. However, a set of word prefixes may be found in more than one language, and so the wrong language may be found first, which could then fail the checksum, since the check may be done with a different unique prefix length from the one it was created from. We now make a checksum test when we we detect a language from prefixes only, to make sure we have the correct one.
* | | Merge pull request #1577Riccardo Spagni2017-01-153-0/+36
|\ \ \ | | | | | | | | | | | | feb499aa core: check block version for alt chains too (moneromooo-monero)
| * | | core: check block version for alt chains toomoneromooo-monero2017-01-143-0/+36
| |/ / | | | | | | | | | This is incompatible with block version voting
* | | Merge pull request #1576Riccardo Spagni2017-01-154-84/+148
|\ \ \ | | | | | | | | | | | | ba3968f6 rct: split rct checks between semantics and other (moneromooo-monero)
| * | | rct: split rct checks between semantics and othermoneromooo-monero2017-01-144-84/+148
| | | | | | | | | | | | | | | | Semantics can be checked early
* | | | Merge pull request #1574Riccardo Spagni2017-01-152-9/+36
|\ \ \ \ | | | | | | | | | | | | | | | d276a165 wallet2: use at least two rct inputs if possible (moneromooo-monero)
| * | | | wallet2: use at least two rct inputs if possiblemoneromooo-monero2017-01-142-9/+36
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we'd make a rct tx with just one input, we try to add a second one to match the 2/2 ideal. This means more txes use that template (and are thus using a larger anonymity set), and it coalesces outputs "for free". We use the smallest amount outputs in priority for this, so we can "clean" the wallet at the same time.
* | | | Merge pull request #1573Riccardo Spagni2017-01-153-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | dea53962 fix timeout in check_connection (Jaquee)
| * | | | fix timeout in check_connectionJaquee2017-01-143-5/+7
| |/ / /
* | | | Merge pull request #1571Riccardo Spagni2017-01-159-33/+50
|\ \ \ \ | | | | | | | | | | | | | | | 81c384e4 fix do_not_relay not preventing relaying on a timer (moneromooo-monero)
| * | | | fix do_not_relay not preventing relaying on a timermoneromooo-monero2017-01-149-34/+51
| |/ / / | | | | | | | | | | | | Also print its value when printing pool
* | | | Merge pull request #1568Riccardo Spagni2017-01-157-1/+134
|\ \ \ \ | | | | | | | | | | | | | | | 5b5017e2 rpc: add a command to get info about the current blockchain (moneromooo-monero)
| * | | | rpc: add a command to get info about the current blockchainmoneromooo-monero2017-01-137-1/+134
| |/ / / | | | | | | | | | | | | About the tip of the main chain, and the last N blocks
* | | | Merge pull request #1567Riccardo Spagni2017-01-151-7/+13
|\ \ \ \ | | | | | | | | | | | | | | | c9f13c5e wallet2: fix tx reroll not updating fee is going up a kB step (moneromooo-monero)
| * | | | wallet2: fix tx reroll not updating fee is going up a kB stepmoneromooo-monero2017-01-131-7/+13
| |/ / /
* | | | Merge pull request #1565Riccardo Spagni2017-01-151-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | 50b230d1 core: ensure block size limit is set from the start (moneromooo-monero)
| * | | | core: ensure block size limit is set from the startmoneromooo-monero2017-01-131-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | It can now be queried by RPC, so it needs to be set before it is otherwise needed for consensus, even if no blocks had to be added (ie, exit and restart quickly).
* | | | Merge pull request #1564Riccardo Spagni2017-01-153-6/+67
|\ \ \ \ | | | | | | | | | | | | | | | 1d317981 Wallet API: add key image import/export functions (Jaquee)
| * | | | Wallet API: add key image import/export functionsJaquee2017-01-133-6/+67
| |/ / /
* | | | Merge pull request #1563Riccardo Spagni2017-01-152-21/+26
|\ \ \ \ | | | | | | | | | | | | | | | 36ba311c Prioritize older transactions in the mempool (Miguel Herranz)
| * | | | Prioritize older transactions in the mempoolMiguel Herranz2017-01-132-21/+26
| | |_|/ | |/| | | | | | | | | | | | | | The transactions are first prioritized by fee and in case the fees are equal by receive_time.
* | | | Merge pull request #1560Riccardo Spagni2017-01-153-1/+24
|\ \ \ \ | | | | | | | | | | | | | | | 46550c0b Wallet API: add rescanSpent() (Jaquee)
| * | | | Wallet API: add rescanSpent()Jaquee2017-01-133-1/+24
| | |/ / | |/| |
* | | | Merge pull request #1552Riccardo Spagni2017-01-151-12/+42
|\ \ \ \ | | | | | | | | | | | | | | | 4a017674 Wallet API: support integrated addresses in address book. (Jaquee)
| * | | | Wallet API: support integrated addresses in address book.Jaquee2017-01-131-12/+42
| |/ / /
* | | | Merge pull request #1506Riccardo Spagni2017-01-158-32/+70
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 3ff54bdd Check for correct thread before ending batch transaction (Howard Chu) eaf8470b Must wait for previous batch to finish before starting new one (Howard Chu) c903c554 Don't cache block height, always get from DB (Howard Chu) eb1fb601 Tweak default db-sync-mode to fast:async:1 (Howard Chu) 0693cff9 Use batch transactions when syncing (Howard Chu)
| * | | Check for correct thread before ending batch transactionHoward Chu2017-01-151-0/+7
| | | |
| * | | Must wait for previous batch to finish before starting new oneHoward Chu2017-01-141-1/+6
| | | |
| * | | Don't cache block height, always get from DBHoward Chu2017-01-142-14/+29
| | | |
| * | | Tweak default db-sync-mode to fast:async:1Howard Chu2017-01-141-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | fsync the DB asynchronously, to allow block download/verification to proceed while syncing. Sync after every batch. Note that "fastest" still defaults to fastest:async:1000.
| * | | Use batch transactions when syncingHoward Chu2017-01-147-14/+22
| | | | | | | | | | | | | | | | | | | | Faster throughput while avoiding corruption. I.e., makes running with --db-sync-mode safe more tolerable.
* | | | account: fix build error involving std::max and different typesmoneromooo-monero2017-01-131-2/+6
| |/ / |/| |
* | | Merge pull request #1562Riccardo Spagni2017-01-133-79/+99
|\ \ \ | | | | | | | | | | | | a081b39c Move key image export/import functions to wallet2 (Jaquee)
| * | | Move key image export/import functions to wallet2Jaquee2017-01-133-79/+99
| | |/ | |/|
* | | Merge pull request #1559Riccardo Spagni2017-01-139-6/+73
|\ \ \ | | | | | | | | | | | | db56a03f Wallet2 + API: Callbacks for unconfirmed transfers (Jaquee)
| * | | Wallet2 + API: Callbacks for unconfirmed transfersJaquee2017-01-129-6/+73
| | | |