aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-06-18 23:20:00 +0800
committerzelig <viktor.tron@gmail.com>2015-07-03 06:28:11 +0800
commitfc2e33c594449e38b90bad2bd7b5c50f03b7f69d (patch)
tree8cd8fbf8f0ecb93234b2fb47df30e5e1b78d5173 /eth
parent1d72aaa0cd3a94e95c892a8b8b88a8a1ef59847e (diff)
downloaddexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.gz
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.bz2
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.lz
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.xz
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.zst
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.zip
unlock multiple passes and obsolete primary
* multiple passwords allowed in password file * split on "\n", sideeffect: chop trailing slashes. fixes common mistake <(echo 'pass') * remove accounts.Primary method * do not fall back to primary account for mining
Diffstat (limited to 'eth')
-rw-r--r--eth/backend.go11
1 files changed, 2 insertions, 9 deletions
diff --git a/eth/backend.go b/eth/backend.go
index d6ad3381d..ce774ba1b 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -464,15 +464,8 @@ 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("no accounts found")
+ return eb, err
}
return eb, nil
}