monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6113 commits 9 branches 69 tags 319 MiB
Commit graph

6113 commits

This branch
This branch
All branches
Author SHA1 Message Date
luigi1111
06b0f9e870
Merge pull request #3976 
f40cf1a device_ledger: fix bad memory access on connect error (moneromooo-monero)
 2018-06-27 15:35:13 -05:00
luigi1111
0a7efa45f7
Merge pull request #3928 
b1538bf Update readme to indicate recommended version (Gingeropolous)
 2018-06-25 14:51:45 -05:00
luigi1111
db26776a35
Merge pull request #3526 
66100f2 malloc scratchpad for all supported android archs (m2049r)
 2018-06-12 12:10:00 -05:00
moneromooo-monero
f40cf1a859
device_ledger: fix bad memory access on connect error 2018-06-09 20:49:05 +01:00
Gingeropolous
b1538bff31
Update readme to indicate recommended version 
... is 0.12.2.0
 2018-06-04 22:34:35 -04:00
Riccardo Spagni
e2c39f6b59
Merge pull request #3914 
107eec4d protocol: drop (and increase fails) if most blocks hashes are invalid (moneromooo-monero)
 2018-06-03 18:41:36 +02:00
Riccardo Spagni
f12b277d20
Merge pull request #3912 
de742b5c blockchain: demote a hash-of-hashes validation warning to debug (moneromooo-monero)
 2018-06-03 18:38:30 +02:00
moneromooo-monero
107eec4dca
protocol: drop (and increase fails) if most blocks hashes are invalid 2018-06-03 17:37:06 +01:00
moneromooo-monero
de742b5c82
blockchain: demote a hash-of-hashes validation warning to debug 
This data comes from untrusted peers, and validation failures
are therefore normal.
 2018-06-02 23:52:50 +01:00
Riccardo Spagni
0d219ccdcd
Merge pull request #3906 
2cab7ec9 remove -master from version string (Riccardo Spagni)
e0cf1eca update checkpoints.dat for point release (Riccardo Spagni)
bfecf19c bump version for 0.12.2 point release (Riccardo Spagni)
 2018-06-02 14:54:06 +02:00
Riccardo Spagni
2cab7ec917 remove -master from version string 2018-06-02 14:51:24 +02:00
Riccardo Spagni
e0cf1ecadd
update checkpoints.dat for point release 2018-06-02 14:31:05 +02:00
Riccardo Spagni
bfecf19ce9
bump version for 0.12.2 point release 2018-06-02 14:27:48 +02:00
Riccardo Spagni
95568639e0
Merge pull request #3900 
bcddce70 rpc: the cache is still for non cumulative on that branch (moneromooo-monero)
 2018-06-01 13:24:27 +02:00
moneromooo-monero
bcddce70e6
rpc: the cache is still for non cumulative on that branch 2018-06-01 09:03:31 +01:00
Riccardo Spagni
bd56771996
Merge pull request #3858 
f6687c3e rapidjson: remove outdated in-tree, use submodule (anonimal)
 2018-05-31 21:26:31 +02:00
Riccardo Spagni
a87a19c570
Merge pull request #3893 
410c6e5b rpc: convert distribution to cumulative after caching (moneromooo-monero)
 2018-05-31 21:25:58 +02:00
Riccardo Spagni
3380458d2e
Merge pull request #3891 
9e96873f wallet2: don't ask for pruned txes yet, we still parse the entire tx (moneromooo-monero)
 2018-05-31 21:25:43 +02:00
Riccardo Spagni
0dac3afc22
Merge pull request #3883 
15e029ac rpc: fix get_output_distribution cache for the cumulative case (moneromooo-monero)
 2018-05-31 21:24:52 +02:00
Riccardo Spagni
dca353c574
Merge pull request #3886 
4602c267 Fix CMAKE config for PCSC in order to avoid msys DLL dependencies (cslashm)
 2018-05-31 21:24:17 +02:00
Riccardo Spagni
8195a444ee
Merge pull request #3889 
5e2e003c http_protocol_handler: limit the number of starting newlines (moneromooo-monero)
fd9019b3 abstract_tcp_server2: timeout on RPC connections (moneromooo-monero)
ccaa666c http_protocol_handler: speedup newline discarding (moneromooo-monero)
ca7f0249 console_handler: fix start_default_console use of prompt parameter (moneromooo-monero)
 2018-05-31 21:23:52 +02:00
Riccardo Spagni
b2dd94bcc0
Merge pull request #3802 
a66f152f Use median timestamp if current time renders a block invalid. (Thaer Khawaja)
 2018-05-31 21:22:58 +02:00
Riccardo Spagni
65c69fb67e
Merge pull request #3884 
49cf41a6 protocol: do not switch to unsafe sync mode for just a few blocks (moneromooo-monero)
22a4cb06 core: fix automatic safe db sync mode switching (moneromooo-monero)
 2018-05-31 21:22:32 +02:00
moneromooo-monero
410c6e5b48
rpc: convert distribution to cumulative after caching 
This avoids double conversion on a later cache hit
 2018-05-31 16:55:24 +01:00
moneromooo-monero
9e96873f87
wallet2: don't ask for pruned txes yet, we still parse the entire tx 2018-05-31 16:45:43 +01:00
moneromooo-monero
5e2e003cfb
http_protocol_handler: limit the number of starting newlines 2018-05-31 12:17:54 +01:00
moneromooo-monero
fd9019b37d
abstract_tcp_server2: timeout on RPC connections 2018-05-31 12:17:52 +01:00
moneromooo-monero
ccaa666cf9
http_protocol_handler: speedup newline discarding 2018-05-31 12:17:50 +01:00
moneromooo-monero
ca7f0249eb
console_handler: fix start_default_console use of prompt parameter 
It had not been updated to the function type change
 2018-05-31 12:17:48 +01:00
cslashm
4602c2674f Fix CMAKE config for PCSC in order to avoid msys DLL dependencies 2018-05-31 12:19:44 +02:00
moneromooo-monero
49cf41a61d
protocol: do not switch to unsafe sync mode for just a few blocks 2018-05-30 18:28:55 +01:00
moneromooo-monero
22a4cb0609
core: fix automatic safe db sync mode switching 2018-05-30 18:28:53 +01:00
moneromooo-monero
15e029ac6d
rpc: fix get_output_distribution cache for the cumulative case 
The distribution was not converted to cumulative after a cache hit
 2018-05-30 16:10:53 +01:00
anonimal
f6687c3ed8
rapidjson: remove outdated in-tree, use submodule 
Includes ~2 years worth of fixes including security and build.

Note: this pulls directly from master, not a release branch/tag. See
https://github.com/Tencent/rapidjson/issues/1265

(cherry picked from commit 8a6c081df7)
 2018-05-25 05:33:23 +00:00
Riccardo Spagni
aa6850c71d
Merge pull request #3846 
e18cb33e update checkpoints (Riccardo Spagni)
f1cdcba9 update checkpoints for point release (Riccardo Spagni)
ed273a88 bump version for point release (Riccardo Spagni)
 2018-05-23 21:21:59 +02:00
Riccardo Spagni
e18cb33e08
update checkpoints 2018-05-23 21:16:57 +02:00
Riccardo Spagni
f1cdcba95e
update checkpoints for point release 2018-05-23 21:13:54 +02:00
Riccardo Spagni
ed273a88d2
bump version for point release 2018-05-23 21:10:06 +02:00
Riccardo Spagni
c79fe98b71
Merge pull request #3843 
e05a17f1 Fix PCSC discovery under Windows/MSYS Fix PCSC compilation under windows (cslashm)
 2018-05-23 20:42:57 +02:00
cslashm
e05a17f1ea Fix PCSC discovery under Windows/MSYS 
Fix PCSC compilation under windows
 2018-05-22 19:43:49 +02:00
Riccardo Spagni
9205bba38a
Merge pull request #3801 
96405bca crypto: more places needing fixing for GCC 8.1 (moneroexamples)
86c63b8e chacha: fix build with GCC 8.1 (moneromooo-monero)
 2018-05-21 21:59:27 +02:00
Riccardo Spagni
9bde29cb23
Merge pull request #3833 
aabe3eed Fix output shuffling for multisig (stoffu)
 2018-05-21 20:38:58 +02:00
Riccardo Spagni
b25c9ee183
Merge pull request #3838 
38ef5f8b simplewallet: use correct unit for fee command (stoffu)
 2018-05-21 20:38:31 +02:00
Riccardo Spagni
252e834800
Merge pull request #3796 
fac173d8 Wallet API: allow log path to be non-default & console output to be configurable (stoffu)
 2018-05-21 20:37:58 +02:00
Riccardo Spagni
ace614612b
Merge pull request #3815 
ffe9d882 speed up get_output_distribution (and precalc common case) (moneromooo-monero)
 2018-05-21 20:37:19 +02:00
Riccardo Spagni
23edf8901f
Merge pull request #3831 
7f33e07d daemon: request unpruned transactions for print_tx (moneromooo-monero)
 2018-05-21 20:36:47 +02:00
Riccardo Spagni
91de2f812f
Merge pull request #3811 
13184bc4 [RELEASE] Update readme to include link to announcement list (Gingeropolous)
 2018-05-21 20:36:21 +02:00
Riccardo Spagni
2a1a208b2b
Merge pull request #3753 
4980d3c0 blockchain: pop top if block version disagrees with the ideal fork version (stoffu)
 2018-05-21 20:35:15 +02:00
Riccardo Spagni
df688e0ec5
Merge pull request #3810 
d6074be5 unit_tests: set default data dir to the source tree at build time (moneromooo-monero)
 2018-05-21 20:34:32 +02:00
Riccardo Spagni
770c0189d0
Merge pull request #3808 
41cb11b2 version.cmake: fix configuring version.cpp without git (moneromooo-monero)
 2018-05-21 20:34:10 +02:00