monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-19 02:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4841 commits 9 branches 69 tags 309 MiB
Commit graph

4841 commits

This branch
This branch
All branches
Author SHA1 Message Date
Riccardo Spagni
7452359d8f
Merge pull request #2591 
93ad1f87 Fix #2559: more flexible print_tx daemon command (binaryFate)
 2017-11-06 01:54:48 +02:00
Riccardo Spagni
32b083d8bd
Merge pull request #2546 
b2d416f2 Distinguish "not enough money" and "not enough unlocked money" (binaryFate)
 2017-11-06 01:53:43 +02:00
Riccardo Spagni
9d65a9cc98
Merge pull request #2483 
ff7745bb Edited test readme for accuracy and depth (Cole Lightfighter)
c300ae56 Added test documentation & Keccak unit test (Cole Lightfighter)
f6119a8e Added test documentation & Keccak unit test (Cole Lightfighter)
 2017-11-06 01:52:08 +02:00
Riccardo Spagni
4022a0a57e
Merge pull request #2729 
161401dd Fix JSON-RPC response object over ZMQ (Lee Clagett)
 2017-11-06 01:42:55 +02:00
Riccardo Spagni
13a84caa22
Merge pull request #2662 
88ebfd64 core_tests: fix for subaddress patch (kenshi84)
e373a203 performance_tests: add master spend pubkey to subaddress hashtable (kenshi84)
 2017-11-03 11:58:06 +02:00
Riccardo Spagni
4146f2e202
Merge pull request #2666 
8233a24b unit_tests: fix build on windows (moneromooo-monero)
 2017-11-02 11:44:36 +02:00
Riccardo Spagni
ef3c77117a
Merge pull request #2689 
6a90506a Link against libpgm/libnorm if found, optional libzmq ldependencies (moneromooo-monero)
 2017-11-01 11:26:22 +02:00
Riccardo Spagni
35dbb3be33
Merge pull request #2663 
4b228dd3 cmake: epee: use var from FindOpenSSL.cmake (redfish)
29497f79 epee: use boost type for SSL error code (redfish)
 2017-11-01 11:25:53 +02:00
Riccardo Spagni
32b46c594b
Merge pull request #2703 
d0463312 fix libwallet api test after api change (Jaquee)
a46c1eed Wallet2: Don't throw when subaddress label doesn't exist (Jaquee)
086b7db2 Wallet API: default values for account and subaddr index (Jaquee)
 2017-11-01 11:24:54 +02:00
Riccardo Spagni
1648c1d466
Merge pull request #2659 
52c13810 blockchain_utilities: Add monero-blockchain-{ex,im}port binaries to default install targets (Bertrand Jacquin)
 2017-10-31 20:42:48 +02:00
Riccardo Spagni
9b5e2ceb40
Merge pull request #2684 
66255c0e Problem: Copyright notice is very confusing (Gareth)
 2017-10-31 20:41:45 +02:00
Riccardo Spagni
54463b33b3
Merge pull request #2723 
69c37200 RPC Add cross origin resource sharing support (Tim L)
 2017-10-31 20:38:38 +02:00
Riccardo Spagni
5ef9c69ef5
Merge pull request #2711 
fab3b722 Add more specific RPC error codes (Michał Sałaban)
 2017-10-31 20:35:41 +02:00
Riccardo Spagni
00270dd279
Merge pull request #2737 
935f7462 blockchain: do not lock the blockchain lock for simple DB getters (moneromooo-monero)
 2017-10-31 20:34:22 +02:00
Riccardo Spagni
c97fbb0176
Merge pull request #2718 
626e8078 wallet2: fix show_transfers missing multiple incoming outputs (moneromooo-monero)
 2017-10-31 20:33:44 +02:00
Riccardo Spagni
3fe07603e4
Merge pull request #2705 
44f14638 wallet2: fix tx size estimator for large number of inputs (moneromooo-monero)
 2017-10-31 20:33:19 +02:00
Riccardo Spagni
75ad92c82c
Merge pull request #2702 
f946bb7b fixed an LMDB issue on OpenBSD (#2699) which leads to a crash in monerod (ston1th)
 2017-10-31 20:31:42 +02:00
Riccardo Spagni
0e15653536
Merge pull request #2687 
969b5a2a net_helper: fix massive slowdown after SSL support (moneromooo-monero)
 2017-10-31 20:30:36 +02:00
Riccardo Spagni
784f7b07f0
Merge pull request #2660 
4dd05a2f subaddress: change prefix so that it starts with 8 (kenshi84)
 2017-10-31 20:28:00 +02:00
Riccardo Spagni
6d1562d94c
Merge pull request #2715 
ca87cbd8 wallet2: fix subaddress fields serialization (moneromooo-monero)
 2017-10-31 20:25:40 +02:00
Tim L
69c37200aa RPC Add cross origin resource sharing support 2017-10-30 13:55:56 -04:00
moneromooo-monero
935f746249
blockchain: do not lock the blockchain lock for simple DB getters 
It is safe in those cases, though might return slightly out of date
information if another thread is busy modifying the blockchain,
but it avoids potentially lengthy delays just to get things like
the current blockchain height.
 2017-10-30 08:23:40 +00:00
Jaquee
d04633121b fix libwallet api test after api change 2017-10-29 15:26:23 +01:00
Jaquee
a46c1eed8c Wallet2: Don't throw when subaddress label doesn't exist 2017-10-29 15:26:22 +01:00
Lee Clagett
161401ddca Fix JSON-RPC response object over ZMQ 2017-10-26 17:25:14 -04:00
ston1th
f946bb7be6 fixed an LMDB issue on OpenBSD (#2699) which leads to a crash in monerod 2017-10-26 17:16:06 +02:00
moneromooo-monero
626e80780b
wallet2: fix show_transfers missing multiple incoming outputs 2017-10-23 14:38:07 +01:00
moneromooo-monero
ca87cbd852
wallet2: fix subaddress fields serialization 
When loading an older wallet cache, they wouldn't be initialized,
leading them to have random(ish) values, and so assigned to some
random subaddress.
 2017-10-23 11:53:49 +01:00
Michał Sałaban
fab3b7221b Add more specific RPC error codes 2017-10-23 04:27:02 +02:00
moneromooo-monero
44f1463867
wallet2: fix tx size estimator for large number of inputs 2017-10-22 19:46:07 +01:00
Jaquee
086b7db2c7 Wallet API: default values for account and subaddr index 2017-10-22 18:15:23 +02:00
moneromooo-monero
6a90506a8d
Link against libpgm/libnorm if found, optional libzmq ldependencies 2017-10-21 08:39:52 +01:00
moneromooo-monero
969b5a2ae3
net_helper: fix massive slowdown after SSL support 2017-10-20 17:27:15 +01:00
Gareth
66255c0ea1 Problem: Copyright notice is very confusing 
Solution: add line break to copyright notice and fix grammar.
 2017-10-19 21:21:52 +08:00
redfish
4b228dd356 cmake: epee: use var from FindOpenSSL.cmake 
This fixes linking when path to openssl
is defined manually:
cmake -DOPENSSL_ROOT_DIR='/usr/include/openssl-1.0;/usr/lib/openssl-1.0' ...

This is useful for building with OpenSSL v1.0
when default system installation is v1.1.

The linking error is undefined SSL_load_error_strings symbol.
This is due to -L /usr/lib/openssl-1.0 not making it onto
the linkline (so -lssl pulls in the default system openssl).
 2017-10-17 16:13:07 -04:00
redfish
29497f7920 epee: use boost type for SSL error code 
Fixes compile error when building with OpenSSL v1.1:

contrib/epee/include/net/net_helper.h: In member function ‘void epee::net_utils::blocked_mode_client::shutdown_ssl()’:
contrib/epee/include/net/net_helper.h:579:106: error: ‘SSL_R_SHORT_READ’ was not declared in this scope
    if (ec.category() == boost::asio::error::get_ssl_category() && ec.value() != ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ))
                                                                                                          ^
contrib/epee/include/net/net_helper.h:579:106: note: suggested alternative: ‘SSL_F_SSL_READ’

See boost/asio/ssl/error.hpp.
Boost handles differences between OpenSSL versions.

cmake: fail if Boost is too old for OpenSSL v1.1
 2017-10-17 16:12:58 -04:00
kenshi84
88ebfd646a
core_tests: fix for subaddress patch 2017-10-17 22:29:01 +09:00
binaryFate
b2d416f211 Distinguish "not enough money" and "not enough unlocked money" 
Fix #1530
 2017-10-16 15:14:09 +02:00
moneromooo-monero
8233a24ba8
unit_tests: fix build on windows 
Reported by iDunk on IRC
 2017-10-16 09:37:51 +01:00
kenshi84
e373a2037b
performance_tests: add master spend pubkey to subaddress hashtable 2017-10-16 13:08:44 +09:00
kenshi84
4dd05a2f9b
subaddress: change prefix so that it starts with 8 2017-10-16 10:35:59 +09:00
Bertrand Jacquin
52c1381049
blockchain_utilities: Add monero-blockchain-{ex,im}port binaries to 
default install targets

Binaries available to download on https://getmonero.org/downloads/ as
embedding monerod, monero-wallet-{cli,rpc} and
monero-blockchain-{ex,im}port.

This change synchronise download results with a manual build from
source
 2017-10-15 22:19:38 +01:00
Riccardo Spagni
8d511f3c24
Merge pull request #2601 
4d35ad76 Fix compiler warnings with Clang 6.0.0. (Vasil Dimov)
 2017-10-15 21:36:36 +02:00
Vasil Dimov
4d35ad7603
Fix compiler warnings with Clang 6.0.0. 
monero/src/cryptonote_protocol/block_queue.cpp:208:44: error:
      suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
  static const boost::uuids::uuid uuid0 = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                           {                                          }

monero/src/wallet/wallet_rpc_server.cpp:1895:43: error:
      lambda capture 'wal' is not used [-Werror,-Wunused-lambda-capture]
  tools::signal_handler::install([&wrpc, &wal](int) {
                                          ^

monero/src/cryptonote_protocol/cryptonote_protocol_handler.inl:1616:40: error:
      lambda capture 'arg' is not used [-Werror,-Wunused-lambda-capture]
    m_p2p->for_each_connection([this, &arg, &fluffy_arg, &exclude_context, &fullConnections...
                                       ^

monero/src/cryptonote_protocol/cryptonote_protocol_handler.inl:1616:46: error:
      lambda capture 'fluffy_arg' is not used [-Werror,-Wunused-lambda-capture]
    m_p2p->for_each_connection([this, &arg, &fluffy_arg, &exclude_context, &fullConnections...
                                             ^

monero/src/blockchain_utilities/blockchain_export.cpp:181:3: error:
      bool literal returned from 'main' [-Werror,-Wmain]
  CHECK_AND_ASSERT_MES(r, false, "Failed to initialize source blockchain storage");
  ^                       ~~~~~
monero/contrib/epee/include/misc_log_ex.h:180:97: note:
      expanded from macro 'CHECK_AND_ASSERT_MES'
  ...fail_ret_val, message)   do{if(!(expr)) {LOG_ERROR(message); return fail_ret_val;};}while(0)
                                                                  ^      ~~~~~~~~~~~~
monero/src/blockchain_utilities/blockchain_export.cpp:195:3: error:
      bool literal returned from 'main' [-Werror,-Wmain]
  CHECK_AND_ASSERT_MES(r, false, "Failed to export blockchain raw data");
  ^                       ~~~~~
monero/contrib/epee/include/misc_log_ex.h:180:97: note:
      expanded from macro 'CHECK_AND_ASSERT_MES'
  ...fail_ret_val, message)   do{if(!(expr)) {LOG_ERROR(message); return fail_ret_val;};}while(0)
                                                                  ^      ~~~~~~~~~~~~
 2017-10-15 22:02:24 +03:00
Riccardo Spagni
48af25ed83 Merge pull request #2658 
fddd8d22 performance_tests: fix build after subaddress patch (moneromooo-monero)
 2017-10-15 21:01:20 +02:00
moneromooo-monero
fddd8d226f
performance_tests: fix build after subaddress patch 2017-10-15 19:58:53 +01:00
Riccardo Spagni
da1bb4b0af Merge pull request #2657 
52ec0e7f epee: link against ssl/crypto for the new SSL code (moneromooo-monero)
 2017-10-15 20:13:53 +02:00
moneromooo-monero
52ec0e7f4e
epee: link against ssl/crypto for the new SSL code 2017-10-15 19:11:34 +01:00
Riccardo Spagni
97c11caf07 Merge pull request #2656 
3492de01 fix lightwallet and subaddresses conflict (Jaquee)
329f149e remove reference to cryptonote::null_hash (Jaquee)
 2017-10-15 19:32:18 +02:00
Jaquee
3492de010b fix lightwallet and subaddresses conflict 2017-10-15 19:19:40 +02:00