From c8fe88124cda78255e4288fe644673f9459002e3 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 10 Apr 2025 11:39:43 -0400
Subject: [PATCH] fix: ensure only one from_block field is set in
 subscribeToTransactionsWithProofs

---
 .../subscribeToTransactionsWithProofsFactory.js    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/js-dapi-client/lib/methods/core/subscribeToTransactionsWithProofsFactory.js b/packages/js-dapi-client/lib/methods/core/subscribeToTransactionsWithProofsFactory.js
index bf1784291eb..a96eb2e90d2 100644
--- a/packages/js-dapi-client/lib/methods/core/subscribeToTransactionsWithProofsFactory.js
+++ b/packages/js-dapi-client/lib/methods/core/subscribeToTransactionsWithProofsFactory.js
@@ -39,7 +39,7 @@ function subscribeToTransactionsWithProofsFactory(grpcTransport) {
       ...options,
     };
 
-    if (options.fromBlockHeight === 0) {
+    if ('fromBlockHeight' in options && options.fromBlockHeight === 0) {
       throw new DAPIClientError('Invalid argument: minimum value for `fromBlockHeight` is 1');
     }
 
@@ -59,14 +59,14 @@ function subscribeToTransactionsWithProofsFactory(grpcTransport) {
     const request = new TransactionsWithProofsRequest();
     request.setBloomFilter(bloomFilterMessage);
 
-    if (options.fromBlockHeight !== undefined) {
-      request.setFromBlockHeight(options.fromBlockHeight);
-    }
-
-    if (options.fromBlockHash) {
+    if ('fromBlockHash' in options) {
       request.setFromBlockHash(
-        Buffer.from(options.fromBlockHash, 'hex'),
+        Buffer.isBuffer(options.fromBlockHash)
+          ? options.fromBlockHash
+          : Buffer.from(options.fromBlockHash, 'hex'),
       );
+    } else if ('fromBlockHeight' in options) {
+      request.setFromBlockHeight(options.fromBlockHeight);
     }
 
     request.setCount(options.count);