gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1428 from obscuren/coinbase-fixes

Browse Source 
cmd,eth,rpc,tests: default coinbase
This commit is contained in:
Jeffrey Wilcke
2015-07-07 02:55:33 -07:00
parent 916d155467 37c1a8f69d
commit e5fba8fd70
12 changed files with 99 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/geth/main.go
View File

@ -461,22 +461,7 @@ func execJSFiles(ctx *cli.Context) {
func unlockAccount(ctx *cli.Context, am *accounts.Manager, addr string, i int) (addrHex, auth string) {
var err error
// Load startup keys. XXX we are going to need a different format
if !((len(addr) == 40) || (len(addr) == 42)) { // with or without 0x
var index int
index, err = strconv.Atoi(addr)
if err != nil {
utils.Fatalf("Invalid account address '%s'", addr)
}
addrHex, err = am.AddressByIndex(index)
if err != nil {
utils.Fatalf("%v", err)
}
} else {
addrHex = addr
}
addrHex = utils.ParamToAddress(addr, am)
// Attempt to unlock the account 3 times
attempts := 3
for tries := 0; tries < attempts; tries++ {