Commit Graph

6065 Commits

Author SHA1 Message Date
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
anonimal
e962216678
Build: remove in-tree miniupnpc
Will be replaced by a submodule.
2018-04-19 06:28:55 +00:00
stoffu
5ef4bf05c5
simplewallet: fix help message of sign_transfer 2018-04-19 09:41:01 +09:00
stoffu
e561a0c329
WalletManagerImpl: reuse existing connection to daemon instead of reconnectivng every time 2018-04-19 09:33:37 +09:00
stoffu
0299d36e76
daemon: read config file before reading any other args 2018-04-19 09:29:57 +09:00
stoffu
998c1461c3
daemon: read config file before reading any other args 2018-04-14 22:05:24 +09:00
moneromooo-monero
26dc764ab0
device: add a one off override keyword where appropriate 2018-04-14 11:00:12 +01:00
moneromooo-monero
f914df8494
device: add a one off override keyword where appropriate 2018-04-14 10:59:38 +01:00
moneromooo-monero
fe427170b9
simplewallet: add version command 2018-04-13 18:48:06 +01:00
moneromooo-monero
41b95ad40e
daemon: add a version command 2018-04-13 18:48:02 +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
moneromooo-monero
7d0505c85d
wallet2: increase rpc timeout for get_output_distribution 2018-04-13 10:55:41 +01:00
moneromooo-monero
96370488c0
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-13 10:55:38 +01:00
moneromooo-monero
9dc67af187
util: log stack trace on crash 2018-04-12 20:36:47 +01:00
moneromooo-monero
d8584fc8d7
util: log stack trace on crash 2018-04-12 20:36:16 +01:00
moneromooo-monero
bc4d53bece
rpc: add missing perf timer for get_output_distribution 2018-04-12 18:06:22 +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
41a66bf05b
Merge pull request #3619
3edef51d blockchain_blackball: fix build with CLANG 5 (moneromooo-monero)
2018-04-12 15:11:02 +02: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
3edef51d70
blockchain_blackball: fix build with CLANG 5
It doesn't like the explicit NULL dereference (which is fine, honest)
2018-04-12 14:04:31 +01: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
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
Riccardo Spagni
4a9794e033
Merge pull request #3550
58f66073 wallet2: request transactions in slices when scanning for known rings (moneromooo-monero)
2897c269 rpc: allow getting pruned blocks from gettransactions (moneromooo-monero)
2018-04-12 13:44:55 +02:00
Riccardo Spagni
a9e2993258
Merge pull request #3607
5eeeec39 wallet2: store subaddress lookahead settings (stoffu)
2018-04-12 13:31:51 +02:00
Riccardo Spagni
5b8afd43ac
Merge pull request #3610
178c11f4 tx_pool: fix loading with colliding key images (moneromooo-monero)
2018-04-12 13:27:46 +02:00
Riccardo Spagni
9ae9f6ada6
Merge pull request #3601
91a61fea common: make this build with unbound 1.4.20 (moneromooo-monero)
2018-04-12 13:26:48 +02:00
Riccardo Spagni
a4feeb4238
Merge pull request #3574
cdf9ecfd wallet2: fix misc issues when the ringdb can't be initialized (moneromooo-monero)
2018-04-12 13:24:28 +02:00
Riccardo Spagni
e89f33634d
Merge pull request #3556
d400b4d3 wallet2: move segregation height to v7 (moneromooo-monero)
2018-04-12 13:24:07 +02:00
Riccardo Spagni
dd527d9369
Merge pull request #3535
4c6ff21c wallet: warn if not using the default ring size (moneromooo-monero)
2018-04-12 13:22:09 +02:00
Riccardo Spagni
1e792c3e26
Merge pull request #3533
2012cbe9 simplewallet: warn about key reuse on startup (moneromooo-monero)
2018-04-12 13:21:51 +02:00
Riccardo Spagni
3c7d7bc324
Merge pull request #3531
eb59f7c5 cryptonote_tx_util: make destinations properly shuffled (stoffu)
2018-04-12 13:21:15 +02:00
Riccardo Spagni
51a4cc0fad
Merge pull request #3515
89250054 wallet: fix default mixin (4 -> 6) (sneurlax)
2018-04-12 13:06:56 +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
7bd9b62db6
Merge pull request #3591
8daba22f Use 'boost' mutex instead of 'std' mutex (cslashm)
d481410b Fix sub-address tx scan. (cslashm)
2018-04-12 11:29:56 +02:00