zelig 
							
						 
					 
					
						
						
						
						
							
						
						
							5e7702fd05 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into frontier/js  
						
						... 
						
						
						
						Conflicts:
	cmd/ethereum/js.go
	javascript/types.go 
						
					 
					
						2015-03-16 22:46:29 +07:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							22893b7ac9 
							
						 
					 
					
						
						
							
							removed compile  
						
						
						
					 
					
						2015-03-16 16:31:16 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							b523441361 
							
						 
					 
					
						
						
							
							Moved ethutil => common  
						
						
						
					 
					
						2015-03-16 11:27:38 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
						
						
							
						
						
							31ffca6d8a 
							
						 
					 
					
						
						
							
							remove jsre from mist  
						
						
						
					 
					
						2015-03-15 13:18:58 +07:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							7235e84c75 
							
						 
					 
					
						
						
							
							#469  
						
						
						
					 
					
						2015-03-12 11:09:25 -05:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							d7b5a87b3b 
							
						 
					 
					
						
						
							
							miner: provide coinbase when starting the miner  
						
						... 
						
						
						
						This avoids having to query the coinbase when creating the miner, which
in turn eliminates the dreaded startup error when no accounts are set
up. Later, this will also allow us to simply restart the miner when the
user picks a different coinbase.
This causes a lot of changes in other packages. These are included in
this commit because they're impossible to separate. 
						
					 
					
						2015-03-11 23:43:27 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							269cfbb8ac 
							
						 
					 
					
						
						
							
							Merge branch origin/develop into accounts-integration  
						
						... 
						
						
						
						Conflicts:
	cmd/blocktest/main.go
	cmd/mist/debugger.go
	cmd/utils/cmd.go 
						
					 
					
						2015-03-10 17:14:31 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							56524d13b5 
							
						 
					 
					
						
						
							
							removed debugger  
						
						
						
					 
					
						2015-03-10 12:06:16 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							9bf513e993 
							
						 
					 
					
						
						
							
							Merge ethereum/poc-9 into accounts-integration  
						
						... 
						
						
						
						Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go 
						
					 
					
						2015-03-09 23:25:46 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							20741a96ac 
							
						 
					 
					
						
						
							
							Updated xeth instances to take extra param for ui.Interface  
						
						... 
						
						
						
						Please be aware that if any of the instances on xeth.frontend are called
the program will crash due to the default, temporarily, frontend
interface. 
						
					 
					
						2015-03-09 13:50:05 +01:00 
						 
				 
			
				
					
						
							
							
								Gustav Simonsson 
							
						 
					 
					
						
						
						
						
							
						
						
							bc45e5c6de 
							
						 
					 
					
						
						
							
							Integrate eth_accounts and eth_transact to use new account manager  
						
						... 
						
						
						
						* Add from to eth_transact / xeth.Transact and add static pass in lieu
  of integrating with native Mist window for user passphrase entry
* Make eth_accounts return AccountManager.Accounts()
* Add a Generate Key menu item in Mist 
						
					 
					
						2015-03-06 13:10:42 +00:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							c47866d251 
							
						 
					 
					
						
						
							
							Miner fixes and updates (including miner)  
						
						
						
					 
					
						2015-03-05 09:14:58 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							ea9a549bbd 
							
						 
					 
					
						
						
							
							Removed exported fields from state object and added proper set/getters  
						
						
						
					 
					
						2015-02-20 14:19:34 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							8135752a32 
							
						 
					 
					
						
						
							
							"centralised" mining to backend.  Closes   #323  
						
						
						
					 
					
						2015-02-17 12:24:58 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							8464e43eaf 
							
						 
					 
					
						
						
							
							cmd/mist: fix peer window  
						
						
						
					 
					
						2015-02-14 00:12:37 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							8305d409d2 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into miner  
						
						
						
					 
					
						2015-02-13 17:00:15 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							da2fae0e43 
							
						 
					 
					
						
						
							
							Basic structure miner  
						
						
						
					 
					
						2015-02-10 13:04:38 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							028775a086 
							
						 
					 
					
						
						
							
							cmd/ethereum, cmd/mist: add flag for discovery bootstrap nodes  
						
						
						
					 
					
						2015-02-07 00:52:49 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							2cf4fed11b 
							
						 
					 
					
						
						
							
							cmd/mist, eth, javascript, p2p: use Node URLs for peer suggestions  
						
						
						
					 
					
						2015-02-07 00:46:56 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							56f777b2fc 
							
						 
					 
					
						
						
							
							cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new p2p API  
						
						
						
					 
					
						2015-02-06 00:03:59 +01:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							1f4ed49b4c 
							
						 
					 
					
						
						
							
							Move hardcoded seed node address to app flag  
						
						... 
						
						
						
						Replaces functionality `-seed=true` with `-seed="ip:port"` 
						
					 
					
						2015-02-02 13:04:00 -06:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							cebb149f5c 
							
						 
					 
					
						
						
							
							removed key while in the process of moving to the new key storage  
						
						
						
					 
					
						2015-01-28 20:50:09 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							1c51e12c18 
							
						 
					 
					
						
						
							
							Merge branch 'jsonrpc' into qt5.4  
						
						
						
					 
					
						2015-01-28 18:36:41 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							872b249711 
							
						 
					 
					
						
						
							
							further cleaned up xeth interface  
						
						
						
					 
					
						2015-01-28 18:36:23 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							45e15f62f5 
							
						 
					 
					
						
						
							
							merge jsonrpc  
						
						
						
					 
					
						2015-01-28 18:22:53 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							7f638f0b2d 
							
						 
					 
					
						
						
							
							moving to a better xeth  
						
						
						
					 
					
						2015-01-28 18:14:28 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							fb7c03ff4d 
							
						 
					 
					
						
						
							
							switched to obscuren/qml  
						
						
						
					 
					
						2015-01-28 14:51:54 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							9a11a94894 
							
						 
					 
					
						
						
							
							Updated assets & moved messages  
						
						
						
					 
					
						2015-01-28 14:02:36 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							b777d6aa3f 
							
						 
					 
					
						
						
							
							UI Updates  
						
						... 
						
						
						
						* Browser now has tabs
* Fixed a callback issue 
						
					 
					
						2015-01-22 12:35:31 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							465b0a79d8 
							
						 
					 
					
						
						
							
							Updated browser & pass view to callback function  
						
						
						
					 
					
						2015-01-22 00:24:20 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							9845029a75 
							
						 
					 
					
						
						
							
							StdVm by default  
						
						
						
					 
					
						2015-01-20 15:49:12 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							e3da85faed 
							
						 
					 
					
						
						
							
							Implemented filter for ws + fixes  
						
						... 
						
						
						
						* proper 0xhex
* filters fixed
* start of filter manager
* accounts for ws. Closes  #246  
						
					 
					
						2015-01-10 00:51:56 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							117f66e823 
							
						 
					 
					
						
						
							
							Added license headers  
						
						
						
					 
					
						2015-01-06 12:13:57 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							47e6b2cef8 
							
						 
					 
					
						
						
							
							Allow extra to be set for mined blocks  
						
						
						
					 
					
						2015-01-06 00:19:07 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							f16810c48e 
							
						 
					 
					
						
						
							
							added shh back in  
						
						
						
					 
					
						2015-01-05 17:12:52 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							4051c0333f 
							
						 
					 
					
						
						
							
							Added whisper js api  
						
						
						
					 
					
						2014-12-22 13:23:11 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							0e5aed63dd 
							
						 
					 
					
						
						
							
							Updated QWhisper  
						
						... 
						
						
						
						* changed api
* general whisper debug interface 
						
					 
					
						2014-12-21 15:06:35 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							01a6db9324 
							
						 
					 
					
						
						
							
							Added whisper debug interface + whisper fixes  
						
						
						
					 
					
						2014-12-15 17:14:02 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							56dac74f71 
							
						 
					 
					
						
						
							
							made mist in a compilable, workable state using the new refactored packages  
						
						
						
					 
					
						2014-12-15 13:00:29 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							96272e19a6 
							
						 
					 
					
						
						
							
							removed filter manager from base  
						
						
						
					 
					
						2014-12-15 12:34:06 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							5553e5aaed 
							
						 
					 
					
						
						
							
							states moved to chain  
						
						
						
					 
					
						2014-12-10 19:59:12 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							9008b155d3 
							
						 
					 
					
						
						
							
							Renamed chain => core  
						
						
						
					 
					
						2014-12-04 10:28:02 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							64f35ba8d1 
							
						 
					 
					
						
						
							
							merge errors fixed  
						
						
						
					 
					
						2014-12-02 11:52:56 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							6dc46d3341 
							
						 
					 
					
						
						
							
							Changed the way transactions are being added to the transaction pool  
						
						
						
					 
					
						2014-12-01 20:18:09 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							a1b6a9ac29 
							
						 
					 
					
						
						
							
							Begin of moving objects to types package  
						
						... 
						
						
						
						* Block(s)
* Transaction(s) 
						
					 
					
						2014-11-18 16:58:22 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							cbeebcd47d 
							
						 
					 
					
						
						
							
							Fixed bloom, updated mining & block processing  
						
						... 
						
						
						
						* Reverted back to process blocks in batches method
* Bloom generation and lookup fix
* Minor UI changed (mainly debug) 
						
					 
					
						2014-11-10 01:17:31 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							429dd2a100 
							
						 
					 
					
						
						
							
							Implemented new  miner w/ ui interface for merged mining.  Closes   #177  
						
						... 
						
						
						
						* Miner has been rewritten
* Added new miner pane
* Added option for local txs
* Added option to read from MergeMining contract and list them for
  merged mining 
						
					 
					
						2014-11-07 12:18:48 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							f59a3b67f6 
							
						 
					 
					
						
						
							
							StateManager => BlockManager  
						
						
						
					 
					
						2014-11-04 10:57:02 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							af8f5f0b69 
							
						 
					 
					
						
						
							
							ethstate => state  
						
						
						
					 
					
						2014-10-31 14:43:14 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							0ed1a8b50a 
							
						 
					 
					
						
						
							
							ethpipe => xeth (eXtended ETHereum)  
						
						
						
					 
					
						2014-10-31 14:30:08 +01:00