Commit Graph

6936 Commits

Author SHA1 Message Date
anonimal 6b85398031
Build: update CMake and p2p for in-tree miniupnp
(cherry picked from commit a7366b5feeffaeb65b217b2d6f138e0ab1c90192)
2018-04-21 09:43:23 +00:00
moneromooo-monero 875c1cabb9
wallet2: increase rpc timeout for get_output_distribution 2018-04-19 16:06:26 +01:00
moneromooo-monero 70f2321763
add top height to get_output_distribution, and cache it for rct
This should cache the vast majority of calls for long running wallets
2018-04-19 16:06:22 +01:00
moneromooo-monero 8c7363fbef
rpc: add missing perf timer for get_output_distribution 2018-04-19 16:06:20 +01:00
anonimal 859db52fda
CMake: update new location of in-tree miniupnpc
(cherry picked from commit b16a282f97d8f6c967e8a0b1ecfd75110f095182)
2018-04-19 10:56:09 +00:00
anonimal f21df05c77
Build: add miniupnp submodule
Though we only need miniupnpc, rebasing and maintaining a miniupnpc-only
repo is unrealistic.

(cherry picked from commit 3c40eb768c292a4dec79d7dffd6685fd37940a2a)
2018-04-19 10:55:56 +00:00
anonimal 1068564867
Build: remove in-tree miniupnpc
Will be replaced by a submodule.

(cherry picked from commit e962216678)
2018-04-19 10:55:29 +00:00
Jan Beich 53a1962da1 epee: Drop deprecated Boost.Thread header
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-19 09:15:09 +00:00
Ryan Ronnander 6f36cf02e7
Improve 'show_transfers' date formatting
Change the wallet's 'show_transfers' command to always output the transaction date with timestamp (24 hour UTC).
2018-04-15 19:23:15 -07:00
cryptochangements34 e2b75586fb handle improper log levels 2018-04-15 11:33:22 -04:00
stoffu 998c1461c3
daemon: read config file before reading any other args 2018-04-14 22:05:24 +09:00
moneromooo-monero c1bda097c1
wallet_rpc_server: add a get_version RPC 2018-04-14 13:34:05 +01:00
moneromooo-monero f914df8494
device: add a one off override keyword where appropriate 2018-04-14 10:59:38 +01:00
moneromooo-monero 51b511be4c
simplewallet: add version command 2018-04-13 18:47:33 +01:00
moneromooo-monero 35d1269fac
daemon: add a version command 2018-04-13 18:47:30 +01:00
naughtyfox 8787fd899b WalletApi: publicMultisigSignerKey method 2018-04-13 13:15:20 +03:00
moneromooo-monero d8584fc8d7
util: log stack trace on crash 2018-04-12 20:36:16 +01:00
Riccardo Spagni 6f6521ad7a
Merge pull request #3606
b5d6c723 wallet2: store subaddress lookahead settings (stoffu)
2018-04-12 15:27:49 +02:00
stoffu b5d6c723e9
wallet2: store subaddress lookahead settings 2018-04-12 22:23:53 +09:00
Riccardo Spagni 1f96755ddc
Merge pull request #3618
3367ed86 blockchain_blackball: fix build with CLANG 5 (moneromooo-monero)
2018-04-12 15:10:21 +02:00
moneromooo-monero 3367ed863c
blockchain_blackball: fix build with CLANG 5
It doesn't like the explicit NULL dereference (which is fine, honest)
2018-04-12 13:51:26 +01:00
moneromooo-monero 4c00a4d31e
unit_tests: add device unit tests
Annoyingly, its locking semantics are borked since it does not
do any locking
2018-04-12 13:49:05 +01:00
Riccardo Spagni 079dd5dfef
Merge pull request #3616
94b899db Use 'boost' mutex instead of 'std' mutex (cslashm)
2c274e05 Fix sub-address tx scan. (cslashm)
2018-04-12 14:41:51 +02:00
cslashm 94b899db26 Use 'boost' mutex instead of 'std' mutex 2018-04-12 13:58:57 +02:00
cslashm 2c274e05fe Fix sub-address tx scan.
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-12 13:58:57 +02:00
Riccardo Spagni 5e08fd89ea
Merge pull request #3549
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-12 13:49:33 +02:00
Riccardo Spagni a95461e76d
Merge pull request #3609
08343aba tx_pool: fix loading with colliding key images (moneromooo-monero)
2018-04-12 13:48:44 +02:00
Riccardo Spagni 1e9cc3e43e
Merge pull request #3602
a9cc88ee common: make this build with unbound 1.4.20 (moneromooo-monero)
2018-04-12 13:48:12 +02:00
Riccardo Spagni 14c870ee5f
Merge pull request #3615
24acb66e wallet2: fix misc issues when the ringdb can't be initialized (moneromooo-monero)
2018-04-12 13:47:54 +02:00
Riccardo Spagni 3b8704b0fa
Merge pull request #3555
0b26c4d5 wallet2: move segregation height to v7 (moneromooo-monero)
2018-04-12 13:47:39 +02:00
Riccardo Spagni 5d8439e310
Merge pull request #3534
eecfb57d wallet: warn if not using the default ring size (moneromooo-monero)
2018-04-12 13:47:20 +02:00
Riccardo Spagni f6094bb225
Merge pull request #3532
aa5c2e01 simplewallet: warn about key reuse on startup (moneromooo-monero)
2018-04-12 13:46:50 +02:00
Riccardo Spagni 226de8e928
Merge pull request #3530
eb59f7c5 cryptonote_tx_util: make destinations properly shuffled (stoffu)
2018-04-12 13:46:34 +02:00
Riccardo Spagni 8703f1d80e
Merge pull request #3516
1e0958c0 wallet: fix default mixin (4 -> 6) (sneurlax)
2018-04-12 13:46:18 +02:00
moneromooo-monero 24acb66eac
wallet2: fix misc issues when the ringdb can't be initialized 2018-04-12 11:07:07 +01:00
Riccardo Spagni 3a9290ba6f
Merge pull request #3511
0beb94f3 device: fix endianess dependence on subaddress secret key generation (moneromooo-monero)
2018-04-12 11:15:27 +02:00
Riccardo Spagni 5053f8f40b
Merge pull request #3502
11c933e1 fix lambda compile error on openbsd (moneromooo-monero)
2018-04-12 11:14:43 +02:00
Riccardo Spagni 96b2fee721
Merge pull request #3536
c77d2bfa Add the possibility to export private view key for fast scan. (cslashm)
100b7bc1 Change mutex lock model to avoid dead lock and ensure locks are always released. (cslashm)
641dfc99 Automatic height setup when creating/restoring hw device. (cslashm)
2018-04-12 11:12:33 +02:00
Riccardo Spagni 60b18cdd1f
Merge pull request #3492
dac3895a update block hashes for checkpoints.dat (Riccardo Spagni)
2018-04-12 11:07:16 +02:00
Riccardo Spagni 93047ce762
Merge pull request #3485
1834127c rpc: make get_output_distribution a non-restricted RPC (moneromooo-monero)
2018-04-12 11:06:26 +02:00
Riccardo Spagni 1b4dc46129
Merge pull request #3473
eaa8bfe7 wallet2: set from_height of GET_OUTPUT_DISTRIBUTION correctly The previous expression (stoffu)
0a619f78 wallet2: enable the mitigation only after the fork height (stoffu)
2018-04-12 11:05:31 +02:00
Riccardo Spagni 3d6636e79c
Merge pull request #3471
5f664793 p2p: correct port number for seed nodes (stoffu)
2018-04-12 11:02:46 +02:00
Riccardo Spagni ebb55f797b
Merge pull request #3468
0098ed33 wallet2: fix for loading settings of key reuse mitigation (stoffu)
2018-04-12 11:00:47 +02:00
Riccardo Spagni 8902ddb91a
Merge pull request #3466
1d79c14d Revert bb19386b (Howard Chu)
522be96f Fix generating version.cpp (Howard Chu)
2018-04-12 11:00:14 +02:00
Riccardo Spagni 628946c1f8
Merge pull request #3464
e520cc06 change wording in hard fork description section (Gingeropolous)
2018-04-12 10:59:44 +02:00
Riccardo Spagni 959f6ed9a5
Merge pull request #3461
57300491 wallet: catch exceptions dealing with ringdb and warn (moneromooo-monero)
2018-04-12 10:57:50 +02:00
moneromooo-monero 08343abaf4
tx_pool: fix loading with colliding key images
A key image may be present more than once if all but one of the
txes spending that key image are coming from blocks. When loading
a txpool from storage, we must load the one that's not from a
block first to avoid rejection
2018-04-11 15:27:56 +01:00
moneromooo-monero 6a61f520e2
unit_tests: add ringdb unit tests 2018-04-11 11:43:39 +01:00
stoffu 54d9fffa10
gtest: Fix compilation on MinGW with pthread /googletest#621 2018-04-11 11:35:45 +09:00
moneromooo-monero a9cc88ee76
common: make this build with unbound 1.4.20
Common on currently used distros
2018-04-10 23:46:18 +01:00