diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-28 20:11:43 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-28 20:11:43 +0800 |
| commit | a281df783d32270c188d05872b8008eb0b74d042 (patch) | |
| tree | 6548da21b4c784cde127d3451842e46b1a2d4017 | |
| parent | 1fad8798ec043b9b829caea96dd7a2c5e7b1ed36 (diff) | |
| parent | 1356daad276b849a192c84834d78a6cf32d739eb (diff) | |
| download | go-tangerine-a281df783d32270c188d05872b8008eb0b74d042.tar go-tangerine-a281df783d32270c188d05872b8008eb0b74d042.tar.gz go-tangerine-a281df783d32270c188d05872b8008eb0b74d042.tar.bz2 go-tangerine-a281df783d32270c188d05872b8008eb0b74d042.tar.lz go-tangerine-a281df783d32270c188d05872b8008eb0b74d042.tar.xz go-tangerine-a281df783d32270c188d05872b8008eb0b74d042.tar.zst go-tangerine-a281df783d32270c188d05872b8008eb0b74d042.zip | |
Merge pull request #1533 from ethersphere/frontier/etherbase
Etherbase defaults to first account even if it is created during the session
| -rw-r--r-- | cmd/geth/js_test.go | 3 | ||||
| -rw-r--r-- | eth/backend.go | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index aebf2d552..67c36dfe7 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -159,7 +159,7 @@ func TestAccounts(t *testing.T) { defer os.RemoveAll(tmp) checkEvalJSON(t, repl, `eth.accounts`, `["`+testAddress+`"]`) - checkEvalJSON(t, repl, `eth.coinbase`, `null`) + checkEvalJSON(t, repl, `eth.coinbase`, `"`+testAddress+`"`) val, err := repl.re.Run(`personal.newAccount("password")`) if err != nil { t.Errorf("expected no error, got %v", err) @@ -170,6 +170,7 @@ func TestAccounts(t *testing.T) { } checkEvalJSON(t, repl, `eth.accounts`, `["`+testAddress+`","`+addr+`"]`) + } func TestBlockChain(t *testing.T) { diff --git a/eth/backend.go b/eth/backend.go index dc592e7fc..bed6231ed 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -489,7 +489,11 @@ func (s *Ethereum) StartMining(threads int) error { func (s *Ethereum) Etherbase() (eb common.Address, err error) { eb = s.etherbase if (eb == common.Address{}) { - err = fmt.Errorf("etherbase address must be explicitly specified") + addr, e := s.AccountManager().AddressByIndex(0) + if e != nil { + err = fmt.Errorf("etherbase address must be explicitly specified") + } + eb = common.HexToAddress(addr) } return } |