Add getwork result infrastructure. Make the work request optional.

jsonapi.go

@@ -173,6 +173,14 @@ type GetMiningInfoResult struct {
 	HashesPerSec     float64 `json:"hashespersec"`
 }
 
+// GetWorkResult models the data from the getwork command.
+type GetWorkResult struct {
+	Data     string `json:"data"`
+	Hash1    string `json:"hash1"`
+	Midstate string `json:"midstate"`
+	Target   string `json:"target"`
+}
+
 // ValidateAddressResult models the data from the validateaddress command.
 type ValidateAddressResult struct {
 	IsValid      bool   `json:"isvalid"`
@@ -872,6 +880,12 @@ func ReadResultCmd(cmd string, message []byte) (Reply, error) {
 		if err == nil {
 			result.Result = res
 		}
+	case "getwork":
+		var res GetWorkResult
+		err = json.Unmarshal(objmap["result"], &res)
+		if err == nil {
+			result.Result = res
+		}
 	case "validateaddress":
 		var res ValidateAddressResult
 		err = json.Unmarshal(objmap["result"], &res)

jsoncmd.go

@@ -3751,17 +3751,16 @@ func (cmd *GetWorkCmd) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &r); err != nil {
 		return err
 	}
-
+	if len(r.Params) > 1 {
-	if len(r.Params) != 1 {
 		return ErrWrongNumberOfParams
 	}
-
+	wrequest := new(WorkRequest)
+	if len(r.Params) == 1 {
 		rmap, ok := r.Params[0].(map[string]interface{})
 		if !ok {
 			return errors.New("first optional parameter template request must be an object")
 		}
 
-	wrequest := new(WorkRequest)
 		// data is required
 		data, ok := rmap["data"]
 		if !ok {
@@ -3793,7 +3792,7 @@ func (cmd *GetWorkCmd) UnmarshalJSON(b []byte) error {
 			}
 			wrequest.Algorithm = salgo
 		}
-
+	}
 	newCmd, err := NewGetWorkCmd(r.Id, wrequest)
 	if err != nil {
 		return err