core: types: implement rlp.Encoder and rlp.Decoder (#232)

* core: types: implement rlp.Encoder and rlp.Decoder
* crypto: dkg: fix PublicKey.Bytes

1 files changed, 44 insertions, 0 deletions

diff --git a/core/types/dkg.go b/core/types/dkg.go
index 6018ebd..c0a42ee 100644
--- a/core/types/dkg.go
+++ b/core/types/dkg.go
@@ -20,6 +20,9 @@ package types
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+
+	"github.com/dexon-foundation/dexon/rlp"
 
 	"github.com/dexon-foundation/dexon-consensus-core/common"
 	"github.com/dexon-foundation/dexon-consensus-core/core/crypto"
@@ -59,6 +62,47 @@ func (d *DKGMasterPublicKey) String() string {
 		d.Round)
 }
 
+type rlpDKGMasterPublicKey struct {
+	ProposerID      NodeID
+	Round           uint64
+	DKGID           []byte
+	PublicKeyShares *dkg.PublicKeyShares
+	Signature       crypto.Signature
+}
+
+// EncodeRLP implements rlp.Encoder
+func (d *DKGMasterPublicKey) EncodeRLP(w io.Writer) error {
+	return rlp.Encode(w, rlpDKGMasterPublicKey{
+		ProposerID:      d.ProposerID,
+		Round:           d.Round,
+		DKGID:           d.DKGID.GetLittleEndian(),
+		PublicKeyShares: &d.PublicKeyShares,
+		Signature:       d.Signature,
+	})
+}
+
+// DecodeRLP implements rlp.Decoder
+func (d *DKGMasterPublicKey) DecodeRLP(s *rlp.Stream) error {
+	var dec rlpDKGMasterPublicKey
+	if err := s.Decode(&dec); err != nil {
+		return err
+	}
+
+	id, err := dkg.BytesID(dec.DKGID)
+	if err != nil {
+		return err
+	}
+
+	*d = DKGMasterPublicKey{
+		ProposerID:      dec.ProposerID,
+		Round:           dec.Round,
+		DKGID:           id,
+		PublicKeyShares: *dec.PublicKeyShares,
+		Signature:       dec.Signature,
+	}
+	return err
+}
+
 // NewDKGMasterPublicKey returns a new DKGMasterPublicKey instance.
 func NewDKGMasterPublicKey() *DKGMasterPublicKey {
 	return &DKGMasterPublicKey{