From 2bc6c4c2ae07102400abb2f11b737d7266e5a8db Mon Sep 17 00:00:00 2001
From: Thane Thomson <connect@thanethomson.com>
Date: Thu, 7 Apr 2022 15:56:23 -0400
Subject: [PATCH] Temporarily disable vote extension signature requirement

Signed-off-by: Thane Thomson <connect@thanethomson.com>
---
 types/vote.go      |  4 +++-
 types/vote_test.go | 26 +++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/types/vote.go b/types/vote.go
index 1ca9669e1..6d903fc08 100644
--- a/types/vote.go
+++ b/types/vote.go
@@ -173,7 +173,9 @@ func (vote *Vote) Verify(chainID string, pubKey crypto.PubKey) error {
 		return ErrVoteInvalidSignature
 	}
 	extSignBytes := VoteExtensionSignBytes(chainID, v)
-	if !pubKey.VerifySignature(extSignBytes, vote.ExtensionSignature) {
+	// TODO: Remove extension signature nil check to enforce vote extension
+	//       signing once we resolve https://github.com/tendermint/tendermint/issues/8272
+	if vote.ExtensionSignature != nil && !pubKey.VerifySignature(extSignBytes, vote.ExtensionSignature) {
 		return ErrVoteInvalidSignature
 	}
 	return nil
diff --git a/types/vote_test.go b/types/vote_test.go
index 1cf5d806e..949c996d0 100644
--- a/types/vote_test.go
+++ b/types/vote_test.go
@@ -221,22 +221,26 @@ func TestVoteExtension(t *testing.T) {
 			includeSignature: true,
 			expectError:      false,
 		},
-		{
-			name:             "no extension signature",
-			extension:        []byte("extension"),
-			includeSignature: false,
-			expectError:      true,
-		},
+		// TODO: Re-enable once
+		// https://github.com/tendermint/tendermint/issues/8272 is resolved.
+		//{
+		//	name:             "no extension signature",
+		//	extension:        []byte("extension"),
+		//	includeSignature: false,
+		//	expectError:      true,
+		//},
 		{
 			name:             "empty extension",
 			includeSignature: true,
 			expectError:      false,
 		},
-		{
-			name:             "no extension and no signature",
-			includeSignature: false,
-			expectError:      true,
-		},
+		// TODO: Re-enable once
+		// https://github.com/tendermint/tendermint/issues/8272 is resolved.
+		//{
+		//	name:             "no extension and no signature",
+		//	includeSignature: false,
+		//	expectError:      true,
+		//},
 	}
 
 	for _, tc := range testCases {