feat(connector-xdai): add interval to pollForTxReceipt

Signed-off-by: Pritam Singh <pkspritam16@gmail.com>
hyperledger-cacti · Jun 28, 2021 · 40be742 · 40be742
1 parent d470540
commit 40be742
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/packages/cactus-plugin-ledger-connector-xdai/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-xdai/src/main/json/openapi.json
@@ -55,6 +55,11 @@
                         "type": "integer",
                         "minimum": 0,
                         "description": "The number of blocks to wait to be confirmed in addition to the block containing the transaction in question. Note that if the receipt type is set to only wait for node transaction pool ACK and this parameter is set to anything, but zero then the API will not accept the request due to conflicting parameters."
+                    },
+                    "pollIntervalMs" : {
+                        "type": "integer",
+                        "minimum": 0,
+                        "description": "The amount of time (in milliseconds) connector will wait before making another confiramtion request to the network in case of previous confiramtion request fails"
                     }
                 }
             },

diff --git a/...lugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/api.ts b/...lugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/api.ts
@@ -45,6 +45,12 @@ export interface ConsistencyStrategy {
      * @memberof ConsistencyStrategy
      */
     blockConfirmations: number;
+    /**
+     * The amount of time (in milliseconds) connector will wait before making another confiramtion request to the network in case of previous confiramtion request fails
+     * @type {number}
+     * @memberof ConsistencyStrategy
+     */
+    pollIntervalMs?: number;
 }
 /**
  * 

diff --git a/...s/cactus-plugin-ledger-connector-xdai/src/main/typescript/plugin-ledger-connector-xdai.ts b/...s/cactus-plugin-ledger-connector-xdai/src/main/typescript/plugin-ledger-connector-xdai.ts
@@ -482,6 +482,9 @@ export class PluginLedgerConnectorXdai
     consistencyStrategy: ConsistencyStrategy,
   ): Promise<TransactionReceipt> {
     const fnTag = `${this.className}#pollForTxReceipt()`;
+    if (consistencyStrategy.receiptType === ReceiptType.NodeTxPoolAck) {
+      consistencyStrategy.blockConfirmations = 0;
+    }
     let txReceipt;
     let timedOut = false;
     let tries = 0;
@@ -496,14 +499,18 @@ export class PluginLedgerConnectorXdai
         break;
       }
 
+      await new Promise((resolve) =>
+        setTimeout(resolve, consistencyStrategy.pollIntervalMs),
+      );
+
       txReceipt = await this.web3.eth.getTransactionReceipt(txHash);
       if (!txReceipt) {
         continue;
       }
 
       const latestBlockNo = await this.web3.eth.getBlockNumber();
       confirmationCount = latestBlockNo - txReceipt.blockNumber;
-    } while (confirmationCount >= consistencyStrategy.blockConfirmations);
+    } while (confirmationCount < consistencyStrategy.blockConfirmations);
 
     if (!txReceipt) {
       throw new Error(`${fnTag} Timed out ${timeoutMs}ms, polls=${tries}`);