fix most of the conversions

block/executor.go

@@ -171,7 +171,8 @@ func (e *Executor) CreateBlock(
 		},
 		LastCommit: *lastCommit,
 	}
-	block.Header.Dym = types.NewDymHeader(block.Data.ConsensusMessages)
+
+	block.Header.SetDymHeader(types.MakeDymHeader(block.Data.ConsensusMessages))
 	copy(block.Header.LastCommitHash[:], types.GetLastCommitHash(lastCommit, &block.Header))
 	copy(block.Header.DataHash[:], types.GetDataHash(block))
 	copy(block.Header.SequencerHash[:], state.GetProposerHash())

da/celestia/celestia_test.go

@@ -320,7 +320,7 @@ func getRandomBlock(height uint64, nTxs int) *types.Block {
 	block := &types.Block{
 		Header: types.Header{
 			Height: height,
-			Dym:    types.NewDymHeader(nil),
+			Dym:    types.ConsMessagesHash(nil),
 		},
 		Data: types.Data{
 			Txs: make(types.Txs, nTxs),

da/da_test.go

@@ -210,7 +210,7 @@ func getRandomBlock(height uint64, nTxs int) *types.Block {
 	block := &types.Block{
 		Header: types.Header{
 			Height: height,
-			Dym:    types.NewDymHeader(nil),
+			Dym:    types.ConsMessagesHash(nil),
 		},
 		Data: types.Data{
 			Txs: make(types.Txs, nTxs),

rpc/client/client_test.go

@@ -929,11 +929,10 @@ func TestValidatorSetHandling(t *testing.T) {
 func getRandomBlock(height uint64, nTxs int) *types.Block {
 	block := &types.Block{
 		Header: types.Header{
-			Height:          height,
-			Version:         types.Version{Block: testutil.BlockVersion},
-			ProposerAddress: getRandomBytes(20),
-			Dym:             types.NewDymHeader(nil),
-		},
+			Height:                height,
+			Version:               types.Version{Block: testutil.BlockVersion},
+			ProposerAddress:       getRandomBytes(20),
+			ConsensusMessagesHash: types.ConsMessagesHash(nil)},
 		Data: types.Data{
 			Txs: make(types.Txs, nTxs),
 			IntermediateStateRoots: types.IntermediateStateRoots{

testutil/types.go

@@ -73,20 +73,19 @@ func generateBlock(height uint64, proposerHash []byte, lastHeaderHash [32]byte)
 				Block: BlockVersion,
 				App:   AppVersion,
 			},
-			Height:             height,
-			Time:               4567,
-			LastHeaderHash:     lastHeaderHash,
-			LastCommitHash:     h[0],
-			DataHash:           h[1],
-			ConsensusHash:      h[2],
-			AppHash:            [32]byte{},
-			LastResultsHash:    GetEmptyLastResultsHash(),
-			ProposerAddress:    []byte{4, 3, 2, 1},
-			SequencerHash:      [32]byte(proposerHash),
-			NextSequencersHash: [32]byte(proposerHash),
-			ChainID:            "test-chain",
-			Dym:                types.NewDymHeader(nil),
-		},
+			Height:                height,
+			Time:                  4567,
+			LastHeaderHash:        lastHeaderHash,
+			LastCommitHash:        h[0],
+			DataHash:              h[1],
+			ConsensusHash:         h[2],
+			AppHash:               [32]byte{},
+			LastResultsHash:       GetEmptyLastResultsHash(),
+			ProposerAddress:       []byte{4, 3, 2, 1},
+			SequencerHash:         [32]byte(proposerHash),
+			NextSequencersHash:    [32]byte(proposerHash),
+			ChainID:               "test-chain",
+			ConsensusMessagesHash: types.ConsMessagesHash(nil)},
 		Data: types.Data{
 			Txs:                    nil,
 			IntermediateStateRoots: types.IntermediateStateRoots{RawRootsList: [][]byte{{0x1}}},
@@ -390,7 +389,7 @@ func GetRandomBlock(height uint64, nTxs int) *types.Block {
 	block := &types.Block{
 		Header: types.Header{
 			Height: height,
-			Dym:    types.NewDymHeader(nil),
+			Dym:    types.ConsMessagesHash(nil),
 		},
 		Data: types.Data{
 			Txs: make(types.Txs, nTxs),

types/conv.go

@@ -40,7 +40,7 @@ func ToABCIHeader(header *Header) tmtypes.Header {
 		ConsensusHash:      header.ConsensusHash[:],
 		AppHash:            header.AppHash[:],
 		LastResultsHash:    header.LastResultsHash[:],
-		EvidenceHash:       header.Dym.Hash(), // Overloaded, we don't need the evidence field because we don't use comet.
+		EvidenceHash:       header.DymHash(), // Overloaded, we don't need the evidence field because we don't use comet.
 		ProposerAddress:    header.ProposerAddress,
 		ChainID:            header.ChainID,
 	}

types/dym_header.go

@@ -10,27 +10,39 @@ import (
 	_ "github.com/tendermint/tendermint/types"
 )
 
-func NewDymHeader(cons []*proto.Any) *DymHeader {
-	return &DymHeader{
-		ConsensusMessagesHash: consMessagesHash(cons),
-	}
+// a convenience struct to make computing easier
+// persisted and over the wire types use a flat representation
+type DymHeader struct {
+	ConsensusMessagesHash [32]byte
 }
 
-func (d *DymHeader) ValidateBasic() error {
-	if d == nil {
-		return ErrInvalidDymHeaderNil
+func MakeDymHeader(consMessages []*proto.Any) DymHeader {
+	return DymHeader{
+		ConsensusMessagesHash: ConsMessagesHash(consMessages),
 	}
-	return nil
 }
 
-func (d *DymHeader) Hash() cmtbytes.HexBytes {
+func (h *Header) SetDymHeader(dh DymHeader) {
+	h.ConsensusMessagesHash = dh.ConsensusMessagesHash
+}
+
+func (h *Header) DymHash() cmtbytes.HexBytes {
 	// 32 bytes long
 	return merkle.HashFromByteSlices([][]byte{
-		d.ConsensusMessagesHash[:],
+		h.ConsensusMessagesHash[:],
 		// can be extended with other things if we need to later
 	})
 }
 
+func dymHashFr(blocks []*Block) cmtbytes.HexBytes {
+	// 32 bytes long
+	bzz := make([][]byte, len(blocks))
+	for i, block := range blocks {
+		bzz[i] = block.Header.DymHash()
+	}
+	return merkle.HashFromByteSlices(bzz)
+}
+
 func (d *DymHeader) ToProto() *pb.DymHeader {
 	if d == nil {
 		// responsibility of caller to validate
@@ -51,7 +63,7 @@ func (d *DymHeader) FromProto(o *pb.DymHeader) error {
 	return nil // just return error anyway to stick with pattern
 }
 
-func consMessagesHash(msgs []*proto.Any) [32]byte {
+func ConsMessagesHash(msgs []*proto.Any) [32]byte {
 	bzz := make([][]byte, len(msgs))
 	for i, msg := range msgs {
 		var err error

types/serialization.go

@@ -84,21 +84,21 @@ func (c *Commit) UnmarshalBinary(data []byte) error {
 // ToProto converts Header into protobuf representation and returns it.
 func (h *Header) ToProto() *pb.Header {
 	return &pb.Header{
-		Version:           &pb.Version{Block: h.Version.Block, App: h.Version.App},
-		NamespaceId:       []byte{},
-		Height:            h.Height,
-		Time:              h.Time,
-		LastHeaderHash:    h.LastHeaderHash[:],
-		LastCommitHash:    h.LastCommitHash[:],
-		DataHash:          h.DataHash[:],
-		ConsensusHash:     h.ConsensusHash[:],
-		AppHash:           h.AppHash[:],
-		LastResultsHash:   h.LastResultsHash[:],
-		ProposerAddress:   h.ProposerAddress[:],
-		SequencerHash:     h.SequencerHash[:],
-		NextSequencerHash: h.NextSequencersHash[:],
-		ChainId:           h.ChainID,
-		Dym:               h.Dym.ToProto(),
+		Version:               &pb.Version{Block: h.Version.Block, App: h.Version.App},
+		NamespaceId:           []byte{},
+		Height:                h.Height,
+		Time:                  h.Time,
+		LastHeaderHash:        h.LastHeaderHash[:],
+		LastCommitHash:        h.LastCommitHash[:],
+		DataHash:              h.DataHash[:],
+		ConsensusHash:         h.ConsensusHash[:],
+		AppHash:               h.AppHash[:],
+		LastResultsHash:       h.LastResultsHash[:],
+		ProposerAddress:       h.ProposerAddress[:],
+		SequencerHash:         h.SequencerHash[:],
+		NextSequencerHash:     h.NextSequencersHash[:],
+		ChainId:               h.ChainID,
+		ConsensusMessagesHash: h.ConsensusMessagesHash[:],
 	}
 }
 
@@ -137,11 +137,8 @@ func (h *Header) FromProto(other *pb.Header) error {
 		h.ProposerAddress = make([]byte, len(other.ProposerAddress))
 		copy(h.ProposerAddress, other.ProposerAddress)
 	}
-	if h.Dym != nil {
-		h.Dym = &DymHeader{}
-		if err := h.Dym.FromProto(other.Dym); err != nil {
-			return err
-		}
+	if !safeCopy(h.ConsensusMessagesHash[:], other.ConsensusMessagesHash) {
+		return errors.New("invalid length of 'SequencersHash'")
 	}
 	return nil
 }

types/serialization_test.go

@@ -48,18 +48,17 @@ func TestBlockSerializationRoundTrip(t *testing.T) {
 					Block: 1,
 					App:   2,
 				},
-				Height:             3,
-				Time:               4567,
-				LastHeaderHash:     h[0],
-				LastCommitHash:     h[1],
-				DataHash:           h[2],
-				ConsensusHash:      h[3],
-				AppHash:            h[4],
-				LastResultsHash:    h[5],
-				ProposerAddress:    []byte{4, 3, 2, 1},
-				NextSequencersHash: h[6],
-				Dym:                types.NewDymHeader(nil),
-			},
+				Height:                3,
+				Time:                  4567,
+				LastHeaderHash:        h[0],
+				LastCommitHash:        h[1],
+				DataHash:              h[2],
+				ConsensusHash:         h[3],
+				AppHash:               h[4],
+				LastResultsHash:       h[5],
+				ProposerAddress:       []byte{4, 3, 2, 1},
+				NextSequencersHash:    h[6],
+				ConsensusMessagesHash: types.ConsMessagesHash(nil)},
 			Data: types.Data{
 				Txs:                    nil,
 				IntermediateStateRoots: types.IntermediateStateRoots{RawRootsList: [][]byte{{0x1}}},

types/validation.go

@@ -50,6 +50,7 @@ func (b *Block) ValidateBasic() error {
 }
 
 func (b *Block) validateDymHeader() error {
+	if !bytes.Equal(b.Header.DymHash(), NewDymHeader(b.Data.ConsensusMessages).Hash()) {
 	if !bytes.Equal(b.Header.Dym.Hash(), NewDymHeader(b.Data.ConsensusMessages).Hash()) {
 		return ErrInvalidDymHeaderHash
 	}