Bump version to 4.3.1

Reward share limit activation timestamp set to 1698508800000 (Sat Oct 28 2023 16:00:00 UTC)
Merge pull request #134 from AlphaX-Projects/master
2025-07-31 06:01:22 +00:00 · 2023-10-19 13:51:53 -04:00 · 2023-10-19 13:48:33 -04:00 · 2023-10-19 12:57:44 -04:00 · 2023-10-18 17:29:10 +02:00 · 2023-10-18 13:49:53 +02:00
24 changed files with 814 additions and 408 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}
--- a/WindowsInstaller/Install
+++ b/WindowsInstaller/Install
@@ -1,7 +1,7 @@
 rootLogger.level = info
 # On Windows, uncomment next line to set dirname:
 # property.dirname = ${sys:user.home}\\AppData\\Local\\qortal\\
-property.filename = ${sys:log4j2.filenameTemplate:-log.txt}
+# property.filename = ${sys:log4j2.filenameTemplate:-log.txt}

 rootLogger.appenderRef.console.ref = stdout
 rootLogger.appenderRef.rolling.ref = FILE
@@ -59,11 +59,14 @@ appender.console.filter.threshold.level = error

 appender.rolling.type = RollingFile
 appender.rolling.name = FILE
+appender.rolling.fileName = qortal.log
+appender.rolling.filePattern = qortal.%d{dd-MMM}.log.gz
 appender.rolling.layout.type = PatternLayout
 appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-appender.rolling.filePattern = ./${filename}.%i
 appender.rolling.policy.type = SizeBasedTriggeringPolicy
-appender.rolling.policy.size = 4MB
+appender.rolling.policy.size = 10MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 7
 # Set the immediate flush to true (default)
 # appender.rolling.immediateFlush = true
 # Set the append to true (default), should not overwrite
--- a/lib/org/ciyam/AT/1.4.1/AT-1.4.1.jar
+++ b/lib/org/ciyam/AT/1.4.1/AT-1.4.1.jar
--- a/lib/org/ciyam/AT/1.4.1/AT-1.4.1.pom
+++ b/lib/org/ciyam/AT/1.4.1/AT-1.4.1.pom
@@ -0,0 +1,124 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.ciyam</groupId>
+	<artifactId>AT</artifactId>
+	<version>1.4.1</version>
+	<packaging>jar</packaging>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<skipTests>false</skipTests>
+
+		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
+		<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+		<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+
+		<bouncycastle.version>1.64</bouncycastle.version>
+	</properties>
+
+	<build>
+		<sourceDirectory>src/main/java</sourceDirectory>
+		<testSourceDirectory>src/test/java</testSourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven-compiler-plugin.version}</version>
+				<configuration>
+					<source>11</source>
+					<target>11</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${maven-surefire-plugin.version}</version>
+				<configuration>
+					<skipTests>${skipTests}</skipTests>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>${maven-source-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>${maven-javadoc-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>attach-javadoc</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>${maven-jar-plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-compiler-plugin</artifactId>
+			<version>${maven-compiler-plugin.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<version>${maven-surefire-plugin.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-source-plugin</artifactId>
+			<version>${maven-source-plugin.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-javadoc-plugin</artifactId>
+			<version>${maven-javadoc-plugin.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-jar-plugin</artifactId>
+			<version>${maven-jar-plugin.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>${bouncycastle.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
--- a/lib/org/ciyam/AT/maven-metadata-local.xml
+++ b/lib/org/ciyam/AT/maven-metadata-local.xml
@@ -3,7 +3,7 @@
  <groupId>org.ciyam</groupId>
  <artifactId>AT</artifactId>
  <versioning>
-    <release>1.4.0</release>
+    <release>1.4.1</release>
    <versions>
      <version>1.3.4</version>
      <version>1.3.5</version>
@@ -11,7 +11,8 @@
      <version>1.3.7</version>
      <version>1.3.8</version>
      <version>1.4.0</version>
+      <version>1.4.1</version>
    </versions>
-    <lastUpdated>20221105114346</lastUpdated>
+    <lastUpdated>20230821074325</lastUpdated>
  </versioning>
 </metadata>
--- a/log4j2.properties
+++ b/log4j2.properties
@@ -1,7 +1,7 @@
 rootLogger.level = info
 # On Windows, uncomment next line to set dirname:
 # property.dirname = ${sys:user.home}\\AppData\\Local\\qortal\\
-property.filename = ${sys:log4j2.filenameTemplate:-log.txt}
+# property.filename = ${sys:log4j2.filenameTemplate:-log.txt}

 rootLogger.appenderRef.console.ref = stdout
 rootLogger.appenderRef.rolling.ref = FILE
@@ -59,11 +59,14 @@ appender.console.filter.threshold.level = error

 appender.rolling.type = RollingFile
 appender.rolling.name = FILE
+appender.rolling.fileName = qortal.log
+appender.rolling.filePattern = qortal.%d{dd-MMM}.log.gz
 appender.rolling.layout.type = PatternLayout
 appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-appender.rolling.filePattern = ./${filename}.%i
 appender.rolling.policy.type = SizeBasedTriggeringPolicy
-appender.rolling.policy.size = 4MB
+appender.rolling.policy.size = 10MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 7
 # Set the immediate flush to true (default)
 # appender.rolling.immediateFlush = true
 # Set the append to true (default), should not overwrite
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.qortal</groupId>
 	<artifactId>qortal</artifactId>
-	<version>4.3.0</version>
+	<version>4.3.1</version>
 	<packaging>jar</packaging>
 	<properties>
 		<skipTests>true</skipTests>
@@ -11,32 +11,52 @@
 		<bitcoinj.version>0.15.10</bitcoinj.version>
 		<bouncycastle.version>1.69</bouncycastle.version>
 		<build.timestamp>${maven.build.timestamp}</build.timestamp>
-		<ciyam-at.version>1.4.0</ciyam-at.version>
-		<commons-net.version>3.6</commons-net.version>
-		<commons-text.version>1.8</commons-text.version>
-		<commons-io.version>2.6</commons-io.version>
-		<commons-compress.version>1.21</commons-compress.version>
-		<commons-lang3.version>3.12.0</commons-lang3.version>
+		<ciyam-at.version>1.4.1</ciyam-at.version>
+		<commons-net.version>3.8.0</commons-net.version>
+		<commons-text.version>1.10.0</commons-text.version>
+		<commons-io.version>2.11.0</commons-io.version>
+		<commons-compress.version>1.24.0</commons-compress.version>
+		<commons-lang3.version>3.13.0</commons-lang3.version>
 		<xz.version>1.9</xz.version>
 		<dagger.version>1.2.2</dagger.version>
-		<guava.version>28.1-jre</guava.version>
+		<guava.version>32.1.3-jre</guava.version>
 		<hsqldb.version>2.5.1</hsqldb.version>
 		<homoglyph.version>1.2.1</homoglyph.version>
-		<icu4j.version>70.1</icu4j.version>
+		<icu4j.version>73.2</icu4j.version>
 		<upnp.version>1.1</upnp.version>
-		<jersey.version>2.29.1</jersey.version>
-		<jetty.version>9.4.29.v20200521</jetty.version>
-		<log4j.version>2.17.1</log4j.version>
+		<jaxb-runtime.version>2.3.3</jaxb-runtime.version>
+		<jersey.version>2.40</jersey.version>
+		<jetty.version>9.4.53.v20231009</jetty.version>
+		<log4j.version>2.20.0</log4j.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<slf4j.version>1.7.12</slf4j.version>
-		<swagger-api.version>2.0.9</swagger-api.version>
-		<swagger-ui.version>3.23.8</swagger-ui.version>
+		<slf4j.version>1.7.36</slf4j.version>
+		<swagger-api.version>2.0.10</swagger-api.version>
+		<swagger-ui.version>3.52.5</swagger-ui.version>
 		<package-info-maven-plugin.version>1.1.0</package-info-maven-plugin.version>
-		<jsoup.version>1.13.1</jsoup.version>
-		<java-diff-utils.version>4.10</java-diff-utils.version>
-		<grpc.version>1.45.1</grpc.version>
-		<protobuf.version>3.19.4</protobuf.version>
+		<jsoup.version>1.16.1</jsoup.version>
+		<java-diff-utils.version>4.12</java-diff-utils.version>
+		<grpc.version>1.58.0</grpc.version>
+		<protobuf.version>3.24.4</protobuf.version>
 		<simplemagic.version>1.17</simplemagic.version>
+		<versions-maven-plugin.version>2.16.1</versions-maven-plugin.version>
+		<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+		<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
+		<replacer.version>1.5.3</replacer.version>
+		<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+		<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
+		<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+		<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
+		<reproducible-build-maven-plugin.version>0.16</reproducible-build-maven-plugin.version>
+		<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+		<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
+		<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
+		<json-simple.version>1.1.1</json-simple.version>
+		<json.version>20231013</json.version>
+		<extendedset.version>0.12.3</extendedset.version>
+		<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
+		<mail.version>1.5.0-b01</mail.version>
+		<junit-jupiter-engine.version>5.3.1</junit-jupiter-engine.version>
+		<hamcrest-library.version>1.3</hamcrest-library.version>
 	</properties>
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
@@ -51,14 +71,14 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.5</version>
+				<version>${versions-maven-plugin.version}</version>
 				<configuration>
 					<generateBackupPoms>false</generateBackupPoms>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>${maven-compiler-plugin.version}</version>
 				<configuration>
 					<release>11</release>
 				</configuration>
@@ -89,7 +109,7 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>4.0.0</version>
+				<version>${git-commit-id-plugin.version}</version>
 				<executions>
 					<execution>
 						<id>get-the-git-infos</id>
@@ -121,7 +141,7 @@
 			<plugin>
 				<groupId>com.google.code.maven-replacer-plugin</groupId>
 				<artifactId>replacer</artifactId>
-				<version>1.5.3</version>
+				<version>${replacer.version}</version>
 				<executions>
 					<execution>
 						<id>replace-swagger-ui</id>
@@ -164,11 +184,13 @@
 						<configuration>
 							<file>${project.build.outputDirectory}/git.properties</file>
 							<regex>true</regex>
-							<regexFlags><regexFlag>MULTILINE</regexFlag></regexFlags>
+							<regexFlags>
+								<regexFlag>MULTILINE</regexFlag>
+							</regexFlags>
 							<replacements>
 								<replacement>
 									<token>^(#.*$[\n\r]*)</token>
-									<value></value>
+									<value/>
 								</replacement>
 							</replacements>
 						</configuration>
@@ -178,7 +200,10 @@
 			<!-- add swagger-ui as resource to output package -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>${maven-resources-plugin.version}</version>
+				<configuration>
+					<propertiesEncoding>ISO-8859-1</propertiesEncoding>
+				</configuration>
 				<executions>
 					<execution>
 						<id>copy-resources</id>
@@ -232,7 +257,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>${build-helper-maven-plugin.version}</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
@@ -250,7 +275,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>${maven-jar-plugin.version}</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -268,13 +293,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
+				<version>${maven-shade-plugin.version}</version>
 				<configuration>
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 					<artifactSet>
 						<excludes>
-							<!-- Don't include original swagger-UI as we're including our own 
-								modified version -->
+							<!-- Don't include original swagger-UI as we're including our own modified version -->
 							<exclude>org.webjars:swagger-ui</exclude>
 							<!-- Don't include JUnit as it's for testing only! -->
 							<exclude>junit:junit</exclude>
@@ -318,7 +342,7 @@
 			<plugin>
 				<groupId>io.github.zlika</groupId>
 				<artifactId>reproducible-build-maven-plugin</artifactId>
-				<version>0.11</version>
+				<version>${reproducible-build-maven-plugin.version}</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -335,7 +359,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.2</version>
+				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<skipTests>${skipTests}</skipTests>
 				</configuration>
@@ -347,7 +371,7 @@
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
+					<version>${lifecycle-mapping.version}</version>
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
@@ -360,14 +384,14 @@
 											maven-dependency-plugin
 										</artifactId>
 										<versionRange>
-											[2.8,)
+											[3.6.0,)
 										</versionRange>
 										<goals>
 											<goal>unpack</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<execute></execute>
+										<execute/>
 									</action>
 								</pluginExecution>
 								<pluginExecution>
@@ -386,7 +410,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<execute></execute>
+										<execute/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -413,15 +437,17 @@
 		<dependency>
 			<groupId>org.codehaus.mojo</groupId>
 			<artifactId>build-helper-maven-plugin</artifactId>
-			<version>3.0.0</version>
-			<scope>provided</scope><!-- needed for build, not for runtime -->
+			<version>${build-helper-maven-plugin.version}</version>
+			<scope>provided</scope>
+			<!-- needed for build, not for runtime -->
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/com.github.bohnman/package-info-maven-plugin -->
 		<dependency>
 			<groupId>com.github.bohnman</groupId>
 			<artifactId>package-info-maven-plugin</artifactId>
 			<version>${package-info-maven-plugin.version}</version>
-			<scope>provided</scope><!-- needed for build, not for runtime -->
+			<scope>provided</scope>
+			<!-- needed for build, not for runtime -->
 		</dependency>
 		<!-- HSQLDB for repository -->
 		<dependency>
@@ -457,12 +483,12 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>1.1.1</version>
+			<version>${json-simple.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20210307</version>
+			<version>${json.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -493,7 +519,7 @@
 		<dependency>
 			<groupId>io.druid</groupId>
 			<artifactId>extendedset</artifactId>
-			<version>0.12.3</version>
+			<version>${extendedset.version}</version>
 			<exclusions>
 				<!-- exclude old versions of jackson-annotations / jackson-core -->
 				<exclusion>
@@ -564,12 +590,12 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>4.0.1</version>
+			<version>${javax.servlet-api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
-			<version>1.5.0-b01</version>
+			<version>${mail.version}</version>
 		</dependency>
 		<!-- Unicode homoglyph utilities -->
 		<dependency>
@@ -638,7 +664,8 @@
 			<artifactId>jersey-hk2</artifactId>
 			<version>${jersey.version}</version>
 			<exclusions>
-				<exclusion><!-- exclude javax.inject-1.jar because other jersey modules include javax.inject v2+ -->
+				<exclusion>
+					<!-- exclude javax.inject-1.jar because other jersey modules include javax.inject v2+ -->
 					<groupId>javax.inject</groupId>
 					<artifactId>javax.inject</artifactId>
 				</exclusion>
@@ -665,7 +692,8 @@
 			<artifactId>swagger-jaxrs2-servlet-initializer</artifactId>
 			<version>${swagger-api.version}</version>
 			<exclusions>
-				<exclusion><!-- excluded because included in swagger-jaxrs2-servlet-initializer -->
+				<exclusion>
+					<!-- excluded because included in swagger-jaxrs2-servlet-initializer -->
 					<groupId>io.swagger.core.v3</groupId>
 					<artifactId>swagger-integration</artifactId>
 				</exclusion>
@@ -681,12 +709,12 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.3.1</version>
+			<version>${junit-jupiter-engine.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>1.3</version>
+			<version>${hamcrest-library.version}</version>
 		</dependency>
 		-->
 		<!-- BouncyCastle for crypto, including TLS secure networking -->
@@ -735,5 +763,11 @@
 			<artifactId>simplemagic</artifactId>
 			<version>${simplemagic.version}</version>
 		</dependency>
+		<!-- JAXB runtime for WADL support -->
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>${jaxb-runtime.version}</version>
+		</dependency>
 	</dependencies>
 </project>
--- a/src/main/java/org/qortal/api/restricted/resource/AdminResource.java
+++ b/src/main/java/org/qortal/api/restricted/resource/AdminResource.java
@@ -16,11 +16,6 @@ import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -38,7 +33,6 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.RollingFileAppender;
 import org.json.JSONArray;
-import org.json.JSONObject;
 import org.qortal.account.Account;
 import org.qortal.account.PrivateKeyAccount;
 import org.qortal.api.*;
@@ -269,7 +263,7 @@ public class AdminResource {
 	@GET
 	@Path("/summary")
 	@Operation(
-		summary = "Summary of activity since midnight, UTC",
+		summary = "Summary of activity past 24 hours",
 		responses = {
 			@ApiResponse(
 				content = @Content(schema = @Schema(implementation = ActivitySummary.class))
@@ -282,23 +276,21 @@ public class AdminResource {
 		Security.checkApiCallAllowed(request);

 		ActivitySummary summary = new ActivitySummary();
-
-		LocalDate date = LocalDate.now();
-		LocalTime time = LocalTime.of(0, 0);
-		ZoneOffset offset = ZoneOffset.UTC;
-		long start = OffsetDateTime.of(date, time, offset).toInstant().toEpochMilli();
+		
+		long now = NTP.getTime();
+		long oneday = now - 24 * 60 * 60 * 1000L;

 		try (final Repository repository = RepositoryManager.getRepository()) {
-			int startHeight = repository.getBlockRepository().getHeightFromTimestamp(start);
+			int startHeight = repository.getBlockRepository().getHeightFromTimestamp(oneday);
 			int endHeight = repository.getBlockRepository().getBlockchainHeight();

 			summary.setBlockCount(endHeight - startHeight);

 			summary.setTransactionCountByType(repository.getTransactionRepository().getTransactionSummary(startHeight + 1, endHeight));

-			summary.setAssetsIssued(repository.getAssetRepository().getRecentAssetIds(start).size());
+			summary.setAssetsIssued(repository.getAssetRepository().getRecentAssetIds(oneday).size());

-			summary.setNamesRegistered (repository.getNameRepository().getRecentNames(start).size());
+			summary.setNamesRegistered (repository.getNameRepository().getRecentNames(oneday).size());

 			return summary;
 		} catch (DataException e) {
--- a/src/main/java/org/qortal/controller/tradebot/TradeBot.java
+++ b/src/main/java/org/qortal/controller/tradebot/TradeBot.java
@@ -712,30 +712,16 @@ public class TradeBot implements Listener {
 			}

 			try {
-				List<byte[]> signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(null, null, null, Arrays.asList(Transaction.TransactionType.MESSAGE), null, null, crossChainTradeData.qortalCreatorTradeAddress, TransactionsResource.ConfirmationStatus.CONFIRMED, null, null, null);
-				if (signatures.size() < getMaxTradeOfferAttempts) {
-					// Less than 3 (or user-specified number of) MESSAGE transactions relate to this trade, so assume it is ok
-					validTrades.put(crossChainTradeData.qortalAtAddress, now);
-					continue;
-				}
+				List<TransactionData> transactions = repository.getTransactionRepository().getUnconfirmedTransactions(Arrays.asList(Transaction.TransactionType.MESSAGE), null, null, null, null);

-				List<TransactionData> transactions = new ArrayList<>(signatures.size());
-				for (byte[] signature : signatures) {
-					transactions.add(repository.getTransactionRepository().fromSignature(signature));
-				}
-				transactions.sort(Transaction.getDataComparator());
-
-				// Get timestamp of the first MESSAGE transaction
-				long firstMessageTimestamp = transactions.get(0).getTimestamp();
-
-				// Treat as failed if first buy attempt was more than 60 mins ago (as it's still in the OFFERING state)
-				boolean isFailed = (now - firstMessageTimestamp > 60*60*1000L);
-				if (isFailed) {
-					failedTrades.put(crossChainTradeData.qortalAtAddress, now);
-					updatedCrossChainTrades.remove(crossChainTradeData);
-				}
-				else {
-					validTrades.put(crossChainTradeData.qortalAtAddress, now);
+				for (TransactionData transactionData : transactions) {
+					// Treat as failed if buy attempt was more than 60 mins ago (as it's still in the OFFERING state)
+					if (transactionData.getRecipient().equals(crossChainTradeData.qortalCreatorTradeAddress) && now - transactionData.getTimestamp() > 60*60*1000L) {
+						failedTrades.put(crossChainTradeData.qortalAtAddress, now);
+						updatedCrossChainTrades.remove(crossChainTradeData);
+					} else {
+						validTrades.put(crossChainTradeData.qortalAtAddress, now);
+					}
 				}

 			} catch (DataException e) {
--- a/src/main/java/org/qortal/crosschain/Bitcoin.java
+++ b/src/main/java/org/qortal/crosschain/Bitcoin.java
@@ -44,89 +44,78 @@ public class Bitcoin extends Bitcoiny {
 			@Override
 			public Collection<ElectrumX.Server> getServers() {
 				return Arrays.asList(
-						// Servers chosen on NO BASIS WHATSOEVER from various sources!
-						// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=btc
-						//CLOSED new Server("bitcoin.grey.pw", Server.ConnectionType.SSL, 50002),
-						//CLOSED new Server("btc.litepay.ch", Server.ConnectionType.SSL, 50002),
-						//CLOSED new Server("electrum.pabu.io", Server.ConnectionType.SSL, 50002),
-						//CLOSED new Server("electrumx.dev", Server.ConnectionType.SSL, 50002),
-						//CLOSED new Server("electrumx.hodlwallet.com", Server.ConnectionType.SSL, 50002),
-						//CLOSED new Server("gd42.org", Server.ConnectionType.SSL, 50002),
-						//CLOSED new Server("korea.electrum-server.com", Server.ConnectionType.SSL, 50002),
-						//CLOSED new Server("prospero.bitsrc.net", Server.ConnectionType.SSL, 50002),
-						//1.15.0 new Server("alviss.coinjoined.com", Server.ConnectionType.SSL, 50002),
-						//1.15.0 new Server("electrum.acinq.co", Server.ConnectionType.SSL, 50002),
-						//1.14.0 new Server("electrum.coinext.com.br", Server.ConnectionType.SSL, 50002),
-						//F1.7.0 new Server("btc.lastingcoin.net", Server.ConnectionType.SSL, 50002),
-						new Server("104.248.139.211", Server.ConnectionType.SSL, 50002),
-						new Server("128.0.190.26", Server.ConnectionType.SSL, 50002),
-						new Server("142.93.6.38", Server.ConnectionType.SSL, 50002),
-						new Server("157.245.172.236", Server.ConnectionType.SSL, 50002),
-						new Server("167.172.226.175", Server.ConnectionType.SSL, 50002),
-						new Server("167.172.42.31", Server.ConnectionType.SSL, 50002),
-						new Server("178.62.80.20", Server.ConnectionType.SSL, 50002),
-						new Server("185.64.116.15", Server.ConnectionType.SSL, 50002),
-						new Server("188.165.206.215", Server.ConnectionType.SSL, 50002),
-						new Server("188.165.211.112", Server.ConnectionType.SSL, 50002),
-						new Server("2azzarita.hopto.org", Server.ConnectionType.SSL, 50002),
-						new Server("2electrumx.hopto.me", Server.ConnectionType.SSL, 56022),
-						new Server("2ex.digitaleveryware.com", Server.ConnectionType.SSL, 50002),
-						new Server("65.39.140.37", Server.ConnectionType.SSL, 50002),
-						new Server("68.183.188.105", Server.ConnectionType.SSL, 50002),
-						new Server("71.73.14.254", Server.ConnectionType.SSL, 50002),
-						new Server("94.23.247.135", Server.ConnectionType.SSL, 50002),
-						new Server("assuredly.not.fyi", Server.ConnectionType.SSL, 50002),
-						new Server("ax101.blockeng.ch", Server.ConnectionType.SSL, 50002),
-						new Server("ax102.blockeng.ch", Server.ConnectionType.SSL, 50002),
-						new Server("b.1209k.com", Server.ConnectionType.SSL, 50002),
-						new Server("b6.1209k.com", Server.ConnectionType.SSL, 50002),
-						new Server("bitcoin.dermichi.com", Server.ConnectionType.SSL, 50002),
-						new Server("bitcoin.lu.ke", Server.ConnectionType.SSL, 50002),
-						new Server("bitcoin.lukechilds.co", Server.ConnectionType.SSL, 50002),
-						new Server("blkhub.net", Server.ConnectionType.SSL, 50002),
-						new Server("btc.electroncash.dk", Server.ConnectionType.SSL, 60002),
-						new Server("btc.ocf.sh", Server.ConnectionType.SSL, 50002),
-						new Server("btce.iiiiiii.biz", Server.ConnectionType.SSL, 50002),
-						new Server("caleb.vegas", Server.ConnectionType.SSL, 50002),
-						new Server("eai.coincited.net", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.bhoovd.com", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.bitaroo.net", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.bitcoinlizard.net", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.blockstream.info", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.emzy.de", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.exan.tech", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.kendigisland.xyz", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.mmitech.info", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.petrkr.net", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.stippy.com", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.thomasfischbach.de", Server.ConnectionType.SSL, 50002),
-						new Server("electrum0.snel.it", Server.ConnectionType.SSL, 50002),
-						new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 50002),
-						new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 50002),
-						new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 50002),
-						new Server("electrumx.alexridevski.net", Server.ConnectionType.SSL, 50002),
-						new Server("electrumx-core.1209k.com", Server.ConnectionType.SSL, 50002),
-						new Server("elx.bitske.com", Server.ConnectionType.SSL, 50002),
-						new Server("ex03.axalgo.com", Server.ConnectionType.SSL, 50002),
-						new Server("ex05.axalgo.com", Server.ConnectionType.SSL, 50002),
-						new Server("ex07.axalgo.com", Server.ConnectionType.SSL, 50002),
-						new Server("fortress.qtornado.com", Server.ConnectionType.SSL, 50002),
-						new Server("fulcrum.grey.pw", Server.ConnectionType.SSL, 50002),
-						new Server("fulcrum.sethforprivacy.com", Server.ConnectionType.SSL, 51002),
-						new Server("guichet.centure.cc", Server.ConnectionType.SSL, 50002),
-						new Server("hodlers.beer", Server.ConnectionType.SSL, 50002),
-						new Server("kareoke.qoppa.org", Server.ConnectionType.SSL, 50002),
-						new Server("kirsche.emzy.de", Server.ConnectionType.SSL, 50002),
-						new Server("node1.btccuracao.com", Server.ConnectionType.SSL, 50002),
-						new Server("osr1ex1.compumundohipermegared.one", Server.ConnectionType.SSL, 50002),
-						new Server("smmalis37.ddns.net", Server.ConnectionType.SSL, 50002),
-						new Server("ulrichard.ch", Server.ConnectionType.SSL, 50002),
-						new Server("vmd104012.contaboserver.net", Server.ConnectionType.SSL, 50002),
-						new Server("vmd104014.contaboserver.net", Server.ConnectionType.SSL, 50002),
-						new Server("vmd63185.contaboserver.net", Server.ConnectionType.SSL, 50002),
-						new Server("vmd71287.contaboserver.net", Server.ConnectionType.SSL, 50002),
-						new Server("vmd84592.contaboserver.net", Server.ConnectionType.SSL, 50002),
-						new Server("xtrum.com", Server.ConnectionType.SSL, 50002));
+					// Servers chosen on NO BASIS WHATSOEVER from various sources!
+					// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=btc
+					new Server("104.248.139.211", Server.ConnectionType.SSL, 50002),
+					new Server("128.0.190.26", Server.ConnectionType.SSL, 50002),
+					new Server("142.93.6.38", Server.ConnectionType.SSL, 50002),
+					new Server("157.245.172.236", Server.ConnectionType.SSL, 50002),
+					new Server("167.172.226.175", Server.ConnectionType.SSL, 50002),
+					new Server("167.172.42.31", Server.ConnectionType.SSL, 50002),
+					new Server("178.62.80.20", Server.ConnectionType.SSL, 50002),
+					new Server("185.64.116.15", Server.ConnectionType.SSL, 50002),
+					new Server("188.165.206.215", Server.ConnectionType.SSL, 50002),
+					new Server("188.165.211.112", Server.ConnectionType.SSL, 50002),
+					new Server("2azzarita.hopto.org", Server.ConnectionType.SSL, 50002),
+					new Server("2electrumx.hopto.me", Server.ConnectionType.SSL, 56022),
+					new Server("2ex.digitaleveryware.com", Server.ConnectionType.SSL, 50002),
+					new Server("65.39.140.37", Server.ConnectionType.SSL, 50002),
+					new Server("68.183.188.105", Server.ConnectionType.SSL, 50002),
+					new Server("71.73.14.254", Server.ConnectionType.SSL, 50002),
+					new Server("94.23.247.135", Server.ConnectionType.SSL, 50002),
+					new Server("assuredly.not.fyi", Server.ConnectionType.SSL, 50002),
+					new Server("ax101.blockeng.ch", Server.ConnectionType.SSL, 50002),
+					new Server("ax102.blockeng.ch", Server.ConnectionType.SSL, 50002),
+					new Server("b.1209k.com", Server.ConnectionType.SSL, 50002),
+					new Server("b6.1209k.com", Server.ConnectionType.SSL, 50002),
+					new Server("bitcoin.dermichi.com", Server.ConnectionType.SSL, 50002),
+					new Server("bitcoin.lu.ke", Server.ConnectionType.SSL, 50002),
+					new Server("bitcoin.lukechilds.co", Server.ConnectionType.SSL, 50002),
+					new Server("blkhub.net", Server.ConnectionType.SSL, 50002),
+					new Server("btc.electroncash.dk", Server.ConnectionType.SSL, 60002),
+					new Server("btc.ocf.sh", Server.ConnectionType.SSL, 50002),
+					new Server("btce.iiiiiii.biz", Server.ConnectionType.SSL, 50002),
+					new Server("caleb.vegas", Server.ConnectionType.SSL, 50002),
+					new Server("eai.coincited.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.bhoovd.com", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.bitaroo.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.bitcoinlizard.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.blockstream.info", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.emzy.de", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.exan.tech", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.kendigisland.xyz", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.mmitech.info", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.petrkr.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.stippy.com", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.thomasfischbach.de", Server.ConnectionType.SSL, 50002),
+					new Server("electrum0.snel.it", Server.ConnectionType.SSL, 50002),
+					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrumx.alexridevski.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrumx-core.1209k.com", Server.ConnectionType.SSL, 50002),
+					new Server("elx.bitske.com", Server.ConnectionType.SSL, 50002),
+					new Server("ex03.axalgo.com", Server.ConnectionType.SSL, 50002),
+					new Server("ex05.axalgo.com", Server.ConnectionType.SSL, 50002),
+					new Server("ex07.axalgo.com", Server.ConnectionType.SSL, 50002),
+					new Server("fortress.qtornado.com", Server.ConnectionType.SSL, 50002),
+					new Server("fulcrum.grey.pw", Server.ConnectionType.SSL, 50002),
+					new Server("fulcrum.sethforprivacy.com", Server.ConnectionType.SSL, 51002),
+					new Server("guichet.centure.cc", Server.ConnectionType.SSL, 50002),
+					new Server("hodlers.beer", Server.ConnectionType.SSL, 50002),
+					new Server("kareoke.qoppa.org", Server.ConnectionType.SSL, 50002),
+					new Server("kirsche.emzy.de", Server.ConnectionType.SSL, 50002),
+					new Server("node1.btccuracao.com", Server.ConnectionType.SSL, 50002),
+					new Server("osr1ex1.compumundohipermegared.one", Server.ConnectionType.SSL, 50002),
+					new Server("smmalis37.ddns.net", Server.ConnectionType.SSL, 50002),
+					new Server("ulrichard.ch", Server.ConnectionType.SSL, 50002),
+					new Server("vmd104012.contaboserver.net", Server.ConnectionType.SSL, 50002),
+					new Server("vmd104014.contaboserver.net", Server.ConnectionType.SSL, 50002),
+					new Server("vmd63185.contaboserver.net", Server.ConnectionType.SSL, 50002),
+					new Server("vmd71287.contaboserver.net", Server.ConnectionType.SSL, 50002),
+					new Server("vmd84592.contaboserver.net", Server.ConnectionType.SSL, 50002),
+					new Server("xtrum.com", Server.ConnectionType.SSL, 50002)
+				);
 			}

 			@Override
@@ -152,12 +141,13 @@ public class Bitcoin extends Bitcoiny {
 			@Override
 			public Collection<ElectrumX.Server> getServers() {
 				return Arrays.asList(
-						new Server("tn.not.fyi", Server.ConnectionType.SSL, 55002),
-						new Server("electrumx-test.1209k.com", Server.ConnectionType.SSL, 50002),
-						new Server("testnet.qtornado.com", Server.ConnectionType.SSL, 51002),
-						new Server("testnet.aranguren.org", Server.ConnectionType.TCP, 51001),
-						new Server("testnet.aranguren.org", Server.ConnectionType.SSL, 51002),
-						new Server("testnet.hsmiths.com", Server.ConnectionType.SSL, 53012));
+					new Server("tn.not.fyi", Server.ConnectionType.SSL, 55002),
+					new Server("electrumx-test.1209k.com", Server.ConnectionType.SSL, 50002),
+					new Server("testnet.qtornado.com", Server.ConnectionType.SSL, 51002),
+					new Server("testnet.aranguren.org", Server.ConnectionType.TCP, 51001),
+					new Server("testnet.aranguren.org", Server.ConnectionType.SSL, 51002),
+					new Server("testnet.hsmiths.com", Server.ConnectionType.SSL, 53012)
+				);
 			}

 			@Override
@@ -179,8 +169,9 @@ public class Bitcoin extends Bitcoiny {
 			@Override
 			public Collection<ElectrumX.Server> getServers() {
 				return Arrays.asList(
-						new Server("localhost", Server.ConnectionType.TCP, 50001),
-						new Server("localhost", Server.ConnectionType.SSL, 50002));
+					new Server("localhost", Server.ConnectionType.TCP, 50001),
+					new Server("localhost", Server.ConnectionType.SSL, 50002)
+				);
 			}

 			@Override
--- a/src/main/java/org/qortal/crosschain/Digibyte.java
+++ b/src/main/java/org/qortal/crosschain/Digibyte.java
@@ -43,14 +43,17 @@ public class Digibyte extends Bitcoiny {
 			@Override
 			public Collection<Server> getServers() {
 				return Arrays.asList(
-						// Servers chosen on NO BASIS WHATSOEVER from various sources!
-						// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=dgb
-						new Server("electrum.qortal.link", Server.ConnectionType.SSL, 55002),
-						new Server("electrum-dgb.qortal.online", ConnectionType.SSL, 50002),
-						new Server("electrum1-dgb.qortal.online", ConnectionType.SSL, 50002),
-						new Server("electrum1.cipig.net", ConnectionType.SSL, 20059),
-						new Server("electrum2.cipig.net", ConnectionType.SSL, 20059),
-						new Server("electrum3.cipig.net", ConnectionType.SSL, 20059));
+					// Servers chosen on NO BASIS WHATSOEVER from various sources!
+					// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=dgb
+					new Server("electrum.qortal.link", Server.ConnectionType.SSL, 55002),
+					new Server("electrum1-dgb.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum2-dgb.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum3-dgb.qortal.online", Server.ConnectionType.SSL, 40002),
+					new Server("electrum4-dgb.qortal.online", Server.ConnectionType.SSL, 40002),
+					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 20059),
+					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 20059),
+					new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 20059)
+				);
 			}

 			@Override
@@ -94,8 +97,9 @@ public class Digibyte extends Bitcoiny {
 			@Override
 			public Collection<Server> getServers() {
 				return Arrays.asList(
-						new Server("localhost", ConnectionType.TCP, 50001),
-						new Server("localhost", ConnectionType.SSL, 50002));
+					new Server("localhost", Server.ConnectionType.TCP, 50001),
+					new Server("localhost", Server.ConnectionType.SSL, 50002)
+				);
 			}

 			@Override
--- a/src/main/java/org/qortal/crosschain/Dogecoin.java
+++ b/src/main/java/org/qortal/crosschain/Dogecoin.java
@@ -4,7 +4,6 @@ import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Context;
 import org.bitcoinj.core.NetworkParameters;
 import org.libdohj.params.DogecoinMainNetParams;
-//import org.libdohj.params.DogecoinRegTestParams;
 import org.libdohj.params.DogecoinTestNet3Params;
 import org.qortal.crosschain.ElectrumX.Server;
 import org.qortal.crosschain.ElectrumX.Server.ConnectionType;
@@ -44,14 +43,17 @@ public class Dogecoin extends Bitcoiny {
 			@Override
 			public Collection<Server> getServers() {
 				return Arrays.asList(
-						// Servers chosen on NO BASIS WHATSOEVER from various sources!
-						// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=doge
-						new Server("electrum.qortal.link", Server.ConnectionType.SSL, 54002),
-						new Server("electrum-doge.qortal.online", ConnectionType.SSL, 50002),
-						new Server("electrum1-doge.qortal.online", ConnectionType.SSL, 50002),
-						new Server("electrum1.cipig.net", ConnectionType.SSL, 20060),
-						new Server("electrum2.cipig.net", ConnectionType.SSL, 20060),
-						new Server("electrum3.cipig.net", ConnectionType.SSL, 20060));
+					// Servers chosen on NO BASIS WHATSOEVER from various sources!
+					// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=doge
+					new Server("electrum.qortal.link", Server.ConnectionType.SSL, 54002),
+					new Server("electrum1-doge.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum2-doge.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum3-doge.qortal.online", Server.ConnectionType.SSL, 30002),
+					new Server("electrum4-doge.qortal.online", Server.ConnectionType.SSL, 30002),
+					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 20060),
+					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 20060),
+					new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 20060)
+				);
 			}

 			@Override
@@ -95,8 +97,9 @@ public class Dogecoin extends Bitcoiny {
 			@Override
 			public Collection<Server> getServers() {
 				return Arrays.asList(
-						new Server("localhost", ConnectionType.TCP, 50001),
-						new Server("localhost", ConnectionType.SSL, 50002));
+					new Server("localhost", Server.ConnectionType.TCP, 50001),
+					new Server("localhost", Server.ConnectionType.SSL, 50002)
+				);
 			}

 			@Override
--- a/src/main/java/org/qortal/crosschain/Litecoin.java
+++ b/src/main/java/org/qortal/crosschain/Litecoin.java
@@ -43,22 +43,21 @@ public class Litecoin extends Bitcoiny {
 			@Override
 			public Collection<ElectrumX.Server> getServers() {
 				return Arrays.asList(
-						// Servers chosen on NO BASIS WHATSOEVER from various sources!
-						// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=ltc
-						//CLOSED new Server("electrum-ltc.someguy123.net", Server.ConnectionType.SSL, 50002),
-						//CLOSED new Server("ltc.litepay.ch", Server.ConnectionType.SSL, 50022),
-						//BEHIND new Server("62.171.169.176", Server.ConnectionType.SSL, 50002),
-						//PHISHY new Server("electrum-ltc.bysh.me", Server.ConnectionType.SSL, 50002),
-						new Server("backup.electrum-ltc.org", Server.ConnectionType.SSL, 443),
-						new Server("electrum.qortal.link", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.ltc.xurious.com", Server.ConnectionType.SSL, 50002),
-						new Server("electrum-ltc.petrkr.net", Server.ConnectionType.SSL, 60002),
-						new Server("electrum-ltc.qortal.online", Server.ConnectionType.SSL, 50002),
-						new Server("electrum1-ltc.qortal.online", Server.ConnectionType.SSL, 50002),
-						new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 20063),
-						new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 20063),
-						new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 20063),
-						new Server("ltc.rentonrisk.com", Server.ConnectionType.SSL, 50002));
+					// Servers chosen on NO BASIS WHATSOEVER from various sources!
+					// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=ltc
+					new Server("electrum.qortal.link", Server.ConnectionType.SSL, 50002),
+					new Server("electrum1-ltc.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum2-ltc.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum3-ltc.qortal.online", Server.ConnectionType.SSL, 20002),
+					new Server("electrum4-ltc.qortal.online", Server.ConnectionType.SSL, 20002),
+					new Server("backup.electrum-ltc.org", Server.ConnectionType.SSL, 443),
+					new Server("electrum.ltc.xurious.com", Server.ConnectionType.SSL, 50002),
+					new Server("electrum-ltc.petrkr.net", Server.ConnectionType.SSL, 60002),
+					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 20063),
+					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 20063),
+					new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 20063),
+					new Server("ltc.rentonrisk.com", Server.ConnectionType.SSL, 50002)
+				);
 			}

 			@Override
@@ -81,10 +80,11 @@ public class Litecoin extends Bitcoiny {
 			@Override
 			public Collection<ElectrumX.Server> getServers() {
 				return Arrays.asList(
-						new Server("electrum-ltc.bysh.me", Server.ConnectionType.TCP, 51001),
-						new Server("electrum-ltc.bysh.me", Server.ConnectionType.SSL, 51002),
-						new Server("electrum.ltc.xurious.com", Server.ConnectionType.TCP, 51001),
-						new Server("electrum.ltc.xurious.com", Server.ConnectionType.SSL, 51002));
+					new Server("electrum-ltc.bysh.me", Server.ConnectionType.TCP, 51001),
+					new Server("electrum-ltc.bysh.me", Server.ConnectionType.SSL, 51002),
+					new Server("electrum.ltc.xurious.com", Server.ConnectionType.TCP, 51001),
+					new Server("electrum.ltc.xurious.com", Server.ConnectionType.SSL, 51002)
+				);
 			}

 			@Override
@@ -106,8 +106,9 @@ public class Litecoin extends Bitcoiny {
 			@Override
 			public Collection<ElectrumX.Server> getServers() {
 				return Arrays.asList(
-						new Server("localhost", Server.ConnectionType.TCP, 50001),
-						new Server("localhost", Server.ConnectionType.SSL, 50002));
+					new Server("localhost", Server.ConnectionType.TCP, 50001),
+					new Server("localhost", Server.ConnectionType.SSL, 50002)
+				);
 			}

 			@Override
--- a/src/main/java/org/qortal/crosschain/PirateChain.java
+++ b/src/main/java/org/qortal/crosschain/PirateChain.java
@@ -56,11 +56,14 @@ public class PirateChain extends Bitcoiny {
 			@Override
 			public Collection<Server> getServers() {
 				return Arrays.asList(
-						// Servers chosen on NO BASIS WHATSOEVER from various sources!
-						new Server("wallet-arrr1.qortal.online", ConnectionType.SSL, 443),
-						new Server("wallet-arrr2.qortal.online", ConnectionType.SSL, 443),
-						new Server("wallet-arrr3.qortal.online", ConnectionType.SSL, 443),
-						new Server("lightd.pirate.black", ConnectionType.SSL, 443));
+					// Servers chosen on NO BASIS WHATSOEVER from various sources!
+					new Server("wallet-arrr1.qortal.online", Server.ConnectionType.SSL, 443),
+					new Server("wallet-arrr2.qortal.online", Server.ConnectionType.SSL, 443),
+					new Server("wallet-arrr3.qortal.online", Server.ConnectionType.SSL, 443),
+					new Server("wallet-arrr4.qortal.online", Server.ConnectionType.SSL, 443),
+					new Server("wallet-arrr5.qortal.online", Server.ConnectionType.SSL, 443),
+					new Server("lightd.pirate.black", Server.ConnectionType.SSL, 443)
+				);
 			}

 			@Override
@@ -104,8 +107,9 @@ public class PirateChain extends Bitcoiny {
 			@Override
 			public Collection<Server> getServers() {
 				return Arrays.asList(
-						new Server("localhost", ConnectionType.TCP, 9067),
-						new Server("localhost", ConnectionType.SSL, 443));
+					new Server("localhost", Server.ConnectionType.TCP, 9067),
+					new Server("localhost", Server.ConnectionType.SSL, 443)
+				);
 			}

 			@Override
--- a/src/main/java/org/qortal/crosschain/Ravencoin.java
+++ b/src/main/java/org/qortal/crosschain/Ravencoin.java
@@ -43,19 +43,19 @@ public class Ravencoin extends Bitcoiny {
 			@Override
 			public Collection<Server> getServers() {
 				return Arrays.asList(
-						// Servers chosen on NO BASIS WHATSOEVER from various sources!
-						// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=rvn
-						//CLOSED new Server("aethyn.com", ConnectionType.SSL, 50002),
-						//CLOSED new Server("electrum2.rvn.rocks", ConnectionType.SSL, 50002),
-						//BEHIND new Server("electrum3.rvn.rocks", ConnectionType.SSL, 50002),
-						new Server("electrum.qortal.link", Server.ConnectionType.SSL, 56002),
-						new Server("electrum-rvn.qortal.online", ConnectionType.SSL, 50002),
-						new Server("electrum1-rvn.qortal.online", ConnectionType.SSL, 50002),
-						new Server("electrum1.cipig.net", ConnectionType.SSL, 20051),
-						new Server("electrum2.cipig.net", ConnectionType.SSL, 20051),
-						new Server("electrum3.cipig.net", ConnectionType.SSL, 20051),
-						new Server("rvn-dashboard.com", ConnectionType.SSL, 50002),
-						new Server("rvn4lyfe.com", ConnectionType.SSL, 50002));
+					// Servers chosen on NO BASIS WHATSOEVER from various sources!
+					// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=rvn
+					new Server("electrum.qortal.link", Server.ConnectionType.SSL, 56002),
+					new Server("electrum1-rvn.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum2-rvn.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum3-rvn.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum4-rvn.qortal.online", Server.ConnectionType.SSL, 50002),
+					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 20051),
+					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 20051),
+					new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 20051),
+					new Server("rvn-dashboard.com", Server.ConnectionType.SSL, 50002),
+					new Server("rvn4lyfe.com", Server.ConnectionType.SSL, 50002)
+				);
 			}

 			@Override
@@ -99,8 +99,9 @@ public class Ravencoin extends Bitcoiny {
 			@Override
 			public Collection<Server> getServers() {
 				return Arrays.asList(
-						new Server("localhost", ConnectionType.TCP, 50001),
-						new Server("localhost", ConnectionType.SSL, 50002));
+					new Server("localhost", Server.ConnectionType.TCP, 50001),
+					new Server("localhost", Server.ConnectionType.SSL, 50002)
+				);
 			}

 			@Override
--- a/src/main/java/org/qortal/data/transaction/TransactionData.java
+++ b/src/main/java/org/qortal/data/transaction/TransactionData.java
@@ -75,6 +75,9 @@ public abstract class TransactionData {
 	@Schema(description = "groupID for this transaction")
 	protected int txGroupId;

+	@Schema(description = "recipient for this transaction")
+	protected String recipient;
+
 	// Not always present
 	@Schema(accessMode = AccessMode.READ_ONLY, hidden = true, description = "height of block containing transaction")
 	protected Integer blockHeight;
@@ -105,7 +108,7 @@ public abstract class TransactionData {
 	/** Constructor for use by transaction subclasses. */
 	protected TransactionData(TransactionType type, BaseTransactionData baseTransactionData) {
 		this.type = type;
-
+		this.recipient = baseTransactionData.recipient;
 		this.timestamp = baseTransactionData.timestamp;
 		this.txGroupId = baseTransactionData.txGroupId;
 		this.reference = baseTransactionData.reference;
@@ -136,6 +139,10 @@ public abstract class TransactionData {
 		return this.txGroupId;
 	}

+	public String getRecipient() {
+		return this.recipient;
+	}
+
 	public void setTxGroupId(int txGroupId) {
 		this.txGroupId = txGroupId;
 	}
@@ -250,5 +257,4 @@ public abstract class TransactionData {

 		return Arrays.equals(this.signature, otherTransactionData.signature);
 	}
-
-}
+}
--- a/src/main/java/org/qortal/network/Network.java
+++ b/src/main/java/org/qortal/network/Network.java
@@ -8,7 +8,6 @@ import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
 import org.qortal.block.BlockChain;
 import org.qortal.controller.Controller;
 import org.qortal.controller.arbitrary.ArbitraryDataFileListManager;
-import org.qortal.controller.arbitrary.ArbitraryDataManager;
 import org.qortal.crypto.Crypto;
 import org.qortal.data.block.BlockData;
 import org.qortal.data.block.BlockSummaryData;
@@ -122,6 +121,22 @@ public class Network {
    private List<Peer> immutableOutboundHandshakedPeers = Collections.emptyList(); // always rebuilt from mutable, synced list above


+    /**
+     * Count threads per message type in order to enforce limits
+     */
+    private final Map<MessageType, Integer> threadsPerMessageType = Collections.synchronizedMap(new HashMap<>());
+
+    /**
+     * Keep track of total thread count, to warn when the thread pool is getting low
+     */
+    private int totalThreadCount = 0;
+
+    /**
+     * Thresholds at which to warn about the number of active threads
+     */
+    private final int threadCountWarningThreshold = (int) (Settings.getInstance().getMaxNetworkThreadPoolSize() * 0.9f);
+    private final Integer threadCountPerMessageTypeWarningThreshold = Settings.getInstance().getThreadCountPerMessageTypeWarningThreshold();
+
    private final List<PeerAddress> selfPeers = new ArrayList<>();

    private String bindAddress = null;
@@ -240,6 +255,16 @@ public class Network {
        private static final Network INSTANCE = new Network();
    }

+    public Map<MessageType, Integer> getThreadsPerMessageType() {
+        return this.threadsPerMessageType;
+    }
+
+    public int getTotalThreadCount() {
+        synchronized (this) {
+            return this.totalThreadCount;
+        }
+    }
+
    public static Network getInstance() {
        return SingletonContainer.INSTANCE;
    }
@@ -952,6 +977,37 @@ public class Network {

        // Should be non-handshaking messages from now on

+        // Limit threads per message type and discard if there are already too many
+        Integer maxThreadsForMessageType = Settings.getInstance().getMaxThreadsForMessageType(message.getType());
+        if (maxThreadsForMessageType != null) {
+            Integer threadCount = threadsPerMessageType.get(message.getType());
+            if (threadCount != null && threadCount >= maxThreadsForMessageType) {
+                LOGGER.trace("Discarding {} message as there are already {} active threads", message.getType().name(), threadCount);
+                return;
+            }
+        }
+
+        // Warn if necessary
+        if (threadCountPerMessageTypeWarningThreshold != null) {
+            Integer threadCount = threadsPerMessageType.get(message.getType());
+            if (threadCount != null && threadCount > threadCountPerMessageTypeWarningThreshold) {
+                LOGGER.info("Warning: high thread count for {} message type: {}", message.getType().name(), threadCount);
+            }
+        }
+
+        // Add to per-message thread count (first initializing to 0 if not already present)
+        threadsPerMessageType.computeIfAbsent(message.getType(), key -> 0);
+        threadsPerMessageType.computeIfPresent(message.getType(), (key, value) -> value + 1);
+        
+        // Add to total thread count
+        synchronized (this) {
+            totalThreadCount++;
+
+            if (totalThreadCount >= threadCountWarningThreshold) {
+                LOGGER.info("Warning: high total thread count: {} / {}", totalThreadCount, Settings.getInstance().getMaxNetworkThreadPoolSize());
+            }
+        }
+
        // Ordered by message type value
        switch (message.getType()) {
            case GET_PEERS:
@@ -979,6 +1035,15 @@ public class Network {
                Controller.getInstance().onNetworkMessage(peer, message);
                break;
        }
+
+        // Remove from per-message thread count (first initializing to 0 if not already present)
+        threadsPerMessageType.computeIfAbsent(message.getType(), key -> 0);
+        threadsPerMessageType.computeIfPresent(message.getType(), (key, value) -> value - 1);
+
+        // Remove from total thread count
+        synchronized (this) {
+            totalThreadCount--;
+        }
    }

    private void onHandshakingMessage(Peer peer, Message message, Handshake handshakeStatus) {
--- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java
+++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java
@@ -1014,5 +1014,4 @@ public class HSQLDBDatabaseUpdates {
 		LOGGER.info(() -> String.format("HSQLDB repository updated to version %d", databaseVersion + 1));
 		return true;
 	}
-
-}
+}
--- a/src/main/java/org/qortal/settings/Settings.java
+++ b/src/main/java/org/qortal/settings/Settings.java
@@ -29,6 +29,7 @@ import org.qortal.crosschain.Dogecoin.DogecoinNet;
 import org.qortal.crosschain.Digibyte.DigibyteNet;
 import org.qortal.crosschain.Ravencoin.RavencoinNet;
 import org.qortal.crosschain.PirateChain.PirateChainNet;
+import org.qortal.network.message.MessageType;
 import org.qortal.utils.EnumUtils;

 // All properties to be converted to JSON via JAXB
@@ -47,8 +48,8 @@ public class Settings {
 	private static final int MAINNET_GATEWAY_PORT = 80;
 	private static final int TESTNET_GATEWAY_PORT = 8080;

-    private static final int MAINNET_DEV_PROXY_PORT = 12393;
-    private static final int TESTNET_DEV_PROXY_PORT = 62393;
+	private static final int MAINNET_DEV_PROXY_PORT = 12393;
+	private static final int TESTNET_DEV_PROXY_PORT = 62393;

 	private static final Logger LOGGER = LogManager.getLogger(Settings.class);
 	private static final String SETTINGS_FILENAME = "settings.json";
@@ -110,10 +111,9 @@ public class Settings {
 	private boolean gatewayLoggingEnabled = false;
 	private boolean gatewayLoopbackEnabled = false;

-    // Developer Proxy
+	// Developer Proxy
 	private Integer devProxyPort;
-    private boolean devProxyLoggingEnabled = false;
-
+	private boolean devProxyLoggingEnabled = false;

 	// Specific to this node
 	private boolean wipeUnconfirmedOnStart = false;
@@ -186,7 +186,6 @@ public class Settings {
 	 * This has a significant effect on execution time. */
 	private int blockPruneBatchSize = 10000; // blocks

-
 	/** Whether we should archive old data to reduce the database size */
 	private boolean archiveEnabled = true;
 	/** How often to attempt archiving (ms). */
@@ -194,15 +193,12 @@ public class Settings {
 	/** Serialization version to use when building an archive */
 	private int defaultArchiveVersion = 2;

-
 	/** Whether to automatically bootstrap instead of syncing from genesis */
 	private boolean bootstrap = true;

-
 	/** Registered names integrity check */
 	private boolean namesIntegrityCheckEnabled = false;

-
 	// Peer-to-peer related
 	private boolean isTestNet = false;
 	/** Single node testnet mode */
@@ -230,7 +226,7 @@ public class Settings {
 	public long recoveryModeTimeout = 9999999999999L;

 	/** Minimum peer version number required in order to sync with them */
-	private String minPeerVersion = "4.1.2";
+	private String minPeerVersion = "4.3.0";
 	/** 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 false, sync will be blocked both ways, and they will not appear in the peers list */
@@ -289,10 +285,10 @@ public class Settings {

 	// Bootstrap sources
 	private String[] bootstrapHosts = new String[] {
-			"http://bootstrap.qortal.org",
-			"http://bootstrap2.qortal.org",
-			"http://bootstrap3.qortal.org",
-			"http://bootstrap.qortal.online"
+		"http://bootstrap.qortal.org",
+		"http://bootstrap2.qortal.org",
+		"http://bootstrap3.qortal.org",
+		"http://bootstrap.qortal.online"
 	};

 	// Auto-update sources
@@ -311,17 +307,35 @@ public class Settings {
 		"1.pool.ntp.org",
 		"2.pool.ntp.org",
 		"3.pool.ntp.org",
-		"cn.pool.ntp.org",
-		"0.cn.pool.ntp.org",
-		"1.cn.pool.ntp.org",
-		"2.cn.pool.ntp.org",
-		"3.cn.pool.ntp.org"
+		"asia.pool.ntp.org",
+		"0.asia.pool.ntp.org",
+		"1.asia.pool.ntp.org",
+		"2.asia.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() */
 	private Long testNtpOffset = null;

-
-
 	/* Foreign chains */

 	/** The number of consecutive empty addresses required before treating a wallet's transaction set as complete */
@@ -330,8 +344,6 @@ public class Settings {
 	/** How many wallet keys to generate when using bitcoinj as the blockchain interface (e.g. when sending coins) */
 	private int bitcoinjLookaheadSize = 50;

-
-
 	// Data storage (QDN)

 	/** Data storage enabled/disabled*/
@@ -371,6 +383,58 @@ public class Settings {
 	/** Whether to serve QDN data without authentication */
 	private boolean qdnAuthBypassEnabled = true;

+	/** Limit threads per message type */
+	private Set<ThreadLimit> maxThreadsPerMessageType = new HashSet<>();
+
+	/** The number of threads per message type at which a warning should be logged.
+	 * Exclude from settings.json to disable this warning. */
+	private Integer threadCountPerMessageTypeWarningThreshold = null;
+
+
+	// Domain mapping
+	public static class ThreadLimit {
+		private String messageType;
+		private Integer limit;
+
+		private ThreadLimit() { // makes JAXB happy; will never be invoked
+		}
+
+		private ThreadLimit(String messageType, Integer limit) {
+			this.messageType = messageType;
+			this.limit = limit;
+		}
+
+		public String getMessageType() {
+			return messageType;
+		}
+
+		public void setMessageType(String messageType) {
+			this.messageType = messageType;
+		}
+
+		public Integer getLimit() {
+			return limit;
+		}
+
+		public void setLimit(Integer limit) {
+			this.limit = limit;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (!(other instanceof ThreadLimit))
+				return false;
+
+			return this.messageType.equals(((ThreadLimit) other).getMessageType());
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(messageType);
+		}
+	}
+
+
 	// Domain mapping
 	public static class DomainMap {
 		private String domain;
@@ -396,7 +460,6 @@ public class Settings {
 		}
 	}

-
 	// Constructors

 	private Settings() {
@@ -497,6 +560,9 @@ public class Settings {
 			}
 		} while (settings.userPath != null);

+		// Set some additional defaults if needed
+		settings.setAdditionalDefaults();
+
 		// Validate settings
 		settings.validate();

@@ -533,6 +599,22 @@ public class Settings {
 		}
 	}

+	private void setAdditionalDefaults() {
+		// Populate defaults for maxThreadsPerMessageType. If any are specified in settings.json, they will take priority.
+		maxThreadsPerMessageType.add(new ThreadLimit("ARBITRARY_DATA_FILE", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("GET_ARBITRARY_DATA_FILE", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("ARBITRARY_DATA", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("GET_ARBITRARY_DATA", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("ARBITRARY_DATA_FILE_LIST", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("GET_ARBITRARY_DATA_FILE_LIST", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("ARBITRARY_SIGNATURES", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("ARBITRARY_METADATA", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("GET_ARBITRARY_METADATA", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("GET_TRANSACTION", 10));
+		maxThreadsPerMessageType.add(new ThreadLimit("TRANSACTION_SIGNATURES", 5));
+		maxThreadsPerMessageType.add(new ThreadLimit("TRADE_PRESENCES", 5));
+	}
+
 	// Getters / setters

 	public String getUserPath() {
@@ -660,17 +742,16 @@ public class Settings {
 	}


-    public int getDevProxyPort() {
-        if (this.devProxyPort != null)
-            return this.devProxyPort;
+	public int getDevProxyPort() {
+		if (this.devProxyPort != null)
+			return this.devProxyPort;

-        return this.isTestNet ? TESTNET_DEV_PROXY_PORT : MAINNET_DEV_PROXY_PORT;
-    }
-
-    public boolean isDevProxyLoggingEnabled() {
-        return this.devProxyLoggingEnabled;
-    }
+		return this.isTestNet ? TESTNET_DEV_PROXY_PORT : MAINNET_DEV_PROXY_PORT;
+	}

+	public boolean isDevProxyLoggingEnabled() {
+		return this.devProxyLoggingEnabled;
+	}

 	public boolean getWipeUnconfirmedOnStart() {
 		return this.wipeUnconfirmedOnStart;
@@ -1054,4 +1135,20 @@ public class Settings {
 		}
 		return this.qdnAuthBypassEnabled;
 	}
+
+	public Integer getMaxThreadsForMessageType(MessageType messageType) {
+		if (maxThreadsPerMessageType != null) {
+			for (ThreadLimit threadLimit : maxThreadsPerMessageType) {
+				if (threadLimit.getMessageType().equals(messageType.name())) {
+					return threadLimit.getLimit();
+				}
+			}
+		}
+		// No entry, so assume unlimited
+		return null;
+	}
+
+	public Integer getThreadCountPerMessageTypeWarningThreshold() {
+		return this.threadCountPerMessageTypeWarningThreshold;
+	}
 }
--- a/src/main/resources/blockchain.json
+++ b/src/main/resources/blockchain.json
@@ -22,7 +22,8 @@
 	"maxRewardSharesPerFounderMintingAccount": 6,
 	"maxRewardSharesByTimestamp": [
 		{ "timestamp": 0, "maxShares": 6 },
-		{ "timestamp": 1657382400000, "maxShares": 3 }
+		{ "timestamp": 1657382400000, "maxShares": 3 },
+		{ "timestamp": 1698508800000, "maxShares": 2 }
 	],
 	"founderEffectiveMintingLevel": 10,
 	"onlineAccountSignaturesMinLifetime": 43200000,
--- a/src/main/resources/i18n/ApiError_de.properties
+++ b/src/main/resources/i18n/ApiError_de.properties
@@ -4,52 +4,52 @@
 # "localeLang": "de",

 ### Common ###
-JSON = JSON Nachricht konnte nicht geparst werden
+JSON = JSON-Nachricht konnte nicht geparst werden

-INSUFFICIENT_BALANCE = Kein Ausgleich
+INSUFFICIENT_BALANCE = Guthaben reicht nicht aus

 UNAUTHORIZED = API-Aufruf nicht autorisiert

 REPOSITORY_ISSUE = Repository-Fehler

-NON_PRODUCTION = Dieser APi-Aufruf ist nicht gestattet für Produtkion
+NON_PRODUCTION = dieser API-Aufruf ist für Produktionssysteme nicht gestattet

-BLOCKCHAIN_NEEDS_SYNC = Blockchain muss sich erst verbinden
+BLOCKCHAIN_NEEDS_SYNC = Blockchain muss sich erst synchronisieren

-NO_TIME_SYNC = noch keine Uhrensynchronisation
+NO_TIME_SYNC = Uhrzeit noch nicht synchronisiert

 ### Validation ###
-INVALID_SIGNATURE = ungültige Signatur
+INVALID_SIGNATURE = Signatur ungültig

-INVALID_ADDRESS = ungültige Adresse
+INVALID_ADDRESS = Adresse ungültig

-INVALID_PUBLIC_KEY = ungültiger public key
+INVALID_PUBLIC_KEY = öffentlicher Schlüssel ungültig

-INVALID_DATA = ungültige Daten
+INVALID_DATA = Daten ungültig

-INVALID_NETWORK_ADDRESS = ungültige Netzwerk Adresse
+INVALID_NETWORK_ADDRESS = Netzwerk Adresse ungültig

-ADDRESS_UNKNOWN = Account Adresse unbekannt
+ADDRESS_UNKNOWN = Kontoadresse unbekannt

-INVALID_CRITERIA = ungültige Suchkriterien
+INVALID_CRITERIA = Suchkriterien ungültig

-INVALID_REFERENCE = ungültige Referenz
+INVALID_REFERENCE = Referenz ungültig

 TRANSFORMATION_ERROR = konnte JSON nicht in eine Transaktion umwandeln

-INVALID_PRIVATE_KEY = ungültiger private key
+INVALID_PRIVATE_KEY = öffentlicher Schlüssel ungültig

-INVALID_HEIGHT = ungültige block height
+INVALID_HEIGHT = Blockhöhe ungültig

-CANNOT_MINT = Account kann nicht minten
+CANNOT_MINT = Konto kann nicht prägen

 ### Blocks ###
-BLOCK_UNKNOWN = block unbekannt
+BLOCK_UNKNOWN = Block unbekannt

 ### Transactions ###
 TRANSACTION_UNKNOWN = Transaktion unbekannt

-PUBLIC_KEY_NOT_FOUND = public key wurde nicht gefunden
+PUBLIC_KEY_NOT_FOUND = öffentlicher Schlüssel wurde nicht gefunden

 # this one is special in that caller expected to pass two additional strings, hence the two %s
 TRANSACTION_INVALID = Transaktion ungültig: %s (%s)
@@ -58,19 +58,19 @@ TRANSACTION_INVALID = Transaktion ungültig: %s (%s)
 NAME_UNKNOWN = Name unbekannt

 ### Asset ###
-INVALID_ASSET_ID = ungültige asset ID
+INVALID_ASSET_ID = Vermögenswert-Kennung ungültig

-INVALID_ORDER_ID = ungültige asset order ID
+INVALID_ORDER_ID = Vermögenswert-Auftragssnummer ungültig

-ORDER_UNKNOWN = unbekannte asset order ID
+ORDER_UNKNOWN = Vermögenswert-Auftragssnummer unbekannt

 ### Groups ###
 GROUP_UNKNOWN = Gruppe unbekannt

 ### Foreign Blockchain ###
-FOREIGN_BLOCKCHAIN_NETWORK_ISSUE = fremde Blockchain oder ElectrumX Netzwerk Problem
+FOREIGN_BLOCKCHAIN_NETWORK_ISSUE = fremde Blockchain oder ElectrumX Netzwerkproblem

-FOREIGN_BLOCKCHAIN_BALANCE_ISSUE = unzureichend Bilanz auf fremde blockchain
+FOREIGN_BLOCKCHAIN_BALANCE_ISSUE = unzureichendes Guthaben auf fremder blockchain

 FOREIGN_BLOCKCHAIN_TOO_SOON = zu früh um fremde Blockchain-Transaktionen zu übertragen (Sperrzeit/mittlere Blockzeit)

@@ -80,4 +80,4 @@ ORDER_SIZE_TOO_SMALL = Bestellmenge zu niedrig
 ### Data ###
 FILE_NOT_FOUND = Datei nicht gefunden

-NO_REPLY = Peer hat nicht mit Daten verbinden
+NO_REPLY = Peer hat nicht in vorgegebener Zeit geantwortet
--- a/src/main/resources/i18n/SysTray_de.properties
+++ b/src/main/resources/i18n/SysTray_de.properties
@@ -1,7 +1,7 @@
 #Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
 # SysTray pop-up menu

-APPLYING_UPDATE_AND_RESTARTING = Automatisches Update anwenden und neu starten …
+APPLYING_UPDATE_AND_RESTARTING = Automatisches Update anwenden und neu starten...

 AUTO_UPDATE = Automatisches Update

@@ -19,7 +19,7 @@ CONNECTION = Verbindung

 CONNECTIONS = Verbindungen

-CREATING_BACKUP_OF_DB_FILES = Erstellen Backup von Datenbank Dateien …
+CREATING_BACKUP_OF_DB_FILES = Erstelle Backup von Datenbank Dateien...

 DB_BACKUP = Datenbank Backup

@@ -31,18 +31,18 @@ EXIT = Verlassen

 LITE_NODE = Lite node

-MINTING_DISABLED = Kein minting
+MINTING_DISABLED = Münzprägung inaktiv

-MINTING_ENABLED = \u2714 Minting aktiviert 
+MINTING_ENABLED = \u2714 Münzprägung aktiv

-OPEN_UI = Öffne UI
+OPEN_UI = Öffne Benutzeroberfläche

-PERFORMING_DB_CHECKPOINT = Speichern von unbestätigten Datenbankänderungen...
+PERFORMING_DB_CHECKPOINT = Speichere unerfasste Datenbankänderungen...

-PERFORMING_DB_MAINTENANCE = Planmäßige Wartung durchführen...
+PERFORMING_DB_MAINTENANCE = Planmäßige Wartung wird durchgeführt...

-SYNCHRONIZE_CLOCK = Synchronisiere Uhr
+SYNCHRONIZE_CLOCK = Synchronisiere Uhrzeit

-SYNCHRONIZING_BLOCKCHAIN = Synchronisierung der Blockchain
+SYNCHRONIZING_BLOCKCHAIN = Synchronisiere

-SYNCHRONIZING_CLOCK = Synchronisierung der Uhr
+SYNCHRONIZING_CLOCK = Uhrzeit wird synchronisiert
--- a/src/main/resources/i18n/TransactionValidity_de.properties
+++ b/src/main/resources/i18n/TransactionValidity_de.properties
@@ -1,60 +1,60 @@
 #

-ACCOUNT_ALREADY_EXISTS = Account existiert bereits
+ACCOUNT_ALREADY_EXISTS = Konto existiert bereits

-ACCOUNT_CANNOT_REWARD_SHARE = Account kann keine Belohnung teilen
+ACCOUNT_CANNOT_REWARD_SHARE = Konto kann nicht an Belohnungsbeteiligung teilnehmen

-ADDRESS_ABOVE_RATE_LIMIT = address hat das angegebene Geschwindigkeitlimit erreicht 
+ADDRESS_ABOVE_RATE_LIMIT = Adresse hat festgelegtes Tarif-Limit erreicht

-ADDRESS_BLOCKED =  Addresse ist geblockt
+ADDRESS_BLOCKED = diese Adresse ist gesperrt

-ALREADY_GROUP_ADMIN = bereits Gruppen Admin
+ALREADY_GROUP_ADMIN = bereits Gruppenadmin

-ALREADY_GROUP_MEMBER = bereits Gruppen Mitglied
+ALREADY_GROUP_MEMBER = bereits Gruppenmitglied

 ALREADY_VOTED_FOR_THAT_OPTION = bereits für diese Option gestimmt

-ASSET_ALREADY_EXISTS = asset existiert bereits
+ASSET_ALREADY_EXISTS = Vermögenswert existiert bereits

-ASSET_DOES_NOT_EXIST = asset nicht gefunden 
+ASSET_DOES_NOT_EXIST = Vermögenswert existiert nicht

-ASSET_DOES_NOT_MATCH_AT = asset passt nicht mit AT's asset
+ASSET_DOES_NOT_MATCH_AT = Vermögenswert stimmt nicht mit dem Vermögenswert von AT überein

-ASSET_NOT_SPENDABLE = asset ist nicht ausgabefähig
+ASSET_NOT_SPENDABLE = Vermögenswert ist nicht auszahlbar

 AT_ALREADY_EXISTS = AT existiert bereits

-AT_IS_FINISHED = AT ist fertig 
+AT_IS_FINISHED = AT ist beendet

-AT_UNKNOWN = AT unbekannt 
+AT_UNKNOWN = AT unbekannt

-BAN_EXISTS = ban besteht bereits
+BAN_EXISTS = Bann ist bereits vorhanden

-BAN_UNKNOWN = ban unbekannt
+BAN_UNKNOWN = Bann unbekannt

-BANNED_FROM_GROUP = von der gruppe gebannt
+BANNED_FROM_GROUP = aus der Gruppe verbannt

-BUYER_ALREADY_OWNER = Käufer ist bereits Besitzer 
+BUYER_ALREADY_OWNER = Käufer ist bereits Eigentümer

-CLOCK_NOT_SYNCED = Uhr nicht synchronisiert
+CLOCK_NOT_SYNCED = Uhrzeit ist nicht synchronisiert

-DUPLICATE_MESSAGE = Adresse sendete doppelte Nachricht
+DUPLICATE_MESSAGE = Adresse hat doppelte Nachricht gesendet

-DUPLICATE_OPTION = Duplizierungsmöglichkeit
+DUPLICATE_OPTION = doppelte Option

-GROUP_ALREADY_EXISTS = Gruppe besteht bereits
+GROUP_ALREADY_EXISTS = Gruppe existiert bereits

-GROUP_APPROVAL_DECIDED = Gruppenfreigabe bereits beschlossen
+GROUP_APPROVAL_DECIDED = Gruppenzulassung bereits beschlossen

-GROUP_APPROVAL_NOT_REQUIRED = Gruppenfreigabe nicht erforderlich
+GROUP_APPROVAL_NOT_REQUIRED = Gruppenzustimmung nicht erforderlich

-GROUP_DOES_NOT_EXIST = Gruppe nicht vorhanden
+GROUP_DOES_NOT_EXIST = Gruppe existiert nicht

 GROUP_ID_MISMATCH = Gruppen-ID stimmt nicht überein

-GROUP_OWNER_CANNOT_LEAVE = Gruppenbesitzer kann Gruppe nicht verlassen
+GROUP_OWNER_CANNOT_LEAVE = Gruppeneigentümer kann Gruppe nicht verlassen

-HAVE_EQUALS_WANT = das bessesene-asset ist das selbe wie das gesuchte-asset
+HAVE_EQUALS_WANT = Haben-Vermögenswert ist derselbe wie Wollen-Vermögenswert

 INCORRECT_NONCE = falsche PoW-Nonce

@@ -64,81 +64,81 @@ INVALID_ADDRESS = ungültige Adresse

 INVALID_AMOUNT = ungültiger Betrag

-INVALID_ASSET_OWNER = Ungültiger Eigentümer
+INVALID_ASSET_OWNER = ungültiger Vermögenswert-Eigentümer

 INVALID_AT_TRANSACTION = ungültige AT-Transaktion

-INVALID_AT_TYPE_LENGTH = ungültige AT 'Typ' Länge
+INVALID_AT_TYPE_LENGTH = ungültige AT-Typ-Länge

-INVALID_BUT_OK = ungültig aber OK
+INVALID_BUT_OK = ungültig, aber OK

-INVALID_CREATION_BYTES = ungültige Erstellungs der bytes
+INVALID_CREATION_BYTES = ungültige Erstellungsbytes

-INVALID_DATA_LENGTH = ungültige Datenlänge
+INVALID_DATA_LENGTH = unzulässige Datenlänge

-INVALID_DESCRIPTION_LENGTH = ungültige Länge der Beschreibung
+INVALID_DESCRIPTION_LENGTH = unzulässige Länge der Beschreibung

 INVALID_GROUP_APPROVAL_THRESHOLD = ungültiger Schwellenwert für die Gruppenzulassung

-INVALID_GROUP_BLOCK_DELAY = Ungültige Blockverzögerung der Gruppenfreigabe
+INVALID_GROUP_BLOCK_DELAY = ungültige Blockverzögerung bei der Gruppenfreigabe

 INVALID_GROUP_ID = ungültige Gruppen-ID

-INVALID_GROUP_OWNER = ungültiger Gruppenbesitzer
+INVALID_GROUP_OWNER = ungültiger Gruppeneigentümer

-INVALID_LIFETIME = unzulässige Lebensdauer
+INVALID_LIFETIME = unzulässige Gültigkeitsdauer

 INVALID_NAME_LENGTH = ungültige Namenslänge

-INVALID_NAME_OWNER = ungültiger Besitzername 
+INVALID_NAME_OWNER = ungültiger Eigentümer des Namens

 INVALID_OPTION_LENGTH = ungültige Länge der Optionen

-INVALID_OPTIONS_COUNT = Anzahl ungültiger Optionen
+INVALID_OPTIONS_COUNT = ungültige Anzahl von Optionen

 INVALID_ORDER_CREATOR = ungültiger Auftragsersteller

-INVALID_PAYMENTS_COUNT = Anzahl ungültiger Zahlungen
+INVALID_PAYMENTS_COUNT = ungültige Anzahl der Zahlungen

 INVALID_PUBLIC_KEY = ungültiger öffentlicher Schlüssel

-INVALID_QUANTITY = unzulässige Menge
+INVALID_QUANTITY = ungültige Menge

 INVALID_REFERENCE = ungültige Referenz

 INVALID_RETURN = ungültige Rückgabe

-INVALID_REWARD_SHARE_PERCENT = ungültig Prozent der Belohnunganteile 
+INVALID_REWARD_SHARE_PERCENT = ungültiger Belohnungsbeteiligungs-Anteil

-INVALID_SELLER = unzulässiger Verkäufer
+INVALID_SELLER = ungültiger Verkäufer

 INVALID_TAGS_LENGTH = ungültige 'tags'-Länge

-INVALID_TIMESTAMP_SIGNATURE = Ungültige Zeitstempel-Signatur
+INVALID_TIMESTAMP_SIGNATURE = ungültige Zeitstempel-Signatur

-INVALID_TX_GROUP_ID = Ungültige Transaktionsgruppen-ID
+INVALID_TX_GROUP_ID = ungültige Transaktionsgruppen-ID

-INVALID_VALUE_LENGTH = ungültige 'Wert'-Länge
+INVALID_VALUE_LENGTH = ungültige 'value'-Länge

 INVITE_UNKNOWN = Gruppeneinladung unbekannt

-JOIN_REQUEST_EXISTS = Gruppeneinladung existiert bereits
+JOIN_REQUEST_EXISTS = Gruppenverbindungsanfrage existiert bereits

-MAXIMUM_REWARD_SHARES = die maximale Anzahl von Reward-Shares für dieses Konto erreicht
+MAXIMUM_REWARD_SHARES = maximale Anzahl von Belohnungsbeteiligungen für dieses Konto bereits erreicht

 MISSING_CREATOR = fehlender Ersteller

-MULTIPLE_NAMES_FORBIDDEN = mehrere registrierte Namen pro Konto sind untersagt
+MULTIPLE_NAMES_FORBIDDEN = mehrere registrierte Namen pro Konto sind verboten

-NAME_ALREADY_FOR_SALE = Name bereits zum Verkauf
+NAME_ALREADY_FOR_SALE = Name steht bereits zum Verkauf

 NAME_ALREADY_REGISTERED = Name bereits registriert

-NAME_BLOCKED = Name geblockt
+NAME_BLOCKED = dieser Name ist gesperrt

-NAME_DOES_NOT_EXIST = Name nicht vorhanden
+NAME_DOES_NOT_EXIST = Name existiert nicht

-NAME_NOT_FOR_SALE = Name ist unverkäuflich
+NAME_NOT_FOR_SALE = Name steht nicht zum Verkauf

 NAME_NOT_NORMALIZED = Name nicht in Unicode-'normalisierter' Form

@@ -150,46 +150,46 @@ NEGATIVE_PRICE = ungültiger/negativer Preis

 NO_BALANCE = unzureichendes Guthaben

-NO_BLOCKCHAIN_LOCK = die Blockchain des Knotens ist beschäftigt
+NO_BLOCKCHAIN_LOCK = die Blockchain des Knotens ist derzeit beschäftigt

 NO_FLAG_PERMISSION = Konto hat diese Berechtigung nicht

-NOT_GROUP_ADMIN = Account ist kein Gruppenadmin
+NOT_GROUP_ADMIN = Konto ist kein Gruppenadmin

-NOT_GROUP_MEMBER = Account kein Gruppenmitglied 
+NOT_GROUP_MEMBER = Konto ist kein Gruppenmitglied

-NOT_MINTING_ACCOUNT = Account kann nicht minten
+NOT_MINTING_ACCOUNT = Konto kann nicht prägen

 NOT_YET_RELEASED = Funktion noch nicht freigegeben

 OK = OK

-ORDER_ALREADY_CLOSED = Asset Trade Order ist bereits geschlossen
+ORDER_ALREADY_CLOSED = Vermögenswert-Handelsauftrag ist bereits geschlossen

-ORDER_DOES_NOT_EXIST = asset trade order existiert nicht
+ORDER_DOES_NOT_EXIST = Vermögenswert-Handelsauftrag existiert nicht

-POLL_ALREADY_EXISTS = Umfrage bereits vorhanden
+POLL_ALREADY_EXISTS = Umfrage existiert bereits

-POLL_DOES_NOT_EXIST = Umfrage nicht vorhanden
+POLL_DOES_NOT_EXIST = Umfrage existiert nicht

-POLL_OPTION_DOES_NOT_EXIST = Umfrageoption existiert nicht
+POLL_OPTION_DOES_NOT_EXIST = Umfrageoption nicht vorhanden

 PUBLIC_KEY_UNKNOWN = öffentlicher Schlüssel unbekannt

-REWARD_SHARE_UNKNOWN = Geteilte Belohnungen unbekant
+REWARD_SHARE_UNKNOWN = Belohnungsbeteiligung unbekannt

-SELF_SHARE_EXISTS = Selbstbeteiligung (Geteilte Belohnungen) sind breits vorhanden
+SELF_SHARE_EXISTS = Selbst-Beteiligung (Belohnungsbeteiligung) existiert bereits

 TIMESTAMP_TOO_NEW = Zeitstempel zu neu

 TIMESTAMP_TOO_OLD = Zeitstempel zu alt

-TOO_MANY_UNCONFIRMED = Account hat zu viele unbestätigte Transaktionen am laufen
+TOO_MANY_UNCONFIRMED = Konto hat zu viele ausstehende unbestätigte Transaktionen

-TRANSACTION_ALREADY_CONFIRMED = Transaktionen sind bereits bestätigt
+TRANSACTION_ALREADY_CONFIRMED = Transaktion wurde bereits bestätigt

-TRANSACTION_ALREADY_EXISTS = Transaktionen existiert bereits
+TRANSACTION_ALREADY_EXISTS = Transaktion existiert bereits

-TRANSACTION_UNKNOWN = Unbekante Transaktion
+TRANSACTION_UNKNOWN = Transaktion unbekannt

-TX_GROUP_ID_MISMATCH = Transaktion Gruppen ID stimmt nicht überein
+TX_GROUP_ID_MISMATCH = die Gruppen-ID der Transaktion stimmt nicht überein
--- a/tools/qdn
+++ b/tools/qdn
@@ -5,10 +5,10 @@ host="localhost"
 port=12391

 if [ -z "$*" ]; then
-	echo "Usage:"
+ 	echo "Usage:"
 	echo
 	echo "Host/update data:"
-	echo "qdn POST [service] [name] PATH [dirpath] <identifier>"
+	echo "qdn POST [service] [name] PATH [dirpath] <identifier> <title> <description> <tags=tag1,tag2,tag3> <category> <fee> <preview (true or false)>"
 	echo "qdn POST [service] [name] STRING [data-string] <identifier>"
 	echo
 	echo "Fetch data:"
@@ -22,6 +22,21 @@ if [ -z "$*" ]; then
 	exit
 fi

+
+# Default ports for Qortal
+mainnet_port=12391
+testnet_port=62391
+
+# Check if the '-t' operator is passed, if so change to utilizing testnet.
+if [[ "$1" == "-t" ]]; then
+  # Use testnet port
+  port=$testnet_port
+  shift
+else
+  # Use mainnet port
+  port=$mainnet_port
+fi
+
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

 if [ -f "apikey.txt" ]; then
@@ -37,32 +52,46 @@ service=$2
 name=$3

 if [ -z "${method}" ]; then
-  echo "Error: missing method"; exit
+  echo "Error: missing method"
+  exit 1
 fi
 if [ -z "${service}" ]; then
-  echo "Error: missing service"; exit
+  echo "Error: missing service"
+  exit 1
 fi
 if [ -z "${name}" ]; then
-  echo "Error: missing name"; exit
+  echo "Error: missing name"
+  exit 1
 fi

-
 if [[ "${method}" == "POST" ]]; then
  type=$4
  data=$5
  identifier=$6
+  title=$7
+  description=$8
+  tags=$9
+  category=${10}
+  fee=${11}
+  preview=${12}
+  
+

  if [ -z "${data}" ]; then
    if [[ "${type}" == "PATH" ]]; then
-      echo "Error: missing directory"; exit
+      echo "Error: missing directory - please use a path to a directory with a SINGLE file wishing to be published"
+      exit 1
    elif [[ "${type}" == "STRING" ]]; then
-      echo "Error: missing data string"; exit
+      echo "Error: missing data string - please input the data string you wish to publish"
+      exit 1
    else
-      echo "Error: unrecognized type"; exit
+      echo "Error: unrecognized type"
+      exit 1
    fi
  fi
  if [ -z "${QORTAL_PRIVKEY}" ]; then
-    echo "Error: missing private key. Set it by running: export QORTAL_PRIVKEY=privkeyhere"; exit
+    echo "Error: missing private key. Set it by running: export QORTAL_PRIVKEY=privkeyhere"
+    exit 1
  fi

  if [ -z "${identifier}" ]; then
@@ -75,30 +104,88 @@ if [[ "${method}" == "POST" ]]; then
  elif [[ "${type}" == "STRING" ]]; then
      type_component="/string"
  fi
+  
+  # Create tags component in URL, comma-separated list of tags, will be added to the tags call.
+  tags_component=""
+  if [ -n "${tags}" ]; then
+    IFS=',' read -ra tag_array <<< "${tags}"
+    for tag in "${tag_array[@]}"; do
+      tags_component+="&tags=${tag}"
+    done
+  fi
+  
+    if [ -z ${tags_component} ]; then
+      tags_component=""
+      echo "nothing in tags, using empty tags"
+    fi
+  
+  #Create category component with pre-defined list of categories. Error if category is specified but not in list.
+  allowed_categories=("ART" "AUTOMOTIVE" "BEAUTY" "BOOKS" "BUSINESS" "COMMUNICATIONS" "CRYPTOCURRENCY" "CULTURE" "DATING" "DESIGN" "ENTERTAINMENT" "EVENTS" "FAITH" "FASHION" "FINANCE" "FOOD" "GAMING" "GEOGRAPHY" "HEALTH" "HISTORY" "HOME" "KNOWLEDGE" "LANGUAGE" "LIFESTYLE" "MANUFACTURING" "MAPS" "MUSIC" "NEWS" "OTHER" "PETS" "PHILOSOPHY" "PHOTOGRAPHY" "POLITICS" "PRODUCE" "PRODUCTIVITY" "PSYCHOLOGY" "QORTAL" "SCIENCE" "SELF_CARE" "SELF_SUFFICIENCY" "SHOPPING" "SOCIAL" "SOFTWARE" "SPIRITUALITY" "SPORTS" "STORYTELLING" "TECHNOLOGY" "TOOLS" "TRAVEL" "UNCATEGORIZED" "VIDEO" "WEATHER")
+  
+  if [[ -n "$category" && ! " ${allowed_categories[@]} " =~ " $category " ]]; then
+    echo "Error: Invalid category. Allowed categories are: ${allowed_categories[*]} be sure to place your overall script inputs in the correct order"
+    exit 1
+  elif [ -z "$category" ]; then
+    category=""
+    echo "No category is being set"
+  fi
+  
+  if [ -n "$fee" ]; then
+    if [[ "$fee" == "1" || "$fee" == ".01" ]]; then
+    fee="1000000"
+  elif [ -z "$fee" ]; then
+    fee=""
+  else 
+    echo "Error: Invalid fee value. Expected '1', '.01' or no input."
+    exit 1
+    fi
+    final_fee="${fee}"
+  fi
+
+  
+  # check that preview is true/false
+  if [[ -n "$preview" && ! ( "$preview" == "true" || "$preview" == "false" ) ]]; then
+    echo "Error: Invalid preview value. Expected 'true' or 'false'. Please retry with boolean as preview entry."
+    exit 1
+  elif [ -z "$preview" ]; then
+    preview=""
+  fi
+
+  # Build the API URL
+  api_url="http://${host}:${port}/arbitrary/${service}/${name}/${identifier}${type_component}"
+  api_url+="?title=${title}&description=${description}&tags=${tags_component}&category=${category}&fee=${final_fee}&preview=${preview}"
+

  echo "Creating transaction - this can take a while..."
-  tx_data=$(curl --silent --insecure -X ${method} "http://${host}:${port}/arbitrary/${service}/${name}/${identifier}${type_component}" -H "X-API-KEY: ${apikey}" -d "${data}")
+  tx_data=$(curl --silent --insecure -X ${method} "${api_url}" -H "accept: text/plain" -H "X-API-KEY: ${apikey}" -H "Content-Type: text/plain" -d "${data}")

  if [[ "${tx_data}" == *"error"* || "${tx_data}" == *"ERROR"* ]]; then
-    echo "${tx_data}"; exit
+    echo "Error creating transaction: ${tx_data}"
+    exit 1
  elif [ -z "${tx_data}" ]; then
-    echo "Error: no transaction data returned"; exit
+    echo "Error: no transaction data returned"
+    exit 1
  fi

  echo "Computing nonce..."
  computed_tx_data=$(curl --silent --insecure -X POST "http://${host}:${port}/arbitrary/compute" -H "Content-Type: application/json" -H "X-API-KEY: ${apikey}" -d "${tx_data}")
+
  if [[ "${computed_tx_data}" == *"error"* || "${computed_tx_data}" == *"ERROR"* ]]; then
-    echo "${computed_tx_data}"; exit
+    echo "Error computing nonce: ${computed_tx_data}"
+    exit 1
  fi

  echo "Signing..."
  signed_tx_data=$(curl --silent --insecure -X POST "http://${host}:${port}/transactions/sign" -H  "Content-Type: application/json" -d "{\"privateKey\":\"${QORTAL_PRIVKEY}\",\"transactionBytes\":\"${computed_tx_data}\"}")
+
  if [[ "${signed_tx_data}" == *"error"* || "${signed_tx_data}" == *"ERROR"* ]]; then
-    echo "${signed_tx_data}"; exit
+    echo "Error signing transaction: ${signed_tx_data}"
+    exit 1
  fi

  echo "Broadcasting..."
  success=$(curl --silent --insecure -X POST "http://${host}:${port}/transactions/process" -H  "Content-Type: text/plain" -d "${signed_tx_data}")
+
  if [[ "${success}" == "true" ]]; then
    echo "Transaction broadcast successfully"
  else
@@ -131,9 +218,10 @@ elif [[ "${method}" == "GET" ]]; then
    echo "Empty response from ${host}:${port}"
  fi
  if [[ "${response}" == *"error"* || "${response}" == *"ERROR"* ]]; then
-    echo "${response}"; exit
+    echo "${response}"
+    exit 1
  fi

  echo "${response}"
-
 fi
+
Author	SHA1	Message	Date
QuickMythril	033b6adb72	Bump version to 4.3.1	2023-10-19 13:51:53 -04:00
QuickMythril	53c3f7899a	Reward share limit activation timestamp set to 1698508800000 (Sat Oct 28 2023 16:00:00 UTC)	2023-10-19 13:48:33 -04:00
QuickMythril	f7f2d70b77	Merge pull request #134 from AlphaX-Projects/master Final dependencies updates and fixes	2023-10-19 12:57:44 -04:00
AlphaX-Projects	5cbd4490cc	Back to Bouncycastle 1.69	2023-10-18 17:29:10 +02:00
AlphaX-Projects	7103f41e36	Reorg pom update dependencies	2023-10-18 13:49:53 +02:00
AlphaX-Projects	2d599ec3c5	Summary of activity past 24 hours	2023-10-17 18:39:17 +02:00
AlphaX-Projects	e40d884c81	Merge pull request #10 from Qortal/master Merge thread limit	2023-10-17 18:23:59 +02:00
QuickMythril	7cbeb00c1a	Merge pull request #132 from Qortal/thread-limits Added support for thread limits.	2023-10-17 12:10:35 -04:00
AlphaX-Projects	2af8199d9c	Update dependencies	2023-10-16 17:27:14 +02:00
AlphaX-Projects	404c5d0300	Filter failed trade after 1 attempt	2023-10-15 17:12:02 +02:00
AlphaX-Projects	db7b17e52e	Revert HSQLDB update	2023-10-13 15:57:43 +02:00
AlphaX-Projects	6d202b2b48	Create settings.json	2023-10-12 11:23:36 +02:00
AlphaX-Projects	499e2ac3f4	hide-failed-trade	2023-10-10 23:24:57 +02:00
AlphaX-Projects	bf270a63ff	Update bouncycastle	2023-09-24 15:19:07 +02:00
CalDescent	9454031b48	Added support for thread limits. Default thread limits per message type can be specified in Settings.setAdditionalDefaults(), e.g maxThreadsPerMessageType.add(new ThreadLimit("GET_ARBITRARY_DATA_FILE", 5)); These can also be overridden on a per-node basis in settings.json, e.g "maxThreadsPerMessageType": [ { "messageType": "GET_ARBITRARY_DATA_FILE", "limit": 3 }, { "messageType": "GET_ARBITRARY_DATA_FILE_LIST", "limit": 3 } ] settings.json values take priority, but any message types that aren't specified in settings.json will still be included from the Settings.java defaults. This allows single message types to be overridden in settings.json without removing the limits for all of the other message types. Any messages that arrive are discarded if the node is already at the thread limit for that message type. Warnings are now shown in the logs if the total number of active threads reaches 90% of the allocated thread pool size. Additionally, it can warn per message type by specifying a per-message-type warning threshold in settings.json, e.g "threadCountPerMessageTypeWarningThreshold": 20 The above setting would warn in the logs if a single message type was consuming more than 20 threads at once, therefore making it a candidate to be limited in maxThreadsPerMessageType. Initial values of maxThreadsPerMessageType are guesses and may need modifying based on real world results. Limiting threads may impact functionality, so this should be carefully tested. Also be aware that the thread tracking may reduce network performance slightly, so be sure to test thoroughly on slower hardware.	2023-09-22 13:06:03 +01:00
AlphaX-Projects	cae3fdcb06	Update ElectrumX Servers	2023-09-22 11:12:50 +02:00
AlphaX-Projects	1fbb1659a3	Update dependencies	2023-09-13 10:43:05 +02:00
AlphaX-Projects	9959985a13	Update grpc	2023-09-09 10:56:17 +02:00
AlphaX-Projects	15c073edfe	Merge branch 'Qortal:master' into master	2023-09-08 15:20:44 +02:00
QuickMythril	d453e80c6b	Update fee in qdn script	2023-09-08 03:30:06 -04:00
QuickMythril	4fb799ba38	Merge pull request #125 from crowetic/master ADD: (Tools) New features for qdn script	2023-09-08 03:26:34 -04:00
QuickMythril	29e56158ae	Merge pull request #98 from Nuc1eoN/german-translation ADD: (Language) German updates	2023-09-08 02:37:45 -04:00
QuickMythril	f74c9672f6	Merge branch 'test-german' into german-translation	2023-09-08 02:29:07 -04:00
AlphaX-Projects	a7ca306d1b	Update json dependency	2023-09-07 16:54:09 +02:00
AlphaX-Projects	1a9087984a	Swagger updates	2023-09-06 17:22:13 +02:00
AlphaX-Projects	94e9f86245	Version 3.8.0 get faster the NTP offset	2023-09-06 09:11:41 +02:00
AlphaX-Projects	bd05578035	Reverse need latest 1.7.x	2023-09-05 18:31:32 +02:00
AlphaX-Projects	c0ed4022a5	Update log4j2.properties	2023-09-05 15:27:33 +02:00
AlphaX-Projects	12dbff79c9	Update logging properties	2023-09-05 15:20:21 +02:00
AlphaX-Projects	6be3897fdb	Update logging	2023-09-05 15:06:46 +02:00
AlphaX-Projects	43921e6ab8	Update jetty server	2023-09-05 13:44:54 +02:00
AlphaX-Projects	b92c7cc866	Update dependencies and ntp servers	2023-09-05 11:35:53 +02:00
AlphaX-Projects	053d56d01d	Update hsqldb to 2.7.2 , ciyam at to 1.4.1	2023-09-05 09:40:01 +02:00
CalDescent	eb6a834fd9	Default minPeerVersion set to 4.3.0	2023-09-01 10:47:45 +01:00
crowetic	ac433b1527	Add files via upload	2023-06-27 13:29:10 -07:00
Nuc1eoN	0693e26cda	Update/add German translation	2022-10-09 15:34:20 +02:00