From 3e911f91a6a383457200a1838f3a71690b75ce8a Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 21 Sep 2020 12:30:59 +0200
Subject: [PATCH] Make TxEvent.index optional

---
 packages/tendermint-rpc/src/client.spec.ts     | 2 --
 packages/tendermint-rpc/src/responses.ts       | 3 ++-
 packages/tendermint-rpc/src/v0-33/responses.ts | 5 +++--
 packages/tendermint-rpc/types/responses.d.ts   | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/tendermint-rpc/src/client.spec.ts b/packages/tendermint-rpc/src/client.spec.ts
index 65f93e83..8c1c1a37 100644
--- a/packages/tendermint-rpc/src/client.spec.ts
+++ b/packages/tendermint-rpc/src/client.spec.ts
@@ -510,7 +510,6 @@ function websocketTestSuite(rpcFactory: () => RpcClient, adaptor: Adaptor, expec
     const subscription = stream.subscribe({
       next: (event) => {
         expect(event.height).toBeGreaterThan(0);
-        expect(event.index).toEqual(0);
         expect(event.result).toBeTruthy();
         expect(event.result.events.length).toBeGreaterThanOrEqual(1);
 
@@ -557,7 +556,6 @@ function websocketTestSuite(rpcFactory: () => RpcClient, adaptor: Adaptor, expec
     const subscription = stream.subscribe({
       next: (event) => {
         expect(event.height).toBeGreaterThan(0);
-        expect(event.index).toEqual(0);
         expect(event.result).toBeTruthy();
         expect(event.result.events.length).toBeGreaterThanOrEqual(1);
         events.push(event);
diff --git a/packages/tendermint-rpc/src/responses.ts b/packages/tendermint-rpc/src/responses.ts
index 92fadb4a..c3f78a8f 100644
--- a/packages/tendermint-rpc/src/responses.ts
+++ b/packages/tendermint-rpc/src/responses.ts
@@ -153,7 +153,8 @@ export interface TxEvent {
   readonly tx: TxBytes;
   readonly hash: TxHash;
   readonly height: number;
-  readonly index: number;
+  /** @deprecated this value is not set in Tendermint 0.34+ */
+  readonly index?: number;
   readonly result: TxData;
 }
 
diff --git a/packages/tendermint-rpc/src/v0-33/responses.ts b/packages/tendermint-rpc/src/v0-33/responses.ts
index 3b17a02e..b21960a8 100644
--- a/packages/tendermint-rpc/src/v0-33/responses.ts
+++ b/packages/tendermint-rpc/src/v0-33/responses.ts
@@ -619,7 +619,8 @@ interface RpcTxEvent {
   readonly tx: Base64String;
   readonly result: RpcTxData;
   readonly height: IntegerString;
-  readonly index: number;
+  /** Not set since Tendermint 0.34 */
+  readonly index?: number;
 }
 
 function decodeTxEvent(data: RpcTxEvent): responses.TxEvent {
@@ -629,7 +630,7 @@ function decodeTxEvent(data: RpcTxEvent): responses.TxEvent {
     hash: hashTx(tx),
     result: decodeTxData(data.result),
     height: Integer.parse(assertNotEmpty(data.height)),
-    index: Integer.parse(assertNumber(data.index)),
+    index: may(Integer.parse, data.index),
   };
 }
 
diff --git a/packages/tendermint-rpc/types/responses.d.ts b/packages/tendermint-rpc/types/responses.d.ts
index b73f6ebc..09221e60 100644
--- a/packages/tendermint-rpc/types/responses.d.ts
+++ b/packages/tendermint-rpc/types/responses.d.ts
@@ -120,7 +120,8 @@ export interface TxEvent {
   readonly tx: TxBytes;
   readonly hash: TxHash;
   readonly height: number;
-  readonly index: number;
+  /** @deprecated this value is not set in Tendermint 0.34+ */
+  readonly index?: number;
   readonly result: TxData;
 }
 /** An event attribute */