From f50721c36a8f0f097d6859892cce148ae588990e Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Fri, 28 Jan 2022 17:17:15 -0500
Subject: [PATCH] add nil checks to ConsensusParamsFromProto

---
 types/params.go | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/types/params.go b/types/params.go
index eaa91195f..b4905c6f0 100644
--- a/types/params.go
+++ b/types/params.go
@@ -299,25 +299,31 @@ func (params *ConsensusParams) ToProto() tmproto.ConsensusParams {
 }
 
 func ConsensusParamsFromProto(pbParams tmproto.ConsensusParams) ConsensusParams {
-	return ConsensusParams{
-		Block: BlockParams{
+	c := ConsensusParams{}
+	if pbParams.Block != nil {
+		c.Block = BlockParams{
 			MaxBytes: pbParams.Block.MaxBytes,
 			MaxGas:   pbParams.Block.MaxGas,
-		},
-		Evidence: EvidenceParams{
-			MaxAgeNumBlocks: pbParams.Evidence.MaxAgeNumBlocks,
-			MaxAgeDuration:  pbParams.Evidence.MaxAgeDuration,
-			MaxBytes:        pbParams.Evidence.MaxBytes,
-		},
-		Validator: ValidatorParams{
+		}
+	}
+
+	if pbParams.Validator != nil {
+		c.Validator = ValidatorParams{
 			PubKeyTypes: pbParams.Validator.PubKeyTypes,
-		},
-		Version: VersionParams{
+		}
+	}
+
+	if pbParams.Validator != nil {
+		c.Version = VersionParams{
 			AppVersion: pbParams.Version.AppVersion,
-		},
-		Synchrony: SynchronyParams{
+		}
+	}
+
+	if pbParams.Synchrony != nil {
+		c.Synchrony = SynchronyParams{
 			MessageDelay: pbParams.Synchrony.MessageDelay,
 			Precision:    pbParams.Synchrony.Precision,
-		},
+		}
 	}
+	return c
 }