Review feedback; minor fixes

Author: alpe

pkg/store/batch.go

@@ -2,6 +2,7 @@ package store
 
 import (
 	"context"
+	"crypto/sha256"
 	"fmt"
 
 	ds "github.com/ipfs/go-datastore"
@@ -69,9 +70,9 @@ func (b *DefaultBatch) SaveBlockData(header *types.SignedHeader, data *types.Dat
 		return fmt.Errorf("failed to put signature blob in batch: %w", err)
 	}
 
-	headerHash := types.HeaderHash(headerBlob)
+	headerHash := sha256.Sum256(headerBlob)
 	heightBytes := encodeHeight(height)
-	if err := b.batch.Put(b.ctx, ds.NewKey(getIndexKey(headerHash)), heightBytes); err != nil {
+	if err := b.batch.Put(b.ctx, ds.NewKey(getIndexKey(headerHash[:])), heightBytes); err != nil {
 		return fmt.Errorf("failed to put index key in batch: %w", err)
 	}
 

pkg/store/store.go

@@ -2,6 +2,7 @@ package store
 
 import (
 	"context"
+	"crypto/sha256"
 	"encoding/binary"
 	"errors"
 	"fmt"
@@ -247,8 +248,8 @@ func (s *DefaultStore) Rollback(ctx context.Context, height uint64, aggregator b
 		}
 
 		// Use HeaderHash to avoid re-marshaling the header
-		hash := types.HeaderHash(headerBlob)
-		if err := batch.Delete(ctx, ds.NewKey(getIndexKey(hash))); err != nil {
+		headerHash := sha256.Sum256(headerBlob)
+		if err := batch.Delete(ctx, ds.NewKey(getIndexKey(headerHash[:]))); err != nil {
 			return fmt.Errorf("failed to delete index key in batch: %w", err)
 		}
 

proto/evnode/v1/state.proto

@@ -15,7 +15,7 @@ message State {
   google.protobuf.Timestamp last_block_time = 5;
   uint64 da_height = 6;
   bytes app_hash = 8;
-  bytes LastHeaderHash = 9;
+  bytes last_header_hash = 9;
 
   reserved 7;
 }

types/hashing_test.go

@@ -139,7 +139,7 @@ func TestHeaderHashWithBytes(t *testing.T) {
 	// Hash using the function directly
 	headerBytes, err := header.MarshalBinary()
 	require.NoError(t, err)
-	hash2 := HeaderHash(headerBytes)
-
-	assert.Equal(t, hash1, hash2, "HeaderHash should produce same result as Header.Hash()")
+	var targetHeader Header
+	require.NoError(t, targetHeader.UnmarshalBinary(headerBytes))
+	assert.Equal(t, hash1, targetHeader.Hash(), "HeaderHash should produce same result as Header.Hash()")
 }