4266 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Riccardo Spagni	9fc78023e2	Merge pull request #2259 ... 569b9b2b updates: add "misc_log_ex.h" for logs (moneromooo-monero) 74628941 dns_utils: add <functional> for std::function (moneromooo-monero)	2017-08-07 16:01:22 +02:00
moneromooo-monero	569b9b2b50	updates: add "misc_log_ex.h" for logs	2017-08-07 14:42:08 +01:00
moneromooo-monero	74628941d5	dns_utils: add <functional> for std::function	2017-08-07 14:35:41 +01:00
Riccardo Spagni	c63e9633b5	Merge pull request #2218 ... 02f13d6c Fix handling of strings & simplify summation of spendkeys (JollyMort) 40fc9d7b Add option to join multisig wallet pieces together (JollyMort)	2017-08-07 15:28:17 +02:00
Riccardo Spagni	0bab692eee	Merge pull request #2194 ... 380009e5 README: give credit where credit is due (moneromooo-monero)	2017-08-07 15:26:26 +02:00
Riccardo Spagni	b76ba219d9	Merge pull request #2189 ... 335fc8ab mlog: fix crash accessing stale data when rotating logs (moneromooo-monero)	2017-08-07 15:25:46 +02:00
Riccardo Spagni	6db8a60a18	Merge pull request #2149 ... 158c3ecf core: thread most of handle_incoming_tx (moneromooo-monero) f57ee382 cryptonote_protocol: retry stale spans early (moneromooo-monero) 90df52e1 cryptonote_protocol: light cleanup (moneromooo-monero) 84e23156 cryptonote_protocol: avoid spurious SYNCHRONIZED OK messages (moneromooo-monero) 5be43fcd cryptonote_protocol_handler: sync speedup (moneromooo-monero)	2017-08-07 15:24:58 +02:00
Riccardo Spagni	a4151bed58	Merge pull request #2138 ... 044c5b55 Readme: add android docker build instruction (MoroccanMalinois) 82836be4 Utils: Add dockerfile for android NDK build (MoroccanMalinois)	2017-08-07 15:21:01 +02:00
Riccardo Spagni	0dc892a538	Merge pull request #2126 ... 98cb3fee italian translation (erciccione) ff07cdc9 updates monero_fr.ts (erciccione) f675fedc updates monero.ts (erciccione)	2017-08-07 15:18:04 +02:00
Riccardo Spagni	05c44db23b	Merge pull request #2244 ... 328bebbe daemon: some more include cleanup (moneromooo-monero)	2017-08-07 15:14:12 +02:00
Riccardo Spagni	dc2747439c	Merge pull request #2243 ... 4d873046 blockchain: add testnet v6 fork height at 971400 (moneromooo-monero)	2017-08-07 15:13:59 +02:00
Riccardo Spagni	b1af32b48d	Merge pull request #2242 ... 1c9196b0 cryptonote_protocol: fix days behind calc on testnet (moneromooo-monero)	2017-08-07 15:13:45 +02:00
Riccardo Spagni	15e895399c	Merge pull request #2239 ... 600353e2 fix wallet callback signatures (m2049r)	2017-08-07 15:13:30 +02:00
Riccardo Spagni	ea46a5527a	Merge pull request #2234 ... 214fd81e some include cleanup (moneromooo-monero)	2017-08-07 15:13:07 +02:00
Riccardo Spagni	9b3b7f050b	Merge pull request #2230 ... 5dd722be core: add a message when loading checkpoints at init time (moneromooo-monero)	2017-08-07 15:12:42 +02:00
Riccardo Spagni	5cc53c7e49	Merge pull request #2226 ... 14ec6ed8 tx_pool: remove obsolete unused m_config_folder field (moneromooo-monero)	2017-08-07 15:12:29 +02:00
Riccardo Spagni	1ea75abd72	Merge pull request #2223 ... d37e8f88 daemon: add average seconds per block in bc_dyn_stats (moneromooo-monero)	2017-08-07 15:12:15 +02:00
Riccardo Spagni	a2dd125b1e	Merge pull request #2222 ... 878205f1 core: fix lock ordering bug at init time (moneromooo-monero)	2017-08-07 15:11:51 +02:00
Riccardo Spagni	9b0daf49db	Merge pull request #2220 ... c6ba7d11 p2p: move m_in_timedsync from connection_context to p2p_connection_context (moneromooo-monero)	2017-08-07 15:11:37 +02:00
Riccardo Spagni	43c6e452fa	Merge pull request #2219 ... 04ebfbfe p2p: close connections when exiting (moneromooo-monero) 9a10148c p2p: fix thread leak (moneromooo-monero)	2017-08-07 15:11:20 +02:00
Riccardo Spagni	8048de268a	Merge pull request #2216 ... d8becf2e blockchain: fix cryptonight buffer leak on exit (moneromooo-monero) 91aa90fc blockchain: ensure all blocks get their longhash precalculated (moneromooo-monero) ff4bcaed blockchain: pass correct height to get_block_longhash (moneromooo-monero)	2017-08-07 15:11:04 +02:00
Riccardo Spagni	a6ea26e7fa	Merge pull request #2215 ... 06aea2cf move get_proof_of_trust_hash from util.h to p2p_protocol_defs.h (moneromooo-monero)	2017-08-07 15:10:42 +02:00
Riccardo Spagni	a963da9001	Merge pull request #2214 ... 41f935dd network_throttle: remove unneeded heap allocations (moneromooo-monero)	2017-08-07 15:10:27 +02:00
Riccardo Spagni	1e2d6f898e	Merge pull request #2211 ... 525975ac wallet-cli: Minor improvement to help output (Erik de Castro Lopo)	2017-08-07 15:10:13 +02:00
Riccardo Spagni	f5be5b7e7b	Merge pull request #2210 ... cb0b5594 Move OpenAlias console input back from libs (moneromooo-monero)	2017-08-07 15:09:45 +02:00
Riccardo Spagni	61ac6983f2	Merge pull request #2206 ... 340feede core: randomly shuffle outputs (moneromooo-monero)	2017-08-07 15:09:31 +02:00
Riccardo Spagni	24dd5e87af	Merge pull request #2203 ... 0c57df97 wallet2: fix temporarily missing incoming tx when being mined (moneromooo-monero)	2017-08-07 15:09:17 +02:00
Riccardo Spagni	5a04301b32	Merge pull request #2201 ... dc0b312f wallet_rpc_server: optionally return tx blobs on transfer calls (moneromooo-monero) 5eb79983 epee: add a KV_SERIALIZE variant for optional parameters (moneromooo-monero)	2017-08-07 15:09:03 +02:00
Riccardo Spagni	58621e3f65	Merge pull request #2200 ... f1b76c84 cryptonote_protocol: Set send_idle_time in connection_info correctly (rbrunner7)	2017-08-07 15:08:49 +02:00
Riccardo Spagni	0f36efbded	Merge pull request #2198 ... 53af9768 blockchain: one off warning when seeing a block with unknown version (moneromooo-monero)	2017-08-07 15:08:31 +02:00
Riccardo Spagni	5ef8b76b32	Merge pull request #2197 ... d75cff1a Fix readline prompt when command does not output (Jethro Grassie)	2017-08-07 15:08:17 +02:00
Riccardo Spagni	52b33b5284	Merge pull request #2196 ... 16a55347 simplewallet: show payment ids on sign_transfer (moneromooo-monero)	2017-08-07 15:08:00 +02:00
Riccardo Spagni	b6ae718456	Merge pull request #2195 ... 599436a4 mlog: default to msgwriter logs only for log level 1 (moneromooo-monero) 58f3fc68 Make msgwriter logs go to file only (moneromooo-monero)	2017-08-07 15:07:46 +02:00
Riccardo Spagni	8494ffbc37	Merge pull request #2191 ... 23909bb0 Make successful transfer log message more informative (JollyMort)	2017-08-07 15:07:33 +02:00
Riccardo Spagni	cf308cfb20	Merge pull request #2188 ... a5031a7d core: forbid duplicate ring members from v6 (moneromooo-monero)	2017-08-07 15:07:16 +02:00
Riccardo Spagni	64ebeb5aa5	Merge pull request #2182 ... 2fac03e6 Update monerod systemd service file (Erik de Castro Lopo) 51efb217 daemon: Add ability to write a PID file (Erik de Castro Lopo)	2017-08-07 15:06:59 +02:00
Riccardo Spagni	6244c782de	Merge pull request #2151 ... 13a8d64f epee: don't send the body of the response to a HEAD HTTP request (Guillaume LE VAILLANT)	2017-08-07 15:06:45 +02:00
Riccardo Spagni	04591af7fd	Merge pull request #2153 ... 35d68b2c Fix spelling errors (Erik de Castro Lopo)	2017-08-07 14:49:15 +02:00
Riccardo Spagni	f6ee93e214	Merge pull request #2148 ... 125f823b Add on_get_alt_blocks_hashes RPC call (moneroexamples)	2017-08-07 14:48:38 +02:00
Riccardo Spagni	ce52d94cb7	Merge pull request #2147 ... 94717021 fix on_battery_power for linux (Ryan Mehta)	2017-08-07 14:47:43 +02:00
Riccardo Spagni	54b15447d4	Merge pull request #2141 ... 94dd5cb4 Makefile: Add debug-static-all target (Erik de Castro Lopo)	2017-08-07 14:46:56 +02:00
Riccardo Spagni	159a6e9669	Merge pull request #2132 ... 464afd4d Ensure DNSResolver destructor runs on exit (Howard Chu)	2017-08-07 14:46:26 +02:00
moneromooo-monero	4d87304683	blockchain: add testnet v6 fork height at 971400	2017-08-07 11:34:59 +01:00
moneromooo-monero	158c3ecff3	core: thread most of handle_incoming_tx	2017-08-07 09:33:20 +01:00
moneromooo-monero	f57ee382b8	cryptonote_protocol: retry stale spans early ... Connections can be dropped by the net_node layer, unbeknownst to cryptonote_protocol, which would then not flush any spans scheduled to that connection, which would cause it to be only downloaded again once it becomes the next span (possibly after a small delay if it had been requested less than 5 seconds ago).	2017-08-07 09:33:17 +01:00
moneromooo-monero	90df52e12f	cryptonote_protocol: light cleanup	2017-08-07 09:33:14 +01:00
moneromooo-monero	84e23156ac	cryptonote_protocol: avoid spurious SYNCHRONIZED OK messages	2017-08-07 09:33:09 +01:00
moneromooo-monero	5be43fcdba	cryptonote_protocol_handler: sync speedup ... A block queue is now placed between block download and block processing. Blocks are now requested only from one peer (unless starved). Includes a new sync_info coommand.	2017-08-07 09:33:04 +01:00
moneromooo-monero	0c57df9770	wallet2: fix temporarily missing incoming tx when being mined ... When scanning the txpool without having first updated the blockchain, the tx would be seen as neither in the txpool nor the chain, and removed, so it'd only reappear once the chain is refreshed, and the tx seen in a block.	2017-08-05 12:36:03 +01:00
moneromooo-monero	16a5534704	simplewallet: show payment ids on sign_transfer ... Integrated addresses are shown when an encrypted payment id is used	2017-08-04 19:36:02 +01:00