aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api.go700
-rw-r--r--rpc/api_test.go18
-rw-r--r--rpc/args.go539
-rw-r--r--rpc/args_test.go434
-rw-r--r--rpc/messages.go384
-rw-r--r--rpc/responses.go212
-rw-r--r--rpc/util.go74
-rw-r--r--rpc/util_test.go25
8 files changed, 1582 insertions, 804 deletions
diff --git a/rpc/api.go b/rpc/api.go
index d6854bbab..8bbe80bd8 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -1,14 +1,8 @@
-/*
-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 "UnmarshalON" defined on each "Args" struct
-3. EthereumApi method, taking the "Args" type and replying with an interface to be marshalled to ON
-
-*/
package rpc
import (
+ "encoding/json"
+ "fmt"
"math/big"
"path"
"strings"
@@ -27,8 +21,8 @@ import (
)
var (
- defaultGasPrice = big.NewInt(10000000000000)
- defaultGas = big.NewInt(10000)
+ defaultGasPrice = big.NewInt(150000000000)
+ defaultGas = big.NewInt(500000)
filterTickerTime = 15 * time.Second
)
@@ -50,21 +44,18 @@ type EthereumApi struct {
register map[string][]*NewTxArgs
db ethutil.Database
-
- defaultBlockAge int64
}
func NewEthereumApi(eth *xeth.XEth, dataDir string) *EthereumApi {
db, _ := ethdb.NewLDBDatabase(path.Join(dataDir, "dapps"))
api := &EthereumApi{
- eth: eth,
- mux: eth.Backend().EventMux(),
- quit: make(chan struct{}),
- filterManager: filter.NewFilterManager(eth.Backend().EventMux()),
- logs: make(map[int]*logFilter),
- messages: make(map[int]*whisperFilter),
- db: db,
- defaultBlockAge: -1,
+ eth: eth,
+ mux: eth.Backend().EventMux(),
+ quit: make(chan struct{}),
+ filterManager: filter.NewFilterManager(eth.Backend().EventMux()),
+ logs: make(map[int]*logFilter),
+ messages: make(map[int]*whisperFilter),
+ db: db,
}
go api.filterManager.Start()
go api.start()
@@ -72,36 +63,33 @@ func NewEthereumApi(eth *xeth.XEth, dataDir string) *EthereumApi {
return api
}
-func (self *EthereumApi) setStateByBlockNumber(num int64) {
+func (self *EthereumApi) xethWithStateNum(num int64) *xeth.XEth {
chain := self.xeth().Backend().ChainManager()
var block *types.Block
- if self.defaultBlockAge < 0 {
+ if num < 0 {
num = chain.CurrentBlock().Number().Int64() + num + 1
}
block = chain.GetBlockByNumber(uint64(num))
+ var st *state.StateDB
if block != nil {
- self.useState(state.New(block.Root(), self.xeth().Backend().StateDb()))
+ st = state.New(block.Root(), self.xeth().Backend().StateDb())
} else {
- self.useState(chain.State())
+ st = chain.State()
}
+ return self.xeth().WithState(st)
+}
+
+func (self *EthereumApi) getStateWithNum(num int64) *xeth.State {
+ return self.xethWithStateNum(num).State()
}
func (self *EthereumApi) start() {
timer := time.NewTicker(filterTickerTime)
- events := self.mux.Subscribe(core.ChainEvent{})
-
done:
for {
select {
- case ev := <-events.Chan():
- switch ev.(type) {
- case core.ChainEvent:
- if self.defaultBlockAge < 0 {
- self.setStateByBlockNumber(self.defaultBlockAge)
- }
- }
case <-timer.C:
self.logMut.Lock()
self.messagesMut.Lock()
@@ -130,35 +118,35 @@ func (self *EthereumApi) stop() {
close(self.quit)
}
-func (self *EthereumApi) Register(args string, reply *interface{}) error {
- self.regmut.Lock()
- defer self.regmut.Unlock()
+// func (self *EthereumApi) Register(args string, reply *interface{}) error {
+// self.regmut.Lock()
+// defer self.regmut.Unlock()
- if _, ok := self.register[args]; ok {
- self.register[args] = nil // register with empty
- }
- return nil
-}
+// if _, ok := self.register[args]; ok {
+// self.register[args] = nil // register with empty
+// }
+// return nil
+// }
-func (self *EthereumApi) Unregister(args string, reply *interface{}) error {
- self.regmut.Lock()
- defer self.regmut.Unlock()
+// func (self *EthereumApi) Unregister(args string, reply *interface{}) error {
+// self.regmut.Lock()
+// defer self.regmut.Unlock()
- delete(self.register, args)
+// delete(self.register, args)
- return nil
-}
+// return nil
+// }
-func (self *EthereumApi) WatchTx(args string, reply *interface{}) error {
- self.regmut.Lock()
- defer self.regmut.Unlock()
+// func (self *EthereumApi) WatchTx(args string, reply *interface{}) error {
+// self.regmut.Lock()
+// defer self.regmut.Unlock()
- txs := self.register[args]
- self.register[args] = nil
+// txs := self.register[args]
+// self.register[args] = nil
- *reply = txs
- return nil
-}
+// *reply = txs
+// return nil
+// }
func (self *EthereumApi) NewFilter(args *FilterOptions, reply *interface{}) error {
var id int
@@ -173,7 +161,7 @@ func (self *EthereumApi) NewFilter(args *FilterOptions, reply *interface{}) erro
id = self.filterManager.InstallFilter(filter)
self.logs[id] = &logFilter{timeout: time.Now()}
- *reply = id
+ *reply = i2hex(id)
return nil
}
@@ -203,7 +191,7 @@ func (self *EthereumApi) NewFilterString(args string, reply *interface{}) error
id = self.filterManager.InstallFilter(filter)
self.logs[id] = &logFilter{timeout: time.Now()}
- *reply = id
+ *reply = i2hex(id)
return nil
}
@@ -240,35 +228,49 @@ func (self *EthereumApi) AllLogs(args *FilterOptions, reply *interface{}) error
return nil
}
-func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *interface{}) error {
- // This seems a bit precarious Maybe worth splitting to discrete functions
- if len(args.Hash) > 0 {
- *reply = p.xeth().BlockByHash(args.Hash)
- } else {
- *reply = p.xeth().BlockByNumber(args.BlockNumber)
- }
- return nil
-}
+func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) (err error) {
+ // TODO if no_private_key then
+ //if _, exists := p.register[args.From]; exists {
+ // p.register[args.From] = append(p.register[args.From], args)
+ //} else {
+ /*
+ account := accounts.Get(fromHex(args.From))
+ if account != nil {
+ if account.Unlocked() {
+ if !unlockAccount(account) {
+ return
+ }
+ }
-func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error {
+ result, _ := account.Transact(fromHex(args.To), fromHex(args.Value), fromHex(args.Gas), fromHex(args.GasPrice), fromHex(args.Data))
+ if len(result) > 0 {
+ *reply = toHex(result)
+ }
+ } else if _, exists := p.register[args.From]; exists {
+ p.register[ags.From] = append(p.register[args.From], args)
+ }
+ */
// TODO: align default values to have the same type, e.g. not depend on
// ethutil.Value conversions later on
- if ethutil.Big(args.Gas).Cmp(big.NewInt(0)) == 0 {
- args.Gas = defaultGas.String()
+ if args.Gas.Cmp(big.NewInt(0)) == 0 {
+ args.Gas = defaultGas
}
- if ethutil.Big(args.GasPrice).Cmp(big.NewInt(0)) == 0 {
- args.GasPrice = defaultGasPrice.String()
+ if args.GasPrice.Cmp(big.NewInt(0)) == 0 {
+ args.GasPrice = defaultGasPrice
}
- result, _ := p.xeth().Transact(args.From, args.To, args.Value, args.Gas, args.GasPrice, args.Data)
- *reply = result
+ *reply, err = p.xeth().Transact(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data)
+ if err != nil {
+ fmt.Println("err:", err)
+ return err
+ }
return nil
}
func (p *EthereumApi) Call(args *NewTxArgs, reply *interface{}) error {
- result, err := p.xeth().Call(args.From, args.To, args.Value, args.Gas, args.GasPrice, args.Data)
+ result, err := p.xethWithStateNum(args.BlockNumber).Call(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data)
if err != nil {
return err
}
@@ -277,23 +279,28 @@ func (p *EthereumApi) Call(args *NewTxArgs, reply *interface{}) error {
return nil
}
-func (p *EthereumApi) PushTx(args *PushTxArgs, reply *interface{}) error {
- err := args.requirementsPushTx()
- if err != nil {
+func (p *EthereumApi) GetBalance(args *GetBalanceArgs, reply *interface{}) error {
+ if err := args.requirements(); err != nil {
return err
}
- result, _ := p.xeth().PushTx(args.Tx)
- *reply = result
+ state := p.getStateWithNum(args.BlockNumber).SafeGet(args.Address)
+ *reply = toHex(state.Balance().Bytes())
return nil
}
-func (p *EthereumApi) GetStateAt(args *GetStateArgs, reply *interface{}) error {
- err := args.requirements()
- if err != nil {
+func (p *EthereumApi) GetStorage(args *GetStorageArgs, reply *interface{}) error {
+ if err := args.requirements(); err != nil {
return err
}
+ *reply = p.getStateWithNum(args.BlockNumber).SafeGet(args.Address).Storage()
+ return nil
+}
- state := p.xeth().State().SafeGet(args.Address)
+func (p *EthereumApi) GetStorageAt(args *GetStorageAtArgs, reply *interface{}) error {
+ if err := args.requirements(); err != nil {
+ return err
+ }
+ state := p.getStateWithNum(args.BlockNumber).SafeGet(args.Address)
value := state.StorageString(args.Key)
var hx string
@@ -309,115 +316,31 @@ func (p *EthereumApi) GetStateAt(args *GetStateArgs, reply *interface{}) error {
return nil
}
-func (p *EthereumApi) GetStorageAt(args *GetStorageArgs, reply *interface{}) error {
- err := args.requirements()
- if err != nil {
- return err
- }
-
- *reply = p.xeth().State().SafeGet(args.Address).Storage()
- return nil
-}
-
-func (p *EthereumApi) GetPeerCount(reply *interface{}) error {
- *reply = p.xeth().PeerCount()
- return nil
-}
-
-func (p *EthereumApi) GetIsListening(reply *interface{}) error {
- *reply = p.xeth().IsListening()
- return nil
-}
-
-func (p *EthereumApi) GetCoinbase(reply *interface{}) error {
- *reply = p.xeth().Coinbase()
- return nil
-}
-
-func (p *EthereumApi) Accounts(reply *interface{}) error {
- *reply = p.xeth().Accounts()
- return nil
-}
-
-func (p *EthereumApi) GetIsMining(reply *interface{}) error {
- *reply = p.xeth().IsMining()
- return nil
-}
-
-func (p *EthereumApi) SetMining(shouldmine bool, reply *interface{}) error {
- *reply = p.xeth().SetMining(shouldmine)
- return nil
-}
-
-func (p *EthereumApi) GetDefaultBlockAge(reply *interface{}) error {
- *reply = p.defaultBlockAge
- return nil
-}
-
-func (p *EthereumApi) SetDefaultBlockAge(defaultBlockAge int64, reply *interface{}) error {
- p.defaultBlockAge = defaultBlockAge
- p.setStateByBlockNumber(p.defaultBlockAge)
-
- *reply = true
- return nil
-}
-
-func (p *EthereumApi) BlockNumber(reply *interface{}) error {
- *reply = p.xeth().Backend().ChainManager().CurrentBlock().Number()
- return nil
-}
-
func (p *EthereumApi) GetTxCountAt(args *GetTxCountArgs, reply *interface{}) error {
err := args.requirements()
if err != nil {
return err
}
- *reply = p.xeth().TxCountAt(args.Address)
+ *reply = p.xethWithStateNum(args.BlockNumber).TxCountAt(args.Address)
return nil
}
-func (p *EthereumApi) GetBalanceAt(args *GetBalanceArgs, reply *interface{}) error {
- err := args.requirements()
- if err != nil {
+func (p *EthereumApi) GetData(args *GetDataArgs, reply *interface{}) error {
+ if err := args.requirements(); err != nil {
return err
}
- state := p.xeth().State().SafeGet(args.Address)
- *reply = toHex(state.Balance().Bytes())
- return nil
-}
-
-func (p *EthereumApi) GetCodeAt(args *GetCodeAtArgs, reply *interface{}) error {
- err := args.requirements()
- if err != nil {
- return err
- }
- *reply = p.xeth().CodeAt(args.Address)
+ *reply = p.xethWithStateNum(args.BlockNumber).CodeAt(args.Address)
return nil
}
func (p *EthereumApi) GetCompilers(reply *interface{}) error {
- c := []string{"serpent"}
+ c := []string{""}
*reply = c
return nil
}
-func (p *EthereumApi) CompileSerpent(script string, reply *interface{}) error {
- res, err := ethutil.Compile(script, false)
- if err != nil {
- return err
- }
- *reply = res
- return nil
-}
-
-func (p *EthereumApi) Sha3(args *Sha3Args, reply *interface{}) error {
- *reply = toHex(crypto.Sha3(fromHex(args.Data)))
- return nil
-}
-
func (p *EthereumApi) DbPut(args *DbArgs, reply *interface{}) error {
- err := args.requirements()
- if err != nil {
+ if err := args.requirements(); err != nil {
return err
}
@@ -427,8 +350,7 @@ func (p *EthereumApi) DbPut(args *DbArgs, reply *interface{}) error {
}
func (p *EthereumApi) DbGet(args *DbArgs, reply *interface{}) error {
- err := args.requirements()
- if err != nil {
+ if err := args.requirements(); err != nil {
return err
}
@@ -442,14 +364,18 @@ func (p *EthereumApi) NewWhisperIdentity(reply *interface{}) error {
return nil
}
-func (p *EthereumApi) NewWhisperFilter(args *xeth.Options, reply *interface{}) error {
+func (p *EthereumApi) NewWhisperFilter(args *WhisperFilterArgs, reply *interface{}) error {
var id int
- args.Fn = func(msg xeth.WhisperMessage) {
+ opts := new(xeth.Options)
+ opts.From = args.From
+ opts.To = args.To
+ opts.Topics = args.Topics
+ opts.Fn = func(msg xeth.WhisperMessage) {
p.messagesMut.Lock()
defer p.messagesMut.Unlock()
p.messages[id].add(msg) // = append(p.messages[id], msg)
}
- id = p.xeth().Whisper().Watch(args)
+ id = p.xeth().Whisper().Watch(opts)
p.messages[id] = &whisperFilter{timeout: time.Now()}
*reply = id
return nil
@@ -467,7 +393,7 @@ func (self *EthereumApi) MessagesChanged(id int, reply *interface{}) error {
}
func (p *EthereumApi) WhisperPost(args *WhisperMessageArgs, reply *interface{}) error {
- err := p.xeth().Whisper().Post(args.Payload, args.To, args.From, args.Topic, args.Priority, args.Ttl)
+ err := p.xeth().Whisper().Post(args.Payload, args.To, args.From, args.Topics, args.Priority, args.Ttl)
if err != nil {
return err
}
@@ -486,199 +412,358 @@ func (p *EthereumApi) WhisperMessages(id int, reply *interface{}) error {
return nil
}
+func (p *EthereumApi) GetBlockByHash(blockhash string, includetx bool) (*BlockRes, error) {
+ block := p.xeth().EthBlockByHash(blockhash)
+ br := NewBlockRes(block)
+ br.fullTx = includetx
+ return br, nil
+}
+
+func (p *EthereumApi) GetBlockByNumber(blocknum int64, includetx bool) (*BlockRes, error) {
+ block := p.xeth().EthBlockByNumber(blocknum)
+ br := NewBlockRes(block)
+ br.fullTx = includetx
+ return br, nil
+}
+
+func (p *EthereumApi) GetBlockTransactionCountByHash(blockhash string) (int64, error) {
+ block := p.xeth().EthBlockByHash(blockhash)
+ br := NewBlockRes(block)
+ return int64(len(br.Transactions)), nil
+}
+
+func (p *EthereumApi) GetBlockTransactionCountByNumber(blocknum int64) (int64, error) {
+ block := p.xeth().EthBlockByNumber(blocknum)
+ br := NewBlockRes(block)
+ return int64(len(br.Transactions)), nil
+}
+
+func (p *EthereumApi) GetBlockUncleCountByHash(blockhash string) (int64, error) {
+ block := p.xeth().EthBlockByHash(blockhash)
+ br := NewBlockRes(block)
+ return int64(len(br.Uncles)), nil
+}
+
+func (p *EthereumApi) GetBlockUncleCountByNumber(blocknum int64) (int64, error) {
+ block := p.xeth().EthBlockByNumber(blocknum)
+ br := NewBlockRes(block)
+ return int64(len(br.Uncles)), nil
+}
+
func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error {
// Spec at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC
- rpclogger.DebugDetailf("%T %s", req.Params, req.Params)
+ rpclogger.Debugf("%s %s", req.Method, req.Params)
switch req.Method {
+ case "web3_sha3":
+ args := new(Sha3Args)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+ *reply = toHex(crypto.Sha3(fromHex(args.Data)))
+ case "net_listening":
+ *reply = p.xeth().IsListening()
+ case "net_peerCount":
+ *reply = toHex(big.NewInt(int64(p.xeth().PeerCount())).Bytes())
case "eth_coinbase":
- return p.GetCoinbase(reply)
- case "eth_listening":
- return p.GetIsListening(reply)
+ *reply = p.xeth().Coinbase()
case "eth_mining":
- return p.GetIsMining(reply)
- case "eth_setMining":
- args, err := req.ToBoolArgs()
- if err != nil {
+ *reply = p.xeth().IsMining()
+ case "eth_gasPrice":
+ *reply = toHex(defaultGasPrice.Bytes())
+ case "eth_accounts":
+ *reply = p.xeth().Accounts()
+ case "eth_blockNumber":
+ *reply = toHex(p.xeth().Backend().ChainManager().CurrentBlock().Number().Bytes())
+ case "eth_getBalance":
+ args := new(GetBalanceArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.SetMining(args, reply)
- case "eth_defaultBlock":
- return p.GetDefaultBlockAge(reply)
- case "eth_setDefaultBlock":
- args, err := req.ToIntArgs()
- if err != nil {
+ return p.GetBalance(args, reply)
+ case "eth_getStorage", "eth_storageAt":
+ args := new(GetStorageArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.SetDefaultBlockAge(int64(args), reply)
- case "eth_peerCount":
- return p.GetPeerCount(reply)
- case "eth_number":
- return p.BlockNumber(reply)
- case "eth_accounts":
- return p.Accounts(reply)
- case "eth_countAt":
- args, err := req.ToGetTxCountArgs()
- if err != nil {
+ return p.GetStorage(args, reply)
+ case "eth_getStorageAt":
+ args := new(GetStorageAtArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+ return p.GetStorageAt(args, reply)
+ case "eth_getTransactionCount":
+ args := new(GetTxCountArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
return p.GetTxCountAt(args, reply)
- case "eth_codeAt":
- args, err := req.ToGetCodeAtArgs()
- if err != nil {
+ case "eth_getBlockTransactionCountByHash":
+ args := new(GetBlockByHashArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.GetCodeAt(args, reply)
- case "eth_balanceAt":
- args, err := req.ToGetBalanceArgs()
+
+ v, err := p.GetBlockTransactionCountByHash(args.BlockHash)
if err != nil {
return err
}
- return p.GetBalanceAt(args, reply)
- case "eth_stateAt":
- args, err := req.ToGetStateArgs()
- if err != nil {
+ *reply = toHex(big.NewInt(v).Bytes())
+ case "eth_getBlockTransactionCountByNumber":
+ args := new(GetBlockByNumberArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.GetStateAt(args, reply)
- case "eth_storageAt":
- args, err := req.ToStorageAtArgs()
+
+ v, err := p.GetBlockTransactionCountByNumber(args.BlockNumber)
if err != nil {
return err
}
- return p.GetStorageAt(args, reply)
- case "eth_blockByNumber", "eth_blockByHash":
- args, err := req.ToGetBlockArgs()
+ *reply = toHex(big.NewInt(v).Bytes())
+ case "eth_getUncleCountByBlockHash":
+ args := new(GetBlockByHashArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockUncleCountByHash(args.BlockHash)
if err != nil {
return err
}
- return p.GetBlock(args, reply)
- case "eth_transact":
- args, err := req.ToNewTxArgs()
+ *reply = toHex(big.NewInt(v).Bytes())
+ case "eth_getUncleCountByBlockNumber":
+ args := new(GetBlockByNumberArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockUncleCountByNumber(args.BlockNumber)
if err != nil {
return err
}
+ *reply = toHex(big.NewInt(v).Bytes())
+ case "eth_getData":
+ args := new(GetDataArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+ return p.GetData(args, reply)
+ case "eth_sendTransaction", "eth_transact":
+ args := new(NewTxArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
return p.Transact(args, reply)
case "eth_call":
- args, err := req.ToNewTxArgs()
- if err != nil {
+ args := new(NewTxArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
return p.Call(args, reply)
- case "eth_newFilter":
- args, err := req.ToFilterArgs()
- if err != nil {
+ case "eth_flush":
+ return errNotImplemented
+ case "eth_getBlockByHash":
+ args := new(GetBlockByHashArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.NewFilter(args, reply)
- case "eth_newFilterString":
- args, err := req.ToFilterStringArgs()
+
+ v, err := p.GetBlockByHash(args.BlockHash, args.Transactions)
if err != nil {
return err
}
- return p.NewFilterString(args, reply)
- case "eth_uninstallFilter":
- args, err := req.ToUninstallFilterArgs()
+ *reply = v
+ case "eth_getBlockByNumber":
+ args := new(GetBlockByNumberArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockByNumber(args.BlockNumber, args.Transactions)
if err != nil {
return err
}
- return p.UninstallFilter(args, reply)
- case "eth_changed":
- args, err := req.ToIdArgs()
+ *reply = v
+ case "eth_getTransactionByHash":
+ return errNotImplemented
+ case "eth_getTransactionByBlockHashAndIndex":
+ args := new(HashIndexArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockByHash(args.BlockHash, true)
if err != nil {
return err
}
- return p.FilterChanged(args, reply)
- case "eth_filterLogs":
- args, err := req.ToIdArgs()
+ if args.Index > int64(len(v.Transactions)) || args.Index < 0 {
+ return NewErrorWithMessage(errDecodeArgs, "Transaction index does not exist")
+ }
+ *reply = v.Transactions[args.Index]
+ case "eth_getTransactionByBlockNumberAndIndex":
+ args := new(BlockNumIndexArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockByNumber(args.BlockNumber, true)
if err != nil {
return err
}
- return p.Logs(args, reply)
- case "eth_logs":
- args, err := req.ToFilterArgs()
+ if args.Index > int64(len(v.Transactions)) || args.Index < 0 {
+ return NewErrorWithMessage(errDecodeArgs, "Transaction index does not exist")
+ }
+ *reply = v.Transactions[args.Index]
+ case "eth_getUncleByBlockHashAndIndex":
+ args := new(HashIndexArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockByHash(args.BlockHash, false)
if err != nil {
return err
}
- return p.AllLogs(args, reply)
- case "eth_gasPrice":
- *reply = toHex(defaultGasPrice.Bytes())
- return nil
- case "eth_register":
- args, err := req.ToRegisterArgs()
+ if args.Index > int64(len(v.Uncles)) || args.Index < 0 {
+ return NewErrorWithMessage(errDecodeArgs, "Uncle index does not exist")
+ }
+
+ uncle, err := p.GetBlockByHash(toHex(v.Uncles[args.Index]), false)
if err != nil {
return err
}
- return p.Register(args, reply)
- case "eth_unregister":
- args, err := req.ToRegisterArgs()
+ *reply = uncle
+ case "eth_getUncleByBlockNumberAndIndex":
+ args := new(BlockNumIndexArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockByNumber(args.BlockNumber, true)
if err != nil {
return err
}
- return p.Unregister(args, reply)
- case "eth_watchTx":
- args, err := req.ToWatchTxArgs()
+ if args.Index > int64(len(v.Uncles)) || args.Index < 0 {
+ return NewErrorWithMessage(errDecodeArgs, "Uncle index does not exist")
+ }
+
+ uncle, err := p.GetBlockByHash(toHex(v.Uncles[args.Index]), false)
if err != nil {
return err
}
- return p.WatchTx(args, reply)
- case "eth_compilers":
+ *reply = uncle
+ case "eth_getCompilers":
return p.GetCompilers(reply)
- case "eth_serpent":
- args, err := req.ToCompileArgs()
- if err != nil {
+ case "eth_compileSolidity":
+ case "eth_compileLLL":
+ case "eth_compileSerpent":
+ return errNotImplemented
+ case "eth_newFilter":
+ args := new(FilterOptions)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.CompileSerpent(args, reply)
- case "web3_sha3":
- args, err := req.ToSha3Args()
- if err != nil {
+ return p.NewFilter(args, reply)
+ case "eth_newBlockFilter":
+ args := new(FilterStringArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+ return p.NewFilterString(args.Word, reply)
+ case "eth_uninstallFilter":
+ args := new(FilterIdArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.Sha3(args, reply)
+ return p.UninstallFilter(args.Id, reply)
+ case "eth_getFilterChanges":
+ args := new(FilterIdArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+ return p.FilterChanged(args.Id, reply)
+ case "eth_getFilterLogs":
+ args := new(FilterIdArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+ return p.Logs(args.Id, reply)
+ case "eth_getLogs":
+ args := new(FilterOptions)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+ return p.AllLogs(args, reply)
+ case "eth_getWork":
+ case "eth_submitWork":
+ return errNotImplemented
case "db_put":
- args, err := req.ToDbPutArgs()
- if err != nil {
+ args := new(DbArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
return p.DbPut(args, reply)
case "db_get":
- args, err := req.ToDbGetArgs()
- if err != nil {
+ args := new(DbArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
return p.DbGet(args, reply)
- case "shh_newIdentity":
- return p.NewWhisperIdentity(reply)
- case "shh_newFilter":
- args, err := req.ToWhisperFilterArgs()
- if err != nil {
+ case "shh_post":
+ args := new(WhisperMessageArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.NewWhisperFilter(args, reply)
- case "shh_changed":
- args, err := req.ToIdArgs()
- if err != nil {
+ return p.WhisperPost(args, reply)
+ case "shh_newIdentity":
+ return p.NewWhisperIdentity(reply)
+ case "shh_hasIdentity":
+ args := new(WhisperIdentityArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.MessagesChanged(args, reply)
- case "shh_post":
- args, err := req.ToWhisperPostArgs()
- if err != nil {
+ return p.HasWhisperIdentity(args.Identity, reply)
+ case "shh_newGroup":
+ case "shh_addToGroup":
+ return errNotImplemented
+ case "shh_newFilter":
+ args := new(WhisperFilterArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.WhisperPost(args, reply)
- case "shh_haveIdentity":
- args, err := req.ToWhisperHasIdentityArgs()
- if err != nil {
+ return p.NewWhisperFilter(args, reply)
+ case "shh_uninstallFilter":
+ return errNotImplemented
+ case "shh_getFilterChanges":
+ args := new(FilterIdArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.HasWhisperIdentity(args, reply)
+ return p.MessagesChanged(args.Id, reply)
case "shh_getMessages":
- args, err := req.ToIdArgs()
- if err != nil {
+ args := new(FilterIdArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- return p.WhisperMessages(args, reply)
+ return p.WhisperMessages(args.Id, reply)
+ // case "eth_register":
+ // args, err := req.ToRegisterArgs()
+ // if err != nil {
+ // return err
+ // }
+ // return p.Register(args, reply)
+ // case "eth_unregister":
+ // args, err := req.ToRegisterArgs()
+ // if err != nil {
+ // return err
+ // }
+ // return p.Unregister(args, reply)
+ // case "eth_watchTx":
+ // args, err := req.ToWatchTxArgs()
+ // if err != nil {
+ // return err
+ // }
+ // return p.WatchTx(args, reply)
default:
return NewErrorWithMessage(errNotImplemented, req.Method)
}
@@ -694,9 +779,38 @@ func (self *EthereumApi) xeth() *xeth.XEth {
return self.eth
}
-func (self *EthereumApi) useState(statedb *state.StateDB) {
- self.xethMu.Lock()
- defer self.xethMu.Unlock()
+func toFilterOptions(options *FilterOptions) core.FilterOptions {
+ var opts core.FilterOptions
+
+ // Convert optional address slice/string to byte slice
+ if str, ok := options.Address.(string); ok {
+ opts.Address = [][]byte{fromHex(str)}
+ } else if slice, ok := options.Address.([]interface{}); ok {
+ bslice := make([][]byte, len(slice))
+ for i, addr := range slice {
+ if saddr, ok := addr.(string); ok {
+ bslice[i] = fromHex(saddr)
+ }
+ }
+ opts.Address = bslice
+ }
+
+ opts.Earliest = options.Earliest
+ opts.Latest = options.Latest
+
+ topics := make([][][]byte, len(options.Topics))
+ for i, topicDat := range options.Topics {
+ if slice, ok := topicDat.([]interface{}); ok {
+ topics[i] = make([][]byte, len(slice))
+ for j, topic := range slice {
+ topics[i][j] = fromHex(topic.(string))
+ }
+ } else if str, ok := topicDat.(string); ok {
+ topics[i] = make([][]byte, 1)
+ topics[i][0] = fromHex(str)
+ }
+ }
+ opts.Topics = topics
- self.eth = self.eth.UseState(statedb)
+ return opts
}
diff --git a/rpc/api_test.go b/rpc/api_test.go
index a9fc16cd3..ec03822c5 100644
--- a/rpc/api_test.go
+++ b/rpc/api_test.go
@@ -1,11 +1,29 @@
package rpc
import (
+ "encoding/json"
"sync"
"testing"
"time"
)
+func TestWeb3Sha3(t *testing.T) {
+ jsonstr := `{"jsonrpc":"2.0","method":"web3_sha3","params":["0x68656c6c6f20776f726c64"],"id":64}`
+ expected := "0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad"
+
+ api := &EthereumApi{}
+
+ var req RpcRequest
+ json.Unmarshal([]byte(jsonstr), &req)
+
+ var response interface{}
+ _ = api.GetRequestReply(&req, &response)
+
+ if response.(string) != expected {
+ t.Errorf("Expected %s got %s", expected, response)
+ }
+}
+
func TestFilterClose(t *testing.T) {
t.Skip()
api := &EthereumApi{
diff --git a/rpc/args.go b/rpc/args.go
index ec3359a4a..d4d807060 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -1,247 +1,331 @@
package rpc
-import "encoding/json"
+import (
+ "bytes"
+ "encoding/json"
+ "math/big"
-import "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/ethutil"
+)
-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
+func blockNumber(raw json.RawMessage, number *int64) (err error) {
+ var str string
+ if err = json.Unmarshal(raw, &str); err != nil {
+ return errDecodeArgs
}
- if err = json.Unmarshal(b, &argstr); err == nil {
- obj.Hash = argstr
- return
+
+ switch str {
+ case "latest":
+ *number = -1
+ case "pending":
+ *number = 0
+ default:
+ *number = ethutil.String2Big(str).Int64()
}
- return errDecodeArgs
+ return nil
}
-type NewTxArgs struct {
- From string `json:"from"`
- Pass string `json:"pass"`
- To string `json:"to"`
- Value string `json:"value"`
- Gas string `json:"gas"`
- GasPrice string `json:"gasPrice"`
- Data string `json:"data"`
-}
-
-func (obj *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
- // Data can be either specified as "data" or "code" :-/
- var ext struct {
- From string
- To string
- Value string
- Gas string
- GasPrice string
- Data string
- Code string
+type GetBlockByHashArgs struct {
+ BlockHash string
+ Transactions bool
+}
+
+func (args *GetBlockByHashArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []interface{}
+ r := bytes.NewReader(b)
+ if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) < 1 {
+ return errArguments
}
- if err = json.Unmarshal(b, &ext); err == nil {
- if len(ext.Data) == 0 {
- ext.Data = ext.Code
- }
- obj.From = ext.From
- obj.To = ext.To
- obj.Value = ext.Value
- obj.Gas = ext.Gas
- obj.GasPrice = ext.GasPrice
- obj.Data = ext.Data
+ argstr, ok := obj[0].(string)
+ if !ok {
+ return errDecodeArgs
+ }
+ args.BlockHash = argstr
- return
+ if len(obj) > 1 {
+ args.Transactions = obj[1].(bool)
}
- return errDecodeArgs
+ return nil
}
-type PushTxArgs struct {
- Tx string `json:"tx"`
+type GetBlockByNumberArgs struct {
+ BlockNumber int64
+ Transactions bool
}
-func (obj *PushTxArgs) UnmarshalJSON(b []byte) (err error) {
- arg0 := ""
- if err = json.Unmarshal(b, &arg0); err == nil {
- obj.Tx = arg0
- return
+func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []interface{}
+ r := bytes.NewReader(b)
+ if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) < 1 {
+ return errArguments
}
- return errDecodeArgs
+
+ if v, ok := obj[0].(float64); ok {
+ args.BlockNumber = int64(v)
+ } else {
+ args.BlockNumber = ethutil.Big(obj[0].(string)).Int64()
+ }
+
+ if len(obj) > 1 {
+ args.Transactions = obj[1].(bool)
+ }
+
+ return nil
+}
+
+type NewTxArgs struct {
+ From string
+ To string
+ Value *big.Int
+ Gas *big.Int
+ GasPrice *big.Int
+ Data string
+
+ BlockNumber int64
}
-func (a *PushTxArgs) requirementsPushTx() error {
- if a.Tx == "" {
- return NewErrorWithMessage(errArguments, "PushTx requires a 'tx' as argument")
+func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj struct{ From, To, Value, Gas, GasPrice, Data string }
+ if err = UnmarshalRawMessages(b, &obj, &args.BlockNumber); err != nil {
+ return err
}
+
+ args.From = obj.From
+ args.To = obj.To
+ args.Value = ethutil.Big(obj.Value)
+ args.Gas = ethutil.Big(obj.Gas)
+ args.GasPrice = ethutil.Big(obj.GasPrice)
+ args.Data = obj.Data
+
return nil
}
type GetStorageArgs struct {
- Address string
+ Address string
+ BlockNumber int64
}
-func (obj *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
- if err = json.Unmarshal(b, &obj.Address); err != nil {
+func (args *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
+ if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
return errDecodeArgs
}
- return
+
+ return nil
}
-func (a *GetStorageArgs) requirements() error {
- if len(a.Address) == 0 {
- return NewErrorWithMessage(errArguments, "GetStorageAt requires an 'address' value as argument")
+func (args *GetStorageArgs) requirements() error {
+ if len(args.Address) == 0 {
+ return NewErrorWithMessage(errArguments, "Address cannot be blank")
}
return nil
}
-type GetStateArgs struct {
- Address string
- Key string
+type GetStorageAtArgs struct {
+ Address string
+ Key string
+ BlockNumber int64
}
-func (obj *GetStateArgs) UnmarshalJSON(b []byte) (err error) {
- arg0 := ""
- if err = json.Unmarshal(b, &arg0); err == nil {
- obj.Address = arg0
- return
+func (args *GetStorageAtArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []string
+ if err = UnmarshalRawMessages(b, &obj, &args.BlockNumber); err != nil {
+ return errDecodeArgs
+ }
+ if len(obj) < 2 {
+ return errDecodeArgs
}
- return errDecodeArgs
+
+ args.Address = obj[0]
+ args.Key = obj[1]
+
+ return nil
}
-func (a *GetStateArgs) requirements() error {
- if a.Address == "" {
- return NewErrorWithMessage(errArguments, "GetStorageAt requires an 'address' value as argument")
+func (args *GetStorageAtArgs) requirements() error {
+ if len(args.Address) == 0 {
+ return NewErrorWithMessage(errArguments, "Address cannot be blank")
}
- if a.Key == "" {
- return NewErrorWithMessage(errArguments, "GetStorageAt requires an 'key' value as argument")
+
+ if len(args.Key) == 0 {
+ return NewErrorWithMessage(errArguments, "Key cannot be blank")
}
return nil
}
type GetTxCountArgs struct {
- Address string `json:"address"`
+ Address string
+ BlockNumber int64
}
-func (obj *GetTxCountArgs) UnmarshalJSON(b []byte) (err error) {
- arg0 := ""
- if err = json.Unmarshal(b, &arg0); err == nil {
- obj.Address = arg0
- return
+func (args *GetTxCountArgs) UnmarshalJSON(b []byte) (err error) {
+ if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
+ return errDecodeArgs
}
- return errDecodeArgs
+
+ return nil
}
-func (a *GetTxCountArgs) requirements() error {
- if a.Address == "" {
- return NewErrorWithMessage(errArguments, "GetTxCountAt requires an 'address' value as argument")
+func (args *GetTxCountArgs) requirements() error {
+ if len(args.Address) == 0 {
+ return NewErrorWithMessage(errArguments, "Address cannot be blank")
}
return nil
}
type GetBalanceArgs struct {
- Address string
+ Address string
+ BlockNumber int64
}
-func (obj *GetBalanceArgs) UnmarshalJSON(b []byte) (err error) {
- arg0 := ""
- if err = json.Unmarshal(b, &arg0); err == nil {
- obj.Address = arg0
- return
+func (args *GetBalanceArgs) UnmarshalJSON(b []byte) (err error) {
+ if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
+ return errDecodeArgs
}
- return errDecodeArgs
+
+ return nil
}
-func (a *GetBalanceArgs) requirements() error {
- if a.Address == "" {
- return NewErrorWithMessage(errArguments, "GetBalanceAt requires an 'address' value as argument")
+func (args *GetBalanceArgs) requirements() error {
+ if len(args.Address) == 0 {
+ return NewErrorWithMessage(errArguments, "Address cannot be blank")
}
return nil
}
-type GetCodeAtArgs struct {
- Address string
+type GetDataArgs struct {
+ Address string
+ BlockNumber int64
}
-func (obj *GetCodeAtArgs) UnmarshalJSON(b []byte) (err error) {
- arg0 := ""
- if err = json.Unmarshal(b, &arg0); err == nil {
- obj.Address = arg0
- return
+func (args *GetDataArgs) UnmarshalJSON(b []byte) (err error) {
+ if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
+ return errDecodeArgs
}
- return errDecodeArgs
+
+ return nil
}
-func (a *GetCodeAtArgs) requirements() error {
- if a.Address == "" {
- return NewErrorWithMessage(errArguments, "GetCodeAt requires an 'address' value as argument")
+func (args *GetDataArgs) requirements() error {
+ if len(args.Address) == 0 {
+ return NewErrorWithMessage(errArguments, "Address cannot be blank")
}
return nil
}
+type BlockNumIndexArgs struct {
+ BlockNumber int64
+ Index int64
+}
+
+type HashIndexArgs struct {
+ BlockHash string
+ Index int64
+}
+
type Sha3Args struct {
Data string
}
-func (obj *Sha3Args) UnmarshalJSON(b []byte) (err error) {
- if err = json.Unmarshal(b, &obj.Data); err != nil {
- return errDecodeArgs
+func (args *Sha3Args) UnmarshalJSON(b []byte) (err error) {
+ var obj []interface{}
+ r := bytes.NewReader(b)
+ if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ return NewErrorWithMessage(errDecodeArgs, err.Error())
}
- return
+
+ if len(obj) < 1 {
+ return errArguments
+ }
+ args.Data = obj[0].(string)
+
+ return nil
}
+// type FilterArgs struct {
+// FromBlock uint64
+// ToBlock uint64
+// Limit uint64
+// Offset uint64
+// Address string
+// Topics []string
+// }
+
+// func (args *FilterArgs) UnmarshalJSON(b []byte) (err error) {
+// var obj []struct {
+// FromBlock string `json:"fromBlock"`
+// ToBlock string `json:"toBlock"`
+// Limit string `json:"limit"`
+// Offset string `json:"offset"`
+// Address string `json:"address"`
+// Topics []string `json:"topics"`
+// }
+
+// if err = json.Unmarshal(b, &obj); err != nil {
+// return errDecodeArgs
+// }
+
+// if len(obj) < 1 {
+// return errArguments
+// }
+// args.FromBlock = uint64(ethutil.Big(obj[0].FromBlock).Int64())
+// args.ToBlock = uint64(ethutil.Big(obj[0].ToBlock).Int64())
+// args.Limit = uint64(ethutil.Big(obj[0].Limit).Int64())
+// args.Offset = uint64(ethutil.Big(obj[0].Offset).Int64())
+// args.Address = obj[0].Address
+// args.Topics = obj[0].Topics
+
+// return nil
+// }
+
type FilterOptions struct {
Earliest int64
Latest int64
Address interface{}
- Topic []interface{}
+ Topics []interface{}
Skip int
Max int
}
-func toFilterOptions(options *FilterOptions) core.FilterOptions {
- var opts core.FilterOptions
-
- // Convert optional address slice/string to byte slice
- if str, ok := options.Address.(string); ok {
- opts.Address = [][]byte{fromHex(str)}
- } else if slice, ok := options.Address.([]interface{}); ok {
- bslice := make([][]byte, len(slice))
- for i, addr := range slice {
- if saddr, ok := addr.(string); ok {
- bslice[i] = fromHex(saddr)
- }
- }
- opts.Address = bslice
+func (args *FilterOptions) UnmarshalJSON(b []byte) (err error) {
+ var obj []struct {
+ FromBlock string `json:"fromBlock"`
+ ToBlock string `json:"toBlock"`
+ Limit string `json:"limit"`
+ Offset string `json:"offset"`
+ Address string `json:"address"`
+ Topics []interface{} `json:"topics"`
}
- opts.Earliest = options.Earliest
- opts.Latest = options.Latest
+ if err = json.Unmarshal(b, &obj); err != nil {
+ return errDecodeArgs
+ }
- topics := make([][][]byte, len(options.Topic))
- for i, topicDat := range options.Topic {
- if slice, ok := topicDat.([]interface{}); ok {
- topics[i] = make([][]byte, len(slice))
- for j, topic := range slice {
- topics[i][j] = fromHex(topic.(string))
- }
- } else if str, ok := topicDat.(string); ok {
- topics[i] = make([][]byte, 1)
- topics[i][0] = fromHex(str)
- }
+ if len(obj) < 1 {
+ return errArguments
}
- opts.Topics = topics
+ args.Earliest = int64(ethutil.Big(obj[0].FromBlock).Int64())
+ args.Latest = int64(ethutil.Big(obj[0].ToBlock).Int64())
+ args.Max = int(ethutil.Big(obj[0].Limit).Int64())
+ args.Skip = int(ethutil.Big(obj[0].Offset).Int64())
+ args.Address = obj[0].Address
+ args.Topics = obj[0].Topics
- return opts
+ return nil
}
-type FilterChangedArgs struct {
- n int
-}
+// type FilterChangedArgs struct {
+// n int
+// }
type DbArgs struct {
Database string
@@ -249,12 +333,32 @@ type DbArgs struct {
Value string
}
+func (args *DbArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []interface{}
+ r := bytes.NewReader(b)
+ if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) < 2 {
+ return errArguments
+ }
+ args.Database = obj[0].(string)
+ args.Key = obj[1].(string)
+
+ if len(obj) > 2 {
+ args.Value = obj[2].(string)
+ }
+
+ return nil
+}
+
func (a *DbArgs) requirements() error {
if len(a.Database) == 0 {
- return NewErrorWithMessage(errArguments, "DbPutArgs requires an 'Database' value as argument")
+ return NewErrorWithMessage(errArguments, "Database cannot be blank")
}
if len(a.Key) == 0 {
- return NewErrorWithMessage(errArguments, "DbPutArgs requires an 'Key' value as argument")
+ return NewErrorWithMessage(errArguments, "Key cannot be blank")
}
return nil
}
@@ -263,7 +367,140 @@ type WhisperMessageArgs struct {
Payload string
To string
From string
- Topic []string
+ Topics []string
Priority uint32
Ttl uint32
}
+
+func (args *WhisperMessageArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []struct {
+ Payload string
+ To string
+ From string
+ Topics []string
+ Priority string
+ Ttl string
+ }
+
+ if err = json.Unmarshal(b, &obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) < 1 {
+ return errArguments
+ }
+ args.Payload = obj[0].Payload
+ args.To = obj[0].To
+ args.From = obj[0].From
+ args.Topics = obj[0].Topics
+ args.Priority = uint32(ethutil.Big(obj[0].Priority).Int64())
+ args.Ttl = uint32(ethutil.Big(obj[0].Ttl).Int64())
+
+ return nil
+}
+
+type CompileArgs struct {
+ Source string
+}
+
+func (args *CompileArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []interface{}
+ r := bytes.NewReader(b)
+ if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) > 0 {
+ args.Source = obj[0].(string)
+ }
+
+ return nil
+}
+
+type FilterStringArgs struct {
+ Word string
+}
+
+func (args *FilterStringArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []string
+ r := bytes.NewReader(b)
+ if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) < 1 {
+ return errDecodeArgs
+ }
+
+ args.Word = obj[0]
+
+ return nil
+}
+
+type FilterIdArgs struct {
+ Id int
+}
+
+func (args *FilterIdArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []string
+ r := bytes.NewReader(b)
+ if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) < 1 {
+ return errDecodeArgs
+ }
+
+ args.Id = int(ethutil.Big(obj[0]).Int64())
+
+ return nil
+}
+
+type WhisperIdentityArgs struct {
+ Identity string
+}
+
+func (args *WhisperIdentityArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []string
+ r := bytes.NewReader(b)
+ if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) < 1 {
+ return errDecodeArgs
+ }
+
+ args.Identity = obj[0]
+
+ return nil
+}
+
+type WhisperFilterArgs struct {
+ To string `json:"to"`
+ From string
+ Topics []string
+}
+
+func (args *WhisperFilterArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []struct {
+ To string
+ From string
+ Topics []string
+ }
+
+ if err = json.Unmarshal(b, &obj); err != nil {
+ return errDecodeArgs
+ }
+
+ if len(obj) < 1 {
+ return errArguments
+ }
+
+ args.To = obj[0].To
+ args.From = obj[0].From
+ args.Topics = obj[0].Topics
+
+ return nil
+}
diff --git a/rpc/args_test.go b/rpc/args_test.go
new file mode 100644
index 000000000..027624500
--- /dev/null
+++ b/rpc/args_test.go
@@ -0,0 +1,434 @@
+package rpc
+
+import (
+ "bytes"
+ "encoding/json"
+ "math/big"
+ "testing"
+)
+
+func TestSha3(t *testing.T) {
+ input := `["0x68656c6c6f20776f726c64"]`
+ expected := "0x68656c6c6f20776f726c64"
+
+ args := new(Sha3Args)
+ json.Unmarshal([]byte(input), &args)
+
+ if args.Data != expected {
+ t.Error("got %s expected %s", input, expected)
+ }
+}
+
+func TestGetBalanceArgs(t *testing.T) {
+ input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "0x1f"]`
+ expected := new(GetBalanceArgs)
+ expected.Address = "0x407d73d8a49eeb85d32cf465507dd71d507100c1"
+ expected.BlockNumber = 31
+
+ args := new(GetBalanceArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if err := args.requirements(); err != nil {
+ t.Error(err)
+ }
+
+ if args.Address != expected.Address {
+ t.Errorf("Address should be %v but is %v", expected.Address, args.Address)
+ }
+
+ if args.BlockNumber != expected.BlockNumber {
+ t.Errorf("BlockNumber should be %v but is %v", expected.BlockNumber, args.BlockNumber)
+ }
+}
+
+func TestGetBlockByHashArgs(t *testing.T) {
+ input := `["0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331", true]`
+ expected := new(GetBlockByHashArgs)
+ expected.BlockHash = "0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331"
+ expected.Transactions = true
+
+ args := new(GetBlockByHashArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if args.BlockHash != expected.BlockHash {
+ t.Errorf("BlockHash should be %v but is %v", expected.BlockHash, args.BlockHash)
+ }
+
+ if args.Transactions != expected.Transactions {
+ t.Errorf("Transactions should be %v but is %v", expected.Transactions, args.Transactions)
+ }
+}
+
+func TestGetBlockByNumberArgs(t *testing.T) {
+ input := `["0x1b4", false]`
+ expected := new(GetBlockByNumberArgs)
+ expected.BlockNumber = 436
+ expected.Transactions = false
+
+ args := new(GetBlockByNumberArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if args.BlockNumber != expected.BlockNumber {
+ t.Errorf("BlockHash should be %v but is %v", expected.BlockNumber, args.BlockNumber)
+ }
+
+ if args.Transactions != expected.Transactions {
+ t.Errorf("Transactions should be %v but is %v", expected.Transactions, args.Transactions)
+ }
+}
+
+func TestNewTxArgs(t *testing.T) {
+ input := `[{"from": "0xb60e8dd61c5d32be8058bb8eb970870f07233155",
+ "to": "0xd46e8dd67c5d32be8058bb8eb970870f072445675",
+ "gas": "0x76c0",
+ "gasPrice": "0x9184e72a000",
+ "value": "0x9184e72a000",
+ "data": "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675"}]`
+ expected := new(NewTxArgs)
+ expected.From = "0xb60e8dd61c5d32be8058bb8eb970870f07233155"
+ expected.To = "0xd46e8dd67c5d32be8058bb8eb970870f072445675"
+ expected.Gas = big.NewInt(30400)
+ expected.GasPrice = big.NewInt(10000000000000)
+ expected.Value = big.NewInt(10000000000000)
+ expected.Data = "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675"
+
+ args := new(NewTxArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.From != args.From {
+ t.Errorf("From shoud be %#v but is %#v", expected.From, args.From)
+ }
+
+ if expected.To != args.To {
+ t.Errorf("To shoud be %#v but is %#v", expected.To, args.To)
+ }
+
+ if bytes.Compare(expected.Gas.Bytes(), args.Gas.Bytes()) != 0 {
+ t.Errorf("Gas shoud be %#v but is %#v", expected.Gas.Bytes(), args.Gas.Bytes())
+ }
+
+ if bytes.Compare(expected.GasPrice.Bytes(), args.GasPrice.Bytes()) != 0 {
+ t.Errorf("GasPrice shoud be %#v but is %#v", expected.GasPrice, args.GasPrice)
+ }
+
+ if bytes.Compare(expected.Value.Bytes(), args.Value.Bytes()) != 0 {
+ t.Errorf("Value shoud be %#v but is %#v", expected.Value, args.Value)
+ }
+
+ if expected.Data != args.Data {
+ t.Errorf("Data shoud be %#v but is %#v", expected.Data, args.Data)
+ }
+}
+
+func TestGetStorageArgs(t *testing.T) {
+ input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "latest"]`
+ expected := new(GetStorageArgs)
+ expected.Address = "0x407d73d8a49eeb85d32cf465507dd71d507100c1"
+ expected.BlockNumber = -1
+
+ args := new(GetStorageArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if err := args.requirements(); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Address != args.Address {
+ t.Errorf("Address shoud be %#v but is %#v", expected.Address, args.Address)
+ }
+
+ if expected.BlockNumber != args.BlockNumber {
+ t.Errorf("BlockNumber shoud be %#v but is %#v", expected.BlockNumber, args.BlockNumber)
+ }
+}
+
+func TestGetStorageAtArgs(t *testing.T) {
+ input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "0x0", "0x2"]`
+ expected := new(GetStorageAtArgs)
+ expected.Address = "0x407d73d8a49eeb85d32cf465507dd71d507100c1"
+ expected.Key = "0x0"
+ expected.BlockNumber = 2
+
+ args := new(GetStorageAtArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if err := args.requirements(); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Address != args.Address {
+ t.Errorf("Address shoud be %#v but is %#v", expected.Address, args.Address)
+ }
+
+ if expected.Key != args.Key {
+ t.Errorf("Address shoud be %#v but is %#v", expected.Address, args.Address)
+ }
+
+ if expected.BlockNumber != args.BlockNumber {
+ t.Errorf("BlockNumber shoud be %#v but is %#v", expected.BlockNumber, args.BlockNumber)
+ }
+}
+
+func TestGetTxCountArgs(t *testing.T) {
+ input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "latest"]`
+ expected := new(GetTxCountArgs)
+ expected.Address = "0x407d73d8a49eeb85d32cf465507dd71d507100c1"
+ expected.BlockNumber = -1
+
+ args := new(GetTxCountArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if err := args.requirements(); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Address != args.Address {
+ t.Errorf("Address shoud be %#v but is %#v", expected.Address, args.Address)
+ }
+
+ if expected.BlockNumber != args.BlockNumber {
+ t.Errorf("BlockNumber shoud be %#v but is %#v", expected.BlockNumber, args.BlockNumber)
+ }
+}
+
+func TestGetDataArgs(t *testing.T) {
+ input := `["0xd5677cf67b5aa051bb40496e68ad359eb97cfbf8", "latest"]`
+ expected := new(GetDataArgs)
+ expected.Address = "0xd5677cf67b5aa051bb40496e68ad359eb97cfbf8"
+ expected.BlockNumber = -1
+
+ args := new(GetDataArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if err := args.requirements(); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Address != args.Address {
+ t.Errorf("Address shoud be %#v but is %#v", expected.Address, args.Address)
+ }
+
+ if expected.BlockNumber != args.BlockNumber {
+ t.Errorf("BlockNumber shoud be %#v but is %#v", expected.BlockNumber, args.BlockNumber)
+ }
+}
+
+func TestFilterOptions(t *testing.T) {
+ input := `[{
+ "fromBlock": "0x1",
+ "toBlock": "0x2",
+ "limit": "0x3",
+ "offset": "0x0",
+ "address": "0xd5677cf67b5aa051bb40496e68ad359eb97cfbf8",
+ "topics": ["0x12341234"]}]`
+ expected := new(FilterOptions)
+ expected.Earliest = 1
+ expected.Latest = 2
+ expected.Max = 3
+ expected.Skip = 0
+ expected.Address = "0xd5677cf67b5aa051bb40496e68ad359eb97cfbf8"
+ // expected.Topics = []string{"0x12341234"}
+
+ args := new(FilterOptions)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Earliest != args.Earliest {
+ t.Errorf("Earliest shoud be %#v but is %#v", expected.Earliest, args.Earliest)
+ }
+
+ if expected.Latest != args.Latest {
+ t.Errorf("Latest shoud be %#v but is %#v", expected.Latest, args.Latest)
+ }
+
+ if expected.Max != args.Max {
+ t.Errorf("Max shoud be %#v but is %#v", expected.Max, args.Max)
+ }
+
+ if expected.Skip != args.Skip {
+ t.Errorf("Skip shoud be %#v but is %#v", expected.Skip, args.Skip)
+ }
+
+ if expected.Address != args.Address {
+ t.Errorf("Address shoud be %#v but is %#v", expected.Address, args.Address)
+ }
+
+ // if expected.Topics != args.Topics {
+ // t.Errorf("Topic shoud be %#v but is %#v", expected.Topic, args.Topic)
+ // }
+}
+
+func TestDbArgs(t *testing.T) {
+ input := `["0x74657374","0x6b6579","0x6d79537472696e67"]`
+ expected := new(DbArgs)
+ expected.Database = "0x74657374"
+ expected.Key = "0x6b6579"
+ expected.Value = "0x6d79537472696e67"
+
+ args := new(DbArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if err := args.requirements(); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Database != args.Database {
+ t.Errorf("Database shoud be %#v but is %#v", expected.Database, args.Database)
+ }
+
+ if expected.Key != args.Key {
+ t.Errorf("Key shoud be %#v but is %#v", expected.Key, args.Key)
+ }
+
+ if expected.Value != args.Value {
+ t.Errorf("Value shoud be %#v but is %#v", expected.Value, args.Value)
+ }
+}
+
+func TestWhisperMessageArgs(t *testing.T) {
+ input := `[{"from":"0xc931d93e97ab07fe42d923478ba2465f2",
+ "topics": ["0x68656c6c6f20776f726c64"],
+ "payload":"0x68656c6c6f20776f726c64",
+ "ttl": "0x64",
+ "priority": "0x64"}]`
+ expected := new(WhisperMessageArgs)
+ expected.From = "0xc931d93e97ab07fe42d923478ba2465f2"
+ expected.To = ""
+ expected.Payload = "0x68656c6c6f20776f726c64"
+ expected.Priority = 100
+ expected.Ttl = 100
+ expected.Topics = []string{"0x68656c6c6f20776f726c64"}
+
+ args := new(WhisperMessageArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.From != args.From {
+ t.Errorf("From shoud be %#v but is %#v", expected.From, args.From)
+ }
+
+ if expected.To != args.To {
+ t.Errorf("To shoud be %#v but is %#v", expected.To, args.To)
+ }
+
+ if expected.Payload != args.Payload {
+ t.Errorf("Value shoud be %#v but is %#v", expected.Payload, args.Payload)
+ }
+
+ if expected.Ttl != args.Ttl {
+ t.Errorf("Ttl shoud be %#v but is %#v", expected.Ttl, args.Ttl)
+ }
+
+ if expected.Priority != args.Priority {
+ t.Errorf("Priority shoud be %#v but is %#v", expected.Priority, args.Priority)
+ }
+
+ // if expected.Topics != args.Topics {
+ // t.Errorf("Topic shoud be %#v but is %#v", expected.Topic, args.Topic)
+ // }
+}
+
+func TestFilterIdArgs(t *testing.T) {
+ input := `["0x7"]`
+ expected := new(FilterIdArgs)
+ expected.Id = 7
+
+ args := new(FilterIdArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Id != args.Id {
+ t.Errorf("Id shoud be %#v but is %#v", expected.Id, args.Id)
+ }
+}
+
+func TestWhsiperFilterArgs(t *testing.T) {
+ input := `[{"topics": ["0x68656c6c6f20776f726c64"], "to": "0x34ag445g3455b34"}]`
+ expected := new(WhisperFilterArgs)
+ expected.From = ""
+ expected.To = "0x34ag445g3455b34"
+ expected.Topics = []string{"0x68656c6c6f20776f726c64"}
+
+ args := new(WhisperFilterArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.From != args.From {
+ t.Errorf("From shoud be %#v but is %#v", expected.From, args.From)
+ }
+
+ if expected.To != args.To {
+ t.Errorf("To shoud be %#v but is %#v", expected.To, args.To)
+ }
+
+ // if expected.Topics != args.Topics {
+ // t.Errorf("Topics shoud be %#v but is %#v", expected.Topics, args.Topics)
+ // }
+}
+
+func TestCompileArgs(t *testing.T) {
+ input := `["contract test { function multiply(uint a) returns(uint d) { return a * 7; } }"]`
+ expected := new(CompileArgs)
+ expected.Source = `contract test { function multiply(uint a) returns(uint d) { return a * 7; } }`
+
+ args := new(CompileArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Source != args.Source {
+ t.Errorf("Source shoud be %#v but is %#v", expected.Source, args.Source)
+ }
+}
+
+func TestFilterStringArgs(t *testing.T) {
+ input := `["pending"]`
+ expected := new(FilterStringArgs)
+ expected.Word = "pending"
+
+ args := new(FilterStringArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Word != args.Word {
+ t.Errorf("Word shoud be %#v but is %#v", expected.Word, args.Word)
+ }
+}
+
+func TestWhisperIdentityArgs(t *testing.T) {
+ input := `["0xc931d93e97ab07fe42d923478ba2465f283"]`
+ expected := new(WhisperIdentityArgs)
+ expected.Identity = "0xc931d93e97ab07fe42d923478ba2465f283"
+
+ args := new(WhisperIdentityArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.Identity != args.Identity {
+ t.Errorf("Identity shoud be %#v but is %#v", expected.Identity, args.Identity)
+ }
+}
diff --git a/rpc/messages.go b/rpc/messages.go
index b37d8229d..a3ebbf330 100644
--- a/rpc/messages.go
+++ b/rpc/messages.go
@@ -17,12 +17,9 @@
package rpc
import (
- "bytes"
"encoding/json"
"errors"
"fmt"
-
- "github.com/ethereum/go-ethereum/xeth"
)
var (
@@ -33,10 +30,10 @@ var (
)
type RpcRequest struct {
- ID interface{} `json:"id"`
- JsonRpc string `json:"jsonrpc"`
- Method string `json:"method"`
- Params []json.RawMessage `json:"params"`
+ ID interface{} `json:"id"`
+ JsonRpc string `json:"jsonrpc"`
+ Method string `json:"method"`
+ Params json.RawMessage `json:"params"`
}
type RpcSuccessResponse struct {
@@ -61,359 +58,30 @@ func NewErrorWithMessage(err error, msg string) error {
return fmt.Errorf("%s: %s", err.Error(), msg)
}
-func (req *RpcRequest) ToSha3Args() (*Sha3Args, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(Sha3Args)
- r := bytes.NewReader(req.Params[0])
- if err := json.NewDecoder(r).Decode(args); err != nil {
- return nil, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToGetBlockArgs() (*GetBlockArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(GetBlockArgs)
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToNewTxArgs() (*NewTxArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(NewTxArgs)
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, NewErrorWithMessage(errDecodeArgs, err.Error())
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToPushTxArgs() (*PushTxArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(PushTxArgs)
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToGetStateArgs() (*GetStateArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(GetStateArgs)
- // TODO need to pass both arguments
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToStorageAtArgs() (*GetStorageArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(GetStorageArgs)
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToGetTxCountArgs() (*GetTxCountArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(GetTxCountArgs)
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToGetBalanceArgs() (*GetBalanceArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(GetBalanceArgs)
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToGetCodeAtArgs() (*GetCodeAtArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(GetCodeAtArgs)
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToBoolArgs() (bool, error) {
- if len(req.Params) < 1 {
- return false, errArguments
- }
-
- var args bool
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return false, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToIntArgs() (int, error) {
- if len(req.Params) < 1 {
- return 0, errArguments
- }
-
- var args int
- if err := json.Unmarshal(req.Params[0], &args); err != nil {
- return 0, errArguments
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToCompileArgs() (string, error) {
- if len(req.Params) < 1 {
- return "", errArguments
- }
-
- var args string
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return "", errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToFilterArgs() (*FilterOptions, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- args := new(FilterOptions)
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(args)
- if err != nil {
- return nil, errDecodeArgs
- }
- return args, nil
-}
-
-func (req *RpcRequest) ToFilterStringArgs() (string, error) {
- if len(req.Params) < 1 {
- return "", errArguments
- }
-
- var args string
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return "", errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToUninstallFilterArgs() (int, error) {
- if len(req.Params) < 1 {
- return 0, errArguments
- }
-
- var args int
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return 0, errDecodeArgs
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToFilterChangedArgs() (int, error) {
- if len(req.Params) < 1 {
- return 0, errArguments
- }
-
- var id int
- r := bytes.NewReader(req.Params[0])
- err := json.NewDecoder(r).Decode(&id)
- if err != nil {
- return 0, errDecodeArgs
- }
- return id, nil
-}
-
-func (req *RpcRequest) ToDbPutArgs() (*DbArgs, error) {
- if len(req.Params) < 3 {
- return nil, errArguments
- }
-
- var args DbArgs
- err := json.Unmarshal(req.Params[0], &args.Database)
- if err != nil {
- return nil, NewErrorWithMessage(errDecodeArgs, err.Error())
- }
- err = json.Unmarshal(req.Params[1], &args.Key)
- if err != nil {
- return nil, NewErrorWithMessage(errDecodeArgs, err.Error())
- }
- err = json.Unmarshal(req.Params[2], &args.Value)
- if err != nil {
- return nil, NewErrorWithMessage(errDecodeArgs, err.Error())
- }
-
- return &args, nil
-}
-
-func (req *RpcRequest) ToDbGetArgs() (*DbArgs, error) {
- if len(req.Params) < 2 {
- return nil, errArguments
- }
+// func (req *RpcRequest) ToRegisterArgs() (string, error) {
+// if len(req.Params) < 1 {
+// return "", errArguments
+// }
- var args DbArgs
- err := json.Unmarshal(req.Params[0], &args.Database)
- if err != nil {
- return nil, NewErrorWithMessage(errDecodeArgs, err.Error())
- }
+// var args string
+// err := json.Unmarshal(req.Params, &args)
+// if err != nil {
+// return "", err
+// }
- err = json.Unmarshal(req.Params[1], &args.Key)
- if err != nil {
- return nil, NewErrorWithMessage(errDecodeArgs, err.Error())
- }
+// return args, nil
+// }
- return &args, nil
-}
-
-func (req *RpcRequest) ToWhisperFilterArgs() (*xeth.Options, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- var args xeth.Options
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return nil, NewErrorWithMessage(errDecodeArgs, err.Error())
- }
-
- return &args, nil
-}
-
-func (req *RpcRequest) ToIdArgs() (int, error) {
- if len(req.Params) < 1 {
- return 0, errArguments
- }
+// func (req *RpcRequest) ToWatchTxArgs() (string, error) {
+// if len(req.Params) < 1 {
+// return "", errArguments
+// }
- var id int
- err := json.Unmarshal(req.Params[0], &id)
- if err != nil {
- return 0, errDecodeArgs
- }
-
- return id, nil
-}
-
-func (req *RpcRequest) ToWhisperPostArgs() (*WhisperMessageArgs, error) {
- if len(req.Params) < 1 {
- return nil, errArguments
- }
-
- var args WhisperMessageArgs
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return nil, err
- }
-
- return &args, nil
-}
+// var args string
+// err := json.Unmarshal(req.Params, &args)
+// if err != nil {
+// return "", err
+// }
-func (req *RpcRequest) ToWhisperHasIdentityArgs() (string, error) {
- if len(req.Params) < 1 {
- return "", errArguments
- }
-
- var args string
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return "", err
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToRegisterArgs() (string, error) {
- if len(req.Params) < 1 {
- return "", errArguments
- }
-
- var args string
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return "", err
- }
-
- return args, nil
-}
-
-func (req *RpcRequest) ToWatchTxArgs() (string, error) {
- if len(req.Params) < 1 {
- return "", errArguments
- }
-
- var args string
- err := json.Unmarshal(req.Params[0], &args)
- if err != nil {
- return "", err
- }
-
- return args, nil
-}
+// return args, nil
+// }
diff --git a/rpc/responses.go b/rpc/responses.go
new file mode 100644
index 000000000..f41ce7b96
--- /dev/null
+++ b/rpc/responses.go
@@ -0,0 +1,212 @@
+package rpc
+
+import (
+ "encoding/json"
+ // "fmt"
+ "math/big"
+
+ "github.com/ethereum/go-ethereum/core/types"
+)
+
+type BlockRes struct {
+ fullTx bool
+
+ BlockNumber int64 `json:"number"`
+ BlockHash []byte `json:"hash"`
+ ParentHash []byte `json:"parentHash"`
+ Nonce []byte `json:"nonce"`
+ Sha3Uncles []byte `json:"sha3Uncles"`
+ LogsBloom []byte `json:"logsBloom"`
+ TransactionRoot []byte `json:"transactionRoot"`
+ StateRoot []byte `json:"stateRoot"`
+ Miner []byte `json:"miner"`
+ Difficulty int64 `json:"difficulty"`
+ TotalDifficulty int64 `json:"totalDifficulty"`
+ Size int64 `json:"size"`
+ ExtraData []byte `json:"extraData"`
+ GasLimit int64 `json:"gasLimit"`
+ MinGasPrice int64 `json:"minGasPrice"`
+ GasUsed int64 `json:"gasUsed"`
+ UnixTimestamp int64 `json:"timestamp"`
+ Transactions []*TransactionRes `json:"transactions"`
+ Uncles [][]byte `json:"uncles"`
+}
+
+func (b *BlockRes) MarshalJSON() ([]byte, error) {
+ var ext struct {
+ BlockNumber string `json:"number"`
+ BlockHash string `json:"hash"`
+ ParentHash string `json:"parentHash"`
+ Nonce string `json:"nonce"`
+ Sha3Uncles string `json:"sha3Uncles"`
+ LogsBloom string `json:"logsBloom"`
+ TransactionRoot string `json:"transactionRoot"`
+ StateRoot string `json:"stateRoot"`
+ Miner string `json:"miner"`
+ Difficulty string `json:"difficulty"`
+ TotalDifficulty string `json:"totalDifficulty"`
+ Size string `json:"size"`
+ ExtraData string `json:"extraData"`
+ GasLimit string `json:"gasLimit"`
+ MinGasPrice string `json:"minGasPrice"`
+ GasUsed string `json:"gasUsed"`
+ UnixTimestamp string `json:"timestamp"`
+ Transactions []interface{} `json:"transactions"`
+ Uncles []string `json:"uncles"`
+ }
+
+ // convert strict types to hexified strings
+ ext.BlockNumber = toHex(big.NewInt(b.BlockNumber).Bytes())
+ ext.BlockHash = toHex(b.BlockHash)
+ ext.ParentHash = toHex(b.ParentHash)
+ ext.Nonce = toHex(b.Nonce)
+ ext.Sha3Uncles = toHex(b.Sha3Uncles)
+ ext.LogsBloom = toHex(b.LogsBloom)
+ ext.TransactionRoot = toHex(b.TransactionRoot)
+ ext.StateRoot = toHex(b.StateRoot)
+ ext.Miner = toHex(b.Miner)
+ ext.Difficulty = toHex(big.NewInt(b.Difficulty).Bytes())
+ ext.TotalDifficulty = toHex(big.NewInt(b.TotalDifficulty).Bytes())
+ ext.Size = toHex(big.NewInt(b.Size).Bytes())
+ // ext.ExtraData = toHex(b.ExtraData)
+ ext.GasLimit = toHex(big.NewInt(b.GasLimit).Bytes())
+ // ext.MinGasPrice = toHex(big.NewInt(b.MinGasPrice).Bytes())
+ ext.GasUsed = toHex(big.NewInt(b.GasUsed).Bytes())
+ ext.UnixTimestamp = toHex(big.NewInt(b.UnixTimestamp).Bytes())
+ ext.Transactions = make([]interface{}, len(b.Transactions))
+ if b.fullTx {
+ for i, tx := range b.Transactions {
+ ext.Transactions[i] = tx
+ }
+ } else {
+ for i, tx := range b.Transactions {
+ ext.Transactions[i] = toHex(tx.Hash)
+ }
+ }
+ ext.Uncles = make([]string, len(b.Uncles))
+ for i, v := range b.Uncles {
+ ext.Uncles[i] = toHex(v)
+ }
+
+ return json.Marshal(ext)
+}
+
+func NewBlockRes(block *types.Block) *BlockRes {
+ if block == nil {
+ return &BlockRes{}
+ }
+
+ res := new(BlockRes)
+ res.BlockNumber = block.Number().Int64()
+ res.BlockHash = block.Hash()
+ res.ParentHash = block.ParentHash()
+ res.Nonce = block.Header().Nonce
+ res.Sha3Uncles = block.Header().UncleHash
+ res.LogsBloom = block.Bloom()
+ res.TransactionRoot = block.Header().TxHash
+ res.StateRoot = block.Root()
+ res.Miner = block.Header().Coinbase
+ res.Difficulty = block.Difficulty().Int64()
+ if block.Td != nil {
+ res.TotalDifficulty = block.Td.Int64()
+ }
+ res.Size = int64(block.Size())
+ // res.ExtraData =
+ res.GasLimit = block.GasLimit().Int64()
+ // res.MinGasPrice =
+ res.GasUsed = block.GasUsed().Int64()
+ res.UnixTimestamp = block.Time()
+ res.Transactions = make([]*TransactionRes, len(block.Transactions()))
+ for i, tx := range block.Transactions() {
+ v := NewTransactionRes(tx)
+ v.BlockHash = block.Hash()
+ v.BlockNumber = block.Number().Int64()
+ v.TxIndex = int64(i)
+ res.Transactions[i] = v
+ }
+ res.Uncles = make([][]byte, len(block.Uncles()))
+ for i, uncle := range block.Uncles() {
+ res.Uncles[i] = uncle.Hash()
+ }
+ return res
+}
+
+type TransactionRes struct {
+ Hash []byte `json:"hash"`
+ Nonce int64 `json:"nonce"`
+ BlockHash []byte `json:"blockHash,omitempty"`
+ BlockNumber int64 `json:"blockNumber,omitempty"`
+ TxIndex int64 `json:"transactionIndex,omitempty"`
+ From []byte `json:"from"`
+ To []byte `json:"to"`
+ Value int64 `json:"value"`
+ Gas int64 `json:"gas"`
+ GasPrice int64 `json:"gasPrice"`
+ Input []byte `json:"input"`
+}
+
+func (t *TransactionRes) MarshalJSON() ([]byte, error) {
+ var ext struct {
+ Hash string `json:"hash"`
+ Nonce string `json:"nonce"`
+ BlockHash string `json:"blockHash,omitempty"`
+ BlockNumber string `json:"blockNumber,omitempty"`
+ TxIndex string `json:"transactionIndex,omitempty"`
+ From string `json:"from"`
+ To string `json:"to"`
+ Value string `json:"value"`
+ Gas string `json:"gas"`
+ GasPrice string `json:"gasPrice"`
+ Input string `json:"input"`
+ }
+
+ ext.Hash = toHex(t.Hash)
+ ext.Nonce = toHex(big.NewInt(t.Nonce).Bytes())
+ ext.BlockHash = toHex(t.BlockHash)
+ ext.BlockNumber = toHex(big.NewInt(t.BlockNumber).Bytes())
+ ext.TxIndex = toHex(big.NewInt(t.TxIndex).Bytes())
+ ext.From = toHex(t.From)
+ ext.To = toHex(t.To)
+ ext.Value = toHex(big.NewInt(t.Value).Bytes())
+ ext.Gas = toHex(big.NewInt(t.Gas).Bytes())
+ ext.GasPrice = toHex(big.NewInt(t.GasPrice).Bytes())
+ ext.Input = toHex(t.Input)
+
+ return json.Marshal(ext)
+}
+
+func NewTransactionRes(tx *types.Transaction) *TransactionRes {
+ var v = new(TransactionRes)
+ v.Hash = tx.Hash()
+ v.Nonce = int64(tx.Nonce())
+ v.From = tx.From()
+ v.To = tx.To()
+ v.Value = tx.Value().Int64()
+ v.Gas = tx.Gas().Int64()
+ v.GasPrice = tx.GasPrice().Int64()
+ v.Input = tx.Data()
+ return v
+}
+
+type FilterLogRes struct {
+ Hash string `json:"hash"`
+ Address string `json:"address"`
+ Data string `json:"data"`
+ BlockNumber string `json:"blockNumber"`
+ TransactionHash string `json:"transactionHash"`
+ BlockHash string `json:"blockHash"`
+ TransactionIndex string `json:"transactionIndex"`
+ LogIndex string `json:"logIndex"`
+}
+
+type FilterWhisperRes struct {
+ Hash string `json:"hash"`
+ From string `json:"from"`
+ To string `json:"to"`
+ Expiry string `json:"expiry"`
+ Sent string `json:"sent"`
+ Ttl string `json:"ttl"`
+ Topics string `json:"topics"`
+ Payload string `json:"payload"`
+ WorkProved string `json:"workProved"`
+}
diff --git a/rpc/util.go b/rpc/util.go
index 3e8ca3fef..8ff3c6d31 100644
--- a/rpc/util.go
+++ b/rpc/util.go
@@ -18,8 +18,11 @@ package rpc
import (
"encoding/json"
+ "fmt"
"io"
+ "math/big"
"net/http"
+ "reflect"
"time"
"github.com/ethereum/go-ethereum/ethutil"
@@ -32,9 +35,63 @@ var rpclogger = logger.NewLogger("RPC")
type JsonWrapper struct{}
+// Unmarshal state is a helper method which has the ability to decode messsages
+// that use the `defaultBlock` (https://github.com/ethereum/wiki/wiki/JSON-RPC#the-default-block-parameter)
+// For example a `call`: [{to: "0x....", data:"0x..."}, "latest"]. The first argument is the transaction
+// message and the second one refers to the block height (or state) to which to apply this `call`.
+func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error) {
+ var data []json.RawMessage
+ if err = json.Unmarshal(b, &data); err != nil && len(data) == 0 {
+ return errDecodeArgs
+ }
+
+ // Number index determines the index in the array for a possible block number
+ numberIndex := 0
+
+ value := reflect.ValueOf(iface)
+ rvalue := reflect.Indirect(value)
+
+ switch rvalue.Kind() {
+ case reflect.Slice:
+ // This is a bit of a cheat, but `data` is expected to be larger than 2 if iface is a slice
+ if number != nil {
+ numberIndex = len(data) - 1
+ } else {
+ numberIndex = len(data)
+ }
+
+ slice := reflect.MakeSlice(rvalue.Type(), numberIndex, numberIndex)
+ for i, raw := range data[0:numberIndex] {
+ v := slice.Index(i).Interface()
+ if err = json.Unmarshal(raw, &v); err != nil {
+ fmt.Println(err, v)
+ return err
+ }
+ slice.Index(i).Set(reflect.ValueOf(v))
+ }
+ reflect.Indirect(rvalue).Set(slice) //value.Set(slice)
+ case reflect.Struct:
+ fallthrough
+ default:
+ if err = json.Unmarshal(data[0], iface); err != nil {
+ return errDecodeArgs
+ }
+ numberIndex = 1
+ }
+
+ // <0 index means out of bound for block number
+ if numberIndex >= 0 && len(data) > numberIndex {
+ if err = blockNumber(data[numberIndex], number); err != nil {
+ return errDecodeArgs
+ }
+ }
+
+ return nil
+}
+
func (self JsonWrapper) Send(writer io.Writer, v interface{}) (n int, err error) {
var payload []byte
- payload, err = json.Marshal(v)
+ payload, err = json.MarshalIndent(v, "", "\t")
if err != nil {
rpclogger.Fatalln("Error marshalling JSON", err)
return 0, err
@@ -63,18 +120,31 @@ func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error)
}
func toHex(b []byte) string {
- return "0x" + ethutil.Bytes2Hex(b)
+ hex := ethutil.Bytes2Hex(b)
+ // Prefer output of "0x0" instead of "0x"
+ if len(hex) == 0 {
+ hex = "0"
+ }
+ return "0x" + hex
}
+
func fromHex(s string) []byte {
if len(s) > 1 {
if s[0:2] == "0x" {
s = s[2:]
}
+ if len(s)%2 == 1 {
+ s = "0" + s
+ }
return ethutil.Hex2Bytes(s)
}
return nil
}
+func i2hex(n int) string {
+ return toHex(big.NewInt(int64(n)).Bytes())
+}
+
type RpcServer interface {
Start()
Stop()
diff --git a/rpc/util_test.go b/rpc/util_test.go
new file mode 100644
index 000000000..b0a4979b5
--- /dev/null
+++ b/rpc/util_test.go
@@ -0,0 +1,25 @@
+package rpc
+
+import (
+ "bytes"
+ "testing"
+)
+
+//fromHex
+func TestFromHex(t *testing.T) {
+ input := "0x01"
+ expected := []byte{1}
+ result := fromHex(input)
+ if bytes.Compare(expected, result) != 0 {
+ t.Errorf("Expected % x got % x", expected, result)
+ }
+}
+
+func TestFromHexOddLength(t *testing.T) {
+ input := "0x1"
+ expected := []byte{1}
+ result := fromHex(input)
+ if bytes.Compare(expected, result) != 0 {
+ t.Errorf("Expected % x got % x", expected, result)
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 09:03:06 +0800