1 files changed, 92 insertions, 58 deletions

diff --git a/rpc/args.go b/rpc/args.go
index 8b01cc191..84b076d4a 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -1,8 +1,7 @@
 package rpc
 
-import (
-	"encoding/json"
-)
+import "encoding/json"
+import "github.com/ethereum/go-ethereum/core"
 
 type GetBlockArgs struct {
 	BlockNumber int32
@@ -30,56 +29,12 @@ func (obj *GetBlockArgs) requirements() error {
 }
 
 type NewTxArgs struct {
-	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 {
-	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
+	From     string `json:"from"`
+	To       string `json:"to"`
+	Value    string `json:"value"`
+	Gas      string `json:"gas"`
+	GasPrice string `json:"gasPrice"`
+	Data     string `json:"data"`
 }
 
 type PushTxArgs struct {
@@ -104,10 +59,28 @@ func (a *PushTxArgs) requirementsPushTx() error {
 
 type GetStorageArgs struct {
 	Address string
-	Key     string
 }
 
 func (obj *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
+	if err = json.Unmarshal(b, &obj.Address); err != nil {
+		return NewErrorResponse(ErrorDecodeArgs)
+	}
+	return
+}
+
+func (a *GetStorageArgs) requirements() error {
+	if len(a.Address) == 0 {
+		return NewErrorResponse("GetStorageAt requires an 'address' value as argument")
+	}
+	return nil
+}
+
+type GetStateArgs struct {
+	Address string
+	Key     string
+}
+
+func (obj *GetStateArgs) UnmarshalJSON(b []byte) (err error) {
 	arg0 := ""
 	if err = json.Unmarshal(b, arg0); err == nil {
 		obj.Address = arg0
@@ -116,7 +89,7 @@ func (obj *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
 	return NewErrorResponse(ErrorDecodeArgs)
 }
 
-func (a *GetStorageArgs) requirements() error {
+func (a *GetStateArgs) requirements() error {
 	if a.Address == "" {
 		return NewErrorResponse("GetStorageAt requires an 'address' value as argument")
 	}
@@ -127,9 +100,8 @@ func (a *GetStorageArgs) requirements() error {
 }
 
 type GetStorageAtRes struct {
-	Key     string `json:"key"`
-	Value   string `json:"value"`
-	Address string `json:"address"`
+	Key   string `json:"key"`
+	Value string `json:"value"`
 }
 
 type GetTxCountArgs struct {
@@ -216,3 +188,65 @@ func (a *GetCodeAtArgs) requirements() error {
 	}
 	return nil
 }
+
+type Sha3Args struct {
+	Data string
+}
+
+func (obj *Sha3Args) UnmarshalJSON(b []byte) (err error) {
+	if err = json.Unmarshal(b, &obj.Data); err != nil {
+		return NewErrorResponse(ErrorDecodeArgs)
+	}
+	return
+}
+
+type FilterOptions struct {
+	Earliest int64
+	Latest   int64
+	Address  string
+	Topic    []string
+	Skip     int
+	Max      int
+}
+
+func toFilterOptions(options *FilterOptions) core.FilterOptions {
+	var opts core.FilterOptions
+	opts.Earliest = options.Earliest
+	opts.Latest = options.Latest
+	opts.Address = fromHex(options.Address)
+	opts.Topics = make([][]byte, len(options.Topic))
+	for i, topic := range options.Topic {
+		opts.Topics[i] = fromHex(topic)
+	}
+
+	return opts
+}
+
+type FilterChangedArgs struct {
+	n int
+}
+
+type DbArgs struct {
+	Database string
+	Key      string
+	Value    string
+}
+
+func (a *DbArgs) requirements() error {
+	if len(a.Database) == 0 {
+		return NewErrorResponse("DbPutArgs requires an 'Database' value as argument")
+	}
+	if len(a.Key) == 0 {
+		return NewErrorResponse("DbPutArgs requires an 'Key' value as argument")
+	}
+	return nil
+}
+
+type WhisperMessageArgs struct {
+	Payload  string
+	To       string
+	From     string
+	Topics   []string
+	Priority uint32
+	Ttl      uint32
+}