From 8f8a500dcdfeb9500a8f9fc08bd1472354976d50 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Mon, 10 Jan 2022 19:26:25 +0000 Subject: [PATCH] Fixed some issues left over from the qortaldata project --- src/main/java/org/qortal/controller/Controller.java | 2 +- src/main/java/org/qortal/settings/Settings.java | 8 ++++---- src/main/java/org/qortal/transaction/Transaction.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java index aff35b38..2bfc80c2 100644 --- a/src/main/java/org/qortal/controller/Controller.java +++ b/src/main/java/org/qortal/controller/Controller.java @@ -90,7 +90,7 @@ public class Controller extends Thread { /** Controller start-up time (ms) taken using System.currentTimeMillis(). */ public static final long startTime = System.currentTimeMillis(); - public static final String VERSION_PREFIX = "qortaldata-"; + public static final String VERSION_PREFIX = "qortal-"; private static final Logger LOGGER = LogManager.getLogger(Controller.class); private static final long MISBEHAVIOUR_COOLOFF = 10 * 60 * 1000L; // ms diff --git a/src/main/java/org/qortal/settings/Settings.java b/src/main/java/org/qortal/settings/Settings.java index 505ed6be..6715f401 100644 --- a/src/main/java/org/qortal/settings/Settings.java +++ b/src/main/java/org/qortal/settings/Settings.java @@ -32,11 +32,11 @@ import org.qortal.utils.EnumUtils; @XmlAccessorType(XmlAccessType.FIELD) public class Settings { - private static final int MAINNET_LISTEN_PORT = 12394; - private static final int TESTNET_LISTEN_PORT = 62394; + private static final int MAINNET_LISTEN_PORT = 12392; + private static final int TESTNET_LISTEN_PORT = 62392; - private static final int MAINNET_API_PORT = 12393; - private static final int TESTNET_API_PORT = 62393; + private static final int MAINNET_API_PORT = 12391; + private static final int TESTNET_API_PORT = 62391; private static final int MAINNET_DOMAIN_MAP_PORT = 80; private static final int TESTNET_DOMAIN_MAP_PORT = 8080; diff --git a/src/main/java/org/qortal/transaction/Transaction.java b/src/main/java/org/qortal/transaction/Transaction.java index 43591374..bc1555c8 100644 --- a/src/main/java/org/qortal/transaction/Transaction.java +++ b/src/main/java/org/qortal/transaction/Transaction.java @@ -382,7 +382,7 @@ public abstract class Transaction { * @return transaction version number */ public static int getVersionByTimestamp(long timestamp) { - return 5; // TODO: hard fork timestamp!! + return 4; // TODO: hard fork timestamp!! } /**