poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,996 Commits 22 Branches 24 Tags 156 MiB
Commit Graph

85 Commits

Author SHA1 Message Date
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
Felix Lange 9d4e1e8f8b eth: return account errors directly 2015-03-10 15:42:58 +01:00
Felix Lange 9b3ae1fdb7 eth: fix tests 2015-03-10 02:34:52 +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
Felix Lange 63758db379 eth: delete unused RpcServer field 2015-03-09 23:08:46 +01:00
Gustav Simonsson 27c42ea934 Add empty total difficulty to test blocks and clean up stopping the node 2015-03-09 18:03:35 +01:00
Felix Lange fb53a9362e accounts: AccountManager -> Manager 2015-03-08 01:58:35 +01:00
Felix Lange d66f93cecd accounts, core, eth, xeth: use account manager for everything 
The account manager is now responsible for picking the
default account and the coinbase.
 2015-03-07 12:38:33 +01:00
obscuren cd856cb213 Separated block db from state db. Partial fix for #416 2015-03-06 18:26:16 +01:00
obscuren ed84b58af5 Debug option for VM & command line flag 2015-03-06 16:58:52 +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
Felix Lange e64f727529 Merge pull request #433 from fjl/newcli 
Improved CLI
 2015-03-06 14:02:16 +01:00
Felix Lange bdba044a80 ethutil: remove Config variable 
Various functions throughout the codebase used it to grab settings. This
has to stop because I want to use them without reading the config file.

These functions can now be used without reading the config first:

* ethdb.NewLDBDatabase
* ethrepl.NewJSRepl
* vm.New
 2015-03-06 02:46:56 +01:00
obscuren ba0c41436c Merge branch 'p2p-handshake-2' of https://github.com/fjl/go-ethereum into fjl-p2p-handshake-2 2015-03-05 17:21:32 +01:00
obscuren c47866d251 Miner fixes and updates (including miner) 2015-03-05 09:14:58 +01:00
Felix Lange 215c763d53 eth, p2p: delete p2p.Blacklist 
It is unused and untested right now. We can
bring it back later if required.
 2015-03-04 16:54:36 +01:00
obscuren bb152612e0 Merge branch 'develop' into poc-9 
Conflicts:
	cmd/utils/cmd.go
 2015-03-03 20:34:48 +01:00
obscuren f0b2ea64fc Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs 
Conflicts:
	eth/block_pool.go
	eth/block_pool_test.go
	eth/protocol_test.go
	miner/worker.go
 2015-03-03 20:30:05 +01:00
Jeffrey Wilcke 253eb778d1 Merge pull request #411 from ethersphere/readme 
[WIP] Update Readme
 2015-03-03 20:17:51 +01:00
Jeffrey Wilcke 988391fc37 Merge pull request #409 from tgerring/jsonlogs 
Updated JSON log events
 2015-03-03 20:16:55 +01:00
obscuren 313fe3861b fixed pow stuff 2015-03-03 17:55:23 +01:00
zelig 7e224b6834 db name database -> blockchain in backend error message 2015-03-03 13:22:19 +07:00
Taylor Gerring 0976c3024f Don't import logger as ethlogger 2015-03-02 08:15:28 -06:00
Taylor Gerring cfe0370280 Remove Websockets RPC transport 2015-03-01 16:19:06 +01:00
obscuren 73c52d1677 Merge branch 'ethersphere-blockpool2' into poc-9 2015-02-28 20:52:57 +01:00
obscuren cc5c8a444d Report proper database directory. Closes #397 2015-02-26 20:36:54 +01:00
zelig 16ecda951b integrate blockpool into eth 
- remove blockpool code
- remove blockpool integration test (kinda embarrassing)
- remove errors.go
 2015-02-25 20:38:37 +07:00
Felix Lange e968928613 eth: persist node key between sessions (#304) 2015-02-20 15:26:50 +01:00
Felix Lange e282ad25a8 eth: add poc-8.ethdev.com as second default bootstrap node 2015-02-20 15:24:43 +01:00
Jeffrey Wilcke 765740b829 Merge pull request #345 from maran/feature/minerthreads 
Implement command line argument to set the amount miner threads
 2015-02-19 22:37:13 +01:00
Taylor Gerring 4322632c59 Merge pull request #339 from tgerring/jsonlog 
JSON log updates
 2015-02-19 12:25:45 +01:00
Maran 5aff8bfb59 Implement command line argument to set the amount of agents created by the miner 
Defaults to the amount of cores available on the CPU
 2015-02-19 10:38:36 +01:00
obscuren 05b1ec008b Disabled ability to disable whisper. Closes #334 2015-02-18 11:42:01 +01:00
Taylor Gerring f499f343ba Update JSON Log types 2015-02-18 10:52:23 +01:00
obscuren 5ec8c5f71b added bootnode back in 2015-02-17 23:14:10 +01:00
obscuren 7fc9b5b3f9 Changed to ChainEvent and fixed a nil pointer in transact 2015-02-17 22:20:47 +01:00
obscuren 567428fb34 Filter and mutex locks added 2015-02-17 16:12:55 +01:00
obscuren 8135752a32 "centralised" mining to backend. Closes #323 2015-02-17 12:24:58 +01:00
Felix Lange 1c1a3033be eth: add default bootnode 2015-02-13 21:41:13 +01:00
obscuren bde3ff16ad merge 2015-02-13 16:02:37 +01:00
obscuren 76fa75b394 wip 2015-02-13 15:35:54 +01:00
obscuren a5ea21cd85 merge 2015-02-13 15:05:56 +01:00
Felix Lange d0a2e655c9 cmd/ethereum, cmd/mist, eth, p2p: use package p2p/nat 
This deletes the old NAT implementation.
 2015-02-13 11:39:31 +01:00
Taylor Gerring db24fb792c Move standard fields to LogEvent 2015-02-11 18:49:00 +01:00
Taylor Gerring 3d6fd601c5 Move event names within each object 2015-02-11 12:45:41 +01:00
Taylor Gerring d53e5646ec Use strongly-typed objects 2015-02-10 19:21:13 +01:00
Felix Lange a21b30c901 eth: remove unused Ethereum sync fields 2015-02-10 13:30:07 +01:00
Felix Lange a3cd218719 cmd/mist, cmd/ethereum: add CLI arguments for node key 2015-02-10 12:30:09 +01:00
Felix Lange f1ebad2508 eth: don't warn if no BootNodes are specified 2015-02-09 16:17:07 +01:00
Felix Lange 028775a086 cmd/ethereum, cmd/mist: add flag for discovery bootstrap nodes 2015-02-07 00:52:49 +01:00