aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/packages.go
diff options
context:
space:
mode:
Diffstat (limited to 'rpc/packages.go')
-rw-r--r--rpc/packages.go379
1 files changed, 220 insertions, 159 deletions
diff --git a/rpc/packages.go b/rpc/packages.go
index 5535e6e79..d371c4ca1 100644
--- a/rpc/packages.go
+++ b/rpc/packages.go
@@ -1,8 +1,32 @@
+/*
+ This file is part of go-ethereum
+
+ go-ethereum is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ go-ethereum 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+*/
+/*
+
+For each request type, define the following:
+
+1. RpcRequest "To" method [message.go], which does basic validation and conversion to "Args" type via json.Decoder()
+2. json.Decoder() calls "UnmarshalJSON" defined on each "Args" struct
+3. EthereumApi method, taking the "Args" type and replying with an interface to be marshalled to JSON
+
+*/
package rpc
import (
"encoding/json"
- "errors"
"math/big"
"strings"
@@ -14,82 +38,170 @@ type EthereumApi struct {
pipe *xeth.JSXEth
}
-type JsonArgs interface {
- requirements() error
-}
+func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *interface{}) error {
+ err := args.requirements()
+ if err != nil {
+ return err
+ }
-type BlockResponse struct {
- JsonResponse
+ if args.BlockNumber > 0 {
+ *reply = p.pipe.BlockByNumber(args.BlockNumber)
+ } else {
+ *reply = p.pipe.BlockByHash(args.Hash)
+ }
+ return nil
}
-type GetBlockArgs struct {
- BlockNumber int
- Hash string
+
+func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error {
+ err := args.requirements()
+ if err != nil {
+ return err
+ }
+ result, _ := p.pipe.Transact(p.pipe.Key().PrivateKey, args.Recipient, args.Value, args.Gas, args.GasPrice, args.Body)
+ *reply = result
+ return nil
}
-type ErrorResponse struct {
- Error bool `json:"error"`
- ErrorText string `json:"errorText"`
+func (p *EthereumApi) Create(args *NewTxArgs, reply *interface{}) error {
+ err := args.requirementsContract()
+ if err != nil {
+ return err
+ }
+
+ result, _ := p.pipe.Transact(p.pipe.Key().PrivateKey, "", args.Value, args.Gas, args.GasPrice, args.Body)
+ *reply = result
+ return nil
}
-type JsonResponse interface {
+func (p *EthereumApi) PushTx(args *PushTxArgs, reply *interface{}) error {
+ err := args.requirementsPushTx()
+ if err != nil {
+ return err
+ }
+ result, _ := p.pipe.PushTx(args.Tx)
+ *reply = result
+ return nil
}
-type SuccessRes struct {
- Error bool `json:"error"`
- Result JsonResponse `json:"result"`
+func (p *EthereumApi) GetKey(args interface{}, reply *interface{}) error {
+ *reply = p.pipe.Key()
+ return nil
}
-func NewSuccessRes(object JsonResponse) string {
- e := SuccessRes{Error: false, Result: object}
- res, err := json.Marshal(e)
+func (p *EthereumApi) GetStorageAt(args *GetStorageArgs, reply *interface{}) error {
+ err := args.requirements()
if err != nil {
- // This should never happen
- panic("Creating json error response failed, help")
+ return err
}
- success := string(res)
- return success
+
+ state := p.pipe.World().SafeGet(ethutil.Hex2Bytes(args.Address))
+
+ var hx string
+ if strings.Index(args.Key, "0x") == 0 {
+ hx = string([]byte(args.Key)[2:])
+ } else {
+ // Convert the incoming string (which is a bigint) into hex
+ i, _ := new(big.Int).SetString(args.Key, 10)
+ hx = ethutil.Bytes2Hex(i.Bytes())
+ }
+ jsonlogger.Debugf("GetStorageAt(%s, %s)\n", args.Address, hx)
+ value := state.Storage(ethutil.Hex2Bytes(hx))
+ *reply = GetStorageAtRes{Address: args.Address, Key: args.Key, Value: value.Str()}
+ return nil
+}
+
+func (p *EthereumApi) GetPeerCount(reply *interface{}) error {
+ *reply = p.pipe.PeerCount()
+ return nil
+}
+
+func (p *EthereumApi) GetIsListening(reply *interface{}) error {
+ *reply = p.pipe.IsListening()
+ return nil
}
-func NewErrorResponse(msg string) error {
- e := ErrorResponse{Error: true, ErrorText: msg}
- res, err := json.Marshal(e)
+func (p *EthereumApi) GetCoinbase(reply *interface{}) error {
+ *reply = p.pipe.CoinBase()
+ return nil
+}
+
+func (p *EthereumApi) GetIsMining(reply *interface{}) error {
+ *reply = p.pipe.IsMining()
+ return nil
+}
+
+func (p *EthereumApi) GetTxCountAt(args *GetTxCountArgs, reply *interface{}) error {
+ err := args.requirements()
if err != nil {
- // This should never happen
- panic("Creating json error response failed, help")
+ return err
}
- newErr := errors.New(string(res))
- return newErr
+ *reply = p.pipe.TxCountAt(args.Address)
+ return nil
}
-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")
+func (p *EthereumApi) GetBalanceAt(args *GetBalanceArgs, reply *interface{}) error {
+ err := args.requirements()
+ if err != nil {
+ return err
}
+ state := p.pipe.World().SafeGet(ethutil.Hex2Bytes(args.Address))
+ *reply = BalanceRes{Balance: state.Balance().String(), Address: args.Address}
return nil
}
-func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *string) error {
+func (p *EthereumApi) GetCodeAt(args *GetCodeAtArgs, reply *interface{}) error {
err := args.requirements()
if err != nil {
return err
}
+ *reply = p.pipe.CodeAt(args.Address)
+ return nil
+}
- block := p.pipe.BlockByHash(args.Hash)
- *reply = NewSuccessRes(block)
+type GetBlockArgs struct {
+ BlockNumber int32
+ Hash string
+}
+
+func (obj *GetBlockArgs) UnmarshalJSON(b []byte) (err error) {
+ argint, argstr := int32(0), ""
+ if err = json.Unmarshal(b, &argint); err == nil {
+ obj.BlockNumber = argint
+ return
+ }
+ if err = json.Unmarshal(b, &argstr); err == nil {
+ obj.Hash = argstr
+ return
+ }
+ return NewErrorResponse(ErrorDecodeArgs)
+}
+
+func (obj *GetBlockArgs) requirements() error {
+ if obj.BlockNumber == 0 && obj.Hash == "" {
+ return NewErrorResponse("GetBlock requires either a block 'number' or a block 'hash' as argument")
+ }
return nil
}
type NewTxArgs struct {
- Sec string
- Recipient string
- Value string
- Gas string
- GasPrice string
- Init string
- Body string
-}
-type TxResponse struct {
- Hash string
+ Sec string `json:"sec"`
+ Recipient string `json:"recipient"`
+ Value string `json:"value"`
+ Gas string `json:"gas"`
+ GasPrice string `json:"gasprice"`
+ Init string `json:"init"`
+ Body string `json:"body"`
+}
+
+// type TxResponse struct {
+// Hash string
+// }
+
+func (obj *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
+ if err = json.Unmarshal(b, obj); err == nil {
+ return
+ }
+ return NewErrorResponse(ErrorDecodeArgs)
}
func (a *NewTxArgs) requirements() error {
@@ -124,29 +236,17 @@ func (a *NewTxArgs) requirementsContract() error {
return nil
}
-func (p *EthereumApi) Transact(args *NewTxArgs, reply *string) error {
- err := args.requirements()
- if err != nil {
- return err
- }
- result, _ := p.pipe.Transact(p.pipe.Key().PrivateKey, args.Recipient, args.Value, args.Gas, args.GasPrice, args.Body)
- *reply = NewSuccessRes(result)
- return nil
+type PushTxArgs struct {
+ Tx string `json:"tx"`
}
-func (p *EthereumApi) Create(args *NewTxArgs, reply *string) error {
- err := args.requirementsContract()
- if err != nil {
- return err
+func (obj *PushTxArgs) UnmarshalJSON(b []byte) (err error) {
+ arg0 := ""
+ if err = json.Unmarshal(b, arg0); err == nil {
+ obj.Tx = arg0
+ return
}
-
- result, _ := p.pipe.Transact(p.pipe.Key().PrivateKey, "", args.Value, args.Gas, args.GasPrice, args.Body)
- *reply = NewSuccessRes(result)
- return nil
-}
-
-type PushTxArgs struct {
- Tx string
+ return NewErrorResponse(ErrorDecodeArgs)
}
func (a *PushTxArgs) requirementsPushTx() error {
@@ -156,26 +256,20 @@ func (a *PushTxArgs) requirementsPushTx() error {
return nil
}
-func (p *EthereumApi) PushTx(args *PushTxArgs, reply *string) error {
- err := args.requirementsPushTx()
- if err != nil {
- return err
- }
- result, _ := p.pipe.PushTx(args.Tx)
- *reply = NewSuccessRes(result)
- return nil
-}
-
-func (p *EthereumApi) GetKey(args interface{}, reply *string) error {
- *reply = NewSuccessRes(p.pipe.Key())
- return nil
-}
-
type GetStorageArgs struct {
Address string
Key string
}
+func (obj *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
+ arg0 := ""
+ if err = json.Unmarshal(b, arg0); err == nil {
+ obj.Address = arg0
+ return
+ }
+ return NewErrorResponse(ErrorDecodeArgs)
+}
+
func (a *GetStorageArgs) requirements() error {
if a.Address == "" {
return NewErrorResponse("GetStorageAt requires an 'address' value as argument")
@@ -192,33 +286,21 @@ type GetStorageAtRes struct {
Address string `json:"address"`
}
-func (p *EthereumApi) GetStorageAt(args *GetStorageArgs, reply *string) error {
- err := args.requirements()
- if err != nil {
- return err
- }
-
- state := p.pipe.World().SafeGet(ethutil.Hex2Bytes(args.Address))
-
- var hx string
- if strings.Index(args.Key, "0x") == 0 {
- hx = string([]byte(args.Key)[2:])
- } else {
- // Convert the incoming string (which is a bigint) into hex
- i, _ := new(big.Int).SetString(args.Key, 10)
- hx = ethutil.Bytes2Hex(i.Bytes())
- }
- jsonlogger.Debugf("GetStorageAt(%s, %s)\n", args.Address, hx)
- value := state.Storage(ethutil.Hex2Bytes(hx))
- *reply = NewSuccessRes(GetStorageAtRes{Address: args.Address, Key: args.Key, Value: value.Str()})
- return nil
-}
-
type GetTxCountArgs struct {
Address string `json:"address"`
}
-type GetTxCountRes struct {
- Nonce int `json:"nonce"`
+
+// type GetTxCountRes struct {
+// Nonce int `json:"nonce"`
+// }
+
+func (obj *GetTxCountArgs) UnmarshalJSON(b []byte) (err error) {
+ arg0 := ""
+ if err = json.Unmarshal(b, arg0); err == nil {
+ obj.Address = arg0
+ return
+ }
+ return NewErrorResponse("Could not determine JSON parameters")
}
func (a *GetTxCountArgs) requirements() error {
@@ -228,54 +310,33 @@ func (a *GetTxCountArgs) requirements() error {
return nil
}
-type GetPeerCountRes struct {
- PeerCount int `json:"peerCount"`
-}
-
-func (p *EthereumApi) GetPeerCount(args *interface{}, reply *string) error {
- *reply = NewSuccessRes(GetPeerCountRes{PeerCount: p.pipe.PeerCount()})
- return nil
-}
-
-type GetListeningRes struct {
- IsListening bool `json:"isListening"`
-}
+// type GetPeerCountRes struct {
+// PeerCount int `json:"peerCount"`
+// }
-func (p *EthereumApi) GetIsListening(args *interface{}, reply *string) error {
- *reply = NewSuccessRes(GetListeningRes{IsListening: p.pipe.IsListening()})
- return nil
-}
+// type GetListeningRes struct {
+// IsListening bool `json:"isListening"`
+// }
-type GetCoinbaseRes struct {
- Coinbase string `json:"coinbase"`
-}
+// type GetCoinbaseRes struct {
+// Coinbase string `json:"coinbase"`
+// }
-func (p *EthereumApi) GetCoinbase(args *interface{}, reply *string) error {
- *reply = NewSuccessRes(GetCoinbaseRes{Coinbase: p.pipe.CoinBase()})
- return nil
-}
-
-type GetMiningRes struct {
- IsMining bool `json:"isMining"`
-}
+// type GetMiningRes struct {
+// IsMining bool `json:"isMining"`
+// }
-func (p *EthereumApi) GetIsMining(args *interface{}, reply *string) error {
- *reply = NewSuccessRes(GetMiningRes{IsMining: p.pipe.IsMining()})
- return nil
+type GetBalanceArgs struct {
+ Address string
}
-func (p *EthereumApi) GetTxCountAt(args *GetTxCountArgs, reply *string) error {
- err := args.requirements()
- if err != nil {
- return err
+func (obj *GetBalanceArgs) UnmarshalJSON(b []byte) (err error) {
+ arg0 := ""
+ if err = json.Unmarshal(b, &arg0); err == nil {
+ obj.Address = arg0
+ return
}
- state := p.pipe.TxCountAt(args.Address)
- *reply = NewSuccessRes(GetTxCountRes{Nonce: state})
- return nil
-}
-
-type GetBalanceArgs struct {
- Address string
+ return NewErrorResponse("Could not determine JSON parameters")
}
func (a *GetBalanceArgs) requirements() error {
@@ -290,22 +351,22 @@ type BalanceRes struct {
Address string `json:"address"`
}
-func (p *EthereumApi) GetBalanceAt(args *GetBalanceArgs, reply *string) error {
- err := args.requirements()
- if err != nil {
- return err
- }
- state := p.pipe.World().SafeGet(ethutil.Hex2Bytes(args.Address))
- *reply = NewSuccessRes(BalanceRes{Balance: state.Balance().String(), Address: args.Address})
- return nil
+type GetCodeAtArgs struct {
+ Address string
}
-type TestRes struct {
- JsonResponse `json:"-"`
- Answer int `json:"answer"`
+func (obj *GetCodeAtArgs) UnmarshalJSON(b []byte) (err error) {
+ arg0 := ""
+ if err = json.Unmarshal(b, &arg0); err == nil {
+ obj.Address = arg0
+ return
+ }
+ return NewErrorResponse(ErrorDecodeArgs)
}
-func (p *EthereumApi) Test(args *GetBlockArgs, reply *string) error {
- *reply = NewSuccessRes(TestRes{Answer: 15})
+func (a *GetCodeAtArgs) requirements() error {
+ if a.Address == "" {
+ return NewErrorResponse("GetCodeAt requires an 'address' value as argument")
+ }
return nil
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-21 10:56:09 +0800