nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,846 Commits 10 Branches 68 Tags 223 MiB
c1bda097c1
Commit Graph

4090 Commits

Author SHA1 Message Date
Riccardo Spagni
6198c816b1
Merge pull request #3170 
b3b2d4d2 options: add testnet option dependencies (whythat)
c5f55bb4 common: implement dynamic option dependencies mechanism (whythat)
05a12ccc options: remove testnet-* options (whythat)
c33cb60e common: implement dependent option descriptor (whythat)
 2018-02-17 11:51:57 +01:00
Riccardo Spagni
a2cbedd29f
Merge pull request #3191 
3607d467 core: add --no-fluffy-blocks, and enable fluffy blocks by default (moneromooo-monero)
 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 refresh height for a newly created wallet
connected to a sync'd daemon was off by a month. Now we only use
the 1 month safety margin if we're unable to talk to a daemon.
 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 p2p: fix testnet/mainnet port mixup (moneromooo-monero)
 2018-02-16 14:31:16 +01:00
Riccardo Spagni
6b1382b6b6
Merge pull request #3199 
30ce8c59 cn_deserialize: check for raw tx_extra (moneromooo-monero)
 2018-02-16 14:29:51 +01:00
Riccardo Spagni
f4a6bc79d9
Merge pull request #3226 
e4646379 keccak: fix mdlen bounds sanity checking (moneromooo-monero)
2e3e90ac pass large parameters by const ref, not value (moneromooo-monero)
61defd89 blockchain: sanity check number of precomputed hash of hash blocks (moneromooo-monero)
9af6b2d1 ringct: fix infinite loop in unused h2b function (moneromooo-monero)
8cea8d0c simplewallet: double check a new multisig wallet is multisig (moneromooo-monero)
9b98a6ac threadpool: catch exceptions in dtor, to avoid terminate (moneromooo-monero)
24803ed9 blockchain_export: fix buffer overflow in exporter (moneromooo-monero)
f3f7da62 perf_timer: rewrite to make it clear there is no division by zero (moneromooo-monero)
c6ea3df0 performance_tests: remove add_arg call stray extra param (moneromooo-monero)
fa6b4566 fuzz_tests: fix an uninitialized var in setup (moneromooo-monero)
03887f11 keccak: fix sanity check bounds test (moneromooo-monero)
ad11db91 blockchain_db: initialize m_open in base class ctor (moneromooo-monero)
bece67f9 miner: restore std::cout precision after modification (moneromooo-monero)
1aabd14c db_lmdb: check hard fork info drop succeeded (moneromooo-monero)
 2018-02-16 14:26:58 +01:00
Riccardo Spagni
24d8f9237f
Merge pull request #3248 
d6a0ae96 blockchain: don't try to use hash check array after it's freed (moneromooo-monero)
 2018-02-16 14:24:22 +01:00
Riccardo Spagni
853dd2d4f7
Merge pull request #3232 
b81e276c connection_context: initialize m_last_request_time to current time (moneromooo-monero)
 2018-02-16 14:24:12 +01:00
Riccardo Spagni
260d666cf4
Merge pull request #3231 
84a8b2da Don't create readtxn until after txn_safe gate check (Howard Chu)
 2018-02-16 14:24:01 +01:00
Riccardo Spagni
ef47ba95c8
Merge pull request #3229 
928c1825 cryptonote_protocol: guard against all threads in standby (moneromooo-monero)
 2018-02-16 14:23:53 +01:00
Riccardo Spagni
b5b88c2747
Merge pull request #3225 
71806327 dns: change default DNS to a worldwide selection (moneromooo-monero)
 2018-02-16 14:23:34 +01:00
Riccardo Spagni
a54247b993
Merge pull request #3221 
2e584dcb p2p: do not try to connect to peers in offline mode (moneromooo-monero)
 2018-02-16 14:23:22 +01:00
Riccardo Spagni
0c71197892
Merge pull request #3217 
fde4489e wipeable_string: call memwipe directly (moneromooo-monero)
 2018-02-16 14:23:08 +01:00
Riccardo Spagni
9c4428e583
Merge pull request #3214 
214d251c wallet: suggest the use of sweep_unmixable when not_enough_outs_to_mix is thrown (stoffu)
 2018-02-16 14:22:41 +01:00
Riccardo Spagni
bfddb2283b
Merge pull request #3210 
39992134 txpool: Properly bail out when outputs_amount == inputs_amount (Leon Klingele)
 2018-02-16 14:22:10 +01:00
Riccardo Spagni
9681a885d1
Merge pull request #3207 
a99ef176 wallet-rpc: take subaddress account as arg for get_transfer_by_txid (stoffu)
77125096 wallet-rpc: rename *_INDEX_OUTOFBOUND into *_INDEX_OUT_OF_BOUNDS (stoffu)
 2018-02-16 14:21:59 +01:00
Riccardo Spagni
079eea7b70
Merge pull request #3205 
bc61ae69 tx_pool: add a max pool size, settable with --max-txpool-size (moneromooo-monero)
3b4e6b35 txpool: increase unmined tx expiry to three days (moneromooo-monero)
 2018-02-16 14:21:50 +01:00
Riccardo Spagni
b23578e473
Merge pull request #3197 
f90c76be Return appropriate error code when there's no connection to daemon (Michał Sałaban)
3cb65b3f Return appropriate error code when not enough money for tx (Michał Sałaban)
 2018-02-16 14:21:00 +01:00
Riccardo Spagni
666a76652b
Merge pull request #3187 
851bd057 call _exit instead of abort in release mode (moneromooo-monero)
 2018-02-16 14:20:31 +01:00
Riccardo Spagni
bdf0339dda
Merge pull request #3181 
e3f0980a daemon: don't drop RPC with busy error when running offline (moneromooo-monero)
 2018-02-16 14:19:54 +01:00
Riccardo Spagni
ba22928d4b
Merge pull request #3180 
1dfed567 Fixed #if instead of #ifdef (Matt Little)
7c442453 Support building cncrypto lib with msvc (Matt Little)
 2018-02-16 14:19:42 +01:00
Riccardo Spagni
82599ef0e3
Merge pull request #3175 
3be98036 wallet-cli: Do not ask for scan_from_height if it explicitly is set to zero. (Maximilian Lupke)
 2018-02-16 14:19:24 +01:00
Riccardo Spagni
a43be404c7
Merge pull request #3171 
402c9eef cryptonote_tx_utils: fixed logic bug in get_destination_view_key_pub (stoffu)
 2018-02-16 14:19:10 +01:00
Riccardo Spagni
04a676397f
Merge pull request #3165 
7539603f Bootstrap daemon (stoffu)
 2018-02-16 14:18:50 +01:00
Riccardo Spagni
381faf06c7
Merge pull request #3163 
628b78ae Fix in_peers/out_peers RPC operations (Erik de Castro Lopo)
ece9bcf5 rpc_client: Fix error handling (Erik de Castro Lopo)
8f30350d Fix method name in invoke_http_json_rpc (Erik de Castro Lopo)
32c0f908 Allow the number of incoming connections to be limited (Erik de Castro Lopo)
d609a2c1 Rename delete_connections to delete_out_connections (Erik de Castro Lopo)
b927c0fc Rename connections_count to max_out_connection_count (Erik de Castro Lopo)
 2018-02-16 14:18:38 +01:00
Riccardo Spagni
0bffd2ec64
Merge pull request #3161 
78a2e15b daemon: exit with 0 when successful (moneromooo-monero)
 2018-02-16 14:18:29 +01:00
Riccardo Spagni
5d36ed6613
Merge pull request #3094 
a85dbb3f Fixed typos and wording tweaks (Maxithi)
 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 
19ff243f wallets: reorg 61 more days on testnet (moneromooo-monero)
c70f03ca blockchain: move bulletproofs to v8 (moneromooo-monero)
 2018-02-14 12:49:57 +01:00
Riccardo Spagni
589a53f479
Merge pull request #2959 
3f1a3fac bulletproofs: more robust challenge computation (moneromooo-monero)
 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 cryptonote_protocol: fix std::move usage on different types (moneromooo-monero)
 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 Bugfix : Missing i18n import in simplewallet (Neozaru)
 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 wallet2::import_blockchain fix import loop (Jaquee)
 2018-01-27 17:27:07 -08:00
Riccardo Spagni
a4ae78a335
Merge pull request #3145 
fd1dfac5 p2p: don't lookup seed IPs if using an exclusive peer (moneromooo-monero)
b50182ae p2p: don't connect to seeds if using an exclusive peer (moneromooo-monero)
 2018-01-27 17:25:47 -08:00
Riccardo Spagni
f7dcb730cb
Merge pull request #3144 
42f86624 rpc: expose recent median block size in getinfo (moneromooo-monero)
 2018-01-27 17:25:40 -08:00
Riccardo Spagni
e93ff8f22d
Merge pull request #3143 
ba6d2975 cryptonote_core: add --disable-dns-checkpoints flag (moneromooo-monero)
 2018-01-27 17:25:33 -08:00
Riccardo Spagni
1506f33075
Merge pull request #3142 
a9cae0ab Wallet API: remove unused enum Priority from UnsignedTransaction (stoffu)
 2018-01-27 17:25:25 -08:00
Riccardo Spagni
5603d5aaea
Merge pull request #3141 
3160a930 wallet2: remove {set|get}_default_decimal_point and use the same funcs under cryptonote:: instead (stoffu)
7d1088d3 wallet2: make scan_output const and omit keys arg (stoffu)
bc1ee2c2 wallet2: make member functions const when possible (stoffu)
 2018-01-27 17:25:15 -08:00
Riccardo Spagni
6d48bddffd
Merge pull request #3136 
e0404d35 rpc: default do_not_relay to false in sendrawtransaction (moneromooo-monero)
 2018-01-27 17:25:07 -08:00
Riccardo Spagni
d3e1244466
Merge pull request #3121 
6fbb0b06 cmake: set API header install path to what Qt wallet expects (redfish)
 2018-01-27 17:24:57 -08:00
Riccardo Spagni
4c302c6385
Merge pull request #3120 
6cf56682 perf_timer: add faster x86_64 timers, and pause/resume (moneromooo-monero)
411da337 perf_timer: use std::unique_ptr instead of new/delete (moneromooo-monero)
 2018-01-27 17:24:49 -08:00
Riccardo Spagni
7de1685bd8
Merge pull request #3119 
c4f43779 crypto: add a ge_p3_identity constant (moneromooo-monero)
13b4c90e crypto: add scalar mult functions returning ge_p3 instead of ge_p2 (moneromooo-monero)
 2018-01-27 17:24:42 -08:00
Riccardo Spagni
e1ba5b95c1
Merge pull request #3118 
ca336c62 simplewallet: check file overwrite when exporting stuff (stoffu)
 2018-01-27 17:24:34 -08:00
Riccardo Spagni
92ea8af34d
Merge pull request #3114 
fb5c971c Allow retrieving spend key via RPC (Michał Sałaban)
 2018-01-27 17:24:26 -08:00
Riccardo Spagni
73a19e0b06
Merge pull request #3113 
ffc2e570 wallet rpc: show fees when querying incoming transfers (stoffu)
 2018-01-27 17:24:15 -08:00
Riccardo Spagni
087a773247
Merge pull request #3104 
939629e8 Wallet API: all recover options with password (m2049r)
 2018-01-27 17:24:08 -08:00
Riccardo Spagni
0d328cffda
Merge pull request #3102 
3050a4f0 simplewallet: fix typo get_tx_proof_out to get_tx_proof (stoffu)
 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 
5ae617d5 simplewallet: single out 0 amount destinations as dummy ones (moneromooo-monero)
c1d19f3c wallet2: fix sweep_all sending an atomic unit (moneromooo-monero)
 2018-01-25 16:57:03 -08:00
Riccardo Spagni
700b3193f8
Merge pull request #3084 
5f5a51a6 util: warn if unbound was not built with threads (moneromooo-monero)
 2018-01-25 16:56:28 -08:00
Riccardo Spagni
ea75e71dd2
Merge pull request #3052 
d507167f Removed unused mac-specific output folder path (Maxithi)
 2018-01-25 16:54:45 -08:00
Riccardo Spagni
5a15a8322e
Merge pull request #3153 
ab58b150 p2p: fix picking peers off an empty gray list (moneromooo-monero)
 2018-01-25 16:51:50 -08:00
Riccardo Spagni
ef4b69f8bb
Merge pull request #3126 
ff5626d7 ringct: handle exceptions verifying bulletproofs in worker threads (moneromooo-monero)
 2018-01-25 16:50:47 -08:00
Riccardo Spagni
d25217f058
Merge pull request #3105 
b56f4645 cryptonote_protocol: fix size_t used in wire format (moneromooo-monero)
 2018-01-25 16:50:18 -08:00
Riccardo Spagni
f31f5c9a3e
Merge pull request #3093 
d188840c Improved terminology from create to generate (Maxithi)
 2018-01-25 16:49:54 -08:00
Riccardo Spagni
39bd6c6815
Merge pull request #3072 
0811b924 fix some confirmation dialog, add missing symbols (AJIekceu4)
 2018-01-25 16:48:00 -08:00
Riccardo Spagni
c222b6485e
Merge pull request #3068 
301ec15c Change cryptonote::COMMAND_RPC_SET_LIMIT::response to use int64_t (Nick Johnson)
 2018-01-25 16:47:29 -08:00
Riccardo Spagni
66a2751d68
Merge pull request #3065 
3e635a3c wallet2: allow failing parse_tx_extra (moneromooo-monero)
 2018-01-25 16:47:08 -08:00
Riccardo Spagni
ede4e1c54c
Merge pull request #3057 
9ffa97fe Factor the monero donation address (Maxithi)
 2018-01-25 16:46:18 -08:00
Riccardo Spagni
008b492963
Merge pull request #3047 
fa5c0bab Implement #3045, fixing RPC snakecases (Nick Johnson)
 2018-01-25 16:45:45 -08:00
Riccardo Spagni
5a312752af
Merge pull request #3040 
69f9a075 cryptonote_protocol: fix missing space in version mismatch message (moneromooo-monero)
 2018-01-25 16:44:51 -08:00
Riccardo Spagni
153e319cd4
Merge pull request #3038 
eb39a3d7 wallet_api: make this optional but not built by default (moneromooo-monero)
 2018-01-25 16:44:23 -08:00
Riccardo Spagni
b2ce5739df
Merge pull request #3028 
a4b006f9 wallet2 bugfix: initialize subaddress table when generating from keys (stoffu)
 2018-01-25 16:42:06 -08:00
Riccardo Spagni
960b32ba70
Merge pull request #3027 
6d40a920 Reserve proof (stoffu)
 2018-01-25 16:40:59 -08:00
Riccardo Spagni
5e211b4186
Merge pull request #3020 
03ac3890 zmq: use older 3-arg version of setsockopt (stoffu)
 2018-01-25 16:40:03 -08:00
Riccardo Spagni
75cbb7719e
Merge pull request #3015 
f06603a4 cryptonote_protocol: update target height when receiving blocks (moneromooo-monero)
 2018-01-25 16:39:16 -08:00
Riccardo Spagni
9872620781
Merge pull request #3014 
deeffaeb blockchain: remove minor floating point usage (moneromooo-monero)
 2018-01-25 16:38:32 -08:00
Riccardo Spagni
c16261c8da
Merge pull request #3013 
fe436eca apply_permutation.h: add #pragma once (moneromooo-monero)
 2018-01-25 16:37:28 -08:00
Riccardo Spagni
92826e3d8b
Merge pull request #3011 
619bb723 daemon+simplewallet: given an unknown command, show it (stoffu)
 2018-01-25 16:34:45 -08:00
Riccardo Spagni
f077bbb4f1
Merge pull request #3010 
07da9c80 Resolve addresses in get_transfers (Michał Sałaban)
 2018-01-25 16:32:40 -08:00
Riccardo Spagni
ca199aa08a
Merge pull request #3008 
50786ac7 simplewallet: Correct 3 multisig command usage help texts, e.g. for 'export_multisig_info' (rbrunner7)
 2018-01-25 16:25:01 -08:00
Matt Little
7c4424531f Support building cncrypto lib with msvc 2018-01-25 13:00:45 -07:00
moneromooo-monero
e3f0980a1d
daemon: don't drop RPC with busy error when running offline 2018-01-25 13:35:58 +00:00
Maximilian Lupke
3be98036e7 wallet-cli: Do not ask for scan_from_height if it explicitly is set to zero. 
Fixes #3080
 2018-01-24 18:01:08 +01:00
moneromooo-monero
78a2e15bea
daemon: exit with 0 when successful 2018-01-20 13:34:32 +00:00
moneromooo-monero
ab58b150ef
p2p: fix picking peers off an empty gray list 2018-01-18 17:11:37 +00:00
m2049r
939629e837 Wallet API: all recover options with password 
also renamed memo => mnemonic in api method parms
 2018-01-17 18:46:31 +01:00
moneromooo-monero
fd1dfac5d2
p2p: don't lookup seed IPs if using an exclusive peer 2018-01-17 12:15:12 +00:00
moneromooo-monero
b50182aee7
p2p: don't connect to seeds if using an exclusive peer 2018-01-17 11:17:21 +00:00
moneromooo-monero
42f86624a3
rpc: expose recent median block size in getinfo 2018-01-17 11:12:26 +00:00
moneromooo-monero
ba6d2975bc
cryptonote_core: add --disable-dns-checkpoints flag 2018-01-17 10:14:48 +00:00
moneromooo-monero
5ae617d5ae
simplewallet: single out 0 amount destinations as dummy ones 
Avoids surprising the user with "sending 0 to..."
 2018-01-16 15:41:25 +00:00
moneromooo-monero
e0404d35fe
rpc: default do_not_relay to false in sendrawtransaction 2018-01-16 11:15:01 +00:00
moneromooo-monero
c1d19f3c84
wallet2: fix sweep_all sending an atomic unit 2018-01-15 15:54:19 +00:00
moneromooo-monero
ff5626d785
ringct: handle exceptions verifying bulletproofs in worker threads 2018-01-15 11:48:23 +00:00
redfish
6fbb0b065d cmake: set API header install path to what Qt wallet expects 2018-01-14 20:14:07 -05:00
moneromooo-monero
6cf56682bc
perf_timer: add faster x86_64 timers, and pause/resume 2018-01-15 00:35:55 +00:00
moneromooo-monero
411da337d2
perf_timer: use std::unique_ptr instead of new/delete 2018-01-15 00:35:24 +00:00
moneromooo-monero
c4f437796d
crypto: add a ge_p3_identity constant 2018-01-15 00:30:46 +00:00
moneromooo-monero
13b4c90e01
crypto: add scalar mult functions returning ge_p3 instead of ge_p2 
ge_scalarmult_p3
ge_double_scalarmult_precomp_vartime2_p3
ge_double_scalarmult_base_vartime_p3

This makes it possible to reuse the result without having to
convert back to unsigned char[32] and back to ge types.
 2018-01-15 00:30:26 +00:00
Jaquee
269ba25228 wallet2::import_blockchain fix import loop 2018-01-14 20:30:35 +01:00
Michał Sałaban
fb5c971cc6 Allow retrieving spend key via RPC 2018-01-14 06:23:12 +01:00
Jethro Grassie
be1826c0fb
Keep readline optional 2018-01-11 13:51:13 -05:00
moneromooo-monero
b56f46457c
cryptonote_protocol: fix size_t used in wire format 
This is 32 bits on 32 bit platforms, but 64 bits on 64 bit platforms.
 2018-01-11 17:31:47 +00:00
stoffu
6d40a92026
Reserve proof 2018-01-10 20:37:18 +09:00
moneromooo-monero
deeffaeb5c
blockchain: remove minor floating point usage 2018-01-10 11:05:30 +00:00
Riccardo Spagni
e61f655440
Merge pull request #3061 
fc041b58 common cmake: make sure translation_files.h is generated for i18n.cpp (stoffu)
 2018-01-10 11:55:35 +01:00
Riccardo Spagni
00f4ff26c8
Merge pull request #3021 
dc6729a6 wallet2: std::unordered_set ctor is sometimes explicit (moneromooo-monero)
 2018-01-10 11:55:19 +01:00
Riccardo Spagni
4e3716a2d2
Merge pull request #3005 
369884a6 mnemonics: typo fix (4 bytes == 3 words, not 8 bytes) (stoffu)
 2018-01-10 11:54:38 +01:00
Riccardo Spagni
0b5994fbec
Merge pull request #3004 
a2c845c7 cryptonote_protocol: internal error consistency size check (moneromooo-monero)
 2018-01-10 11:54:23 +01:00
Riccardo Spagni
990389f09d
Merge pull request #3002 
9996d5e9 wallet2: guard against the dameon sending blocks before last checkpoint (moneromooo-monero)
eadaa6aa wallet_rpc_server: fix wallet leak on error exit (moneromooo-monero)
 2018-01-10 11:54:11 +01:00
Riccardo Spagni
229e1ce7d1
Merge pull request #2997 
7c4f01a7 blockchain_import: more informative verification switch (moneromooo-monero)
 2018-01-10 11:53:57 +01:00
Riccardo Spagni
d08aee7a7e
Merge pull request #2993 
776b44f1 Add misc hardening flags to the cmake machinery (moneromooo-monero)
 2018-01-10 11:53:26 +01:00
Riccardo Spagni
f9c66ba67c
Merge pull request #2990 
2d17feb0 factor STL container serialization (moneromooo-monero)
 2018-01-10 11:53:05 +01:00
Riccardo Spagni
6c7eb5109d
Merge pull request #2989 
66eeeaa1 wallet2: fix failure to create tx if inputs are not enough for fee (moneromooo-monero)
 2018-01-10 11:52:49 +01:00
Riccardo Spagni
529ca39e9d
Merge pull request #2988 
8a4610c3 blake256: fix wrong hash when computed in parts (moneromooo-monero)
 2018-01-10 11:52:32 +01:00
Riccardo Spagni
ab8a32429a
Merge pull request #2985 
6d8b29ef fix some link errors in debug mode for macos (stoffu)
fdd4c5e5 move memwipe to epee to avoid common<->crypto circular dependencies (moneromooo-monero)
40ab12a7 epee: remove dependency on common (moneromooo-monero)
 2018-01-10 11:50:58 +01:00
Riccardo Spagni
3ce7f2bead
Merge pull request #2983 
6fc4fc85 sweep_below: do not prematurely exclude subaddresses set (stoffu)
 2018-01-10 11:50:36 +01:00
Riccardo Spagni
a71db6d239
Merge pull request #2981 
b63afbaa simplewallet: detect typo for incoming_transfers options (stoffu)
 2018-01-10 11:50:21 +01:00
Riccardo Spagni
bfe580787d
Merge pull request #2976 
c765f951 simplewallet: disable donations on testnet (Matt Smith)
 2018-01-10 11:49:14 +01:00
Riccardo Spagni
420a803ff8
Merge pull request #2973 
277a5aef wallet2: fix m_key_image_{partial,known} in_light_wallet code (moneromooo-monero)
 2018-01-10 11:48:42 +01:00
Riccardo Spagni
c951bf1f72
Merge pull request #2972 
586ee642 simplewallet: lock idle scope in {im,ex}port_{key_images,outputs} (moneromooo-monero)
 2018-01-10 11:48:12 +01:00
Riccardo Spagni
0a110aefbb
Merge pull request #2971 
ae860230 Fix exceptions not finding txpool txes when relaying (moneromooo-monero)
 2018-01-10 11:45:15 +01:00
stoffu
6d8b29ef28
fix some link errors in debug mode for macos 2018-01-10 01:57:56 +00:00
moneromooo-monero
fdd4c5e577
move memwipe to epee to avoid common<->crypto circular dependencies 2018-01-10 01:57:54 +00:00
moneromooo-monero
40ab12a773
epee: remove dependency on common 2018-01-10 01:57:51 +00:00
Maxithi
d188840cc2
Improved terminology from create to generate 2018-01-09 21:46:44 +01:00
moneromooo-monero
5f5a51a6c8
util: warn if unbound was not built with threads 
This can causes crashes in libunbound
 2018-01-08 10:58:50 +00:00
Nick Johnson
fa5c0bab44
Implement #3045, fixing RPC snakecases 2018-01-06 15:11:36 -06:00
AJIekceu4
0811b9242b
fix some confirmation dialog, add missing symbols 
Change some confirmation dialog to look like other ones (add symbol ":" and space)
So, it will look like: (Y/Yes/N/No): y
Now it look: (Y/Yes/N/No)y
 2018-01-06 22:04:04 +07:00
Maxithi
9ffa97fe98
Factor the monero donation address 
Signed-off-by: Maxithi <34792056+Maxithi@users.noreply.github.com>
 2018-01-05 12:58:40 +01:00
Nick Johnson
301ec15c49
Change cryptonote::COMMAND_RPC_SET_LIMIT::response to use int64_t 2018-01-04 21:01:10 -06:00
Maxithi
d507167fa5
Removed unused mac-specific output folder path 2018-01-04 21:16:44 +01:00
moneromooo-monero
3e635a3cef
wallet2: allow failing parse_tx_extra 
It can fail if it fails to parse extra, while still having filled
the returned data with partial contents
 2018-01-04 15:38:49 +00:00
stoffu
fc041b58d6
common cmake: make sure translation_files.h is generated for i18n.cpp 2018-01-04 12:24:06 +09:00
Riccardo Spagni
a529f0a6c9
Merge pull request #3019 
294adc83 Additional fix for core_tests (Howard Chu)
d52b732e Fix stale readcursor flags (Howard Chu)
 2018-01-02 00:32:12 +02:00
Riccardo Spagni
aa4195e199
Merge pull request #2977 
c70e8daa threadpool: fix deadlock in recursive waiter usage (moneromooo-monero)
 2018-01-02 00:31:56 +02:00
Riccardo Spagni
803f54b9fd
Merge pull request #2967 
55556fab wallet_rpc_server: factor transfer info return and add missing info (moneromooo-monero)
 2018-01-02 00:31:30 +02:00
Riccardo Spagni
ee02c7ab03
Merge pull request #2962 
14c29814 wallet2: fix use of uninitialized data (moneromooo-monero)
 2018-01-02 00:30:01 +02:00
Riccardo Spagni
eb617be8f4
Merge pull request #2960 
5cbcf0aa wallet: support for multisig seeds (moneromooo-monero)
 2018-01-02 00:29:36 +02:00
Riccardo Spagni
dd11bfb89c
Merge pull request #2934 
db2bc965 Embed the translation files in the binary (Guillaume LE VAILLANT)
 2018-01-02 00:28:45 +02:00
moneromooo-monero
69f9a07553
cryptonote_protocol: fix missing space in version mismatch message 2017-12-31 17:32:57 +00:00
moneromooo-monero
776b44f17b
Add misc hardening flags to the cmake machinery 
See https://wiki.debian.org/Hardening#User_Space
 2017-12-31 14:26:12 +00:00
moneromooo-monero
eb39a3d7d3
wallet_api: make this optional but not built by default 
It means it can still be built with make -C build/debug wallet_api
but still not DoS us while debugging
 2017-12-31 11:14:20 +00:00
stoffu
a4b006f965
wallet2 bugfix: initialize subaddress table when generating from keys 2017-12-29 15:53:28 +09:00
Howard Chu
294adc8341
Additional fix for core_tests 
Reset thread-local info if it doesn't match the current env.
Only happens when a process opens/closes env multiple times in the
same process, doesn't affect monerod.
 2017-12-28 20:24:08 +00:00
moneromooo-monero
dc6729a66a
wallet2: std::unordered_set ctor is sometimes explicit 2017-12-28 10:20:12 +00:00
Riccardo Spagni
a1a8262355
Merge pull request #2949 
e20e489a Better definite article use (xmr-eric)
 2017-12-28 09:00:00 +02:00
Riccardo Spagni
3bbe2481ce
Merge pull request #2946 
1a686bf8 daemon: print num txes in print_bc (moneromooo-monero)
 2017-12-28 08:59:31 +02:00
Riccardo Spagni
95a687d584
Merge pull request #2945 
9e07ccf1 daemon: remove some superfluous includes (moneromooo-monero)
 2017-12-28 08:59:16 +02:00
Riccardo Spagni
0ae3651cc9
Merge pull request #2942 
4f45f9da simplewallet: factor out tx exceptions (moneromooo-monero)
 2017-12-28 08:58:46 +02:00
Riccardo Spagni
5f562cf9e6
Merge pull request #2941 
d0d38dc8 wallet2: print tx size in bytes and kB (moneromooo-monero)
 2017-12-28 08:58:30 +02:00
Riccardo Spagni
8980aacbe8
Merge pull request #2940 
da0fd71d only include the easylogging++ stack trace code when needed (moneromooo-monero)
81b04cfa easlogging++: omit some unneded macros (moneromooo-monero)
 2017-12-28 08:57:59 +02:00
stoffu
03ac389022
zmq: use older 3-arg version of setsockopt 2017-12-28 13:15:49 +09:00
Howard Chu
d52b732efb
Fix stale readcursor flags 
Reset thread-specific flags when a write txn is started.
Also remove some redundant start-readtxn code.
 2017-12-28 00:59:04 +00:00
stoffu
b63afbaa99
simplewallet: detect typo for incoming_transfers options 2017-12-28 07:53:31 +09:00
stoffu
6fc4fc850e
sweep_below: do not prematurely exclude subaddresses set 2017-12-28 07:52:53 +09:00
moneromooo-monero
f06603a439
cryptonote_protocol: update target height when receiving blocks 2017-12-27 13:54:19 +00:00
moneromooo-monero
fe436eca46
apply_permutation.h: add #pragma once 2017-12-27 12:15:51 +00:00
stoffu
619bb7233b
daemon+simplewallet: given an unknown command, show it 2017-12-27 15:23:34 +09:00
Michał Sałaban
07da9c806d Resolve addresses in get_transfers 2017-12-27 01:35:48 +01:00
rbrunner7
50786ac70c simplewallet: Correct 3 multisig command usage help texts, e.g. for 'export_multisig_info' 2017-12-26 14:57:08 +01:00
moneromooo-monero
da0fd71d3e
only include the easylogging++ stack trace code when needed 2017-12-26 11:40:15 +00:00
stoffu
e3530789d3
wallet-api: added Utils::onStartup 2017-12-26 08:23:32 +09:00
Riccardo Spagni
40df4905fd
Merge pull request #3006 
7e7b1a82 Revert "return subaddress in get_bulk_payments" (moneromooo-monero)
 2017-12-25 22:08:56 +02:00
moneromooo-monero
7e7b1a8252
Revert "return subaddress in get_bulk_payments" 
This reverts commit b60f48f0e3.
 2017-12-25 20:04:40 +00:00
Riccardo Spagni
ca8c7e863f
Merge pull request #2895 
5ad312a1 wallet2: switch to chacha20 instead of chacha8 (moneromooo-monero)
1e5491e9 Add a chacha20 variant to go with chacha8 (moneromooo-monero)
 2017-12-25 22:00:44 +02:00
Riccardo Spagni
0a5bfa7c73
Merge pull request #2938 
aaae94f0 wallet2: reinstate the single preferred output selection (moneromooo-monero)
 2017-12-25 21:42:22 +02:00
moneromooo-monero
5ad312a1c3
wallet2: switch to chacha20 instead of chacha8 
Wallet caches and keys files are loaded with chacha8 as needed,
but only saved with chacha20. Other data (eg, cold wallet data
files, etc) will be incompatible.
 2017-12-25 19:28:06 +00:00
moneromooo-monero
1e5491e942
Add a chacha20 variant to go with chacha8 2017-12-25 19:28:03 +00:00
Riccardo Spagni
409e9bb029
Merge pull request #2931 
04349492 wallet2: error out in get_seed if the language is invalid (moneromooo-monero)
 2017-12-25 21:21:00 +02:00
Riccardo Spagni
b38f6dcf0b
Merge pull request #2929 
ae55bacd resumption support for updates using range requests (moneromooo-monero)
fe0fae50 epee: add a get_file_size function (moneromooo-monero)
 2017-12-25 21:20:22 +02:00
Riccardo Spagni
c611cca462
Merge pull request #2928 
d28c388f p2p: stop net server before closing starting connections (moneromooo-monero)
 2017-12-25 21:19:58 +02:00
Riccardo Spagni
db09247c68
Merge pull request #2926 
6b5bd129 Account tagging (stoffu)
 2017-12-25 21:19:33 +02:00
Riccardo Spagni
32c14e0f37
Merge pull request #2922 
a1d44f27 updates: use https for updates (moneromooo-monero)
472a93c8 download: SSL suport (moneromooo-monero)
 2017-12-25 21:18:29 +02:00
Riccardo Spagni
2b00899bb2
Merge pull request #2920 
bd5cce07 network_throttle: fix ineffective locking (moneromooo-monero)
e0a61299 network_throttle: remove unused xxx static member (moneromooo-monero)
24f584d9 cryptonote_core: remove unused functions with off by one bugs (moneromooo-monero)
b1634aa3 blockchain: don't leave dangling pointers in this (moneromooo-monero)
8e60b81c cryptonote_core: fix db leak on error (moneromooo-monero)
213e326c abstract_tcp_server2: log init_server errors as fatal (moneromooo-monero)
b51dc566 use const refs in for loops for non tiny types (moneromooo-monero)
f0568ca6 net_parse_helpers: fix regex error checking (moneromooo-monero)
b49ddc76 check accessing an element past the end of a container (moneromooo-monero)
2305bf26 check return value for generate_key_derivation and derive_public_key (moneromooo-monero)
a4240d9f catch const exceptions (moneromooo-monero)
45a1c4c0 add empty container sanity checks when using front() and back() (moneromooo-monero)
56fa6ce1 tests: fix a buffer overread in a unit test (moneromooo-monero)
b4524892 rpc: guard against json parsing a non object (moneromooo-monero)
c2ed8618 easylogging++: avoid buffer underflow (moneromooo-monero)
187a6ab2 epee: trap failure to parse URI from request (moneromooo-monero)
061789b5 checkpoints: trap failure to load JSON checkpoints (moneromooo-monero)
ba2fefb9 checkpoints: pass std::string by const ref, not const value (moneromooo-monero)
38c8f4e0 mlog: terminate a string at last char, just in case (moneromooo-monero)
d753d716 fix a few leaks by throwing objects, not newed pointers to objects (moneromooo-monero)
fe568db8 p2p: use size_t for arbitrary counters instead of uint8_t (moneromooo-monero)
46d6fa35 cryptonote_protocol: sanity check chain hashes from peer (moneromooo-monero)
25584f86 cryptonote_protocol: print peer versions when unexpected (moneromooo-monero)
490a5d41 rpc: do not try to use an invalid txid in relay_tx (moneromooo-monero)
 2017-12-25 21:17:52 +02:00
Riccardo Spagni
170f598ac9
Merge pull request #2918 
f5bc7f18 simplewallet: fix default unspent_outputs output with subaddresses (moneromooo-monero)
 2017-12-25 21:17:32 +02:00
Riccardo Spagni
8b40bc27a2
Merge pull request #2916 
a9217641 wallet-rpc: added receiving address to res of get(_bulk)_payments; selective addresses for getaddress (stoffu)
 2017-12-25 21:17:16 +02:00
Riccardo Spagni
d06f3ea9ad
Merge pull request #2902 
1741fb5f node_rpc_proxy: remove unused local and time call (moneromooo-monero)
 2017-12-25 21:16:01 +02:00
Riccardo Spagni
b3dddb22fe
Merge pull request #2899 
b60f48f0 return subaddress in get_bulk_payments (Dmitriy Plekhanov)
 2017-12-25 21:15:08 +02:00
Riccardo Spagni
2ef299f2a9
Merge pull request #2891 
3f24e901 wallet2: don't write a .new file when not needed (moneromooo-monero)
 2017-12-25 21:14:20 +02:00
Riccardo Spagni
2f09828ea8
Merge pull request #2890 
83b0f9e6 version: add -master to master version (moneromooo-monero)
493f7d09 util: allow non numeric version parts (moneromooo-monero)
 2017-12-25 21:13:59 +02:00
Riccardo Spagni
2d1965f31b
Merge pull request #2888 
ca18ff64 wallet2: detect spends in txes without a valid public tx key (moneromooo-monero)
6afcd8e3 cn_deserialize: print tx extra fields in partly decoded tx extra (moneromooo-monero)
 2017-12-25 21:13:33 +02:00
stoffu
369884a669
mnemonics: typo fix (4 bytes == 3 words, not 8 bytes) 2017-12-25 19:57:38 +09:00
moneromooo-monero
a2c845c7e3
cryptonote_protocol: internal error consistency size check 2017-12-24 13:04:40 +00:00
moneromooo-monero
9996d5e96c
wallet2: guard against the dameon sending blocks before last checkpoint 2017-12-24 12:12:40 +00:00
moneromooo-monero
eadaa6aaa3
wallet_rpc_server: fix wallet leak on error exit 
Makes it easier to debug leaks
 2017-12-24 12:12:37 +00:00