Riccardo Spagni
4728ab977a
Merge pull request #1837
...
31533493
2017-03-04 21:15:04 +02:00
Riccardo Spagni
f2d0f0174f
Merge pull request #1836
...
cd71774d
2017-03-04 21:14:38 +02:00
moneromooo-monero
c7dd0b1535
Revert "wallet: fix insertion of pool transactions"
...
This reverts commit d47dac9a88
2017-03-04 12:41:19 +00:00
moneromooo-monero
3153349325
core: quantize per kB fee to 8 decimals
2017-03-03 23:31:56 +00:00
moneromooo-monero
cd71774d77
tx_pool: log separately "not ready" and "double spend" cases
2017-03-03 22:32:51 +00:00
Howard Chu
e4437b2551
Fix double-import
...
Incomplete ifdef cleanup in 9e82b694da
2017-03-03 21:45:14 +00:00
Howard Chu
eb62dcc871
Remove redundant num_txs() method
...
Cleanup of bf1348b7e2
2017-03-03 16:52:45 +00:00
Howard Chu
296641e047
Fix #1824 don't end batch that we didn't start
2017-03-03 16:50:53 +00:00
Jaquee
9ae33b51fb
wallet api: fix parameters in wallet2callbackImpl
2017-03-03 15:49:12 +01:00
Jaquee
1cf2f5a5c2
use txid in wallet2::process_new_transaction()
2017-03-03 15:48:32 +01:00
Riccardo Spagni
e24cd86c18
Merge pull request #1827
...
db1c7d80
2017-03-03 14:31:28 +02:00
Riccardo Spagni
d35d626181
Merge pull request #1826
...
2c468dd4
2017-03-03 14:31:04 +02:00
Riccardo Spagni
2f9ecd4fba
Merge pull request #1823
...
d47dac9a
2017-03-03 14:30:24 +02:00
Riccardo Spagni
78a99fe7da
Merge pull request #1820
...
7a44f38ada18898fb49c6ab4f113b92b6fd4b827b5c74e40
2017-03-03 14:30:02 +02:00
Riccardo Spagni
11f8e0d33f
Merge pull request #1687
...
1a7e18bff3be9991
2017-03-03 14:29:23 +02:00
Riccardo Spagni
9e10fac223
Merge pull request #1814
...
11a00df6
2017-03-03 14:14:51 +02:00
Riccardo Spagni
460836a2b7
Merge pull request #1813
...
b8a08f19
2017-03-03 14:14:09 +02:00
Riccardo Spagni
1965c819f6
Merge pull request #1811
...
378d2bb1
2017-03-03 14:13:52 +02:00
Riccardo Spagni
3787ffca80
Merge pull request #1804
...
12adb4a3
2017-03-03 14:11:09 +02:00
Riccardo Spagni
14c6c910d7
Merge pull request #1803
...
53105743
2017-03-03 14:10:44 +02:00
Riccardo Spagni
27b7320fed
Merge pull request #1801
...
96ce57d5
2017-03-03 14:04:35 +02:00
moneromooo-monero
2c468dd429
allow user I/O in millinero, micronero, nanonero, piconero
2017-03-02 19:02:41 +00:00
Jaquee
db1c7d80b1
wallet api: add missing mining options
2017-03-02 14:09:04 +01:00
moneromooo-monero
d47dac9a88
wallet: fix insertion of pool transactions
...
They were inserted using payment id as key, not txid
2017-02-28 21:19:24 +00:00
Miguel Herranz
1a7e18bfdf
Make gray peer selection uniform
...
Prevents the system from always picking the gray peers with the most
recent last_seen.
2017-02-28 17:39:39 +01:00
moneromooo-monero
b8a08f199a
wallet: fix --log-file not working
2017-02-28 09:07:56 +00:00
moneromooo-monero
7a44f38a7f
Add support for the wallet to refresh pruned blocks
2017-02-27 22:29:00 +00:00
moneromooo-monero
da18898f0e
ringct: do not require range proof in decodeRct/decodeRctSimple
...
These fields aren't used, and they'll actually be pruned in
some cases
2017-02-27 22:28:45 +00:00
moneromooo-monero
b49c6ab45d
rpc: add a default category for daemon rpc
2017-02-27 20:25:35 +00:00
moneromooo-monero
f113b92b93
core: add functions to serialize base tx info
...
That is, information without signatures (for v1) nor range
proofs and MGs (for v2)
2017-02-27 20:24:39 +00:00
moneromooo-monero
6fd4b827fb
node_rpc_proxy: allow caching daemon RPC version
2017-02-27 17:57:18 +00:00
moneromooo-monero
b5c74e4041
wallet: invalidate node proxy cache when reconnecting
2017-02-27 17:46:55 +00:00
Miguel Herranz
f3be9991d7
Make get_random_gray_peer distribution uniform
...
get_random_gray_peer is used to implement feeler connections, described
in: https://eprint.iacr.org/2015/263.pdf 2. Random selection
2017-02-27 18:29:50 +01:00
moneromooo-monero
11a00df699
daemon: fix bc_dyn_stats via rpc
2017-02-26 23:12:55 +00:00
Nano Akron
378d2bb1ff
Revert attempt to write to console on daemon shutdown
2017-02-26 21:49:50 +00:00
Jaquee
5310574382
Wallet API: Add support for daemon rpc login
2017-02-25 22:17:35 +01:00
moneromooo-monero
12adb4a3f3
core: move hardfork back to cryptonote_core
...
should fix a cross dependency betewen cryptonote_basic and
blockchain_db
2017-02-25 16:41:35 +00:00
moneromooo-monero
96ce57d551
protocol: tone down a rate limit not implemented yet warning
...
it scares users
2017-02-25 12:10:29 +00:00
moneromooo-monero
ea873ceb2c
daemon/rpc: updates command and RPC
...
subcommands "check", "download", and "update".
update is not yet implemented.
2017-02-24 23:18:27 +00:00
Riccardo Spagni
beee286c7b
Merge pull request #1798
...
9a2157d7
2017-02-24 21:14:20 +02:00
moneromooo-monero
2b188151d4
daemon: avoid pre-log-init spew on creating directories
2017-02-24 19:08:20 +00:00
moneromooo-monero
cf2b151116
wallet: avoid pre-log-init spew on --version
2017-02-24 19:08:02 +00:00
Riccardo Spagni
9a2157d71a
update version
2017-02-24 21:03:57 +02:00
Riccardo Spagni
57f15994a5
Merge pull request #1797
...
ada6a8a2
2017-02-24 20:33:04 +02:00
moneromooo-monero
ada6a8a2de
wallet_rpc_server: new --trusted-daemon flag
...
and remove trusted_daemon fields from transfer RPCs,
it is much friendlier on users
2017-02-24 18:20:14 +00:00
Riccardo Spagni
3435038a4d
add rpc timeouts to calls that might timeout
2017-02-24 19:17:22 +02:00
Riccardo Spagni
1e7f783f69
Merge pull request #1776
...
e4dbea97
2017-02-24 14:22:55 +02:00
Riccardo Spagni
4cb6b265ee
Merge pull request #1794
...
29b34ed1
2017-02-24 12:05:39 +02:00
Riccardo Spagni
0e7722ff40
Merge pull request #1793
...
eabe3bf2
2017-02-24 12:04:28 +02:00
Riccardo Spagni
954cc459d2
Merge pull request #1786
...
4d05955d
2017-02-24 12:01:36 +02:00
Riccardo Spagni
ed6f2e8323
Merge pull request #1785
...
583a7b5c
2017-02-24 12:00:51 +02:00
Riccardo Spagni
b352330a3f
Merge pull request #1781
...
520756c3
2017-02-24 11:58:38 +02:00
Riccardo Spagni
089df0a7a4
Merge pull request #1780
...
8262da81
2017-02-24 11:57:03 +02:00
Riccardo Spagni
2b38973b5c
Merge pull request #1779
...
9effa553240054a7
2017-02-24 11:55:54 +02:00
moneromooo-monero
29b34ed156
blockchain_utilities: link against blockchain_db
2017-02-24 09:01:34 +00:00
kenshi84
eabe3bf20c
simplewallet: updated help message for 'set ask-password'
2017-02-24 17:54:30 +09:00
moneromooo-monero
4d05955d53
protocol: fix "sync done" message not appearing
2017-02-24 01:28:56 +00:00
moneromooo-monero
583a7b5c74
core: protect precomputed block hashes with SHA256
2017-02-23 23:18:10 +00:00
moneromooo-monero
520756c3c5
rpc: s/rcp/rpc/
2017-02-23 21:02:15 +00:00
moneromooo-monero
8262da8137
rpc: make mining_status RPC work when syncing
2017-02-23 20:40:28 +00:00
moneromooo-monero
9effa55311
core: bound the amount of entries in bad tx semantics cache
...
This is to prevent unbounded memory use. Since I don't think there
is a container that has quick insert, quick lookup, and automatic
FIFO, I use two and swap every N, clearing the oldest one.
2017-02-23 20:34:11 +00:00
moneromooo-monero
240054a7f8
core: remove a couple unused/obsolete bits
2017-02-23 20:11:57 +00:00
Miguel Herranz
3bdda60f3e
Add print_pl_stats daemon command
2017-02-23 18:20:17 +01:00
Jaquee
e4dbea976e
wallet2: fix wrong status on daemon shutdown/startup
2017-02-23 12:41:21 +01:00
Riccardo Spagni
d666339853
Merge pull request #1775
...
700d218c0abddd64
2017-02-22 23:18:36 +02:00
Riccardo Spagni
0abddd648d
fix broken checkpoints.dat
2017-02-22 23:10:05 +02:00
moneromooo-monero
ada0e23a84
updates: fix user/auto url split
2017-02-22 13:04:07 +00:00
moneromooo-monero
14d0e00235
wallet2_api: add updates check api
2017-02-22 13:03:45 +00:00
moneromooo-monero
5901331669
updates: remove testnet case
...
It need not be any different
2017-02-22 11:20:44 +00:00
moneromooo-monero
822577eb42
updates: we now have a user URL, and an automatic one
...
So the user can use https, while the automatic does not have to
2017-02-22 11:20:40 +00:00
moneromooo-monero
9f17b1a30f
updates: s/monerod/monero/ for the main download
...
Also print download success message as global log
2017-02-22 11:20:37 +00:00
moneromooo-monero
6a5dfb88d2
updates: add all update servers
2017-02-22 11:20:24 +00:00
moneromooo-monero
72d40f13a4
updates: use HTTP, not HTTPS
...
The files are hashed and the hashes signed
2017-02-22 09:08:35 +00:00
Riccardo Spagni
5aab25b60a
Merge pull request #1765
...
5cfddd74
2017-02-22 09:37:31 +02:00
Riccardo Spagni
1a4298685a
Merge pull request #1766
...
72deb48433329f5b04a50a7ec3599fa7
2017-02-22 09:36:11 +02:00
Noah Watkins
44a5b03841
create a foreground non-interactive mode
...
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2017-02-21 16:44:22 -08:00
moneromooo-monero
708758b737
core: do not download an update we already downloaded
2017-02-21 22:23:59 +00:00
moneromooo-monero
45101550f2
updates: use updates host, not downloads, for HTTP
2017-02-21 22:21:59 +00:00
Riccardo Spagni
72deb4846d
updated fallback nodes
2017-02-21 22:40:26 +02:00
Riccardo Spagni
33329f5bd1
update version to 0.10.2
2017-02-21 22:24:01 +02:00
Riccardo Spagni
04a50a7ea4
update checkpoints.dat
2017-02-21 19:52:27 +02:00
Riccardo Spagni
c3599fa7b9
update copyright year, fix occasional lack of newline at line end
2017-02-21 19:38:18 +02:00
Dion Ahmetaj
5cfddd74e9
Add support for smart mining through wallet.
2017-02-21 11:45:47 -05:00
Riccardo Spagni
2bdad8d695
Merge pull request #1760
...
efdd783c058eed36
2017-02-21 17:23:10 +02:00
Riccardo Spagni
5f48a1b000
Merge pull request #1759
...
417b126f
2017-02-21 17:22:33 +02:00
Riccardo Spagni
058eed369b
cmakify openssl
2017-02-21 17:11:12 +02:00
moneromooo-monero
417b126fc4
Fix core_tests breaking on startup
...
You're wondering how this fixes core tests, aren't you...
It prevents the miner (initialized by cryptonote::core) from
breaking trying to access arguments that were not added.
Since the tests don't use the miner directly, it makes more
sense to have cryptonote_core add those, since it also uses
the miner.
2017-02-21 15:06:07 +00:00
anonimal
5c3badb749
dns_utils: fix infinite recursion when distributing empty dns_urls
...
load_txt_records_from_dns attempts to distribute `a = 0, b = -1` where
(b = dns_urls.size() - 1) and IntType is signed integer. This results in
an infinite recursion which leads to SIGSEGV.
2017-02-21 14:38:22 +00:00
moneromooo-monero
e74b3ab5f7
core: add p2p bind port options from net_node
...
They're now used by core to determine the data directory to use
for the txpool directory.
This fixes an assert in the core tests, which don't use the RPC
server, which normally initializes the P2P code.
2017-02-21 09:35:23 +00:00
Riccardo Spagni
50fadea8fa
Merge pull request #1747
...
26bd7aac
2017-02-21 11:28:58 +02:00
Riccardo Spagni
31a189b7dd
Merge pull request #1728
...
67693415
2017-02-21 11:28:31 +02:00
Riccardo Spagni
b252afb0b0
Merge pull request #1736
...
424b76a4
2017-02-21 11:27:49 +02:00
Riccardo Spagni
49efd3add9
Merge pull request #1727
...
0288310e
2017-02-21 11:27:15 +02:00
Riccardo Spagni
b67d35a76a
Merge pull request #1725
...
53f04044
2017-02-21 11:26:47 +02:00
Riccardo Spagni
98e34ca157
Merge pull request #1723
...
d43fde8a
2017-02-21 11:26:32 +02:00
Riccardo Spagni
826f49485e
Merge pull request #1716
...
b560ed4a
2017-02-21 11:23:38 +02:00
Riccardo Spagni
59d96eedd8
Merge pull request #1724
...
cca95c1c
2017-02-21 11:23:03 +02:00
Riccardo Spagni
565c99f670
Merge pull request #1731
...
a427235eb6a2230ec488eca5
2017-02-21 11:21:57 +02:00
Riccardo Spagni
6994c85201
Merge pull request #1733
...
a493c0b1
2017-02-21 11:21:14 +02:00
Riccardo Spagni
d11dbe7dc2
Merge pull request #1744
...
a5a0a3c8216f062e4bf78492d282cfccefb72e74f640512ce3cae4ae969ad71008c3f380e8a7525c
2017-02-21 11:16:43 +02:00
Riccardo Spagni
d2059dfab2
Merge pull request #1737
...
69ab14d9
2017-02-21 11:16:08 +02:00
Riccardo Spagni
d596722dfa
Merge pull request #1749
...
5a3b1e98
2017-02-21 11:15:40 +02:00
moneromooo-monero
a5a0a3c894
core: updates can now be downloaded (and SHA256 hash checked)
2017-02-20 22:58:37 +00:00
moneromooo-monero
216f062eb8
util: add a SHA256 function
2017-02-20 22:58:33 +00:00
moneromooo-monero
d282cfcc46
core: test key images against validity domain
2017-02-20 22:58:25 +00:00
moneromooo-monero
f640512c53
Optionally query moneropulse DNS records to check for updates
...
It just checks and prints a message if there is a new version
for now.
2017-02-20 22:58:16 +00:00
moneromooo-monero
e3cae4ae2e
core: display any fork warning at startup too
...
This is a good time for the operator to be around and see it
2017-02-20 22:58:12 +00:00
moneromooo-monero
969ad710ba
dns_utils: fix first checked DNS entry being ignored
2017-02-20 22:58:08 +00:00
moneromooo-monero
08c3f38031
util: add a vercmp function to compare version numbers
...
It is simple, supports simple x.y.z type numeric versions,
and does not attempt any kind of validation
2017-02-20 22:58:04 +00:00
moneromooo-monero
e8a7525ceb
dns_utils: factor TXT record loading code from checkpoint code
2017-02-20 22:57:57 +00:00
Riccardo Spagni
5892f653c7
Merge pull request #1729
...
9925edcb
2017-02-21 00:52:12 +02:00
Riccardo Spagni
ba633d33a8
Merge pull request #1732
...
83ec209f
2017-02-21 00:51:46 +02:00
Riccardo Spagni
675434ffab
Merge pull request #1748
...
bed2d9f22e913676bf1348b7dc53e9ee
2017-02-21 00:51:13 +02:00
moneromooo-monero
c32830937c
tx_pool: revert template filling changes
...
They are not ready yet
2017-02-20 22:43:37 +00:00
moneromooo-monero
5a3b1e983c
wallet2: fix failure to send (relatedness check in wrong case)
...
A relatedness check was meant to be done in the case of adding
an extra output if just one was enough. This was mistakenly
added to the "preferred output" case.
2017-02-19 09:31:54 +00:00
Howard Chu
bed2d9f231
Get rid of directory lock
...
We don't need it any more. Fixes issue #1633
2017-02-18 22:22:24 +00:00
Howard Chu
2e9136767e
Handle map resizes from other processes
2017-02-18 22:22:24 +00:00
Howard Chu
bf1348b7e2
Can't cache num_txs or num_outputs either
...
Same reason as 3ff54bdd7a
2017-02-18 21:01:24 +00:00
Howard Chu
dc53e9eef2
Add a few read txns to streamline
...
Slight perf gain, but mainly to reduce spam at loglevel 3
2017-02-18 21:01:24 +00:00
moneromooo-monero
26bd7aac03
wallet_api: fix logging init via api
2017-02-18 20:44:23 +00:00
Dion Ahmetaj
69ab14d91e
More robust battery status handling.
...
Added an extra path to check for linux power supply status.
Added ignore battery option. If set to true, then when we can't figure out
the power status, we'll assume the system is plugged in.
2017-02-16 14:35:01 -05:00
Dion Ahmetaj
a493c0b196
BACKGROUND_MINING_MINER_MONITOR_INVERVAL_IN_SECONDS was odr-used, so required a definition.
...
Instead of adding a declaration to cpp file, I changed it to non odr-used.
2017-02-15 11:15:12 -05:00
Howard Chu
424b76a4e5
Fix spurious synchronization status msgs
...
Only update target height if it's actually greater than the current target.
Only display "synchronized" when current height equals target.
2017-02-15 14:41:42 +00:00
moneromooo-monero
83ec209f42
simplewallet: validate hex input size
2017-02-14 19:45:46 +00:00
moneromooo-monero
a427235e30
core: add a missing newline on a string to be logged
2017-02-14 19:14:41 +00:00
moneromooo-monero
c488eca5e8
hardfork: tone down some logs
2017-02-14 18:56:39 +00:00
moneromooo-monero
9925edcb1e
rpc: fix some RPC calls not returning OK status when needed
2017-02-13 23:50:10 +00:00
moneromooo-monero
b560ed4ac6
daemon: silence spurious warning about uninitialized variable
...
Also fixes a leak
2017-02-13 22:39:25 +00:00
NanoAkron
67693415ff
Fix compiler error about nested externs in slow_hash.c by moving declarations
2017-02-13 22:35:43 +00:00
moneromooo-monero
0288310e3b
blockchain_db: add "raw" blobdata getters for block and transaction
...
This speeds up operations such as serving blocks to syncing peers
2017-02-13 21:11:37 +00:00
moneromooo-monero
53f040445f
cryptonote_protocol: tweaks to the syncing speedup
...
- only pause mining once we've got the lock (in practice, it'll
already be paused by another thread if we can't get the lock
at once though)
- do not call prepare_handle_incoming_blocks when we dismissed
all the blocks, it only causes cleanup_handle_incoming_blocks
to complain afterwards
2017-02-13 19:36:31 +00:00
moneromooo-monero
cca95c1c7a
blockchain_db: do not throw on expected partial results getting keys
...
When scanning for outputs used in a set of incoming blocks,
we expect that some of the inputs in their transactions will
not be found in the blockchain, as they could be in previous
blocks in that set. Those outputs will be scanned there at
a later point. In this case, we add a flag to control wehther
an output not being found is expected or not.
2017-02-13 19:05:30 +00:00
moneromooo-monero
d43fde8a9b
network_throttle: demote spammy logs to TRACE
2017-02-13 16:54:45 +00:00
Riccardo Spagni
6e78915061
Merge pull request #1718
...
882db8e9142e5e1e
2017-02-12 23:28:56 +02:00
Riccardo Spagni
e246dd1443
Merge pull request #1717
...
8bdc86be61dfa310
2017-02-12 23:28:38 +02:00
Riccardo Spagni
f4e2539a32
Merge pull request #1715
...
8ec2a8d2
2017-02-12 23:27:08 +02:00
Riccardo Spagni
92fe31fd44
Merge pull request #1714
...
5adcb5a49faef1f8
2017-02-12 23:26:02 +02:00
Riccardo Spagni
4e7bcad58f
Merge pull request #1713
...
422ecc98
2017-02-12 23:25:42 +02:00
Riccardo Spagni
b0e992237e
Merge pull request #1712
...
3b6839cc38a1b9c928d0b11f
2017-02-12 23:25:07 +02:00
Riccardo Spagni
b1df7f114d
Merge pull request #1711
...
cf2e75eb
2017-02-12 23:24:49 +02:00
Riccardo Spagni
47687399fb
Merge pull request #1709
...
b2ac939e#1626 ) (iDunk5400)
2017-02-12 23:24:19 +02:00
Riccardo Spagni
6a261fa1bc
Merge pull request #1708
...
f2986ccf
2017-02-12 23:23:46 +02:00
moneromooo-monero
882db8e9d9
tools: log to the correct file
2017-02-12 19:39:59 +00:00
moneromooo-monero
142e5e1eb4
tools: set requested log level
...
also move a couple logs from INFO to DEBUG
2017-02-12 18:48:39 +00:00
moneromooo-monero
8bdc86beb4
protocol: speed up sync by minimizing duplicate work
...
In particular, the prepare_handle_incoming_blocks call
is pretty lengthy, and entirely pointless in the common
case where several different connections will prepare
the exact same blocks.
2017-02-12 17:17:30 +00:00
moneromooo-monero
8ec2a8d2b0
net_node: fix spurious warning about using uninitialized data
...
This is only used to load, not save
2017-02-12 14:06:36 +00:00
moneromooo-monero
422ecc98e4
Fixup choice of easylogging++ vs libunwind stack trace code
2017-02-12 13:59:21 +00:00
moneromooo-monero
5adcb5a48c
tx_pool: add a debug message when adding a tx to the pool
2017-02-12 12:33:48 +00:00
moneromooo-monero
9faef1f83a
cryptonote_protocol: misc fluffy block fixes
...
- fix wrong block being used when a new block is received between
a node elaying a fluffy block and sending a new fluffy block
with txes a peer did not have
- misc a neverending ping pong requesting the same missing txids
when a new block is received in the meantime, causing the top
block to not be the one we need
- send the original fluffy block message block height when sending
a new fluffy block, not the current top height, which might
have been updated since
- avoid sending back the whole block blob when asking for txes,
send only the hash instead
- plus misc cleanup and additional debugging logs
2017-02-12 12:33:45 +00:00
moneromooo-monero
38a1b9c956
rpc: fix daemon mixed style set_log 2,category:level
2017-02-12 11:37:09 +00:00
moneromooo-monero
cf2e75ebb3
daemon: fix crash on exit when mining
...
When exiting while the miner is running, finding a block after
the p2p layer has been shutdown will cause a crash as the now
uninitialized p2p layer is asked to relay the found block to
any peers.
2017-02-12 11:09:21 +00:00
iDunk5400
b2ac939eb3
Fix GUI building after libcryptonote_core was split ( #1626 )
2017-02-11 17:00:55 +01:00
moneromooo-monero
f2986ccfc1
db_lmdb: fix bad height saved in tx data
...
The recent change to not keep separate track of the blockchain
height caused the reported height to jump early in the lmdb
transaction (when the block data is added to the blocks table),
rather than at the end, after everything succeeded. Since the
block data is added before the transaction data, this caused
the transaction data to be saved with a height one more than
its expected value.
Fix this by saving the block data last. This should have no
side effects.
2017-02-11 10:16:18 +00:00
Dion Ahmetaj
ad95e65028
Added a note about smart mining to status command. Fixed up a bug where I was resetting bg mining enabled instead of started. Upped the miner threshold. Also moved setting of enabled on start above miner thread creation since starting with true, then stopping, then starting with false resulted in race condition.
2017-02-10 18:07:43 -05:00
Dion Ahmetaj
e4dfd2fb63
Changed ac_line_status to on_battery_power.
2017-02-10 18:07:42 -05:00
Dion Ahmetaj
23c73269ca
Use defined directive to silence pre-proc warnings.
2017-02-10 18:07:41 -05:00
Dion Ahmetaj
d2c7d0f6b0
Cleaned up some logging. Thanks to moneromooo for help.
2017-02-10 18:07:41 -05:00
Dion Ahmetaj
68652cd94d
Added some //TODO comments pertaining to returning enums instead of bools in order to be better able to handle failure states.
2017-02-10 18:07:41 -05:00
Dion Ahmetaj
0b1045ed7d
Moved around checking of AC power in order to bail quicker to sleep if not plugged in.
2017-02-10 18:07:40 -05:00
Dion Ahmetaj
2937fdbbbf
Moved setting of previous process times to block where background mining is started, and added an explicit sleep in that block to wait for some mining to occur.
2017-02-10 18:07:40 -05:00
Dion Ahmetaj
21a1e0252f
Set background mining started bool to false on bg thread start. If mining::stop then mining::start, idle logic is re-run instead of starting immediately (if it was running before stop).
2017-02-10 18:07:39 -05:00
Dion Ahmetaj
345ed4823c
Background/smart mining. If a users' computer is plugged into a power
...
source, and CPU has been idle for some time, then begin mining to some
threshold (don't destroy the users' CPU).
This patch only supports windows and linux (I've only tested on Win64 and
Ubuntu).
The variables currently default to pretty conservative values (i.e. 20%
CPU mining threshold).
2017-02-10 18:07:39 -05:00
Riccardo Spagni
cb54eeaa31
Merge pull request #1698
...
9459f331
2017-02-11 00:54:30 +02:00
Riccardo Spagni
eacf2124b6
Merge pull request #1689
...
ce7fcbb4
2017-02-11 00:35:25 +02:00
Miguel Herranz
8277e67f11
Add anchor connections
...
Based on https://eprint.iacr.org/2015/263.pdf 4. Anchor connections.
Peer list serialisation version bumped to 5.
2017-02-10 23:28:54 +01:00
Riccardo Spagni
9296960081
Merge pull request #1686
...
bceaf4b7
2017-02-11 00:22:17 +02:00
Riccardo Spagni
9781ecaa70
Merge pull request #1685
...
7549116e
2017-02-11 00:21:51 +02:00
Riccardo Spagni
4feaa790e2
Merge pull request #1680
...
db0a5392
2017-02-11 00:21:12 +02:00
kenshi84
9459f33178
simplewallet: print error when address is wrong
2017-02-08 23:04:48 +09:00
kenshi84
8027ce0c75
extract some basic code from libcryptonote_core into libcryptonote_basic
2017-02-08 22:45:15 +09:00
Riccardo Spagni
99ee3fd17e
Merge pull request #1679
...
4efc926d
2017-02-08 12:53:57 +02:00
Riccardo Spagni
d30b64f457
Merge pull request #1674
...
92978b2c
2017-02-08 12:51:11 +02:00
moneromooo-monero
bceaf4b788
wallet2: fix transactions not considering rct inputs
...
I broke this very recently in 2bf029be17
2017-02-06 20:20:22 +00:00
Lee Clagett
ce7fcbb4ae
Add server auth to monerod, and client auth to wallet-cli and wallet-rpc
2017-02-06 01:15:41 -05:00
Jaquee
7549116ec3
Wallet API: Easylogger wrapper for gui
2017-02-05 20:12:01 +01:00
kenshi84
bab1e9a397
bugfix: infinite recursion in get_account_address_from_str_or_url
2017-02-05 23:20:16 +09:00
NanoAkron
db0a5392a5
Clarify in/out connections for users
2017-02-05 11:15:51 +00:00
moneromooo-monero
92978b2c0f
common: fix link error on at least one platform (no clue which one)
...
Bug and fix reported by tdprime
2017-02-05 10:55:55 +00:00
Jaquee
4efc926d28
Wallet API: Catch error from tools::is_local_address
2017-02-05 11:08:05 +01:00
Jaquee
0cc50bdd11
GUI: Improved refresh performance
2017-02-04 23:25:05 +01:00
Jaquee
805625b541
wallet api: Remove initAsync() and don't start refresh automatically on init
2017-02-04 23:25:03 +01:00
Jaquee
031b060af0
wallet2::init() - disconnect before init if connected
...
Makes it possible for GUI to reinit with new daemon without closing and reopening wallet.
2017-02-04 23:10:20 +01:00
Riccardo Spagni
e56bf442c3
Merge pull request #1669
...
4f5b130d
2017-02-04 17:28:53 +02:00
Riccardo Spagni
5da4650cba
Merge pull request #1671
...
cd34fc65
2017-02-04 17:27:54 +02:00
Riccardo Spagni
c3c281e699
Merge pull request #1666
...
03ff3639
2017-02-04 17:26:19 +02:00
Riccardo Spagni
bcb7b0a9af
Merge pull request #1665
...
34719071a9a9b64b
2017-02-04 17:21:11 +02:00
Riccardo Spagni
eb21389953
Merge pull request #1664
...
b5cb8861
2017-02-04 17:20:02 +02:00
Riccardo Spagni
31cf4e7362
Merge pull request #1640
...
f97526e6
2017-02-04 17:18:38 +02:00
moneromooo-monero
cd34fc655d
Use easylogging++'s stack trace facility where possible
...
This avoids using libunwind, which often causes trouble.
2017-02-04 12:33:03 +00:00
moneromooo-monero
4f5b130de9
wallet_rpc_server: add address book RPC calls
2017-02-04 11:40:49 +00:00
kenshi84
f97526e641
simplewallet: option to always ask password for any crytical operations
2017-02-03 09:38:12 +09:00
Miguel Herranz
03ff363982
Fix missing parentheses
2017-02-02 22:05:31 +01:00
moneromooo-monero
3471907160
simplewallet: cleanup
...
Remove empty static function which was refactored, as well as
leftover exception testing code.
2017-02-02 20:56:53 +00:00
moneromooo-monero
a9a9b64b13
simplewallet: fix build (unqualified type not in current scope)
2017-02-02 20:56:31 +00:00
moneromooo-monero
b5cb8861c7
core: fix integrated addresses breaking with auto zero change
...
Zero change is sent to a random address, which confuses the code
which determines which key to use to encrypt the payment id.
Ignore zero amounts for this purpose, so the payment id gets
encrypted with the real destination's key.
2017-02-02 20:53:12 +00:00
Riccardo Spagni
b01990124e
Merge pull request #1663
...
bbcc3a12
2017-02-02 22:41:58 +02:00
Riccardo Spagni
fcb299b4ae
Merge pull request #1641
...
ca94d0a4
2017-02-02 22:41:28 +02:00
Riccardo Spagni
f4fe39ca92
Merge pull request #1654
...
084aef70
2017-02-02 21:38:15 +02:00
Riccardo Spagni
58c87786ae
Merge pull request #1652
...
fba9332d
2017-02-02 21:36:56 +02:00
Riccardo Spagni
011c5a8a7c
Merge pull request #1647
...
2bf029be
2017-02-02 21:35:31 +02:00
Riccardo Spagni
3aa008e4c6
Merge pull request #1646
...
95f3e193
2017-02-02 21:34:31 +02:00
Riccardo Spagni
10b625079b
Merge pull request #1645
...
9bd9906e
2017-02-02 21:27:45 +02:00
Riccardo Spagni
614400e5af
Merge pull request #1643
...
69d2ad39
2017-02-02 21:26:56 +02:00
Riccardo Spagni
c3eff820be
Merge pull request #1642
...
3ae79a59ea6549e9
2017-02-02 21:25:30 +02:00
Riccardo Spagni
ab2b3480b2
Merge pull request #1639
...
48aa9cf0
2017-02-02 21:22:30 +02:00
Riccardo Spagni
72aa788a0e
Merge pull request #1636
...
cc1462e0
2017-02-02 21:12:13 +02:00
Miguel Herranz
bbcc3a125f
Add missing include
...
Fails to build without it.
2017-02-02 19:54:17 +01:00
Riccardo Spagni
5bb95fc613
Merge pull request #1634
...
99f58437
2017-02-02 19:43:05 +02:00
Riccardo Spagni
a6f61b8419
Merge pull request #1631
...
58e825065f7a87414ecab0d8
2017-02-02 19:41:25 +02:00
Riccardo Spagni
5fb3f97a55
Merge pull request #1629
...
c02e1cb9
2017-02-02 19:32:01 +02:00
Riccardo Spagni
10bf54bfc9
Merge pull request #1628
...
66665003
2017-02-02 18:44:41 +02:00
Riccardo Spagni
ca2e2c2453
Merge pull request #1627
...
55a8e982
2017-02-02 18:24:08 +02:00
Riccardo Spagni
cc03036e3e
Merge pull request #1624
...
a39cd745
2017-02-02 18:20:07 +02:00
Riccardo Spagni
f9e60dcd55
Merge pull request #1617
...
0644eed736dd3e23629e3101
2017-02-02 18:16:39 +02:00
NanoAkron
084aef700b
Added days uptime to the status message
...
Also broke down the time calculations for legibility
2017-01-31 09:49:32 +00:00
luigi1111
1cb5905e71
Merge pull request #1637
...
6b14576
2017-01-30 17:55:52 -06:00
luigi1111
3cef7fbbb6
Merge pull request 1635
...
774a213
2017-01-30 17:09:38 -06:00
Jaquee
774a21394a
Wallet API: Create wallet from keys
2017-01-30 23:28:09 +01:00
NanoAkron
fba9332de8
Changed console output for transaction from L0 to L1
2017-01-30 03:24:51 +00:00
moneromooo-monero
8c8482ac98
wallet_rpc_server: fix short payment id validation in transfer
2017-01-29 16:10:20 +00:00
Ashley Perpetual
48aa9cf035
Add change_password for simplewallet
2017-01-29 03:04:17 +08:00
moneromooo-monero
2bf029be17
wallet2: fix corner case failing to send a second output
...
If a rct transaction can be made with just one input, a second
output will be added. This output will be the smallest amount
output available. However, if this output is a non rct output
with less available fake outs than requested, the transaction
will be rejected. We now check the histogram to only consider
outputs with enough available fake outs in the first place.
2017-01-28 15:07:15 +00:00
moneromooo-monero
9bd9906e8f
Factor is_address_local code into a tools function
2017-01-28 14:57:47 +00:00
Miguel Herranz
95f3e193f0
Update and use blockchain data files defines
2017-01-28 15:55:14 +01:00
Miguel Herranz
ca94d0a43c
Separate data per P2P port
...
poolstate.bin and p2pstate.bin are stored in .bitmonero/ if the default
P2P port is being used.
If another port is used both files are stored in
.bitmonero/PORTNUMBER/.
2017-01-28 14:16:06 +01:00
moneromooo-monero
69d2ad3967
wallet_rpc_server: fix logs going to the wrong file
2017-01-28 11:37:21 +00:00
moneromooo-monero
3ae79a59e4
core: set missing verifivation_failed flag when rejecting a tx
...
This fixes two core rct tests
2017-01-28 09:43:41 +00:00
Ashley Perpetual
cc1462e0b7
Add concurrency check to rpc mining to ensure not too many threads. number of cores times 4 or 257.
2017-01-28 05:59:56 +08:00
luigi1111
4629ead8c5
Merge pull request #1618
2017-01-27 11:33:26 -06:00
Timothy D. Prime
6b145763f7
Fix clang build failure, caused by mixing C and C++
...
Easily fixed by moving a C++ header out of 'extern "C" {...}'.
When building with CC=clang CXX=clang++ make,
[ 21%] Building CXX object src/ringct/CMakeFiles/obj_ringct.dir/rctTypes.cpp.o
In file included from /home/tdprime/bitmonero/src/ringct/rctTypes.cpp:31:
In file included from /home/tdprime/bitmonero/src/ringct/rctTypes.h:43:
In file included from /home/tdprime/bitmonero/src/crypto/generic-ops.h:34:
/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/cstring💯 3: error: conflicting types for 'memchr'
memchr(void* __s, int __c, size_t __n)
^
/usr/include/string.h:92:14: note: previous declaration is here
extern void *memchr (const void *__s, int __c, size_t __n)
^
... and 4 more similar errors
2017-01-26 17:30:00 -08:00
Timothy D. Prime
99f584376e
Fix invalid + of std::string and int
...
These warnings were emitted by clang++, and they are real bugs.
src/rpc/core_rpc_server.cpp:208:58: warning: adding 'uint64_t'
(aka 'unsigned long') to a string does not append to the string
[-Wstring-plus-int]
res.status = "Error retrieving block at height " + height;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
The obvious intent is achieved by using std::to_string().
2017-01-26 10:11:37 -08:00
Lee Clagett
c02e1cb943
Updates to epee HTTP client code
...
- http_simple_client now uses std::chrono for timeouts
- http_simple_client accepts timeouts per connect / invoke call
- shortened names of epee http invoke functions
- invoke command functions only take relative path, connection
is not automatically performed
2017-01-25 15:39:32 -05:00
Alexis Enston
58e825060e
Blockfill - Sort tx pool correctly
2017-01-25 12:06:19 +00:00
Alexis Enston
5f7a8741b9
Blockfill - Take TX fees into account properly
2017-01-25 11:59:25 +00:00
Alexis Enston
4ecab0d80c
Consider empty block when filling with TXs
2017-01-25 11:59:15 +00:00
NanoAkron
66665003bd
Clear feedback to user when daemon has stopped successfully
2017-01-25 00:37:23 +00:00
kenshi84
55a8e982c0
moved get_account_address_from_str_or_url from libcommon to libcryptonote_core
2017-01-24 20:31:03 +09:00
moneromooo-monero
a39cd745c9
rpc: fix bc_dyn_stats not setting grace blocks
...
This caused a random value to be used, and the resulting
incorrect fee when it wasn't 0.
2017-01-23 19:28:00 +00:00
Riccardo Spagni
ad91ffe7e5
Merge pull request #1622
...
8141973e
2017-01-23 08:11:24 -05:00
Riccardo Spagni
6f39ba5909
Merge pull request #1621
...
feed6175
2017-01-23 08:11:02 -05:00
Miguel Herranz
8141973e00
Remove unreachable returns
...
CATCH_ENTRY_L0 already returns the second value.
2017-01-23 11:29:34 +01:00
kenshi84
feed6175ea
fixed typo: monero-wallet-cli,log
2017-01-23 11:44:06 +09:00
NanoAkron
98357db400
Update log messages to reflect fact we no longer need to type exit to save database before quitting
2017-01-23 01:21:26 +00:00
Miguel Herranz
0644eed772
Remove boost/foreach.cpp includes
2017-01-22 23:31:34 +01:00
=
e92c4fff1a
Wallet api: testnet getter
2017-01-22 23:02:01 +01:00
Miguel Herranz
36dd3e238f
Replace BOOST_REVERSE_FOREACH with ranged for
2017-01-22 21:47:39 +01:00
Miguel Herranz
629e3101ab
Replace BOOST_FOREACH with C++11 ranged for
2017-01-22 21:38:10 +01:00
moneromooo-monero
8028b5324e
protocol: log received messages in a separate category
...
Makes it easier to log just what's going on on P2P
2017-01-22 16:54:10 +00:00
Riccardo Spagni
9c06a7fd04
Merge pull request #1615
...
f0989893
2017-01-22 11:51:53 -05:00
Riccardo Spagni
17247b23bf
Merge pull request #1612
...
20f71527
2017-01-22 11:49:20 -05:00
Riccardo Spagni
a3de797e57
Merge pull request #1610
...
b70ab128
2017-01-22 11:48:39 -05:00
Riccardo Spagni
add98edfc3
Merge pull request #1609
...
4cdf0a35
2017-01-22 11:47:43 -05:00
Riccardo Spagni
f798a2ab85
Merge pull request #1606
...
f8b97aef
2017-01-22 11:43:11 -05:00
Riccardo Spagni
ee45b7a6db
Merge pull request #1605
...
7c3f79cb6cc7d261
2017-01-22 11:42:15 -05:00
Riccardo Spagni
e12f073f65
Merge pull request #1604
...
a854cec3
2017-01-22 11:41:38 -05:00
moneromooo-monero
f098989396
core: cache tx hashes of failing semantics txes
2017-01-22 16:13:31 +00:00
moneromooo-monero
20f7152769
wallet2: fix sending a rct tx with a single output available
...
This would have tried to send a second output to make the tx
look like the 2/2 ideal, but it would not fail to find one
because picking an output from preferred_inputs priority list
did not remove it from the unused tranfer/dust outputs, so
it would try to send the same output twice.
While there, I also added a check to avoid sending a second
input if it's related to the first. Better 1/2 than linking
inputs, I think.
2017-01-22 15:16:45 +00:00
moneromooo-monero
b70ab128fc
rpc: fix orphan_status when getting blocks
...
It was always set to false, even for orphan blocks
2017-01-22 12:20:55 +00:00
moneromooo-monero
4cdf0a35c9
p2p: always recreate a new peer id on startup
...
This prevents easy fingerprinting when you change IPs, and
will be a must when kovri gets used.
2017-01-22 11:37:55 +00:00
moneromooo-monero
f8b97aef34
p2p: show ban/unban logs by default again
2017-01-21 21:19:21 +00:00
moneromooo-monero
7c3f79cb9f
core: early out in handle_incoming_tx if already in pool or blockchain
2017-01-21 20:30:10 +00:00
moneromooo-monero
6cc7d26140
ringct: reorder a bit to check quicker tests first
2017-01-21 20:29:22 +00:00
moneromooo-monero
a854cec3ba
Make stack trace show up in log file with default settings
2017-01-21 20:28:18 +00:00
Miguel Herranz
1c4d65c011
Rename method to get_random_gray_peer
2017-01-21 13:04:49 +01:00
Miguel Herranz
03a54ee0c9
Fix logging that broke after rebasing
2017-01-21 11:22:04 +01:00
Miguel Herranz
6bdd3a59b5
Use set_peer_just_seen to keep last_seen updated
2017-01-21 10:11:32 +01:00
Miguel Herranz
82dbeedd1b
Add gray peer list housekeeping system
...
A random peer from the gray peer list is selected and a connection is
made to check if the peer is alive.
If the connection and handshake are successful the peer is promoted to
the white peer list, in case of failure the peer is evicted from the
gray peer list.
The connection is closed after the check in either case.
2017-01-21 10:09:38 +01:00
Riccardo Spagni
39aaea8e62
Merge pull request #1599
...
17246d05
2017-01-20 21:00:01 -05:00
Riccardo Spagni
3db3a6ee1a
Merge pull request #1593
...
cbcdf8ad
2017-01-20 20:59:09 -05:00
Riccardo Spagni
4bcd284c76
Merge pull request #1592
...
78d560a9
2017-01-20 20:58:55 -05:00
Riccardo Spagni
d5fbba45e8
Merge pull request #1589
...
87c658f8
2017-01-20 20:58:39 -05:00
Riccardo Spagni
8698dd36f2
Merge pull request #1587
...
843769f8
2017-01-20 20:56:47 -05:00
Riccardo Spagni
d10425025a
Merge pull request #1572
...
0e0e6c5f3f269e98
2017-01-20 20:54:04 -05:00
moneromooo-monero
17246d051d
wallet: print exception message on get_random_outs_error
2017-01-20 18:01:13 +00:00
Miguel Herranz
cbcdf8ad35
Honor depth in get_peerlist_head method
...
The method returned depth + 2 because:
- push_back was executed before the condition.
- > instead of >= causing one more iteration.
2017-01-18 21:41:52 +01:00
kenshi84
78d560a933
simplewallet: use MAKE_CORE_RPC_VERSION(1,4) instead of 0x10004
2017-01-18 16:11:18 +09:00
moneromooo-monero
87c658f83b
wallet2_api: add API to set log categories
2017-01-16 21:14:44 +00:00
Howard Chu
843769f88f
Tweak some msg loglevels
2017-01-16 20:42:59 +00:00
Miguel Herranz
0e0e6c5f39
Reduce to one connection per IP
2017-01-16 18:16:32 +01:00
Riccardo Spagni
71ac698b78
Merge pull request #1585
...
a480bf6b
2017-01-16 08:41:33 -05:00
Riccardo Spagni
deb6728bc3
Merge pull request #1584
...
990e08f0
2017-01-16 08:41:15 -05:00
moneromooo-monero
a480bf6b14
fixups in logging init calls, and add missing net context in a log
2017-01-16 10:45:59 +00:00
Howard Chu
990e08f090
Fix PR#1506, off by one in chain height
2017-01-16 10:00:06 +00:00
moneromooo-monero
693c190881
wallet: add a node RPC cache layer for simple RPC calls
...
Mostly getinfo and get_hard_fork_info, which are called
pretty often. This speeds up transfers as a bonus.
2017-01-16 08:59:15 +00:00
moneromooo-monero
d86ae2bec6
wallet2: reuse fake outs when adjusting fee on transfer
...
This avoids indirectly leaking the real output to the daemon,
and is faster.
This will still happen for more complex cases, especially
when cancelling a tx and "re-rolling" it.
2017-01-16 08:59:08 +00:00
moneromooo-monero
64da0983d5
core: don't try to deserialize an empty extra to remove a field
2017-01-16 08:59:02 +00:00
Riccardo Spagni
ab69d5b367
Merge pull request #1569
...
16b8b66a
2017-01-15 20:32:57 -05:00
kenshi84
16b8b66adc
specify restore height by YYYY-MM-DD format
2017-01-16 10:00:28 +09:00
moneromooo-monero
5833d66f65
Change logging to easylogging++
...
This replaces the epee and data_loggers logging systems with
a single one, and also adds filename:line and explicit severity
levels. Categories may be defined, and logging severity set
by category (or set of categories). epee style 0-4 log level
maps to a sensible severity configuration. Log files now also
rotate when reaching 100 MB.
To select which logs to output, use the MONERO_LOGS environment
variable, with a comma separated list of categories (globs are
supported), with their requested severity level after a colon.
If a log matches more than one such setting, the last one in
the configuration string applies. A few examples:
This one is (mostly) silent, only outputting fatal errors:
MONERO_LOGS=*:FATAL
This one is very verbose:
MONERO_LOGS=*:TRACE
This one is totally silent (logwise):
MONERO_LOGS=""
This one outputs all errors and warnings, except for the
"verify" category, which prints just fatal errors (the verify
category is used for logs about incoming transactions and
blocks, and it is expected that some/many will fail to verify,
hence we don't want the spam):
MONERO_LOGS=*:WARNING,verify:FATAL
Log levels are, in decreasing order of priority:
FATAL, ERROR, WARNING, INFO, DEBUG, TRACE
Subcategories may be added using prefixes and globs. This
example will output net.p2p logs at the TRACE level, but all
other net* logs only at INFO:
MONERO_LOGS=*:ERROR,net*:INFO,net.p2p:TRACE
Logs which are intended for the user (which Monero was using
a lot through epee, but really isn't a nice way to go things)
should use the "global" category. There are a few helper macros
for using this category, eg: MGINFO("this shows up by default")
or MGINFO_RED("this is red"), to try to keep a similar look
and feel for now.
Existing epee log macros still exist, and map to the new log
levels, but since they're used as a "user facing" UI element
as much as a logging system, they often don't map well to log
severities (ie, a log level 0 log may be an error, or may be
something we want the user to see, such as an important info).
In those cases, I tried to use the new macros. In other cases,
I left the existing macros in. When modifying logs, it is
probably best to switch to the new macros with explicit levels.
The --log-level options and set_log commands now also accept
category settings, in addition to the epee style log levels.
2017-01-16 00:25:46 +00:00
Riccardo Spagni
e459d8604d
Merge pull request #1578
...
ce866d1c
2017-01-15 19:13:45 -05:00
Riccardo Spagni
422a36ca2a
Merge pull request #1581
...
6da9335a
2017-01-15 19:13:28 -05:00
Riccardo Spagni
ec323d8c3f
Merge pull request #1561
...
d561f4ad0aefb2f6629d5b76fb76d4393b6d5f25fcf66925296f8c16
2017-01-15 19:01:08 -05:00
kenshi84
ce866d1cc6
macro to define core RPC version for avoiding future mistake
2017-01-16 07:55:43 +09:00
moneromooo-monero
6da9335a9e
blockchain_import: fix build after tx_pool::add_tx changes
2017-01-15 21:52:56 +00:00
Riccardo Spagni
b2e1568335
Merge pull request #1579
...
f5f4109f
2017-01-15 14:58:09 -05:00
Riccardo Spagni
99ffc49740
Merge pull request #1577
...
feb499aa
2017-01-15 14:57:30 -05:00
Riccardo Spagni
1207d8ad0d
Merge pull request #1576
...
ba3968f6
2017-01-15 14:56:39 -05:00
Riccardo Spagni
9cda94d0aa
Merge pull request #1574
...
d276a165
2017-01-15 14:55:40 -05:00
Riccardo Spagni
f00797a1f2
Merge pull request #1573
...
dea53962
2017-01-15 14:55:12 -05:00
Riccardo Spagni
10c6afd316
Merge pull request #1571
...
81c384e4
2017-01-15 14:50:10 -05:00
