From 199833bdd45ee0468a85bdd92f7991dd219eac00 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Wed, 24 Nov 2021 15:21:08 +0000
Subject: [PATCH] Fixed issue with GET /crosschain/trades API endpoint where
 the minimumTimestamp parameter returned inconsistent results.

---
 src/main/java/org/qortal/api/resource/CrossChainResource.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/qortal/api/resource/CrossChainResource.java b/src/main/java/org/qortal/api/resource/CrossChainResource.java
index b180f11e..fa1ebbb6 100644
--- a/src/main/java/org/qortal/api/resource/CrossChainResource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainResource.java
@@ -195,7 +195,8 @@ public class CrossChainResource {
 
 			if (minimumTimestamp != null) {
 				minimumFinalHeight = repository.getBlockRepository().getHeightFromTimestamp(minimumTimestamp);
-				if (minimumFinalHeight == 0) {
+				// If not found in the block repository it will return either 0 or 1
+				if (minimumFinalHeight == 0 || minimumFinalHeight == 1) {
 					// Try the archive
 					minimumFinalHeight = repository.getBlockArchiveRepository().getHeightFromTimestamp(minimumTimestamp);
 				}