aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6288Alexander Blair2020-03-273-20/+38
|\
| * ringdb: use a different iv for key and data in rings tablemoneromooo-monero2020-01-091-18/+37
| * simplewallet: reword mixin in user message in terms of ring sizemoneromooo-monero2020-01-091-1/+1
| * wallet2: do not remove known rings when a tx failsmoneromooo-monero2020-01-091-1/+0
* | Merge pull request #6285Alexander Blair2020-03-273-24/+406
|\ \
| * | net: fix incorrect less operator for top/i2p addressesAaron Hook2020-01-183-24/+406
* | | Merge pull request #6284Alexander Blair2020-03-271-2/+2
|\ \ \
| * | | Fix check_fee() discrepancy.UkoeHB2020-01-091-2/+2
* | | | Merge pull request #6283Alexander Blair2020-03-271-2/+2
|\ \ \ \
| * | | | p2p: fix off by one adding fallback peersmoneromooo-monero2020-01-071-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #6282Alexander Blair2020-03-271-1/+1
|\ \ \ \
| * | | | Daemon: Guard against reporting "synchronized" too earlyrbrunner72020-01-101-1/+1
* | | | | Merge pull request #6281Alexander Blair2020-03-271-1/+1
|\ \ \ \ \
| * | | | | 10 block time is for incoming outputs, not transactionsrating89us2020-01-051-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #6280Alexander Blair2020-03-271-2/+8
|\ \ \ \ \
| * | | | | p2p: fix spurious warning when we're connected to at last one seedmoneromooo-monero2020-01-311-2/+8
| |/ / / /
* | | | | Merge pull request #6279Alexander Blair2020-03-271-1/+1
|\ \ \ \ \
| * | | | | p2p: fix adding wrong indices to the filtered peer listmoneromooo-monero2020-01-031-1/+1
| |/ / / /
* | | | | Merge pull request #6275Alexander Blair2020-03-2715-328/+3
|\ \ \ \ \
| * | | | | p2p: remove old debug commandsAaron Hook2020-03-2015-328/+3
* | | | | | Merge pull request #6227Alexander Blair2020-03-272-30/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | core: move the LockedTXN class out of txpool so it may be reusedmoneromooo-monero2020-03-122-30/+65
* | | | | | Merge pull request #6388luigi11112020-03-151-1/+1
|\ \ \ \ \ \
| * | | | | | workaround for GetObject windows.h macro and rapidjson conflictxiphon2020-03-141-1/+1
|/ / / / / /
* | | | | | Merge pull request #6383luigi11112020-03-131-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | easylogging++: fix 'ELPP_OS_EMSCRIPTEN is not defined' warningxiphon2020-03-111-0/+2
* | | | | | Merge pull request #6273Alexander Blair2020-03-1212-1025/+828
|\ \ \ \ \ \
| * | | | | | Various improvements to the ZMQ JSON-RPC handling:Lee Clagett2020-03-0512-1025/+828
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6268Alexander Blair2020-03-124-13/+13
|\ \ \ \ \ \
| * | | | | | wallet: fix exceptions getting the hash of a pruned txmoneromooo-monero2019-12-304-13/+13
| |/ / / / /
* | | | | | Merge pull request #6263Alexander Blair2020-03-122-5/+5
|\ \ \ \ \ \
| * | | | | | Gitian: Change lxc ip linkTheCharlatan2020-01-062-5/+5
| |/ / / / /
* | | | | | Merge pull request #6251Alexander Blair2020-03-121-0/+10
|\ \ \ \ \ \
| * | | | | | depends: set several missing build tagsmoneromooo-monero2019-12-181-0/+10
| |/ / / / /
* | | | | | Merge pull request #6244Alexander Blair2020-03-121-5/+16
|\ \ \ \ \ \
| * | | | | | abstract_tcp_server2: guard against negative timeoutsmoneromooo-monero2019-12-161-5/+16
| |/ / / / /
* | | | | | Merge pull request #6243Alexander Blair2020-03-128-87/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | p2p: remove obsolete local time in handshakemoneromooo-monero2020-01-292-5/+0
| * | | | | p2p: avoid sending the same peer list over and overmoneromooo-monero2020-01-293-4/+17
| * | | | | epee: remove backward compatible endian specific address serializationmoneromooo-monero2020-01-261-6/+2
| * | | | | p2p: remove backward compatible peer listmoneromooo-monero2020-01-261-58/+2
| * | | | | p2p: simplify last_seen serialization now we have optional storesmoneromooo-monero2020-01-261-2/+1
| * | | | | cryptonote_protocol: omit top 64 bits of difficulty when 0moneromooo-monero2020-01-261-2/+8
| * | | | | serialization: do not write optional fields with default valuemoneromooo-monero2020-01-262-2/+4
| * | | | | p2p: remove obsolete local time from TIMED_SYNCmoneromooo-monero2020-01-263-8/+4
* | | | | | Merge pull request #6248Alexander Blair2020-02-281-1/+1
|\ \ \ \ \ \
| * | | | | | p2p: drop the peerlist dump to TRACEmoneromooo-monero2019-12-171-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6238Alexander Blair2020-02-282-0/+9
|\ \ \ \ \ \
| * | | | | | wallet2: guard against race with multiple decrypt_keys usersmoneromooo-monero2019-12-172-0/+9
| |/ / / / /
* | | | | | Merge pull request #6222Alexander Blair2020-02-281-0/+2
|\ \ \ \ \ \