Fix paramater parsing for raw JSON-RPC endpoint

Author: AmirAbrams

blockchain/dynamic/request.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	"dyn-https/models"
 	"dyn-https/util"
 )
 
@@ -46,6 +47,30 @@ func NewRequest(cmd string) (*RPCRequest, error) {
 	return &req, nil
 }
 
+// GetNewRequest returns a new JSON-RPC 1.0 request object given the raw command.
+func GetNewRequest(jsonRPC models.JSONRPC) (*RPCRequest, error) {
+	var req RPCRequest
+	req.Method = jsonRPC.Method
+	if len(jsonRPC.Params) > 0 {
+		req.Params = make([]interface{}, len(jsonRPC.Params))
+	}
+	for i, param := range jsonRPC.Params {
+		switch param.(type) {
+		case int:
+			req.Params[i] = param
+		case float64:
+			req.Params[i] = param
+		case bool:
+			req.Params[i] = param
+		case string:
+			req.Params[i] = param
+		}
+	}
+	req.JSONRPC = "1.0"
+	req.ID, _ = util.RandomHashString(9)
+	return &req, nil
+}
+
 func (req *RPCRequest) parseCmd(cmd string) error {
 	// Split cmd string
 	r := NewCmdReader(strings.NewReader(cmd))

https/rest/jsonrpc.go

@@ -18,30 +18,13 @@ func (w *WebProxy) handleJSONRPC(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err})
 		return
 	}
-	strRequest := "dynamic-cli " + reqInput.Method
-	for _, param := range reqInput.Params {
-		switch param.(type) {
-		case int:
-			val, ok := param.(int)
-			if ok {
-				strRequest += ` ` + fmt.Sprintf("%v", val)
-			}
-		case float64:
-			val, ok := param.(float64)
-			if ok {
-				strRequest += ` ` + fmt.Sprintf("%v", val)
-			}
-		case bool:
-			val, ok := param.(bool)
-			if ok {
-				strRequest += ` ` + fmt.Sprintf("%v", val)
-			}
-		case string:
-			strRequest += ` "` + fmt.Sprintf("%v", param) + `"`
-		}
+	req, err := dynamic.GetNewRequest(reqInput)
+	if err != nil {
+		strErrMsg := fmt.Sprintf("GetNewRequest error %v", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": strErrMsg})
+		return
 	}
-	reqOutput, _ := dynamic.NewRequest(strRequest)
-	response, _ := <-w.dynamicd.ExecCmdRequest(reqOutput)
+	response, _ := <-w.dynamicd.ExecCmdRequest(req)
 	var result interface{}
 	err = json.Unmarshal([]byte(response), &result)
 	if err != nil {