Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,317 Commits 9 Branches 69 Tags 295 MiB
2d60c9b738
Commit Graph

5317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riccardo Spagni
2d60c9b738
Merge pull request #2986 
373d1d50 epee: use strptime instead of std::get_time, for compatibility (moneromooo-monero)
 2018-01-10 11:51:20 +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
9d73cd894c
Merge pull request #2978 
0e93b098 Add checks for termcap if needed by readline (Jethro Grassie)
 2018-01-10 11:50:00 +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
Jethro Grassie
0e93b0986c
Add checks for termcap if needed by readline 2018-01-02 13:26:22 -05: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
d7df56341e
Merge pull request #2965 
5388c81b Added using TOOLCHAIN_DIR varable on symlinking in android dockerfiles (damir)
 2018-01-02 00:31:15 +02:00
Riccardo Spagni
989c9309ec
Merge pull request #2964 
3ed1a74c tests: remove unused/unfinished keccak bits (moneromooo-monero)
 2018-01-02 00:30:54 +02:00
Riccardo Spagni
753215b9c6
Merge pull request #2963 
0e19a394 tests: test wallets don't need a dummy temp file anymore (moneromooo-monero)
 2018-01-02 00:30:33 +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
759d8e8f80
Merge pull request #2956 
dc642631 performance_tests: add a test for subaddress expansion (moneromooo-monero)
 2018-01-02 00:29:15 +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
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
Riccardo Spagni
a0a8706946
Merge pull request #2955 
0bcaf86c tests: fix link error in hash tests now needing common (moneromooo-monero)
 2017-12-28 09:00:21 +02: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
4f4174f330
Merge pull request #2947 
e12ee76a README.md: Improve copy for supporting the project (xmr-eric)
 2017-12-28 08:59:46 +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
838b2e8a52
Merge pull request #2944 
223e3788 unit_tests: fix memwipe test comparison (moneromooo-monero)
 2017-12-28 08:59:01 +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
Riccardo Spagni
395e209745
Merge pull request #2952 
e3530789 wallet-api: added Utils::onStartup (stoffu)
 2017-12-27 10:00:01 +02:00
Riccardo Spagni
270236e8f4
Merge pull request #2996 
1a271d25 unbound: enable SHA1 (moneromooo-monero)
 2017-12-26 17:42:57 +02:00
moneromooo-monero
da0fd71d3e
only include the easylogging++ stack trace code when needed 2017-12-26 11:40:15 +00:00
moneromooo-monero
81b04cfa88
easlogging++: omit some unneded macros 2017-12-26 11:40:12 +00:00
stoffu
e3530789d3
wallet-api: added Utils::onStartup 2017-12-26 08:23:32 +09:00
Riccardo Spagni
4b156c003b
Merge pull request #2611 
cdd516fa tests : remove lib_wallet_api tests (guzzijones)
 2017-12-25 22:49:07 +02: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
6ca30ae666
Merge pull request #2936 
cb9aa23c levin_protocol_handler_async: another attempt at fixing at exception (moneromooo-monero)
64d23ce3 Revert "epee: keep a ref to a connection we're deleting" (moneromooo-monero)
 2017-12-25 21:21:17 +02: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