| 
							
							
								 Gav Wood | d63e535b3c | Merge branch 'master' into finduncles | 2016-03-04 23:08:48 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 96617533c8 | Remove unneeded field. | 2016-03-04 22:57:44 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 559e01ea84 | Review remarks resolved. | 2016-03-04 22:54:59 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bc018faedc | Avoid forcing a resync for the pre-existing journaldbs. | 2016-03-04 21:17:42 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bbbaffbc53 | "--archive" option for disabling the journal DB Fixes #579 | 2016-03-04 21:06:28 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | c72c27b47e | client integration | 2016-03-04 20:09:21 +03:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | bcaed67eaa | Swapping order of inserting block to chain and commiting to DB to avoid race conditions | 2016-03-04 16:48:10 +01:00 |  | 
			
				
					| 
							
							
								 debris | 706ce5dfb6 | verifier trait | 2016-03-04 11:56:04 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 52dceff3ea | Merge branch 'master' into finduncles | 2016-03-03 15:16:56 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 00b5fcebe3 | Merge pull request #580 from ethcore/fixblockchainmem shrink_to_fit after removing hashes. | 2016-03-03 15:08:47 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | f8dc1f2e3a | Avoid leaking block_details. Fixes #576 | 2016-03-03 12:56:34 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 09e01fa0f8 | Merge pull request #504 from ethcore/rpc_poll_ids support for rpc polling | 2016-03-03 12:44:27 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 806f962b7d | Merge pull request #573 from ethcore/issue-test/568 fork test for Issue test/568 | 2016-03-03 12:41:32 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | dadc2a96ea | shrink_to_fit after removing hashes. | 2016-03-03 12:39:19 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | df77f51bcc | History to 30 to pass tests. | 2016-03-03 11:47:24 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 3daa4c6497 | Fix max uncles. | 2016-03-03 11:39:00 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 6933bb971b | Test. | 2016-03-02 23:41:15 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | f4a71dc03c | Merge branch 'tx_queue' into tx_queue_integration | 2016-03-02 21:27:08 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 039c0056bc | Uncle inclusion in block authoring. Still need tests. | 2016-03-02 19:38:00 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 877270c35f | Fixes. | 2016-03-02 18:32:54 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 42df98450c | Include uncles in exclused. | 2016-03-02 18:05:47 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 671965d44f | Test for ancestry. | 2016-03-02 17:31:42 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | c75737bcf0 | Add ancestry iterator. | 2016-03-02 17:04:44 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 3c7814c8ac | Remove debug line. | 2016-03-02 15:43:48 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 028434f93d | Merge branch 'master' into issue-test/568 Conflicts:
	ethcore/src/tests/client.rs | 2016-03-02 17:15:09 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 02aad03f92 | helpers | 2016-03-02 17:06:53 +03:00 |  | 
			
				
					| 
							
							
								 debris | 03ffcd0e64 | Merge branch 'master' into rpc_poll_ids | 2016-03-02 13:59:03 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 47b4729332 | Fix check. | 2016-03-02 13:28:51 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 4fd926bfd6 | Merge branch 'master' of github.com:ethcore/parity | 2016-03-02 13:27:45 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 3b3399ccc3 | Merge pull request #564 from ethcore/inclusive_bloom_ranges chainfilter shouldnt exclude to_block from results | 2016-03-02 13:05:45 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 13deb4f048 | Merge branch 'master' of github.com:ethcore/parity | 2016-03-02 13:01:48 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 162300a4a6 | Merge pull request #547 from ethcore/mining Mining | 2016-03-02 13:00:22 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 3309959139 | Additional check to ancient enactments. | 2016-03-02 12:57:34 +01:00 |  | 
			
				
					| 
							
							
								 debris | 5a7dfa4df2 | Merge branch 'master' into rpc_poll_ids | 2016-03-02 12:27:38 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 6b9fde5790 | Merge branch 'master' into mining | 2016-03-02 08:54:21 +03:00 |  | 
			
				
					| 
							
							
								 debris | a0acfd5113 | Merge branch 'master' into rpc_poll_ids | 2016-03-02 06:12:06 +01:00 |  | 
			
				
					| 
							
							
								 debris | feff1f9e6e | chainfilter shouldnt exclude to_block from results | 2016-03-02 06:09:27 +01:00 |  | 
			
				
					| 
							
							
								 debris | 67a1f2065e | fixed broken master | 2016-03-02 06:01:31 +01:00 |  | 
			
				
					| 
							
							
								 debris | 32074cc420 | fixed compilation issue caused by incorrect merge | 2016-03-02 05:55:42 +01:00 |  | 
			
				
					| 
							
							
								 debris | 3b4d4a9b63 | Merge branch 'master' into rpc_poll_ids | 2016-03-02 05:15:21 +01:00 |  | 
			
				
					| 
							
							
								 debris | 4571df9fc6 | Merge branch 'master' of github.com:ethcore/parity into chain_generator | 2016-03-02 04:54:55 +01:00 |  | 
			
				
					| 
							
							
								 debris | 010659cf12 | added missing , in comment | 2016-03-02 04:54:47 +01:00 |  | 
			
				
					| 
							
							
								 debris | 68ba016279 | improved blockchain generator | 2016-03-02 04:25:03 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 324e070581 | Reverted some changes | 2016-03-02 01:24:06 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 15ecba57ec | Merge branch 'master' of github.com:ethcore/parity into thread | 2016-03-02 01:20:41 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d55aa54412 | Merge branch 'master' into mining | 2016-03-02 00:59:39 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 0082d12ea9 | Merge pull request #544 from ethcore/uint-refact uint to separate crate | 2016-03-02 00:59:03 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 3ac14a6d89 | Merge pull request #554 from ethcore/chain_generator improved test chain generator | 2016-03-02 00:58:52 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 30c6820437 | Refactor and cleanup. | 2016-03-02 00:52:18 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 929f44fe4f | Tests for Client sealing. | 2016-03-02 00:34:38 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 7565625ce0 | Integrating TransactionQueue with client | 2016-03-01 22:30:23 +01:00 |  | 
			
				
					| 
							
							
								 Tomusdrw | aab274d3ef | Changing RefCell to Cell in transaction. Implementing Copy on Uints. | 2016-03-01 21:29:22 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | a21fda23a6 | Enable transition test. | 2016-03-01 20:14:28 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 628a53ccec | Update tests. Fix our tests. | 2016-03-01 20:02:59 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 140711dd8a | Fixups from review. Reduce size of default extra-data.
Introduce find_uncle_headers. | 2016-03-01 19:59:12 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | f2eae8bc50 | Merge branch 'master' into mining | 2016-03-01 18:46:02 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 61420d3c9c | Fix for morden consensus. | 2016-03-01 18:17:59 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | afc0605080 | Refactor engine to make it clear that we're actually checking the seal. | 2016-03-01 17:23:44 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | f705f6957a | Merge branch 'master' into mining | 2016-03-01 16:59:39 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | a5c65b2a3d | Reduce spam. | 2016-03-01 16:59:01 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 48df869202 | --author and --extra-data options. Fixed null parent-hash. | 2016-03-01 16:58:14 +01:00 |  | 
			
				
					| 
							
							
								 debris | 38d74bf78c | Merge branch 'master' of github.com:ethcore/parity into chain_generator | 2016-03-01 16:22:51 +01:00 |  | 
			
				
					| 
							
							
								 debris | 3e2366b38b | improved chain generator | 2016-03-01 16:22:06 +01:00 |  | 
			
				
					| 
							
							
								 Marek Kotewicz | bbe2e8076b | Merge pull request #550 from ethcore/chain_generator blockchain generator | 2016-03-01 16:21:27 +01:00 |  | 
			
				
					| 
							
							
								 debris | 47688e49cd | removed redundant whitespaces | 2016-03-01 13:54:14 +01:00 |  | 
			
				
					| 
							
							
								 debris | 063020f507 | added license headers | 2016-03-01 13:46:33 +01:00 |  | 
			
				
					| 
							
							
								 debris | ab9fddf6b2 | blockchain generator | 2016-03-01 13:44:09 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 5ccb172e73 | Hashrate now reported correctly. | 2016-03-01 01:52:22 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 2266d74c2a | Fix JSONRPC I/O. | 2016-03-01 01:15:00 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 394e9c679b | Reorganised ImportError to be a type of Errpr (rather than vice-versa). Added support for eth_submitWork. | 2016-03-01 00:02:48 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | f528d8c50a | common -> numbers (as most narrow) | 2016-03-01 00:44:45 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | d0125f3ff5 | uint to separated crate | 2016-03-01 00:21:15 +03:00 |  | 
			
				
					| 
							
							
								 arkpar | d0129ff67b | Fixed cache memory leak | 2016-02-29 21:15:39 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | cb4d17825b | Fixed lock order | 2016-02-29 19:49:29 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | ffc5c2ea7b | eth_getwork implemented. | 2016-02-29 19:30:13 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | dff7f2e8e5 | Merge branch 'master' of github.com:ethcore/parity into thread | 2016-02-29 18:25:06 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 0ccbba9073 | Merge branch 'master' of github.com:ethcore/parity into thread | 2016-02-29 18:11:59 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 2c32b0fc1c | Merge branch 'master' into mining | 2016-02-29 16:40:57 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | a1e1f4f87c | Disable stTransitionTest until Dimitri updates to correct number. | 2016-02-29 15:33:33 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 71da65eb7b | Merge branch 'master' of github.com:ethcore/parity | 2016-02-29 15:33:02 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | e20858a5dc | Compile fixes. | 2016-02-29 15:30:08 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 83b8e7df5a | Initial refactor and block closing. | 2016-02-29 14:57:41 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 6197b3ee60 | New provisional Homestead block. | 2016-02-29 12:47:34 +01:00 |  | 
			
				
					| 
							
							
								 debris | 5357f58131 | uncomment state transition tests | 2016-02-29 12:04:58 +01:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 90b41a81f5 | Merge pull request #531 from ethcore/mordenswitch Morden switch to Homestead rules at #494,000. | 2016-02-29 11:15:01 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | be4b0472c8 | Morden switch to Homestead rules at #494,000. | 2016-02-29 10:33:57 +01:00 |  | 
			
				
					| 
							
							
								 debris | 1481f3f477 | replaced match with if to shorten the code | 2016-02-27 19:27:34 +01:00 |  | 
			
				
					| 
							
							
								 debris | 1cc719d413 | description for prepare_block_blooms_update function | 2016-02-27 19:17:29 +01:00 |  | 
			
				
					| 
							
							
								 debris | 53b19e9f2d | Merge branch 'master' of https://github.com/ethcore/parity into blockchain_cleanup | 2016-02-27 16:06:02 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | b3f09596b1 | Merge pull request #516 from ethcore/sync Better memory management | 2016-02-27 15:54:19 +01:00 |  | 
			
				
					| 
							
							
								 debris | f1538ebc76 | Merge branch 'master' into rpc_poll_ids | 2016-02-27 15:34:02 +01:00 |  | 
			
				
					| 
							
							
								 debris | 7b3613e1f0 | updated ExtrasUpdate function | 2016-02-27 10:21:44 +01:00 |  | 
			
				
					| 
							
							
								 debris | 01f69ca80c | moved creation of blockchains db transaction to apply_update function | 2016-02-27 10:19:33 +01:00 |  | 
			
				
					| 
							
							
								 debris | d57518d90c | Merge branch 'master' into blockchain_cleanup | 2016-02-27 02:18:07 +01:00 |  | 
			
				
					| 
							
							
								 debris | cd43e32e25 | added docs and license headers | 2016-02-27 02:16:39 +01:00 |  | 
			
				
					| 
							
							
								 debris | 53e8d99075 | blockchain split into few separate submodules, cleanup insert_block process | 2016-02-27 01:37:12 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 92625a5095 | Merge branch 'master' of github.com:ethcore/parity | 2016-02-26 22:39:23 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | f118e30b20 | Renaming variables to more descriptive | 2016-02-26 19:56:32 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | f55d111469 | Merge branch 'master' into client_bugs Conflicts:
	ethcore/src/client.rs | 2016-02-26 19:43:06 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | fd63fa6836 | Update block.rs | 2016-02-26 17:27:56 +01:00 |  |