Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,168 Commits 9 Branches 69 Tags 230 MiB
Commit Graph

5168 Commits

Author SHA1 Message Date
moneromooo-monero 523084bc79
core: don't add empty additional pub keys field to extra 
Saves a couple bytes per tx
 2017-10-19 09:11:10 +01:00
kenshi84 00cc1fdd22
subaddress: remove unneeded scalarmultBase 2017-10-18 08:46:00 +09: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
Cole Lightfighter 4fd6a3d27f Subaddress unit tests 
Basic unit test fixture, and initialization of a subaddress account.

Signed-off-by: Cole Lightfighter <cole@onicsla.bz>
 2017-10-17 10:59:53 -06:00
kenshi84 88ebfd646a
core_tests: fix for subaddress patch 2017-10-17 22:29:01 +09:00
rbrunner7 b370ef54b9 Wallet: Descriptions through new commands 'set_description', 'get_description' 2017-10-16 22:24:09 +02: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 ac4018a7e6
wallet2: workaround for lightwallet before supporting subaddress (followup #2656) 2017-10-16 12:03:09 +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
Jaquee 329f149e95 remove reference to cryptonote::null_hash 2017-10-15 19:19:40 +02:00
Riccardo Spagni b293ad9a1a
Merge pull request #2640 
22b51e06 db_lmdb: include chain height when failing to find an output key (moneromooo-monero)
5db433b3 blockchain: avoid exceptions in output verification (moneromooo-monero)
 2017-10-15 18:59:45 +02:00
Riccardo Spagni 344c01c712
Merge pull request #2638 
529a6a4a core: guard against a mined block not finding all txes in the pool (moneromooo-monero)
 2017-10-15 18:58:57 +02:00
Riccardo Spagni 845afb5191
Merge pull request #2613 
2051f89f cmake: build tests last (redfish)
 2017-10-15 18:58:31 +02:00
Riccardo Spagni b4126266d4
Merge pull request #2610 
44c1d160 unit_tests: fix compiling on Windows (iDunk5400)
 2017-10-15 18:54:32 +02:00
Riccardo Spagni 6159a83175
Merge pull request #2608 
fe484f30 unit_tests: data dir is now overridden with --data-dir (moneromooo-monero)
 2017-10-15 18:54:16 +02:00
Riccardo Spagni 73f0c16743
Merge pull request #2606 
4090e8c6 simplewallet: add get/set for refresh-from-height (moneromooo-monero)
 2017-10-15 18:51:11 +02:00
Riccardo Spagni d5ab55b8d7
Merge pull request #2604 
0a872798 protocol: kick idle peers by dropping them (moneromooo-monero)
 2017-10-15 18:50:32 +02:00
Riccardo Spagni f1bee553b1
Merge pull request #2602 
bc1b9333 frob level 1 logs a bit for consistency (moneromooo-monero)
 2017-10-15 18:49:48 +02:00
Riccardo Spagni 62d2a55719
Merge pull request #2600 
885c773a cmake: print which stack trace lib is used (redfish)
 2017-10-15 18:49:11 +02:00
Riccardo Spagni f484b162db
Merge pull request #2599 
b776c725 daemon: use @N syntax to output_histogram for specific amounts (moneromooo-monero)
 2017-10-15 18:48:19 +02:00
Riccardo Spagni e50bf5f811
Merge pull request #2597 
c4136134 miner: always update block template when starting (moneromooo-monero)
 2017-10-15 18:47:43 +02:00
Riccardo Spagni 5c3275ddbe
Merge pull request #2596 
06fb9bcf wallet2: fix refresh height calc for new wallets (moneromooo-monero)
 2017-10-15 18:47:16 +02:00
Riccardo Spagni 71253c1dcd
Merge pull request #2592 
dc19659d Remove network_address_base which has been merged with ipv4_network_address in 8b006877 (Michał Sałaban)
2183ade0 Don't try to create wallet-dir when it's not given, don't crash if wallet-dir already exists. (Michał Sałaban)
 2017-10-15 18:39:13 +02:00
Riccardo Spagni 1280ba4f5b
Merge pull request #2589 
8f0cea63 add a command_line function to check for defaulted options (moneromooo-monero)
 2017-10-15 18:38:46 +02:00
Riccardo Spagni 3eac7ab94f
Merge pull request #2587 
cba34494 rpc: out_peers now works again (moneromooo-monero)
 2017-10-15 18:38:12 +02:00
Riccardo Spagni 50f0c1f0e0
Merge pull request #2586 
7b8d3ec6 wallet-cli: add --do-not-relay option (stoffu)
 2017-10-15 18:37:38 +02:00
Riccardo Spagni 1740f0a13e
Merge pull request #2583 
27fdaaa4 Fix building with -DARCH=default -DNO_AES=ON (moneromooo-monero)
 2017-10-15 18:37:14 +02:00
Riccardo Spagni cb9b1fcc94
Merge pull request #2582 
240f769d tests: add sha256sum unit test (moneromooo-monero)
 2017-10-15 18:36:38 +02:00
Riccardo Spagni 6ad660a82e
Merge pull request #2578 
e6636577 Add needed dependencies (Emilien Devos)
 2017-10-15 18:36:05 +02:00
Riccardo Spagni 147ecb6b7a
Merge pull request #2573 
7e7acdc3 daemon: catch out of range exceptions too when calling stoll/stoi (moneromooo-monero)
 2017-10-15 18:34:48 +02:00
Riccardo Spagni 1e577e8fbf
Merge pull request #2571 
8028dde7 block_queue: use boost::uuids::nil_uuid where appropriate (moneromooo-monero)
 2017-10-15 18:34:26 +02:00
Riccardo Spagni 27ed7419bb
Merge pull request #2570 
f139a6ca wallet2: fix backlog being off by 1 (moneromooo-monero)
 2017-10-15 18:33:51 +02:00
Riccardo Spagni 1039b5e813
Merge pull request #2569 
b5b4abb8 simplewallet: fix setting default-ring-size to 0 (moneromooo-monero)
 2017-10-15 18:32:41 +02:00
Riccardo Spagni c45f3ac4d9
Merge pull request #2568 
7130cf0c Add tools::on_startup, and warn about glibc 2.25 bug if found (moneromooo-monero)
 2017-10-15 18:32:09 +02:00
Riccardo Spagni 2babd2e0a3
Merge pull request #2567 
54940d8c blockchain_import: remove a few commented out obsolete lines (moneromooo-monero)
 2017-10-15 18:29:18 +02:00
Riccardo Spagni 1c546e0d81
Merge pull request #2565 
452d4fae tests: fix hashchain unit tests (moneromooo-monero)
 2017-10-15 18:27:08 +02:00
Riccardo Spagni 51bfdfb674
Merge pull request #2556 
acc186eb README: Add package installation instructions for Void Linux (Helmut Pozimski)
 2017-10-15 18:26:46 +02:00
Riccardo Spagni 960886aa04
Merge pull request #2109 
97c2e449 wallet2+API: use separate callbacks for lightwallets (Jaquee)
d9261867 walletAPI: correct confirmations in txHistory for unsynced wallets (Jaquee)
9442b043 walletAPI: lightwallet exceptions (Jaquee)
fc922934 walletAPI: add lightwallet login() and importWalletRequest() (Jaquee)
79207743 walletAPI: init() lightwallet and SSL support (Jaquee)
dde5a1fc walletAPI: add tx unlock_time (Jaquee)
bba5cbed wallet2: remove obsolete get_num_rct_outputs() call from create_transactions_2 (Jaquee)
7a482f30 wallet2: create_transactions_2 lightwallet support (Jaquee)
ce61b818 wallet2: get_outs lightwallet support (Jaquee)
1197cb71 wallet2: commit_tx() lightwallet support (Jaquee)
43b57804 wallet2: refactor is_tx_spendtime_unlocked() (Jaquee)
32e2b003 wallet2: add lightwallet exceptions to common functions (Jaquee)
2e692fc0 wallet2: refresh() lightwallet support (Jaquee)
f44d156c my/openmonero API functions (Jaquee)
288d3c75 wallet2: add remove_obsolete_pool_txs() (Jaquee)
2c6aad7e wallet2: add on_pool_tx_removed callback (Jaquee)
ff7c30aa wallet2: light wallet member variables (Jaquee)
e2a276cb wallet2: add ssl option to init() (Jaquee)
a13540be add string_tools::validate_hex() (Jaquee)
fd773d88 refactor cryptonote_basic::add_tx_pub_key_to_extra (Jaquee)
8bfa6c2d lightwallet rpc server commands (Jaquee)
76961ddc Serializer: string to integer conversion for MyMonero compatibility (Jaquee)
1cf940f2 epee http_client SSL support (Jaquee)
eec10137 CMakeLists.txt - Add openssl include dir (Jaquee)
 2017-10-15 18:25:08 +02:00