Riccardo Spagni
7995dcff94
Merge pull request #2112
...
76043b17#2117 ) (moneromooo-monero)
a73a42a6#2117 ) (moneromooo-monero)
be9d4f04
2017-07-03 12:27:14 +02:00
Riccardo Spagni
bbdbccfba0
Merge pull request #2110
...
7d2c89b63255887f
2017-07-03 12:26:02 +02:00
Riccardo Spagni
c577bc8762
Merge pull request #2107
...
bdab3436
2017-07-03 12:24:16 +02:00
Riccardo Spagni
9e1ded69dd
Merge pull request #2106
...
bb708ab8
2017-07-03 12:23:39 +02:00
moneromooo-monero
02d66db4b4
tx_pool: initialize padding in txpool meta structure
2017-07-02 18:45:29 +01:00
moneromooo-monero
0722aea3df
cryptonote_core: initialize checkpoint flag
2017-07-02 18:45:25 +01:00
moneromooo-monero
5cea355232
simplewallet: lock idle scope when sweeping
...
This ensures the chain and related structures can't change
while we're using them
2017-06-30 09:33:37 +01:00
Howard Chu
464afd4d2d
Ensure DNSResolver destructor runs on exit
...
Plugs a noisy but benign memory leak
2017-06-28 22:21:06 +01:00
moneromooo-monero
8f96cfc20a
Remove typeid use in network_address
...
Since I had to add an ID to the derived classes anyway,
this can be used instead. This removes an apparently
pointless warning from CLANG too.
2017-06-28 09:11:24 +01:00
binaryFate
f98bf48b1d
Minor cleanup: tab vs. space + logs messages
2017-06-26 12:30:14 +02:00
binaryFate
5a09d79caf
Fix #2120 : return per-tx amount in transfer_split RPC call.
2017-06-26 12:22:12 +02:00
moneromooo-monero
3b599d2b7e
wallet2: get current height from the daemon on creation
...
Use current time to estimate current height only if the daemon
cannot be queried.
2017-06-26 08:11:14 +01:00
moneromooo-monero
d3bb72fff1
wallet2: fix infinite loop on future refresh height
...
If the refresh height is in the future, the current code will
loop till the actual height reaches this. Fix it by bailing out
if we receive only three hashes, which is what we set in the
call parameters.
2017-06-26 06:58:37 +01:00
moneromooo-monero
32754784db
wallet: fix refresh_from_height setting on new wallet
...
The previous patch was based on a wrong premise (that the
daemon height was 0 because the daemon calling code wasn't
yet initialized). In fact, current height approximation
was not setup for testnet. Fix this.
2017-06-26 06:58:31 +01:00
Jethro Grassie
be9d4f0411
Fix multiline wallet cli output with readline
...
monero-wallet-cli commands which have multine output sometimes causes
issues with the readline support. This patch fixes show_transfers,
payments and incoming_transfers.
2017-06-25 10:48:02 -04:00
Riccardo Spagni
50d8f73f06
Merge pull request #2091
...
e4da88a2
2017-06-24 12:43:28 +02:00
Riccardo Spagni
f31b89012d
Merge pull request #2073
...
07c4276ccf3a376c340830de
2017-06-24 12:41:09 +02:00
Mike C
b592cb3f0a
Fix on_transfer RPC incorrect logging info
2017-06-23 11:54:10 -04:00
Guillaume LE VAILLANT
3255887f5e
simplewallet: typo fixes
2017-06-23 14:04:44 +02:00
Julien Klepatch
bdab3436d3
Fix mismatch of parameter name between header file and implementation for set_user_options()
2017-06-23 05:16:11 +08:00
moneromooo-monero
bb708ab8c3
electrum-words: fix seed mistakenly thought to be old style
...
It'd see "empty" words due to extraneous spaces
2017-06-22 16:47:07 +01:00
stoffu
d5f1cef73c
simplewallet: removed unneeded LOCK_IDLE_SCOPE() from check_tx_key()
2017-06-22 18:11:20 +09:00
stoffu
8df918f8c7
simplewallet: replace assert(m_wallet) with error out
2017-06-22 18:11:18 +09:00
stoffu
8da82256d4
crypto: moved boost::lock_guard into a smaller scope
2017-06-22 18:11:15 +09:00
stoffu
c9e0e944e9
Signature proving payment to destination by only revealing key derivation, not the actual tx secret key
2017-06-22 18:11:13 +09:00
Riccardo Spagni
ae8841f2ab
Merge pull request #2087
...
4e13ab30
2017-06-18 17:36:55 +02:00
Riccardo Spagni
78f965a9e2
Merge pull request #2082
...
235df7f4
2017-06-18 17:36:12 +02:00
Riccardo Spagni
91e1a7e3e2
Merge pull request #2081
...
b2319a03
2017-06-18 17:34:41 +02:00
Riccardo Spagni
f973a2f81a
Merge pull request #2078
...
1dd52415Fix #1991 asm multiply again (Howard Chu)
2017-06-18 17:32:03 +02:00
Riccardo Spagni
fb7d6db051
Merge pull request #2076
...
ac0714dc
2017-06-18 17:27:52 +02:00
Riccardo Spagni
ae5f7c71d7
Merge pull request #2074
...
e1f3dfcc
2017-06-18 17:26:08 +02:00
Riccardo Spagni
88b7cb9bda
Merge pull request #2070
...
71f8249a
2017-06-18 16:43:35 +02:00
Riccardo Spagni
ace1440b65
Merge pull request #2066
...
3fc22e7bd09620b0
2017-06-18 16:41:42 +02:00
Riccardo Spagni
a0174ad534
Merge pull request #2064
...
6fc2dc39
2017-06-18 16:40:52 +02:00
jethro
e1f3dfccc8
Add readline support to cli
...
This PR adds readline support to the daemon and monero-wallet-cli. Only
GNU readline is supported (e.g. not libedit) and there are cmake checks
to ensure this.
There is a cmake variable, Readline_ROOT_DIR that can specify a
directory to find readline, otherwise some default paths are searched.
There is also a cmake option, USE_READLINE, that defaults to ON. If set
to ON, if readline is not found, the build continues but without
readline support.
One negative side effect of using readline is that the color prompt in
the wallet-cli now has no color and just uses terminal default. I know
how to fix this but it's quite a big change so will tackle another time.
2017-06-18 10:08:37 -04:00
Riccardo Spagni
421a6d0340
Merge pull request #2055
...
1b75ad91
2017-06-18 14:24:48 +02:00
Riccardo Spagni
a237f90c5b
Merge pull request #2052
...
072102cf
2017-06-18 14:23:59 +02:00
Julien Klepatch
e4da88a223
Fixed typo in rpc/core_rpc_server.cpp
2017-06-18 16:12:54 +08:00
Howard Chu
07c4276cbe
Don't issue a new timedsync while one is already in progress
...
A timedsync is issued every minute on a connection, but the input
tineout is 2 minutes. This means a new sync request could be issued
while a slow sync request was already in progress. The additional
request will further clog the network on a slow connection, and
cause a premature timeout.
2017-06-15 16:54:03 +01:00
moneromooo-monero
4e13ab306a
wallet_api: fix missing transaction parameter in callback
...
It was unused, so harmless
Reported by erikd on IRC
2017-06-13 19:34:51 +01:00
moneromooo-monero
235df7f484
blockchain_db: add a txpool tx getter which returns existence
...
Avoids exception spam for the "nope, not found" case
2017-06-11 15:36:48 +01:00
moneromooo-monero
b2319a03a6
simplewallet: new command to generate a random payment id
...
This is trivial, but often requested, and possibly hard to do
in Windows. That makes it more user friendly.
2017-06-10 10:08:55 +01:00
Howard Chu
1dd524151d
Fix #1991 asm multiply again
...
Tweak temp variables and constraints. Was working before if not inlined
but newer gcc tends to inline it.
2017-06-08 21:46:40 +01:00
jethro
1b75ad91aa
Add OSX background mining
...
Implements miner::get_system_times, miner::get_process_time and
miner::on_battery_power for OSX so that background mining works on OSX.
2017-06-08 09:26:09 -04:00
Michael Shick
ac0714dcd7
add simplewallet --generate-new-wallet arg checks
...
Add fail-fast paths that reduce frustration around the misuse of
--wallet-file combined with --restore-deterministic-wallet. Flow now
gives more descriptive errors and avoids having users type in their
whole seed before the failure condition is noticed.
2017-06-07 07:46:59 -07:00
Howard Chu
3fc22e7b78
Add histogram to poolstats
2017-06-04 22:48:14 +01:00
Robby Weinberg
71f8249a08
Prevent crash if performing certain actions before wallet is initialized
2017-06-03 19:56:51 -05:00
moneromooo-monero
6fc2dc3927
cryptonote_protocol_handler: fix crash in debug log
2017-06-01 19:42:33 +01:00
Riccardo Spagni
ea286d1a14
Merge pull request #2058
...
6bcd3b2d
2017-06-01 19:42:37 +02:00
Riccardo Spagni
3d397325bf
Merge pull request #2063
...
d17c0fc2
2017-06-01 19:33:43 +02:00
Riccardo Spagni
4a60e9e66e
Merge pull request #2062
...
31417d57
2017-06-01 19:33:17 +02:00
Howard Chu
5414970dcd
Speedup print_pool_stats
...
Since we're just counting txs, there's no reason to deserialize all the blobs.
2017-06-01 17:34:03 +01:00
Howard Chu
d17c0fc2d0
Don't copy blockchain for coinbase_tx_sum
...
Changed Blockchain::for_all_blocks() to for_blocks_range()
Operate on blockchain in-place instead of building a copy first.
2017-06-01 14:14:24 +01:00
moneromooo-monero
31417d57da
tx_pool: add missing blockchain lock in add_tx
2017-05-31 22:55:13 +01:00
schnerchi
6bcd3b2df1
fix get_upper_transaction rename
2017-05-31 12:26:42 +02:00
Riccardo Spagni
8fbbefb8db
Merge pull request #2053
...
05f3dcf7
2017-05-30 21:28:40 +02:00
Riccardo Spagni
f5e65452ce
Merge pull request #2042
...
740bc24c
2017-05-30 21:24:45 +02:00
Riccardo Spagni
a4c13ea092
Merge pull request #2039
...
4b932ff3
2017-05-30 21:24:11 +02:00
Riccardo Spagni
4284f1777d
Merge pull request #2038
...
89e20bb9
2017-05-30 21:23:25 +02:00
Riccardo Spagni
cd13bcb4d2
Merge pull request #2036
...
89b2f306a374a522
2017-05-30 21:23:05 +02:00
Riccardo Spagni
9ea7fbed8a
Merge pull request #2032
...
dd8e3266
2017-05-30 21:21:36 +02:00
Riccardo Spagni
907ce14b18
Merge pull request #2026
...
a5739201
2017-05-30 21:20:39 +02:00
Riccardo Spagni
d621f9e558
Merge pull request #2022
...
e25293473029d0ef
2017-05-30 21:19:00 +02:00
Riccardo Spagni
62cc3b6447
Merge pull request #2021
...
8ac2496c
2017-05-30 21:15:33 +02:00
Riccardo Spagni
024860b49d
Merge pull request #2020
...
6cb1ad1f
2017-05-30 21:14:24 +02:00
Riccardo Spagni
1555e7673d
Merge pull request #2017
...
0a182576391c918d
2017-05-30 21:13:47 +02:00
Riccardo Spagni
545e2b003c
Merge pull request #1982
...
b52abd13
2017-05-30 21:12:44 +02:00
moneromooo-monero
05f3dcf738
simplewallet: fix refresh height for new wallets
...
With the recent change to wallet creation code, the code was
calling to the daemon before the wallet's daemon address was
initialized, and thus failing. This was causing all new wallets
to refresh from 0 instead of just fetching early block hashes.
2017-05-28 13:17:32 +01:00
moneromooo-monero
072102cfd2
abstracted nework addresses
...
All code which was using ip and port now uses a new IPv4 object,
subclass of a new network_address class. This will allow easy
addition of I2P addresses later (and also IPv6, etc).
Both old style and new style peer lists are now sent in the P2P
protocol, which is inefficient but allows peers using both
codebases to talk to each other. This will be removed in the
future. No other subclasses than IPv4 exist yet.
2017-05-27 11:35:54 +01:00
moneromooo-monero
0a182576d0
node_rpc_proxy: fix earliest fork height query for unknown forks
2017-05-26 21:34:44 +01:00
moneromooo-monero
b52abd1370
Move txpool to the database
...
Integration could go further (ie, return_tx_to_pool calls should
not be needed anymore, possibly other things).
poolstate.bin is now obsolete.
2017-05-25 22:23:37 +01:00
Jaquee
740bc24c95
Wallet API: Set seed lang when recovering form keys
2017-05-23 14:01:23 +02:00
Gentian
4b932ff314
changed crypto to cncrypto so it generated libcncrypto
...
fix a cmakelist
2017-05-23 07:45:40 -04:00
xmr-eric
89e20bb9af
Fix typo
2017-05-19 00:40:51 -04:00
moneromooo-monero
a374a522df
wallet2: check key image validity domain in import_key_images
2017-05-18 09:19:48 +01:00
stoffu
dd8e3266b2
shared libs build (i.e. make debug)
2017-05-17 10:17:08 +09:00
xmr-eric
a57392016b
Update sync time copy
2017-05-10 14:34:18 -04:00
Nano Akron
e2529347b6
Correct spelling of 'get_upper_transaction_size_limit'
2017-05-09 16:02:57 +01:00
Nano Akron
3029d0efb3
Remove the 1.25x multiplier in max transaction size in just the wallet
2017-05-09 16:01:11 +01:00
stoffu
8ac2496c5d
corrected typo in help regarding min-outputs-*
2017-05-09 12:06:46 +09:00
stoffu
6cb1ad1fa2
wallet fix: ensure iterator to be valid
2017-05-09 11:54:21 +09:00
moneromooo-monero
391c918d87
wallet2: fix sweep_unmixable assuming wrong minimum mixin at v5
...
The bump to minimum mixin 4 was moved from v5 to v6
2017-05-07 18:27:25 +01:00
Riccardo Spagni
81b370d5a1
Merge pull request #2012
...
bbf4c210
2017-05-05 11:35:03 +02:00
Riccardo Spagni
c17102c385
Merge pull request #2002
...
12fff108533187f0
2017-05-05 11:29:51 +02:00
Riccardo Spagni
ed09652a17
Merge pull request #1701
...
8277e67f
2017-05-05 11:26:11 +02:00
Jaquee
bbf4c21048
Wallet API: add spend/view key getters
2017-05-02 16:48:38 +02:00
Nano Akron
12fff108ea
Change Old_English to English_Old - 'Old English' is actually a language
2017-04-24 20:27:12 +01:00
moneromooo-monero
6df83b3efb
wallet: add sweep_below function
...
It sweeps all outputs below the given threshold
This is available via the existing sweep_all RPC, by setting
amount_threshold the desired amount (in atomic units)
2017-04-24 19:50:37 +01:00
Nano Akron
533187f0c3
Change all wallet language names into native names (and scripts)
2017-04-24 11:17:33 +01:00
Riccardo Spagni
9a9fb0483f
Merge pull request #1996
...
a6d5bb75ac1aba90
2017-04-24 10:55:24 +02:00
Riccardo Spagni
999b0f399d
Merge pull request #1989
...
7f4beaa4
2017-04-24 10:50:54 +02:00
Riccardo Spagni
0385999cda
Merge pull request #1984
...
a255a5405fce581c
2017-04-24 10:49:51 +02:00
Riccardo Spagni
e53dd76a49
Merge pull request #1983
...
72d113dd54bcd260
2017-04-24 10:49:24 +02:00
Riccardo Spagni
ae1d816768
Merge pull request #1976
...
a7d78dda
2017-04-24 10:48:56 +02:00
Riccardo Spagni
ed082a747a
Merge pull request #1973
...
e9fb44ed
2017-04-24 10:48:20 +02:00
Riccardo Spagni
865bb03ecf
Merge pull request #1968
...
5e5b85126c72d6a0e65d66fea4673218a3d77901
2017-04-24 10:46:23 +02:00
Riccardo Spagni
29a77c9b19
Merge pull request #1961
...
89d70756
2017-04-24 10:43:39 +02:00
Riccardo Spagni
0a6da8929d
Merge pull request #1959
...
10e137be
2017-04-24 10:43:13 +02:00
Riccardo Spagni
f65d739c41
Merge pull request #1954
...
110b6831Resolve #92 add ability to create wallets thru RPC (Howard Chu)
2017-04-24 10:42:10 +02:00
Riccardo Spagni
acbe0b4849
Merge pull request #1938
...
bff90264
2017-04-24 10:41:32 +02:00
moneromooo-monero
a6d5bb75fe
wallet2: refer to triangular distribution for recent zone in comment
...
It was wrongly refering to equiprobable distribution, which I think
I'd originally done, but forgot to update the comment after changing
to triangular
Reported by smooth on IRC
2017-04-22 11:22:39 +01:00
moneromooo-monero
ac1aba90f8
wallet2: bias fake outs more towards recent outputs
...
Two recent papers quantified the real usage bias for the
real output in a ring being the true one, and shows that
the current biasing is much too weak.
While we wait for a better solution, we increase the ratio
of recent-to-total fake outputs, as well as decrease the
time window for recent outputs, so that half the fake outs
are selected within the last 1.8 day. Value plucked from
figure 10, page 11 of An Empirical Analysis of Linkability
in the Monero Blockchain, 2017, Miller et al.
This is also arbitrary, of course, but serves as a stopgap
till a better selection algorithm is chosen.
2017-04-22 10:29:03 +01:00
assylias
bff90264b8
Add expected total reward to RPC "getblocktemplate".
...
Only works from V5 fork onward - returns 0 before that block.
2017-04-19 18:28:16 +01:00
moneromooo-monero
7f4beaa44a
wallet2: fix removal of wrong txes from unconfirmed_payments
...
unconfirmed_payments changed from having the txid as key to
the payment id, and this was not changed to match.
2017-04-17 19:37:13 +01:00
Nano Akron
72d113dd38
Amended software licenses for Portuguese and Spanish
2017-04-16 12:15:59 +01:00
Nano Akron
54bcd260ff
Added Simplified Chinese electrum word list
2017-04-16 12:06:53 +01:00
moneromooo-monero
a255a5407f
simplewallet: allow multiline seed
...
People are likely to enter it in three lines as it is how it
is displayed at creation time
2017-04-16 11:52:30 +01:00
moneromooo-monero
5fce581ce3
mnemonics: ignore multiple whitespace between words
2017-04-16 11:29:21 +01:00
moneromooo-monero
a7d78dda77
wallet2: fix --generate-from-json in RPC mode
...
The daemon address was initialized too late
2017-04-14 22:12:20 +01:00
hyc
a467321800
Clean up ARMv8-a aes_expand_key()
...
The inline asm was lying about its parameters
2017-04-12 23:53:08 +01:00
hyc
a3d779013d
Fix block_longhash_worker thread
...
Wasn't getting its stack size initialized; crashes on Android
with a default stack size of 1MB.
2017-04-12 23:51:18 +01:00
kenshi84
e9fb44ed3c
wallet cli: removed some inappropriate return-false
2017-04-12 21:33:19 +09:00
Lee Clagett
93e10f1cc4
Simplified the implementation and features of span
2017-04-11 16:35:14 -04:00
Lee Clagett
4a8f96f95d
Improvements for epee binary to hex functions:
...
- Performance improvements
- Added `span` for zero-copy pointer+length arguments
- Added `std::ostream` overload for direct writing to output buffers
- Removal of unused `string_tools::buff_to_hex`
2017-04-11 16:35:00 -04:00
Howard Chu
110b683152
Resolve #92 add ability to create wallets thru RPC
...
Reviewed and squashed. Open/Create is only allowed if no walletfile
was specified at startup.
2017-04-11 01:22:44 +01:00
Riccardo Spagni
9ed496bbc5
Merge pull request #1956
...
eb20f72037be70bb893f5a30
2017-04-11 00:34:46 +02:00
Riccardo Spagni
c8dd4c58ce
Merge pull request #1955
...
5b632468
2017-04-11 00:34:03 +02:00
Riccardo Spagni
878c4ee913
Merge pull request #1952
...
548075b1
2017-04-11 00:32:30 +02:00
Riccardo Spagni
4be94be168
Merge pull request #1951
...
0a7885bf
2017-04-11 00:26:47 +02:00
Riccardo Spagni
e9ca165b1a
Merge pull request #1950
...
f5bd3465d8a88d05
2017-04-11 00:26:15 +02:00
Riccardo Spagni
9c2bcabcdd
Merge pull request #1949
...
0ee018b49ae566d0aae14a10
2017-04-11 00:25:09 +02:00
Riccardo Spagni
6353e5b0e5
Merge pull request #1946
...
a38343bf
2017-04-11 00:23:43 +02:00
Riccardo Spagni
17e8ce8c35
Merge pull request #1940
...
17c7c62d
2017-04-11 00:19:32 +02:00
Riccardo Spagni
2037083b5f
Merge pull request #1937
...
64377c90
2017-04-11 00:15:24 +02:00
Riccardo Spagni
bf665e5991
Merge pull request #1931
...
89e100bc
2017-04-11 00:14:02 +02:00
Riccardo Spagni
541e1ff474
Merge pull request #1929
...
89949706
2017-04-11 00:13:40 +02:00
moneromooo-monero
89d707566a
wallet2: fix spurious output splitting when not merging destinations
2017-04-08 11:13:28 +01:00
moneromooo-monero
10e137be3a
wallet2: mention escaping/quoting --password in help string
2017-04-06 21:24:55 +01:00
moneromooo-monero
eb20f7209e
daemon: print average fee per byte in print_pool_stats
2017-04-04 19:00:57 +01:00
moneromooo-monero
37be70bbd7
daemon: add fee/byte when print pool transaction info
2017-04-04 09:04:39 +01:00
moneromooo-monero
893f5a301e
tx_pool: add blob size and fee/byte when logging a new tx
2017-04-04 09:04:11 +01:00
moneromooo-monero
5b63246813
core: fix blob size cache, and reenable hash and blob size caches
2017-04-03 22:19:57 +01:00
Jaquee
f5bd346573
IOS CMAKE build settings
2017-04-03 18:38:50 +02:00
Jaquee
0a7885bf19
Wallet API: fix Cold signing split tx
2017-04-02 14:19:21 +02:00
moneromooo-monero
548075b1f5
daemon: new relay_tx command and RPC
2017-04-02 12:17:35 +01:00
moneromooo-monero
0ee018b407
wallet2: do not go over the target tx size if many destinations
...
If using a large input and many destinations, the code would
generate as many outputs as it could using that input, even if
it would bring the resulting tx above the max tx size.
2017-04-02 11:13:15 +01:00
moneromooo-monero
9ae566d0dd
simplewallet: fix cold signing of split transactions
...
They'd be rejected as suspicious as the change goes to more
than one destination. However, split transactions will most
likely include fake zero amount change to random addresses,
so we only consider change with non zero amount for this.
2017-04-02 11:11:18 +01:00
moneromooo-monero
aae14a107a
simplewallet: allow setting confirm-missing-payment-id in watch wallets
...
These can create transactions, even though they cannot sign them.
2017-04-02 11:10:11 +01:00
Antti Keränen
17c7c62d55
Add per transaction fee to transfer command
...
Allows priority argument default/unimportant/normal/elevated/priority to
be used per transaction in CLI wallet's transfer command. Resolves #1913 .
2017-04-01 09:59:15 +03:00
moneromooo-monero
a38343bf68
miner: add a debug log in pause and resume
2017-03-31 20:01:58 +01:00
Guillaume LE VAILLANT
64377c90b5
Add other possible paths of AC power status file on Linux
2017-03-28 11:35:18 +02:00
kenshi84
89e100bc8c
wallet cli: remove redundant password confirm in donate command
2017-03-27 11:02:20 +09:00
Riccardo Spagni
d1530f06bb
update version to 0.10.3.1 tag
2017-03-26 23:29:31 +02:00
moneromooo-monero
899497069b
simplewallet: factor the per-variable code in set_variable
2017-03-26 17:52:36 +01:00
moneromooo-monero
a96f9baeb4
core: disable tx/block hash cache
...
Looks like it doesn't work on win64
2017-03-26 02:21:01 +01:00
Riccardo Spagni
b1313aefd8
Merge pull request #1925
...
93b32892
2017-03-25 17:36:23 +02:00
Riccardo Spagni
f64a0f2243
Merge pull request #1917
...
6e679478e98f1114
2017-03-25 17:35:52 +02:00
Guillaume LE VAILLANT
93b32892f7
Silence warning about possibly uninitialized pointer
2017-03-25 13:53:14 +01:00
moneromooo-monero
6e6794786a
mnemonics: sanity checks for word lists
...
and a test to go with it
Remember to run the test when changing word lists, or simplewallet
will throw uncaught if that word list is used.
2017-03-25 12:14:01 +00:00
moneromooo-monero
e98f1114a0
mnemonics: misc cleanup
...
Pass relevant information to the base class instead of overwriting
default values later, use objects instead of pointers to objects
to avoid having to new objects unnecessarily.
2017-03-25 11:51:04 +00:00
moneromooo-monero
a50c4a4fad
wallet: option to merge destinations
...
With the change from the original transfer method to the new
algorithm, payments to the same destination were merged. It
seemed like a good idea, optimizing space. However, it is a
useful tool for people who want to split large outputs into
several smaller ones (ie, service providers making frequent
payments, and who do not like a large chunk of their balance
being locked for 10 blocks after each payment).
Default to off, which is a change from the previous behavior.
2017-03-25 11:44:04 +00:00
Riccardo Spagni
e3d2b135e7
Merge pull request #1924
...
6d315459
2017-03-25 13:29:36 +02:00
Riccardo Spagni
119803f26e
Merge pull request #1921
...
2bee92dbd17179d1
2017-03-25 13:29:11 +02:00
Riccardo Spagni
4737f61c81
Merge pull request #1919
...
0ad87db0
2017-03-25 13:28:19 +02:00
moneromooo-monero
6d315459b6
core: avoid possible reordering bugs wth tx/bloch hash cache
2017-03-25 09:18:53 +00:00
Derek Zhang
2bee92dbd0
Fixed typo in v5 hard fork finalized date
2017-03-24 18:06:55 -07:00
Derek Zhang
d17179d14b
Fixed typo in CLI wallet help message
2017-03-24 18:05:05 -07:00
Roy Jacobs
5a4827ae21
Add Dutch mnemonics wordlist
2017-03-25 00:58:35 +01:00
moneromooo-monero
0ad87db01f
wallet: try to save large outputs when using an unneeded second input
...
When a single input is enough to satisfy a transfer, the code would
previously try to add a second input, to match the "canonical" makeup
of a transaction with two inputs and two outputs. This would cause
wallets to slowly merge outputs till all the monero ends up in a
single output, which causes trouble when making two transactions
one after the other, since change is locked for 10 blocks, and an
increasing portion of the remaining balance would end up locked on
each transaction.
There are two new settings (min-output-count and min-output-value)
which can control when to stop adding such unneeded second outputs.
The idea is that small "dust" outputs will still get added, but
larger ones will not.
Enable with, eg:
set min-output-count 10
set min-output-value 30
to avoid using an unneeded second output of 30 monero or more, if
there would be less than 10 such outputs left.
This does not invalidate any other reason why such outputs would
be used (ie, when they're really needed to satisfy a transfer, or
when randomly picked in the normal course of selection). This may
be improved in the future.
2017-03-24 21:04:08 +00:00
Riccardo Spagni
11e24bb2ba
Merge pull request #1916
...
5a798358
2017-03-24 14:36:44 +02:00
Riccardo Spagni
92c2d79d10
Merge pull request #1915
...
a8646b09
2017-03-24 14:34:55 +02:00
Riccardo Spagni
20387386b9
Merge pull request #1914
...
31616af3Fixes #1850 - Add French mnemonics wordlist (assylias)
2017-03-24 14:34:07 +02:00
Riccardo Spagni
f543377789
Merge pull request #1894
...
8bbcbcfb
2017-03-24 14:33:47 +02:00
moneromooo-monero
5a7983585e
blockchain: offset v5 addition date on testnet
...
to silence the update warning, since v5 was done very early
on testnet
2017-03-24 10:01:15 +00:00
Jaquee
a8646b0957
Wallet API: add hard fork info functions
2017-03-24 09:59:26 +01:00
assylias
31616af33d
Fixes #1850 - Add French mnemonics wordlist
2017-03-23 21:53:20 +00:00
Riccardo Spagni
16f12f0628
Merge pull request #1912
...
00cbf720
2017-03-23 11:47:26 +02:00
Riccardo Spagni
a73a886cb1
Merge pull request #1911
...
91d41090aaeb164c558cfc31f065234b
2017-03-23 11:46:57 +02:00
Riccardo Spagni
7432f13898
Merge pull request #1910
...
9bccf1b1
2017-03-23 11:46:29 +02:00
Riccardo Spagni
8188f6bfe8
Merge pull request #1908
...
c94f8fac
2017-03-23 11:45:49 +02:00
Riccardo Spagni
4ec8a4c2b6
Merge pull request #1905
...
2242d8eb
2017-03-23 11:45:00 +02:00
moneromooo-monero
91d4109023
tx_pool: ensure txes loaded from poolstate.bin have their txid cached
...
The txid is not saved, and we want to make sure the transactions
have their txid cached while in the pool, since get_transactions
copies the transaction object, so any txid calculation on those
copies would not benefit any later caller, since the original tx
would be left without a cached txid.
2017-03-23 09:25:33 +00:00
moneromooo-monero
aaeb164cf6
tx_pool: remove transactions if they're in the blockchain
...
When starting up, if the pool state was not saved, the pool
might contain transactions which made it into the blockchain,
so these need removing
2017-03-23 09:25:29 +00:00
moneromooo-monero
558cfc31ca
core, wallet: faster tx pool scanning
...
Includes a new RPC to get tx pool hashes fast.
2017-03-23 09:25:22 +00:00
moneromooo-monero
f065234b71
core: cache tx and block hashes in the respective classes
...
An idea from smooth
2017-03-23 09:25:17 +00:00
moneromooo-monero
00cbf72064
ringct: move ge_frombytes_vartime failure error to warning
...
Avoids scaring people when seeing some invalid txes
2017-03-22 21:26:38 +00:00
Akademik Prokhor Zakharov
9bccf1b11e
Transfer help
...
New pull request because I couldn't figure out how to change the previous one.
1. For clarity, I want to focus the help text for the 'transfer' command on the most typical use case (a single payment).
2. New users will prefer to use 'transfer', so the older method 'transfer_original' should refer to 'transfer' rather than the other way around.
2017-03-22 14:10:34 +01:00
moneromooo-monero
c94f8facf5
daemon: better error reporting in commands
2017-03-21 19:21:00 +00:00
moneromooo-monero
2242d8ebd6
tx_pool: silence use of uninitialized warning
...
The result is not actually used when uninitialized
2017-03-21 12:21:19 +00:00
Riccardo Spagni
4b34531307
Merge pull request #1897
...
44a5b038
2017-03-21 14:10:36 +02:00
Riccardo Spagni
70e71a1845
Merge pull request #1904
...
995969b1
2017-03-21 14:09:42 +02:00
Riccardo Spagni
7769a6e757
Merge pull request #1903
...
350e99ae
2017-03-21 14:09:19 +02:00
Riccardo Spagni
9d157b519d
Merge pull request #1899
...
c1e9ccc7
2017-03-21 14:08:36 +02:00
moneromooo-monero
995969b190
wallet: fix set_log not handling 0,xxx style settings
2017-03-21 11:17:05 +00:00
moneromooo-monero
350e99ae57
wallet2: cache which pool txes were scanned already
...
This massively speeds up the wallet updating the pool on mainnet,
where the tx backlog is more than 500 txes.
2017-03-21 10:30:25 +00:00
moneromooo-monero
7c03349869
blockchain: lower the relay fee by 2%
...
This ensures we accept txes with a fee that's slightly too small,
to accomodate blockchain median jitter
2017-03-20 19:14:12 +00:00
moneromooo-monero
266492e919
tx_pool: use new filling algorithm from v5 only
2017-03-20 18:46:57 +00:00
moneromooo-monero
5b7c6ced80
wallet2: start using new fee priorities at v5, not 14 days laer
...
Waiting would mean the fee used is 1x base, but the base will
have suddenly dropped
2017-03-20 18:34:56 +00:00
moneromooo-monero
c1e9ccc794
wallet2: speed up transactions using remote nodes
...
Asking for a full histogram from a remote node (since it's
untrusted) is pretty slow, and spams the remote node, so
we replace it by only adding a second input if we have rct
ones, which are for all intents and purposes always mixable.
2017-03-20 08:44:28 +00:00
stoffu
8bbcbcfb0d
wallet rpc: enable solo mining
2017-03-20 09:47:16 +09:00
Riccardo Spagni
73e8510717
Merge pull request #1896
...
a6f1d8fc
2017-03-19 23:03:18 +02:00
Riccardo Spagni
dbfbd3b698
Merge pull request #1895
...
d3aaf740fix #1876 , check thread in block_txn_start() (Howard Chu)
2017-03-19 23:02:32 +02:00
Riccardo Spagni
45fa27b56a
Merge pull request #1892
...
df810a82
2017-03-19 22:58:55 +02:00
Riccardo Spagni
c97005723c
Merge pull request #1890
...
50cd179a
2017-03-19 22:55:39 +02:00
Riccardo Spagni
4a6fc007c6
Merge pull request #1889
...
24ae7140
2017-03-19 22:55:10 +02:00
moneromooo-monero
a6f1d8fc4c
core: call {prepare|cleanup}_handle_incoming_blocks when adding a mined block
...
This ensures that a batch can't also be started/stopped out of
sync by another thread and us getting in the middle
2017-03-19 12:40:26 +00:00
Howard Chu
d3aaf74080
Partial fix #1876 , check thread in block_txn_start()
...
Don't allow use of existing batch txn if it's from the wrong thread
2017-03-19 12:27:03 +00:00
kenshi84
df810a8250
wallet-rpc bugfix: get_transfer_by_txid previously checking against payment id
2017-03-19 17:45:39 +09:00
Lee Clagett
50cd179a60
Removed boost/asio.hpp include from epee/string_tools.h
2017-03-18 22:05:14 -04:00
moneromooo-monero
24ae71404f
wallet: increase node_rpc_proxy timeout to match wallet2
2017-03-18 23:06:06 +00:00
Riccardo Spagni
df140d90ee
Merge pull request #1887
...
c5316d29
2017-03-18 21:56:56 +02:00
moneromooo-monero
d5fbfd677c
daemon: fix missing close parenthesis in alt_chain_info output
...
Reported by assylias_ on IRC
2017-03-18 19:19:32 +00:00
Riccardo Spagni
c5316d2929
update version to 0.10.3.0
2017-03-18 20:34:52 +02:00
Riccardo Spagni
82411cdf3a
Merge pull request #1886
...
f9a2b527
2017-03-18 20:31:37 +02:00
Riccardo Spagni
a48e41787b
Merge pull request #1885
...
63d7cd88
2017-03-18 20:31:12 +02:00
Riccardo Spagni
a6f1959d1c
Merge pull request #1884
...
e9175cec
2017-03-18 20:30:50 +02:00
Riccardo Spagni
f33a696ec7
Merge pull request #1883
...
d0238313
2017-03-18 20:30:19 +02:00
Riccardo Spagni
9aac64c238
Merge pull request #1882
...
3fa597559d134e86
2017-03-18 20:29:22 +02:00
Riccardo Spagni
4fb39a9d20
Merge pull request #1881
...
1a666c30
2017-03-18 20:28:45 +02:00
Riccardo Spagni
d628ed2c14
Merge pull request #1880
...
8d787e24
2017-03-18 20:27:44 +02:00
Riccardo Spagni
585445d0bc
Merge pull request #1879
...
c1c9eeaa
2017-03-18 20:27:00 +02:00
moneromooo-monero
f9a2b5279d
simplewallet: allow setting tx priority in watch wallets
...
Those can create unsigned transactions
2017-03-18 18:07:54 +00:00
moneromooo-monero
63d7cd8882
daemon: alt_chain_info now prints fork depth
2017-03-18 16:59:57 +00:00
moneromooo-monero
e9175cec07
wallet_rpc_server: make a few RPCs unavailable in restricted mode
...
Address book modification, setting tx nodes, importing key images
2017-03-18 13:01:53 +00:00
moneromooo-monero
d023831327
use const references in catch blocks
2017-03-18 12:56:07 +00:00
moneromooo-monero
3fa5975520
wallet2: call is_key_image_spent in blocks in rescan_spent
...
This is a potentially long lasting daemon RPC call
2017-03-18 12:47:07 +00:00
moneromooo-monero
9d134e8647
wallet_rpc_server: add a rescan_spent RPC
2017-03-18 12:04:17 +00:00
moneromooo-monero
1a666c3016
simplewallet: catch case where no transactions are made
...
This would otherwise be a silent noop, which is confusing.
This can happen if the daemon is started, but not yet ready
to service all requests, and this is a safe catch all.
2017-03-18 11:44:31 +00:00
moneromooo-monero
c1c9eeaaf7
p2p: use the fallback seed IPs when not enough seeds are found
...
In case the DNS seed(s) is/are down, which would otherwise
cause the fallback seeds to never be used. Also if the seeds
resolve to too few IPs.
2017-03-18 11:40:28 +00:00
Riccardo Spagni
8d787e2414
bump version number
2017-03-17 23:42:06 +01:00
stoffu
250c4cb3e0
wallet-rpc: enable openalias
2017-03-17 10:42:10 +09:00
Riccardo Spagni
c642d3224c
Merge pull request #1869
...
3396a9f2
2017-03-15 18:23:51 +01:00
Riccardo Spagni
e5b5d041f5
Merge pull request #1868
...
585c9176
2017-03-15 18:21:43 +01:00
Riccardo Spagni
2f8e0af7f9
Merge pull request #1867
...
b54e19d0
2017-03-15 18:21:19 +01:00
Riccardo Spagni
6de3a70347
Merge pull request #1861
...
badec326
2017-03-15 18:20:53 +01:00
moneromooo-monero
3396a9f2af
Add intervening v5 fork for increased min block size
...
Minimum mixin 4 and enforced ringct is moved from v5 to v6.
v5 is now used for an increased minimum block size (from 60000
to 300000) to cater for larger typical/minimum transaction size.
The fee algorithm is also changed to decrease the base per kB
fee, and add a cheap tier for those transactions which we do
not care if they get delayed (or even included in a block).
2017-03-15 08:32:51 +00:00
darentuzi
585c917691
Specify "524,288" iterations instead of "500,000"
...
CryptoNight does exactly 524,288 iterations over the scratchpad as defined in CNS008, saying 500,000 could be confusing. I know its meant to give a rough idea (around 500k) to the reader but if you are reading the code, might as well know the exact number.
2017-03-14 16:39:44 +02:00
moneromooo-monero
b54e19d00e
protocol: fix wrong tx being looked up from fluffy block
...
Found by smooth
2017-03-13 19:16:25 +00:00
Riccardo Spagni
c6102d5c1b
Merge pull request #1864
...
74b216a1
2017-03-13 17:22:33 +01:00
Riccardo Spagni
22e51c5d29
Merge pull request #1863
...
09e060fe
2017-03-13 17:22:10 +01:00
Arne Brutschy
badec326d8
Adds a config file option to the wallet
2017-03-12 21:45:59 +01:00
moneromooo-monero
74b216a17f
core: don't try to re-relay an empty set of pool transactions
2017-03-12 14:57:58 +00:00
moneromooo-monero
09e060febb
protocol: fix fluffy to normal block dropping txes
2017-03-12 14:14:51 +00:00
kenshi84
7d07c64fe5
fix dependency: put HardFork back to cryptonote_basic, made some BlockchainDB functions virtual again to avoid missing symbols error
2017-03-10 11:22:39 +09:00
Riccardo Spagni
ba0767477d
Merge pull request #1841
...
b553c28202097c87749ebacef36c5f1ef621132263f0e0749bf017ed0d90123c
2017-03-06 15:17:08 +00:00
Riccardo Spagni
ea047307da
Merge pull request #1848
...
cfa2564a383590365fee856150ebf66187d57d9c
2017-03-06 15:16:02 +00:00
Riccardo Spagni
5bcb25f3f8
Merge pull request #1846
...
4b48565c
2017-03-06 15:14:59 +00:00
moneromooo-monero
cfa2564a40
blockchain: don't try to load an empty block hash set
...
If the blocks aren't being linked against a binary (such as
one of the blockchain utilities), the symbol will not be
NULL, but the size will be 0. This avoids a apurious warning
about the data hash.
2017-03-05 19:46:55 +00:00
moneromooo-monero
3835903650
blockchain_import: make --log-level understand categories
2017-03-05 19:45:22 +00:00
moneromooo-monero
5fee85616d
blockchain_export: make --log-level understand categories
2017-03-05 19:45:00 +00:00
moneromooo-monero
50ebf66150
blockchain_import: error out nicely on exceptions
2017-03-05 19:25:01 +00:00
moneromooo-monero
87d57d9c59
blockchain_export: error out nicely on exceptions
2017-03-05 19:24:47 +00:00
moneromooo-monero
b553c282fb
rpc: fix BUILD_TAG mispelling (BUILDTAG)
...
This ensures a manual or RPC update tries the right build tag,
rather than source, which is currently not setup
2017-03-05 16:59:39 +00:00
moneromooo-monero
02097c87eb
core: print the "new update found" message in cyan, for visibility
2017-03-05 16:59:36 +00:00
moneromooo-monero
749ebacebd
download: check available disk space before downloading
...
We don't check *while* the download happens, so it might
still be that we don't have enough space later
2017-03-05 16:59:32 +00:00
moneromooo-monero
f36c5f1e08
download: give download threads distinct names
2017-03-05 16:59:29 +00:00
moneromooo-monero
f6211322e5
core: make update download cancellable
2017-03-05 16:59:25 +00:00
moneromooo-monero
63f0e074eb
download: async API
2017-03-05 16:58:48 +00:00
Riccardo Spagni
e66866c1fc
Merge pull request #1844
...
d18ff58a
2017-03-05 18:13:49 +02:00
Riccardo Spagni
b375dde57f
Merge pull request #1843
...
3964b30f
2017-03-05 18:01:03 +02:00
Riccardo Spagni
8cb58dbb69
Merge pull request #1842
...
223fe5bb
2017-03-05 17:52:42 +02:00
Riccardo Spagni
a861992359
Merge pull request #1839
...
c7dd0b15
2017-03-05 17:47:18 +02:00
moneromooo-monero
4b48565c9e
wallet: add password command
...
Also tweak wallet2 password code to verify password without
saying it's a new wallet, because it's assuming things.
2017-03-05 14:53:46 +00:00
lethos3
d18ff58a1c
format_utils: fix typo in assert message
...
Fix two small typos as mentioned by reddit user nthterm.
2017-03-05 11:11:44 +13:00
Howard Chu
3964b30f2d
Add dependency for blocksdat.o
...
To make sure it gets regenerated whenever checkpoints.dat changes
Likewise for blocks.o and testnet_blocks.o
2017-03-04 22:02:10 +00:00
moneromooo-monero
223fe5bbe2
wallet: fix get_tranfers with multiple incoming txes with same pid
2017-03-04 21:47:53 +00:00
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
