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

Fixed some issues left over from the qortaldata project

Browse Source
This commit is contained in:
CalDescent 2022-01-10 19:26:25 +00:00
parent f9749cd82c
commit 8f8a500dcd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ public class Controller extends Thread {
/** Controller start-up time (ms) taken using <tt>System.currentTimeMillis()</tt>. */ /** Controller start-up time (ms) taken using <tt>System.currentTimeMillis()</tt>. */
public static final long startTime = 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 Logger LOGGER = LogManager.getLogger(Controller.class);
private static final long MISBEHAVIOUR_COOLOFF = 10 * 60 * 1000L; // ms private static final long MISBEHAVIOUR_COOLOFF = 10 * 60 * 1000L; // ms

8
src/main/java/org/qortal/settings/Settings.java
View File

@ -32,11 +32,11 @@ import org.qortal.utils.EnumUtils;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class Settings { public class Settings {
private static final int MAINNET_LISTEN_PORT = 12394; private static final int MAINNET_LISTEN_PORT = 12392;
private static final int TESTNET_LISTEN_PORT = 62394; private static final int TESTNET_LISTEN_PORT = 62392;
private static final int MAINNET_API_PORT = 12393; private static final int MAINNET_API_PORT = 12391;
private static final int TESTNET_API_PORT = 62393; private static final int TESTNET_API_PORT = 62391;
private static final int MAINNET_DOMAIN_MAP_PORT = 80; private static final int MAINNET_DOMAIN_MAP_PORT = 80;
private static final int TESTNET_DOMAIN_MAP_PORT = 8080; private static final int TESTNET_DOMAIN_MAP_PORT = 8080;

2
src/main/java/org/qortal/transaction/Transaction.java
View File

@ -382,7 +382,7 @@ public abstract class Transaction {
* @return transaction version number * @return transaction version number
*/ */
public static int getVersionByTimestamp(long timestamp) { public static int getVersionByTimestamp(long timestamp) {
return 5; // TODO: hard fork timestamp!! return 4; // TODO: hard fork timestamp!!
} }
/** /**