aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-06-16Merge pull request #3762luigi11111-2/+3
eb9f3a3 check_spend_proof (itssteven)
2018-06-16Merge pull request #3735luigi11111-1/+1
4812c06 add .load() to make Boost 1.67 happy with its new is_integral check (Teutone)
2018-06-16Merge pull request #3732luigi11111-1/+1
fa0839f Ensure m_timestamps has the correct number for computing difficulty. (thaerkh)
2018-06-16Merge pull request #3737luigi11112-3/+11
1590183 p2p: fix fallback seed node usage (moneromooo-monero)
2018-06-16Merge pull request #3726luigi11111-8/+11
b5cb1bc blockchain: avoid exception if asked for a block we do not have (moneromooo-monero)
2018-06-16Merge pull request #3725luigi11112-6/+6
9cc0d42 connection_context: remove state_ prefix from state names (moneromooo-monero) d9d002c daemon: print peer state in sync_info (moneromooo-monero)
2018-06-16Merge pull request #3708luigi11111-1/+1
a7ce392 Updating the FindReadline CMake hint to search in homebrew's default directory (gene-telligent)
2018-06-16Merge pull request #3652luigi11112-18/+18
b43b9a1 wallet-rpc: added IPs to error logging in simple_http_connection_handler (jcktm)
2018-06-16Merge pull request #3538luigi11111-2/+110
f4e3295 simplewallet: set_ring can now take a file with rings (moneromooo-monero)
2018-06-13wallet-rpc: added IPs to error logging in simple_http_connection_handlerjcktm2-18/+18
2018-06-12Merge pull request #3701luigi11111-0/+3
3ca267b cn_deserialize: dump additional tx pubkeys (moneromooo-monero)
2018-06-12Merge pull request #3700luigi11111-2/+26
efcecb4 mnemonics: add some logs to help debug failures (moneromooo-monero)
2018-06-12Merge pull request #3687luigi11111-3/+3
6b13976 blockchain: log in DEBUG when a block is found, and where (moneromooo-monero)
2018-06-12Merge pull request #3648luigi11111-8/+5
6f36cf0 Improve 'show_transfers' date formatting (ryan-ronnander)
2018-06-12Merge pull request #3643luigi11111-2/+18
e2b7558 handle improper log levels (cryptochangements34)
2018-06-09simplewallet: set_ring can now take a file with ringsmoneromooo-monero1-2/+110
2018-06-08Merge pull request #3340luigi11113-0/+75
284fe64 db_lmdb: warn about slowness when running off a spinning disk (moneromooo-monero)
2018-06-08db_lmdb: warn about slowness when running off a spinning diskmoneromooo-monero3-0/+75
2018-06-08Merge pull request #3908luigi11113-2/+2
827ca3f bump version for 0.12.2 point release (fluffypony) 95ccf50 update checkpoints.dat for point release (fluffypony)
2018-06-08Merge pull request #3604luigi11112-5/+2
54d9fff gtest: Fix compilation on MinGW with pthread /googletest#621 (stoffu)
2018-06-08Merge pull request #3599luigi11113-0/+17
8787fd8 WalletApi: publicMultisigSignerKey method (naughtyfox)
2018-06-08Merge pull request #3598luigi11115-0/+113
b21bc00 Wallet: added methods to sign and verify arbitrary message with multisig public signer's key (libwallet & wallet api) (naughtyfox)
2018-06-08Merge pull request #3887luigi11113-0/+19
14f0d38 Incorporate Window debug build targets (philkode)
2018-06-08Merge pull request #3450luigi11115-0/+21
3b941be core: add get_earliest_ideal_height_for_version() (stoffu)
2018-06-08Merge pull request #3444luigi11112-7/+138
a79fc21 hardfork: fix get_earliest_ideal_height_for_version() to support non-existent versions (stoffu) 7e30ead unit_tests/hardfork: add tests for check_for_height() (stoffu) 98cf62c hardfork: fix get_next_version() (stoffu) 0321d1a unit_tests/hardfork: add tests for get_voting_info() (stoffu)
2018-06-08Merge pull request #3428luigi11112-26/+148
b26cd26 blockchain_utilities: do not link against unneeded p2p lib (moneromooo-monero) 66f4700 blockchain_blackball: add incremental mode (moneromooo-monero) e09710f blockchain_blackball: also blackball N N-sized duplicate rings (moneromooo-monero)
2018-06-07Merge pull request #3910luigi11111-3/+3
f2cb56a protocol: drop (and increase fails) if most blocks hashes are invalid (moneromooo-monero)
2018-06-07Merge pull request #3892luigi11111-6/+7
d344736 rpc: convert distribution to cumulative after caching (moneromooo-monero)
2018-06-07Merge pull request #3940luigi11111-8/+12
f24cbc5 blockchain: fix deadlock with the difficulty cache (moneromooo-monero)
2018-06-07Merge pull request #3911luigi11111-1/+1
f0322a0 blockchain: demote a hash-of-hashes validation warning to debug (moneromooo-monero)
2018-06-07Merge pull request #3899luigi11111-0/+7
ab87e7f rpc: the cache is still for non cumulative on that branch (moneromooo-monero)
2018-06-07Merge pull request #3890luigi11111-1/+1
f80b157 wallet2: don't ask for pruned txes yet, we still parse the entire tx (moneromooo-monero)
2018-06-07Merge pull request #3857luigi111138-15175/+4
8a6c081 rapidjson: remove outdated in-tree, use submodule (anonimal)
2018-06-06blockchain: fix deadlock with the difficulty cachemoneromooo-monero1-8/+12
2018-06-03protocol: drop (and increase fails) if most blocks hashes are invalidmoneromooo-monero1-3/+3
2018-06-02blockchain: demote a hash-of-hashes validation warning to debugmoneromooo-monero1-1/+1
This data comes from untrusted peers, and validation failures are therefore normal.
2018-06-02update checkpoints.dat for point releaseRiccardo Spagni2-1/+1
2018-06-02bump version for 0.12.2 point releaseRiccardo Spagni1-1/+1
2018-06-01rpc: the cache is still for non cumulative on that branchmoneromooo-monero1-0/+7
2018-05-31Merge pull request #3866luigi11115-6/+105
6a58c88 console_handler: fix start_default_console use of prompt parameter (moneromooo-monero) 885a117 http_protocol_handler: speedup newline discarding (moneromooo-monero) 4d15864 abstract_tcp_server2: timeout on RPC connections (moneromooo-monero) dfd36bb http_protocol_handler: limit the number of starting newlines (moneromooo-monero)
2018-05-31Merge pull request #3640luigi11115-10/+36
f36132a wallet cli/rpc: terminate execution with code 0 when --help or --version is given (stoffu)
2018-05-31Merge pull request #3635luigi11113-0/+37
c1bda09 wallet_rpc_server: add a get_version RPC (moneromooo-monero)
2018-05-31Merge pull request #3592luigi11116-15/+196
90a16b1 crypto: fix initialization order issue with random mutex (moneromooo-monero) 6a61f52 unit_tests: add ringdb unit tests (moneromooo-monero)
2018-05-31Merge pull request #3583luigi11111-1/+1
372ffeb Add a space in mining to testnet/stagenet string (cryptochangements34)
2018-05-31Merge pull request #3561luigi11114-8/+25
353e9c0 Core RPC: optionally add POW hash to block_header_response (stoffu)
2018-05-31Merge pull request #3543luigi11111-3/+10
6fc97c9 blockchain_usage: don't divide by 0 when there is nothing to process (moneromooo-monero)
2018-05-31Merge pull request #3489luigi11117-256/+482
47fdb74 WalletApi: getMultisigInfo entry for gui wallets... (naughtyfox) 47fdb74 Refactored: work with wallet api statuses to make setting and getting operations atomic along with error strings (naughtyfox)
2018-05-31Merge pull request #3499luigi11112-6/+12
0da5d37 wallet: fix shared ring db path (stoffu)
2018-05-31Merge pull request #3882luigi11111-0/+7
b665bab rpc: fix get_output_distribution cache for the cumulative case (moneromooo-monero)
2018-05-31rpc: convert distribution to cumulative after cachingmoneromooo-monero1-6/+7
This avoids double conversion on a later cache hit
2018-05-31wallet2: don't ask for pruned txes yet, we still parse the entire txmoneromooo-monero1-1/+1
2018-05-31Incorporate Window debug build targetsphilkode3-0/+19
2018-05-31wallet: fix shared ring db pathstoffu2-6/+12
2018-05-30Merge pull request #3525luigi11111-0/+1
66a659b blockchain: add scope guard to waiter for threaded txv1 verification (stoffu)
2018-05-30Merge pull request #3522luigi11111-0/+52
52a4b70 Add key for Sarang Noether (SarangNoether)
2018-05-30Merge pull request #3504luigi11111-1/+1
a0a810c performance_tests: fix subaddress expansion test not expanding (moneromooo-monero)
2018-05-30Merge pull request #3491luigi11111-0/+11
c8cb5fc exit if specified wallet file doesn't exist (cryptochangements34)
2018-05-30Merge pull request #3442luigi11111-150/+150
8df202e Updates italian localizations. (hrumag)
2018-05-30Merge pull request #3433luigi11111-14/+26
b55c14c fix sha256sum check, which requires two spaces. added set -ex to catch this, and other, errors in the future. (cornfeedhobo)
2018-05-30Merge pull request #3876luigi11113-6/+9
740da1b core: fix automatic safe db sync mode switching (moneromooo-monero) e942d34 protocol: do not switch to unsafe sync mode for just a few blocks (moneromooo-monero)
2018-05-30Merge pull request #3731luigi11112-6/+15
a66f152 Use median timestamp if current time renders a block invalid. (thaerkh)
2018-05-30rpc: fix get_output_distribution cache for the cumulative casemoneromooo-monero1-0/+7
The distribution was not converted to cumulative after a cache hit
2018-05-30blockchain_blackball: also blackball N N-sized duplicate ringsmoneromooo-monero1-5/+48
These are unlikely to happen at random, but Wijaya et al made a paper about it, so people might try it on purpose now (and it turns out it's easy to add anyway)
2018-05-30blockchain_blackball: add incremental modemoneromooo-monero1-19/+102
2018-05-30blockchain_utilities: do not link against unneeded p2p libmoneromooo-monero1-4/+0
2018-05-30unit_tests/hardfork: add tests for get_voting_info()stoffu1-0/+49
2018-05-30hardfork: fix get_next_version()stoffu2-3/+32
2018-05-30unit_tests/hardfork: add tests for check_for_height()stoffu1-0/+24
2018-05-30hardfork: fix get_earliest_ideal_height_for_version() to support ↵stoffu2-4/+33
non-existent versions
2018-05-29Merge pull request #3251luigi111116-92/+461
b9389e5 db_lmdb: save pruned and prunable tx data separately (moneromooo-monero)
2018-05-29Merge pull request #3477luigi11112-25/+34
3f5fb6f simplewallet: add --untrusted-daemon option (moneromooo-monero)
2018-05-29Merge pull request #3470luigi11111-1/+1
ad19f86 don't show error twice when starting simplewallet (cryptochangements34)
2018-05-29Merge pull request #3446luigi11111-4/+0
a6b8d3f tx_pool: remove old comment from fill_block_template() (stoffu)
2018-05-29Merge pull request #3420luigi11112-3/+22
a6a54fa blockchain: cache difficulty for next block (moneromooo-monero)
2018-05-29Merge pull request #3405luigi11112-31/+41
80d2f80 wallet2: Update function parameter documentation (leonklingele)
2018-05-29Merge pull request #3847luigi11114-3/+3
49f4645 bump version for point release (fluffypony) 6715c90 update checkpoints for point release (fluffypony) 45975fd update checkpoints (fluffypony)
2018-05-28protocol: do not switch to unsafe sync mode for just a few blocksmoneromooo-monero1-1/+2
2018-05-28core: fix automatic safe db sync mode switchingmoneromooo-monero2-5/+7
2018-05-28tx_pool: remove old comment from fill_block_template()stoffu1-4/+0
2018-05-27http_protocol_handler: limit the number of starting newlinesmoneromooo-monero3-1/+12
2018-05-26abstract_tcp_server2: timeout on RPC connectionsmoneromooo-monero2-1/+68
2018-05-26http_protocol_handler: speedup newline discardingmoneromooo-monero1-2/+5
2018-05-26console_handler: fix start_default_console use of prompt parametermoneromooo-monero1-3/+21
It had not been updated to the function type change
2018-05-25rapidjson: remove outdated in-tree, use submoduleanonimal38-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
2018-05-23db_lmdb: save pruned and prunable tx data separatelymoneromooo-monero16-92/+461
This bumps DB version to 2, migration code will run for v1 DBs
2018-05-23update checkpointsRiccardo Spagni2-1/+1
2018-05-23update checkpoints for point releaseRiccardo Spagni1-1/+1
2018-05-23bump version for point releaseRiccardo Spagni1-1/+1
2018-05-21Merge pull request #3800Riccardo Spagni2-12/+12
9317bce9 crypto: more places needing fixing for GCC 8.1 (moneroexamples) 4a72d595 chacha: fix build with GCC 8.1 (moneromooo-monero)
2018-05-21Merge pull request #3842Riccardo Spagni1-1/+1
64f82e04 unit_tests: fix build after get_output_didstribution signature change (moneromooo-monero)
2018-05-21unit_tests: fix build after get_output_didstribution signature changemoneromooo-monero1-1/+1
2018-05-21Merge pull request #3787Riccardo Spagni1-0/+6
ce63ab09 blockchain: invalidate misc caches when popping blocks (moneromooo-monero)
2018-05-21Merge pull request #3782Riccardo Spagni2-6/+10
18cd6837 Fix mdb_load append option (hyc) 97050326 ITS#8831 move flag init into readhdr (hyc)
2018-05-21Merge pull request #3832Riccardo Spagni3-11/+13
cb9c7972 Fix output shuffling for multisig (stoffu)
2018-05-21Merge pull request #3837Riccardo Spagni1-1/+1
18761b37 simplewallet: use correct unit for fee command (stoffu)
2018-05-21Merge pull request #3745Riccardo Spagni2-3/+4
b13bddc3 Wallet API: allow log path to be non-default & console output to be configurable (stoffu)
2018-05-21Merge pull request #3814Riccardo Spagni10-23/+183
5f8ffca3 speed up get_output_distribution (and precalc common case) (moneromooo-monero)
2018-05-21speed up get_output_distribution (and precalc common case)moneromooo-monero10-23/+183
2018-05-21Merge pull request #3830Riccardo Spagni1-0/+1
29fbaeaa daemon: request unpruned transactions for print_tx (moneromooo-monero)
2018-05-21Merge pull request #3765Riccardo Spagni1-0/+4
b6a76f76 Update readme to include link to announcement list (Gingeropolous)
2018-05-21Merge pull request #3749Riccardo Spagni1-0/+47
872cb4ef blockchain: pop top if block version disagrees with the ideal fork version (stoffu)
2018-05-21Merge pull request #3809Riccardo Spagni2-8/+5
b88c9a00 unit_tests: set default data dir to the source tree at build time (moneromooo-monero)
2018-05-21Merge pull request #3807Riccardo Spagni1-1/+1
a5c98609 version.cmake: fix configuring version.cpp without git (moneromooo-monero)
2018-05-21Merge pull request #3841Riccardo Spagni1-1/+1
ff31611a Revert "Merge pull request #3775" (Riccardo Spagni)
2018-05-21Revert "Merge pull request #3775"Riccardo Spagni1-1/+1
This reverts commit 20ef37bbcac7715d5299dd77d401583420e07ced, reversing changes made to 40070a661fd2ff503e07f4ed48dfe9fe67cfa297.
2018-05-20simplewallet: use correct unit for fee commandstoffu1-1/+1
2018-05-20Fix output shuffling for multisigstoffu3-11/+13
2018-05-19daemon: request unpruned transactions for print_txmoneromooo-monero1-0/+1
instead of uninitialized
2018-05-15unit_tests: set default data dir to the source tree at build timemoneromooo-monero2-8/+5
2018-05-15version.cmake: fix configuring version.cpp without gitmoneromooo-monero1-1/+1
2018-05-13Use median timestamp if current time renders a block invalid.Thaer Khawaja2-6/+15
2018-05-13crypto: more places needing fixing for GCC 8.1moneroexamples1-10/+10
2018-05-13chacha: fix build with GCC 8.1moneromooo-monero1-2/+2
2018-05-10Merge pull request #3794Riccardo Spagni1-2/+2
a58d9738 wallet2: consider 6 outputs or less to be unmixable from v7 (moneromooo-monero)
2018-05-10wallet2: consider 6 outputs or less to be unmixable from v7moneromooo-monero1-2/+2
2018-05-09blockchain: avoid exception if asked for a block we do not havemoneromooo-monero1-8/+11
This can happen if a peer tries to obtain the next span from other peers if that span is needed for not downloaded yet. Also if the peer maliciously requests a non existent block hash.
2018-05-09blockchain: invalidate misc caches when popping blocksmoneromooo-monero1-0/+6
Might be a bit heavy handed, but conservative.
2018-05-08Merge pull request #3775Riccardo Spagni2-33/+37
6f859e43 cryptonote: make sure outPk setup always happens (moneromooo-monero)
2018-05-08Fix mdb_load append optionhyc2-5/+9
Use MDB_CURRENT to avoid seeking to new key when appending DUPs. Reinit cursor on new batch, if appending DUPs.
2018-05-08ITS#8831 move flag init into readhdrhyc1-1/+1
Avoid stomping on flags from 1st readhdr invocation
2018-05-07Updating the FindReadline CMake hint to search in homebrew's default directoryGene Peters1-1/+1
2018-05-07cryptonote: make sure outPk setup always happensmoneromooo-monero2-33/+37
2018-05-06Update readme to include link to announcement listGingeropolous1-0/+4
Added link to readme for https://lists.getmonero.org
2018-05-06check_spend_proofitssteven1-2/+3
My intention is to mitigate #3761 by returning "bad signature", rather than throwing an error, as the error is triggered inappropriately in the case of checking a different txid than the one used to create the signature, which causes issues for monerophp: https://github.com/monero-integrations/monerophp/issues/72 & my temp fix: https://github.com/monero-integrations/monerophp/pull/74
2018-05-06blockchain: pop top if block version disagrees with the ideal fork versionstoffu1-0/+47
2018-05-05add .load() to make Boost 1.67 happy with its new is_integral checkTeutone1-1/+1
2018-05-05Merge pull request #3752Riccardo Spagni1-4/+6
5f193847 ringct: do not show verification errors with default settings (moneromooo-monero)
2018-05-04ringct: do not show verification errors with default settingsmoneromooo-monero1-4/+6
2018-05-04Wallet API: allow log path to be non-default & console output to be configurablestoffu2-3/+4
2018-04-29Ensure m_timestamps has the correct number for computing difficulty.Thaer Khawaja1-1/+1
2018-04-29Merge pull request #3719Riccardo Spagni1-8/+11
3880bf39 cryptonote_protocol_handler.inl: remove span read just now that failed to pass some basic tests (stoffu) da249fd5 cryptonote_protocol_handler.inl: fix return type mismatches (int vs bool) (stoffu)
2018-04-29Merge pull request #3729Riccardo Spagni1-0/+2
e3c68b90 README.md: mention building deps with -fPIC for static builds (moneromooo-monero)
2018-04-29README.md: mention building deps with -fPIC for static buildsmoneromooo-monero1-0/+2
2018-04-29p2p: fix fallback seed node usagemoneromooo-monero2-3/+11
Those were added to the seed nodes list even when they had already been added. Moreover, the current index was not reset after they were added, typically causing previous seeds to be used, and some of those fallback seeds to not be tried.
2018-04-28Merge pull request #3720Riccardo Spagni1-1/+1
c1886155 unit_tests: fix build after get_output_didstribution signature change (moneromooo-monero)
2018-04-28daemon: print peer state in sync_infomoneromooo-monero1-1/+1
It's often relevant
2018-04-28connection_context: remove "state_" prefix from state namesmoneromooo-monero1-5/+5
It's redundant and makes it easier to print them in columns
2018-04-28unit_tests: fix build after get_output_didstribution signature changemoneromooo-monero1-1/+1
2018-04-28Merge pull request #3709Riccardo Spagni1-0/+1
82b05d50 Adding required library (dependency of boost::this_thread::sleep_for) (Gene Peters)
2018-04-28Merge pull request #3705Riccardo Spagni4-15/+9
f9d0827b Fix broken interactive daemon 'limit' commands plus RPC calls (rbrunner7)
2018-04-28Merge pull request #3667Riccardo Spagni2-2/+4
53a1962d epee: Drop deprecated Boost.Thread header (Jan Beich)
2018-04-28Merge pull request #3703Riccardo Spagni1-1/+6
18c2f6e2 mlog: fix setting no logs (moneromooo-monero)
2018-04-28Merge pull request #3695Riccardo Spagni1-1/+1
b1a9e97b slow-hash: fix memory leak for Windows /karbowanec#41 (aivve)
2018-04-28Merge pull request #3692Riccardo Spagni1-1/+1
7346a59c Build: update miniupnp submodule (anonimal)
2018-04-28Merge pull request #3683Riccardo Spagni5-1/+15
dad10775 Only log an error if fork version is higher AND is not known. (Thaer Khawaja)
2018-04-28Merge pull request #3685Riccardo Spagni7-10/+19
ffeeefde speedup get_output_histogram for all amounts when min_count > 0 (moneromooo-monero) 2dae0f20 wallet2: add missing parameters to get_output_histogram (moneromooo-monero)
2018-04-28Merge pull request #3650Riccardo Spagni1-1/+6
5bd7f760 import_multisig_info: fix sanity check crash in detach_blockchain (Mikhail Mitkevichl)
2018-04-28cryptonote_protocol_handler.inl: remove span read just now that failed to ↵stoffu1-0/+3
pass some basic tests
2018-04-28cryptonote_protocol_handler.inl: fix return type mismatches (int vs bool)stoffu1-8/+8
2018-04-25Adding required library (dependency of boost::this_thread::sleep_for)Gene Peters1-0/+1
2018-04-25mlog: fix setting no logsmoneromooo-monero1-1/+6
2018-04-25Fix broken interactive daemon 'limit' commands plus RPC callsrbrunner74-15/+9
2018-04-25Wallet: added methods to sign and verify arbitrary message with multisig ↵naughtyfox5-0/+113
public signer's key (libwallet & wallet api)
2018-04-25cn_deserialize: dump additional tx pubkeysmoneromooo-monero1-0/+3
2018-04-25mnemonics: add some logs to help debug failuresmoneromooo-monero1-2/+26
2018-04-24slow-hash: fix memory leak for Windows /karbowanec#41aivve1-1/+1
2018-04-23Build: update miniupnp submoduleanonimal1-1/+1
f21df05 was never supposed to be merged into the master branch. fluffypony merged #3670 before #3668 was rebased and resolved. Note: the cherry-picked commit hashes are now invalid because #3670 was merged before #3668 was rebased with the updated repo location.
2018-04-23blockchain: log in DEBUG when a block is found, and wheremoneromooo-monero1-3/+3
Eases up debugging
2018-04-23speedup get_output_histogram for all amounts when min_count > 0moneromooo-monero6-10/+16
This skips the vast majority of "dust" output amounts with just one instance on the chain. Clocks in at 0.15% of the original time on testnet.
2018-04-23wallet2: add missing parameters to get_output_histogrammoneromooo-monero1-0/+3
2018-04-22Only log an error if fork version is higher AND is not known.Thaer Khawaja5-1/+15
2018-04-22wallet cli/rpc: terminate execution with code 0 when --help or --version is ↵stoffu5-10/+36
given
2018-04-21import_multisig_info: fix sanity check crash in detach_blockchainMikhail Mitkevichl1-1/+6
2018-04-21Merge pull request #3670Riccardo Spagni98-12626/+17
19e01378 Build: remove UPnP definition from snap (anonimal) 6b853980 Build: update CMake and p2p for in-tree miniupnp (anonimal) 859db52f CMake: update new location of in-tree miniupnpc (anonimal) f21df05c Build: add miniupnp submodule (anonimal) 10685648 Build: remove in-tree miniupnpc (anonimal)
2018-04-21Merge pull request #3579Riccardo Spagni1-2/+2
0b88fff3 simplewallet: fix help message of sign_transfer (stoffu)
2018-04-21Merge pull request #3576Riccardo Spagni3-39/+35
f82c10dc WalletManagerImpl: reuse existing connection to daemon instead of reconnectivng every time (stoffu)
2018-04-21Merge pull request #3636Riccardo Spagni1-23/+22
998c1461 daemon: read config file before reading any other args (stoffu)
2018-04-21Merge pull request #3633Riccardo Spagni2-2/+2
f914df84 device: add a one off override keyword where appropriate (moneromooo-monero)
2018-04-21Merge pull request #3630Riccardo Spagni5-0/+26
51b511be simplewallet: add version command (moneromooo-monero) 35d1269f daemon: add a version command (moneromooo-monero)
2018-04-21Merge pull request #3624Riccardo Spagni1-0/+39
d8584fc8 util: log stack trace on crash (moneromooo-monero)
2018-04-21Merge pull request #3672Riccardo Spagni3-1/+39
875c1cab wallet2: increase rpc timeout for get_output_distribution (moneromooo-monero) 70f23217 add top height to get_output_distribution, and cache it for rct (moneromooo-monero) 8c7363fb rpc: add missing perf timer for get_output_distribution (moneromooo-monero)
2018-04-21Build: remove UPnP definition from snapanonimal1-1/+0
(cherry picked from commit 5ef6dcb1c4b08497533a20d0addcf1b09db51166)
2018-04-21Build: update CMake and p2p for in-tree miniupnpanonimal3-49/+13
(cherry picked from commit a7366b5feeffaeb65b217b2d6f138e0ab1c90192)
2018-04-19wallet2: increase rpc timeout for get_output_distributionmoneromooo-monero1-1/+1
2018-04-19add top height to get_output_distribution, and cache it for rctmoneromooo-monero3-0/+37
This should cache the vast majority of calls for long running wallets
2018-04-19rpc: add missing perf timer for get_output_distributionmoneromooo-monero1-0/+1
2018-04-19CMake: update new location of in-tree miniupnpcanonimal2-5/+5
(cherry picked from commit b16a282f97d8f6c967e8a0b1ecfd75110f095182)
2018-04-19Build: add miniupnp submoduleanonimal2-0/+4
Though we only need miniupnpc, rebasing and maintaining a miniupnpc-only repo is unrealistic. (cherry picked from commit 3c40eb768c292a4dec79d7dffd6685fd37940a2a)
2018-04-19Build: remove in-tree miniupnpcanonimal92-12576/+0
Will be replaced by a submodule. (cherry picked from commit e962216678e699a8fc7eb271a8a515f5ca65f7cb)
2018-04-19epee: Drop deprecated Boost.Thread headerJan Beich2-2/+4
In file included from src/cryptonote_basic/hardfork.cpp:33: In file included from src/blockchain_db/blockchain_db.h:42: In file included from src/cryptonote_basic/hardfork.h:31: contrib/epee/include/syncobj.h:37:10: fatal error: 'boost/thread/v2/thread.hpp' file not found #include <boost/thread/v2/thread.hpp> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from src/rpc/daemon_handler.cpp:29: In file included from src/rpc/daemon_handler.h:36: In file included from src/p2p/net_node.h:41: In file included from contrib/epee/include/net/levin_server_cp2.h:32: In file included from contrib/epee/include/net/abstract_tcp_server2.h:324: contrib/epee/include/net/abstract_tcp_server2.inl:44:10: fatal error: 'boost/thread/v2/thread.hpp' file not found #include <boost/thread/v2/thread.hpp> // TODO ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ contrib/epee/include/math_helper.h: In member function 'bool epee::math_helper::average<val, default_base>::set_base()': contrib/epee/include/syncobj.h:227:56: error: 'sleep_for' is not a member of 'boost::this_thread' #define CRITICAL_REGION_LOCAL(x) {boost::this_thread::sleep_for(boost::chrono::milliseconds(epee::debug::g_test_dbg_lock_sleep()));} epee::critical_region_t<decltype(x)> critical_region_var(x) ^ contrib/epee/include/syncobj.h:227:56: note: in definition of macro 'CRITICAL_REGION_LOCAL' #define CRITICAL_REGION_LOCAL(x) {boost::this_thread::sleep_for(boost::chrono::milliseconds(epee::debug::g_test_dbg_lock_sleep()));} epee::critical_region_t<decltype(x)> critical_region_var(x) ^~~~~~~~~ contrib/epee/include/syncobj.h:227:56: note: suggested alternative: 'sleep' #define CRITICAL_REGION_LOCAL(x) {boost::this_thread::sleep_for(boost::chrono::milliseconds(epee::debug::g_test_dbg_lock_sleep()));} epee::critical_region_t<decltype(x)> critical_region_var(x) ^ contrib/epee/include/syncobj.h:227:56: note: in definition of macro 'CRITICAL_REGION_LOCAL' #define CRITICAL_REGION_LOCAL(x) {boost::this_thread::sleep_for(boost::chrono::milliseconds(epee::debug::g_test_dbg_lock_sleep()));} epee::critical_region_t<decltype(x)> critical_region_var(x) ^~~~~~~~~
2018-04-15Improve 'show_transfers' date formattingRyan Ronnander1-8/+5
Change the wallet's 'show_transfers' command to always output the transaction date with timestamp (24 hour UTC).
2018-04-15handle improper log levelscryptochangements341-2/+18
2018-04-14daemon: read config file before reading any other argsstoffu1-23/+22
2018-04-14wallet_rpc_server: add a get_version RPCmoneromooo-monero3-0/+37
2018-04-14device: add a one off override keyword where appropriatemoneromooo-monero2-2/+2
2018-04-13simplewallet: add version commandmoneromooo-monero2-0/+12
2018-04-13daemon: add a version commandmoneromooo-monero3-0/+14
2018-04-13WalletApi: publicMultisigSignerKey methodnaughtyfox3-0/+17
2018-04-12util: log stack trace on crashmoneromooo-monero1-0/+39
2018-04-12Merge pull request #3606Riccardo Spagni1-0/+12
b5d6c723 wallet2: store subaddress lookahead settings (stoffu)
2018-04-12wallet2: store subaddress lookahead settingsstoffu1-0/+12
2018-04-12Merge pull request #3618Riccardo Spagni1-1/+2
3367ed86 blockchain_blackball: fix build with CLANG 5 (moneromooo-monero)
2018-04-12blockchain_blackball: fix build with CLANG 5moneromooo-monero1-1/+2
It doesn't like the explicit NULL dereference (which is fine, honest)
2018-04-12Merge pull request #3616Riccardo Spagni6-7/+37
94b899db Use 'boost' mutex instead of 'std' mutex (cslashm) 2c274e05 Fix sub-address tx scan. (cslashm)
2018-04-12Use 'boost' mutex instead of 'std' mutexcslashm1-4/+4
2018-04-12Fix sub-address tx scan.cslashm6-3/+33
When additional keys was needed, the TX scan failed because the derivation data was always recomputed with the main tx_key and not the corresponding additional one. Moreover this patch avoid perf decreasing when not using HW device.
2018-04-12Merge pull request #3549Riccardo Spagni3-29/+58
73951cbd wallet2: request transactions in slices when scanning for known rings (moneromooo-monero) 25fe67e4 rpc: allow getting pruned blocks from gettransactions (moneromooo-monero)
2018-04-12Merge pull request #3609Riccardo Spagni1-17/+26
08343aba tx_pool: fix loading with colliding key images (moneromooo-monero)
2018-04-12Merge pull request #3602Riccardo Spagni2-2/+5
a9cc88ee common: make this build with unbound 1.4.20 (moneromooo-monero)
2018-04-12Merge pull request #3615Riccardo Spagni1-9/+9
24acb66e wallet2: fix misc issues when the ringdb can't be initialized (moneromooo-monero)