AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Further relaxed min latest block timestamp age to be considered "up to date" in a few places, from 30 to 60 mins. This should help reduce the visible effects of larger re-orgs if they happen again.

Browse Source
This commit is contained in:
CalDescent 2022-06-20 21:25:14 +01:00
parent c6cbd8e826
commit ffb27c3946
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/qortal/api/resource/TransactionsResource.java
View File

@ -723,9 +723,9 @@ public class TransactionsResource {
ApiError.BLOCKCHAIN_NEEDS_SYNC, ApiError.INVALID_SIGNATURE, ApiError.INVALID_DATA, ApiError.TRANSFORMATION_ERROR, ApiError.REPOSITORY_ISSUE ApiError.BLOCKCHAIN_NEEDS_SYNC, ApiError.INVALID_SIGNATURE, ApiError.INVALID_DATA, ApiError.TRANSFORMATION_ERROR, ApiError.REPOSITORY_ISSUE
}) })
public String processTransaction(String rawBytes58) { public String processTransaction(String rawBytes58) {
// Only allow a transaction to be processed if our latest block is less than 30 minutes old // Only allow a transaction to be processed if our latest block is less than 60 minutes old
// If older than this, we should first wait until the blockchain is synced // If older than this, we should first wait until the blockchain is synced
final Long minLatestBlockTimestamp = NTP.getTime() - (30 * 60 * 1000L); final Long minLatestBlockTimestamp = NTP.getTime() - (60 * 60 * 1000L);
if (!Controller.getInstance().isUpToDate(minLatestBlockTimestamp)) if (!Controller.getInstance().isUpToDate(minLatestBlockTimestamp))
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCKCHAIN_NEEDS_SYNC); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCKCHAIN_NEEDS_SYNC);

4
src/main/java/org/qortal/controller/Controller.java
View File

@ -787,8 +787,8 @@ public class Controller extends Thread {
String actionText; String actionText;
// Use a more tolerant latest block timestamp in the isUpToDate() calls below to reduce misleading statuses. // Use a more tolerant latest block timestamp in the isUpToDate() calls below to reduce misleading statuses.
// Any block in the last 30 minutes is considered "up to date" for the purposes of displaying statuses. // Any block in the last 60 minutes is considered "up to date" for the purposes of displaying statuses.
final Long minLatestBlockTimestamp = NTP.getTime() - (30 * 60 * 1000L); final Long minLatestBlockTimestamp = NTP.getTime() - (60 * 60 * 1000L);
synchronized (Synchronizer.getInstance().syncLock) { synchronized (Synchronizer.getInstance().syncLock) {
if (Settings.getInstance().isLite()) { if (Settings.getInstance().isLite()) {

4
src/main/java/org/qortal/controller/Synchronizer.java
View File

@ -171,8 +171,8 @@ public class Synchronizer extends Thread {
public Integer getSyncPercent() { public Integer getSyncPercent() {
synchronized (this.syncLock) { synchronized (this.syncLock) {
// Report as 100% synced if the latest block is within the last 30 mins // Report as 100% synced if the latest block is within the last 60 mins
final Long minLatestBlockTimestamp = NTP.getTime() - (30 * 60 * 1000L); final Long minLatestBlockTimestamp = NTP.getTime() - (60 * 60 * 1000L);
if (Controller.getInstance().isUpToDate(minLatestBlockTimestamp)) { if (Controller.getInstance().isUpToDate(minLatestBlockTimestamp)) {
return 100; return 100;
} }

4
src/main/java/org/qortal/controller/tradebot/TradeBot.java
View File

@ -242,8 +242,8 @@ public class TradeBot implements Listener {
if (!(event instanceof Synchronizer.NewChainTipEvent)) if (!(event instanceof Synchronizer.NewChainTipEvent))
return; return;
// Don't process trade bots or broadcast presence timestamps if our chain is more than 30 minutes old // Don't process trade bots or broadcast presence timestamps if our chain is more than 60 minutes old
final Long minLatestBlockTimestamp = NTP.getTime() - (30 * 60 * 1000L); final Long minLatestBlockTimestamp = NTP.getTime() - (60 * 60 * 1000L);
if (!Controller.getInstance().isUpToDate(minLatestBlockTimestamp)) if (!Controller.getInstance().isUpToDate(minLatestBlockTimestamp))
return; return;