Qortal/qortal
Qortal/qortal
3
0
Fork 3
mirror of https://github.com/Qortal/qortal.git synced 2025-02-15 19:55:48 +00:00
Code Issues Projects Releases Wiki Activity

Update dependencies and ntp servers

Browse Source
This commit is contained in:
AlphaX-Projects 2023-09-05 11:35:53 +02:00
parent 053d56d01d
commit b92c7cc866
2 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -51,14 +51,14 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId> <artifactId>versions-maven-plugin</artifactId>
<version>2.5</version> <version>2.16.0</version>
<configuration> <configuration>
<generateBackupPoms>false</generateBackupPoms> <generateBackupPoms>false</generateBackupPoms>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>3.11.0</version>
<configuration> <configuration>
<release>11</release> <release>11</release>
</configuration> </configuration>
@ -232,7 +232,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.4.0</version>
<executions> <executions>
<execution> <execution>
<phase>generate-sources</phase> <phase>generate-sources</phase>
@ -250,7 +250,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>3.3.0</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
@ -268,7 +268,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version> <version>3.5.0</version>
<configuration> <configuration>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet> <artifactSet>
@ -318,7 +318,7 @@
<plugin> <plugin>
<groupId>io.github.zlika</groupId> <groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId> <artifactId>reproducible-build-maven-plugin</artifactId>
<version>0.11</version> <version>0.16</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -335,7 +335,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version> <version>3.1.2</version>
<configuration> <configuration>
<skipTests>${skipTests}</skipTests> <skipTests>${skipTests}</skipTests>
</configuration> </configuration>
@ -360,7 +360,7 @@
maven-dependency-plugin maven-dependency-plugin
</artifactId> </artifactId>
<versionRange> <versionRange>
[2.8,) [3.6.0,)
</versionRange> </versionRange>
<goals> <goals>
<goal>unpack</goal> <goal>unpack</goal>
@ -413,7 +413,7 @@
<dependency> <dependency>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.4.0</version>
<scope>provided</scope><!-- needed for build, not for runtime --> <scope>provided</scope><!-- needed for build, not for runtime -->
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.github.bohnman/package-info-maven-plugin --> <!-- https://mvnrepository.com/artifact/com.github.bohnman/package-info-maven-plugin -->

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

@ -47,8 +47,8 @@ public class Settings {
private static final int MAINNET_GATEWAY_PORT = 80; private static final int MAINNET_GATEWAY_PORT = 80;
private static final int TESTNET_GATEWAY_PORT = 8080; private static final int TESTNET_GATEWAY_PORT = 8080;
private static final int MAINNET_DEV_PROXY_PORT = 12393; private static final int MAINNET_DEV_PROXY_PORT = 12393;
private static final int TESTNET_DEV_PROXY_PORT = 62393; private static final int TESTNET_DEV_PROXY_PORT = 62393;
private static final Logger LOGGER = LogManager.getLogger(Settings.class); private static final Logger LOGGER = LogManager.getLogger(Settings.class);
private static final String SETTINGS_FILENAME = "settings.json"; private static final String SETTINGS_FILENAME = "settings.json";
@ -110,10 +110,9 @@ public class Settings {
private boolean gatewayLoggingEnabled = false; private boolean gatewayLoggingEnabled = false;
private boolean gatewayLoopbackEnabled = false; private boolean gatewayLoopbackEnabled = false;
// Developer Proxy // Developer Proxy
private Integer devProxyPort; private Integer devProxyPort;
private boolean devProxyLoggingEnabled = false; private boolean devProxyLoggingEnabled = false;
// Specific to this node // Specific to this node
private boolean wipeUnconfirmedOnStart = false; private boolean wipeUnconfirmedOnStart = false;
@ -186,7 +185,6 @@ public class Settings {
* This has a significant effect on execution time. */ * This has a significant effect on execution time. */
private int blockPruneBatchSize = 10000; // blocks private int blockPruneBatchSize = 10000; // blocks
/** Whether we should archive old data to reduce the database size */ /** Whether we should archive old data to reduce the database size */
private boolean archiveEnabled = true; private boolean archiveEnabled = true;
/** How often to attempt archiving (ms). */ /** How often to attempt archiving (ms). */
@ -194,15 +192,12 @@ public class Settings {
/** Serialization version to use when building an archive */ /** Serialization version to use when building an archive */
private int defaultArchiveVersion = 2; private int defaultArchiveVersion = 2;
/** Whether to automatically bootstrap instead of syncing from genesis */ /** Whether to automatically bootstrap instead of syncing from genesis */
private boolean bootstrap = true; private boolean bootstrap = true;
/** Registered names integrity check */ /** Registered names integrity check */
private boolean namesIntegrityCheckEnabled = false; private boolean namesIntegrityCheckEnabled = false;
// Peer-to-peer related // Peer-to-peer related
private boolean isTestNet = false; private boolean isTestNet = false;
/** Single node testnet mode */ /** Single node testnet mode */
@ -289,10 +284,10 @@ public class Settings {
// Bootstrap sources // Bootstrap sources
private String[] bootstrapHosts = new String[] { private String[] bootstrapHosts = new String[] {
"http://bootstrap.qortal.org", "http://bootstrap.qortal.org",
"http://bootstrap2.qortal.org", "http://bootstrap2.qortal.org",
"http://bootstrap3.qortal.org", "http://bootstrap3.qortal.org",
"http://bootstrap.qortal.online" "http://bootstrap.qortal.online"
}; };
// Auto-update sources // Auto-update sources
@ -311,17 +306,35 @@ public class Settings {
"1.pool.ntp.org", "1.pool.ntp.org",
"2.pool.ntp.org", "2.pool.ntp.org",
"3.pool.ntp.org", "3.pool.ntp.org",
"cn.pool.ntp.org", "asia.pool.ntp.org",
"0.cn.pool.ntp.org", "0.asia.pool.ntp.org",
"1.cn.pool.ntp.org", "1.asia.pool.ntp.org",
"2.cn.pool.ntp.org", "2.asia.pool.ntp.org",
"3.cn.pool.ntp.org" "3.asia.pool.ntp.org",
"europe.pool.ntp.org",
"0.europe.pool.ntp.org",
"1.europe.pool.ntp.org",
"2.europe.pool.ntp.org",
"3.europe.pool.ntp.org",
"north-america.pool.ntp.org",
"0.north-america.pool.ntp.org",
"1.north-america.pool.ntp.org",
"2.north-america.pool.ntp.org",
"3.north-america.pool.ntp.org",
"oceania.pool.ntp.org",
"0.oceania.pool.ntp.org",
"1.oceania.pool.ntp.org",
"2.oceania.pool.ntp.org",
"3.oceania.pool.ntp.org",
"south-america.pool.ntp.org",
"0.south-america.pool.ntp.org",
"1.south-america.pool.ntp.org",
"2.south-america.pool.ntp.org",
"3.south-america.pool.ntp.org"
}; };
/** Additional offset added to values returned by NTP.getTime() */ /** Additional offset added to values returned by NTP.getTime() */
private Long testNtpOffset = null; private Long testNtpOffset = null;
/* Foreign chains */ /* Foreign chains */
/** The number of consecutive empty addresses required before treating a wallet's transaction set as complete */ /** The number of consecutive empty addresses required before treating a wallet's transaction set as complete */
@ -330,8 +343,6 @@ public class Settings {
/** How many wallet keys to generate when using bitcoinj as the blockchain interface (e.g. when sending coins) */ /** How many wallet keys to generate when using bitcoinj as the blockchain interface (e.g. when sending coins) */
private int bitcoinjLookaheadSize = 50; private int bitcoinjLookaheadSize = 50;
// Data storage (QDN) // Data storage (QDN)
/** Data storage enabled/disabled*/ /** Data storage enabled/disabled*/
@ -396,7 +407,6 @@ public class Settings {
} }
} }
// Constructors // Constructors
private Settings() { private Settings() {
@ -660,17 +670,16 @@ public class Settings {
} }
public int getDevProxyPort() { public int getDevProxyPort() {
if (this.devProxyPort != null) if (this.devProxyPort != null)
return this.devProxyPort; return this.devProxyPort;
return this.isTestNet ? TESTNET_DEV_PROXY_PORT : MAINNET_DEV_PROXY_PORT; return this.isTestNet ? TESTNET_DEV_PROXY_PORT : MAINNET_DEV_PROXY_PORT;
} }
public boolean isDevProxyLoggingEnabled() {
return this.devProxyLoggingEnabled;
}
public boolean isDevProxyLoggingEnabled() {
return this.devProxyLoggingEnabled;
}
public boolean getWipeUnconfirmedOnStart() { public boolean getWipeUnconfirmedOnStart() {
return this.wipeUnconfirmedOnStart; return this.wipeUnconfirmedOnStart;