4 files changed, 16 insertions, 13 deletions
diff --git a/rpc/api/args_test.go b/rpc/api/args_test.go
index bb279718b..23ae2930d 100644
--- a/rpc/api/args_test.go
+++ b/rpc/api/args_test.go
@@ -935,9 +935,9 @@ func TestCallArgsNotStrings(t *testing.T) {
 func TestCallArgsToEmpty(t *testing.T) {
 	input := `[{"from": "0xb60e8dd61c5d32be8058bb8eb970870f07233155"}]`
 	args := new(CallArgs)
-	str := ExpectValidationError(json.Unmarshal([]byte(input), &args))
-	if len(str) > 0 {
-		t.Error(str)
+	err := json.Unmarshal([]byte(input), &args)
+	if err != nil {
+		t.Error("Did not expect error. Got", err)
 	}
 }
 
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index ed636004c..328cd4f19 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -322,7 +322,7 @@ func (self *ethApi) EstimateGas(req *shared.Request) (interface{}, error) {
 	if len(gas) == 0 {
 		return newHexNum(0), nil
 	} else {
-		return newHexNum(gas), nil
+		return newHexNum(common.String2Big(gas)), err
 	}
 }
 
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index ae394e7ec..2f864b5c1 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -469,10 +469,6 @@ func (args *CallArgs) UnmarshalJSON(b []byte) (err error) {
 	}
 
 	args.From = ext.From
-
-	if len(ext.To) == 0 {
-		return shared.NewValidationError("to", "is required")
-	}
 	args.To = ext.To
 
 	var num *big.Int
diff --git a/rpc/api/utils.go b/rpc/api/utils.go
index a791dcd65..50c607d16 100644
--- a/rpc/api/utils.go
+++ b/rpc/api/utils.go
@@ -32,16 +32,22 @@ var (
 	AutoCompletion = map[string][]string{
 		"admin": []string{
 			"addPeer",
-			"peers",
-			"nodeInfo",
+			"chainSyncStatus",
+			"datadir",
 			"exportChain",
+			"getContractInfo",
 			"importChain",
-			"verbosity",
-			"chainSyncStatus",
+			"nodeInfo",
+			"peers",
+			"register",
+			"registerUrl",
 			"setSolc",
-			"datadir",
+			"sleepBlocks",
+			"startNatSpec",
 			"startRPC",
+			"stopNatSpec",
 			"stopRPC",
+			"verbosity",
 		},
 		"db": []string{
 			"getString",
@@ -97,6 +103,7 @@ var (
 		"miner": []string{
 			"hashrate",
 			"makeDAG",
+			"setEtherbase",
 			"setExtra",
 			"setGasPrice",
 			"startAutoDAG",