4301 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Riccardo Spagni	68ccc10b29	Merge pull request #2205 ... c97d1bd3 wallet: return unlock_time in get_transfers (moneromooo-monero)	2017-08-15 20:44:44 +02:00
Riccardo Spagni	c1f651175a	Merge pull request #2295 ... 35e01a6e cryptonote_protocol: fix "holes" in block download schedule (moneromooo-monero) 3da1edfd cryptonote_protocol: fix out of order addition (moneromooo-monero) 6edb1b3e block_queue: do not add empty spans (moneromooo-monero)	2017-08-15 20:42:47 +02:00
moneromooo-monero	35e01a6e50	cryptonote_protocol: fix "holes" in block download schedule	2017-08-15 17:49:06 +01:00
moneromooo-monero	3da1edfde5	cryptonote_protocol: fix out of order addition ... This was broken by the reorg fix, since we now have to add blocks regardless of their starting height. We now check whether we know the parent for the first block in the next span, or whether it was requested. If neither, it's an orphan. If it is not known, but was requested, we wait to get that block.	2017-08-15 16:54:08 +01:00
moneromooo-monero	6edb1b3e46	block_queue: do not add empty spans	2017-08-15 11:38:59 +01:00
Riccardo Spagni	70495665f9	Merge pull request #2284 ... 2ec15a69 daemon: print peers' top height in sync_info (moneromooo-monero) 08abb670 protocol: fix reorgs while syncing (moneromooo-monero)	2017-08-13 15:59:30 +02:00
moneromooo-monero	2ec15a6931	daemon: print peers' top height in sync_info	2017-08-12 20:36:31 +01:00
moneromooo-monero	08abb670e1	protocol: fix reorgs while syncing	2017-08-12 11:22:42 +01:00
Riccardo Spagni	181a008aa3	Merge pull request #2271 ... 3ff5ce63 connection_context: initialize state (moneromooo-monero)	2017-08-09 20:23:17 +02:00
moneromooo-monero	3ff5ce63c5	connection_context: initialize state ... Why this was initialized properly before I have no idea, but it is not anymore. Fix it, which fixes syncing in release mode.	2017-08-09 19:01:27 +01:00
Riccardo Spagni	f43d59d8b3	Merge pull request #2269 ... 635929ea protocol: add checks for top block hard fork version (moneromooo-monero) 7482253a epee: fixup KV_SERIALIZE_OPT to work in more cases (moneromooo-monero)	2017-08-09 14:58:11 +02:00
moneromooo-monero	635929eaca	protocol: add checks for top block hard fork version ... We won't even talk to a peer which claims a wrong version for its top block. This will avoid syncing to known bad peers in the first place. Also add IP fails when failing to verify a block.	2017-08-09 10:28:41 +01:00
moneromooo-monero	7482253a6d	epee: fixup KV_SERIALIZE_OPT to work in more cases	2017-08-09 09:30:22 +01:00
Riccardo Spagni	b3d595582a	Merge pull request #2267 ... e49f6d43 net_node: fix m_in_timedsync initialization (moneromooo-monero)	2017-08-09 09:21:22 +02:00
moneromooo-monero	e49f6d439d	net_node: fix m_in_timedsync initialization ... This fixes nodes not being able to connect to nodes which use recent code. While there, init peer_id too.	2017-08-08 17:23:02 +01:00
Riccardo Spagni	bfd2532ea5	Merge pull request #2247 ... a839a6fa Wallet API: add tx unlock time (Jaquee)	2017-08-07 23:34:06 +02:00
Riccardo Spagni	86226754a9	Merge pull request #2263 ... 49ffb156 cmake: do not use GREATER_EQUAL, it's too new (moneromooo-monero)	2017-08-07 22:53:39 +02:00
Riccardo Spagni	bff9fb9c8b	Merge pull request #2231 ... 61770ec2 change mixin to ring size in user visible places (moneromooo-monero)	2017-08-07 22:53:15 +02:00
moneromooo-monero	49ffb156f0	cmake: do not use GREATER_EQUAL, it's too new	2017-08-07 21:37:13 +01:00
moneromooo-monero	61770ec2da	change mixin to ring size in user visible places	2017-08-07 21:12:27 +01:00
Riccardo Spagni	14f479bb9c	Merge pull request #2262 ... 7f7d42f8 core: fix invalid memory access creating tx (moneromooo-monero)	2017-08-07 22:11:45 +02:00
Riccardo Spagni	62610a3a53	Merge pull request #2225 ... 5d91b26c blockchain: skip checking tx semantics in embedded block hash range (moneromooo-monero)	2017-08-07 22:10:09 +02:00
Riccardo Spagni	f09156eb65	Merge pull request #2224 ... 04bd1925 cmake: Update detection of external miniupnpc (Erik de Castro Lopo)	2017-08-07 22:09:42 +02:00
moneromooo-monero	7f7d42f890	core: fix invalid memory access creating tx	2017-08-07 21:09:19 +01:00
Riccardo Spagni	a796cb341e	Merge pull request #2207 ... c93b7692 blockchain_import: much faster when verifying with cryptonote::core (moneromooo-monero) 38756d00 core: new API to disable DNS checkpoint lookups (moneromooo-monero)	2017-08-07 21:40:32 +02:00
Riccardo Spagni	3db039828e	Merge pull request #2254 ... e31aac80 walletAPI: add getRefreshFromBlockHeight() (Jaquee) 48c0cb1b wallet api: pause refresh while commiting tx (Jaquee) f233c01c CMakeLists.txt - ios/xcode fix (Jaquee)	2017-08-07 16:01:40 +02:00
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
moneromooo-monero	c93b7692b4	blockchain_import: much faster when verifying with cryptonote::core ... Quick test with the first 56569 blocks from mainnet version verify batch time old 0 200 1:16 new 0 200 0:57 old 0 5000 0:53 new 0 5000 0:51 old 1 200 est > 1h new 1 200 10:21 old 1 5000 est > 1h new 1 5000 8:27	2017-08-07 14:32:49 +01:00
moneromooo-monero	38756d00ff	core: new API to disable DNS checkpoint lookups	2017-08-07 14:31:06 +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