aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api/admin.go2
-rw-r--r--rpc/api/admin_args.go2
-rw-r--r--rpc/api/admin_js.go2
-rw-r--r--rpc/api/api.go2
-rw-r--r--rpc/api/api_test.go2
-rw-r--r--rpc/api/args.go2
-rw-r--r--rpc/api/args_test.go8
-rw-r--r--rpc/api/db.go2
-rw-r--r--rpc/api/db_args.go2
-rw-r--r--rpc/api/db_js.go2
-rw-r--r--rpc/api/debug.go2
-rw-r--r--rpc/api/debug_args.go2
-rw-r--r--rpc/api/debug_js.go2
-rw-r--r--rpc/api/eth.go22
-rw-r--r--rpc/api/eth_args.go14
-rw-r--r--rpc/api/eth_js.go2
-rw-r--r--rpc/api/mergedapi.go2
-rw-r--r--rpc/api/miner.go2
-rw-r--r--rpc/api/miner_args.go2
-rw-r--r--rpc/api/miner_js.go2
-rw-r--r--rpc/api/net.go2
-rw-r--r--rpc/api/net_js.go2
-rw-r--r--rpc/api/parsing.go2
-rw-r--r--rpc/api/personal.go2
-rw-r--r--rpc/api/personal_args.go2
-rw-r--r--rpc/api/personal_js.go2
-rw-r--r--rpc/api/shh.go2
-rw-r--r--rpc/api/shh_args.go2
-rw-r--r--rpc/api/ssh_js.go2
-rw-r--r--rpc/api/txpool.go2
-rw-r--r--rpc/api/txpool_js.go2
-rw-r--r--rpc/api/utils.go19
-rw-r--r--rpc/api/web3.go2
-rw-r--r--rpc/api/web3_args.go2
-rw-r--r--rpc/codec/codec.go2
-rw-r--r--rpc/codec/json.go2
-rw-r--r--rpc/codec/json_test.go2
-rw-r--r--rpc/comms/comms.go2
-rw-r--r--rpc/comms/http.go2
-rw-r--r--rpc/comms/http_net.go2
-rw-r--r--rpc/comms/inproc.go2
-rw-r--r--rpc/comms/ipc.go2
-rw-r--r--rpc/comms/ipc_unix.go2
-rw-r--r--rpc/comms/ipc_windows.go2
-rw-r--r--rpc/jeth.go2
-rw-r--r--rpc/shared/errors.go2
-rw-r--r--rpc/shared/types.go2
-rw-r--r--rpc/shared/utils.go2
-rw-r--r--rpc/xeth.go2
49 files changed, 84 insertions, 69 deletions
diff --git a/rpc/api/admin.go b/rpc/api/admin.go
index 44815ae2d..29f342ab6 100644
--- a/rpc/api/admin.go
+++ b/rpc/api/admin.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/admin_args.go b/rpc/api/admin_args.go
index a4e6713f3..e3a2f72bf 100644
--- a/rpc/api/admin_args.go
+++ b/rpc/api/admin_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/admin_js.go b/rpc/api/admin_js.go
index 847a1e840..25dbb4a8d 100644
--- a/rpc/api/admin_js.go
+++ b/rpc/api/admin_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/api.go b/rpc/api/api.go
index 07f0896a6..e03250ec6 100644
--- a/rpc/api/api.go
+++ b/rpc/api/api.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/api_test.go b/rpc/api/api_test.go
index 1b00a9d49..131ef68f8 100644
--- a/rpc/api/api_test.go
+++ b/rpc/api/api_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/args.go b/rpc/api/args.go
index a4393a41a..20f073b67 100644
--- a/rpc/api/args.go
+++ b/rpc/api/args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/args_test.go b/rpc/api/args_test.go
index fdaa38864..23ae2930d 100644
--- a/rpc/api/args_test.go
+++ b/rpc/api/args_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
@@ -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/db.go b/rpc/api/db.go
index 5371572b1..0eddc410e 100644
--- a/rpc/api/db.go
+++ b/rpc/api/db.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/db_args.go b/rpc/api/db_args.go
index b6d38cbbd..d61ea77ee 100644
--- a/rpc/api/db_args.go
+++ b/rpc/api/db_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/db_js.go b/rpc/api/db_js.go
index 09e3401d0..899f8abd9 100644
--- a/rpc/api/db_js.go
+++ b/rpc/api/db_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/debug.go b/rpc/api/debug.go
index 396584765..cdacd6c62 100644
--- a/rpc/api/debug.go
+++ b/rpc/api/debug.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/debug_args.go b/rpc/api/debug_args.go
index edc4003ec..041ad6b6a 100644
--- a/rpc/api/debug_args.go
+++ b/rpc/api/debug_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/debug_js.go b/rpc/api/debug_js.go
index 7afc414d4..0eb9f97f1 100644
--- a/rpc/api/debug_js.go
+++ b/rpc/api/debug_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index a94279b65..4041811f0 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
@@ -21,8 +21,9 @@ import (
"encoding/json"
"math/big"
+ "fmt"
+
"github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared"
@@ -322,7 +323,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
}
}
@@ -578,14 +579,17 @@ func (self *ethApi) Resend(req *shared.Request) (interface{}, error) {
return nil, shared.NewDecodeParamError(err.Error())
}
- ret, err := self.xeth.Transact(args.Tx.From, args.Tx.To, args.Tx.Nonce, args.Tx.Value, args.GasLimit, args.GasPrice, args.Tx.Data)
- if err != nil {
- return nil, err
- }
+ from := common.HexToAddress(args.Tx.From)
- self.ethereum.TxPool().RemoveTransactions(types.Transactions{args.Tx.tx})
+ pending := self.ethereum.TxPool().GetTransactions()
+ for _, p := range pending {
+ if pFrom, err := p.From(); err == nil && pFrom == from && p.SigHash() == args.Tx.tx.SigHash() {
+ self.ethereum.TxPool().RemoveTx(common.HexToHash(args.Tx.Hash))
+ return self.xeth.Transact(args.Tx.From, args.Tx.To, args.Tx.Nonce, args.Tx.Value, args.GasLimit, args.GasPrice, args.Tx.Data)
+ }
+ }
- return ret, nil
+ return nil, fmt.Errorf("Transaction %s not found", args.Tx.Hash)
}
func (self *ethApi) PendingTransactions(req *shared.Request) (interface{}, error) {
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 256313472..1218bd625 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
@@ -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
@@ -888,6 +884,7 @@ type tx struct {
Data string
GasLimit string
GasPrice string
+ Hash string
}
func newTx(t *types.Transaction) *tx {
@@ -906,6 +903,7 @@ func newTx(t *types.Transaction) *tx {
Data: "0x" + common.Bytes2Hex(t.Data()),
GasLimit: t.Gas().String(),
GasPrice: t.GasPrice().String(),
+ Hash: t.Hash().Hex(),
}
}
@@ -931,6 +929,12 @@ func (tx *tx) UnmarshalJSON(b []byte) (err error) {
contractCreation = true
)
+ if val, found := fields["Hash"]; found {
+ if hashVal, ok := val.(string); ok {
+ tx.Hash = hashVal
+ }
+ }
+
if val, found := fields["To"]; found {
if strVal, ok := val.(string); ok && len(strVal) > 0 {
tx.To = strVal
diff --git a/rpc/api/eth_js.go b/rpc/api/eth_js.go
index d80e6f4d8..393dac22f 100644
--- a/rpc/api/eth_js.go
+++ b/rpc/api/eth_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/mergedapi.go b/rpc/api/mergedapi.go
index 7ed8cfedb..8f4ef8e60 100644
--- a/rpc/api/mergedapi.go
+++ b/rpc/api/mergedapi.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/miner.go b/rpc/api/miner.go
index 12203ffe0..3c3d1ee0b 100644
--- a/rpc/api/miner.go
+++ b/rpc/api/miner.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/miner_args.go b/rpc/api/miner_args.go
index f19411a70..5ceb244fe 100644
--- a/rpc/api/miner_args.go
+++ b/rpc/api/miner_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/miner_js.go b/rpc/api/miner_js.go
index be4257447..0998a9f41 100644
--- a/rpc/api/miner_js.go
+++ b/rpc/api/miner_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/net.go b/rpc/api/net.go
index 93ea77c65..39c230e14 100644
--- a/rpc/api/net.go
+++ b/rpc/api/net.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/net_js.go b/rpc/api/net_js.go
index 99052b115..2ee1f0041 100644
--- a/rpc/api/net_js.go
+++ b/rpc/api/net_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/parsing.go b/rpc/api/parsing.go
index 3f1f79e22..0698e8dbe 100644
--- a/rpc/api/parsing.go
+++ b/rpc/api/parsing.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/personal.go b/rpc/api/personal.go
index e4fe329a0..e9942c1e5 100644
--- a/rpc/api/personal.go
+++ b/rpc/api/personal.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/personal_args.go b/rpc/api/personal_args.go
index 5224d2411..7f00701e3 100644
--- a/rpc/api/personal_args.go
+++ b/rpc/api/personal_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/personal_js.go b/rpc/api/personal_js.go
index cb94c7cfb..81c5d4a36 100644
--- a/rpc/api/personal_js.go
+++ b/rpc/api/personal_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/shh.go b/rpc/api/shh.go
index e55b0ae17..9ca6f9dda 100644
--- a/rpc/api/shh.go
+++ b/rpc/api/shh.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/shh_args.go b/rpc/api/shh_args.go
index 42508a2c8..468a0b98f 100644
--- a/rpc/api/shh_args.go
+++ b/rpc/api/shh_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/ssh_js.go b/rpc/api/ssh_js.go
index 02ff7a1e5..a92ad1644 100644
--- a/rpc/api/ssh_js.go
+++ b/rpc/api/ssh_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/txpool.go b/rpc/api/txpool.go
index b75f33f34..27e40cae5 100644
--- a/rpc/api/txpool.go
+++ b/rpc/api/txpool.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/txpool_js.go b/rpc/api/txpool_js.go
index 4856683b0..b6c29871a 100644
--- a/rpc/api/txpool_js.go
+++ b/rpc/api/txpool_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/utils.go b/rpc/api/utils.go
index a35dc3cb9..50c607d16 100644
--- a/rpc/api/utils.go
+++ b/rpc/api/utils.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
@@ -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",
diff --git a/rpc/api/web3.go b/rpc/api/web3.go
index 8666a0634..e2d8543d3 100644
--- a/rpc/api/web3.go
+++ b/rpc/api/web3.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/api/web3_args.go b/rpc/api/web3_args.go
index 8c0cb135b..9e39f7130 100644
--- a/rpc/api/web3_args.go
+++ b/rpc/api/web3_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/codec/codec.go b/rpc/codec/codec.go
index 504907622..2fdb0d8f3 100644
--- a/rpc/codec/codec.go
+++ b/rpc/codec/codec.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/codec/json.go b/rpc/codec/json.go
index dbac95436..d811b2096 100644
--- a/rpc/codec/json.go
+++ b/rpc/codec/json.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/codec/json_test.go b/rpc/codec/json_test.go
index 28533af66..01ef77e57 100644
--- a/rpc/codec/json_test.go
+++ b/rpc/codec/json_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/comms/comms.go b/rpc/comms/comms.go
index b2955d7c2..f5eeae84f 100644
--- a/rpc/comms/comms.go
+++ b/rpc/comms/comms.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/comms/http.go b/rpc/comms/http.go
index 91eacca91..108ba0c5f 100644
--- a/rpc/comms/http.go
+++ b/rpc/comms/http.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/comms/http_net.go b/rpc/comms/http_net.go
index 4eec824ac..dba2029d4 100644
--- a/rpc/comms/http_net.go
+++ b/rpc/comms/http_net.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/comms/inproc.go b/rpc/comms/inproc.go
index 2a92f12f5..f279f0163 100644
--- a/rpc/comms/inproc.go
+++ b/rpc/comms/inproc.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/comms/ipc.go b/rpc/comms/ipc.go
index 2b5fc8b6c..0250aa01e 100644
--- a/rpc/comms/ipc.go
+++ b/rpc/comms/ipc.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/comms/ipc_unix.go b/rpc/comms/ipc_unix.go
index 2504058f9..aff90cfaa 100644
--- a/rpc/comms/ipc_unix.go
+++ b/rpc/comms/ipc_unix.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/comms/ipc_windows.go b/rpc/comms/ipc_windows.go
index 991882160..ee49f069b 100644
--- a/rpc/comms/ipc_windows.go
+++ b/rpc/comms/ipc_windows.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/jeth.go b/rpc/jeth.go
index 56fd72568..07add2bad 100644
--- a/rpc/jeth.go
+++ b/rpc/jeth.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/shared/errors.go b/rpc/shared/errors.go
index 97872f463..85af1bb2f 100644
--- a/rpc/shared/errors.go
+++ b/rpc/shared/errors.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/shared/types.go b/rpc/shared/types.go
index 9c791f4c7..659b74bf6 100644
--- a/rpc/shared/types.go
+++ b/rpc/shared/types.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/shared/utils.go b/rpc/shared/utils.go
index 33639cc35..b13e9eb1b 100644
--- a/rpc/shared/utils.go
+++ b/rpc/shared/utils.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.
diff --git a/rpc/xeth.go b/rpc/xeth.go
index beb20ecd9..65a1edeb8 100644
--- a/rpc/xeth.go
+++ b/rpc/xeth.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// 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.