8b81ad1fc4
* lines with leading space are ommitted from history * exit processed even with whitespace around * all whitespace lines (not only empty ones) are ignored add 7 missing commands to admin api autocomplete registrar: methods now return proper error if reg addresses are not set. fixes #1457 rpc/console: fix personal.newAccount() regression. Now all comms accept interactive password registrar: add registrar tests for errors crypto: catch AES decryption error on presale wallet import + fix error msg format. fixes #1580 CLI: improve error message when starting a second instance of geth. fixes #1564 cli/accounts: unlock multiple accounts. fixes #1785 * make unlocking multiple accounts work with inline <() fd * passwdfile now correctly read only once * improve logs * fix CLI help text for unlocking fix regression with docRoot / admin API * docRoot/jspath passed to rpc/api ParseApis, which passes onto adminApi * docRoot field for JS console in order to pass when RPC is (re)started * improve flag desc for jspath common/docserver: catch http errors from response fix rpc/api tests common/natspec: fix end to end test (skipped because takes 8s) registrar: fix major regression: * deploy registrars on frontier * register HashsReg and UrlHint in GlobalRegistrar. * set all 3 contract addresses in code * zero out addresses first in tests
140 lines
3.8 KiB
Go
140 lines
3.8 KiB
Go
// Copyright 2015 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package api
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/eth"
|
|
"github.com/ethereum/go-ethereum/rpc/codec"
|
|
"github.com/ethereum/go-ethereum/rpc/shared"
|
|
"github.com/ethereum/go-ethereum/xeth"
|
|
)
|
|
|
|
const (
|
|
PersonalApiVersion = "1.0"
|
|
)
|
|
|
|
var (
|
|
// mapping between methods and handlers
|
|
personalMapping = map[string]personalhandler{
|
|
"personal_listAccounts": (*personalApi).ListAccounts,
|
|
"personal_newAccount": (*personalApi).NewAccount,
|
|
"personal_unlockAccount": (*personalApi).UnlockAccount,
|
|
}
|
|
)
|
|
|
|
// net callback handler
|
|
type personalhandler func(*personalApi, *shared.Request) (interface{}, error)
|
|
|
|
// net api provider
|
|
type personalApi struct {
|
|
xeth *xeth.XEth
|
|
ethereum *eth.Ethereum
|
|
methods map[string]personalhandler
|
|
codec codec.ApiCoder
|
|
}
|
|
|
|
// create a new net api instance
|
|
func NewPersonalApi(xeth *xeth.XEth, eth *eth.Ethereum, coder codec.Codec) *personalApi {
|
|
return &personalApi{
|
|
xeth: xeth,
|
|
ethereum: eth,
|
|
methods: personalMapping,
|
|
codec: coder.New(nil),
|
|
}
|
|
}
|
|
|
|
// collection with supported methods
|
|
func (self *personalApi) Methods() []string {
|
|
methods := make([]string, len(self.methods))
|
|
i := 0
|
|
for k := range self.methods {
|
|
methods[i] = k
|
|
i++
|
|
}
|
|
return methods
|
|
}
|
|
|
|
// Execute given request
|
|
func (self *personalApi) Execute(req *shared.Request) (interface{}, error) {
|
|
if callback, ok := self.methods[req.Method]; ok {
|
|
return callback(self, req)
|
|
}
|
|
|
|
return nil, shared.NewNotImplementedError(req.Method)
|
|
}
|
|
|
|
func (self *personalApi) Name() string {
|
|
return shared.PersonalApiName
|
|
}
|
|
|
|
func (self *personalApi) ApiVersion() string {
|
|
return PersonalApiVersion
|
|
}
|
|
|
|
func (self *personalApi) ListAccounts(req *shared.Request) (interface{}, error) {
|
|
return self.xeth.Accounts(), nil
|
|
}
|
|
|
|
func (self *personalApi) NewAccount(req *shared.Request) (interface{}, error) {
|
|
args := new(NewAccountArgs)
|
|
if err := self.codec.Decode(req.Params, &args); err != nil {
|
|
return nil, shared.NewDecodeParamError(err.Error())
|
|
}
|
|
var passwd string
|
|
if args.Passphrase == nil {
|
|
fe := self.xeth.Frontend()
|
|
if fe == nil {
|
|
return false, fmt.Errorf("unable to create account: unable to interact with user")
|
|
}
|
|
var ok bool
|
|
passwd, ok = fe.AskPassword()
|
|
if !ok {
|
|
return false, fmt.Errorf("unable to create account: no password given")
|
|
}
|
|
} else {
|
|
passwd = *args.Passphrase
|
|
}
|
|
am := self.ethereum.AccountManager()
|
|
acc, err := am.NewAccount(passwd)
|
|
return acc.Address.Hex(), err
|
|
}
|
|
|
|
func (self *personalApi) UnlockAccount(req *shared.Request) (interface{}, error) {
|
|
args := new(UnlockAccountArgs)
|
|
if err := self.codec.Decode(req.Params, &args); err != nil {
|
|
return nil, shared.NewDecodeParamError(err.Error())
|
|
}
|
|
|
|
if args.Passphrase == nil {
|
|
fe := self.xeth.Frontend()
|
|
if fe == nil {
|
|
return false, fmt.Errorf("No password provided")
|
|
}
|
|
return fe.UnlockAccount(common.HexToAddress(args.Address).Bytes()), nil
|
|
}
|
|
|
|
am := self.ethereum.AccountManager()
|
|
addr := common.HexToAddress(args.Address)
|
|
|
|
err := am.TimedUnlock(addr, *args.Passphrase, time.Duration(args.Duration)*time.Second)
|
|
return err == nil, err
|
|
}
|