From f3a25d48a9eff93c5b7ce18eef69ac881ecdf6af Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Fri, 3 Jun 2022 16:52:26 -0400
Subject: [PATCH] consensus: fix consensus timeouts when using defaults

---
 internal/consensus/state.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/consensus/state.go b/internal/consensus/state.go
index 3af775bb6..ea42b2706 100644
--- a/internal/consensus/state.go
+++ b/internal/consensus/state.go
@@ -2796,7 +2796,8 @@ func (cs *State) voteTimeout(round int32) time.Duration {
 }
 
 func (cs *State) commitTime(t time.Time) time.Time {
-	c := cs.state.ConsensusParams.Timeout.Commit
+	tp := cs.state.ConsensusParams.Timeout.TimeoutParamsOrDefaults()
+	c := tp.Commit
 	if cs.config.UnsafeCommitTimeoutOverride != 0 {
 		c = cs.config.UnsafeProposeTimeoutOverride
 	}
@@ -2804,10 +2805,12 @@ func (cs *State) commitTime(t time.Time) time.Time {
 }
 
 func (cs *State) bypassCommitTimeout() bool {
+	tp := cs.state.ConsensusParams.Timeout.TimeoutParamsOrDefaults()
+	b := tp.BypassCommitTimeout
 	if cs.config.UnsafeBypassCommitTimeoutOverride != nil {
 		return *cs.config.UnsafeBypassCommitTimeoutOverride
 	}
-	return cs.state.ConsensusParams.Timeout.BypassCommitTimeout
+	return b
 }
 
 func (cs *State) calculateProposalTimestampDifferenceMetric() {