Add more verbosity to fork digest mismatch (#14968)

terencechain · web-flow · commit 56208aa84d55 · 2025-02-21T03:36:31.000Z
diff --git a/beacon-chain/sync/rpc_status.go b/beacon-chain/sync/rpc_status.go
@@ -295,7 +295,7 @@ func (s *Service) validateStatusMessage(ctx context.Context, msg *pb.Status) err
 		return err
 	}
 	if !bytes.Equal(forkDigest[:], msg.ForkDigest) {
-		return p2ptypes.ErrWrongForkDigestVersion
+		return fmt.Errorf("mismatch fork digest: expected %#x, got %#x: %w", forkDigest[:], msg.ForkDigest, p2ptypes.ErrWrongForkDigestVersion)
 	}
 	genesis := s.cfg.clock.GenesisTime()
 	cp := s.cfg.chain.FinalizedCheckpt()
diff --git a/changelog/tt_fork_digest.md b/changelog/tt_fork_digest.md
@@ -0,0 +1,3 @@
+### Ignored
+
+- Add more debugging information to mismatch fork digest error message

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ func (s Service) validateStatusMessage(ctx context.Context, msg pb.Status) err`
`295`	`295`	`return err`
`296`	`296`	`}`
`297`	`297`	`if !bytes.Equal(forkDigest[:], msg.ForkDigest) {`
`298`		`- return p2ptypes.ErrWrongForkDigestVersion`
	`298`	`+ return fmt.Errorf("mismatch fork digest: expected %#x, got %#x: %w", forkDigest[:], msg.ForkDigest, p2ptypes.ErrWrongForkDigestVersion)`
`299`	`299`	`}`
`300`	`300`	`genesis := s.cfg.clock.GenesisTime()`
`301`	`301`	`cp := s.cfg.chain.FinalizedCheckpt()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+### Ignored`
	`2`	`+`
	`3`	`+- Add more debugging information to mismatch fork digest error message`