From 299b3eb99ddfb6c9e9ab06287078f7e4ecc4fb5f Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Fri, 15 Jan 2021 07:40:47 -0700
Subject: [PATCH] fix: handle confirmationStatus field in TransactionStatus
 (#14583)

---
 web3.js/module.d.ts       | 6 ++++++
 web3.js/module.flow.js    | 6 ++++++
 web3.js/src/connection.js | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/web3.js/module.d.ts b/web3.js/module.d.ts
index 865a440418..8517c9c490 100644
--- a/web3.js/module.d.ts
+++ b/web3.js/module.d.ts
@@ -93,10 +93,16 @@ declare module '@solana/web3.js' {
     searchTransactionHistory: boolean;
   };
 
+  export type TransactionConfirmationStatus =
+    | 'processed'
+    | 'confirmed'
+    | 'finalized';
+
   export type SignatureStatus = {
     slot: number;
     err: TransactionError | null;
     confirmations: number | null;
+    confirmationStatus: TransactionConfirmationStatus | null;
   };
 
   export type ConfirmedSignatureInfo = {
diff --git a/web3.js/module.flow.js b/web3.js/module.flow.js
index 1fa61ed21e..a0552bd983 100644
--- a/web3.js/module.flow.js
+++ b/web3.js/module.flow.js
@@ -108,10 +108,16 @@ declare module '@solana/web3.js' {
     searchTransactionHistory: boolean,
   };
 
+  declare export type TransactionConfirmationStatus =
+    | 'processed'
+    | 'confirmed'
+    | 'finalized';
+
   declare export type SignatureStatus = {
     slot: number,
     err: TransactionError | null,
     confirmations: number | null,
+    confirmationStatus: TransactionConfirmationStatus | null,
   };
 
   declare export type ConfirmedSignatureInfo = {
diff --git a/web3.js/src/connection.js b/web3.js/src/connection.js
index 893b233bb8..df80ed7e4f 100644
--- a/web3.js/src/connection.js
+++ b/web3.js/src/connection.js
@@ -1090,6 +1090,7 @@ const GetSignatureStatusesRpcResult = jsonRpcResultAndContext(
         slot: 'number',
         confirmations: struct.union(['number', 'null']),
         err: TransactionErrorResult,
+        confirmationStatus: 'string?',
       }),
     ]),
   ]),
@@ -1577,11 +1578,13 @@ export type TransactionError = {};
  * @property {number} slot when the transaction was processed
  * @property {number | null} confirmations the number of blocks that have been confirmed and voted on in the fork containing `slot` (TODO)
  * @property {TransactionError | null} err error, if any
+ * @property {string | null} confirmationStatus the transaction's cluster confirmation status, if data available. Possible non-null responses: `processed`, `confirmed`, `finalized`
  */
 export type SignatureStatus = {
   slot: number,
   confirmations: number | null,
   err: TransactionError | null,
+  confirmationStatus: string | null,
 };
 
 /**