fix(abci): use correct hash in abci block.LastCommit.BlockID

block/executor.go

@@ -173,7 +173,7 @@ func (e *Executor) CreateBlock(
 	}
 
 	block.Header.SetDymHeader(types.MakeDymHeader(block.Data.ConsensusMessages))
-	copy(block.Header.LastCommitHash[:], types.GetLastCommitHash(lastCommit, &block.Header))
+	copy(block.Header.LastCommitHash[:], types.GetLastCommitHash(lastCommit))
 	copy(block.Header.DataHash[:], types.GetDataHash(block))
 	copy(block.Header.SequencerHash[:], state.GetProposerHash())
 	copy(block.Header.NextSequencersHash[:], nextSeqHash[:])

rpc/client/client.go

@@ -519,7 +519,7 @@ func (c *Client) Commit(ctx context.Context, height *int64) (*ctypes.ResultCommi
 	if err != nil {
 		return nil, err
 	}
-	commit := types.ToABCICommit(com, &b.Header)
+	commit := types.ToABCICommit(com)
 	block, err := types.ToABCIBlock(b)
 	if err != nil {
 		return nil, err

testutil/types.go

@@ -148,7 +148,7 @@ func GenerateBlocks(startHeight uint64, num uint64, proposerKey crypto.PrivKey,
 		block := generateBlock(i+startHeight, proposerHash, lastHeaderHash)
 		copy(block.Header.DataHash[:], types.GetDataHash(block))
 		if i > 0 {
-			copy(block.Header.LastCommitHash[:], types.GetLastCommitHash(&blocks[i-1].LastCommit, &block.Header))
+			copy(block.Header.LastCommitHash[:], types.GetLastCommitHash(&blocks[i-1].LastCommit))
 		}
 
 		signature, err := generateSignature(proposerKey, &block.Header)
@@ -268,7 +268,7 @@ func GenerateLastBlocks(startHeight uint64, num uint64, proposerKey crypto.PrivK
 
 		copy(block.Header.DataHash[:], types.GetDataHash(block))
 		if i > 0 {
-			copy(block.Header.LastCommitHash[:], types.GetLastCommitHash(&blocks[i-1].LastCommit, &block.Header))
+			copy(block.Header.LastCommitHash[:], types.GetLastCommitHash(&blocks[i-1].LastCommit))
 		}
 
 		signature, err := generateSignature(proposerKey, &block.Header)

types/block.go

@@ -122,8 +122,9 @@ type IntermediateStateRoots struct {
 	RawRootsList [][]byte
 }
 
-func GetLastCommitHash(lastCommit *Commit, header *Header) []byte {
-	lastABCICommit := ToABCICommit(lastCommit, header)
+func GetLastCommitHash(lastCommit *Commit) []byte {
+	lastABCICommit := ToABCICommit(lastCommit)
+	// Note: hash only depends on the signature
 	return lastABCICommit.Hash()
 }
 

types/conv.go

@@ -50,17 +50,13 @@ func ToABCIHeader(header *Header) tmtypes.Header {
 // Returned block should pass `ValidateBasic`.
 func ToABCIBlock(block *Block) (*tmtypes.Block, error) {
 	abciHeader := ToABCIHeader(&block.Header)
-	abciCommit := ToABCICommit(&block.LastCommit, &block.Header)
-	// This assumes that we have only one signature
-	if len(abciCommit.Signatures) == 1 {
-		abciCommit.Signatures[0].ValidatorAddress = block.Header.ProposerAddress
-	}
+	abciLastCommit := ToABCICommit(&block.LastCommit)
 	abciBlock := tmtypes.Block{
 		Header: abciHeader,
 		Evidence: tmtypes.EvidenceData{
 			Evidence: nil,
 		},
-		LastCommit: abciCommit,
+		LastCommit: abciLastCommit,
 	}
 	abciBlock.Data.Txs = ToABCIBlockDataTxs(&block.Data)
 	abciBlock.Header.DataHash = block.Header.DataHash[:]
@@ -96,36 +92,20 @@ func ToABCIBlockMeta(block *Block) (*tmtypes.BlockMeta, error) {
 // ToABCICommit converts Dymint commit into commit format defined by ABCI.
 // This function only converts fields that are available in Dymint commit.
 // Other fields (especially ValidatorAddress and Timestamp of Signature) has to be filled by caller.
-func ToABCICommit(commit *Commit, header *Header) *tmtypes.Commit {
-	headerHash := header.Hash()
+func ToABCICommit(commit *Commit) *tmtypes.Commit {
 	tmCommit := tmtypes.Commit{
 		Height: int64(commit.Height), //nolint:gosec // height is non-negative and falls in int64
 		Round:  0,
 		BlockID: tmtypes.BlockID{
-			Hash: headerHash[:],
+			Hash: commit.HeaderHash[:],
 			PartSetHeader: tmtypes.PartSetHeader{
 				Total: 1,
-				Hash:  headerHash[:],
+				Hash:  commit.HeaderHash[:],
 			},
 		},
 	}
-	// Check if TMSignature exists. if not use the previous dymint signature for backwards compatibility.
-	if len(commit.TMSignature.Signature) == 0 {
-		for _, sig := range commit.Signatures {
-			commitSig := tmtypes.CommitSig{
-				BlockIDFlag: tmtypes.BlockIDFlagCommit,
-				Signature:   sig,
-			}
-			tmCommit.Signatures = append(tmCommit.Signatures, commitSig)
-		}
-		// This assumes that we have only one signature
-		if len(commit.Signatures) == 1 {
-			tmCommit.Signatures[0].ValidatorAddress = header.ProposerAddress
-			tmCommit.Signatures[0].Timestamp = header.GetTimestamp()
-		}
-	} else {
-		tmCommit.Signatures = append(tmCommit.Signatures, commit.TMSignature)
-	}
-
+	// Very old commits may not have a TM signature already. Should run a prior version of
+	// dymint to handle them.
+	tmCommit.Signatures = append(tmCommit.Signatures, commit.TMSignature)
 	return &tmCommit
 }