Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,767 Commits 21 Branches 51 Tags 162 MiB
Commit Graph

6117 Commits

Author SHA1 Message Date
moneromooo-monero 4ee095c200
p2p: don't connect to more than one IP per class B if we can 2019-07-05 18:25:52 +00:00
moneromooo-monero c2238327d0
keccak: guard against misaligned memory accesses on ARM 
The code generated is exactly the same as the direct access
one on x86_64
 2019-07-04 22:13:16 +00:00
moneromooo-monero a96c1a46d4
cryptonote_protocol: drop peers we can't download from when syncing 
Any peer that's behind us while syncing is useless to us (though
not to them). This ensures that we don't get our peer slots filled
with peers that we can't use. Once we've synced, we can connect
to them and they can then sync off us if they want.
 2019-07-04 21:56:10 +00:00
moneromooo-monero ab361df2cd
p2p: add a few missing connection close calls 2019-07-04 21:56:10 +00:00
luigi1111 9d7107c870
Merge pull request #5663 
5d6b43b core: fix --prune-blockchain not pruning if no blockchain exists (moneromooo-monero)
 2019-07-04 14:46:37 -05:00
luigi1111 59ba0eee69
Merge pull request #5650 
3c071d2 blockchain: silence an error getting blocks for pruned nodes (moneromooo-monero)
 2019-07-04 14:44:05 -05:00
luigi1111 591c72613b
Merge pull request #5647 
2ff99fb db_lmdb: commit pruning txn at checkpoints (moneromooo-monero)
 2019-07-04 14:41:36 -05:00
selene c393e824d6 CryptonightR_JIT: fix return value on error 
The value was positive rather than zero, but the caller only
checks for negative errors
 2019-07-04 12:49:54 +01:00
Martijn Otto c164f9037e
Remove unnecessary m_check_txin_table, fix const correctness 2019-07-03 14:39:52 +02:00
Jethro Grassie 6560bfa64c
rpc: get_block_template add optional extra_nonce 
Circumvents the need to create a new blockhashing blob when you already
know the data you want to set in the extra_nonce (so use this instead of
reserve_size).
 2019-07-03 07:57:36 -04:00
moneromooo-monero 8be5fea1de
simplewallet: optional all flag to export_outputs/export_key_images 2019-07-02 19:42:28 +00:00
moneromooo-monero bcd2da76cd
miner: fix --bg-mining-enable description 2019-07-02 17:43:36 +00:00
Jethro Grassie dc8b7a88bd
zmq: MacPorts latest fix 2019-07-01 23:13:55 -04:00
moneromooo-monero c8709fe52f
wallet: do not print log settings when unset 
Coverity 199721
 2019-07-01 15:17:30 +00:00
luigi1111 633f14b976
Merge pull request #5681 
037f94c Remove Xiala.net from the list of dns resolvers (tobtoht)
 2019-07-01 01:12:23 -05:00
luigi1111 2db997828a
Merge pull request #5678 
15c699f rpc: set sanity_check_failed to false when successful (stoffu)
 2019-07-01 00:22:07 -05:00
luigi1111 393c33f86c
Merge pull request #5675 
da3e20e tx_sanity_check: relax the median check a lot (moneromooo-monero)
 2019-07-01 00:18:40 -05:00
moneromooo-monero 4237707d3e
p2p: don't forget pruning seed or public RPC port when updating peers 
Older nodes don't pass that information around
 2019-06-26 10:20:19 +00:00
Michal vel m@lbit 1db5357c7b rpc headers fix 2019-06-25 01:49:04 +01:00
moneromooo-monero a604241ef6
simplewallet: don't ask about mining when running a command line 
This is likely to be done via a script
 2019-06-22 10:50:20 +00:00
moneromooo-monero 3768db227c
p2p: add a reference to Cao, Tong et al. for the last_seen changes 
"Exploring the Monero Peer-to-Peer Network". https://eprint.iacr.org/2019/411
 2019-06-21 10:34:33 +00:00
tobtoht 037f94c54e
Remove Xiala.net from the list of dns resolvers 
It is down permanently. See: https://xiala.net/
"Ende November 2018 werden alle Dienste von xiala.net abgeschaltet."
 2019-06-21 09:40:10 +00:00
stoffu 15c699f0a6
rpc: set sanity_check_failed to false when successful 2019-06-20 14:32:49 +09:00
moneromooo-monero da3e20ee01
tx_sanity_check: relax the median check a lot 
we don't want to prevent bona fide txes, just obvious bad ones
 2019-06-19 23:31:38 +00:00
moneromooo-monero 098aadf084
p2p: close the right number of connections on setting max in/out peers 2019-06-19 11:49:36 +00:00
moneromooo-monero fcbf7b3f74
p2p: propagate out peers limit to payload handler 2019-06-19 11:49:36 +00:00
Dusan Klinec 097cca59c1
wallet_api: catch getTxKey exception 
- getTxKey method throws an exception, e.g., when user declines txKey export
 2019-06-19 12:09:49 +02:00
moneromooo-monero b2bfcab618
wallet2: fix change subaddress mixup when sending pre rct outputs 2019-06-19 09:39:16 +00:00
moneromooo-monero 5d6b43b672
core: fix --prune-blockchain not pruning if no blockchain exists 2019-06-17 16:26:43 +00:00
Dusan Klinec f074b6b571
device: show address on device display 
- Trezor: support for device address display (subaddress, integrated address)
- Wallet::API support added
- Simplewallet:
  - address device [<index>]
  - address new <label>  // shows address on device also
  - integrated_address [device] <payment_id|address>  // new optional "device" arg to display also on the device
 2019-06-17 16:49:04 +02:00
Dusan Klinec 64fb0f872a
device: tx_key caching fixed, store recovered txkey 2019-06-17 14:53:39 +02:00
Howard Chu 8ccc30b163
Fix --restore-date usage 
The wallet was ignoring --restore-height and --restore-date params and
prompting for them again.
 2019-06-16 21:11:33 +01:00
moneromooo-monero 3c071d203f
blockchain: silence an error getting blocks for pruned nodes 
This happens often when a pre-pruning node asks a pruned node
for data it does not have
 2019-06-16 11:03:41 +00:00
Howard Chu a182df21d0
Bans for RPC connections 
Make bans control RPC sessions too. And auto-ban some bad requests.
Drops HTTP connections whenever response code is 500.
 2019-06-16 11:38:08 +01:00
moneromooo-monero 2ff99fb47f
db_lmdb: commit pruning txn at checkpoints 
to avoid errors when the txn is too large
 2019-06-15 09:50:54 +00:00
Riccardo Spagni 6335509727
Merge pull request #5641 
633f1542 prep for 0.14.1 release (Riccardo Spagni)
 2019-06-14 16:20:02 +02:00
Riccardo Spagni 633f1542e2
prep for 0.14.1 release 2019-06-14 16:16:52 +02:00
moneromooo-monero 2eef90d6ef
rpc: restrict the recent cutoff size in restricted RPC mode 2019-06-14 08:47:33 +00:00
moneromooo-monero 0564da5fdc
ensure no NULL is passed to memcpy 
NULL is valid when size is 0, but memcpy uses nonnull attributes,
so let's not poke the bear
 2019-06-14 08:47:29 +00:00
moneromooo-monero 1387549e90
serialization: check stream good flag at the end 
just in case
 2019-06-14 08:47:23 +00:00
moneromooo-monero a00cabd4f3
tree-hash: allocate variable memory on heap, not stack 
Large amounts might run out of stack

Reported by guidov
 2019-06-14 08:47:20 +00:00
moneromooo-monero f215219252
cryptonote: throw on tx hash calculation error 2019-06-14 08:47:17 +00:00
moneromooo-monero db2b9fba65
serialization: fail on read_varint error 2019-06-14 08:47:14 +00:00
moneromooo-monero 68ad548193
cryptonote_protocol: fix another potential P2P DoS 
When asking for txes in a fluffy transaction, one might ask
for the same (large) tx many times
 2019-06-14 08:47:11 +00:00
moneromooo-monero 1cc61018e5
cryptonote_protocol: expand basic DoS protection 
Count transactions as well
 2019-06-14 08:47:08 +00:00
anonimal 8f66b7053a
cryptonote_protocol_handler: prevent potential DoS 
Essentially, one can send such a large amount of IDs that core exhausts
all free memory. This issue can theoretically be exploited using very
large CN blockchains, such as Monero.

This is a partial fix. Thanks and credit given to CryptoNote author
'cryptozoidberg' for collaboration and the fix. Also thanks to
'moneromooo'. Referencing HackerOne report #506595.
 2019-06-14 08:47:05 +00:00
moneromooo-monero 69f9420489
core: do not complain about low block rate if disconnected 
In that case, we'll still keep the "Monero is now disconnected
from the network" near the end of the log
 2019-06-13 10:25:30 +00:00
moneromooo-monero b712ae0af2
rpc: work around a GCC 7.4.0 (at least) bug 
In static member function ‘static boost::optional<cryptonote::rpc::output_distribution_data> cryptonote::rpc::RpcHandler::get_output_distribution(const std::function<bool(long unsigned int, long unsigned int, long unsigned int, long unsigned int&, std::vector<long unsigned int>&, long unsigned int&)>&, uint64_t, uint64_t, uint64_t, const std::function<crypto::hash(long unsigned int)>&, bool, uint64_t)’:
cc1plus: warning: ‘void* __builtin_memset(void*, int, long unsigned int)’: specified size 18446744073709551536 exceeds maximum object size 9223372036854775807 [-Wstringop-overflow=]
 2019-06-12 22:27:07 +00:00
moneromooo-monero 03aa14ec87
tx_sanity_check: don't print an error when not enough outs to check 2019-06-12 12:06:14 +00:00
moneromooo-monero 14881094af
rpc: fix get_transactions getting v1 txes from the txpool 
It would try to get their prunable hash, but v1 txes don't have one
 2019-06-12 11:59:13 +00:00
luigi1111 fd0cf689dd
Merge pull request #5619 
f2f207d miner: fix double free of thread attributes (ston1th)
 2019-06-11 18:17:11 -05:00
Your Name 6b41bd8eb5 Delete more include string.h 2019-06-11 16:08:42 +08:00
xiphon b8cfa92b7e rpc: implement set_bootstrap_daemon method 2019-06-10 21:10:08 +00:00
moneromooo-monero 35c20c4332
Fix GCC 9.1 build warnings 
GCC wants operator= aand copy ctor to be both defined, or neither
 2019-06-09 09:39:18 +00:00
ston1th f2f207d635 miner: fix double free of thread attributes 
issue: #5568
 2019-06-09 10:51:18 +02:00
moneromooo-monero 2cbe75661c
p2p: fix GCC 9.1 crash 2019-06-08 17:52:53 +00:00
moneromooo-monero 068fa1ca5c
p2p: delay IGP probing on startup 
We might have external access without having to do this
 2019-06-06 10:33:02 +00:00
moneromooo-monero c820e1839f
simplewallet: print errors on exceptions creating wallets 
Exceptions would otherwise terminate the process silently
 2019-06-06 09:49:47 +00:00
xiphon cf8cb6873a rpc: use ip address string representation for peer::host field 2019-06-04 19:33:35 +00:00
Howard Chu dd58057126
Remember RPC version on initial connect 
Don't keep asking for it on an intact connection
Wallet is too chatty over the wire
 2019-06-02 09:31:50 +01:00
Riccardo Spagni 62d32e955a
Merge pull request #5577 
f950517a core: update pruning if using --prune-blockchain on a pruned blockchain (moneromooo-monero)
 2019-06-01 20:25:19 +02:00
Riccardo Spagni 7e417dd408
Merge pull request #5571 
35da33be blockchain: do not try to pop blocks down to the genesis block (moneromooo-monero)
4b51f9a3 core: do not commit half constructed batch db txn (moneromooo-monero)
 2019-06-01 20:22:19 +02:00
Riccardo Spagni 14d3295649
Merge pull request #5561 
9bfa4c20 Fix allow any cert mode in wallet rpc when configured over rpc (Lee Clagett)
3544596f Add ssl_options support to monerod's rpc mode. (Lee Clagett)
c9aaccf3 Fix configuration bug; wallet2 --daemon-ssl-allow-any-cert now works. (Lee Clagett)
 2019-06-01 20:21:45 +02:00
Riccardo Spagni fccfc1aa25
Merge pull request #5555 
b6830db2 Fix #5553 (Howard Chu)
 2019-06-01 20:20:39 +02:00
Jethro Grassie 343c0b4255
add a command line option to disable ZMQ server 2019-06-01 13:03:37 -04:00
moneromooo-monero 880ebfdeea
daemon: add more chain specific info in alt_chain_info 2019-06-01 15:43:52 +00:00
moneromooo-monero 2aa11341fc
daemon: display peer address type in print_cn 2019-05-31 09:10:05 +00:00
moneromooo-monero fcfcc3ac86
rpc: in/out peers can now return the setting's value 2019-05-30 12:13:31 +00:00
wowario cd720c7e0b
add cumulative difficulty to diff command 2019-05-30 11:57:21 +03:00
Jesus Ramirez 270a3ae58b Unused private member m_miner_address 2019-05-29 10:12:47 -04:00
moneromooo-monero f950517a08
core: update pruning if using --prune-blockchain on a pruned blockchain 
Avoids a massive amount of spurious warnings if the last update before
the daemon exited was a while ago and the daemon was syncing
 2019-05-28 09:12:11 +00:00
xiphon 577324a954 wallet_manager: omit redundant disconnect, drop unused variable 2019-05-27 14:40:29 +00:00
moneromooo-monero 35da33bea9
blockchain: do not try to pop blocks down to the genesis block 2019-05-26 17:11:32 +00:00
moneromooo-monero 4b51f9a34f
core: do not commit half constructed batch db txn 2019-05-25 16:24:56 +00:00
moneromooo-monero 162c3e18ec
blockchain_export: allow exporting blocks.dat format from pruned 
We don't need any of the pruned data for this
 2019-05-24 14:12:45 +00:00
moneromooo-monero c07bbd5c04
daemon: fix "never seen before" time span display for peers 2019-05-24 10:47:36 +00:00
Lee Clagett 9bfa4c20ca Fix allow any cert mode in wallet rpc when configured over rpc 2019-05-22 00:15:14 -04:00
Lee Clagett 3544596f9f Add ssl_options support to monerod's rpc mode. 2019-05-22 00:09:11 -04:00
Lee Clagett c9aaccf346 Fix configuration bug; wallet2 --daemon-ssl-allow-any-cert now works. 2019-05-21 15:43:27 -04:00
Howard Chu b6830db2d4
Fix #5553 
Make sure the tip hash still matches the cached block
 2019-05-19 03:02:33 +01:00
moneromooo-monero 915f59e3c0
wallet: add unlock_time details to show_transfers 
also add a note when receiving the tx, because the user
might not notice the "XXX blocks to unlock" in the balance.
 2019-05-16 21:37:05 +00:00
Riccardo Spagni e8487fa46b
Merge pull request #5539 
3f612cda Changed odd bullet point to low level header (Rohaq)
af9bc4ec Used subeaders to avoid slightly wonky looking formatting (Rohaq)
1873af35 Made code block usage consistent across all .md files (Rohaq)
68103075 Updated Copyright notice (Rohaq)
39bd157f Added Table of Contents to main README.md (Rohaq)
 2019-05-15 16:10:41 +02:00
Riccardo Spagni 5e80b3c3ef
Merge pull request #5535 
e1016bce password: do not use line input on windows (moneromooo-monero)
 2019-05-15 16:06:58 +02:00
luigi1111 1607419e38
Merge pull request #5538 
615f287 wallet: fix certificate fingerprint length check (moneromooo-monero)
 2019-05-14 16:02:59 -05:00
luigi1111 eedf5106f5
Merge pull request #5532 
46244dd wallet_rpc_server: use original addresses in destinations in get_transfers (moneromooo-monero)
 2019-05-14 15:59:34 -05:00
luigi1111 5a67ff2b32
Merge pull request #5526 
1e8f3f6 rpc: fail update RPC when running offline (moneromooo-monero)
 2019-05-14 15:54:10 -05:00
luigi1111 266f68be32
Merge pull request #5512 
d47292e error: fix compile error on windows with depends (moneromooo-monero)
 2019-05-14 15:51:14 -05:00
Rohaq 1873af35bf Made code block usage consistent across all .md files 2019-05-12 05:16:26 +01:00
moneromooo-monero 615f287aec
wallet: fix certificate fingerprint length check 
Fixed by crCr62U0
 2019-05-11 13:05:06 +00:00
moneromooo-monero e1016bce14
password: do not use line input on windows 
This keeps its builtin command editing away

Thanks iDunk for testing on Windows
 2019-05-10 18:56:50 +00:00
dsc 4c666141e3 expose set/get walletcache attribute functionality in wallet api 2019-05-10 19:24:45 +02:00
moneromooo-monero 46244dd08c
wallet_rpc_server: use original addresses in destinations in get_transfers 
And add them for pending transfers, where they were missing
 2019-05-10 14:44:13 +00:00
moneromooo-monero 6abaaaa994
remove obsolete save_graph skeleton code 2019-05-10 14:17:18 +00:00
moneromooo-monero 1e8f3f66bf
rpc: fail update RPC when running offline 2019-05-09 19:14:49 +00:00
moneromooo-monero 4228ee0b9e
daemon: add optional arguments to alt_chain_info 
>N limits display to alt chains with more than N blocks
-N limits display to alt chains younger than N blocks
 2019-05-09 09:13:11 +00:00
moneromooo-monero 0605406714
daemon: sort alt chains by height 2019-05-09 09:12:49 +00:00
moneromooo-monero 06b8f29992
blockchain: keep alternative blocks in LMDB 
Alternative blocks are cleared on startup unless --keep-alt-blocks
is passed on the command line
 2019-05-08 17:36:52 +00:00
Riccardo Spagni f64f59627d
Merge pull request #5510 
e9809382 fix wide difficulty conversion with some versions of boost (moneromooo-monero)
 2019-05-07 17:36:27 +02:00
Riccardo Spagni 97cb1c9436
Merge pull request #5508 
1c44e658 wallet2: reject standalone short payment IDs in monero: URI API (moneromooo-monero)
 2019-05-07 17:35:28 +02:00
Riccardo Spagni a22a8b0f2b
Merge pull request #5505 
7e5158aa mnemonics: fix 4 byte UTF-8 rewriting (moneromooo-monero)
 2019-05-07 17:34:53 +02:00
Riccardo Spagni c20221f290
Merge pull request #5503 
ccc1e311 wallet_rpc_server: reject standalone short payment id in address book (moneromooo-monero)
 2019-05-07 17:34:16 +02:00
Riccardo Spagni ebb1c03e8c
Merge pull request #5501 
b4ca72dd wallet2: fix infinite loop picking outputs in corner case (moneromooo-monero)
 2019-05-07 17:32:33 +02:00
Riccardo Spagni 2d04b0e500
Merge pull request #5499 
a4c4a2d8 blockchain: keep a rolling long term block weight median (moneromooo-monero)
 2019-05-07 17:31:45 +02:00
Riccardo Spagni 9d91301faa
Merge pull request #5496 
0eb0d6b8 rpc: improve get_output_distribution (moneromooo-monero)
 2019-05-07 17:30:27 +02:00
Riccardo Spagni cf8319602d
Merge pull request #5481 
28a7d315 p2p: do not send last_seen timestamp to peers (moneromooo-monero)
 2019-05-07 17:29:42 +02:00
moneromooo-monero e4d100b062
wallet2: don't wait a day before using new version fees 
30 blocks should be more than enough to drain the txpool of
transactions made with the old fee scheme
 2019-05-02 18:00:25 +00:00
moneromooo-monero bc94ba4d14
wallet: distinguish between empty and absent attributes 2019-05-02 13:00:08 +00:00
moneromooo-monero d47292eb3d
error: fix compile error on windows with depends 
state_not_recoverable is not defined there
 2019-05-02 10:14:09 +00:00
moneromooo-monero a4c4a2d8aa
blockchain: keep a rolling long term block weight median 2019-05-02 09:47:01 +00:00
Riccardo Spagni 77f9bfa4d5
Merge pull request #5493 
5e0da6fb change SSL certificate fingerprint whitelisting from SHA1 to SHA-256 (moneromooo-monero)
 2019-05-02 11:30:28 +02:00
Riccardo Spagni 52eb454d7b
Merge pull request #5491 
98fb98f9 wallet_rpc_server: adding missing return on error in set_daemon (moneromooo-monero)
9074c0d8 wallet_rpc_server: return false on error in set_log_categories (moneromooo-monero)
968848a7 wallet_rpc_server: fix crash in validate_address if no wallet is loaded (moneromooo-monero)
 2019-05-02 11:30:11 +02:00
Riccardo Spagni efd2412e77
Merge pull request #5489 
64983fce wallet2: default to trying to keep 5 outputs of 2+ monero (moneromooo-monero)
 2019-05-02 11:29:25 +02:00
Riccardo Spagni 08ab0cbdda
Merge pull request #5476 
0aaf5e2a device/trezor: device sorting and filtering improved (Dusan Klinec)
 2019-05-02 11:28:51 +02:00
moneromooo-monero e980938210
fix wide difficulty conversion with some versions of boost 2019-05-01 19:58:09 +00:00
moneromooo-monero 1c44e65863
wallet2: reject standalone short payment IDs in monero: URI API 2019-05-01 18:41:39 +00:00
moneromooo-monero 7e5158aa97
mnemonics: fix 4 byte UTF-8 rewriting 2019-04-30 21:10:54 +00:00
moneromooo-monero ccc1e311dc
wallet_rpc_server: reject standalone short payment id in address book 2019-04-30 21:07:37 +00:00
moneromooo-monero 1a66a86f94
remove unused code 2019-04-29 20:52:40 +00:00
moneromooo-monero 25a7cfdb4a
add a few checks where it seems appropriate 2019-04-29 20:52:40 +00:00
moneromooo-monero b4ca72dde9
wallet2: fix infinite loop picking outputs in corner case 
If we have fewer outputs available on the chain than what we
require, but the output we're spending already has a ring,
it would loop picking outputs randomly, but never find enough.
Also tune logs for better debugging this kind of thing.
 2019-04-29 10:02:20 +00:00
moneromooo-monero 5e0da6fb68
change SSL certificate fingerprint whitelisting from SHA1 to SHA-256 
SHA1 is too close to bruteforceable
 2019-04-26 11:37:15 +00:00
moneromooo-monero 98fb98f93f
wallet_rpc_server: adding missing return on error in set_daemon 2019-04-25 23:35:37 +00:00
moneromooo-monero 9074c0d8cf
wallet_rpc_server: return false on error in set_log_categories 
Reported by SmajeNz0
 2019-04-25 23:35:37 +00:00
moneromooo-monero 968848a77b
wallet_rpc_server: fix crash in validate_address if no wallet is loaded 
Reported by SmajeNz0
 2019-04-25 23:35:37 +00:00
moneromooo-monero 0eb0d6b802
rpc: improve get_output_distribution 
It can now handle small reorgs without having to rescan the
whole blockchain.

Also add a test for it.
 2019-04-25 16:49:29 +00:00
Dusan Klinec 0aaf5e2ac8
device/trezor: device sorting and filtering improved 
- Trezor type detection refactored, T1 disabled (was enabled before which was a bug)
- Sort connected devices by env TREZOR_PATH
  - Compatibility with Trezor ecosystem using TREZOR_PATH env var
  - Enables to pick particular Trezor to use in GUI as we don't have the multi-device selection yet
- Dump all detected devices to log for better debugging / troubleshooting
 2019-04-25 00:31:10 +02:00
Riccardo Spagni 581994b61c
Merge pull request #5486 
4be18df3 tx_sanity_check: relax uniqueness check a bit (moneromooo-monero)
b386ae57 wallet2: add missing "sanity check failed" reason message (moneromooo-monero)
 2019-04-24 22:41:40 +02:00
Riccardo Spagni 2e2ee3d823
Merge pull request #5485 
c519d1df wallet2: fix wrong change being recorded in sweep_all (moneromooo-monero)
 2019-04-24 22:41:18 +02:00
Riccardo Spagni 2aa7fbd1d6
Merge pull request #5480 
7af49ef0 daemonizer: add --non-interactive for windows (moneromooo-monero)
 2019-04-24 22:39:50 +02:00
Riccardo Spagni edcb0cfff2
Merge pull request #5477 
97e1c927 wallet: fix key image computation signaling to the device (Dusan Klinec)
 2019-04-24 22:38:36 +02:00
Riccardo Spagni fd7ed93526
Merge pull request #5470 
31a9aa83 wallet_rpc_server: add block_height and frozen to incoming_transfers (moneromooo-monero)
 2019-04-24 22:37:43 +02:00
moneromooo-monero 28a7d31565
p2p: do not send last_seen timestamp to peers 
This can be used for fingerprinting and working out the
network topology.

Instead of sending the first N (which are sorted by last
seen time), we sent a random subset of the first N+N/5,
which ensures reasonably recent peers are used, while
preventing repeated calls from deducing new entries are
peers the target node just connected to.

The list is also randomly shuffled so the original set of
timestamps cannot be approximated.
 2019-04-24 17:56:12 +00:00
moneromooo-monero 64983fcee4
wallet2: default to trying to keep 5 outputs of 2+ monero 
In the case where previously a second unneeded output would be
added to a transaction. This should help *some* of the cases
where outputs are slowly being consolidated, leading to the
whole balance being locked when sending monero.
 2019-04-24 12:25:43 +00:00
moneromooo-monero df83ed74e4
consensus: from v12, enforce >= 2 outputs 2019-04-23 22:09:35 +00:00
moneromooo-monero 4be18df32a
tx_sanity_check: relax uniqueness check a bit 
It triggers easily on testnet
 2019-04-23 21:59:57 +00:00
moneromooo-monero b386ae5725
wallet2: add missing "sanity check failed" reason message 2019-04-23 21:59:57 +00:00
moneromooo-monero c519d1df34
wallet2: fix wrong change being recorded in sweep_all 
leading to the sanity check triggering
 2019-04-23 21:58:55 +00:00
moneromooo-monero 6aa3c2f303
dns_checks: new helper program to check on DNSSEC lookups 2019-04-23 15:20:45 +00:00
moneromooo-monero 7af49ef0c2
daemonizer: add --non-interactive for windows 
The RPC functional tests need it

Thanks to iDunk for debugging/testing
 2019-04-23 00:26:51 +00:00
Dusan Klinec 97e1c9278c
wallet: fix key image computation signaling to the device 2019-04-22 16:14:50 +02:00
moneromooo-monero 31a9aa83af
wallet_rpc_server: add block_height and frozen to incoming_transfers 2019-04-20 08:44:09 +00:00
moneromooo-monero 375fde9454
hardfork: fix off by one updating fork index after popping 2019-04-20 00:05:35 +00:00
Riccardo Spagni 71c6b24893
Merge pull request #5464 
0f52fe4c Windows: work around a boost 1.70 and cmake SNAFU (iDunk5400)
b414b69f Windows: fix a build error in MSYS2 with boost 1.70.0 (iDunk5400)
 2019-04-18 22:04:11 +02:00
Riccardo Spagni 2267f110b2
Merge pull request #5463 
fbbe75d7 device/trezor: button request callback fix (Dusan Klinec)
 2019-04-18 22:03:30 +02:00
Riccardo Spagni 950f79dc03
Merge pull request #5389 
588e6700 simplewallet: fix output representation offset (moneromooo-monero)
35e0a968 wallet2: "output lineup" fake out selection (moneromooo-monero)
 2019-04-18 22:01:51 +02:00
Riccardo Spagni 2e342d8df6
Merge pull request #5458 
84047cb7 wallet_rpc_server: add unlocked field to incoming_transfers output (moneromooo-monero)
 2019-04-18 22:01:22 +02:00
Riccardo Spagni b8f1709684
Merge pull request #5456 
58eade68 simplewallet: add the change amount to the prompt when locking (moneromooo-monero)
 2019-04-18 22:01:03 +02:00
Riccardo Spagni 55807141f2
Merge pull request #5453 
71102267 wallet_rpc_server: set suggested_confirmations_threshold for pool txes (moneromooo-monero)
 2019-04-18 21:59:01 +02:00
Dusan Klinec fbbe75d75f
device/trezor: button request callback fix 2019-04-18 18:04:54 +02:00
moneromooo-monero 588e670089
simplewallet: fix output representation offset 2019-04-18 15:14:41 +00:00
moneromooo-monero 35e0a968bd
wallet2: "output lineup" fake out selection 
Based on python code by sarang:
https://github.com/SarangNoether/skunkworks/blob/outputs/outputs/simulate.py
 2019-04-18 15:14:38 +00:00
iDunk5400 b414b69f5c
Windows: fix a build error in MSYS2 with boost 1.70.0 2019-04-18 17:00:13 +02:00
moneromooo-monero a23dbe69f6
simplewallet: prompt when spending more than one old out in one tx 2019-04-18 12:46:03 +00:00
moneromooo-monero 84047cb729
wallet_rpc_server: add unlocked field to incoming_transfers output 2019-04-17 15:30:49 +00:00
moneromooo-monero 3b9ce453a9
wallet_rpc_server: remove unused variable 2019-04-17 11:25:33 +00:00
moneromooo-monero 58eade689c
simplewallet: add the change amount to the prompt when locking 2019-04-17 11:05:18 +00:00
Riccardo Spagni e9464eb5e3
Merge pull request #5413 
5fafb90e testdb: add override keyword where missing (stoffu)
 2019-04-17 08:27:36 +02:00
stoffu 5fafb90e91
testdb: add override keyword where missing 
and delete obsolete BlockchainBDB::get_tx_output_indices along the way
 2019-04-17 10:26:25 +09:00
moneromooo-monero b0a346689b
daemon: fix absolute/relative log file test for windows 2019-04-16 22:15:36 +00:00
moneromooo-monero 7110226794
wallet_rpc_server: set suggested_confirmations_threshold for pool txes 2019-04-16 20:59:57 +00:00
moneromooo-monero 294e858d57
wallet_rpc_server: add set_log_level/set_log_categories 2019-04-16 20:50:15 +00:00
Riccardo Spagni 1b092f3a44
Merge pull request #5452 
c30d93fc rpc: add a pruned bool to the prune_blockchain call (moneromooo-monero)
 2019-04-16 22:48:50 +02:00
Riccardo Spagni 810dd0a5f6
Merge pull request #5450 
926e0472 simplewallet: add another warning about long payment ids (moneromooo-monero)
 2019-04-16 22:48:18 +02:00
Riccardo Spagni 68d131615e
Merge pull request #5448 
d009f6dd rpc: fix get_block_hashes.bin from wallet on pruned blockchain (moneromooo-monero)
bb0ef5b1 blockchain: lock the blockchain while pruning (moneromooo-monero)
 2019-04-16 22:47:36 +02:00
Riccardo Spagni c8ce4217cf
Merge pull request #5445 
b18f0b10 wallet: new --offline option (moneromooo-monero)
 2019-04-16 22:46:53 +02:00
Riccardo Spagni f376cd5605
Merge pull request #5446 
7d79222f daemon: remove debug info (moneromooo-monero)
8fec0f98 functional_tests: add sweep_single test (moneromooo-monero)
9880d61b wallet_rpc_server: remove unused code (moneromooo-monero)
8a61b33d rpc: omit irrelevant fields for pool txes in gettransactions (moneromooo-monero)
56508524 rpc: add relayed in get_transaction output (moneromooo-monero)
82e510f1 rpc: set default log category in core_rpc_server.h (moneromooo-monero)
 2019-04-16 22:46:29 +02:00
Riccardo Spagni e98cbfbdfe
Merge pull request #5444 
6643b047 Increment m_threads_active when mining thread starts (Doyle)
 2019-04-16 22:45:42 +02:00
Riccardo Spagni c5f64bf170
Merge pull request #5443 
07dd5536 hardfork: remove "no hf version db" recreation check (moneromooo-monero)
 2019-04-16 22:45:23 +02:00
Riccardo Spagni 8af1a89e4c
Merge pull request #5441 
b3648232 daemon: fix ratio not being floating point (moneromooo-monero)
e1b097b9 core_rpc_server: remove dummy assigning int to bool (moneromooo-monero)
 2019-04-16 22:44:41 +02:00
Riccardo Spagni 1fc20ba48a
Merge pull request #5439 
f26e0b5d cryptonote_protocol: warn when the last connection goes (moneromooo-monero)
 2019-04-16 22:44:19 +02:00
Riccardo Spagni ac8e2a7819
Merge pull request #5437 
acb68dba bulletproofs: cut down on keyV allocations (moneromooo-monero)
 2019-04-16 22:44:00 +02:00
Riccardo Spagni b0472c43a1
Merge pull request #5435 
5140c15e daemon: if a log file has a /, interpret it from the cwd (moneromooo-monero)
 2019-04-16 22:42:26 +02:00
Riccardo Spagni 1f01070a0c
Merge pull request #5434 
ccb996af rpc: new sanity check on relayed transactions (moneromooo-monero)
 2019-04-16 22:41:40 +02:00
Riccardo Spagni 8deee24cbb
Merge pull request #5431 
34f8c237 simplewallet: fix warning about long payment id using the old option (moneromooo-monero)
 2019-04-16 22:40:34 +02:00
Riccardo Spagni 35b3d754e8
Merge pull request #5429 
bcb86ae6 wallet_rpc_server: fix inconsistent wallet caches on reload (moneromooo-monero)
 2019-04-16 22:39:37 +02:00
Riccardo Spagni 45e1f7c292
Merge pull request #5428 
f3425f8d rpc.getblocktemplate: set reserved_offset to zero when reserve_size==0 (stoffu)
 2019-04-16 22:39:18 +02:00
Riccardo Spagni 8d16e92dcb
Merge pull request #5425 
58585986 p2p: fix integer overflow in host bans (moneromooo-monero)
 2019-04-16 22:38:56 +02:00
Riccardo Spagni a1ea611e24
Merge pull request #5424 
93bb2f48 ringct: prevent use of full ringct signatures for more than one input (moneromooo-monero)
 2019-04-16 22:38:32 +02:00
Riccardo Spagni 8966ac314c
Merge pull request #5422 
2c221d1b wallet2: update estimate_rct_tx_size for smaller rct proofs (moneromooo-monero)
 2019-04-16 22:38:11 +02:00
Riccardo Spagni 96696d1e75
Merge pull request #5418 
374f388d wallet_rpc_server: add a all flag to export_outputs (moneromooo-monero)
 2019-04-16 22:37:52 +02:00
Riccardo Spagni 0d2aaac15b
Merge pull request #5414 
e9fac29a unit_tests/long_term_block_weight: some tweaks that seem to make more sense (stoffu)
467f4c7e tests/block_weight: use integer division when computing median (stoffu)
815d08dc tests/block_weight: remove unused MULTIPLIER_SMALL (stoffu)
661f1fb8 blockchain: remove unused calc of short_term_constraint (stoffu)
 2019-04-16 22:37:02 +02:00
Riccardo Spagni 313a56a2da
Merge pull request #5406 
bea1918a blockchain_import: error out if preparing to handle blocks fails (moneromooo-monero)
 2019-04-16 22:32:27 +02:00
Riccardo Spagni ce2f46f76b
Merge pull request #5405 
ffdbcfb6 core: don't check block rate nor fork time in regtest mode (moneromooo-monero)
 2019-04-16 22:32:06 +02:00
Riccardo Spagni 46c477ab30
Merge pull request #5400 
5e673c03 blockchain_db: fix db txn ending too early (moneromooo-monero)
 2019-04-16 22:30:40 +02:00
moneromooo-monero c30d93fcd9
rpc: add a pruned bool to the prune_blockchain call 2019-04-16 15:15:14 +00:00
moneromooo-monero 926e047288
simplewallet: add another warning about long payment ids 2019-04-16 10:11:02 +00:00
moneromooo-monero 7d79222f5c
daemon: remove debug info 2019-04-15 22:32:09 +00:00
moneromooo-monero d009f6dd61
rpc: fix get_block_hashes.bin from wallet on pruned blockchain 
We want to get all blocks here, even pruned ones
 2019-04-15 22:27:15 +00:00
moneromooo-monero bb0ef5b1f2
blockchain: lock the blockchain while pruning 2019-04-15 22:27:12 +00:00
moneromooo-monero b18f0b1051
wallet: new --offline option 
It will avoid connecting to a daemon (so useful for cold signing
using a RPC wallet), and not perform DNS queries.
 2019-04-15 09:14:12 +00:00
moneromooo-monero 9880d61b98
wallet_rpc_server: remove unused code 2019-04-15 09:13:12 +00:00
moneromooo-monero 8a61b33d8e
rpc: omit irrelevant fields for pool txes in gettransactions 2019-04-15 09:11:54 +00:00
moneromooo-monero 565085245a
rpc: add relayed in get_transaction output 2019-04-15 09:11:50 +00:00
moneromooo-monero 82e510f15e
rpc: set default log category in core_rpc_server.h 2019-04-15 09:10:29 +00:00
Riccardo Spagni e89aa2ec56
Merge pull request #5421 
e78cea74 rpc: fix off by one in get_height (moneromooo-monero)
 2019-04-15 09:22:50 +02:00
Riccardo Spagni 64a4aa4f60
Merge pull request #5408 
c4f8a8a6 build fix: combinator.h stdexcept missing include (Dusan Klinec)
 2019-04-15 09:21:00 +02:00
Riccardo Spagni 9bd0983d5e
Merge pull request #5402 
cbf32241 rpc: make wide_difficulty hexadecimal (moneromooo-monero)
 2019-04-15 09:18:10 +02:00
Riccardo Spagni e31559d319
Merge pull request #5398 
41901b8d device/trezor: env-configurable ports (Dusan Klinec)
c97a1f79 tests: trezor tests fixes and improvements (Dusan Klinec)
 2019-04-15 09:17:47 +02:00
Riccardo Spagni 8bf0a3f123
Merge pull request #5396 
b40392fb wallet2: add --no-dns flag (moneromooo-monero)
 2019-04-15 09:17:26 +02:00
Riccardo Spagni 98f4c8af98
Merge pull request #5395 
15f27c80 wallet2: support multi out txes without change in sanity check (moneromooo-monero)
 2019-04-15 09:17:07 +02:00
Riccardo Spagni 89b8ecfc7c
Merge pull request #5392 
a2195b9b crypto: replace rand<T>()%N idiom with unbiased rand_idx(N) (stoffu)
 2019-04-15 09:14:28 +02:00
Riccardo Spagni 3f46c5b4e1
Merge pull request #5365 
383c38fd fix init warning on whatever compiler version (italocoin)
 2019-04-15 09:12:50 +02:00
Riccardo Spagni 37aea526a9
Merge pull request #5355 
c68fe787 device/trezor: add button pressed request (Dusan Klinec)
827f52ad wallet: API changes to enable passphrase entry (Dusan Klinec)
 2019-04-15 09:12:20 +02:00
Doyle 6643b04737 Increment m_threads_active when mining thread starts 2019-04-15 13:08:33 +10:00
moneromooo-monero 07dd55363c
hardfork: remove "no hf version db" recreation check 
This is now obsolete, and this removes the warning on startup
on a new db that confuses some people
 2019-04-14 10:34:29 +00:00
moneromooo-monero f26e0b5d11
cryptonote_protocol: warn when the last connection goes 2019-04-14 10:30:01 +00:00
moneromooo-monero b364823286
daemon: fix ratio not being floating point 
Coverity 197648
 2019-04-14 09:26:12 +00:00
moneromooo-monero e1b097b99b
core_rpc_server: remove dummy assigning int to bool 
Coverity 197653
 2019-04-14 09:26:12 +00:00
moneromooo-monero 5e673c03fe
blockchain_db: fix db txn ending too early 
The db txn in add_block ending caused the entire overarching
batch txn to stop.
Also add a new guard class so a db txn can be stopped in the
face of exceptions.

Also use a read only db txn in init when the db itself is
read only, and do not save the max tx size in that case.
 2019-04-14 08:35:38 +00:00
moneromooo-monero acb68dbaa9
bulletproofs: cut down on keyV allocations 2019-04-13 22:37:08 +00:00
moneromooo-monero 5140c15e56
daemon: if a log file has a /, interpret it from the cwd 
rather than from data dir where it normally is.

It makes things like --log-file ./foo.log behave as you'd expect.
 2019-04-13 11:21:08 +00:00
moneromooo-monero ccb996afc6
rpc: new sanity check on relayed transactions 
This will weed out some transactions with silly rings
 2019-04-12 20:22:09 +00:00
moneromooo-monero 34f8c237c2
simplewallet: fix warning about long payment id using the old option 2019-04-12 14:09:26 +00:00
moneromooo-monero bcb86ae651
wallet_rpc_server: fix inconsistent wallet caches on reload 
Loading the same wallet as the currently loaded one would autosave
the current state after loading it, leading to some kind of rollback
effect. We now save before loading to avoid this. If loading fails,
it means the current wallet will be saved (or maybe not, depending
on where the failure occurs: most of the sanity checks occur before
saving). There is a new autosave_current flag to open/restore calls
so the (enabled by default) autosave can be skipped.
 2019-04-12 13:40:42 +00:00
stoffu f3425f8d32
rpc.getblocktemplate: set reserved_offset to zero when reserve_size==0 2019-04-12 18:55:38 +09:00
moneromooo-monero 5858598604
p2p: fix integer overflow in host bans 2019-04-11 21:59:27 +00:00
moneromooo-monero 93bb2f48f7
ringct: prevent use of full ringct signatures for more than one input 2019-04-11 19:44:06 +00:00
moneromooo-monero 8f1fe45fe1
simplewallet: fix merge error with new welcome command 2019-04-11 18:46:23 +00:00
moneromooo-monero 2c221d1b6c
wallet2: update estimate_rct_tx_size for smaller rct proofs 2019-04-11 17:31:18 +00:00
moneromooo-monero e78cea74bd
rpc: fix off by one in get_height 2019-04-11 17:24:02 +00:00
Riccardo Spagni 9c77dbf376
Merge pull request #5386 
d843f200 simplewallet: add a welcome/disclaimer message command (moneromooo-monero)
 2019-04-11 13:16:28 +02:00
Riccardo Spagni 083271375a
Merge pull request #5383 
0575794f console: simple shell over console.py (moneromooo-monero)
047af5c3 console.py: can now connect to several daemons/wallets (moneromooo-monero)
9f9571aa cmake: always detect python, it's neeed for some tests (moneromooo-monero)
8646bd00 functional_tests: exit with 1 if any test fails (moneromooo-monero)
6fd8834d console.py: add tab completion (moneromooo-monero)
04a20cb2 functional_tests: cold signing key images/outputs import/export (moneromooo-monero)
798e3cad functional_tests: add double spend detection tests (moneromooo-monero)
7c657bb2 functional_tests: add alt chains tests (moneromooo-monero)
f8be31d2 functional_tests: add wallet creation language tests (moneromooo-monero)
2d68b31f functional_tests: add more wallet tests (moneromooo-monero)
23f86dad python-rpc: add set_log_level and set_log_categories (moneromooo-monero)
b3a32d55 functional_tests: add describe_transfer tests (moneromooo-monero)
108f4375 console.py: support connecting to any host, not just 127.0.0.1 (moneromooo-monero)
064ab123 functional_tests: add more blockchain related tests (moneromooo-monero)
21b1ac1d functional_tests: add bans tests (moneromooo-monero)
 2019-04-11 13:14:44 +02:00
moneromooo-monero d843f20044
simplewallet: add a welcome/disclaimer message command 
I saw one when landing on www.tribler.org, and it seemed
like a good idea to have something similar, alongside some
more general "what is monero" text.
 2019-04-11 11:11:45 +00:00
moneromooo-monero 064ab12340
functional_tests: add more blockchain related tests 
Related to emission, reorgs, getting tx data back, output
distribution and histogram
 2019-04-11 11:07:58 +00:00
Riccardo Spagni 5db72d12b4
Merge pull request #5388 
0be5b2ee simplewallet: new unset_ring command (moneromooo-monero)
 2019-04-11 13:05:43 +02:00
Riccardo Spagni 5c02316598
Merge pull request #5382 
c12b43cb wallet: add number of blocks required for the balance to fully unlock (moneromooo-monero)
3f1e9e84 wallet2: set confirmations to 0 for pool txes in proofs (moneromooo-monero)
36c037ec wallet_rpc_server: error out on getting the spend key from a hot wallet (moneromooo-monero)
cd1eaff2 wallet_rpc_server: always fill out subaddr_indices in get_transfers (moneromooo-monero)
 2019-04-11 13:03:55 +02:00
Riccardo Spagni 38717dafc0
Merge pull request #5381 
def40161 miner: fix race when stopping mining with start mining enabled (moneromooo-monero)
 2019-04-11 13:03:32 +02:00
Riccardo Spagni 915d9e5a1f
Merge pull request #5380 
113e4877 blockchain_stats: fix sign in formatting function (moneromooo-monero)
adaea3ea various: remove unused variables (moneromooo-monero)
631ef00e blockchain: some debug info when adding txes-from-block fails (moneromooo-monero)
 2019-04-11 13:02:59 +02:00
Riccardo Spagni fa789109f6
Merge pull request #5379 
83fc45a4 Add NanoX support (cslashm)
 2019-04-11 13:02:47 +02:00
Riccardo Spagni bd429033df
Merge pull request #5378 
eda2661a Allow pruning before v10 (moneromooo-monero)
 2019-04-11 13:02:35 +02:00
Riccardo Spagni 4a2cc76c84
Merge pull request #5376 
c746f45d Add hash of top block to /getheight RPC (Howard Chu)
 2019-04-11 13:01:54 +02:00
Riccardo Spagni 3a4008f0fc
Merge pull request #5374 
a2561653 wallet: new option to start background mining (moneromooo-monero)
 2019-04-11 13:01:30 +02:00
Riccardo Spagni 036daa3af9
Merge pull request #5373 
aff80e70 blockchain: fix returned height in create_block_template (moneromooo-monero)
 2019-04-11 13:00:55 +02:00
moneromooo-monero 9f8dc4ce51
simplewallet: new net_stats command 
displays total sent and received bytes
 2019-04-11 10:46:41 +00:00
Riccardo Spagni 19e37c05d6
Merge pull request #5367 
07b716bf util: name replace_file arguments better (moneromooo-monero)
 2019-04-11 12:41:55 +02:00
Riccardo Spagni 793651e731
Merge pull request #5366 
c2f271d1 device/trezor: increase live-refresh timeout (Dusan Klinec)
 2019-04-11 12:41:34 +02:00
Riccardo Spagni 76fbcfe2dd
Merge pull request #5123 
089c7637 cryptonote: rework block blob size sanity check (moneromooo-monero)
 2019-04-11 12:41:07 +02:00
Dusan Klinec 41901b8deb
device/trezor: env-configurable ports 2019-04-10 18:29:24 +02:00
moneromooo-monero 374f388de2
wallet_rpc_server: add a all flag to export_outputs 
if we don't want to export new outputs only
 2019-04-10 10:37:34 +00:00
stoffu 661f1fb8b2
blockchain: remove unused calc of short_term_constraint 2019-04-09 19:39:24 +09:00
Lee Clagett 2e578b8214 Enabling daemon-rpc SSL now requires non-system CA verification 
If `--daemon-ssl enabled` is set in the wallet, then a user certificate,
fingerprint, or onion/i2p address must be provided.
 2019-04-07 13:02:43 -04:00
Dusan Klinec c4f8a8a6a9
build fix: combinator.h stdexcept missing include 2019-04-07 17:41:13 +02:00
moneromooo-monero bea1918a05
blockchain_import: error out if preparing to handle blocks fails 
Coverity 197562
 2019-04-07 13:48:19 +00:00
moneromooo-monero ffdbcfb6b3
core: don't check block rate nor fork time in regtest mode 2019-04-07 13:30:02 +00:00
Dusan Klinec c68fe7873b
device/trezor: add button pressed request 2019-04-07 13:35:49 +02:00
Lee Clagett d58f368289 Require manual override for user chain certificates. 
An override for the wallet to daemon connection is provided, but not for
other SSL contexts. The intent is to prevent users from supplying a
system CA as the "user" whitelisted certificate, which is less secure
since the key is controlled by a third party.
 2019-04-07 00:44:37 -04:00
Lee Clagett 21eb1b0725 Pass SSL arguments via one class and use shared_ptr instead of reference 2019-04-07 00:44:37 -04:00
Lee Clagett 1f5ed328aa Change default SSL to "enabled" if user specifies fingerprint/certificate 
Currently if a user specifies a ca file or fingerprint to verify peer,
the default behavior is SSL autodetect which allows for mitm downgrade
attacks. It should be investigated whether a manual override should be
allowed - the configuration is likely always invalid.
 2019-04-06 23:47:07 -04:00
Lee Clagett a3b0284837 Change SSL certificate file list to OpenSSL builtin load_verify_location 
Specifying SSL certificates for peer verification does an exact match,
making it a not-so-obvious alias for the fingerprints option. This
changes the checks to OpenSSL which loads concatenated certificate(s)
from a single file and does a certificate-authority (chain of trust)
check instead. There is no drop in security - a compromised exact match
fingerprint has the same worse case failure. There is increased security
in allowing separate long-term CA key and short-term SSL server keys.

This also removes loading of the system-default CA files if a custom
CA file or certificate fingerprint is specified.
 2019-04-06 23:47:06 -04:00
moneromooo-monero e8cf7dcc2b
rpc: merge the two get_info implementations 2019-04-06 14:04:24 +00:00