Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c4edbdd6b
							
						
					 | 
					
						
						
							
							Merge branch 'master' into tq-stop-sync
						
						
						
						
						
					 | 
					
						2016-03-17 12:25:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							de484b2495
							
						
					 | 
					
						
						
							
							Merge pull request #742 from ethcore/mining-stop-sync
						
						
						
						
						
						
						
						adding check for a sync when giving work to miner 
						
					 | 
					
						2016-03-17 12:23:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							03ca9d2c06
							
						
					 | 
					
						
						
							
							adding message from client to sync and disabling sending transactions to the queue while syncing
						
						
						
						
						
					 | 
					
						2016-03-17 12:17:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							4050462ad4
							
						
					 | 
					
						
						
							
							Update sync_provider.rs
						
						
						
						
						
					 | 
					
						2016-03-17 11:23:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							22bc9f6458
							
						
					 | 
					
						
						
							
							Merge pull request #745 from ethcore/ethjson
						
						
						
						
						
						
						
						json deserialization module 
						
					 | 
					
						2016-03-17 11:21:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0da47db9c
							
						
					 | 
					
						
						
							
							Merge pull request #749 from ethcore/arkpar-patch-1
						
						
						
						
						
						
						
						Update install-parity.sh 
						
					 | 
					
						2016-03-17 10:08:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cd3eaa111
							
						
					 | 
					
						
						
							
							Update install-parity.sh
						
						
						
						
						
					 | 
					
						2016-03-17 09:54:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							ecfcc4f3b6
							
						
					 | 
					
						
						
							
							Merge pull request #747 from ethcore/sync
						
						
						
						
						
						
						
						Restart sync on getting old unknown header 
						
					 | 
					
						2016-03-16 20:32:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9584b7ec9
							
						
					 | 
					
						
						
							
							restart sync on getting old unknown header
						
						
						
						
						
					 | 
					
						2016-03-16 18:25:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd892026f6
							
						
					 | 
					
						
						
							
							tests
						
						
						
						
						
					 | 
					
						2016-03-16 10:37:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							8427e99c73
							
						
					 | 
					
						
						
							
							checking queue also
						
						
						
						
						
					 | 
					
						2016-03-15 23:58:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a96f99a8c
							
						
					 | 
					
						
						
							
							Merge pull request #744 from ethcore/sync
						
						
						
						
						
						
						
						Missing return for #737 
						
					 | 
					
						2016-03-15 19:43:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							196c6e8ecc
							
						
					 | 
					
						
						
							
							tests for loading test json files
						
						
						
						
						
					 | 
					
						2016-03-15 19:32:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4849d1c58
							
						
					 | 
					
						
						
							
							finished blockchain test deserialization
						
						
						
						
						
					 | 
					
						2016-03-15 18:42:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							e538b417f0
							
						
					 | 
					
						
						
							
							Missing return
						
						
						
						
						
					 | 
					
						2016-03-15 18:35:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							d96858d38c
							
						
					 | 
					
						
						
							
							proper blockchain json parsing
						
						
						
						
						
					 | 
					
						2016-03-15 18:17:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							99bae23996
							
						
					 | 
					
						
						
							
							[ci skip] grammar fix
						
						
						
						
						
					 | 
					
						2016-03-15 17:56:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab4bfbac0d
							
						
					 | 
					
						
						
							
							adding check for a sync
						
						
						
						
						
					 | 
					
						2016-03-15 17:13:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							77bdca5b68
							
						
					 | 
					
						
						
							
							Merge pull request #741 from ethcore/block-test
						
						
						
						
						
						
						
						Enact block with uncles test 
						
					 | 
					
						2016-03-15 16:55:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							eac73a4e54
							
						
					 | 
					
						
						
							
							Merge pull request #740 from ethcore/fix-libc-ver
						
						
						
						
						
						
						
						Fix outdated libc version on dependency 
						
					 | 
					
						2016-03-15 14:51:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							9dea31031c
							
						
					 | 
					
						
						
							
							Enact block with uncles test
						
						
						
						
						
					 | 
					
						2016-03-15 14:35:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							1eb0f1b991
							
						
					 | 
					
						
						
							
							Merge branch 'master' into fix-libc-ver
						
						
						
						
						
					 | 
					
						2016-03-15 13:37:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d939ddfce
							
						
					 | 
					
						
						
							
							updating lock
						
						
						
						
						
					 | 
					
						2016-03-15 13:36:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							828d20629b
							
						
					 | 
					
						
						
							
							Merge pull request #735 from ethcore/transaction_queue_race
						
						
						
						
						
						
						
						Fixing possible race in transaction queue 
						
					 | 
					
						2016-03-15 12:47:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0f233a06c
							
						
					 | 
					
						
						
							
							Merge pull request #737 from ethcore/sync
						
						
						
						
						
						
						
						Sync fixed again 
						
					 | 
					
						2016-03-15 12:13:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5f54966af
							
						
					 | 
					
						
						
							
							Merge pull request #734 from ethcore/fixblockchainrace
						
						
						
						
						
						
						
						Don't change best block until extras is committed. 
						
					 | 
					
						2016-03-15 11:56:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b64713e5ac
							
						
					 | 
					
						
						
							
							Merge pull request #736 from ethcore/travis-stable-only
						
						
						
						
						
						
						
						stable only until travis speedup 
						
					 | 
					
						2016-03-15 11:56:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							e98cfd84a9
							
						
					 | 
					
						
						
							
							Merge pull request #629 from ethcore/uint_opt
						
						
						
						
						
						
						
						Optimizing uint operations (architecture independent) 
						
					 | 
					
						2016-03-15 11:24:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9b0444662
							
						
					 | 
					
						
						
							
							Trace sending to unconfirmed session
						
						
						
						
						
					 | 
					
						2016-03-15 11:20:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec4f7c4190
							
						
					 | 
					
						
						
							
							stable only until travis speedup
						
						
						
						
						
					 | 
					
						2016-03-15 11:12:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							59d0d2df9a
							
						
					 | 
					
						
						
							
							Don't change best block until extras is committed.
						
						
						
						
						
					 | 
					
						2016-03-15 10:59:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							40ac01b730
							
						
					 | 
					
						
						
							
							Fixing possible race in transaction queue
						
						
						
						
						
					 | 
					
						2016-03-15 10:54:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							85833d228a
							
						
					 | 
					
						
						
							
							Ignore new blocks while seeking
						
						
						
						
						
					 | 
					
						2016-03-15 01:22:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5ec1775ef
							
						
					 | 
					
						
						
							
							Merge branch 'master' into uint_opt
						
						
						
						
						
						
						
						Conflicts:
	test.sh
	util/bigint/src/uint.rs 
						
					 | 
					
						2016-03-14 23:45:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6d0f8d4eb
							
						
					 | 
					
						
						
							
							Merge pull request #725 from ethcore/unclesminingfix
						
						
						
						
						
						
						
						Add RLP, not a data item. 
						
					 | 
					
						2016-03-14 20:20:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ba396b8d3
							
						
					 | 
					
						
						
							
							Merge pull request #687 from ethcore/pv63-receipts
						
						
						
						
						
						
						
						PV63 receipts response 
						
					 | 
					
						2016-03-14 20:18:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							7628df6fe6
							
						
					 | 
					
						
						
							
							Merge pull request #723 from ethcore/rpc_tests
						
						
						
						
						
						
						
						another batch of rpc tests 
						
					 | 
					
						2016-03-14 19:18:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffbc6f51cb
							
						
					 | 
					
						
						
							
							Merge pull request #726 from ethcore/docker
						
						
						
						
						
						
						
						dockerfiles update 
						
					 | 
					
						2016-03-14 19:02:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							dfef09161c
							
						
					 | 
					
						
						
							
							update dockerfiles
						
						
						
						
						
					 | 
					
						2016-03-14 18:47:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							c476e7da31
							
						
					 | 
					
						
						
							
							update docker
						
						
						
						
						
					 | 
					
						2016-03-14 18:25:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							97051cb949
							
						
					 | 
					
						
						
							
							Add RLP, not a data item.
						
						
						
						
						
					 | 
					
						2016-03-14 18:20:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							81beaf1094
							
						
					 | 
					
						
						
							
							update dockerfiles
						
						
						
						
						
					 | 
					
						2016-03-14 17:53:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cdb013f9f
							
						
					 | 
					
						
						
							
							Merge branch 'master' into pv63-receipts
						
						
						
						
						
						
						
						Conflicts:
	ethcore/src/client/client.rs 
						
					 | 
					
						2016-03-14 17:36:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							683c13db37
							
						
					 | 
					
						
						
							
							Merge pull request #721 from ethcore/titi
						
						
						
						
						
						
						
						Lock reports to avoid out of order badness. 
						
					 | 
					
						2016-03-14 17:26:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b241faf01
							
						
					 | 
					
						
						
							
							uncle method mock
						
						
						
						
						
					 | 
					
						2016-03-14 17:01:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							d844de442a
							
						
					 | 
					
						
						
							
							Merge pull request #722 from ethcore/network
						
						
						
						
						
						
						
						Fixed handshake leak 
						
					 | 
					
						2016-03-14 16:23:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							47ca84041b
							
						
					 | 
					
						
						
							
							tests for eth_mining, eth_compileLLL, eth_compileSolidity, eth_compileSerpent
						
						
						
						
						
					 | 
					
						2016-03-14 14:59:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e5ebc9457
							
						
					 | 
					
						
						
							
							missing mut
						
						
						
						
						
					 | 
					
						2016-03-14 14:22:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6e8c03ff6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into titi
						
						
						
						
						
					 | 
					
						2016-03-14 14:18:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							0de73609d2
							
						
					 | 
					
						
						
							
							eth_hashrate && eth_submitHashrate tests
						
						
						
						
						
					 | 
					
						2016-03-14 14:18:29 +01:00 | 
					
					
						
						
							
							
							
						
					 |