crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

BTC tidy-up

Browse Source
This commit is contained in:
catbref 2020-05-15 07:45:24 +01:00
parent c61690f3e6
commit f6ed3388a4
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/qortal/api/resource/CrossChainResource.java
View File

@ -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

6
src/main/java/org/qortal/crosschain/BTC.java
View File

@ -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...