monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-05 16:07:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6152 commits 9 branches 69 tags 308 MiB
Commit graph

4312 commits

Author SHA1 Message Date
luigi1111
b1be364f08
Merge pull request #3966 
948c482 simplewallet: grammar fix in warning message (moneromooo-monero)
 2018-06-25 15:16:38 -05:00
luigi1111
66212837ab
Merge pull request #3957 
2bb2c1b password: flush cout when prompting for password without newline (moneromooo-monero)
 2018-06-25 15:10:54 -05:00
luigi1111
506be80601
Merge pull request #3955 
d7a6b72 wallet2: fix bulletproof cold signing (moneromooo-monero)
 2018-06-25 15:09:48 -05:00
luigi1111
741a773025
Merge pull request #3948 
c367609 blockchain_import: warn+delay about using --dangerous-unverified-import (moneromooo-monero)
 2018-06-25 14:58:19 -05:00
luigi1111
26562e9f3c
Merge pull request #3941 
bf26920 wallet2: fix get_approximate_blockchain_height for stagenet (stoffu)
 2018-06-25 14:54:54 -05:00
luigi1111
c3ec5373b3
Merge pull request #3936 
d81e042 tx_pool: initialize bitflags padding since it gets written to storage (moneromooo-monero)
 2018-06-25 14:53:27 -05:00
luigi1111
473d984d88
Merge pull request #3921 
8fc0cdb wallet2: lower default for subaddress lookahead when restoring with hardware (stoffu)
248310d Move parse_subaddress_lookahead() from simplewallet.cpp to util.cpp (stoffu)
46e90b7 Wallet API: add support for wallet creation from hardware device (stoffu)
 2018-06-25 14:49:30 -05:00
luigi1111
1eddabf0a4
Merge pull request #3677 
d45cd37 fix typos in language files and rpc_args.cpp (ordtrogen)
 2018-06-25 14:41:48 -05:00
luigi1111
ff7dc087ae
Merge pull request #3407 
7bf99a2 fix string handling for donation message (cryptochangements34)
 2018-06-25 14:39:01 -05:00
ordtrogen
d45cd37c53 fix typos in language files and rpc_args.cpp 2018-06-21 19:14:14 +02:00
stoffu
46e90b7780
Wallet API: add support for wallet creation from hardware device 2018-06-21 12:36:27 +09:00
stoffu
248310de06
Move parse_subaddress_lookahead() from simplewallet.cpp to util.cpp 2018-06-21 12:36:17 +09:00
stoffu
8fc0cdb96f
wallet2: lower default for subaddress lookahead when restoring with hardware 2018-06-21 12:35:23 +09:00
luigi1111
ffab67004c
Merge pull request #3784 
261ee56 don't limit miner threads in wallet (cryptochangements34)
 2018-06-20 15:15:19 -05:00
cryptochangements34
7bf99a2376 fix string handling for donation message 2018-06-20 15:57:23 -04:00
luigi1111
9a3712541e
Merge pull request #3939 
62c8c07 wallet: do not log by default if we're not asked to log to console (moneromooo-monero)
 2018-06-20 14:52:55 -05:00
luigi1111
34c57d071f
Merge pull request #3938 
01cc978 ringct: remove an unnecessary scalarmultBase in zeroCommit (moneromooo-monero)
 2018-06-20 14:51:31 -05:00
luigi1111
3721298cf6
Merge pull request #3932 
8962f00 simplewallet: add optional trusted/untrusted argument to set_daemon (moneromooo-monero)
941a608 util: consider Tor/I2P addresses to be non local (moneromooo-monero)
2b3357e README: mention --untrusted-daemon (moneromooo-monero)
 2018-06-20 14:44:54 -05:00
luigi1111
7935bc5f6b
Merge pull request #3924 
afed978 Fixes #3645: error on freebsd lambda return values forced to std::string (rockhouse)
 2018-06-20 14:41:05 -05:00
luigi1111
9eb51887b0
Merge pull request #3919 
ace2eda blockchain: pop forked blocks only when DB is not read-only (stoffu)
 2018-06-20 14:39:09 -05:00
luigi1111
5a221c0e48
Merge pull request #3904 
4f3a4fb blockchain: return error when requesting non existent output (moneromooo-monero)
 2018-06-20 14:33:08 -05:00
luigi1111
81a2ff768b
Merge pull request #3903 
2b0c632 tx_pool: hold off parsing a tx blob till we actually need it (moneromooo-monero)
 2018-06-20 14:31:33 -05:00
luigi1111
51cdd76bbd
Merge pull request #3897 
63d0ab0 mlog: --max-log-files to set the max number of rotated log files (stoffu)
 2018-06-20 14:19:30 -05:00
luigi1111
034b0c7adb
Merge pull request #3896 
6b8568e simplewallet.sign_transfer: rename export to export_raw, add help message (stoffu)
 2018-06-20 14:13:59 -05:00
luigi1111
17fd575fe4
Merge pull request #3888 
1aae39d daemon: fix readline interfering with std::cerr usage (moneromooo-monero)
 2018-06-20 14:12:18 -05:00
luigi1111
36aeaa7545
Merge pull request #3757 
6f9260e handle optional miner params better (cryptochangements34)
 2018-06-20 14:09:42 -05:00
luigi1111
896512b2b6
Merge pull request #3878 
5a412b7 disable file size sanity check when loading the wallet cache (moneromooo-monero)
 2018-06-19 12:57:59 -05:00
luigi1111
cb130c7590
Merge pull request #3861 
de1ffe0 p2p: warn when no incoming connections are seen for a while (moneromooo-monero)
 2018-06-19 12:56:31 -05:00
luigi1111
9a3bd88b9f
Merge pull request #3851 
a87980f fix build with GCC 8.1.0 (moneromooo-monero)
 2018-06-19 12:51:13 -05:00
luigi1111
61f3916b4a
Merge pull request #3844 
bdf5a3a Fix PCSC compilation under windows (cslashm)
f17383a Fix CMAKE config for PCSC in order to avoid msys DLL dependencies (cslashm)
 2018-06-19 12:49:30 -05:00
luigi1111
d841339b09
Merge pull request #3829 
4764929 use deterministic viewkey if not supplied (cryptochangements34)
 2018-06-19 12:43:10 -05:00
luigi1111
50bc95519e
Merge pull request #3828 
16e209e core: lock incoming tx lock when checking the txpool and chain (moneromooo-monero)
 2018-06-19 12:41:07 -05:00
luigi1111
f62399b88d
Merge pull request #3821 
558d05b epee: log type name when a container size check fails (moneromooo-monero)
a2566db object_sizes: add a few useful types (moneromooo-monero)
 2018-06-19 12:39:12 -05:00
luigi1111
cfd66dae4b
Merge pull request #3691 
db55263 threadpool: allow constructing an object, and misc tweaks (moneromooo-monero)
ce173cb core: remove threadpool dependency from header (moneromooo-monero)
3147468 unit_tests: add threadpool unit test (moneromooo-monero)
 2018-06-17 22:04:39 -05:00
luigi1111
9226acca4b
Merge pull request #3804 
89e51ec simple-wallet-cli: Add warnings about inaccurate balances to to watch-only wallet (jcktm)
 2018-06-16 14:15:52 -05:00
luigi1111
fceb774344
Merge pull request #3798 
f357210 Fix Typo (Rafficer)
 2018-06-16 14:14:19 -05:00
luigi1111
4e7897e57c
Merge pull request #3780 
9c2a7b4 wallet-rpc: watch-only and cold wallet features added (ph4r05)
 2018-06-16 14:12:57 -05:00
luigi1111
e3012444fb
Merge pull request #3762 
eb9f3a3 check_spend_proof (itssteven)
 2018-06-16 14:10:11 -05:00
luigi1111
7af0b7fffc
Merge pull request #3735 
4812c06 add .load() to make Boost 1.67 happy with its new is_integral check (Teutone)
 2018-06-16 14:07:25 -05:00
luigi1111
fb2b16f10a
Merge pull request #3732 
fa0839f Ensure m_timestamps has the correct number for computing difficulty. (thaerkh)
 2018-06-16 14:05:53 -05:00
luigi1111
abfff766e5
Merge pull request #3737 
1590183 p2p: fix fallback seed node usage (moneromooo-monero)
 2018-06-16 14:04:01 -05:00
luigi1111
b3363e8e0a
Merge pull request #3726 
b5cb1bc blockchain: avoid exception if asked for a block we do not have (moneromooo-monero)
 2018-06-16 14:02:56 -05:00
luigi1111
42e7f31613
Merge pull request #3725 
9cc0d42 connection_context: remove state_ prefix from state names (moneromooo-monero)
d9d002c daemon: print peer state in sync_info (moneromooo-monero)
 2018-06-16 14:01:12 -05:00
luigi1111
aada0670ba
Merge pull request #3538 
f4e3295 simplewallet: set_ring can now take a file with rings (moneromooo-monero)
 2018-06-16 13:51:57 -05:00
stoffu
63d0ab09b5
mlog: --max-log-files to set the max number of rotated log files 2018-06-13 12:44:27 +09:00
luigi1111
62f3f0480a
Merge pull request #3701 
3ca267b cn_deserialize: dump additional tx pubkeys (moneromooo-monero)
 2018-06-12 12:24:20 -05:00
luigi1111
a915d49307
Merge pull request #3700 
efcecb4 mnemonics: add some logs to help debug failures (moneromooo-monero)
 2018-06-12 12:23:12 -05:00
luigi1111
6be2516140
Merge pull request #3687 
6b13976 blockchain: log in DEBUG when a block is found, and where (moneromooo-monero)
 2018-06-12 12:22:12 -05:00
luigi1111
41d04a87b2
Merge pull request #3648 
6f36cf0 Improve 'show_transfers' date formatting (ryan-ronnander)
 2018-06-12 12:18:17 -05:00
luigi1111
ed139efc5d
Merge pull request #3643 
e2b7558 handle improper log levels (cryptochangements34)
 2018-06-12 12:13:07 -05:00