Merge pull request #103 from XinFinOrg/upgrade-websocket-epochnumber

EpochNumber ummarshal

Author: wjrjerome

rpc/types.go

@@ -119,6 +119,25 @@ func (bn BlockNumber) Int64() int64 {
 	return (int64)(bn)
 }
 
+func (e *EpochNumber) UnmarshalJSON(data []byte) error {
+	input := trimData(data)
+	if input == "latest" {
+		*e = LatestEpochNumber
+		return nil
+	}
+
+	eNum, err := hexutil.DecodeUint64(input)
+	if err != nil {
+		return err
+	}
+	if eNum > math.MaxInt64 {
+		return fmt.Errorf("EpochNumber too high")
+	}
+
+	*e = EpochNumber(eNum)
+	return nil
+}
+
 func (e EpochNumber) Int64() int64 {
 	return (int64)(e)
 }
@@ -217,3 +236,11 @@ func BlockNumberOrHashWithHash(hash common.Hash, canonical bool) BlockNumberOrHa
 		RequireCanonical: canonical,
 	}
 }
+
+func trimData(data []byte) string {
+	input := strings.TrimSpace(string(data))
+	if len(input) >= 2 && input[0] == '"' && input[len(input)-1] == '"' {
+		input = input[1 : len(input)-1]
+	}
+	return input
+}