Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7bbd48a2bd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						... 
						
						
						
						# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js 
						
					 
					
						2017-06-13 11:02:38 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							99bfef2801 
							
						 
					 
					
						
						
							
							EIP-211 RETURNDATACOPY and RETURNDATASIZE ( #5678 )  
						
						... 
						
						
						
						* EIP-211
* Optimized memory usage
* Optimized truncation 
						
					 
					
						2017-06-06 18:47:12 +03:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a31e7543 
							
						 
					 
					
						
						
							
							EIP-210 BLOCKHASH changes ( #5505 )  
						
						... 
						
						
						
						* EIP-210
* comment 
						
					 
					
						2017-05-30 11:52:33 +02:00 
						 
				 
			
				
					
						
							
							
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							e1fef5c732 
							
						 
					 
					
						
						
							
							Update dependencies and bigint api ( #5685 )  
						
						... 
						
						
						
						* update to latest bigint
* bump elastic array and deps
* fix rlp tests
* also update all smallvec deps
* fix doc test
* reduce parking in attempt to fix CI bug
* fix from/into electum bug
* remove duplicate imports 
						
					 
					
						2017-05-24 12:31:33 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							18c3e90dbf 
							
						 
					 
					
						
						
							
							Merge pull request  #5671  from paritytech/guanqun-add-unit-tests  
						
						... 
						
						
						
						Guanqun add unit tests 
						
					 
					
						2017-05-23 15:18:11 -04:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							dd004aba9f 
							
						 
					 
					
						
						
							
							EIP-140 ( #5477 )  
						
						
						
					 
					
						2017-05-23 16:49:17 +03:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							d35da909db 
							
						 
					 
					
						
						
							
							add asserts in ethash.rs  
						
						
						
					 
					
						2017-05-20 12:12:16 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							73ad575306 
							
						 
					 
					
						
						
							
							add asserts in genesis.rs  
						
						
						
					 
					
						2017-05-20 12:12:16 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							292eb1de62 
							
						 
					 
					
						
						
							
							add asserts in engine.rs  
						
						
						
					 
					
						2017-05-20 12:12:16 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							f96731c82b 
							
						 
					 
					
						
						
							
							add assets for seal.rs  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							5c7c30cc4b 
							
						 
					 
					
						
						
							
							add asserts in spec param.rs  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							a61b249d57 
							
						 
					 
					
						
						
							
							add asserts in tendermint.rs  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							0b4eef48c5 
							
						 
					 
					
						
						
							
							add asserts in instantseal  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							90b8b612cc 
							
						 
					 
					
						
						
							
							add asserts for spec::basic_authority  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a8eaa3bf 
							
						 
					 
					
						
						
							
							add asserts in spec::authority_round's unit test  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							a0dd77ca01 
							
						 
					 
					
						
						
							
							add asserts in spec::validatorset's unit test  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							f90802498f 
							
						 
					 
					
						
						
							
							add two asserts in unit tests for spec::authority_round  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								Guanqun Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							cf0b8b7681 
							
						 
					 
					
						
						
							
							add several new tests for spec::account  
						
						
						
					 
					
						2017-05-19 22:48:23 +08:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							945c1a9478 
							
						 
					 
					
						
						
							
							add monotonic transition to kovan ( #5587 )  
						
						
						
					 
					
						2017-05-15 21:34:01 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							b50fb71dd1 
							
						 
					 
					
						
						
							
							EIP-86 ( #4697 )  
						
						... 
						
						
						
						* EIP-86
* Disable EIP-86 auto activation for now 
						
					 
					
						2017-04-19 14:30:00 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							15ae24b541 
							
						 
					 
					
						
						
							
							New state tests ( #5418 )  
						
						... 
						
						
						
						* General state tests
* Allow dir name for a test 
						
					 
					
						2017-04-12 13:33:49 +02:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							84abf5d84f 
							
						 
					 
					
						
						
							
							Aura eip155 validation transition ( #5362 )  
						
						... 
						
						
						
						* add eip155 validation
* add transition block 
						
					 
					
						2017-04-01 13:21:22 +02:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							a61b1567d0 
							
						 
					 
					
						
						
							
							Strict validation transitions ( #4988 )  
						
						... 
						
						
						
						* ability to make validation stricter
* fix consensus
* remove logger 
						
					 
					
						2017-03-28 10:46:52 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							23d3b79d9a 
							
						 
					 
					
						
						
							
							eip100b ( #5027 )  
						
						... 
						
						
						
						* eip100b
* fix eip100b build and tests
* Conventional comparison order 
						
					 
					
						2017-03-27 11:42:40 +02:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							9fdd0e3a0a 
							
						 
					 
					
						
						
							
							Switching ValidatorSet ( #4961 )  
						
						... 
						
						
						
						* add multi validator set
* nicer comment
* validate in constructor
* reporting 
						
					 
					
						2017-03-23 13:19:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							7e87e9e8ad 
							
						 
					 
					
						
						
							
							Updating JSON-RPC crates ( #4934 )  
						
						... 
						
						
						
						* New version of jsonrpc.
* Better invalid encoding messages
* Fixing deprecated methods of tokio_core
* Using dedicated branch for jsonrpc
* Bump 
						
					 
					
						2017-03-22 07:02:14 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							797a3e1cd9 
							
						 
					 
					
						
						
							
							EIP198 and built-in activation ( #4926 )  
						
						... 
						
						
						
						* EIP198 and built-in activation
* address review 
						
					 
					
						2017-03-21 19:36:38 +03:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							43871e393c 
							
						 
					 
					
						
						
							
							Additional kovan params ( #4892 )  
						
						
						
					 
					
						2017-03-14 11:41:56 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							ade5a13f5b 
							
						 
					 
					
						
						
							
							Add registrar fields ( #4716 )  
						
						... 
						
						
						
						* add registrar field
* use constructor for dev registrar
* fix test 
						
					 
					
						2017-03-02 12:25:55 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							ef7998f473 
							
						 
					 
					
						
						
							
							Max gas limit and min gas price ( #4661 )  
						
						... 
						
						
						
						* Max gas limit and min gas price
* Tests
* Limit gas limit ceiling 
						
					 
					
						2017-02-24 17:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							72998d3ce3 
							
						 
					 
					
						
						
							
							Proper default accounts RPCs ( #4580 )  
						
						... 
						
						
						
						* Default accounts setting - account provider
* RPC support for default accounts
* Updating JS code
* Rename whitelist to addresses 
						
					 
					
						2017-02-20 16:33:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							f1e99ea2e4 
							
						 
					 
					
						
						
							
							Serde 0.9 ( #4508 )  
						
						... 
						
						
						
						* Porting json
* Dapps
* Rpc & Ethstore
* New ethabi
* Last bunch of fixes
* Fixing last test
* Removing build script
* Adding ethcore-ipc-tests back
* Fixing grumbles
* Fixing blockchain tests (inference regression?) 
						
					 
					
						2017-02-13 18:38:47 +03:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							cf348dae60 
							
						 
					 
					
						
						
							
							Persistent tracking of dapps ( #4302 )  
						
						... 
						
						
						
						* Tests for RPC
* Extracting dapp_id from Origin and x-parity-origin
* Separate type for DappId
* Persistent tracking of recent dapps
* Fixing tests
* Exposing dapp timestamps
* Fixing import to work on stable
* Fixing test again 
						
					 
					
						2017-01-30 10:59:46 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							c012dfc3ef 
							
						 
					 
					
						
						
							
							EIP-98: Optional transaction state root ( #4296 )  
						
						... 
						
						
						
						* EIP98: Optional receipt state root
* Use if-else
* Fixing tests 
						
					 
					
						2017-01-25 20:22:48 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							8404edb656 
							
						 
					 
					
						
						
							
							Fix whitespace ( #4299 )  
						
						... 
						
						
						
						* Fix whitespace.
* Update copyright years/owner.
* Push release only for tags. 
						
					 
					
						2017-01-25 18:51:41 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							ba0209678b 
							
						 
					 
					
						
						
							
							ValidatorSet reporting ( #4208 )  
						
						... 
						
						
						
						* remove register_account_provider
* build rpc module
* new dummy client
* common EngineSigner struct
* from -> into
* initial report via call
* separate safe from regular contract
* transact_contract
* fix build
* return Signature, docs
* add sign method to some engines
* add safeContract spec
* update specs to new contracts
* use AuthorityRound for contract spec
* add more reporting
* add reporting test
* use gas floor
* shorter 
						
					 
					
						2017-01-24 12:03:58 +03:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							be30c44179 
							
						 
					 
					
						
						
							
							Validator/authority contract ( #3937 )  
						
						... 
						
						
						
						* dir
* simple validator list
* stub validator contract
* make the engine hold Weak<Client> instead of IoChannel
* validator set factory
* register weak client with ValidatorContract
* check chain security
* add address array to generator
* register provider contract
* update validator set on notify
* add validator contract spec
* simple list test
* split update and contract test
* contract change
* use client in tendermint
* fix deadlock
* step duration in params
* adapt tendermint tests
* add storage fields to test spec
* constructor spec
* execute under wrong address
* create under correct address
* revert
* validator contract constructor
* move genesis block lookup
* add removal ability to contract
* validator contract adding validators
* fix basic authority
* validator changing test
* more docs
* update sync tests
* remove env_logger
* another env_logger
* cameltoe
* hold EngineClient instead of Client
* add a comment about lock scope 
						
					 
					
						2017-01-10 12:23:59 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							fbc9f0d7fb 
							
						 
					 
					
						
						
							
							Add block rewards to more Engines ( #4055 )  
						
						... 
						
						
						
						* add block rewards
* imports 
						
					 
					
						2017-01-05 21:16:13 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							e5b3c092c8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into optional-spec  
						
						
						
					 
					
						2017-01-03 15:42:56 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							8125b5690c 
							
						 
					 
					
						
						
							
							Port try macro to new ? operator. ( #3962 )  
						
						... 
						
						
						
						* initial untry sweep
* restore try in ipc codegen, fix inference
* change a few missed try instances 
						
					 
					
						2016-12-27 12:53:56 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							afc4cd2785 
							
						 
					 
					
						
						
							
							Allow contract constructors in chain spec ( #3932 )  
						
						... 
						
						
						
						* constructor spec
* execute under wrong address
* create under correct address
* revert
* move genesis block lookup
* remove env_logger 
						
					 
					
						2016-12-23 18:44:39 +01:00 
						 
				 
			
				
					
						
							
							
								Igor Artamonov 
							
						 
					 
					
						
						
						
						
							
						
						
							be75cbfaaa 
							
						 
					 
					
						
						
							
							set CHAIN_ID for Classic ( #3934 )  
						
						... 
						
						
						
						* configurable CHAIN_ID
* set CHAIN_ID for Ethereum Classic 
						
					 
					
						2016-12-22 13:10:58 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							552a772cc1 
							
						 
					 
					
						
						
							
							make fields defaulting to 0 optional  
						
						
						
					 
					
						2016-12-22 07:06:40 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							46662899da 
							
						 
					 
					
						
						
							
							make spec naming consistent  
						
						
						
					 
					
						2016-12-19 14:15:39 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d455ac4a40 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc  
						
						
						
					 
					
						2016-12-15 17:12:18 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							20b2f84d48 
							
						 
					 
					
						
						
							
							Merge pull request  #3828  from ethcore/new-dirs  
						
						... 
						
						
						
						New directory structure 
						
					 
					
						2016-12-15 14:34:01 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1ea521ea7d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc  
						
						
						
					 
					
						2016-12-15 13:51:22 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							943efc21bb 
							
						 
					 
					
						
						
							
							add tendermint seal  
						
						
						
					 
					
						2016-12-15 13:41:04 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							db73b0d66f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc  
						
						
						
					 
					
						2016-12-15 13:28:37 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							a74bce2c06 
							
						 
					 
					
						
						
							
							Merge pull request  #3759  from ethcore/auth-bft  
						
						... 
						
						
						
						Tendermint Engine 
						
					 
					
						2016-12-15 13:18:15 +01:00