fix data block hash

Author: philipsu522

internal/consensus/state.go

@@ -2090,8 +2090,10 @@ func (cs *State) finalizeCommit(ctx context.Context, height int64) {
 		defer storeBlockSpan.End()
 		seenExtendedCommit := cs.Votes.Precommits(cs.CommitRound).MakeExtendedCommit()
 		if cs.state.ConsensusParams.ABCI.VoteExtensionsEnabled(block.Height) {
+			logger.Info("PSULOG - saving block with extension with data", "len of txs", len(block.Data.Txs))
 			cs.blockStore.SaveBlockWithExtendedCommit(block, blockParts, seenExtendedCommit)
 		} else {
+			logger.Info("PSULOG - saving block without extension with data", "len of txs", len(block.Data.Txs), "block parts", blockParts)
 			cs.blockStore.SaveBlock(block, blockParts, seenExtendedCommit.ToCommit())
 		}
 		storeBlockSpan.End()
@@ -2380,7 +2382,15 @@ func (cs *State) addProposalBlockPart(
 					cs.logger.Info("PSULOG - populating txs with keys", "keys", txKeys)
 					txs := cs.blockExec.GetTxsForKeys(txKeys)
 					block.Data.Txs = txs
+					block.DataHash = block.Data.Hash()
 					cs.ProposalBlock = block
+					cs.logger.Info("PSULOG - setting proposal block", "block", block)
+					partSet, err := block.MakePartSet(types.BlockPartSizeBytes)
+					if err != nil {
+						return false, nil
+					}
+
+					cs.ProposalBlockParts = partSet
 					// NOTE: it's possible to receive complete proposal blocks for future rounds without having the proposal
 					cs.logger.Info("received complete proposal block", "height", cs.ProposalBlock.Height, "hash", cs.ProposalBlock.Hash(), "time", time.Now().UnixMilli())
 				}

proto/tendermint/consensus/types.proto

@@ -64,8 +64,8 @@ message HasVote {
   int32                          index  = 4;
 }
 
-// VoteSetMaj23 is sent to indicate that a given BlockID has seen +2/3 votes.
 message VoteSetMaj23 {
+  // VoteSetMaj23 is sent to indicate that a given BlockID has seen +2/3 votes.
   int64                          height   = 1;
   int32                          round    = 2;
   tendermint.types.SignedMsgType type     = 3;

rpc/client/http/http.go

@@ -3,6 +3,7 @@ package http
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -33,24 +34,24 @@ the example for more details.
 
 Example:
 
-		c, err := New("http://192.168.1.10:26657")
-		if err != nil {
-			// handle error
-		}
+	c, err := New("http://192.168.1.10:26657")
+	if err != nil {
+		// handle error
+	}
 
-		// call Start/Stop if you're subscribing to events
-		err = c.Start()
-		if err != nil {
-			// handle error
-		}
-		defer c.Stop()
+	// call Start/Stop if you're subscribing to events
+	err = c.Start()
+	if err != nil {
+		// handle error
+	}
+	defer c.Stop()
 
-		res, err := c.Status()
-		if err != nil {
-			// handle error
-		}
+	res, err := c.Status()
+	if err != nil {
+		// handle error
+	}
 
-		// handle result
+	// handle result
 */
 type HTTP struct {
 	remote string
@@ -428,6 +429,7 @@ func (c *baseRPCClient) Commit(ctx context.Context, height *int64) (*coretypes.R
 
 func (c *baseRPCClient) Tx(ctx context.Context, hash bytes.HexBytes, prove bool) (*coretypes.ResultTx, error) {
 	result := new(coretypes.ResultTx)
+	fmt.Println("Calling tx search")
 	if err := c.caller.Call(ctx, "tx", &coretypes.RequestTx{Hash: hash, Prove: prove}, result); err != nil {
 		return nil, err
 	}

rpc/jsonrpc/client/decode.go

@@ -12,7 +12,7 @@ func unmarshalResponseBytes(responseBytes []byte, expectedID string, result inte
 	// into the correct type.
 	var response rpctypes.RPCResponse
 	if err := json.Unmarshal(responseBytes, &response); err != nil {
-		return fmt.Errorf("unmarshaling response: %w", err)
+		return fmt.Errorf("unmarshaling response test: %w, bytes: %d", err, len(responseBytes))
 	}
 
 	if response.Error != nil {

types/block.go

@@ -76,7 +76,7 @@ func (b *Block) ValidateBasic() error {
 
 	// NOTE: b.Data.Txs may be nil, but b.Data.Hash() still works fine.
 	if w, g := b.Data.Hash(), b.DataHash; !bytes.Equal(w, g) {
-		return fmt.Errorf("wrong Header.DataHash. Expected %X, got %X", w, g)
+		return fmt.Errorf("wrong Header.DataHash. Expected %X, got %X. Len of txs %d", w, g, len(b.Data.Txs))
 	}
 
 	// NOTE: b.Evidence may be nil, but we're just looping.
@@ -1306,9 +1306,9 @@ func (data *Data) Hash() tmbytes.HexBytes {
 	if data == nil {
 		return (Txs{}).Hash()
 	}
-	if data.hash == nil {
-		data.hash = data.Txs.Hash() // NOTE: leaves of merkle tree are TxIDs
-	}
+	//if data.hash == nil {
+	data.hash = data.Txs.Hash() // NOTE: leaves of merkle tree are TxIDs
+	//}
 	return data.hash
 }