Add Chain ID onto the Rollmint block (#649)

* Add Chain ID onto the Rollmint block since it is necessary for a correct hash

Author: joroshiba

conv/abci/block.go

@@ -36,6 +36,7 @@ func ToABCIHeaderPB(header *types.Header) (tmproto.Header, error) {
 		LastResultsHash:    header.LastResultsHash[:],
 		EvidenceHash:       new(tmtypes.EvidenceData).Hash(),
 		ProposerAddress:    header.ProposerAddress,
+		ChainID:            header.ChainID,
 	}, nil
 }
 
@@ -65,6 +66,7 @@ func ToABCIHeader(header *types.Header) (tmtypes.Header, error) {
 		LastResultsHash:    header.LastResultsHash[:],
 		EvidenceHash:       new(tmtypes.EvidenceData).Hash(),
 		ProposerAddress:    header.ProposerAddress,
+		ChainID:            header.ChainID,
 	}, nil
 }
 

proto/rollmint/rollmint.proto

@@ -54,6 +54,9 @@ message Header {
 
 	// Hash of block aggregator set, at a time of block creation
 	bytes aggregators_hash = 12;
+
+	// Chain ID the block belongs to
+	string chain_id = 13;
 }
 
 message Commit {

state/executor.go

@@ -98,6 +98,7 @@ func (e *BlockExecutor) CreateBlock(height uint64, lastCommit *types.Commit, las
 				Block: state.Version.Consensus.Block,
 				App:   state.Version.Consensus.App,
 			},
+			ChainID:        e.chainID,
 			NamespaceID:    e.namespaceID,
 			Height:         height,
 			Time:           uint64(time.Now().Unix()), // TODO(tzdybal): how to get TAI64?

types/block.go

@@ -40,6 +40,9 @@ type Header struct {
 
 	// Hash of block aggregator set, at a time of block creation
 	AggregatorsHash [32]byte
+
+	// The Chain ID
+	ChainID string
 }
 
 var _ encoding.BinaryMarshaler = &Header{}

types/hashing.go

@@ -32,6 +32,7 @@ func (h *Header) Hash() [32]byte {
 		LastResultsHash:    h.LastResultsHash[:],
 		EvidenceHash:       new(tmtypes.EvidenceData).Hash(),
 		ProposerAddress:    h.ProposerAddress,
+		ChainID:            h.ChainID,
 	}
 	var hash [32]byte
 	copy(hash[:], abciHeader.Hash())

types/pb/rollmint/rollmint.pb.go

@@ -199,13 +199,15 @@ func (h *Header) ToProto() *pb.Header {
 		LastResultsHash: h.LastResultsHash[:],
 		ProposerAddress: h.ProposerAddress[:],
 		AggregatorsHash: h.AggregatorsHash[:],
+		ChainId:         h.ChainID,
 	}
 }
 
 // FromProto fills Header with data from its protobuf representation.
 func (h *Header) FromProto(other *pb.Header) error {
 	h.Version.Block = other.Version.Block
 	h.Version.App = other.Version.App
+	h.ChainID = other.ChainId
 	if !safeCopy(h.NamespaceID[:], other.NamespaceId) {
 		return errors.New("invalid length of 'NamespaceId'")
 	}