summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3914v0.12.2.0Riccardo Spagni2018-06-031-3/+3
|\ | | | | | | 107eec4d protocol: drop (and increase fails) if most blocks hashes are invalid (moneromooo-monero)
| * protocol: drop (and increase fails) if most blocks hashes are invalidmoneromooo-monero2018-06-031-3/+3
| |
* | Merge pull request #3912Riccardo Spagni2018-06-031-1/+1
|\ \ | | | | | | | | | de742b5c blockchain: demote a hash-of-hashes validation warning to debug (moneromooo-monero)
| * | blockchain: demote a hash-of-hashes validation warning to debugmoneromooo-monero2018-06-021-1/+1
| |/ | | | | | | | | This data comes from untrusted peers, and validation failures are therefore normal.
* | Merge pull request #3906Riccardo Spagni2018-06-023-2/+2
|\ \ | | | | | | | | | | | | | | | 2cab7ec9 remove -master from version string (Riccardo Spagni) e0cf1eca update checkpoints.dat for point release (Riccardo Spagni) bfecf19c bump version for 0.12.2 point release (Riccardo Spagni)
| * | remove -master from version stringRiccardo Spagni2018-06-021-1/+1
| | |
| * | update checkpoints.dat for point releaseRiccardo Spagni2018-06-022-1/+1
| | |
| * | bump version for 0.12.2 point releaseRiccardo Spagni2018-06-021-1/+1
|/ /
* | Merge pull request #3900Riccardo Spagni2018-06-011-0/+7
|\ \ | |/ |/| | | bcddce70 rpc: the cache is still for non cumulative on that branch (moneromooo-monero)
| * rpc: the cache is still for non cumulative on that branchmoneromooo-monero2018-06-011-0/+7
|/
* Merge pull request #3858Riccardo Spagni2018-05-3138-15175/+4
|\ | | | | | | f6687c3e rapidjson: remove outdated in-tree, use submodule (anonimal)
| * rapidjson: remove outdated in-tree, use submoduleanonimal2018-05-2538-15175/+4
| | | | | | | | | | | | | | | | | | Includes ~2 years worth of fixes including security and build. Note: this pulls directly from master, not a release branch/tag. See https://github.com/Tencent/rapidjson/issues/1265 (cherry picked from commit 8a6c081df71cde3f1c55d5b7e5ef7d5d34b475dc)
* | Merge pull request #3893Riccardo Spagni2018-05-311-6/+7
|\ \ | | | | | | | | | 410c6e5b rpc: convert distribution to cumulative after caching (moneromooo-monero)
| * | rpc: convert distribution to cumulative after cachingmoneromooo-monero2018-05-311-6/+7
| |/ | | | | | | This avoids double conversion on a later cache hit
* | Merge pull request #3891Riccardo Spagni2018-05-311-1/+1
|\ \ | | | | | | | | | 9e96873f wallet2: don't ask for pruned txes yet, we still parse the entire tx (moneromooo-monero)
| * | wallet2: don't ask for pruned txes yet, we still parse the entire txmoneromooo-monero2018-05-311-1/+1
| |/
* | Merge pull request #3883Riccardo Spagni2018-05-311-0/+7
|\ \ | | | | | | | | | 15e029ac rpc: fix get_output_distribution cache for the cumulative case (moneromooo-monero)
| * | rpc: fix get_output_distribution cache for the cumulative casemoneromooo-monero2018-05-301-0/+7
| |/ | | | | | | The distribution was not converted to cumulative after a cache hit
* | Merge pull request #3886Riccardo Spagni2018-05-311-17/+20
|\ \ | | | | | | | | | 4602c267 Fix CMAKE config for PCSC in order to avoid msys DLL dependencies (cslashm)
| * | Fix CMAKE config for PCSC in order to avoid msys DLL dependenciescslashm2018-05-311-17/+20
| |/
* | Merge pull request #3889Riccardo Spagni2018-05-315-6/+105
|\ \ | | | | | | | | | | | | | | | | | | 5e2e003c http_protocol_handler: limit the number of starting newlines (moneromooo-monero) fd9019b3 abstract_tcp_server2: timeout on RPC connections (moneromooo-monero) ccaa666c http_protocol_handler: speedup newline discarding (moneromooo-monero) ca7f0249 console_handler: fix start_default_console use of prompt parameter (moneromooo-monero)
| * | http_protocol_handler: limit the number of starting newlinesmoneromooo-monero2018-05-313-1/+12
| | |
| * | abstract_tcp_server2: timeout on RPC connectionsmoneromooo-monero2018-05-312-1/+68
| | |
| * | http_protocol_handler: speedup newline discardingmoneromooo-monero2018-05-311-2/+5
| | |
| * | console_handler: fix start_default_console use of prompt parametermoneromooo-monero2018-05-311-3/+21
| |/ | | | | | | It had not been updated to the function type change
* | Merge pull request #3802Riccardo Spagni2018-05-312-6/+15
|\ \ | | | | | | | | | a66f152f Use median timestamp if current time renders a block invalid. (Thaer Khawaja)
| * | Use median timestamp if current time renders a block invalid.Thaer Khawaja2018-05-132-6/+15
| | |
* | | Merge pull request #3884Riccardo Spagni2018-05-313-6/+9
|\ \ \ | |_|/ |/| | | | | | | | 49cf41a6 protocol: do not switch to unsafe sync mode for just a few blocks (moneromooo-monero) 22a4cb06 core: fix automatic safe db sync mode switching (moneromooo-monero)
| * | protocol: do not switch to unsafe sync mode for just a few blocksmoneromooo-monero2018-05-301-1/+2
| | |
| * | core: fix automatic safe db sync mode switchingmoneromooo-monero2018-05-302-5/+7
|/ /
* | Merge pull request #3846v0.12.1.0Riccardo Spagni2018-05-234-3/+3
|\ \ | | | | | | | | | | | | | | | e18cb33e update checkpoints (Riccardo Spagni) f1cdcba9 update checkpoints for point release (Riccardo Spagni) ed273a88 bump version for point release (Riccardo Spagni)
| * | update checkpointsRiccardo Spagni2018-05-232-1/+1
| | |
| * | update checkpoints for point releaseRiccardo Spagni2018-05-231-1/+1
| | |
| * | bump version for point releaseRiccardo Spagni2018-05-231-1/+1
|/ /
* | Merge pull request #3843Riccardo Spagni2018-05-234-0/+23
|\ \ | | | | | | | | | e05a17f1 Fix PCSC discovery under Windows/MSYS Fix PCSC compilation under windows (cslashm)
| * | Fix PCSC discovery under Windows/MSYScslashm2018-05-224-0/+23
|/ / | | | | | | Fix PCSC compilation under windows
* | Merge pull request #3801Riccardo Spagni2018-05-212-12/+12
|\ \ | | | | | | | | | | | | 96405bca crypto: more places needing fixing for GCC 8.1 (moneroexamples) 86c63b8e chacha: fix build with GCC 8.1 (moneromooo-monero)
| * | crypto: more places needing fixing for GCC 8.1moneroexamples2018-05-131-10/+10
| | |
| * | chacha: fix build with GCC 8.1moneromooo-monero2018-05-131-2/+2
| | |
* | | Merge pull request #3833Riccardo Spagni2018-05-213-11/+13
|\ \ \ | | | | | | | | | | | | aabe3eed Fix output shuffling for multisig (stoffu)
| * | | Fix output shuffling for multisigstoffu2018-05-203-11/+13
| | | |
* | | | Merge pull request #3838Riccardo Spagni2018-05-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | 38ef5f8b simplewallet: use correct unit for fee command (stoffu)
| * | | | simplewallet: use correct unit for fee commandstoffu2018-05-201-1/+1
| |/ / /
* | | | Merge pull request #3796Riccardo Spagni2018-05-212-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | fac173d8 Wallet API: allow log path to be non-default & console output to be configurable (stoffu)
| * | | | Wallet API: allow log path to be non-default & console output to be configurablestoffu2018-05-122-3/+4
| | | | |
* | | | | Merge pull request #3815Riccardo Spagni2018-05-2110-23/+183
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ffe9d882 speed up get_output_distribution (and precalc common case) (moneromooo-monero)
| * | | | | speed up get_output_distribution (and precalc common case)moneromooo-monero2018-05-1910-23/+183
| | |/ / / | |/| | |
* | | | | Merge pull request #3831Riccardo Spagni2018-05-211-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 7f33e07d daemon: request unpruned transactions for print_tx (moneromooo-monero)
| * | | | | daemon: request unpruned transactions for print_txmoneromooo-monero2018-05-191-0/+1
| |/ / / / | | | | | | | | | | | | | | | instead of uninitialized
* | | | | Merge pull request #3811Riccardo Spagni2018-05-211-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 13184bc4 [RELEASE] Update readme to include link to announcement list (Gingeropolous)