summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6894v0.17.1.0luigi11112020-10-131-0/+7
|\ | | | | | | e49ad98 fix next_seed_height regression in getblocktemplate rpc (xnbya)
| * fix next_seed_height regression in getblocktemplate rpcAlexis Enston2020-10-121-0/+7
| |
* | Merge pull request #6893luigi11112020-10-131-3/+11
|\ \ | | | | | | | | | 4cf3545 core_rpc_server: on_get_blocks - forward bootstrap daemon error (xiphon)
| * | core_rpc_server: on_get_blocks - forward bootstrap daemon errorxiphon2020-10-131-3/+11
| | |
* | | Merge pull request #6888luigi11112020-10-136-9/+10
|\ \ \ | | | | | | | | | | | | a2e37eb build: prepare v0.17.1.0 (selsta)
| * | | build: prepare v0.17.1.0selsta2020-10-136-9/+10
| | |/ | |/|
* | | Merge pull request #6887luigi11112020-10-132-2/+2
|\ \ \ | | | | | | | | | | | | 518a2cd Force CMAKE_SKIP_RPATH=ON (hyc)
| * | | Force CMAKE_SKIP_RPATH=ONHoward Chu2020-10-132-2/+2
| | | | | | | | | | | | | | | | Fix empty RPATH token issue. Only affects Linux and FreeBSD.
* | | | Merge pull request #6884luigi11112020-10-139-64/+78
|\ \ \ \ | | | | | | | | | | | | | | | 6352090 Dandelion++: skip desynced peers in stem phase (xiphon)
| * | | | Dandelion++: skip desynced peers in stem phasexiphon2020-10-129-64/+78
| | |_|/ | |/| |
* | | | Merge pull request #6883luigi11112020-10-131-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | c407b92 wallet2: fix missing m_state field in wallet serialization (moneromooo-monero)
| * | | | wallet2: fix missing m_state field in wallet serializationmoneromooo-monero2020-10-121-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #6880luigi11112020-10-131-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | 250c48a tx_pool: silence spammy harmless warning till we fix the bug (moneromooo-monero)
| * | | | tx_pool: silence spammy harmless warning till we fix the bugmoneromooo-monero2020-10-121-1/+4
| |/ / /
* | | | Merge pull request #6870luigi11112020-10-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | 826a844 cmake: Version - use CMAKE_CURRENT_LIST_DIR (xiphon)
| * | | | cmake: Version - use CMAKE_CURRENT_LIST_DIRxiphon2020-10-071-1/+1
| | |/ / | |/| |
* | | | Merge pull request #6869luigi11112020-10-131-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | b4c7756 cmake: CheckTrezor - use ${CMAKE_CURRENT_LIST_DIR} to locate tests (xiphon)
| * | | cmake: CheckTrezor - use ${CMAKE_CURRENT_LIST_DIR} to locate testsxiphon2020-10-061-2/+2
| |/ /
* | | Merge pull request #6868luigi11112020-10-121-12/+17
|\ \ \ | |_|/ |/| | | | | 4665906 Fix lgamma/signgam dependency (hyc)
| * | Fix lgamma/signgam dependencyHoward Chu2020-10-081-12/+17
|/ / | | | | | | | | This is a new indirect dependency due to the use of poisson_distribution, introduced in PR#6354 commit 67ade8005
* | Merge pull request #6845v0.17.0.1luigi11112020-09-251-0/+4
|\ \ | | | | | | | | | 0473abf link libzmq against libgssapi_krb5 if found (moneromooo-monero)
| * | link libzmq against libgssapi_krb5 if foundmoneromooo-monero2020-09-251-0/+4
| |/
* | Merge pull request #6843luigi11112020-09-256-9/+10
|\ \ | | | | | | | | | c02d24f build: prepare v0.17.0.1 (selsta)
| * | build: prepare v0.17.0.1selsta2020-09-256-9/+10
| |/
* | Merge pull request #6842luigi11112020-09-252-0/+8
|\ \ | | | | | | | | | 9e6187a fix a couple bugs found by OSS-fuzz (moneromooo-monero)
| * | fix a couple bugs found by OSS-fuzzmoneromooo-monero2020-09-242-0/+8
| |/ | | | | | | | | - index out of bounds when importing outputs - accessing invalid CLSAG data
* | Merge pull request #6835luigi11112020-09-251-1/+1
|\ \ | |/ |/| | | 4846743 daemon: Windows - fix FAT32 warning, trailing backslash is required (xiphon)
| * daemon: Windows - fix FAT32 warning, trailing backslash is requiredxiphon2020-09-201-1/+1
|/
* Merge pull request #6819v0.17.0.0luigi11112020-09-151-1/+1
|\ | | | | | | c3f354e simplewallet fix wrong persistent-rpc-client-id name in help (moneromooo-monero)
| * simplewallet fix wrong persistent-rpc-client-id name in helpmoneromooo-monero2020-09-141-1/+1
| |
* | Merge pull request #6816luigi11112020-09-151-2/+0
|\ \ | | | | | | | | | 929ea98 Remove unused macros from cryptonote_config.h (TheCharlatan)
| * | Remove unused macros from cryptonote_config.hTheCharlatan2020-09-141-2/+0
| | |
* | | Merge pull request #6793luigi11112020-09-151-1/+1
|\ \ \ | | | | | | | | | | | | de9a9fb update error message 'No unlocked balance in the specified account' (woodser)
| * | | update error message "No unlocked balance in the specified account"woodser2020-09-011-1/+1
| | | |
* | | | Merge pull request #6745luigi11112020-09-1513-51/+122
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 80e535c wallet2: adapt to deterministic unlock time (TheCharlatan) 4971219 blockchain: deterministic UNIX time unlock checks (moneromooo-monero)
| * | | | wallet2: adapt to deterministic unlock timeTheCharlatan2020-09-1510-23/+57
| | | | |
| * | | | blockchain: deterministic UNIX time unlock checksmoneromooo-monero2020-09-153-28/+65
|/ / / / | | | | | | | | | | | | Based on a patch by TheCharlatan <seb.kung@gmail.com>
* | | | Merge pull request #6815luigi11112020-09-142-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | ef4325f wallet2: fix tx sanity check triggering on pre-rct outputs (monermooo-monero)
| * | | | wallet2: fix tx sanity check triggering on pre-rct outputsmoneromooo-monero2020-09-122-4/+9
| | |_|/ | |/| |
* | | | Merge pull request #6813luigi11112020-09-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | a3844e2 Fix typo in command line argument description (reinaldoacosta)
| * | | | Fix typo in command line argument descriptionReinaldulin2020-09-091-1/+1
| | | | |
* | | | | Merge pull request #6812luigi11112020-09-1411-14/+17
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | f240b1d build: prepare v0.17 (selsta)
| * | | | build: prepare v0.17selsta2020-09-1411-14/+17
|/ / / /
* | | | Merge pull request #6805luigi11112020-09-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | fc2cb22 blockchain: fix pow skipping for old blocks without precalc hash (moneromooo-monero)
| * | | | blockchain: fix pow skipping for old blocks without precalc hashmoneromooo-monero2020-09-071-1/+1
| |/ / /
* | | | Merge pull request #6804luigi11112020-09-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | 5498142 rpc: assume randomx from v13 onwards (moneromooo-monero)
| * | | | rpc: assume randomx from v13 onwardsmoneromooo-monero2020-09-071-2/+2
| |/ / /
* | | | Merge pull request #6803luigi11112020-09-071-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | 1b9fe07 Revert 'unbound: update to get build fixes' (moneromooo-monero)
| * | | | Revert "unbound: update to get build fixes"moneromooo-monero2020-09-061-0/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts commit 541a7c81a1c9e6b261fc13e0b9e3829df46a0bdf. It breaks the depends build
* | | | Merge pull request #6800luigi11112020-09-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | 036da6d Let stagenet hardfork happen before mainnet. (normoes)