aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/api/utils.go
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-09-22 16:34:58 +0800
committerzelig <viktor.tron@gmail.com>2015-10-22 06:22:39 +0800
commit8b81ad1fc40080af441c0c6df94f0b2ea46e320b (patch)
tree7d8817ec84be38b911f967f1ecd5618d02e4caa9 /rpc/api/utils.go
parent58d0752fdd1c7363fb1a127cd7e0a86d7602be02 (diff)
downloadgo-tangerine-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar
go-tangerine-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.gz
go-tangerine-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.bz2
go-tangerine-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.lz
go-tangerine-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.xz
go-tangerine-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.zst
go-tangerine-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.zip
console:
* 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
Diffstat (limited to 'rpc/api/utils.go')
-rw-r--r--rpc/api/utils.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/rpc/api/utils.go b/rpc/api/utils.go
index 76b2c531d..719cb8074 100644
--- a/rpc/api/utils.go
+++ b/rpc/api/utils.go
@@ -33,14 +33,21 @@ var (
"admin": []string{
"addPeer",
"datadir",
+ "enableUserAgent",
"exportChain",
"getContractInfo",
+ "httpGet",
"importChain",
"nodeInfo",
"peers",
"register",
"registerUrl",
+ "saveInfo",
+ "setGlobalRegistrar",
+ "setHashReg",
+ "setUrlHint",
"setSolc",
+ "sleep",
"sleepBlocks",
"startNatSpec",
"startRPC",
@@ -146,7 +153,7 @@ var (
)
// Parse a comma separated API string to individual api's
-func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth.Ethereum) ([]shared.EthereumApi, error) {
+func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth.Ethereum, docRoot string) ([]shared.EthereumApi, error) {
if len(strings.TrimSpace(apistr)) == 0 {
return nil, fmt.Errorf("Empty apistr provided")
}
@@ -157,7 +164,7 @@ func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth.
for i, name := range names {
switch strings.ToLower(strings.TrimSpace(name)) {
case shared.AdminApiName:
- apis[i] = NewAdminApi(xeth, eth, codec)
+ apis[i] = NewAdminApi(xeth, eth, codec, docRoot)
case shared.DebugApiName:
apis[i] = NewDebugApi(xeth, eth, codec)
case shared.DbApiName: