Commit Graph

6152 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 3afaedf365
Merge pull request #3964
9ddb07f update readme to include debian one liner for deps (Gingeropolous)
2018-06-25 15:15:32 -05:00
luigi1111 89b99ef2d8
Merge pull request #3963
f61fe2e Update readme to include pcslite dependency (Gingeropolous)
2018-06-25 15:13:57 -05:00
luigi1111 8fad35f8e2
Merge pull request #3962
55c7fb8 epee: adaptive connection timeout system (moneromooo-monero)
2018-06-25 15:12:37 -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 ea1d54aeb7
Merge pull request #3947
8cc4606 snap: strip metadata from icon.png (moneromooo-monero)
2018-06-25 14:56:07 -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 0a24673fef
Merge pull request #3933
2861289 readme - explain building master vs. release (Gingeropolous)
2018-06-20 14:46:04 -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 306365d4e6
Merge pull request #3927
5f00df3 Update Readme to indicate recommended version (Gingeropolous)
2018-06-20 14:42:38 -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 c678413a89
Merge pull request #3902
f8dd433 epee: fix detection of 172.16.0.0/172.31.255.255 local IP range (moneromooo-monero)
5db9e3c unit_tests: add tests for local IP range detection (moneromooo-monero)
2018-06-20 14:22:44 -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 70f932fe0a
Merge pull request #3880
91663fc adding win building details. (k1nghat)
2018-06-20 14:08:19 -05:00
luigi1111 4aa832e534
Merge pull request #3702
099bb83 easylogging++: cached allowed categories (moneromooo-monero)
2018-06-20 14:02:12 -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 26dd216c67
Merge pull request #3852
26c569d add disclaimer about 3rd party packages (jtgrassie)
2018-06-19 12:55:17 -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 1db8cf0db9
Merge pull request #3835
d44d19c Fixed for compilation in big endian PPC. (nioroso-x3)
2018-06-19 12:46:39 -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