align collection guarantee with protobuf schema

access/grpc/convert/convert.go

@@ -327,7 +327,11 @@ func MessageToFullCollection(m []*entities.Transaction) (flow.FullCollection, er
 
 func CollectionGuaranteeToMessage(g flow.CollectionGuarantee) *entities.CollectionGuarantee {
 	return &entities.CollectionGuarantee{
-		CollectionId: g.CollectionID.Bytes(),
+		CollectionId:     g.CollectionID.Bytes(),
+		Signatures:       g.Signatures,
+		ReferenceBlockId: g.ReferenceBlockID.Bytes(),
+		Signature:        g.Signature,
+		SignerIndices:    g.SignerIndices,
 	}
 }
 
@@ -344,7 +348,11 @@ func MessageToCollectionGuarantee(m *entities.CollectionGuarantee) (flow.Collect
 	}
 
 	return flow.CollectionGuarantee{
-		CollectionID: flow.HashToID(m.CollectionId),
+		CollectionID:     flow.HashToID(m.CollectionId),
+		Signatures:       m.Signatures,
+		ReferenceBlockID: flow.HashToID(m.ReferenceBlockId),
+		Signature:        m.Signature,
+		SignerIndices:    m.SignerIndices,
 	}, nil
 }
 

access/http/convert/convert.go

@@ -102,7 +102,7 @@ func ToCollectionGuarantees(guarantees []models.CollectionGuarantee) []*flow.Col
 
 	for i, guarantee := range guarantees {
 		flowGuarantees[i] = &flow.CollectionGuarantee{
-			flow.HexToID(guarantee.CollectionId),
+			CollectionID: flow.HexToID(guarantee.CollectionId),
 		}
 	}
 

collection.go

@@ -45,7 +45,11 @@ func (c Collection) Encode() []byte {
 
 // A CollectionGuarantee is an attestation signed by the nodes that have guaranteed a collection.
 type CollectionGuarantee struct {
-	CollectionID Identifier
+	CollectionID     Identifier
+	Signatures       [][]byte
+	ReferenceBlockID Identifier
+	Signature        []byte
+	SignerIndices    []byte
 }
 
 type FullCollection struct {

test/entities.go

@@ -239,7 +239,11 @@ func CollectionGuaranteeGenerator() *CollectionGuarantees {
 
 func (g *CollectionGuarantees) New() *flow.CollectionGuarantee {
 	return &flow.CollectionGuarantee{
-		CollectionID: g.ids.New(),
+		CollectionID:     g.ids.New(),
+		Signatures:       [][]byte{[]byte("dummy")},
+		ReferenceBlockID: g.ids.New(),
+		Signature:        []byte("dummy"),
+		SignerIndices:    []byte("dummy"),
 	}
 }