Merge pull request #1283 from ethersphere/frontier/accounts

Account management improvements

1 files changed, 2 insertions, 10 deletions

diff --git a/eth/backend.go b/eth/backend.go
index 618eec9fb..e62252b6c 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -464,17 +464,9 @@ func (s *Ethereum) StartMining(threads int) error {
 func (s *Ethereum) Etherbase() (eb common.Address, err error) {
 	eb = s.etherbase
 	if (eb == common.Address{}) {
-		primary, err := s.accountManager.Primary()
-		if err != nil {
-			return eb, err
-		}
-		if (primary == common.Address{}) {
-			err = fmt.Errorf("no accounts found")
-			return eb, err
-		}
-		eb = primary
+		err = fmt.Errorf("etherbase address must be explicitly specified")
 	}
-	return eb, nil
+	return
 }
 
 func (s *Ethereum) StopMining()         { s.miner.Stop() }