aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6299Alexander Blair2020-03-272-2/+26
|\
| * wallet2: remember daemon address overrides when loading a new walletmoneromooo-monero2020-03-072-2/+26
* | Merge pull request #6296Alexander Blair2020-03-271-0/+4
|\ \
| * | wallet2: reject zero keys in json inputmoneromooo-monero2020-01-161-0/+4
| |/
* | Merge pull request #6295Alexander Blair2020-03-273-7/+17
|\ \
| * | p2p: do not add recently failed addresses to the peerlistmoneromooo-monero2020-03-203-7/+17
* | | Merge pull request #6289Alexander Blair2020-03-275-12/+59
|\ \ \
| * | | wallet: reroll fake outs selection on local tx_sanity_check failurexiphon2020-01-145-12/+59
* | | | 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-272-2/+4
|\ \ \ \
| * | | | net: fix incorrect less operator for top/i2p addressesAaron Hook2020-01-182-2/+4
* | | | | 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 #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-2711-326/+1
|\ \ \ \ \
| * | | | | p2p: remove old debug commandsAaron Hook2020-03-2011-326/+1
| | |_|/ / | |/| | |
* | | | | 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
* | | | | workaround for GetObject windows.h macro and rapidjson conflictxiphon2020-03-141-1/+1
|/ / / /
* | | | Merge pull request #6273Alexander Blair2020-03-129-1004/+779
|\ \ \ \
| * | | | Various improvements to the ZMQ JSON-RPC handling:Lee Clagett2020-03-059-1004/+779
| |/ / /
* | | | 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 #6243Alexander Blair2020-03-125-79/+32
|\ \ \ \
| * | | | 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
| * | | | 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
| * | | | 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
|\ \ \ \ \
| * | | | | simplewallet: set manual refresh mode in rescan_bcmoneromooo-monero2019-12-071-0/+2
* | | | | | Merge pull request #6058Alexander Blair2020-02-282-2/+15
|\ \ \ \ \ \
| * | | | | | simplewallet: point to "set help" in the lock screen messagemoneromooo-monero2019-11-251-1/+1
| * | | | | | util: allow newlines in string to be splitmoneromooo-monero2019-11-251-1/+14
* | | | | | | Merge pull request #6259Alexander Blair2020-02-281-0/+1
|\ \ \ \ \ \ \