Jethro Grassie
be1826c0fb
Keep readline optional
2018-01-11 13:51:13 -05:00
Riccardo Spagni
e61f655440
Merge pull request #3061
...
fc041b58
common cmake: make sure translation_files.h is generated for i18n.cpp (stoffu)
2018-01-10 11:55:35 +01:00
Riccardo Spagni
00f4ff26c8
Merge pull request #3021
...
dc6729a6
wallet2: std::unordered_set ctor is sometimes explicit (moneromooo-monero)
2018-01-10 11:55:19 +01:00
Riccardo Spagni
4e3716a2d2
Merge pull request #3005
...
369884a6
mnemonics: typo fix (4 bytes == 3 words, not 8 bytes) (stoffu)
2018-01-10 11:54:38 +01:00
Riccardo Spagni
0b5994fbec
Merge pull request #3004
...
a2c845c7
cryptonote_protocol: internal error consistency size check (moneromooo-monero)
2018-01-10 11:54:23 +01:00
Riccardo Spagni
990389f09d
Merge pull request #3002
...
9996d5e9
wallet2: guard against the dameon sending blocks before last checkpoint (moneromooo-monero)
eadaa6aa
wallet_rpc_server: fix wallet leak on error exit (moneromooo-monero)
2018-01-10 11:54:11 +01:00
Riccardo Spagni
229e1ce7d1
Merge pull request #2997
...
7c4f01a7
blockchain_import: more informative verification switch (moneromooo-monero)
2018-01-10 11:53:57 +01:00
Riccardo Spagni
d08aee7a7e
Merge pull request #2993
...
776b44f1
Add misc hardening flags to the cmake machinery (moneromooo-monero)
2018-01-10 11:53:26 +01:00
Riccardo Spagni
f9c66ba67c
Merge pull request #2990
...
2d17feb0
factor STL container serialization (moneromooo-monero)
2018-01-10 11:53:05 +01:00
Riccardo Spagni
6c7eb5109d
Merge pull request #2989
...
66eeeaa1
wallet2: fix failure to create tx if inputs are not enough for fee (moneromooo-monero)
2018-01-10 11:52:49 +01:00
Riccardo Spagni
529ca39e9d
Merge pull request #2988
...
8a4610c3
blake256: fix wrong hash when computed in parts (moneromooo-monero)
2018-01-10 11:52:32 +01:00
Riccardo Spagni
ab8a32429a
Merge pull request #2985
...
6d8b29ef
fix some link errors in debug mode for macos (stoffu)
fdd4c5e5
move memwipe to epee to avoid common<->crypto circular dependencies (moneromooo-monero)
40ab12a7
epee: remove dependency on common (moneromooo-monero)
2018-01-10 11:50:58 +01:00
Riccardo Spagni
3ce7f2bead
Merge pull request #2983
...
6fc4fc85
sweep_below: do not prematurely exclude subaddresses set (stoffu)
2018-01-10 11:50:36 +01:00
Riccardo Spagni
a71db6d239
Merge pull request #2981
...
b63afbaa
simplewallet: detect typo for incoming_transfers options (stoffu)
2018-01-10 11:50:21 +01:00
Riccardo Spagni
bfe580787d
Merge pull request #2976
...
c765f951
simplewallet: disable donations on testnet (Matt Smith)
2018-01-10 11:49:14 +01:00
Riccardo Spagni
420a803ff8
Merge pull request #2973
...
277a5aef
wallet2: fix m_key_image_{partial,known} in_light_wallet code (moneromooo-monero)
2018-01-10 11:48:42 +01:00
Riccardo Spagni
c951bf1f72
Merge pull request #2972
...
586ee642
simplewallet: lock idle scope in {im,ex}port_{key_images,outputs} (moneromooo-monero)
2018-01-10 11:48:12 +01:00
Riccardo Spagni
0a110aefbb
Merge pull request #2971
...
ae860230
Fix exceptions not finding txpool txes when relaying (moneromooo-monero)
2018-01-10 11:45:15 +01:00
stoffu
6d8b29ef28
fix some link errors in debug mode for macos
2018-01-10 01:57:56 +00:00
moneromooo-monero
fdd4c5e577
move memwipe to epee to avoid common<->crypto circular dependencies
2018-01-10 01:57:54 +00:00
moneromooo-monero
40ab12a773
epee: remove dependency on common
2018-01-10 01:57:51 +00:00
stoffu
fc041b58d6
common cmake: make sure translation_files.h is generated for i18n.cpp
2018-01-04 12:24:06 +09:00
Riccardo Spagni
a529f0a6c9
Merge pull request #3019
...
294adc83
Additional fix for core_tests (Howard Chu)
d52b732e
Fix stale readcursor flags (Howard Chu)
2018-01-02 00:32:12 +02:00
Riccardo Spagni
aa4195e199
Merge pull request #2977
...
c70e8daa
threadpool: fix deadlock in recursive waiter usage (moneromooo-monero)
2018-01-02 00:31:56 +02:00
Riccardo Spagni
803f54b9fd
Merge pull request #2967
...
55556fab
wallet_rpc_server: factor transfer info return and add missing info (moneromooo-monero)
2018-01-02 00:31:30 +02:00
Riccardo Spagni
ee02c7ab03
Merge pull request #2962
...
14c29814
wallet2: fix use of uninitialized data (moneromooo-monero)
2018-01-02 00:30:01 +02:00
Riccardo Spagni
eb617be8f4
Merge pull request #2960
...
5cbcf0aa
wallet: support for multisig seeds (moneromooo-monero)
2018-01-02 00:29:36 +02:00
Riccardo Spagni
dd11bfb89c
Merge pull request #2934
...
db2bc965
Embed the translation files in the binary (Guillaume LE VAILLANT)
2018-01-02 00:28:45 +02:00
moneromooo-monero
776b44f17b
Add misc hardening flags to the cmake machinery
...
See https://wiki.debian.org/Hardening#User_Space
2017-12-31 14:26:12 +00:00
Howard Chu
294adc8341
Additional fix for core_tests
...
Reset thread-local info if it doesn't match the current env.
Only happens when a process opens/closes env multiple times in the
same process, doesn't affect monerod.
2017-12-28 20:24:08 +00:00
moneromooo-monero
dc6729a66a
wallet2: std::unordered_set ctor is sometimes explicit
2017-12-28 10:20:12 +00:00
Riccardo Spagni
a1a8262355
Merge pull request #2949
...
e20e489a
Better definite article use (xmr-eric)
2017-12-28 09:00:00 +02:00
Riccardo Spagni
3bbe2481ce
Merge pull request #2946
...
1a686bf8
daemon: print num txes in print_bc (moneromooo-monero)
2017-12-28 08:59:31 +02:00
Riccardo Spagni
95a687d584
Merge pull request #2945
...
9e07ccf1
daemon: remove some superfluous includes (moneromooo-monero)
2017-12-28 08:59:16 +02:00
Riccardo Spagni
0ae3651cc9
Merge pull request #2942
...
4f45f9da
simplewallet: factor out tx exceptions (moneromooo-monero)
2017-12-28 08:58:46 +02:00
Riccardo Spagni
5f562cf9e6
Merge pull request #2941
...
d0d38dc8
wallet2: print tx size in bytes and kB (moneromooo-monero)
2017-12-28 08:58:30 +02:00
Riccardo Spagni
8980aacbe8
Merge pull request #2940
...
da0fd71d
only include the easylogging++ stack trace code when needed (moneromooo-monero)
81b04cfa
easlogging++: omit some unneded macros (moneromooo-monero)
2017-12-28 08:57:59 +02:00
Howard Chu
d52b732efb
Fix stale readcursor flags
...
Reset thread-specific flags when a write txn is started.
Also remove some redundant start-readtxn code.
2017-12-28 00:59:04 +00:00
stoffu
b63afbaa99
simplewallet: detect typo for incoming_transfers options
2017-12-28 07:53:31 +09:00
stoffu
6fc4fc850e
sweep_below: do not prematurely exclude subaddresses set
2017-12-28 07:52:53 +09:00
moneromooo-monero
da0fd71d3e
only include the easylogging++ stack trace code when needed
2017-12-26 11:40:15 +00:00
stoffu
e3530789d3
wallet-api: added Utils::onStartup
2017-12-26 08:23:32 +09:00
Riccardo Spagni
40df4905fd
Merge pull request #3006
...
7e7b1a82
Revert "return subaddress in get_bulk_payments" (moneromooo-monero)
2017-12-25 22:08:56 +02:00
moneromooo-monero
7e7b1a8252
Revert "return subaddress in get_bulk_payments"
...
This reverts commit b60f48f0e3
.
2017-12-25 20:04:40 +00:00
Riccardo Spagni
ca8c7e863f
Merge pull request #2895
...
5ad312a1
wallet2: switch to chacha20 instead of chacha8 (moneromooo-monero)
1e5491e9
Add a chacha20 variant to go with chacha8 (moneromooo-monero)
2017-12-25 22:00:44 +02:00
Riccardo Spagni
0a5bfa7c73
Merge pull request #2938
...
aaae94f0
wallet2: reinstate the single preferred output selection (moneromooo-monero)
2017-12-25 21:42:22 +02:00
moneromooo-monero
5ad312a1c3
wallet2: switch to chacha20 instead of chacha8
...
Wallet caches and keys files are loaded with chacha8 as needed,
but only saved with chacha20. Other data (eg, cold wallet data
files, etc) will be incompatible.
2017-12-25 19:28:06 +00:00
moneromooo-monero
1e5491e942
Add a chacha20 variant to go with chacha8
2017-12-25 19:28:03 +00:00
Riccardo Spagni
409e9bb029
Merge pull request #2931
...
04349492
wallet2: error out in get_seed if the language is invalid (moneromooo-monero)
2017-12-25 21:21:00 +02:00
Riccardo Spagni
b38f6dcf0b
Merge pull request #2929
...
ae55bacd
resumption support for updates using range requests (moneromooo-monero)
fe0fae50
epee: add a get_file_size function (moneromooo-monero)
2017-12-25 21:20:22 +02:00