Commit Graph

6089 Commits

Author SHA1 Message Date
Riccardo Spagni e8e2bd5212 Merge pull request #3751
2ade8dfb ringct: do not show verification errors with default settings (moneromooo-monero)
2018-05-05 09:09:54 +02:00
moneromooo-monero 2ade8dfb02 ringct: do not show verification errors with default settings 2018-05-04 08:27:41 +01:00
moneromooo-monero 2e336347ec unit_tests: fix build after get_output_distribution signature change 2018-05-01 15:01:15 +01:00
Riccardo Spagni 6b9d9f56a1 Merge pull request #3719
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-29 21:38:22 +02:00
Riccardo Spagni 88c78d1683 Merge pull request #3729
e3c68b90 README.md: mention building deps with -fPIC for static builds (moneromooo-monero)
2018-04-29 21:38:12 +02:00
Riccardo Spagni af6febaa83 Merge pull request #3730
bb8c0f62 README.md: mention building deps with -fPIC for static builds (moneromooo-monero)
2018-04-29 21:37:18 +02:00
Riccardo Spagni 715754d7fd Merge pull request #3723
16b20229 cryptonote_protocol_handler.inl: remove span read just now that failed to pass some basic tests (stoffu)
409bf2d6 cryptonote_protocol_handler.inl: fix return type mismatches (int vs bool) (stoffu)
2018-04-29 21:35:49 +02:00
moneromooo-monero bb8c0f62be README.md: mention building deps with -fPIC for static builds 2018-04-29 20:09:15 +01:00
moneromooo-monero e3c68b9018 README.md: mention building deps with -fPIC for static builds 2018-04-29 20:06:19 +01:00
stoffu 16b2022991 cryptonote_protocol_handler.inl: remove span read just now that failed to pass some basic tests 2018-04-29 08:00:41 +09:00
stoffu 409bf2d642 cryptonote_protocol_handler.inl: fix return type mismatches (int vs bool) 2018-04-29 08:00:17 +09:00
Riccardo Spagni 333c7edeb9 Merge pull request #3711
c0e22ebc [RELEASE] Fix broken interactive daemon 'limit' commands plus RPC calls (rbrunner7)
2018-04-28 22:42:09 +02:00
Riccardo Spagni 78011db913 Merge pull request #3712
4b89d877 Adding required library (dependency of boost::this_thread::sleep_for) (Gene Peters)
2018-04-28 22:41:35 +02:00
Riccardo Spagni ec439a9376 Merge pull request #3707
76817605 epee: Drop deprecated Boost.Thread header (Jan Beich)
2018-04-28 22:40:59 +02:00
Riccardo Spagni 6d8498be1f Merge pull request #3704
e2b72da4 mlog: fix setting no logs (moneromooo-monero)
2018-04-28 22:40:28 +02:00
Riccardo Spagni b085e11b52 Merge pull request #3696
b1a9e97b slow-hash: fix memory leak for Windows /karbowanec#41 (aivve)
2018-04-28 22:39:37 +02:00
Riccardo Spagni 123c0d7d4c Merge pull request #3690
80dc5d21 Only log an error if fork version is higher AND is not known. (Thaer Khawaja)
2018-04-28 22:39:09 +02:00
Riccardo Spagni a48658017b Merge pull request #3686
d003f07c speedup get_output_histogram for all amounts when min_count > 0 (moneromooo-monero)
df9d59ca wallet2: add missing parameters to get_output_histogram (moneromooo-monero)
2018-04-28 22:38:43 +02:00
Riccardo Spagni 8636599654 Merge pull request #3684
9670c917 import_multisig_info: fix sanity check crash in detach_blockchain (Mikhail Mitkevichl)
2018-04-28 22:38:15 +02:00
Riccardo Spagni 31b31effc2 Merge pull request #3668
c6774215 Build: remove UPnP definition from snap (anonimal)
1e20d705 Build: update CMake and p2p for in-tree miniupnp (anonimal)
9e1f8bfa CMake: update new location of in-tree miniupnpc (anonimal)
c7b66d3d Build: add miniupnp submodule (anonimal)
e9622166 Build: remove in-tree miniupnpc (anonimal)
2018-04-28 22:27:24 +02:00
Riccardo Spagni 57a1bcb6b9 Merge pull request #3666
5ef4bf05 simplewallet: fix help message of sign_transfer (stoffu)
2018-04-28 22:26:26 +02:00
Riccardo Spagni fde2a31964 Merge pull request #3665
e561a0c3 WalletManagerImpl: reuse existing connection to daemon instead of reconnectivng every time (stoffu)
2018-04-28 22:26:02 +02:00
Riccardo Spagni 2b16afedf9 Merge pull request #3664
0299d36e daemon: read config file before reading any other args (stoffu)
2018-04-28 22:25:35 +02:00
Riccardo Spagni 3384b0f0f4 Merge pull request #3634
26dc764a device: add a one off override keyword where appropriate (moneromooo-monero)
2018-04-28 22:25:10 +02:00
Riccardo Spagni 44b3c9bd55 Merge pull request #3631
fe427170 simplewallet: add version command (moneromooo-monero)
41b95ad4 daemon: add a version command (moneromooo-monero)
2018-04-28 22:24:28 +02:00
Riccardo Spagni f09edc9fad Merge pull request #3625
9dc67af1 util: log stack trace on crash (moneromooo-monero)
2018-04-28 22:24:12 +02:00
Riccardo Spagni 6fec5f9fdc Merge pull request #3584
7d0505c8 wallet2: increase rpc timeout for get_output_distribution (moneromooo-monero)
96370488 add top height to get_output_distribution, and cache it for rct (moneromooo-monero)
bc4d53be rpc: add missing perf timer for get_output_distribution (moneromooo-monero)
2018-04-28 22:23:42 +02:00
Riccardo Spagni 07e55b0496 Merge pull request #3720
c1886155 unit_tests: fix build after get_output_didstribution signature change (moneromooo-monero)
2018-04-28 22:20:46 +02:00
moneromooo-monero c1886155ed unit_tests: fix build after get_output_didstribution signature change 2018-04-28 18:02:58 +01:00
Riccardo Spagni cd22cb807a Merge pull request #3709
82b05d50 Adding required library (dependency of boost::this_thread::sleep_for) (Gene Peters)
2018-04-28 17:02:22 +02:00
Riccardo Spagni 69b6f5b6a6 Merge pull request #3705
f9d0827b Fix broken interactive daemon 'limit' commands plus RPC calls (rbrunner7)
2018-04-28 17:02:08 +02:00
Riccardo Spagni 5bca8c6998 Merge pull request #3667
53a1962d epee: Drop deprecated Boost.Thread header (Jan Beich)
2018-04-28 17:01:32 +02:00
Riccardo Spagni 66e18cc92f Merge pull request #3703
18c2f6e2 mlog: fix setting no logs (moneromooo-monero)
2018-04-28 16:59:29 +02:00
Riccardo Spagni 26cae8f4f1 Merge pull request #3695
b1a9e97b slow-hash: fix memory leak for Windows /karbowanec#41 (aivve)
2018-04-28 16:59:02 +02:00
Riccardo Spagni 8c27f127ec Merge pull request #3692
7346a59c Build: update miniupnp submodule (anonimal)
2018-04-28 16:58:04 +02:00
Riccardo Spagni 2ab5b1a21f Merge pull request #3683
dad10775 Only log an error if fork version is higher AND is not known. (Thaer Khawaja)
2018-04-28 16:57:36 +02:00
Riccardo Spagni 93e76e14a2 Merge pull request #3685
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-28 16:56:22 +02:00
Riccardo Spagni 35299644b2 Merge pull request #3650
5bd7f760 import_multisig_info: fix sanity check crash in detach_blockchain (Mikhail Mitkevichl)
2018-04-28 16:54:37 +02:00
stoffu 3880bf396a cryptonote_protocol_handler.inl: remove span read just now that failed to pass some basic tests 2018-04-28 11:10:59 +09:00
stoffu da249fd5ba cryptonote_protocol_handler.inl: fix return type mismatches (int vs bool) 2018-04-28 11:07:51 +09:00
Gene Peters 4b89d877d7 Adding required library (dependency of boost::this_thread::sleep_for) 2018-04-26 11:34:59 -07:00
rbrunner7 c0e22ebcca [RELEASE] Fix broken interactive daemon 'limit' commands plus RPC calls 2018-04-26 20:08:17 +02:00
Gene Peters 82b05d5054 Adding required library (dependency of boost::this_thread::sleep_for) 2018-04-25 21:02:54 -07:00
Jan Beich 76817605bd 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-25 22:23:42 +01:00
moneromooo-monero e2b72da4ed mlog: fix setting no logs 2018-04-25 20:42:31 +01:00
moneromooo-monero 18c2f6e21d mlog: fix setting no logs 2018-04-25 20:42:11 +01:00
rbrunner7 f9d0827bba Fix broken interactive daemon 'limit' commands plus RPC calls 2018-04-25 21:37:10 +02:00
aivve b1a9e97b2d slow-hash: fix memory leak for Windows /karbowanec#41 2018-04-24 20:47:29 +09:00
anonimal 7346a59c75 Build: update miniupnp submodule
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-23 22:27:54 +00:00
anonimal c677421594 Build: remove UPnP definition from snap 2018-04-23 22:12:08 +00:00