From db90bd44450721b734098e757480bb3cc3a14063 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Fri, 12 Mar 2021 00:41:40 +0100
Subject: [PATCH 1/2] Properly handle missing commit signatures

---
 .../src/tendermint34/adaptors/v0-34/responses.ts            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts b/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts
index 9feb8c2e..3605890d 100644
--- a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts
+++ b/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts
@@ -414,11 +414,13 @@ type RpcSignature = {
 };
 
 function decodeCommitSignature(data: RpcSignature): CommitSignature {
+  const nonZeroTime = data.timestamp && !data.timestamp.startsWith("0001-01-01");
   return {
     blockIdFlag: decodeBlockIdFlag(data.block_id_flag),
     validatorAddress: fromHex(data.validator_address),
-    timestamp: fromRfc3339WithNanoseconds(assertNotEmpty(data.timestamp)),
-    signature: fromBase64(assertNotEmpty(data.signature)),
+    timestamp: nonZeroTime ? fromRfc3339WithNanoseconds(data.timestamp) : undefined,
+    // FIXME: make this optional in type? (signature?: Uint8Array)
+    signature: fromBase64(optional(data.signature, "")),
   };
 }
 

From c5e1b75c4053779c0081fe76990c09e248853a23 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Fri, 12 Mar 2021 20:26:03 +0100
Subject: [PATCH 2/2] Adapt types to fix

---
 .../src/tendermint34/adaptors/v0-34/responses.ts   | 14 ++++++++++----
 packages/tendermint-rpc/src/types.ts               |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts b/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts
index 3605890d..42f98f3f 100644
--- a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts
+++ b/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts
@@ -409,18 +409,24 @@ type RpcSignature = {
   /** hex encoded */
   readonly validator_address: string;
   readonly timestamp: string;
-  /** bae64 encoded */
-  readonly signature: string;
+  /**
+   * Base64 encoded signature.
+   * There are cases when this is not set, see https://github.com/cosmos/cosmjs/issues/704#issuecomment-797122415.
+   */
+  readonly signature: string | null;
 };
 
 function decodeCommitSignature(data: RpcSignature): CommitSignature {
   const nonZeroTime = data.timestamp && !data.timestamp.startsWith("0001-01-01");
   return {
     blockIdFlag: decodeBlockIdFlag(data.block_id_flag),
+    // FIXME: Return an optional validatorAddress instead of an empty Uint8Array
+    // in the next breaking release.
     validatorAddress: fromHex(data.validator_address),
     timestamp: nonZeroTime ? fromRfc3339WithNanoseconds(data.timestamp) : undefined,
-    // FIXME: make this optional in type? (signature?: Uint8Array)
-    signature: fromBase64(optional(data.signature, "")),
+    // FIXME: Return an optional signature instead of an empty Uint8Array
+    // in the next breaking release.
+    signature: fromBase64(data.signature || ""),
   };
 }
 
diff --git a/packages/tendermint-rpc/src/types.ts b/packages/tendermint-rpc/src/types.ts
index 1c62851c..d920f6d0 100644
--- a/packages/tendermint-rpc/src/types.ts
+++ b/packages/tendermint-rpc/src/types.ts
@@ -23,6 +23,7 @@ export enum BlockIdFlag {
 }
 
 export interface CommitSignature {
+  /** If this is BlockIdFlag.Absent, all other fields are expected to be unset */
   blockIdFlag: BlockIdFlag;
   validatorAddress: Uint8Array;
   timestamp?: ReadonlyDateWithNanoseconds;