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

Revert "modified autoUpdateRepos further to plan ahead."

Browse Source 
This reverts commit 04203e7c31c943d48c96097615d32bc67e318d47.
This commit is contained in:
crowetic 2024-12-05 20:08:24 -08:00
parent 04203e7c31
commit a23eb02182
2 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.qortal</groupId> <groupId>org.qortal</groupId>
<artifactId>qortal</artifactId> <artifactId>qortal</artifactId>
<version>4.6.6</version> <version>4.6.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@ -67,7 +67,7 @@ public class Settings {
private Integer apiPort; private Integer apiPort;
private boolean apiWhitelistEnabled = true; private boolean apiWhitelistEnabled = true;
private String[] apiWhitelist = new String[] { private String[] apiWhitelist = new String[] {
"::1", "127.0.0.1" "::1", "127.0.0.1"
}; };
/** Legacy API key (deprecated Nov 2021). Use /admin/apikey/generate API endpoint instead */ /** Legacy API key (deprecated Nov 2021). Use /admin/apikey/generate API endpoint instead */
@ -213,7 +213,7 @@ public class Settings {
public long recoveryModeTimeout = 9999999999999L; public long recoveryModeTimeout = 9999999999999L;
/** Minimum peer version number required in order to sync with them */ /** Minimum peer version number required in order to sync with them */
private String minPeerVersion = "4.6.5"; private String minPeerVersion = "4.6.3";
/** Whether to allow connections with peers below minPeerVersion /** Whether to allow connections with peers below minPeerVersion
* If true, we won't sync with them but they can still sync with us, and will show in the peers list * If true, we won't sync with them but they can still sync with us, and will show in the peers list
* If false, sync will be blocked both ways, and they will not appear in the peers list */ * If false, sync will be blocked both ways, and they will not appear in the peers list */
@ -222,7 +222,7 @@ public class Settings {
/** Minimum time (in seconds) that we should attempt to remain connected to a peer for */ /** Minimum time (in seconds) that we should attempt to remain connected to a peer for */
private int minPeerConnectionTime = 2 * 60 * 60; // seconds private int minPeerConnectionTime = 2 * 60 * 60; // seconds
/** Maximum time (in seconds) that we should attempt to remain connected to a peer for */ /** Maximum time (in seconds) that we should attempt to remain connected to a peer for */
private int maxPeerConnectionTime = 6 * 60 * 60; // seconds private int maxPeerConnectionTime = 4 * 60 * 60; // seconds
/** Maximum time (in seconds) that a peer should remain connected when requesting QDN data */ /** Maximum time (in seconds) that a peer should remain connected when requesting QDN data */
private int maxDataPeerConnectionTime = 30 * 60; // seconds private int maxDataPeerConnectionTime = 30 * 60; // seconds
@ -272,19 +272,16 @@ 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://bootstrap4.qortal.org" "http://bootstrap4.qortal.org"
}; };
// Auto-update sources // Auto-update sources
private String[] autoUpdateRepos = new String[] { private String[] autoUpdateRepos = new String[] {
"https://github.com/Qortal/qortal/raw/%s/qortal.update", "https://github.com/Qortal/qortal/raw/%s/qortal.update",
"https://raw.githubusercontent.com@151.101.16.133/Qortal/qortal/%s/qortal.update", "https://raw.githubusercontent.com@151.101.16.133/Qortal/qortal/%s/qortal.update"
"https://qortal.link/Auto-Update/%s/qortal.update",
"https://qortal.name/Auto-Update/%s/qortal.update",
"https://update.qortal.org/Auto-Update/%s/qortal.update"
}; };
// Lists // Lists
@ -292,36 +289,36 @@ public class Settings {
/** Array of NTP server hostnames. */ /** Array of NTP server hostnames. */
private String[] ntpServers = new String[] { private String[] ntpServers = new String[] {
"pool.ntp.org", "pool.ntp.org",
"0.pool.ntp.org", "0.pool.ntp.org",
"1.pool.ntp.org", "1.pool.ntp.org",
"2.pool.ntp.org", "2.pool.ntp.org",
"3.pool.ntp.org", "3.pool.ntp.org",
"asia.pool.ntp.org", "asia.pool.ntp.org",
"0.asia.pool.ntp.org", "0.asia.pool.ntp.org",
"1.asia.pool.ntp.org", "1.asia.pool.ntp.org",
"2.asia.pool.ntp.org", "2.asia.pool.ntp.org",
"3.asia.pool.ntp.org", "3.asia.pool.ntp.org",
"europe.pool.ntp.org", "europe.pool.ntp.org",
"0.europe.pool.ntp.org", "0.europe.pool.ntp.org",
"1.europe.pool.ntp.org", "1.europe.pool.ntp.org",
"2.europe.pool.ntp.org", "2.europe.pool.ntp.org",
"3.europe.pool.ntp.org", "3.europe.pool.ntp.org",
"north-america.pool.ntp.org", "north-america.pool.ntp.org",
"0.north-america.pool.ntp.org", "0.north-america.pool.ntp.org",
"1.north-america.pool.ntp.org", "1.north-america.pool.ntp.org",
"2.north-america.pool.ntp.org", "2.north-america.pool.ntp.org",
"3.north-america.pool.ntp.org", "3.north-america.pool.ntp.org",
"oceania.pool.ntp.org", "oceania.pool.ntp.org",
"0.oceania.pool.ntp.org", "0.oceania.pool.ntp.org",
"1.oceania.pool.ntp.org", "1.oceania.pool.ntp.org",
"2.oceania.pool.ntp.org", "2.oceania.pool.ntp.org",
"3.oceania.pool.ntp.org", "3.oceania.pool.ntp.org",
"south-america.pool.ntp.org", "south-america.pool.ntp.org",
"0.south-america.pool.ntp.org", "0.south-america.pool.ntp.org",
"1.south-america.pool.ntp.org", "1.south-america.pool.ntp.org",
"2.south-america.pool.ntp.org", "2.south-america.pool.ntp.org",
"3.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;
@ -411,7 +408,7 @@ public class Settings {
* The thread priority (1 is lowest, 10 is highest) of the threads used for network peer connections. This is the * The thread priority (1 is lowest, 10 is highest) of the threads used for network peer connections. This is the
* main thread connecting to a peer in the network. * main thread connecting to a peer in the network.
*/ */
private int networkThreadPriority = 7; private int networkThreadPriority = 7;
/** /**
* The Handshake Thread Priority * The Handshake Thread Priority
@ -557,7 +554,7 @@ public class Settings {
try { try {
// Create JAXB context aware of Settings // Create JAXB context aware of Settings
jc = JAXBContextFactory.createContext(new Class[] { jc = JAXBContextFactory.createContext(new Class[] {
Settings.class Settings.class
}, null); }, null);
// Create unmarshaller // Create unmarshaller