cmd,eth,rpc,tests: default coinbase

This commit is contained in:
Jeffrey Wilcke
2015-07-07 10:32:05 +02:00
parent d764bd0584
commit 35cd355c14
10 changed files with 87 additions and 51 deletions

View File

@ -87,7 +87,7 @@ type Config struct {
Shh bool
Dial bool
Etherbase string
Etherbase common.Address
GasPrice *big.Int
MinerThreads int
AccountManager *accounts.Manager
@ -322,7 +322,7 @@ func New(config *Config) (*Ethereum, error) {
eventMux: &event.TypeMux{},
accountManager: config.AccountManager,
DataDir: config.DataDir,
etherbase: common.HexToAddress(config.Etherbase),
etherbase: config.Etherbase,
clientVersion: config.Name, // TODO should separate from Name
netVersionId: config.NetworkId,
NatSpec: config.NatSpec,
@ -469,6 +469,11 @@ func (s *Ethereum) Etherbase() (eb common.Address, err error) {
return
}
// set in js console via admin interface or wrapper from cli flags
func (self *Ethereum) SetEtherbase(etherbase common.Address) {
self.etherbase = etherbase
}
func (s *Ethereum) StopMining() { s.miner.Stop() }
func (s *Ethereum) IsMining() bool { return s.miner.Mining() }
func (s *Ethereum) Miner() *miner.Miner { return s.miner }