fix: waitForTransactionToBeProvable not waiting for blocks

lib/externalApis/tenderdash/BlockchainListener.js

@@ -94,18 +94,20 @@ class BlockchainListener extends EventEmitter {
     ]);
   }
 
-  waitForNextBlock() {
+  async waitForBlocks(countToWait = 1) {
     return new Promise((resolve) => {
-      this.once(events.NEW_BLOCK, resolve);
-    });
-  }
+      let blocksSeen = 0;
+      const handler = (data) => {
+        blocksSeen += 1;
 
-  async waitForBlocks(countToWait = 1) {
-    let blocksSeen = 0;
-    while (blocksSeen !== countToWait) {
-      await this.waitForNextBlock();
-      blocksSeen += 1;
-    }
+        if (blocksSeen >= countToWait) {
+          this.off(events.NEW_BLOCK, handler);
+          resolve(data);
+        }
+      };
+
+      this.on(events.NEW_BLOCK, handler);
+    });
   }
 }
 

lib/grpcServer/handlers/platform/waitForStateTransitionResultHandlerFactory.js

@@ -114,9 +114,8 @@ function waitForStateTransitionResultHandlerFactory(
       return response;
     }
 
-    // The first block is the one with the current ST, second block is the
-    // block in which st result will be included in the proof
-    await blockchainListener.waitForBlocks(2);
+    // The state tree which contains the proof will be updated in the next block
+    await blockchainListener.waitForBlocks(1);
 
     if (prove) {
       const stateTransition = await dpp.stateTransition.createFromBuffer(

test/integration/externalApis/tenderdash/BlockchainListener.spec.js

@@ -143,7 +143,7 @@ describe('BlockchainListener', () => {
       await blockPromise;
 
       // Check that event listener was properly attached
-      expect(blockchainListener.on).to.be.calledTwice();
+      expect(blockchainListener.on).to.be.calledOnce();
       // Check that transaction data was emitted
       expect(blockchainListener.emit).to.be.calledTwice();
       // Check that the event listener was properly removed