BTC tidy-up

src/main/java/org/qortal/api/resource/CrossChainResource.java

@@ -526,7 +526,10 @@ public class CrossChainResource {
 
 			Address p2shAddress = LegacyAddress.fromScriptHash(params, redeemScriptHash);
 
-			long medianBlockTime = BTC.getInstance().getMedianBlockTime();
+			Long medianBlockTime = BTC.getInstance().getMedianBlockTime();
+			if (medianBlockTime == null)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BTC_NETWORK_ISSUE);
+
 			long now = NTP.getTime();
 
 			// Check P2SH is funded
@@ -742,7 +745,10 @@ public class CrossChainResource {
 
 			Address p2shAddress = LegacyAddress.fromScriptHash(params, redeemScriptHash);
 
-			long medianBlockTime = BTC.getInstance().getMedianBlockTime();
+			Long medianBlockTime = BTC.getInstance().getMedianBlockTime();
+			if (medianBlockTime == null)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BTC_NETWORK_ISSUE);
+
 			long now = NTP.getTime();
 
 			// Check P2SH is funded

src/main/java/org/qortal/crosschain/BTC.java

@@ -508,7 +508,7 @@ public class BTC {
 
 		// 11 blocks, at roughly 10 minutes per block, means we should go back at least 110 minutes
 		// but some blocks have been way longer than 10 minutes, so be massively pessimistic
-		int startTime = (int) (System.currentTimeMillis() / 1000L) - 110 * 60; // 110 minutes before now, in seconds
+		int startTime = (int) (System.currentTimeMillis() / 1000L) - 11 * 60 * 60; // 11 hours before now, in seconds
 
 		try {
 			this.replayChain(startTime, null, null);
@@ -518,6 +518,10 @@ public class BTC {
 			for (int i = 0; i < 11; ++i) {
 				latestBlocks.add(block);
 				block = block.getPrev(this.blockStore);
+
+				// If previous block is null then chain replay didn't fetch any recent blocks (REGTEST)
+				if (block == null)
+					return null;
 			}
 
 			// Descending, but order shouldn't matter as we're picking median...