accounts, cmd, eth, internal, miner, node: wallets and HD APIs

1 files changed, 4 insertions, 2 deletions

diff --git a/eth/backend.go b/eth/backend.go
index 004be7e26..ef3ac93c8 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -364,8 +364,10 @@ func (s *Ethereum) Etherbase() (eb common.Address, err error) {
 	if s.etherbase != (common.Address{}) {
 		return s.etherbase, nil
 	}
-	if accounts := s.AccountManager().Accounts(); len(accounts) > 0 {
-		return accounts[0].Address, nil
+	if wallets := s.AccountManager().Wallets(); len(wallets) > 0 {
+		if accounts := wallets[0].Accounts(); len(accounts) > 0 {
+			return accounts[0].Address, nil
+		}
 	}
 	return common.Address{}, fmt.Errorf("etherbase address must be explicitly specified")
 }