diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-13 01:00:35 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-13 01:00:35 +0800 |
| commit | d6357aa616715df1e98cfb90c3aa5372e15cc24b (patch) | |
| tree | 3f1792e7d71a82de0ceb6047eaf87f2f72aa82ff /cmd/geth/admin.go | |
| parent | 58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd (diff) | |
| parent | e389585f1f2e77fd7cd507499015bf3754581e4e (diff) | |
| download | dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.gz dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.bz2 dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.lz dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.xz dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.zst dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.zip | |
Merge pull request #631 from Gustav-Simonsson/improve_key_store_crypto
Improve key store crypto
Diffstat (limited to 'cmd/geth/admin.go')
| -rw-r--r-- | cmd/geth/admin.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index b0cb7507a..15923c366 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -126,7 +126,7 @@ func (js *jsre) pendingTransactions(call otto.FunctionCall) otto.Value { // Add the accouns to a new set accountSet := set.New() for _, account := range accounts { - accountSet.Add(common.BytesToAddress(account.Address)) + accountSet.Add(account.Address) } //ltxs := make([]*tx, len(txs)) @@ -391,7 +391,7 @@ func (js *jsre) unlock(call otto.FunctionCall) otto.Value { } } am := js.ethereum.AccountManager() - err = am.TimedUnlock(common.FromHex(addr), passphrase, time.Duration(seconds)*time.Second) + err = am.TimedUnlock(common.HexToAddress(addr), passphrase, time.Duration(seconds)*time.Second) if err != nil { fmt.Printf("Unlock account failed '%v'\n", err) return otto.FalseValue() @@ -433,7 +433,7 @@ func (js *jsre) newAccount(call otto.FunctionCall) otto.Value { fmt.Printf("Could not create the account: %v", err) return otto.UndefinedValue() } - return js.re.ToVal(common.ToHex(acct.Address)) + return js.re.ToVal(acct.Address.Hex()) } func (js *jsre) nodeInfo(call otto.FunctionCall) otto.Value { |