chore: 🤖 increase wait time on middleware sync to 6 secs

Author: prashantasdeveloper

src/__tests__/rest/compliance/fungible/tradeWithCompliance.ts

@@ -1,3 +1,4 @@
+import { BigNumber } from '@polymeshassociation/polymesh-sdk';
 import { ClaimType, InstructionStatus } from '@polymeshassociation/polymesh-sdk/types';
 
 import { assertTagPresent } from '~/assertions';
@@ -190,9 +191,6 @@ describe('Compliance Requirements for Fungible Assets', () => {
     expect(blockedReceiverInstruction).toEqual(
       assertTagPresent(expect, 'settlement.addAndAffirmWithMediators')
     );
-
-    await awaitMiddlewareSyncedForRestApi(investorInstruction, restClient);
-    await awaitMiddlewareSyncedForRestApi(blockedReceiverInstruction, restClient);
   });
 
   it('should be able to call affirm on instruction for both receivers', async () => {
@@ -227,6 +225,11 @@ describe('Compliance Requirements for Fungible Assets', () => {
     expect(blockedAffirmResult).toEqual(
       assertTagPresent(expect, 'settlement.affirmInstructionWithCount')
     );
+
+    // we add buffer of 1 block so that middleware can wait until InstructionExecuted event is processed ( which is done on next block where affirmations are received)
+    await awaitMiddlewareSyncedForRestApi(investorAffirmResult, restClient, new BigNumber(1));
+    // we add buffer of 1 block so that middleware can wait until FailedToExecuteInstruction event is processed ( which is done on next block where affirmations are received)
+    await awaitMiddlewareSyncedForRestApi(blockedAffirmResult, restClient, new BigNumber(1));
   });
 
   it('should have transferred asset to investor', async () => {

src/sdk/identities/claims.ts

@@ -41,7 +41,7 @@ export const manageClaims = async (
     { signingAccount }
   );
 
-  const middlewareSynced = () =>
+  let middlewareSynced = () =>
     new Promise((resolve) => addClaimTx.onProcessedByMiddleware(resolve));
 
   await addClaimTx.run();
@@ -66,9 +66,14 @@ export const manageClaims = async (
     },
     { signingAccount }
   );
+
+  middlewareSynced = () => new Promise((resolve) => revokeClaimTx.onProcessedByMiddleware(resolve));
+
   await revokeClaimTx.run();
   assert(revokeClaimTx.isSuccess);
 
+  await middlewareSynced();
+
   // This following portion demonstrates different ways to fetch claims
 
   // Note, without specifying `target` the signingIdentity claims will be fetched

src/util.ts

@@ -100,8 +100,9 @@ export const awaitMiddlewareSynced = async (
 export const awaitMiddlewareSyncedForRestApi = async (
   result: PostResult,
   restClient: RestClient,
+  bufferBlocks = new BigNumber(0),
   retries = 15,
-  delay = 2000
+  delay = 6000
 ): Promise<void> => {
   if (!('transactions' in result)) {
     throw new Error('Transaction was not successful or failed');
@@ -117,7 +118,10 @@ export const awaitMiddlewareSyncedForRestApi = async (
       const latestBlock = (metadata as { lastProcessedHeight: string })?.lastProcessedHeight;
 
       if (latestBlock && new BigNumber(latestBlock).gte(new BigNumber(txBlock))) {
-        return;
+        if (new BigNumber(latestBlock).gte(new BigNumber(txBlock).plus(bufferBlocks)) || i === 5) {
+          // this is a hacky way to get middleware to wait on syncing instruction execution event for SettleOnAffirmation type instruction
+          return;
+        }
       }
     } catch (err) {
       throw new Error(`Error checking middleware sync status: ${err}`);