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
86 lines
2.2 KiB
Go
86 lines
2.2 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 (
|
|
"encoding/json"
|
|
|
|
"github.com/ethereum/go-ethereum/rpc/shared"
|
|
)
|
|
|
|
type NewAccountArgs struct {
|
|
Passphrase *string
|
|
}
|
|
|
|
func (args *NewAccountArgs) UnmarshalJSON(b []byte) (err error) {
|
|
var obj []interface{}
|
|
if err := json.Unmarshal(b, &obj); err != nil {
|
|
return shared.NewDecodeParamError(err.Error())
|
|
}
|
|
|
|
if len(obj) >= 1 && obj[0] != nil {
|
|
if passphrasestr, ok := obj[0].(string); ok {
|
|
args.Passphrase = &passphrasestr
|
|
} else {
|
|
return shared.NewInvalidTypeError("passphrase", "not a string")
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
type UnlockAccountArgs struct {
|
|
Address string
|
|
Passphrase *string
|
|
Duration int
|
|
}
|
|
|
|
func (args *UnlockAccountArgs) UnmarshalJSON(b []byte) (err error) {
|
|
var obj []interface{}
|
|
if err := json.Unmarshal(b, &obj); err != nil {
|
|
return shared.NewDecodeParamError(err.Error())
|
|
}
|
|
|
|
args.Duration = 0
|
|
|
|
if len(obj) < 1 {
|
|
return shared.NewInsufficientParamsError(len(obj), 1)
|
|
}
|
|
|
|
if addrstr, ok := obj[0].(string); ok {
|
|
args.Address = addrstr
|
|
} else {
|
|
return shared.NewInvalidTypeError("address", "not a string")
|
|
}
|
|
|
|
if len(obj) >= 2 && obj[1] != nil {
|
|
if passphrasestr, ok := obj[1].(string); ok {
|
|
args.Passphrase = &passphrasestr
|
|
} else {
|
|
return shared.NewInvalidTypeError("passphrase", "not a string")
|
|
}
|
|
}
|
|
|
|
if len(obj) >= 3 && obj[2] != nil {
|
|
if duration, ok := obj[2].(float64); ok {
|
|
args.Duration = int(duration)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|