cslashm
641dfc991f
Automatic height setup when creating/restoring hw device.
...
When creating/restoring wallet, if --restore-height option is not used the current estimate
height is used for starting the scan. In other words it is assume we are creating a new account.
2018-03-31 18:00:33 +02:00
moneromooo-monero
eecfb57df9
wallet: warn if not using the default ring size
2018-03-31 15:47:02 +01:00
moneromooo-monero
aa5c2e01e7
simplewallet: warn about key reuse on startup
2018-03-31 10:52:10 +01:00
stoffu
eb59f7c563
cryptonote_tx_util: make destinations properly shuffled
2018-03-31 18:37:46 +09:00
stoffu
66a659bb03
blockchain: add scope guard to waiter for threaded txv1 verification
2018-03-30 19:22:32 +09:00
1e0958c083
wallet: fix default mixin (4 -> 6)
2018-03-28 09:30:11 -07:00
naughtyfox
5a96056600
WalletApi: getMultisigInfo entry for gui wallets
...
WalletApi: makeMultisig call introduced
WalletApi: finalizeMultisig call introduced
WalletApi: new calls exportMultisigImages and importMultisigImages
WalletApi: method to return multisig wallet creation state
WalletApi: create multisig transaction, sign multisig transaction, commit transaction and get multisig data are added
WalletApi: identation and style fixes
2018-03-28 18:22:13 +03:00
naughtyfox
47fdb74273
Refactored: work with wallet api statuses to make setting and getting operations atomic along with error strings
...
WalletApi: added method statusWithErrorString to atomically retrieve error with error string
2018-03-28 16:11:16 +03:00
moneromooo-monero
0beb94f323
device: fix endianess dependence on subaddress secret key generation
...
We now force little endianness
2018-03-28 11:14:25 +01:00
moneromooo-monero
11c933e137
fix lambda compile error on openbsd
2018-03-27 14:48:36 +01:00
cryptochangements34
c8cb5fca5e
exit if specified wallet file doesn't exist
2018-03-24 11:13:21 -04:00
Riccardo Spagni
dac3895ac1
update block hashes for checkpoints.dat
2018-03-24 08:36:10 +02:00
moneromooo-monero
1834127c82
rpc: make get_output_distribution a non-restricted RPC
...
so that those nodes can still be used for sending transactions
2018-03-23 10:56:55 +00:00
moneromooo-monero
3f5fb6fe6d
simplewallet: add --untrusted-daemon option
2018-03-22 14:20:55 +00:00
stoffu
eaa8bfe7c0
wallet2: set from_height of GET_OUTPUT_DISTRIBUTION correctly
...
The previous expression
req_t.from_height = X ? Y >= Z : 0;
forces the parameter to take the value of either 0 or 1.
2018-03-22 20:02:25 +09:00
stoffu
0a619f789b
wallet2: enable the mitigation only after the fork height
2018-03-22 20:02:14 +09:00
stoffu
5f6647934b
p2p: correct port number for seed nodes
2018-03-22 14:56:35 +09:00
stoffu
0098ed338c
wallet2: fix for loading settings of key reuse mitigation
2018-03-22 12:10:46 +09:00
cryptochangements34
ad19f8679e
don't show error twice when starting simplewallet
2018-03-21 22:56:04 -04:00
moneromooo-monero
5730049178
wallet: catch exceptions dealing with ringdb and warn
2018-03-21 14:29:49 +00:00
stoffu
3b941befae
core: add get_earliest_ideal_height_for_version()
2018-03-21 01:53:24 +09:00
moneromooo-monero
a6a54fa883
blockchain: cache difficulty for next block
...
Takes about 10 ms, which takes pretty much all of the get_info
RPC, which is called pretty often from wallets.
Also add a new lock so we don't need to lock the blockchain lock,
which will avoid blocking for a long time when calling the getinfo
RPC while syncing. Users of get_difficulty_for_next_block who need
the lock will have locked it already.
2018-03-19 09:05:40 +00:00
moneromooo-monero
b1398fff40
core: fix use of uninitialised data
2018-03-18 23:37:00 +00:00
Riccardo Spagni
428fb45f68
update checkpoints
2018-03-18 16:44:36 +02:00
Riccardo Spagni
3fedd51d26
update checkpoints.dat to block 1532400
2018-03-18 16:42:20 +02:00
Riccardo Spagni
83dbc5be76
update version to 0.12 Lithium Luna
2018-03-18 16:15:50 +02:00
Riccardo Spagni
df91d7bcbd
Merge pull request #3426
...
8ea3c4d5
2018-03-18 15:58:12 +02:00
Riccardo Spagni
b8ccd47b9f
Merge pull request #3419
...
1e393f4b
2018-03-18 15:57:58 +02:00
moneromooo-monero
bb20f104ba
Move v7 fork to 1546000 to give more update time
2018-03-18 09:29:31 +00:00
moneromooo-monero
8ea3c4d544
simplewallet: new --use-english-language-names flag
...
On some Windows systems, displaying language names in their own
languages freezes the display.
2018-03-17 22:46:41 +00:00
moneromooo-monero
1e393f4bb7
wallet: make the segregation height settable
...
via user setting first, then DNS TXT record, hardcoded fallback
2018-03-17 14:56:31 +00:00
Riccardo Spagni
5cd36e48bf
Merge pull request #3421
...
9732a37e
2018-03-17 16:52:46 +02:00
Riccardo Spagni
83651630bc
Merge pull request #3418
...
20a00266
2018-03-17 16:51:47 +02:00
moneromooo-monero
9732a37e9a
wallet_rpc_server: add sweep_unmixable as alias for sweep_dust
2018-03-17 11:22:58 +00:00
moneromooo-monero
20a002667c
blockchain: forbid bulletproof types before v8
...
They were already forbidden implicitely, but let's make that
explicit for robustness
2018-03-16 18:18:34 +00:00
stoffu
b86f1e5dad
Add command line option allowing to restrict the default sub-address lookahead in order to avoid
...
so looooong time of set-up when creating a HW based wallet.
2018-03-16 18:00:28 +01:00
Riccardo Spagni
a14eabc043
Merge pull request #3416
...
6f54c910#3175 (stoffu)
2018-03-16 18:10:20 +02:00
Riccardo Spagni
432480fa42
Merge pull request #3414
...
524cbdc1
2018-03-16 18:09:34 +02:00
Riccardo Spagni
2a9839cc3e
Merge pull request #3376
...
833f9fcf
2018-03-16 18:08:52 +02:00
Riccardo Spagni
0f27fc57ac
Merge pull request #3336
...
57c0b1ed
2018-03-16 18:08:07 +02:00
moneromooo-monero
eac3a11ed3
wallet: more user friendly print_ring
...
It can now take a txid (to display rings for all its inputs),
and will print rings in a format that set_ring understands
2018-03-16 12:07:45 +00:00
moneromooo-monero
798535149d
wallet2_api: add key reuse mitigations API
2018-03-16 12:07:42 +00:00
moneromooo-monero
b057a21d56
wallet2_api: add ring api
2018-03-16 10:33:05 +00:00
moneromooo-monero
d32ef7b0f2
ringdb: factor ring addition code
2018-03-16 10:33:02 +00:00
moneromooo-monero
a7da8208f5
wallet2_api: add blackball api
2018-03-16 10:32:59 +00:00
moneromooo-monero
504428ab4a
ringdb: use the genesis block as a db name
...
This will avoid careless forkers polluting the shared database
even if they make their own chain. They'll then automatically
start using another subdb, and any key-reusing fork of those
forks will reuse their subdbs.
2018-03-16 10:32:54 +00:00
moneromooo-monero
b09e5181cc
wallet: add a set_ring command
...
This is so one can set rings for spent key images in case the
attackers don't merge the ring matching patch set.
2018-03-16 10:32:51 +00:00
moneromooo-monero
0590f62ab6
new blockchain_usage tool, reports on output usage
2018-03-16 10:32:46 +00:00
moneromooo-monero
db10dd6d83
wallet: make ringdb an object with database state
2018-03-16 10:32:42 +00:00
moneromooo-monero
df6fad4c62
blockchain_utilities: new blockchain_blackball tool
...
It scans for known spent outputs and stores their public keys
in a database which can then be read by the wallet, which can
then avoid using those as fake outs in new transactions.
Usage: monero-blockchain-blackball db1 db2...
This uses the shared database in ~/.shared-ringdb
2018-03-16 10:32:39 +00:00
moneromooo-monero
d29ea0455a
wallet: add an output blackball list to avoid using those in rings
2018-03-16 10:32:37 +00:00
moneromooo-monero
18eaf19489
wallet: key reuse mitigation options
...
If a pre-fork output is spent on both Monero and attack chain,
any post-fork output can be deduced to be a fake output, thereby
decreasing the effective ring size.
The segregate-per-fork-outputs option, on by default, allows
selecting only pre-fork outputs in this case, so that the same
ring can be used when spending it on the other side, which does
not decrease the effective ring size.
This is intended to be SET when intending to spend Monero on the
attack fork, and to be UNSET if not intending to spend Monero
on the attack fork (since it leaks the fact that the output being
spent is pre-fork).
If the user is not certain yet whether they will spend pre-fork
outputs on a key reusing fork, the key-reuse-mitigation2 option
should be SET instead.
If you use this option and intend to spend Monero on both forks,
then spend real Monero first.
2018-03-16 10:32:34 +00:00
moneromooo-monero
5f146873c5
wallet: add shared ring database
...
This maps key images to rings, so that different forks can reuse
the rings by key image. This avoids revealing the real inputs like
would happen if two forks spent the same outputs with different
rings. This database is meant to be shared with all Monero forks
which don't bother making a new chain, putting users' privacy at
risk in the process. It is placed in a shared data directory by
default ($HOME/.shared-ringdb on UNIX like systems). You may
use --shared-ringdb-dir to override this location, and should
then do so for all Monero forks for them to share the database.
2018-03-16 10:32:29 +00:00
moneromooo-monero
41f727ce42
add RPC to get a histogram of outputs of a given amount
2018-03-16 10:32:26 +00:00
cryptochangements34
833f9fcfe9
show '<Not set>' for empty wallet description
2018-03-15 23:22:45 -04:00
stoffu
6f54c910f7
simplewallet: fix restore height prompt that got disabled by #3175
2018-03-16 11:55:31 +09:00
stoffu
524cbdc1e2
blockchain: fix log message about per-kB fee
2018-03-16 10:43:19 +09:00
Dimitris Apostolou
57c0b1ed9f
Fix typos in various files
2018-03-15 18:25:38 +02:00
Riccardo Spagni
51bb7fafac
Merge pull request #3410
...
c5024c5b
2018-03-15 17:10:01 +02:00
Riccardo Spagni
60af9d689b
Merge pull request #3408
...
e1b526b3
2018-03-15 17:09:13 +02:00
moneromooo-monero
c5024c5b73
simplewallet: add a warning when getting a daemon error in transfer
...
A malicious daemon (or MITM) could attempt to add spurious errors
so the wallet tries again, sending another set of fake outs.
2018-03-15 13:33:19 +00:00
stoffu
a7266d6d7b
wallet2+cli+rpc: eliminate redundant m_http_client from cli/rpc and delegate calls to wallet2
2018-03-15 22:01:51 +09:00
Jean Pierre Dudey
e1b526b371
Remove the Blockchain::get_all_known_block_ids function.
...
This function isn't used in the codebase.
Signed-off-by: Jean Pierre Dudey <jeandudey@hotmail.com>
2018-03-14 21:56:19 -04:00
Leon Klingele
80d2f8007c
wallet2: Update function parameter documentation
...
This completes and fixes various parameters docs
2018-03-14 16:41:24 +01:00
stoffu
71d186566e
replace invoke_http_json("/json_rpc",...) with invoke_http_json_rpc("/json_rpc",methodname,...) to reduce boilerplate
2018-03-14 23:23:59 +09:00
Riccardo Spagni
a69c713f8e
Merge pull request #3398
...
c577abab
2018-03-14 16:18:15 +02:00
Riccardo Spagni
2fe1504c03
Merge pull request #3399
...
1d39b265
2018-03-14 16:17:59 +02:00
Riccardo Spagni
f9f2d182da
Merge pull request #3395
...
523371c0
2018-03-14 16:10:42 +02:00
Riccardo Spagni
8b90e3141a
Merge pull request #3386
...
9abeff59
2018-03-14 16:10:00 +02:00
Riccardo Spagni
7a44301675
Merge pull request #3385
...
ec41006c
2018-03-14 16:09:40 +02:00
Riccardo Spagni
534369eece
Merge pull request #3384
...
b63ea060
2018-03-14 16:08:14 +02:00
Riccardo Spagni
cb72b85bbf
Merge pull request #3372
...
c3e23b2d
2018-03-14 16:06:16 +02:00
stoffu
4405e4fc73
wallet2: check_tx_key() shouldn't require hardware encryption
2018-03-14 21:00:18 +09:00
stoffu
7dfa5e9e6e
chacha: call prehashed version explicitly as generate_chacha_key_prehashed
...
hash: add prehashed version cn_slow_hash_prehashed
slow-hash: let cn_slow_hash take 4th parameter for deciding prehashed or not
slow-hash: add support for prehashed version for the other 3 platforms
2018-03-14 21:00:17 +09:00
stoffu
b2d23b189e
crypto: revert odd namespace changes made in #3303
2018-03-14 21:00:17 +09:00
stoffu
8705beaf51
keypair::generate: always require hw::device to avoid possible mistake
2018-03-14 21:00:16 +09:00
stoffu
27a196b126
device: untangle cyclic depenency
...
When #3303 was merged, a cyclic dependency chain was generated:
libdevice <- libcncrypto <- libringct <- libdevice
This was because libdevice needs access to a set of basic crypto operations
implemented in libringct such as scalarmultBase(), while libringct also needs
access to abstracted crypto operations implemented in libdevice such as
ecdhEncode(). To untangle this cyclic dependency chain, this patch splits libringct
into libringct_basic and libringct, where the basic crypto ops previously in
libringct are moved into libringct_basic. The cyclic dependency is now resolved
thanks to this separation:
libcncrypto <- libringct_basic <- libdevice <- libcryptonote_basic <- libringct
This eliminates the need for crypto_device.cpp and rctOps_device.cpp.
Also, many abstracted interfaces of hw::device such as encrypt_payment_id() and
get_subaddress_secret_key() were previously implemented in libcryptonote_basic
(cryptonote_format_utils.cpp) and were then called from hw::core::device_default,
which is odd because libdevice is supposed to be independent of libcryptonote_basic.
Therefore, those functions were moved to device_default.cpp.
2018-03-14 21:00:15 +09:00
stoffu
c9b38b4765
device: made function prototypes consistent with pre-#3303 codebase
2018-03-14 21:00:06 +09:00
Riccardo Spagni
f2e8e8d23c
Merge pull request #3377
...
aa8bef0c
2018-03-14 13:38:50 +02:00
Riccardo Spagni
9a63fbcf83
Merge pull request #3371
...
84decbea
2018-03-14 13:37:25 +02:00
Riccardo Spagni
3bc2537f5a
Merge pull request #3369
...
1979d53d
2018-03-14 13:37:14 +02:00
Riccardo Spagni
0f2d6d40b4
Merge pull request #3360
...
1ff35fda
2018-03-14 13:37:00 +02:00
Riccardo Spagni
2e074e2ae7
Merge pull request #3358
...
978663d4
2018-03-14 13:36:47 +02:00
Riccardo Spagni
117cf12509
Merge pull request #3355
...
0bbd521f
2018-03-14 13:36:36 +02:00
Riccardo Spagni
33158f089d
Merge pull request #3354
...
ffe70b8f
2018-03-14 13:36:25 +02:00
Riccardo Spagni
2dfb4f098e
Merge pull request #3353
...
73dd883d
2018-03-14 13:36:14 +02:00
Riccardo Spagni
cfc5a3d4d4
Merge pull request #3345
...
e0cda74a
2018-03-14 13:35:53 +02:00
Riccardo Spagni
67978b78ce
Merge pull request #3337
...
91d97dd45f85cc7e
2018-03-14 13:35:41 +02:00
Riccardo Spagni
3fed788603
Merge pull request #3315
...
649a1b7a
2018-03-14 13:35:11 +02:00
moneromooo-monero
5f85cc7e3d
wallet2: guard against overflowing of subaddress indices
2018-03-14 11:34:06 +00:00
stoffu
1d39b26556
wallet2: fix use_fork_rules() when querying version that is defined but not enabled yet
2018-03-14 19:02:21 +09:00
stoffu
c577abab61
wallet: fix auto low priority so that it takes effect only when saved default is 0
2018-03-14 18:33:43 +09:00
moneromooo-monero
523371c042
p2p: fix network ID being uninitialised when using exclusive peers
2018-03-13 11:20:49 +00:00
Cédric
73dd883d51
Ledger HW Bug fixes
...
Fix the way the REAL mode is handle:
Let create_transactions_2 and create_transactions_from construct the vector of transactions.
Then iterate on it and resign.
We just need to add 'outs' list in the TX struct for that.
Fix default secret keys value when DEBUG_HWDEVICE mode is off
The magic value (00...00 for view key and FF..FF for spend key) was not correctly set
when DEBUG_HWDEVICE was off. Both was set to 00...00.
Add sub-address info in ABP map in order to correctly display destination sub-address on device
Fix DEBUG_HWDEVICE mode:
- Fix compilation errors.
- Fix control device init in ledger device.
- Add more log.
Fix sub addr control
Fix debug Info
2018-03-12 10:43:06 +01:00
moneromooo-monero
9abeff5911
wallet2: handle no blocks returned in refresh to mean no new blocks
...
This is not a possible return from the daemon, but I want this in
now so all wallets handle this when the daemon starts doing so.
2018-03-11 21:16:15 +00:00
moneromooo-monero
ec41006cad
node_rpc_proxy: fix target height caching
2018-03-11 13:11:49 +00:00
moneromooo-monero
b63ea060de
simplewallet: do not call a RPC when displaying the prompt
...
Speeds up refresh when you have a lot of in/out transactions
2018-03-11 10:23:45 +00:00
Leon Klingele
649a1b7ae6
wallet2 / simplewallet: Must opt-in to create '.address.txt' files for new wallets
...
Previously, a file containing the unencrypted Monero address was
created by default in the wallet's directory. This file might pose
as a privacy risk. The creation of this file is now opt-in and can
be enabled by providing
--create-address-file
2018-03-10 16:28:23 +01:00
cryptochangements34
aa8bef0cb3
fix error message typo in wallet2.cpp
2018-03-09 17:22:26 -05:00
stoffu
978663d461
Stagenet: successive forks up to v7
2018-03-09 13:59:11 +09:00
Riccardo Spagni
e9f41e405f
Merge pull request #3368
...
38657fd0
2018-03-08 18:47:41 +02:00
Riccardo Spagni
546e380cab
Merge pull request #3370
...
04a0cc89
2018-03-08 18:44:47 +02:00
Riccardo Spagni
3a12f2588a
Merge pull request #3365
...
55a65f32
2018-03-08 18:44:18 +02:00
Riccardo Spagni
f4cf613e34
Merge pull request #3362
...
49c70962
2018-03-08 18:43:37 +02:00
Riccardo Spagni
220cb62ca4
Merge pull request #3357
...
557a6fb6
2018-03-08 18:43:20 +02:00
Riccardo Spagni
60c8544e77
Merge pull request #3347
...
9a6be3da
2018-03-08 18:42:24 +02:00
moneromooo-monero
c3e23b2dce
ringct: 17% improvement in Borromean signature verification
2018-03-08 00:41:54 +00:00
moneromooo-monero
84decbea48
core: add v7 for 1539500 on mainnet
2018-03-07 17:19:50 +00:00
moneromooo-monero
1979d53d78
wallet: fixes and tweaks to the save_watch_only command
...
- save the new keys file as FOO-watchonly.keys, not FOO.keys-watchonly
- catch any exception (eg, I/O errors) and error out
- print the new keys filename in simplewallet
2018-03-07 14:24:14 +00:00
moneromooo-monero
38657fd0e9
Bump min ring size from 5 to 7 from v7
2018-03-07 13:19:04 +00:00
moneromooo-monero
04a0cc89cf
slow-hash: fix uint64 type typo
2018-03-07 09:48:58 +00:00
stoffu
55a65f3269
Wallet API: corrected testnet/mainnet ordering
2018-03-07 13:56:17 +09:00
stoffu
49c70962ee
device: remove dependency on readline
2018-03-07 07:42:28 +09:00
stoffu
1ff35fda7c
Wallet API: make nettype non-defaulted to disambiguate from deprecated versions (and make libwallet_api_tests compilable)
2018-03-06 21:14:52 +09:00
moneromooo-monero
557a6fb6ea
cn_deserialize: link with device and ringct
2018-03-05 20:52:18 +00:00
Lee Clagett
e136bc6b8a
tweaks to the monerov1 cryptonight algorithm
2018-03-05 18:18:45 +00:00
SChernykh
d58c9ec99c
slow-hash: optimized version
2018-03-05 18:18:43 +00:00
moneromooo-monero
608fd6f14a
Monero Cryptonight variants, and add one for v7
...
This is the first variant of many, with the intent to improve
Monero's resistance to ASICs and encourage mining decentralization.
2018-03-05 18:18:39 +00:00
stoffu
0bbd521fa2
libwallet_merged: added missing libdevice
2018-03-06 02:36:37 +09:00
cryptochangements34
ffe70b8f61
Make mixin optional with default for rpc transfer
2018-03-05 12:27:22 -05:00
Riccardo Spagni
a21c927d7d
Merge pull request #3298
...
f2bb8085Fix #3297 use the password_prompter helper (Howard Chu)
2018-03-05 19:17:51 +02:00
Riccardo Spagni
0c2b25204e
Merge pull request #3312
...
399120dd
2018-03-05 19:16:52 +02:00
Riccardo Spagni
237f0179b7
Merge pull request #3313
...
43026822
2018-03-05 19:15:54 +02:00
Riccardo Spagni
baf640887d
Merge pull request #3343
...
3d452367
2018-03-05 19:14:03 +02:00
Riccardo Spagni
98acbe83fc
Merge pull request #3348
...
c95dddd2
2018-03-05 19:13:52 +02:00
Riccardo Spagni
05f0762dc5
Merge pull request #3346
...
25ea307d
2018-03-05 19:13:40 +02:00
Riccardo Spagni
9841a452e5
Merge pull request #3338
...
51219457
2018-03-05 19:13:28 +02:00
Riccardo Spagni
61ac5b0471
Merge pull request #3332
...
6b40ea93
2018-03-05 19:12:59 +02:00
Riccardo Spagni
5b25cbb5a7
Merge pull request #3314
...
71bff546
2018-03-05 19:12:24 +02:00
Riccardo Spagni
abcdb7b5c4
Merge pull request #3308
...
6f8779d2
2018-03-05 19:12:05 +02:00
Riccardo Spagni
0e5c006207
Merge pull request #3307
...
223d7d0c
2018-03-05 19:11:52 +02:00
Riccardo Spagni
5950d356b6
Merge pull request #3301
...
34a2a085
2018-03-05 19:11:35 +02:00
Riccardo Spagni
4f93f74528
Merge pull request #3277
...
0e7ad2e2af773211cc9a0bee55f8d917450306a0#3318 (stoffu)
9f9e095a#3261 (Jean Pierre Dudey)
2018-03-05 19:11:20 +02:00
Riccardo Spagni
033ead4bad
Merge pull request #3273
...
f3b74e75
2018-03-05 19:11:07 +02:00
Riccardo Spagni
b54587d7b3
Merge pull request #3259
...
6d900a40496055d1
2018-03-05 19:10:51 +02:00
Edward Betts
fbcc91c2a4
Correct spelling mistakes.
2018-03-05 17:00:40 +00:00
cryptochangements34
3d452367b0
allow using ring size instead of mixin for rpc transfer
2018-03-05 10:10:35 -05:00
stoffu
0e7ad2e2c9
Wallet API: generalize 'bool testnet' to 'NetworkType nettype'
2018-03-05 23:59:16 +09:00
h908714124
c95dddd2d2
remove unused function keyImageV
2018-03-05 09:21:44 +01:00
stoffu
9a6be3da25
wallet_manager: fixed typo deviuce/device.hpp
2018-03-05 11:57:30 +09:00
stoffu
af773211cb
Stagenet
2018-03-05 11:55:05 +09:00
stoffu
cc9a0bee04
command_line: allow args to depend on more than one args
2018-03-05 11:19:08 +09:00
stoffu
55f8d917fd
command_line::get_arg: remove 'required' for dependent args as they're always optional
2018-03-05 11:19:06 +09:00
stoffu
450306a01c
command line: allow has_arg to handle arg_descriptor<bool,false,true> #3318
2018-03-05 11:19:04 +09:00
Jean Pierre Dudey
9f9e095a8c
Use genesis_tx parameter in generate_genesis_block. #3261
...
* src/cryptnote_config.h: The constant `config::testnet::GENESIS_TX` was
changed to be the same as `config::GENESIS_TX` (the mainnet's transaction)
because the mainnet's transaction was being used for both networks.
* src/cryptonote_core/cryptonote_tx_utils.cpp: The `generate_genesis_block` function
was ignoring the `genesis_tx` parameter, and instead it was using the `config::GENESIS_TX`
constant. That's why the testnet genesis transaction was changed. Also five lines of unused
code were removed.
Signed-off-by: Jean Pierre Dudey <jeandudey@hotmail.com>
2018-03-05 11:19:01 +09:00
MoroccanMalinois
25ea307d67
Fix invalid device unique_ptr cast
2018-03-04 18:56:48 +00:00
moneromooo-monero
e0cda74ace
wallet2_api: add info/error/warning entry points
2018-03-04 18:07:30 +00:00
cslashm
e745c1e38d
Code modifications to integrate Ledger HW device into monero-wallet-cli.
...
The basic approach it to delegate all sensitive data (master key, secret
ephemeral key, key derivation, ....) and related operations to the device.
As device has low memory, it does not keep itself the values
(except for view/spend keys) but once computed there are encrypted (with AES
are equivalent) and return back to monero-wallet-cli. When they need to be
manipulated by the device, they are decrypted on receive.
Moreover, using the client for storing the value in encrypted form limits
the modification in the client code. Those values are transfered from one
C-structure to another one as previously.
The code modification has been done with the wishes to be open to any
other hardware wallet. To achieve that a C++ class hw::Device has been
introduced. Two initial implementations are provided: the "default", which
remaps all calls to initial Monero code, and the "Ledger", which delegates
all calls to Ledger device.
2018-03-04 12:54:53 +01:00
moneromooo-monero
51219457b1
core: fix sending to the source address with a short payment id
...
It would fail to send, thinking it needs a destination address,
since the destination matches the change address in this case.
2018-03-02 23:27:57 +00:00
moneromooo-monero
6b40ea937a
simplewallet: fix print_ring_members printing wrong heights
...
And also use uint64_t instead of int for heights where appropriate
2018-03-02 00:25:16 +00:00
stoffu
71bff546d3
wallet api: when restoring from EnglishOld, set language to English
2018-02-25 22:04:36 +09:00
rbrunner7
430268224d
Wallet2 + CLI wallet: UTF-8 support for filenames and paths under Windows
2018-02-25 12:57:58 +01:00
stoffu
399120ddad
simplewallet: set seed language when restoring from english-old seed
2018-02-25 12:44:10 +09:00
ston1th
496055d128
monerod: do not log to tmpdir in daemon mode
...
The logging to /tmp/bitmonero.daemon.stdout.stderr caused segfaults
if the /tmp mount was full (#2851 ).
Now the daemon is only logging to /tmp/bitmonero.daemon.stdout.stderr
in the debug builds.
2018-02-23 21:27:14 +01:00
moneromooo-monero
6f8779d282
blockchain: fix random sync failures
...
When a block is added as part of a chunk (when syncing historical
blocks), a block may end up already in the blockchain if it was
added to the queue before being added to the chain (though it's
not clear how that could happen, but it's an implementation detail)
and thus may not be added to the chain when add_block is called.
This would cause m_blocks_txs_check to not be cleared, causing it
to get out of sync at next call, and thus wrongfully reject the
next block.
2018-02-23 19:47:17 +00:00
moneromooo-monero
223d7d0c7a
db_lmdb: fix free space reporting
...
reported by Brad Richards
2018-02-23 09:06:10 +00:00
Dusan Klinec
34a2a08530
rctSigs - loop invariant code removed from the loop
2018-02-21 16:35:06 +01:00
Riccardo Spagni
2ac3da1251
Merge pull request #3256
...
df5273de
2018-02-20 17:53:38 +02:00
Riccardo Spagni
0d530bd04e
Merge pull request #3295
...
6514f0ed
2018-02-20 17:49:16 +02:00
Riccardo Spagni
46903ec26a
Merge pull request #3294
...
fd57e13a
2018-02-20 17:49:05 +02:00
Riccardo Spagni
21335e5c6b
Merge pull request #3293
...
4a78a99f
2018-02-20 17:48:54 +02:00
Riccardo Spagni
299af8e43e
Merge pull request #3290
...
1d28c0d8
2018-02-20 17:48:29 +02:00
Riccardo Spagni
ea9ddcac7f
Merge pull request #3288
...
10f78f63
2018-02-20 17:48:05 +02:00
Riccardo Spagni
fc57e0ef2d
Merge pull request #3263
...
d4e728c9
2018-02-20 17:47:42 +02:00
Riccardo Spagni
c9aa9370f9
Merge pull request #3260
...
b2d4bb9b
2018-02-20 17:47:31 +02:00
Riccardo Spagni
4e9de94565
Merge pull request #3257
...
da25757b
2018-02-20 17:47:20 +02:00
Riccardo Spagni
ff36fd93fd
Merge pull request #3255
...
3962bcb2Closes #2886 : really ignore battery checking (Timothy D. Prime)
2018-02-20 17:47:03 +02:00
Riccardo Spagni
cfa3af4078
Merge pull request #3247
...
89ad162af2c4c399
2018-02-20 17:46:40 +02:00
Riccardo Spagni
6920fdaf4f
Merge pull request #3246
...
3c33e1310133b348
2018-02-20 17:46:29 +02:00
Riccardo Spagni
0fc5eec9cd
Merge pull request #3235
...
6866ed46
2018-02-20 17:46:00 +02:00
Howard Chu
f2bb8085ec
Fix #3297 use the password_prompter helper
2018-02-20 02:25:20 +00:00
moneromooo-monero
6514f0ed7b
db_lmdb: fix return code mixup in for_all_*
2018-02-19 14:55:58 +00:00
stoffu
fd57e13a84
simplewallet: typo in generate-from-multisig-keys
2018-02-19 09:51:30 +09:00
moneromooo-monero
4a78a99f96
cryptonote_core: change wording of fork warning message
...
An udpate may or may not be available now, but should be soon if not.
This will prevent too many people freaking out.
2018-02-18 23:44:59 +00:00
whythat
1d28c0d8a9
p2p: restore m_testnet assignment lost during rebase
2018-02-18 17:09:39 +02:00
stoffu
10f78f63f1
p2p: need libcryptonote_core due to arg_testnet_on being used
2018-02-18 16:40:43 +09:00
Riccardo Spagni
8154df778a
Merge pull request #3276
...
ed6c68db
2018-02-17 21:48:59 +01:00
Riccardo Spagni
5a8e7fd0e5
Merge pull request #3249
...
a4b50a6f
2018-02-17 21:48:30 +01:00
Riccardo Spagni
6198c816b1
Merge pull request #3170
...
b3b2d4d2c5f55bb405a12cccc33cb60e
2018-02-17 11:51:57 +01:00
Riccardo Spagni
a2cbedd29f
Merge pull request #3191
...
3607d467
2018-02-17 11:48:31 +01:00
whythat
b3b2d4d20c
options: add testnet option dependencies
2018-02-16 22:32:01 +02:00
whythat
c5f55bb4c0
common: implement dynamic option dependencies mechanism
2018-02-16 22:32:01 +02:00
whythat
05a12ccc2d
options: remove testnet-* options
2018-02-16 22:32:01 +02:00
iDunk5400
ed6c68db1b
crypto: add missing include (WIN32)
2018-02-16 19:35:31 +01:00
moneromooo-monero
89ad162a3f
wallet2: remove unused m_subaddresses_inv
2018-02-16 17:13:09 +00:00
moneromooo-monero
f2c4c39971
wallet2: speed up subaddress generation (by about a third)
2018-02-16 17:13:06 +00:00
Leon Klingele
7c1a607c40
txpool: Don't bail out when blob_size == tx_size_limit
...
Previously, when blob_size == tx_size_limit, the "m_too_big" property was set
and the transaction was rejected. This should not have been the case.
2018-02-16 16:27:08 +01:00
whythat
c33cb60eb6
common: implement dependent option descriptor
2018-02-16 16:44:40 +02:00
Howard Chu
f3b74e75b0
Fix refresh height estimation
...
Since commit b0426d4c
2018-02-16 14:17:36 +00:00
moneromooo-monero
3607d467f3
core: add --no-fluffy-blocks, and enable fluffy blocks by default
2018-02-16 13:46:46 +00:00
Riccardo Spagni
ef91d6e61e
Merge pull request #3196
...
eda9fb5b
2018-02-16 14:31:16 +01:00
Riccardo Spagni
6b1382b6b6
Merge pull request #3199
...
30ce8c59
2018-02-16 14:29:51 +01:00
Riccardo Spagni
f4a6bc79d9
Merge pull request #3226
...
e46463792e3e90ac61defd899af6b2d18cea8d0c9b98a6ac24803ed9f3f7da62c6ea3df0fa6b456603887f11ad11db91bece67f91aabd14c
2018-02-16 14:26:58 +01:00
Riccardo Spagni
24d8f9237f
Merge pull request #3248
...
d6a0ae96
2018-02-16 14:24:22 +01:00
Riccardo Spagni
853dd2d4f7
Merge pull request #3232
...
b81e276c
2018-02-16 14:24:12 +01:00
Riccardo Spagni
260d666cf4
Merge pull request #3231
...
84a8b2da
2018-02-16 14:24:01 +01:00
Riccardo Spagni
ef47ba95c8
Merge pull request #3229
...
928c1825
2018-02-16 14:23:53 +01:00
Riccardo Spagni
b5b88c2747
Merge pull request #3225
...
71806327
2018-02-16 14:23:34 +01:00
Riccardo Spagni
a54247b993
Merge pull request #3221
...
2e584dcb
2018-02-16 14:23:22 +01:00
Riccardo Spagni
0c71197892
Merge pull request #3217
...
fde4489e
2018-02-16 14:23:08 +01:00
Riccardo Spagni
9c4428e583
Merge pull request #3214
...
214d251c
2018-02-16 14:22:41 +01:00
Riccardo Spagni
bfddb2283b
Merge pull request #3210
...
39992134
2018-02-16 14:22:10 +01:00
Riccardo Spagni
9681a885d1
Merge pull request #3207
...
a99ef17677125096
2018-02-16 14:21:59 +01:00
Riccardo Spagni
079eea7b70
Merge pull request #3205
...
bc61ae693b4e6b35
2018-02-16 14:21:50 +01:00
Riccardo Spagni
b23578e473
Merge pull request #3197
...
f90c76be3cb65b3f
2018-02-16 14:21:00 +01:00
Riccardo Spagni
666a76652b
Merge pull request #3187
...
851bd057
2018-02-16 14:20:31 +01:00
Riccardo Spagni
bdf0339dda
Merge pull request #3181
...
e3f0980a
2018-02-16 14:19:54 +01:00
Riccardo Spagni
ba22928d4b
Merge pull request #3180
...
1dfed5677c442453
2018-02-16 14:19:42 +01:00
Riccardo Spagni
82599ef0e3
Merge pull request #3175
...
3be98036
2018-02-16 14:19:24 +01:00
Riccardo Spagni
a43be404c7
Merge pull request #3171
...
402c9eef
2018-02-16 14:19:10 +01:00
Riccardo Spagni
04a676397f
Merge pull request #3165
...
7539603f
2018-02-16 14:18:50 +01:00
Riccardo Spagni
381faf06c7
Merge pull request #3163
...
628b78aeece9bcf58f30350d32c0f908d609a2c1b927c0fc
2018-02-16 14:18:38 +01:00
Riccardo Spagni
0bffd2ec64
Merge pull request #3161
...
78a2e15b
2018-02-16 14:18:29 +01:00
Riccardo Spagni
5d36ed6613
Merge pull request #3094
...
a85dbb3f
2018-02-16 14:17:46 +01:00
stoffu
da25757b42
simplewallet: do nothing in on_skip_transaction (wallet2 already logs warnings)
2018-02-15 17:20:39 +09:00
Serhack
d4e728c995
simplewallet: reword donate command message for clarity
2018-02-14 08:28:22 -05:00
Riccardo Spagni
370b43d12b
Merge pull request #3138
...
19ff243fc70f03ca
2018-02-14 12:49:57 +01:00
Riccardo Spagni
589a53f479
Merge pull request #2959
...
3f1a3fac
2018-02-14 12:08:52 +01:00
Jean Pierre Dudey
b2d4bb9b64
Remove voting_version parameter documentation.
...
Signed-off-by: Jean Pierre Dudey <jeandudey@hotmail.com>
2018-02-13 15:04:12 -04:00
moneromooo-monero
df5273def5
wallet2: fix auto_low_priority field name typo on load
2018-02-13 00:33:55 +00:00
Timothy D. Prime
3962bcb2a2
Closes #2886 : really ignore battery checking
...
Move option test first.
2018-02-12 10:29:22 -08:00
stoffu
3c33e1317b
wallet2: don't store invalid key image when watch-only
2018-02-12 20:36:15 +09:00
Jethro Grassie
a4b50a6f51
handle ^D and ^C while password prompting
2018-02-10 18:29:49 -05:00
moneromooo-monero
d6a0ae96c6
blockchain: don't try to use hash check array after it's freed
...
It's freed when we've synced past its end, but we might still
find an old chain somewhere
2018-02-10 11:26:06 +00:00
stoffu
0133b3481a
wallet2: don't throw when spent amount is inconsistent
2018-02-10 12:59:25 +09:00
moneromooo-monero
71806327f5
dns: change default DNS to a worldwide selection
...
DNSSEC aware servers picked from https://wiki.ipfire.org/dns/public-servers
2018-02-08 09:46:16 +00:00
stoffu
214d251c48
wallet: suggest the use of sweep_unmixable when not_enough_outs_to_mix is thrown
2018-02-08 08:02:12 +09:00
moneromooo-monero
bc61ae69bf
tx_pool: add a max pool size, settable with --max-txpool-size
2018-02-07 13:42:12 +00:00
moneromooo-monero
e4646379a6
keccak: fix mdlen bounds sanity checking
...
found by h908714124
2018-02-07 13:39:32 +00:00
Michał Sałaban
6866ed469a
Add default value to max_height, otherwise it's 0
2018-02-05 23:39:37 +01:00
moneromooo-monero
b81e276cab
connection_context: initialize m_last_request_time to current time
...
This prevents spurious early peer drops
2018-02-04 13:13:08 +00:00
moneromooo-monero
928c1825f0
cryptonote_protocol: guard against all threads in standby
2018-02-02 22:33:53 +00:00
moneromooo-monero
2e3e90acbe
pass large parameters by const ref, not value
...
Coverity 136394 136397 136409 136526 136529 136533 175302
2018-02-02 19:36:09 +00:00
moneromooo-monero
61defd89e3
blockchain: sanity check number of precomputed hash of hash blocks
...
Coverity 142951
2018-02-02 17:10:13 +00:00
moneromooo-monero
9af6b2d1b8
ringct: fix infinite loop in unused h2b function
...
Coverity 146775
2018-02-02 16:44:28 +00:00
moneromooo-monero
8cea8d0cef
simplewallet: double check a new multisig wallet is multisig
...
Coverity 182493
2018-02-02 16:41:16 +00:00
moneromooo-monero
9b98a6ac8f
threadpool: catch exceptions in dtor, to avoid terminate
...
If an exception is thrown, it is ignored. While this may hide
a bug, this should only be system exceptions in boost, which
is pretty unlikely. Morever, wait should be called manually
before the dtor anyway. Add an error message if the dtor has
to wait in case some such cases creep in so they get fixed.
Coverity 182538
2018-02-02 16:27:39 +00:00
moneromooo-monero
24803ed91f
blockchain_export: fix buffer overflow in exporter
...
Coverity 182550
2018-02-02 16:11:15 +00:00
moneromooo-monero
f3f7da624d
perf_timer: rewrite to make it clear there is no division by zero
...
It could have happened if epee::misc_utils::get_ns_count
is buggy, at a push
Coverity 182561
2018-02-02 16:06:36 +00:00
moneromooo-monero
03887f1140
keccak: fix sanity check bounds test
...
Nothing calls this with those inputs
2018-02-02 15:48:06 +00:00
moneromooo-monero
ad11db9144
blockchain_db: initialize m_open in base class ctor
...
It's cleaner this way, since it's a base class field
Coverity 136568
2018-02-02 15:21:39 +00:00
moneromooo-monero
bece67f9e8
miner: restore std::cout precision after modification
...
Coverity 136462
2018-02-02 15:15:21 +00:00
moneromooo-monero
1aabd14c21
db_lmdb: check hard fork info drop succeeded
...
Coverity 136364
2018-02-02 15:08:22 +00:00
moneromooo-monero
3b4e6b35b3
txpool: increase unmined tx expiry to three days
2018-02-01 22:48:52 +00:00
moneromooo-monero
2e584dcb1f
p2p: do not try to connect to peers in offline mode
2018-02-01 20:18:30 +00:00
moneromooo-monero
851bd057ec
call _exit instead of abort in release mode
...
Avoids cores being created, as they're nowadays often piped
to some call home system
2018-02-01 13:32:46 +00:00
Leon Klingele
399921347f
txpool: Properly bail out when outputs_amount == inputs_amount
...
Previously, when outputs_amount == inputs_amount, the "m_overspend" property
was set, whereas "m_fee_too_low" would have been the correct property to set.
This is unlikely to ever occur and just something I've noticed while reading
through the code.
2018-02-01 00:48:45 +01:00
Howard Chu
84a8b2da14
Don't create readtxn until after txn_safe gate check
2018-01-31 18:18:01 +00:00
moneromooo-monero
3f1a3fac00
bulletproofs: more robust challenge computation
...
Changes from sarang, from a recommendation by an anonymous reviewer
2018-01-31 15:57:01 +00:00
moneromooo-monero
b809058993
ringct: pseudoOuts moved to prunable in the simple bulletproof case
...
Saves 64 bytes non prunable data per typical tx
This breaks v7 consensus, will require a testnet reorg from v6
2018-01-31 15:56:26 +00:00
moneromooo-monero
19ff243f52
wallets: reorg 61 more days on testnet
2018-01-31 15:52:43 +00:00
moneromooo-monero
c70f03cacf
blockchain: move bulletproofs to v8
...
and set v7 height to 1057027 on testnet (one block earlier)
This is to easily dump current nodes since we're going to change
the v7 rules with this.
2018-01-31 15:52:39 +00:00
moneromooo-monero
fde4489e1d
wipeable_string: call memwipe directly
...
since the original reason for the indirect call (that memwipe
was not in contrib) is now gone
2018-01-31 12:25:30 +00:00
stoffu
a99ef17695
wallet-rpc: take subaddress account as arg for get_transfer_by_txid
2018-01-31 17:53:02 +09:00
stoffu
7712509644
wallet-rpc: rename *_INDEX_OUTOFBOUND into *_INDEX_OUT_OF_BOUNDS
2018-01-31 17:52:31 +09:00
stoffu
7539603f94
Bootstrap daemon
2018-01-30 20:15:47 +09:00
Maxithi
a85dbb3f2f
Fixed typos and wording tweaks
2018-01-29 12:13:23 +01:00
stoffu
402c9eef0e
cryptonote_tx_utils: fixed logic bug in get_destination_view_key_pub
2018-01-29 17:05:07 +09:00
Michał Sałaban
f90c76beb4
Return appropriate error code when there's no connection to daemon
2018-01-29 08:28:25 +01:00
Erik de Castro Lopo
628b78ae8a
Fix in_peers/out_peers RPC operations
...
Original implementations could never have worked.
2018-01-29 11:54:57 +11:00
Erik de Castro Lopo
ece9bcf5c6
rpc_client: Fix error handling
...
Previous code was unable to distingush between a connection error
and a communication error.
2018-01-29 11:54:57 +11:00
Erik de Castro Lopo
32c0f908cd
Allow the number of incoming connections to be limited
...
It was already possible to limit outgoing connections. One might want
to do this on home network connections with high bandwidth but low
usage caps.
2018-01-29 11:14:02 +11:00
Erik de Castro Lopo
d609a2c164
Rename delete_connections to delete_out_connections
...
This rename is needed so that delete_in_connections can be added.
2018-01-29 07:06:08 +11:00
Erik de Castro Lopo
b927c0fc7a
Rename connections_count to max_out_connection_count
...
This is needed so that a max_in_connection_count can be added.
2018-01-29 07:06:08 +11:00
Riccardo Spagni
4fcf609942
Merge pull request #3186
...
7ed62e63
2018-01-28 09:54:17 -08:00
moneromooo-monero
30ce8c5926
cn_deserialize: check for raw tx_extra
2018-01-28 15:23:05 +00:00
Michał Sałaban
3cb65b3f69
Return appropriate error code when not enough money for tx
2018-01-28 12:52:05 +01:00
moneromooo-monero
eda9fb5b98
p2p: fix testnet/mainnet port mixup
2018-01-28 09:44:04 +00:00
Riccardo Spagni
6ed314854c
Merge pull request #3188
...
fbc0a6dd
2018-01-27 18:21:55 -08:00
stoffu
30c44bce06
wallet: automatically use low priority if safe (no backlog & recent blocks not full)
2018-01-28 11:04:52 +09:00
stoffu
c903df5ece
simplewallet: bug fix for backlog estimate
2018-01-28 10:52:25 +09:00
moneromooo-monero
2f5a9b6bb3
wallet2: split estimate_backlog to allow for raw fee levels
2018-01-28 10:52:16 +09:00
Riccardo Spagni
d061c312fb
Merge pull request #3116
...
269ba252
2018-01-27 17:27:07 -08:00
Riccardo Spagni
a4ae78a335
Merge pull request #3145
...
fd1dfac5b50182ae
2018-01-27 17:25:47 -08:00
Riccardo Spagni
f7dcb730cb
Merge pull request #3144
...
42f86624
2018-01-27 17:25:40 -08:00
Riccardo Spagni
e93ff8f22d
Merge pull request #3143
...
ba6d2975
2018-01-27 17:25:33 -08:00
Riccardo Spagni
1506f33075
Merge pull request #3142
...
a9cae0ab
2018-01-27 17:25:25 -08:00
Riccardo Spagni
5603d5aaea
Merge pull request #3141
...
3160a9307d1088d3bc1ee2c2
2018-01-27 17:25:15 -08:00
Riccardo Spagni
6d48bddffd
Merge pull request #3136
...
e0404d35
2018-01-27 17:25:07 -08:00
Riccardo Spagni
d3e1244466
Merge pull request #3121
...
6fbb0b06
2018-01-27 17:24:57 -08:00
Riccardo Spagni
4c302c6385
Merge pull request #3120
...
6cf56682411da337
2018-01-27 17:24:49 -08:00
Riccardo Spagni
7de1685bd8
Merge pull request #3119
...
c4f4377913b4c90e
2018-01-27 17:24:42 -08:00
Riccardo Spagni
e1ba5b95c1
Merge pull request #3118
...
ca336c62
2018-01-27 17:24:34 -08:00
Riccardo Spagni
92ea8af34d
Merge pull request #3114
...
fb5c971c
2018-01-27 17:24:26 -08:00
Riccardo Spagni
73a19e0b06
Merge pull request #3113
...
ffc2e570
2018-01-27 17:24:15 -08:00
Riccardo Spagni
087a773247
Merge pull request #3104
...
939629e8
2018-01-27 17:24:08 -08:00
Riccardo Spagni
0d328cffda
Merge pull request #3102
...
3050a4f0
2018-01-27 17:24:00 -08:00
Matt Little
1dfed567e2
Fixed #if instead of #ifdef
2018-01-27 13:33:11 -07:00
xmr-eric
84a7f6a482
Readd copyright starting date
2018-01-26 10:03:20 -05:00
xmr-eric
18216f19dd
Update 2018 copyright
2018-01-26 10:03:20 -05:00
Neozaru
fbc0a6dd23
Bugfix : Missing i18n import in simplewallet
2018-01-26 13:58:49 +01:00
moneromooo-monero
7ed62e63e5
cryptonote_protocol: fix std::move usage on different types
2018-01-26 10:13:06 +00:00
stoffu
a9cae0abe7
Wallet API: remove unused enum Priority from UnsignedTransaction
2018-01-26 10:59:49 +09:00
stoffu
3160a93027
wallet2: remove {set|get}_default_decimal_point and use the same funcs under cryptonote:: instead
2018-01-26 10:59:32 +09:00
stoffu
7d1088d337
wallet2: make scan_output const and omit keys arg
2018-01-26 10:59:31 +09:00
stoffu
bc1ee2c2ee
wallet2: make member functions const when possible
2018-01-26 10:59:30 +09:00
stoffu
3050a4f05b
simplewallet: fix typo get_tx_proof_out to get_tx_proof
2018-01-26 10:59:15 +09:00
stoffu
ffc2e5705d
wallet rpc: show fees when querying incoming transfers
2018-01-26 10:58:23 +09:00
stoffu
ca336c62e3
simplewallet: check file overwrite when exporting stuff
2018-01-26 10:57:13 +09:00
Riccardo Spagni
09d19c9139
Merge pull request #3130
...
5ae617d5c1d19f3c
2018-01-25 16:57:03 -08:00
