Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							81c71ff4ab 
							
						 
					 
					
						
						
							
							Update submodules to master version  
						
						... 
						
						
						
						# Conflicts:
#	js/src/api/contract/contract.js
#	js/src/redux/providers/requestsActions.js 
						
					 
					
						2017-09-22 14:15:14 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b7be7576 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-09-20 12:14:46 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							db9a70d008 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						... 
						
						
						
						# Conflicts:
#	js/package-lock.json
#	js/src/Application/application.js
#	js/src/api/rpc/parity/parity.js
#	js/src/api/subscriptions/manager.spec.js
#	js/src/api/subscriptions/personal.spec.js
#	js/src/jsonrpc/interfaces/parity.js
#	js/src/mobx/hardwareStore.js
#	js/src/mobx/hardwareStore.spec.js
#	js/src/modals/index.js
#	js/src/redux/providers/signerMiddleware.spec.js
#	js/src/ui/SelectionList/selectionList.css
#	js/src/views/Account/account.spec.js
#	js/src/views/Accounts/accounts.spec.js
#	js/src/views/Application/Extension/store.js
#	js/src/views/Signer/components/SignRequest/signRequest.spec.js 
						
					 
					
						2017-09-18 11:44:09 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							1b6d840ada 
							
						 
					 
					
						
						
							
							Ropsten fork ( #6533 )  
						
						
						
					 
					
						2017-09-18 11:12:42 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							25b35ebddd 
							
						 
					 
					
						
						
							
							Byzantium updates ( #5855 )  
						
						... 
						
						
						
						* EIP-211 updates
* benchmarks
* blockhash instruction gas cost updated
* More benches
* EIP-684
* EIP-649
* EIP-658
* Updated some tests
* Modexp fixes
* STATICCALL fixes
* Pairing fixes
* More STATICALL fixes
* Use paritytech/bn
* Fixed REVERTing of contract creation
* Fixed more tests
* Fixed more tests
* Blockchain tests
* Enable previously broken tests
* Transition test
* Updated tests
* Fixed modexp reading huge numbers
* Enabled max_code_size test
* Review fixes
* Updated pairing pricing
* missing commas (style)
* Update test.rs
* Small improvements
* eip161abc 
						
					 
					
						2017-09-15 21:07:54 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							003eef982b 
							
						 
					 
					
						
						
							
							Move more params to the common section. ( #6134 )  
						
						... 
						
						
						
						* move common forks and parameters to common params
* port specs over to new format
* fix RPC tests 
						
					 
					
						2017-07-31 12:34:29 +02:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							9ad0ff960e 
							
						 
					 
					
						
						
							
							Place RETURNDATA behind block number gate  
						
						
						
					 
					
						2017-07-19 14:34:59 +02:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							f0a6b5d401 
							
						 
					 
					
						
						
							
							azure nodes ( #6017 )  
						
						
						
					 
					
						2017-07-10 13:05:05 +02:00 
						 
				 
			
				
					
						
							
							
								Stewart Mackenzie 
							
						 
					 
					
						
						
						
						
							
						
						
							d152fa3e85 
							
						 
					 
					
						
						
							
							Ethereum Classic Monetary Policy ( #5741 )  
						
						... 
						
						
						
						* Ethereum Classic Monetary Policy
Create a new parameter `ecip1017EraRounds`. When the block number
passes one era rounds, the reward is reduced by 20%.
See https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md 
* Update rewards for uncle miners for ECIP1017
In the monetary policy, the rewards are changed from "up to 7/8 of the
reward" to "1/32 of the reward".
* Fix an off-by-one error in ECIP1017 era calculation
According to
https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md ,
when in block number 5,000,000, it should still be in Era 1 (which in
our code `era == 0`). So we need to check whether the `rem` equals to
zero and act accordingly when calculating the era.
* `ecip1017_era_rounds` missing from EthashParams when run in build bot
* strip out ecip1017_eras_block_reward function and add unit test 
						
					 
					
						2017-06-19 18:56:37 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							575c51f5a0 
							
						 
					 
					
						
						
							
							eip214,  #4833  ( #4851 )  
						
						
						
					 
					
						2017-06-19 11:41:46 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a31e7543 
							
						 
					 
					
						
						
							
							EIP-210 BLOCKHASH changes ( #5505 )  
						
						... 
						
						
						
						* EIP-210
* comment 
						
					 
					
						2017-05-30 11:52:33 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							dd004aba9f 
							
						 
					 
					
						
						
							
							EIP-140 ( #5477 )  
						
						
						
					 
					
						2017-05-23 16:49:17 +03:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							945c1a9478 
							
						 
					 
					
						
						
							
							add monotonic transition to kovan ( #5587 )  
						
						
						
					 
					
						2017-05-15 21:34:01 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							0768ce3600 
							
						 
					 
					
						
						
							
							Merge pull request  #5307  from paritytech/eip-212  
						
						... 
						
						
						
						EIP-212 (bn128 curve pairing) 
						
					 
					
						2017-04-21 13:10:57 +02: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 
						 
				 
			
				
					
						
							
							
								Christopher Franko 
							
						 
					 
					
						
						
						
						
							
						
						
							41700a6996 
							
						 
					 
					
						
						
							
							Update expanse json with fork at block 600000 ( #5351 )  
						
						... 
						
						
						
						* Update expanse json with fork at block 600000
* update exp chainID to 2 
						
					 
					
						2017-04-03 09:59:08 +02:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							84abf5d84f 
							
						 
					 
					
						
						
							
							Aura eip155 validation transition ( #5362 )  
						
						... 
						
						
						
						* add eip155 validation
* add transition block 
						
					 
					
						2017-04-01 13:21:22 +02:00 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							d34aec29ed 
							
						 
					 
					
						
						
							
							finalize  
						
						
						
					 
					
						2017-03-31 17:38:30 +03:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							d146ae7275 
							
						 
					 
					
						
						
							
							Merge pull request  #4999  from paritytech/eip-213  
						
						... 
						
						
						
						EIP-213 (bn128 curve operations) 
						
					 
					
						2017-03-31 14:54:07 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Ziniewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							5d6dac495e 
							
						 
					 
					
						
						
							
							Add new seed nodes ( #5345 )  
						
						
						
					 
					
						2017-03-30 14:49:11 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d99c37fb 
							
						 
					 
					
						
						
							
							Ropsten revival ( #5302 )  
						
						
						
					 
					
						2017-03-28 10:47:21 +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 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							434ed1b91c 
							
						 
					 
					
						
						
							
							remove alt_  
						
						
						
					 
					
						2017-03-24 15:35:00 +03:00 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							5e34235a36 
							
						 
					 
					
						
						
							
							initial, fallable built-ins  
						
						
						
					 
					
						2017-03-22 04:01:46 +03: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 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							e0d554e0ca 
							
						 
					 
					
						
						
							
							Recalculate receipt roots in close_and_lock ( #4884 )  
						
						
						
					 
					
						2017-03-13 17:47:43 +01:00 
						 
				 
			
				
					
						
							
							
								Igor Artamonov 
							
						 
					 
					
						
						
						
						
							
						
						
							63bc942e41 
							
						 
					 
					
						
						
							
							update ETC bootnodes ( #4794 )  
						
						
						
					 
					
						2017-03-07 05:34:48 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							495e5790e9 
							
						 
					 
					
						
						
							
							Support both V1 & V2 DataChanged events in registry ( #4734 )  
						
						... 
						
						
						
						* Add info on forks.
* Add new registry ABI
* Import registry2 & fix exports
* Select ABI based on code hash
* Render new event types (owner not available)
* New registry.
* Rename old chain.
* Fix test.
* Another fix.
* Finish rename. 
						
					 
					
						2017-03-03 13:33:49 +01:00 
						 
				 
			
				
					
						
							
							
								Gav 
							
						 
					 
					
						
						
						
						
							
						
						
							40526c5270 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into new-chains  
						
						
						
					 
					
						2017-03-02 23:49:24 +01:00 
						 
				 
			
				
					
						
							
							
								Gav 
							
						 
					 
					
						
						
						
						
							
						
						
							71d3fa8707 
							
						 
					 
					
						
						
							
							Add registry.  
						
						
						
					 
					
						2017-03-02 23:47:56 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							2862b3c21a 
							
						 
					 
					
						
						
							
							New chains ( #4720 )  
						
						... 
						
						
						
						* Add Kovan chain.
* Fix up --testnet.
* Fix tests.
* Fix test.
* fix test
* Fix test. 
						
					 
					
						2017-03-02 20:24:27 +01:00 
						 
				 
			
				
					
						
							
							
								Gav 
							
						 
					 
					
						
						
						
						
							
						
						
							c662d1cb0a 
							
						 
					 
					
						
						
							
							Add Kovan chain.  
						
						
						
					 
					
						2017-03-02 14:33:59 +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 
						 
				 
			
				
					
						
							
							
								Konstantin 
							
						 
					 
					
						
						
						
						
							
						
						
							9d0278e0f8 
							
						 
					 
					
						
						
							
							added 3 warpnodes for ropsten ( #4289 )  
						
						... 
						
						
						
						* added 3 warpnodes for ropsten
* Fixed indentation 
						
					 
					
						2017-01-24 14:35:52 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							cdc525449a 
							
						 
					 
					
						
						
							
							Ropsten fork detection ( #4163 )  
						
						
						
					 
					
						2017-01-13 14:28:10 +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 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							ddb242c969 
							
						 
					 
					
						
						
							
							Fixed upgrading keys on the first run  
						
						
						
					 
					
						2016-12-19 17:41:55 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b89d10239b 
							
						 
					 
					
						
						
							
							Update tests, gitlabci  
						
						
						
					 
					
						2016-12-16 15:12:35 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							72f278efed 
							
						 
					 
					
						
						
							
							Merge pull request  #3868  from ethcore/new-dirs  
						
						... 
						
						
						
						Base directory option 
						
					 
					
						2016-12-16 13:04:31 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							e2371632c5 
							
						 
					 
					
						
						
							
							Base dir option  
						
						
						
					 
					
						2016-12-15 21:56:45 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							590428e7f2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-15 15:12:09 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							69eec105a7 
							
						 
					 
					
						
						
							
							Change default back to permissive for now.  
						
						
						
					 
					
						2016-12-15 13:40:44 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bf7fb84937 
							
						 
					 
					
						
						
							
							Don't put sha3s.  
						
						
						
					 
					
						2016-12-14 21:59:00 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							2588aea6b2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into check-updates  
						
						
						
					 
					
						2016-12-14 14:37:38 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							be5fefe772 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into new-dirs  
						
						
						
					 
					
						2016-12-14 00:04:11 +01:00 
						 
				 
			
				
					
						
							
							
								Igor Artamonov 
							
						 
					 
					
						
						
						
						
							
						
						
							e61d14d7f7 
							
						 
					 
					
						
						
							
							reuse Morden for Classic Testnet  
						
						
						
					 
					
						2016-12-12 19:50:32 +00:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							6601fde328 
							
						 
					 
					
						
						
							
							New data paths with upgrade  
						
						
						
					 
					
						2016-12-12 16:51:07 +01:00