refactoring to accomodate the bls message changes in the spec

chain/types/blockheader.go

@@ -71,6 +71,7 @@ func init() {
 				}, nil
 			})).
 		Complete())
+	cbor.RegisterCborType(MsgMeta{})
 }
 
 type Ticket []byte
@@ -98,6 +99,11 @@ type BlockHeader struct {
 	MessageReceipts cid.Cid
 }
 
+type MsgMeta struct {
+	BlsMessages   cid.Cid
+	SecpkMessages cid.Cid
+}
+
 func (b *BlockHeader) ToStorageBlock() (block.Block, error) {
 	data, err := b.Serialize()
 	if err != nil {

chain/types/fullblock.go

@@ -3,8 +3,9 @@ package types
 import "github.com/ipfs/go-cid"
 
 type FullBlock struct {
-	Header   *BlockHeader
-	Messages []*SignedMessage
+	Header        *BlockHeader
+	BlsMessages   []*Message
+	SecpkMessages []*SignedMessage
 }
 
 func (fb *FullBlock) Cid() cid.Cid {

chain/types/message.go

@@ -114,3 +114,12 @@ func (m *Message) ToStorageBlock() (block.Block, error) {
 
 	return block.NewBlockWithCid(data, c)
 }
+
+func (m *Message) Cid() cid.Cid {
+	b, err := m.ToStorageBlock()
+	if err != nil {
+		panic(fmt.Sprintf("failed to marshal message: %s", err))
+	}
+
+	return b.Cid()
+}