Renamed etherpc to ethrpc
This commit is contained in:
Maran
parent
9b1f11695d
commit
a4ca9927ab
@ -4,7 +4,7 @@ import (
|
||||
"container/list"
|
||||
"github.com/ethereum/eth-go/ethchain"
|
||||
"github.com/ethereum/eth-go/ethdb"
|
||||
"github.com/ethereum/eth-go/etherpc"
|
||||
"github.com/ethereum/eth-go/ethrpc"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
"github.com/ethereum/eth-go/ethwire"
|
||||
"io/ioutil"
|
||||
@ -64,7 +64,7 @@ type Ethereum struct {
|
||||
|
||||
reactor *ethutil.ReactorEngine
|
||||
|
||||
RpcServer *etherpc.JsonRpcServer
|
||||
RpcServer *ethrpc.JsonRpcServer
|
||||
}
|
||||
|
||||
func New(caps Caps, usePnp bool) (*Ethereum, error) {
|
||||
|
||||
@ -1,215 +0,0 @@
|
||||
package etherpc
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"github.com/ethereum/eth-go/ethpub"
|
||||
_ "log"
|
||||
)
|
||||
|
||||
type EthereumApi struct {
|
||||
ethp *ethpub.PEthereum
|
||||
}
|
||||
|
||||
type JsonArgs interface {
|
||||
requirements() error
|
||||
}
|
||||
|
||||
type BlockResponse struct {
|
||||
JsonResponse
|
||||
}
|
||||
type GetBlockArgs struct {
|
||||
BlockNumber int
|
||||
Hash string
|
||||
}
|
||||
|
||||
type ErrorResponse struct {
|
||||
Error bool `json:"error"`
|
||||
ErrorText string `json:"errorText"`
|
||||
}
|
||||
|
||||
type JsonResponse interface {
|
||||
}
|
||||
|
||||
type SuccessRes struct {
|
||||
Error bool `json:"error"`
|
||||
Result JsonResponse `json:"result"`
|
||||
}
|
||||
|
||||
func NewSuccessRes(object JsonResponse) string {
|
||||
e := SuccessRes{Error: false, Result: object}
|
||||
res, err := json.Marshal(e)
|
||||
if err != nil {
|
||||
// This should never happen
|
||||
panic("Creating json error response failed, help")
|
||||
}
|
||||
success := string(res)
|
||||
return success
|
||||
}
|
||||
|
||||
func NewErrorResponse(msg string) error {
|
||||
e := ErrorResponse{Error: true, ErrorText: msg}
|
||||
res, err := json.Marshal(e)
|
||||
if err != nil {
|
||||
// This should never happen
|
||||
panic("Creating json error response failed, help")
|
||||
}
|
||||
newErr := errors.New(string(res))
|
||||
return newErr
|
||||
}
|
||||
|
||||
func (b *GetBlockArgs) requirements() error {
|
||||
if b.BlockNumber == 0 && b.Hash == "" {
|
||||
return NewErrorResponse("GetBlock requires either a block 'number' or a block 'hash' as argument")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *string) error {
|
||||
err := args.requirements()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// Do something
|
||||
block := p.ethp.GetBlock(args.Hash)
|
||||
*reply = NewSuccessRes(block)
|
||||
return nil
|
||||
}
|
||||
|
||||
type NewTxArgs struct {
|
||||
Sec string
|
||||
Recipient string
|
||||
Value string
|
||||
Gas string
|
||||
GasPrice string
|
||||
Init string
|
||||
Body string
|
||||
}
|
||||
type TxResponse struct {
|
||||
Hash string
|
||||
}
|
||||
|
||||
func (a *NewTxArgs) requirements() error {
|
||||
if a.Recipient == "" {
|
||||
return NewErrorResponse("Transact requires a 'recipient' address as argument")
|
||||
}
|
||||
if a.Value == "" {
|
||||
return NewErrorResponse("Transact requires a 'value' as argument")
|
||||
}
|
||||
if a.Gas == "" {
|
||||
return NewErrorResponse("Transact requires a 'gas' value as argument")
|
||||
}
|
||||
if a.GasPrice == "" {
|
||||
return NewErrorResponse("Transact requires a 'gasprice' value as argument")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *NewTxArgs) requirementsContract() error {
|
||||
if a.Value == "" {
|
||||
return NewErrorResponse("Create requires a 'value' as argument")
|
||||
}
|
||||
if a.Gas == "" {
|
||||
return NewErrorResponse("Create requires a 'gas' value as argument")
|
||||
}
|
||||
if a.GasPrice == "" {
|
||||
return NewErrorResponse("Create requires a 'gasprice' value as argument")
|
||||
}
|
||||
if a.Body == "" {
|
||||
return NewErrorResponse("Create requires a 'body' value as argument")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *EthereumApi) Transact(args *NewTxArgs, reply *string) error {
|
||||
err := args.requirements()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
result, _ := p.ethp.Transact(p.ethp.GetKey().PrivateKey, args.Recipient, args.Value, args.Gas, args.GasPrice, args.Body)
|
||||
*reply = NewSuccessRes(result)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *EthereumApi) Create(args *NewTxArgs, reply *string) error {
|
||||
err := args.requirementsContract()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
result, _ := p.ethp.Create(p.ethp.GetKey().PrivateKey, args.Value, args.Gas, args.GasPrice, args.Init, args.Body)
|
||||
*reply = NewSuccessRes(result)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *EthereumApi) GetKey(args interface{}, reply *string) error {
|
||||
*reply = NewSuccessRes(p.ethp.GetKey())
|
||||
return nil
|
||||
}
|
||||
|
||||
type GetStorageArgs struct {
|
||||
Address string
|
||||
Key string
|
||||
}
|
||||
|
||||
func (a *GetStorageArgs) requirements() error {
|
||||
if a.Address == "" {
|
||||
return NewErrorResponse("GetStorageAt requires an 'address' value as argument")
|
||||
}
|
||||
if a.Key == "" {
|
||||
return NewErrorResponse("GetStorageAt requires an 'key' value as argument")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type GetStorageAtRes struct {
|
||||
Key string `json:"key"`
|
||||
Value string `json:"value"`
|
||||
Address string `json:"address"`
|
||||
}
|
||||
|
||||
func (p *EthereumApi) GetStorageAt(args *GetStorageArgs, reply *string) error {
|
||||
err := args.requirements()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
state := p.ethp.GetStateObject(args.Address)
|
||||
value := state.GetStorage(args.Key)
|
||||
*reply = NewSuccessRes(GetStorageAtRes{Address: args.Address, Key: args.Key, Value: value})
|
||||
return nil
|
||||
}
|
||||
|
||||
type GetBalanceArgs struct {
|
||||
Address string
|
||||
}
|
||||
|
||||
func (a *GetBalanceArgs) requirements() error {
|
||||
if a.Address == "" {
|
||||
return NewErrorResponse("GetBalanceAt requires an 'address' value as argument")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type BalanceRes struct {
|
||||
Balance string `json:"balance"`
|
||||
Address string `json:"address"`
|
||||
}
|
||||
|
||||
func (p *EthereumApi) GetBalanceAt(args *GetBalanceArgs, reply *string) error {
|
||||
err := args.requirements()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
state := p.ethp.GetStateObject(args.Address)
|
||||
*reply = NewSuccessRes(BalanceRes{Balance: state.Value(), Address: args.Address})
|
||||
return nil
|
||||
}
|
||||
|
||||
type TestRes struct {
|
||||
JsonResponse `json:"-"`
|
||||
Answer int `json:"answer"`
|
||||
}
|
||||
|
||||
func (p *EthereumApi) Test(args *GetBlockArgs, reply *string) error {
|
||||
*reply = NewSuccessRes(TestRes{Answer: 15})
|
||||
return nil
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
package etherpc
|
||||
|
||||
import (
|
||||
"github.com/ethereum/eth-go/ethpub"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
"net"
|
||||
"net/rpc"
|
||||
"net/rpc/jsonrpc"
|
||||
)
|
||||
|
||||
type JsonRpcServer struct {
|
||||
quit chan bool
|
||||
listener net.Listener
|
||||
ethp *ethpub.PEthereum
|
||||
}
|
||||
|
||||
func (s *JsonRpcServer) exitHandler() {
|
||||
out:
|
||||
for {
|
||||
select {
|
||||
case <-s.quit:
|
||||
s.listener.Close()
|
||||
break out
|
||||
}
|
||||
}
|
||||
|
||||
ethutil.Config.Log.Infoln("[JSON] Shutdown JSON-RPC server")
|
||||
}
|
||||
|
||||
func (s *JsonRpcServer) Stop() {
|
||||
close(s.quit)
|
||||
}
|
||||
|
||||
func (s *JsonRpcServer) Start() {
|
||||
ethutil.Config.Log.Infoln("[JSON] Starting JSON-RPC server")
|
||||
go s.exitHandler()
|
||||
rpc.Register(&EthereumApi{ethp: s.ethp})
|
||||
rpc.HandleHTTP()
|
||||
|
||||
for {
|
||||
conn, err := s.listener.Accept()
|
||||
if err != nil {
|
||||
ethutil.Config.Log.Infoln("[JSON] Error starting JSON-RPC:", err)
|
||||
break
|
||||
}
|
||||
ethutil.Config.Log.Debugln("[JSON] Incoming request.")
|
||||
go jsonrpc.ServeConn(conn)
|
||||
}
|
||||
}
|
||||
|
||||
func NewJsonRpcServer(ethp *ethpub.PEthereum) *JsonRpcServer {
|
||||
l, err := net.Listen("tcp", ":30304")
|
||||
if err != nil {
|
||||
ethutil.Config.Log.Infoln("Error starting JSON-RPC")
|
||||
}
|
||||
|
||||
return &JsonRpcServer{
|
||||
listener: l,
|
||||
quit: make(chan bool),
|
||||
ethp: ethp,
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user