Bump to v1.3.4

Added BTC.getUnusedReceiveAddress() to support above.

WindowsInstaller/dictionary.ail

@@ -3,95 +3,115 @@
   <!-- Control table -->
   <ENTRY id="Control.Text.CustomizeDataPathDlg#Description">
     <STRING lang="en" value="Do you want to store the blockchain, and other data, in a specific folder?"/>
+	<STRING lang="ru" value="Вы можете выбрать место хранения блокчейна и других данных."/>
     <STRING lang="zh" value="你想把区块链数据存放在一个特定的文件夹吗？"/>
     <STRING lang="zh_TW" value="你想把区块链数据存放在一个特定的文件夹吗？"/>
   </ENTRY>
   <ENTRY id="Control.Text.CustomizeDataPathDlg#Text">
     <STRING lang="en" value="Select one of the options below, then click &quot;Next&quot;."/>
+	<STRING lang="ru" value="Выберите один из вариантов ниже, затем нажмите Далее"/>
     <STRING lang="zh" value="请选择，然后“下一步”"/>
     <STRING lang="zh_TW" value="请选择，然后“下一步”"/>
   </ENTRY>
   <ENTRY id="Control.Text.CustomizeDataPathDlg#Title">
     <STRING lang="en" value="Choose Custom Data Storage Folder?"/>
+	<STRING lang="ru" value="Выберите место хранения данных."/>
     <STRING lang="zh" value="选择数据保存的文件夹?"/>
     <STRING lang="zh_TW" value="选择数据保存的文件夹?"/>
   </ENTRY>
   <ENTRY id="Control.Text.CustomizeDbDlg#Description">
     <STRING lang="en" value="Do you want to store the blockchain, and other data, in a specific folder?"/>
+	<STRING lang="ru" value="Вы можете выбрать место хранения блокчейна и других данных."/>
     <STRING lang="zh" value="Do you want to store the blockchain, and other data, in a specific folder?"/>
     <STRING lang="zh_TW" value="Do you want to store the blockchain, and other data, in a specific folder?"/>
   </ENTRY>
   <ENTRY id="Control.Text.CustomizeDbDlg#Title">
     <STRING lang="en" value="Choose Custom Data Storage Folder?"/>
+	<STRING lang="ru" value="Выберите место хранения данных."/>
     <STRING lang="zh" value="Choose Custom Data Storage Folder?"/>
     <STRING lang="zh_TW" value="Choose Custom Data Storage Folder?"/>
   </ENTRY>
   <ENTRY id="Control.Text.DataFolderDlg#Description">
     <STRING lang="en" value="This is the folder where the blockchain, and other data, will be stored."/>
+	<STRING lang="ru" value="Это папка, в которой будет храниться блокчейн и другие данные."/>
     <STRING lang="zh" value="这里是区块链及其它数据存放的文件夹"/>
     <STRING lang="zh_TW" value="这里是区块链及其它数据存放的文件夹"/>
   </ENTRY>
   <ENTRY id="Control.Text.DataFolderDlg#Text">
     <STRING lang="en" value="To store data in this folder, click &quot;[Text_Next]&quot;. To store data in a different folder, enter it below or click &quot;Browse&quot;."/>
+	<STRING lang="ru" value="Чтобы сохранить данные в этой папке, нажмите &quot;[Text_Next]&quot;. Чтобы сохранить данные в другой папке, введите ее ниже или нажмите &quot;Обзор&quot;."/>
     <STRING lang="zh" value="如果存放在这个文件夹，点 “下一步”。如果存放在其它位置，请选择“浏览”。"/>
     <STRING lang="zh_TW" value="如果存放在这个文件夹，点 “下一步”。如果存放在其它位置，请选择“浏览”。"/>
   </ENTRY>
   <ENTRY id="Control.Text.DataFolderDlg#Title">
     <STRING lang="en" value="Select Data Storage Folder"/>
+	<STRING lang="ru" value="Выберите папку для хранения данных"/>
     <STRING lang="zh" value="请选择文件存储地方"/>
     <STRING lang="zh_TW" value="请选择文件存储地方"/>
   </ENTRY>
   <ENTRY id="Control.Text.DbFolderDlg#Description">
     <STRING lang="en" value="This is the folder where the blockchain, and other data, will be stored."/>
+	<STRING lang="ru" value="Это папка, в которой будет храниться блокчейн и другие данные."/>
     <STRING lang="zh" value="This is the folder where the blockchain, and other data, will be stored."/>
     <STRING lang="zh_TW" value="This is the folder where the blockchain, and other data, will be stored."/>
   </ENTRY>
   <ENTRY id="Control.Text.DbFolderDlg#Title">
     <STRING lang="en" value="Select Data Storage Folder"/>
+	<STRING lang="ru" value="Выберите папку для хранения данных"/>
     <STRING lang="zh" value="请选择文件存储地方"/>
     <STRING lang="zh_TW" value="请选择文件存储地方"/>
   </ENTRY>
   <ENTRY id="Control.Text.NTPDialog#Description">
     <STRING lang="en" value="Reconfigure Windows for more accurate time?"/>
+	<STRING lang="ru" value="Настроить синхронизацию времени системы Windows?"/>
     <STRING lang="zh" value="重新配置Windows以获得更准确的时间？"/>
   </ENTRY>
   <ENTRY id="Control.Text.NTPDialog#Text_1">
     <STRING lang="en" value="An accurate Windows clock is required to connect to the [ProductName] network and make transactions."/>
+	<STRING lang="ru" value="Для подключения к сети Qortal и совершения транзакций требуется точная настройка времени Windows"/>
     <STRING lang="zh" value="需要准确的Windows时钟才能连接到[ProductName]网络并进行交易。"/>
   </ENTRY>
   <ENTRY id="Control.Text.NTPDialog#Text_2">
     <STRING lang="en" value="Select one of the options below, then click &quot;Next&quot;."/>
+	<STRING lang="ru" value="Выберите один из вариантов ниже, затем нажмите"/>
     <STRING lang="zh" value="请选择，然后“下一步”"/>
   </ENTRY>
   <ENTRY id="Control.Text.NTPDialog#Text_3">
     <STRING lang="en" value="Your computer&apos;s clock needs to be accurate to within 0.5 seconds."/>
+	<STRING lang="ru" value="Точность времени вашего компьютера должна составлять 0.5 секунд."/>
     <STRING lang="zh" value="您的计算机时钟需要准确到0.5秒内。"/>
   </ENTRY>
   <ENTRY id="Control.Text.NTPDialog#Title">
     <STRING lang="en" value="Windows clock accuracy"/>
+	<STRING lang="ru" value="Настройка времени системы Windows"/>
     <STRING lang="zh" value="Windows 时钟精度"/>
   </ENTRY>
   <ENTRY id="Control.Text.VerifyRemoveDlg#RemoveBlockchainCheckbox">
     <STRING lang="en" value="Remove downloaded blockchain and other data"/>
+	<STRING lang="ru" value="Удалить загруженный блокчейн и другие данные"/>
     <STRING lang="zh" value="删除您下载的区块链"/>
   </ENTRY>
   <!-- RadioButton table -->
   <ENTRY id="RadioButton.Text.CUSTOM_DB_BOOL#choose">
     <STRING lang="en" value="Choose custom data storage folder..."/>
+	<STRING lang="ru" value="Выбрать папку для хранения данных..."/>
     <STRING lang="zh" value="选择特定的文件夹存储"/>
     <STRING lang="zh_TW" value="选择特定的文件夹存储"/>
   </ENTRY>
   <ENTRY id="RadioButton.Text.CUSTOM_DB_BOOL#default">
     <STRING lang="en" value="Use default location "/>
+	<STRING lang="ru" value="Использовать папку по умолчанию"/>
     <STRING lang="zh" value="使用默认存储地点"/>
     <STRING lang="zh_TW" value="使用默认存储地点"/>
   </ENTRY>
   <ENTRY id="RadioButton.Text.RECONFIG_NTP#1">
     <STRING lang="en" value="Yes, configure Windows to use internet time servers (Recommended)"/>
+	<STRING lang="ru" value="Да, настроить синхронизацию времени Windows (Рекомендуется)"/>
     <STRING lang="zh" value="是，将Windows配置为使用多个Internet时间服务器 (推荐的)"/>
   </ENTRY>
   <ENTRY id="RadioButton.Text.RECONFIG_NTP#2">
     <STRING lang="en" value="No, I will manage clock accuracy myself"/>
+	<STRING lang="ru" value="Нет, я сам буду управлять настройками часов"/>
     <STRING lang="zh" value="不，我会自己管理时钟精度。"/>
   </ENTRY>
 </DICTIONARY>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.qortal</groupId>
 	<artifactId>qortal</artifactId>
-	<version>1.3.2</version>
+	<version>1.3.4</version>
 	<packaging>jar</packaging>
 	<properties>
 		<bitcoinj.version>0.15.5</bitcoinj.version>

src/main/java/org/qortal/ApplyUpdate.java

@@ -35,6 +35,8 @@ public class ApplyUpdate {
 	private static final String JAR_FILENAME = AutoUpdate.JAR_FILENAME;
 	private static final String NEW_JAR_FILENAME = AutoUpdate.NEW_JAR_FILENAME;
 	private static final String WINDOWS_EXE_LAUNCHER = "qortal.exe";
+	private static final String JAVA_TOOL_OPTIONS_NAME = "JAVA_TOOL_OPTIONS";
+	private static final String JAVA_TOOL_OPTIONS_VALUE = "-XX:MaxRAMFraction=4";
 
 	private static final long CHECK_INTERVAL = 10 * 1000L; // ms
 	private static final int MAX_ATTEMPTS = 12;
@@ -65,17 +67,19 @@ public class ApplyUpdate {
 	}
 
 	private static boolean shutdownNode() {
-		String BASE_URI = "http://localhost:" + Settings.getInstance().getApiPort() + "/";
-		LOGGER.info(String.format("Shutting down node using API via %s", BASE_URI));
+		String baseUri = "http://localhost:" + Settings.getInstance().getApiPort() + "/";
+		LOGGER.info(() -> String.format("Shutting down node using API via %s", baseUri));
 
 		int attempt;
 		for (attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
-			LOGGER.info(String.format("Attempt #%d out of %d to shutdown node", attempt + 1, MAX_ATTEMPTS));
-			String response = ApiRequest.perform(BASE_URI + "admin/stop", null);
+			final int attemptForLogging = attempt;
+			LOGGER.info(() -> String.format("Attempt #%d out of %d to shutdown node", attemptForLogging + 1, MAX_ATTEMPTS));
+			String response = ApiRequest.perform(baseUri + "admin/stop", null);
 			if (response == null)
-				break;
+				// No response - consider node shut down
+				return true;
 
-			LOGGER.info(String.format("Response from API: %s", response));
+			LOGGER.info(() -> String.format("Response from API: %s", response));
 
 			try {
 				Thread.sleep(CHECK_INTERVAL);
@@ -99,19 +103,20 @@ public class ApplyUpdate {
 		Path newJar = Paths.get(NEW_JAR_FILENAME);
 
 		if (!Files.exists(newJar)) {
-			LOGGER.warn(String.format("Replacement JAR '%s' not found?", newJar));
+			LOGGER.warn(() -> String.format("Replacement JAR '%s' not found?", newJar));
 			return;
 		}
 
 		int attempt;
 		for (attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
-			LOGGER.info(String.format("Attempt #%d out of %d to replace JAR", attempt + 1, MAX_ATTEMPTS));
+			final int attemptForLogging = attempt;
+			LOGGER.info(() -> String.format("Attempt #%d out of %d to replace JAR", attemptForLogging + 1, MAX_ATTEMPTS));
 
 			try {
 				Files.copy(newJar, realJar, StandardCopyOption.REPLACE_EXISTING);
 				break;
 			} catch (IOException e) {
-				LOGGER.info(String.format("Unable to replace JAR: %s", e.getMessage()));
+				LOGGER.info(() -> String.format("Unable to replace JAR: %s", e.getMessage()));
 
 				// Try again
 			}
@@ -119,6 +124,7 @@ public class ApplyUpdate {
 			try {
 				Thread.sleep(CHECK_INTERVAL);
 			} catch (InterruptedException e) {
+				LOGGER.warn("Ignoring interrupt...");
 				// Doggedly retry
 			}
 		}
@@ -129,13 +135,13 @@ public class ApplyUpdate {
 
 	private static void restartNode(String[] args) {
 		String javaHome = System.getProperty("java.home");
-		LOGGER.info(String.format("Java home: %s", javaHome));
+		LOGGER.info(() -> String.format("Java home: %s", javaHome));
 
 		Path javaBinary = Paths.get(javaHome, "bin", "java");
-		LOGGER.info(String.format("Java binary: %s", javaBinary));
+		LOGGER.info(() -> String.format("Java binary: %s", javaBinary));
 
 		Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER);
-		LOGGER.info(String.format("Windows EXE launcher: %s", exeLauncher));
+		LOGGER.info(() -> String.format("Windows EXE launcher: %s", exeLauncher));
 
 		List<String> javaCmd;
 		if (Files.exists(exeLauncher)) {
@@ -156,9 +162,16 @@ public class ApplyUpdate {
 		}
 
 		try {
-			LOGGER.info(String.format("Restarting node with: %s", String.join(" ", javaCmd)));
+			LOGGER.info(() -> String.format("Restarting node with: %s", String.join(" ", javaCmd)));
 
-			new ProcessBuilder(javaCmd).start();
+			ProcessBuilder processBuilder = new ProcessBuilder(javaCmd);
+
+			if (Files.exists(exeLauncher)) {
+				LOGGER.info(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE));
+				processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE);
+			}
+
+			processBuilder.start();
 		} catch (IOException e) {
 			LOGGER.error(String.format("Failed to restart node (BAD): %s", e.getMessage()));
 		}

src/main/java/org/qortal/api/model/CrossChainBitcoinRefundRequest.java

@@ -22,6 +22,9 @@ public class CrossChainBitcoinRefundRequest {
 	@Schema(description = "Bitcoin miner fee", example = "0.00001000")
 	public BigDecimal bitcoinMinerFee;
 
+	@Schema(description = "Bitcoin HASH160(public key) for receiving funds, or omit to derive from private key", example = "u17kBVKkKSp12oUzaxFwNnq1JZf")
+	public byte[] receivingAccountInfo;
+
 	public CrossChainBitcoinRefundRequest() {
 	}
 

src/main/java/org/qortal/api/resource/CrossChainResource.java

@@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 import java.util.function.Function;
@@ -718,6 +719,13 @@ public class CrossChainResource {
 		if (refundRequest.atAddress == null || !Crypto.isValidAtAddress(refundRequest.atAddress))
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
 
+		if (refundRequest.receivingAccountInfo == null)
+			refundRequest.receivingAccountInfo = refundKey.getPubKeyHash();
+
+		if (refundRequest.receivingAccountInfo.length != 20)
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
+
+
 		// Extract data from cross-chain trading AT
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			ATData atData = fetchAtDataWithChecking(repository, refundRequest.atAddress);
@@ -755,7 +763,7 @@ public class CrossChainResource {
 
 			Coin refundAmount = Coin.valueOf(p2shBalance - refundRequest.bitcoinMinerFee.unscaledValue().longValue());
 
-			org.bitcoinj.core.Transaction refundTransaction = BTCP2SH.buildRefundTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, lockTime);
+			org.bitcoinj.core.Transaction refundTransaction = BTCP2SH.buildRefundTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, lockTime, refundRequest.receivingAccountInfo);
 			boolean wasBroadcast = BTC.getInstance().broadcastTransaction(refundTransaction);
 
 			if (!wasBroadcast)
@@ -1223,6 +1231,10 @@ public class CrossChainResource {
 	)
 	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
 	public List<CrossChainTradeSummary> getCompletedTrades(
+			@Parameter(
+				description = "Only return trades that completed on/after this timestamp (milliseconds since epoch)",
+				example = "1597310000000"
+			) @QueryParam("minimumTimestamp") Long minimumTimestamp,
 			@Parameter( ref = "limit") @QueryParam("limit") Integer limit,
 			@Parameter( ref = "offset" ) @QueryParam("offset") Integer offset,
 			@Parameter( ref = "reverse" ) @QueryParam("reverse") Boolean reverse) {
@@ -1230,10 +1242,27 @@ public class CrossChainResource {
 		if (limit != null && limit > 100)
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
 
+		// minimumTimestamp (if given) needs to be positive
+		if (minimumTimestamp != null && minimumTimestamp <= 0)
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
+
 		final Boolean isFinished = Boolean.TRUE;
-		final Integer minimumFinalHeight = null;
 
 		try (final Repository repository = RepositoryManager.getRepository()) {
+			Integer minimumFinalHeight = null;
+
+			if (minimumTimestamp != null) {
+				minimumFinalHeight = repository.getBlockRepository().getHeightFromTimestamp(minimumTimestamp);
+
+				if (minimumFinalHeight == 0)
+					// We don't have any blocks since minimumTimestamp, let alone trades, so nothing to return
+					return Collections.emptyList();
+
+				// height returned from repository is for block BEFORE timestamp
+				// but we want trades AFTER timestamp so bump height accordingly
+				minimumFinalHeight++;
+			}
+
 			List<ATStateData> atStates = repository.getATRepository().getMatchingFinalATStates(BTCACCT.CODE_BYTES_HASH,
 					isFinished,
 					BTCACCT.MODE_BYTE_OFFSET, (long) BTCACCT.Mode.REDEEMED.value,

src/main/java/org/qortal/api/websocket/AdminStatusWebSocket.java

@@ -13,59 +13,87 @@ import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
 import org.qortal.api.model.NodeStatus;
-import org.qortal.controller.StatusNotifier;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
+import org.qortal.controller.Controller;
+import org.qortal.event.Event;
+import org.qortal.event.EventBus;
+import org.qortal.event.Listener;
 
 @WebSocket
 @SuppressWarnings("serial")
-public class AdminStatusWebSocket extends ApiWebSocket {
+public class AdminStatusWebSocket extends ApiWebSocket implements Listener {
+
+	private static final AtomicReference<String> previousOutput = new AtomicReference<>(null);
 
 	@Override
 	public void configure(WebSocketServletFactory factory) {
 		factory.register(AdminStatusWebSocket.class);
+
+		try {
+			previousOutput.set(buildStatusString());
+		} catch (IOException e) {
+			// How to fail properly?
+			return;
+		}
+
+		EventBus.INSTANCE.addListener(this::listen);
+	}
+
+	@Override
+	public void listen(Event event) {
+		if (!(event instanceof Controller.StatusChangeEvent))
+			return;
+
+		String newOutput;
+		try {
+			newOutput = buildStatusString();
+		} catch (IOException e) {
+			// Ignore this time?
+			return;
+		}
+
+		if (previousOutput.getAndUpdate(currentValue -> newOutput).equals(newOutput))
+			// Output hasn't changed, so don't send anything
+			return;
+
+		for (Session session : getSessions())
+			this.sendStatus(session, newOutput);
 	}
 
 	@OnWebSocketConnect
+	@Override
 	public void onWebSocketConnect(Session session) {
-		AtomicReference<String> previousOutput = new AtomicReference<>(null);
+		this.sendStatus(session, previousOutput.get());
 
-		StatusNotifier.Listener listener = timestamp -> onNotify(session, previousOutput);
-		StatusNotifier.getInstance().register(session, listener);
-
-		this.onNotify(session, previousOutput);
+		super.onWebSocketConnect(session);
 	}
 
 	@OnWebSocketClose
+	@Override
 	public void onWebSocketClose(Session session, int statusCode, String reason) {
-		StatusNotifier.getInstance().deregister(session);
+		super.onWebSocketClose(session, statusCode, reason);
 	}
 
 	@OnWebSocketError
 	public void onWebSocketError(Session session, Throwable throwable) {
+		/* We ignore errors for now, but method here to silence log spam */
 	}
 
 	@OnWebSocketMessage
 	public void onWebSocketMessage(Session session, String message) {
+		/* ignored */
 	}
 
-	private void onNotify(Session session,AtomicReference<String> previousOutput) {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			NodeStatus nodeStatus = new NodeStatus();
+	private static String buildStatusString() throws IOException {
+		NodeStatus nodeStatus = new NodeStatus();
+		StringWriter stringWriter = new StringWriter();
+		marshall(stringWriter, nodeStatus);
+		return stringWriter.toString();
+	}
 
-			StringWriter stringWriter = new StringWriter();
-
-			marshall(stringWriter, nodeStatus);
-
-			// Only output if something has changed
-			String output = stringWriter.toString();
-			if (output.equals(previousOutput.get()))
-				return;
-
-			previousOutput.set(output);
-			session.getRemote().sendStringByFuture(output);
-		} catch (DataException | IOException | WebSocketException e) {
+	private void sendStatus(Session session, String status) {
+		try {
+			session.getRemote().sendStringByFuture(status);
+		} catch (WebSocketException e) {
 			// No output this time?
 		}
 	}

src/main/java/org/qortal/api/websocket/BlocksWebSocket.java

@@ -14,7 +14,11 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
 import org.qortal.api.ApiError;
 import org.qortal.api.model.BlockInfo;
-import org.qortal.controller.BlockNotifier;
+import org.qortal.controller.Controller;
+import org.qortal.data.block.BlockData;
+import org.qortal.event.Event;
+import org.qortal.event.EventBus;
+import org.qortal.event.Listener;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
@@ -22,26 +26,42 @@ import org.qortal.utils.Base58;
 
 @WebSocket
 @SuppressWarnings("serial")
-public class BlocksWebSocket extends ApiWebSocket {
+public class BlocksWebSocket extends ApiWebSocket implements Listener {
 
 	@Override
 	public void configure(WebSocketServletFactory factory) {
 		factory.register(BlocksWebSocket.class);
+
+		EventBus.INSTANCE.addListener(this::listen);
+	}
+
+	@Override
+	public void listen(Event event) {
+		if (!(event instanceof Controller.NewBlockEvent))
+			return;
+
+		BlockData blockData = ((Controller.NewBlockEvent) event).getBlockData();
+		BlockInfo blockInfo = new BlockInfo(blockData);
+
+		for (Session session : getSessions())
+			sendBlockInfo(session, blockInfo);
 	}
 
 	@OnWebSocketConnect
+	@Override
 	public void onWebSocketConnect(Session session) {
-		BlockNotifier.Listener listener = blockInfo -> onNotify(session, blockInfo);
-		BlockNotifier.getInstance().register(session, listener);
+		super.onWebSocketConnect(session);
 	}
 
 	@OnWebSocketClose
+	@Override
 	public void onWebSocketClose(Session session, int statusCode, String reason) {
-		BlockNotifier.getInstance().deregister(session);
+		super.onWebSocketClose(session, statusCode, reason);
 	}
 
 	@OnWebSocketError
 	public void onWebSocketError(Session session, Throwable throwable) {
+		/* We ignore errors for now, but method here to silence log spam */
 	}
 
 	@OnWebSocketMessage
@@ -71,7 +91,7 @@ public class BlocksWebSocket extends ApiWebSocket {
 					return;
 				}
 
-				onNotify(session, blockInfos.get(0));
+				sendBlockInfo(session, blockInfos.get(0));
 			} catch (DataException e) {
 				sendError(session, ApiError.REPOSITORY_ISSUE);
 			}
@@ -100,13 +120,13 @@ public class BlocksWebSocket extends ApiWebSocket {
 				return;
 			}
 
-			onNotify(session, blockInfos.get(0));
+			sendBlockInfo(session, blockInfos.get(0));
 		} catch (DataException e) {
 			sendError(session, ApiError.REPOSITORY_ISSUE);
 		}
 	}
 
-	private void onNotify(Session session, BlockInfo blockInfo) {
+	private void sendBlockInfo(Session session, BlockInfo blockInfo) {
 		StringWriter stringWriter = new StringWriter();
 
 		try {

src/main/java/org/qortal/api/websocket/TradeOffersWebSocket.java

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.eclipse.jetty.websocket.api.Session;
@@ -14,12 +15,15 @@ import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.qortal.api.model.BlockInfo;
 import org.qortal.api.model.CrossChainOfferSummary;
-import org.qortal.controller.BlockNotifier;
+import org.qortal.controller.Controller;
 import org.qortal.crosschain.BTCACCT;
 import org.qortal.data.at.ATStateData;
+import org.qortal.data.block.BlockData;
 import org.qortal.data.crosschain.CrossChainTradeData;
+import org.qortal.event.Event;
+import org.qortal.event.EventBus;
+import org.qortal.event.Listener;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
@@ -27,120 +31,56 @@ import org.qortal.utils.NTP;
 
 @WebSocket
 @SuppressWarnings("serial")
-public class TradeOffersWebSocket extends ApiWebSocket {
+public class TradeOffersWebSocket extends ApiWebSocket implements Listener {
+
+	private static final Map<String, BTCACCT.Mode> previousAtModes = new HashMap<>();
+
+	// OFFERING
+	private static final List<CrossChainOfferSummary> currentSummaries = new ArrayList<>();
+	// REDEEMED/REFUNDED/CANCELLED
+	private static final List<CrossChainOfferSummary> historicSummaries = new ArrayList<>();
+
+	private static final Predicate<CrossChainOfferSummary> isCurrent = offerSummary
+			-> offerSummary.getMode() == BTCACCT.Mode.OFFERING;
+
+	private static final Predicate<CrossChainOfferSummary> isHistoric = offerSummary
+			-> offerSummary.getMode() == BTCACCT.Mode.REDEEMED
+			|| offerSummary.getMode() == BTCACCT.Mode.REFUNDED
+			|| offerSummary.getMode() == BTCACCT.Mode.CANCELLED;
+
 
 	@Override
 	public void configure(WebSocketServletFactory factory) {
 		factory.register(TradeOffersWebSocket.class);
+
+		try (final Repository repository = RepositoryManager.getRepository()) {
+			populateCurrentSummaries(repository);
+
+			populateHistoricSummaries(repository);
+		} catch (DataException e) {
+			// How to fail properly?
+			return;
+		}
+
+		EventBus.INSTANCE.addListener(this::listen);
 	}
 
-	@OnWebSocketConnect
-	public void onWebSocketConnect(Session session) {
-		Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
+	@Override
+	public void listen(Event event) {
+		if (!(event instanceof Controller.NewBlockEvent))
+			return;
 
-		final boolean includeHistoric = queryParams.get("includeHistoric") != null;
-		final Map<String, BTCACCT.Mode> previousAtModes = new HashMap<>();
+		BlockData blockData = ((Controller.NewBlockEvent) event).getBlockData();
+
+		// Process any new info
 		List<CrossChainOfferSummary> crossChainOfferSummaries;
 
 		try (final Repository repository = RepositoryManager.getRepository()) {
-			List<ATStateData> initialAtStates;
-
-			// We want ALL OFFERING trades
-			Boolean isFinished = Boolean.FALSE;
-			Integer dataByteOffset = BTCACCT.MODE_BYTE_OFFSET;
-			Long expectedValue = (long) BTCACCT.Mode.OFFERING.value;
-			Integer minimumFinalHeight = null;
-
-			initialAtStates = repository.getATRepository().getMatchingFinalATStates(BTCACCT.CODE_BYTES_HASH,
-					isFinished, dataByteOffset, expectedValue, minimumFinalHeight,
-					null, null, null);
-
-			if (initialAtStates == null) {
-				session.close(4001, "repository issue fetching OFFERING trades");
-				return;
-			}
-
-			// Save initial AT modes
-			previousAtModes.putAll(initialAtStates.stream().collect(Collectors.toMap(ATStateData::getATAddress, atState -> BTCACCT.Mode.OFFERING)));
-
-			// Convert to offer summaries
-			crossChainOfferSummaries = produceSummaries(repository, initialAtStates, null);
-
-			if (includeHistoric) {
-				// We also want REDEEMED/REFUNDED/CANCELLED trades over the last 24 hours
-				long timestamp = NTP.getTime() - 24 * 60 * 60 * 1000L;
-				minimumFinalHeight = repository.getBlockRepository().getHeightFromTimestamp(timestamp);
-
-				if (minimumFinalHeight != 0) {
-					isFinished = Boolean.TRUE;
-					dataByteOffset = null;
-					expectedValue = null;
-					++minimumFinalHeight; // because height is just *before* timestamp
-
-					List<ATStateData> historicAtStates = repository.getATRepository().getMatchingFinalATStates(BTCACCT.CODE_BYTES_HASH,
-							isFinished, dataByteOffset, expectedValue, minimumFinalHeight,
-							null, null, null);
-
-					if (historicAtStates == null) {
-						session.close(4002, "repository issue fetching historic trades");
-						return;
-					}
-
-					for (ATStateData historicAtState : historicAtStates) {
-						CrossChainOfferSummary historicOfferSummary = produceSummary(repository, historicAtState, null);
-
-						switch (historicOfferSummary.getMode()) {
-							case REDEEMED:
-							case REFUNDED:
-							case CANCELLED:
-								break;
-
-							default:
-								continue;
-						}
-
-						// Add summary to initial burst
-						crossChainOfferSummaries.add(historicOfferSummary);
-
-						// Save initial AT mode
-						previousAtModes.put(historicAtState.getATAddress(), historicOfferSummary.getMode());
-					}
-				}
-			}
-
-		} catch (DataException e) {
-			session.close(4003, "generic repository issue");
-			return;
-		}
-
-		if (!sendOfferSummaries(session, crossChainOfferSummaries)) {
-			session.close(4004, "websocket issue");
-			return;
-		}
-
-		BlockNotifier.Listener listener = blockInfo -> onNotify(session, blockInfo, previousAtModes);
-		BlockNotifier.getInstance().register(session, listener);
-	}
-
-	@OnWebSocketClose
-	public void onWebSocketClose(Session session, int statusCode, String reason) {
-		BlockNotifier.getInstance().deregister(session);
-	}
-
-	@OnWebSocketMessage
-	public void onWebSocketMessage(Session session, String message) {
-		/* ignored */
-	}
-
-	private void onNotify(Session session, BlockInfo blockInfo, final Map<String, BTCACCT.Mode> previousAtModes) {
-		List<CrossChainOfferSummary> crossChainOfferSummaries = null;
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			// Find any new trade ATs since this block
+			// Find any new/changed trade ATs since this block
 			final Boolean isFinished = null;
 			final Integer dataByteOffset = null;
 			final Long expectedValue = null;
-			final Integer minimumFinalHeight = blockInfo.getHeight();
+			final Integer minimumFinalHeight = blockData.getHeight();
 
 			List<ATStateData> atStates = repository.getATRepository().getMatchingFinalATStates(BTCACCT.CODE_BYTES_HASH,
 					isFinished, dataByteOffset, expectedValue, minimumFinalHeight,
@@ -149,12 +89,13 @@ public class TradeOffersWebSocket extends ApiWebSocket {
 			if (atStates == null)
 				return;
 
-			crossChainOfferSummaries = produceSummaries(repository, atStates, blockInfo.getTimestamp());
+			crossChainOfferSummaries = produceSummaries(repository, atStates, blockData.getTimestamp());
 		} catch (DataException e) {
 			// No output this time
+			return;
 		}
 
-		synchronized (previousAtModes) { //NOSONAR squid:S2445 suppressed because previousAtModes is final and curried in lambda
+		synchronized (previousAtModes) {
 			// Remove any entries unchanged from last time
 			crossChainOfferSummaries.removeIf(offerSummary -> previousAtModes.get(offerSummary.getQortalAtAddress()) == offerSummary.getMode());
 
@@ -162,13 +103,63 @@ public class TradeOffersWebSocket extends ApiWebSocket {
 			if (crossChainOfferSummaries.isEmpty())
 				return;
 
-			final boolean wasSent = sendOfferSummaries(session, crossChainOfferSummaries);
-
-			if (!wasSent)
-				return;
-
+			// Update
 			previousAtModes.putAll(crossChainOfferSummaries.stream().collect(Collectors.toMap(CrossChainOfferSummary::getQortalAtAddress, CrossChainOfferSummary::getMode)));
+
+			synchronized (currentSummaries) {
+				// Add any OFFERING to 'current'
+				currentSummaries.addAll(crossChainOfferSummaries.stream().filter(isCurrent).collect(Collectors.toList()));
+			}
+
+			final long tooOldTimestamp = NTP.getTime() - 24 * 60 * 60 * 1000L;
+			synchronized (historicSummaries) {
+				// Add any REDEEMED/REFUNDED/CANCELLED
+				historicSummaries.addAll(crossChainOfferSummaries.stream().filter(isHistoric).collect(Collectors.toList()));
+
+				// But also remove any that are over 24 hours old
+				historicSummaries.removeIf(offerSummary -> offerSummary.getTimestamp() < tooOldTimestamp);
+			}
 		}
+
+		// Notify sessions
+		for (Session session : getSessions())
+			sendOfferSummaries(session, crossChainOfferSummaries);
+	}
+
+	@OnWebSocketConnect
+	@Override
+	public void onWebSocketConnect(Session session) {
+		Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
+		final boolean includeHistoric = queryParams.get("includeHistoric") != null;
+
+		List<CrossChainOfferSummary> crossChainOfferSummaries;
+
+		synchronized (currentSummaries) {
+			crossChainOfferSummaries = new ArrayList<>(currentSummaries);
+		}
+
+		if (includeHistoric)
+			synchronized (historicSummaries) {
+				crossChainOfferSummaries.addAll(historicSummaries);
+			}
+
+		if (!sendOfferSummaries(session, crossChainOfferSummaries)) {
+			session.close(4002, "websocket issue");
+			return;
+		}
+
+		super.onWebSocketConnect(session);
+	}
+
+	@OnWebSocketClose
+	@Override
+	public void onWebSocketClose(Session session, int statusCode, String reason) {
+		super.onWebSocketClose(session, statusCode, reason);
+	}
+
+	@OnWebSocketMessage
+	public void onWebSocketMessage(Session session, String message) {
+		/* ignored */
 	}
 
 	private boolean sendOfferSummaries(Session session, List<CrossChainOfferSummary> crossChainOfferSummaries) {
@@ -186,6 +177,68 @@ public class TradeOffersWebSocket extends ApiWebSocket {
 		return true;
 	}
 
+	private static void populateCurrentSummaries(Repository repository) throws DataException {
+		// We want ALL OFFERING trades
+		Boolean isFinished = Boolean.FALSE;
+		Integer dataByteOffset = BTCACCT.MODE_BYTE_OFFSET;
+		Long expectedValue = (long) BTCACCT.Mode.OFFERING.value;
+		Integer minimumFinalHeight = null;
+
+		List<ATStateData> initialAtStates = repository.getATRepository().getMatchingFinalATStates(BTCACCT.CODE_BYTES_HASH,
+				isFinished, dataByteOffset, expectedValue, minimumFinalHeight,
+				null, null, null);
+
+		if (initialAtStates == null)
+			throw new DataException("Couldn't fetch current trades from repository");
+
+		// Save initial AT modes
+		previousAtModes.putAll(initialAtStates.stream().collect(Collectors.toMap(ATStateData::getATAddress, atState -> BTCACCT.Mode.OFFERING)));
+
+		// Convert to offer summaries
+		currentSummaries.addAll(produceSummaries(repository, initialAtStates, null));
+	}
+
+	private static void populateHistoricSummaries(Repository repository) throws DataException {
+		// We want REDEEMED/REFUNDED/CANCELLED trades over the last 24 hours
+		long timestamp = System.currentTimeMillis() - 24 * 60 * 60 * 1000L;
+		int minimumFinalHeight = repository.getBlockRepository().getHeightFromTimestamp(timestamp);
+
+		if (minimumFinalHeight == 0)
+			throw new DataException("Couldn't fetch block timestamp from repository");
+
+		Boolean isFinished = Boolean.TRUE;
+		Integer dataByteOffset = null;
+		Long expectedValue = null;
+		++minimumFinalHeight; // because height is just *before* timestamp
+
+		List<ATStateData> historicAtStates = repository.getATRepository().getMatchingFinalATStates(BTCACCT.CODE_BYTES_HASH,
+				isFinished, dataByteOffset, expectedValue, minimumFinalHeight,
+				null, null, null);
+
+		if (historicAtStates == null)
+			throw new DataException("Couldn't fetch historic trades from repository");
+
+		for (ATStateData historicAtState : historicAtStates) {
+			CrossChainOfferSummary historicOfferSummary = produceSummary(repository, historicAtState, null);
+
+			switch (historicOfferSummary.getMode()) {
+				case REDEEMED:
+				case REFUNDED:
+				case CANCELLED:
+					break;
+
+				default:
+					continue;
+			}
+
+			// Add summary to initial burst
+			historicSummaries.add(historicOfferSummary);
+
+			// Save initial AT mode
+			previousAtModes.put(historicAtState.getATAddress(), historicOfferSummary.getMode());
+		}
+	}
+
 	private static CrossChainOfferSummary produceSummary(Repository repository, ATStateData atState, Long timestamp) throws DataException {
 		CrossChainTradeData crossChainTradeData = BTCACCT.populateTradeData(repository, atState);
 

src/main/java/org/qortal/controller/BlockMinter.java

@@ -1,4 +1,4 @@
-package org.qortal.block;
+package org.qortal.controller;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -13,8 +13,9 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.qortal.account.Account;
 import org.qortal.account.PrivateKeyAccount;
+import org.qortal.block.Block;
 import org.qortal.block.Block.ValidationResult;
-import org.qortal.controller.Controller;
+import org.qortal.block.BlockChain;
 import org.qortal.data.account.MintingAccountData;
 import org.qortal.data.account.RewardShareData;
 import org.qortal.data.block.BlockData;
@@ -60,7 +61,7 @@ public class BlockMinter extends Thread {
 				List<TransactionData> unconfirmedTransactions = repository.getTransactionRepository().getUnconfirmedTransactions();
 
 				for (TransactionData transactionData : unconfirmedTransactions) {
-					LOGGER.trace(String.format("Deleting unconfirmed transaction %s", Base58.encode(transactionData.getSignature())));
+					LOGGER.trace(() -> String.format("Deleting unconfirmed transaction %s", Base58.encode(transactionData.getSignature())));
 					repository.getTransactionRepository().delete(transactionData);
 				}
 
@@ -69,7 +70,7 @@ public class BlockMinter extends Thread {
 
 			// Going to need this a lot...
 			BlockRepository blockRepository = repository.getBlockRepository();
-			Block previousBlock = null;
+			BlockData previousBlockData = null;
 
 			List<Block> newBlocks = new ArrayList<>();
 
@@ -115,7 +116,7 @@ public class BlockMinter extends Thread {
 
 					RewardShareData rewardShareData = repository.getAccountRepository().getRewardShare(mintingAccountData.getPublicKey());
 					if (rewardShareData == null) {
-						// Reward-share doesn't even exist - probably not a good sign
+						// Reward-share doesn't exist - probably cancelled but not yet removed from node's list of minting accounts
 						madi.remove();
 						continue;
 					}
@@ -150,8 +151,8 @@ public class BlockMinter extends Thread {
 				isMintingPossible = true;
 
 				// Check blockchain hasn't changed
-				if (previousBlock == null || !Arrays.equals(previousBlock.getSignature(), lastBlockData.getSignature())) {
-					previousBlock = new Block(repository, lastBlockData);
+				if (previousBlockData == null || !Arrays.equals(previousBlockData.getSignature(), lastBlockData.getSignature())) {
+					previousBlockData = lastBlockData;
 					newBlocks.clear();
 
 					// Reduce log timeout
@@ -162,12 +163,12 @@ public class BlockMinter extends Thread {
 				mintingAccountsData.removeIf(mintingAccountData -> newBlocks.stream().anyMatch(newBlock -> Arrays.equals(newBlock.getBlockData().getMinterPublicKey(), mintingAccountData.getPublicKey())));
 
 				// Do we need to build any potential new blocks?
-				List<PrivateKeyAccount> mintingAccounts = mintingAccountsData.stream().map(accountData -> new PrivateKeyAccount(repository, accountData.getPrivateKey())).collect(Collectors.toList());
+				List<PrivateKeyAccount> newBlocksMintingAccounts = mintingAccountsData.stream().map(accountData -> new PrivateKeyAccount(repository, accountData.getPrivateKey())).collect(Collectors.toList());
 
-				for (PrivateKeyAccount mintingAccount : mintingAccounts) {
+				for (PrivateKeyAccount mintingAccount : newBlocksMintingAccounts) {
 					// First block does the AT heavy-lifting
 					if (newBlocks.isEmpty()) {
-						Block newBlock = Block.mint(repository, previousBlock.getBlockData(), mintingAccount);
+						Block newBlock = Block.mint(repository, previousBlockData, mintingAccount);
 						if (newBlock == null) {
 							// For some reason we can't mint right now
 							moderatedLog(() -> LOGGER.error("Couldn't build a to-be-minted block"));
@@ -195,7 +196,7 @@ public class BlockMinter extends Thread {
 				// Make sure we're the only thread modifying the blockchain
 				ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
 				if (!blockchainLock.tryLock(30, TimeUnit.SECONDS)) {
-					LOGGER.warn("Couldn't acquire blockchain lock even after waiting 30 seconds");
+					LOGGER.debug("Couldn't acquire blockchain lock even after waiting 30 seconds");
 					continue;
 				}
 
@@ -233,8 +234,8 @@ public class BlockMinter extends Thread {
 						continue;
 
 					// Pick best block
-					final int parentHeight = previousBlock.getBlockData().getHeight();
-					final byte[] parentBlockSignature = previousBlock.getSignature();
+					final int parentHeight = previousBlockData.getHeight();
+					final byte[] parentBlockSignature = previousBlockData.getSignature();
 
 					BigInteger bestWeight = null;
 

src/main/java/org/qortal/controller/BlockNotifier.java

@@ -1,61 +0,0 @@
-package org.qortal.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jetty.websocket.api.Session;
-import org.qortal.api.model.BlockInfo;
-import org.qortal.data.block.BlockData;
-
-public class BlockNotifier {
-
-	private static BlockNotifier instance;
-
-	@FunctionalInterface
-	public interface Listener {
-		void notify(BlockInfo blockInfo);
-	}
-
-	private Map<Session, Listener> listenersBySession = new HashMap<>();
-
-	private BlockNotifier() {
-	}
-
-	public static synchronized BlockNotifier getInstance() {
-		if (instance == null)
-			instance = new BlockNotifier();
-
-		return instance;
-	}
-
-	public void register(Session session, Listener listener) {
-		synchronized (this.listenersBySession) {
-			this.listenersBySession.put(session, listener);
-		}
-	}
-
-	public void deregister(Session session) {
-		synchronized (this.listenersBySession) {
-			this.listenersBySession.remove(session);
-		}
-	}
-
-	public void onNewBlock(BlockData blockData) {
-		// Convert BlockData to BlockInfo
-		BlockInfo blockInfo = new BlockInfo(blockData);
-
-		for (Listener listener : getAllListeners())
-			listener.notify(blockInfo);
-	}
-
-	private Collection<Listener> getAllListeners() {
-		// Make a copy of listeners to both avoid concurrent modification
-		// and reduce synchronization time
-		synchronized (this.listenersBySession) {
-			return new ArrayList<>(this.listenersBySession.values());
-		}
-	}
-
-}

src/main/java/org/qortal/controller/Controller.java

@@ -36,7 +36,6 @@ import org.qortal.account.PublicKeyAccount;
 import org.qortal.api.ApiService;
 import org.qortal.block.Block;
 import org.qortal.block.BlockChain;
-import org.qortal.block.BlockMinter;
 import org.qortal.block.BlockChain.BlockTimingByHeight;
 import org.qortal.controller.Synchronizer.SynchronizationResult;
 import org.qortal.crypto.Crypto;
@@ -50,6 +49,8 @@ import org.qortal.data.network.PeerData;
 import org.qortal.data.transaction.ArbitraryTransactionData;
 import org.qortal.data.transaction.TransactionData;
 import org.qortal.data.transaction.ArbitraryTransactionData.DataType;
+import org.qortal.event.Event;
+import org.qortal.event.EventBus;
 import org.qortal.data.transaction.ChatTransactionData;
 import org.qortal.globalization.Translator;
 import org.qortal.gui.Gui;
@@ -629,6 +630,11 @@ public class Controller extends Thread {
 		}
 	}
 
+	public static class StatusChangeEvent implements Event {
+		public StatusChangeEvent() {
+		}
+	}
+
 	private void updateSysTray() {
 		if (NTP.getTime() == null) {
 			SysTray.getInstance().setToolTipText(Translator.INSTANCE.translate("SysTray", "SYNCHRONIZING_CLOCK"));
@@ -656,7 +662,7 @@ public class Controller extends Thread {
 		SysTray.getInstance().setToolTipText(tooltip);
 
 		this.callbackExecutor.execute(() -> {
-			StatusNotifier.getInstance().onStatusChange(NTP.getTime());
+			EventBus.INSTANCE.notify(new StatusChangeEvent());
 		});
 	}
 
@@ -783,6 +789,18 @@ public class Controller extends Thread {
 		requestSysTrayUpdate = true;
 	}
 
+	public static class NewBlockEvent implements Event {
+		private final BlockData blockData;
+
+		public NewBlockEvent(BlockData blockData) {
+			this.blockData = blockData;
+		}
+
+		public BlockData getBlockData() {
+			return this.blockData;
+		}
+	}
+
 	public void onNewBlock(BlockData latestBlockData) {
 		this.setChainTip(latestBlockData);
 		requestSysTrayUpdate = true;
@@ -792,7 +810,8 @@ public class Controller extends Thread {
 			Network network = Network.getInstance();
 			network.broadcast(peer -> network.buildHeightMessage(peer, latestBlockData));
 
-			BlockNotifier.getInstance().onNewBlock(latestBlockData);
+			// Notify listeners of new block
+			EventBus.INSTANCE.notify(new NewBlockEvent(latestBlockData));
 
 			if (this.notifyGroupMembershipChange) {
 				this.notifyGroupMembershipChange = false;

src/main/java/org/qortal/controller/StatusNotifier.java

@@ -1,56 +0,0 @@
-package org.qortal.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jetty.websocket.api.Session;
-
-public class StatusNotifier {
-
-	private static StatusNotifier instance;
-
-	@FunctionalInterface
-	public interface Listener {
-		void notify(long timestamp);
-	}
-
-	private Map<Session, Listener> listenersBySession = new HashMap<>();
-
-	private StatusNotifier() {
-	}
-
-	public static synchronized StatusNotifier getInstance() {
-		if (instance == null)
-			instance = new StatusNotifier();
-
-		return instance;
-	}
-
-	public void register(Session session, Listener listener) {
-		synchronized (this.listenersBySession) {
-			this.listenersBySession.put(session, listener);
-		}
-	}
-
-	public void deregister(Session session) {
-		synchronized (this.listenersBySession) {
-			this.listenersBySession.remove(session);
-		}
-	}
-
-	public void onStatusChange(long now) {
-		for (Listener listener : getAllListeners())
-			listener.notify(now);
-	}
-
-	private Collection<Listener> getAllListeners() {
-		// Make a copy of listeners to both avoid concurrent modification
-		// and reduce synchronization time
-		synchronized (this.listenersBySession) {
-			return new ArrayList<>(this.listenersBySession.values());
-		}
-	}
-
-}

src/main/java/org/qortal/controller/Synchronizer.java

@@ -4,6 +4,7 @@ import java.math.BigInteger;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
@@ -11,11 +12,13 @@ import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.qortal.account.Account;
+import org.qortal.account.PublicKeyAccount;
 import org.qortal.block.Block;
 import org.qortal.block.Block.ValidationResult;
 import org.qortal.data.block.BlockData;
 import org.qortal.data.block.BlockSummaryData;
 import org.qortal.data.network.PeerChainTipData;
+import org.qortal.data.transaction.RewardShareTransactionData;
 import org.qortal.data.transaction.TransactionData;
 import org.qortal.network.Peer;
 import org.qortal.network.message.BlockMessage;
@@ -550,16 +553,34 @@ public class Synchronizer {
 	}
 
 	private void populateBlockSummariesMinterLevels(Repository repository, List<BlockSummaryData> blockSummaries) throws DataException {
+		final int firstBlockHeight = blockSummaries.get(0).getHeight();
+
 		for (int i = 0; i < blockSummaries.size(); ++i) {
 			BlockSummaryData blockSummary = blockSummaries.get(i);
 
 			// Qortal: minter is always a reward-share, so find actual minter and get their effective minting level
 			int minterLevel = Account.getRewardShareEffectiveMintingLevel(repository, blockSummary.getMinterPublicKey());
 			if (minterLevel == 0) {
-				// We don't want to throw, or use zero, as this will kill Controller thread and make client unstable.
-				// So we log this but use 1 instead
-				LOGGER.warn(String.format("Unexpected zero effective minter level for reward-share %s - using 1 instead!", Base58.encode(blockSummary.getMinterPublicKey())));
-				minterLevel = 1;
+				// It looks like this block's minter's reward-share has been cancelled.
+				// So search for REWARD_SHARE transactions since common block to find missing minter info
+				List<byte[]> transactionSignatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(Transaction.TransactionType.REWARD_SHARE, null, firstBlockHeight, null);
+
+				for (byte[] transactionSignature : transactionSignatures) {
+					RewardShareTransactionData transactionData = (RewardShareTransactionData) repository.getTransactionRepository().fromSignature(transactionSignature);
+
+					if (transactionData != null && Arrays.equals(transactionData.getRewardSharePublicKey(), blockSummary.getMinterPublicKey())) {
+						Account rewardShareMinter = new PublicKeyAccount(repository, transactionData.getMinterPublicKey());
+						minterLevel = rewardShareMinter.getEffectiveMintingLevel();
+						break;
+					}
+				}
+
+				if (minterLevel == 0) {
+					// We don't want to throw, or use zero, as this will kill Controller thread and make client unstable.
+					// So we log this but use 1 instead
+					LOGGER.debug(() -> String.format("Unexpected zero effective minter level for reward-share %s - using 1 instead!", Base58.encode(blockSummary.getMinterPublicKey())));
+					minterLevel = 1;
+				}
 			}
 
 			blockSummary.setMinterLevel(minterLevel);

src/main/java/org/qortal/controller/TradeBot.java

@@ -63,7 +63,8 @@ public class TradeBot {
 
 	private static final Logger LOGGER = LogManager.getLogger(TradeBot.class);
 	private static final Random RANDOM = new SecureRandom();
-	private static final long FEE_AMOUNT = 5000L;
+
+	private static final long P2SH_B_OUTPUT_AMOUNT = 1000L; // P2SH-B output amount needs to be higher than the dust threshold (3000 sats/kB).
 
 	private static TradeBot instance;
 
@@ -233,7 +234,7 @@ public class TradeBot {
 		byte[] tradeForeignPublicKeyHash = Crypto.hash160(tradeForeignPublicKey);
 		byte[] receivingPublicKeyHash = Base58.decode(receivingAddress); // Actually the whole address, not just PKH
 
-		// We need to generate lockTime-A: halfway of refundTimeout from now
+		// We need to generate lockTime-A: add tradeTimeout to now
 		int lockTimeA = crossChainTradeData.tradeTimeout * 60 + (int) (NTP.getTime() / 1000L);
 
 		TradeBotData tradeBotData =  new TradeBotData(tradePrivateKey, TradeBotData.State.ALICE_WAITING_FOR_P2SH_A,
@@ -246,7 +247,14 @@ public class TradeBot {
 		// Check we have enough funds via xprv58 to fund both P2SHs to cover expectedBitcoin
 		String tradeForeignAddress = BTC.getInstance().pkhToAddress(tradeForeignPublicKeyHash);
 
-		long totalFundsRequired = crossChainTradeData.expectedBitcoin + FEE_AMOUNT /* P2SH-A */ + FEE_AMOUNT /* P2SH-B */;
+		Long estimatedFee = BTC.getInstance().estimateFee(lockTimeA * 1000L);
+		if (estimatedFee == null) {
+			LOGGER.debug(() -> String.format("Couldn't estimate Bitcoin fees?"));
+			return ResponseResult.BTC_NETWORK_ISSUE;
+		}
+
+		long totalFundsRequired = crossChainTradeData.expectedBitcoin + estimatedFee /* P2SH-A */
+				+ P2SH_B_OUTPUT_AMOUNT + estimatedFee /* P2SH-B */;
 
 		Transaction fundingCheckTransaction = BTC.getInstance().buildSpend(xprv58, tradeForeignAddress, totalFundsRequired);
 		if (fundingCheckTransaction == null)
@@ -257,7 +265,7 @@ public class TradeBot {
 		String p2shAddress = BTC.getInstance().deriveP2shAddress(redeemScriptBytes);
 
 		// Fund P2SH-A
-		Transaction p2shFundingTransaction = BTC.getInstance().buildSpend(tradeBotData.getXprv58(), p2shAddress, crossChainTradeData.expectedBitcoin + FEE_AMOUNT);
+		Transaction p2shFundingTransaction = BTC.getInstance().buildSpend(tradeBotData.getXprv58(), p2shAddress, crossChainTradeData.expectedBitcoin + estimatedFee);
 		if (p2shFundingTransaction == null) {
 			LOGGER.warn(() -> String.format("Unable to build P2SH-A funding transaction - lack of funds?"));
 			return ResponseResult.BTC_BALANCE_ISSUE;
@@ -539,9 +547,23 @@ public class TradeBot {
 			byte[] redeemScript = BTCP2SH.buildScript(aliceForeignPublicKeyHash, lockTimeA, tradeBotData.getTradeForeignPublicKeyHash(), hashOfSecretA);
 			String p2shAddress = BTC.getInstance().deriveP2shAddress(redeemScript);
 
+			Long estimatedFee = BTC.getInstance().estimateFee(lockTimeA * 1000L);
+			if (estimatedFee == null) {
+				LOGGER.debug(() -> String.format("Couldn't estimate Bitcoin fees?"));
+				// Not worth trying other MESSAGEs... give up for now
+				return;
+			}
+
+			final long minimumBalance = tradeBotData.getBitcoinAmount() + estimatedFee;
 			Long balance = BTC.getInstance().getBalance(p2shAddress);
-			if (balance == null || balance < tradeBotData.getBitcoinAmount())
+			if (balance == null || balance < minimumBalance) {
+				// P2SH-A has no, or insufficient, balance
+				if (balance != null && balance > 0)
+					LOGGER.debug(() -> String.format("P2SH-A %s balance %s lower than expected %s", p2shAddress, BTC.format(balance), BTC.format(minimumBalance)));
+
+				// There might be another MESSAGE from someone else with an actually funded P2SH-A...
 				continue;
+			}
 
 			// Good to go - send MESSAGE to AT
 
@@ -694,7 +716,13 @@ public class TradeBot {
 		byte[] redeemScriptBytes = BTCP2SH.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTimeB, crossChainTradeData.creatorBitcoinPKH, crossChainTradeData.hashOfSecretB);
 		String p2shAddress = BTC.getInstance().deriveP2shAddress(redeemScriptBytes);
 
-		Transaction p2shFundingTransaction = BTC.getInstance().buildSpend(tradeBotData.getXprv58(), p2shAddress, FEE_AMOUNT);
+		Long estimatedFee = BTC.getInstance().estimateFee(lockTimeA * 1000L);
+		if (estimatedFee == null) {
+			LOGGER.debug(() -> String.format("Couldn't estimate Bitcoin fees?"));
+			return;
+		}
+
+		Transaction p2shFundingTransaction = BTC.getInstance().buildSpend(tradeBotData.getXprv58(), p2shAddress, P2SH_B_OUTPUT_AMOUNT + estimatedFee);
 		if (p2shFundingTransaction == null) {
 			LOGGER.warn(() -> String.format("Unable to build P2SH-B funding transaction - lack of funds?"));
 			return;
@@ -757,16 +785,24 @@ public class TradeBot {
 		byte[] redeemScriptBytes = BTCP2SH.buildScript(crossChainTradeData.partnerBitcoinPKH, crossChainTradeData.lockTimeB, crossChainTradeData.creatorBitcoinPKH, crossChainTradeData.hashOfSecretB);
 		String p2shAddress = BTC.getInstance().deriveP2shAddress(redeemScriptBytes);
 
+		int lockTimeA = tradeBotData.getLockTimeA();
+		Long estimatedFee = BTC.getInstance().estimateFee(lockTimeA * 1000L);
+		if (estimatedFee == null) {
+			LOGGER.debug(() -> String.format("Couldn't estimate Bitcoin fees?"));
+			return;
+		}
+
+		final long minimumBalance = P2SH_B_OUTPUT_AMOUNT + estimatedFee;
 		Long balance = BTC.getInstance().getBalance(p2shAddress);
-		if (balance == null || balance < FEE_AMOUNT) {
+		if (balance == null || balance < minimumBalance) {
 			if (balance != null && balance > 0)
-				LOGGER.debug(() -> String.format("P2SH-B balance %s lower than expected %s", BTC.format(balance), BTC.format(FEE_AMOUNT)));
+				LOGGER.debug(() -> String.format("P2SH-B %s balance %s lower than expected %s", p2shAddress, BTC.format(balance), BTC.format(minimumBalance)));
 
 			return;
 		}
 
 		// Redeem P2SH-B using secret-B
-		Coin redeemAmount = Coin.ZERO; // The real funds are in P2SH-A
+		Coin redeemAmount = Coin.valueOf(P2SH_B_OUTPUT_AMOUNT); // An actual amount to avoid dust filter, remaining used as fees. The real funds are in P2SH-A.
 		ECKey redeemKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
 		List<TransactionOutput> fundingOutputs = BTC.getInstance().getUnspentOutputs(p2shAddress);
 		byte[] receivingAccountInfo = tradeBotData.getReceivingAccountInfo();
@@ -976,11 +1012,21 @@ public class TradeBot {
 		byte[] redeemScriptBytes = BTCP2SH.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), crossChainTradeData.lockTimeB, crossChainTradeData.creatorBitcoinPKH, crossChainTradeData.hashOfSecretB);
 		String p2shAddress = BTC.getInstance().deriveP2shAddress(redeemScriptBytes);
 
-		Coin refundAmount = Coin.ZERO;
+		Coin refundAmount = Coin.valueOf(P2SH_B_OUTPUT_AMOUNT); // An actual amount to avoid dust filter, remaining used as fees.
 		ECKey refundKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
 		List<TransactionOutput> fundingOutputs = BTC.getInstance().getUnspentOutputs(p2shAddress);
 
-		Transaction p2shRefundTransaction = BTCP2SH.buildRefundTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, crossChainTradeData.lockTimeB);
+
+		// Determine receive address for refund
+		String receiveAddress = BTC.getInstance().getUnusedReceiveAddress(tradeBotData.getXprv58());
+		if (receiveAddress == null) {
+			LOGGER.debug(() -> String.format("Couldn't determine a receive address for P2SH-B refund?"));
+			return;
+		}
+
+		Address receiving = Address.fromString(BTC.getInstance().getNetworkParameters(), receiveAddress);
+
+		Transaction p2shRefundTransaction = BTCP2SH.buildRefundTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, crossChainTradeData.lockTimeB, receiving.getHash());
 		if (!BTC.getInstance().broadcastTransaction(p2shRefundTransaction)) {
 			// We couldn't refund P2SH-B at this time
 			LOGGER.debug(() -> String.format("Couldn't broadcast P2SH-B refund transaction?"));
@@ -1025,7 +1071,16 @@ public class TradeBot {
 			return;
 		}
 
-		Transaction p2shRefundTransaction = BTCP2SH.buildRefundTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, tradeBotData.getLockTimeA());
+		// Determine receive address for refund
+		String receiveAddress = BTC.getInstance().getUnusedReceiveAddress(tradeBotData.getXprv58());
+		if (receiveAddress == null) {
+			LOGGER.debug(() -> String.format("Couldn't determine a receive address for P2SH-A refund?"));
+			return;
+		}
+
+		Address receiving = Address.fromString(BTC.getInstance().getNetworkParameters(), receiveAddress);
+
+		Transaction p2shRefundTransaction = BTCP2SH.buildRefundTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, tradeBotData.getLockTimeA(), receiving.getHash());
 		if (!BTC.getInstance().broadcastTransaction(p2shRefundTransaction)) {
 			// We couldn't refund P2SH-A at this time
 			LOGGER.debug(() -> String.format("Couldn't broadcast P2SH-A refund transaction?"));

src/main/java/org/qortal/crosschain/BTC.java

@@ -20,6 +20,7 @@ import org.bitcoinj.core.TransactionOutput;
 import org.bitcoinj.core.UTXO;
 import org.bitcoinj.core.UTXOProvider;
 import org.bitcoinj.core.UTXOProviderException;
+import org.bitcoinj.crypto.ChildNumber;
 import org.bitcoinj.crypto.DeterministicHierarchy;
 import org.bitcoinj.crypto.DeterministicKey;
 import org.bitcoinj.params.MainNetParams;
@@ -46,6 +47,11 @@ public class BTC {
 
 	protected static final Logger LOGGER = LogManager.getLogger(BTC.class);
 
+	// Temporary values until a dynamic fee system is written.
+	private static final long OLD_FEE_AMOUNT = 4_000L; // Not 5000 so that existing P2SH-B can output 1000, avoiding dust issue, leaving 4000 for fees.
+	private static final long NEW_FEE_TIMESTAMP = 1598280000000L; // milliseconds since epoch
+	private static final long NEW_FEE_AMOUNT = 10_000L;
+
 	private static final int TIMESTAMP_OFFSET = 4 + 32 + 32;
 	private static final MonetaryFormat FORMAT = new MonetaryFormat().minDecimals(8).postfixCode();
 
@@ -157,6 +163,20 @@ public class BTC {
 		return blockTimestamps.get(5);
 	}
 
+	/**
+	 * Returns estimated BTC fee, in sats per 1000bytes, optionally for historic timestamp.
+	 * 
+	 * @param timestamp optional milliseconds since epoch
+	 * @return sats per 1000bytes, or null if something went wrong
+	 */
+	public Long estimateFee(Long timestamp) {
+		// TODO: This will need to be replaced with something better in the near future!
+		if (timestamp != null && timestamp < NEW_FEE_TIMESTAMP)
+			return OLD_FEE_AMOUNT;
+
+		return NEW_FEE_AMOUNT;
+	}
+
 	public Long getBalance(String base58Address) {
 		return this.electrumX.getBalance(addressToScript(base58Address));
 	}
@@ -240,6 +260,89 @@ public class BTC {
 		return balance.value;
 	}
 
+	/**
+	 * Returns first unused receive address given 'm' BIP32 key.
+	 *
+	 * @param xprv58 BIP32 extended Bitcoin private key
+	 * @return Bitcoin P2PKH address, or null if something went wrong
+	 */
+	public String getUnusedReceiveAddress(String xprv58) {
+		Wallet wallet = Wallet.fromSpendingKeyB58(this.params, xprv58, DeterministicHierarchy.BIP32_STANDARDISATION_TIME_SECS);
+		DeterministicKeyChain keyChain = wallet.getActiveKeyChain();
+
+		keyChain.setLookaheadSize(WalletAwareUTXOProvider.LOOKAHEAD_INCREMENT);
+		keyChain.maybeLookAhead();
+
+		final int keyChainPathSize = keyChain.getAccountPath().size();
+		List<DeterministicKey> keys = new ArrayList<>(keyChain.getLeafKeys());
+
+		int ki = 0;
+		do {
+			for (; ki < keys.size(); ++ki) {
+				DeterministicKey dKey = keys.get(ki);
+				List<ChildNumber> dKeyPath = dKey.getPath();
+
+				// If keyChain is based on 'm', then make sure dKey is m/0/ki
+				if (dKeyPath.size() != keyChainPathSize + 2 || dKeyPath.get(dKeyPath.size() - 2) != ChildNumber.ZERO)
+					continue;
+
+				// Check unspent
+				Address address = Address.fromKey(this.params, dKey, ScriptType.P2PKH);
+				byte[] script = ScriptBuilder.createOutputScript(address).getProgram();
+
+				List<UnspentOutput> unspentOutputs = this.electrumX.getUnspentOutputs(script);
+				if (unspentOutputs == null)
+					return null;
+
+				/*
+				 * If there are no unspent outputs then either:
+				 * a) all the outputs have been spent
+				 * b) address has never been used
+				 * 
+				 * For case (a) we want to remember not to check this address (key) again.
+				 */
+
+				if (unspentOutputs.isEmpty()) {
+					// If this is a known key that has been spent before, then we can skip asking for transaction history
+					if (this.spentKeys.contains(dKey)) {
+						wallet.getActiveKeyChain().markKeyAsUsed((DeterministicKey) dKey);
+						continue;
+					}
+
+					// Ask for transaction history - if it's empty then key has never been used
+					List<byte[]> historicTransactionHashes = this.electrumX.getAddressTransactions(script);
+					if (historicTransactionHashes == null)
+						return null;
+
+					if (!historicTransactionHashes.isEmpty()) {
+						// Fully spent key - case (a)
+						this.spentKeys.add(dKey);
+						wallet.getActiveKeyChain().markKeyAsUsed(dKey);
+					} else {
+						// Key never been used - case (b)
+						return address.toString();
+					}
+				}
+
+				// Key has unspent outputs, hence used, so no good to us
+				this.spentKeys.remove(dKey);
+			}
+
+			// Generate some more keys
+			keyChain.setLookaheadSize(keyChain.getLookaheadSize() + WalletAwareUTXOProvider.LOOKAHEAD_INCREMENT);
+			keyChain.maybeLookAhead();
+
+			// This returns all keys, including those already in 'keys'
+			List<DeterministicKey> allLeafKeys = keyChain.getLeafKeys();
+			// Add only new keys onto our list of keys to search
+			List<DeterministicKey> newKeys = allLeafKeys.subList(ki, allLeafKeys.size());
+			keys.addAll(newKeys);
+			// Fall-through to checking more keys as now 'ki' is smaller than 'keys.size()' again
+
+			// Process new keys
+		} while (true);
+	}
+
 	// UTXOProvider support
 
 	static class WalletAwareUTXOProvider implements UTXOProvider {
@@ -320,6 +423,7 @@ public class BTC {
 					}
 
 					// If we reach here, then there's definitely at least one unspent key
+					btc.spentKeys.remove(key);
 					areAllKeysSpent = false;
 
 					for (UnspentOutput unspentOutput : unspentOutputs) {

src/main/java/org/qortal/crosschain/BTCP2SH.java

@@ -131,9 +131,10 @@ public class BTCP2SH {
 	 * @param fundingOutput output from transaction that funded P2SH address
 	 * @param redeemScriptBytes the redeemScript itself, in byte[] form
 	 * @param lockTime transaction nLockTime - must be at least locktime used in redeemScript
+	 * @param receivingAccountInfo Bitcoin PKH used for output
 	 * @return Signed Bitcoin transaction for refunding P2SH
 	 */
-	public static Transaction buildRefundTransaction(Coin refundAmount, ECKey refundKey, List<TransactionOutput> fundingOutputs, byte[] redeemScriptBytes, long lockTime) {
+	public static Transaction buildRefundTransaction(Coin refundAmount, ECKey refundKey, List<TransactionOutput> fundingOutputs, byte[] redeemScriptBytes, long lockTime, byte[] receivingAccountInfo) {
 		Function<byte[], Script> refundSigScriptBuilder = (txSigBytes) -> {
 			// Build scriptSig with...
 			ScriptBuilder scriptBuilder = new ScriptBuilder();
@@ -152,7 +153,7 @@ public class BTCP2SH {
 		};
 
 		// Send funds back to funding address
-		return buildP2shTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, lockTime, refundSigScriptBuilder, refundKey.getPubKeyHash());
+		return buildP2shTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, lockTime, refundSigScriptBuilder, receivingAccountInfo);
 	}
 
 	/**

src/main/java/org/qortal/crosschain/ElectrumX.java

@@ -95,18 +95,34 @@ public class ElectrumX {
 			case "MAIN":
 				servers.addAll(Arrays.asList(
 						// Servers chosen on NO BASIS WHATSOEVER from various sources!
-						new Server("tardis.bauerj.eu", Server.ConnectionType.SSL, 50002),
-						new Server("rbx.curalle.ovh", Server.ConnectionType.SSL, 50002),
-						new Server("quick.electumx.live", Server.ConnectionType.SSL, 50002),
 						new Server("enode.duckdns.org", Server.ConnectionType.SSL, 50002),
-						new Server("electrumx.ddns.net", Server.ConnectionType.SSL, 50002),
 						new Server("electrumx.ml", Server.ConnectionType.SSL, 50002),
-						new Server("electrum.eff.ro", Server.ConnectionType.SSL, 50002),
 						new Server("electrum.bitkoins.nl", Server.ConnectionType.SSL, 50512),
-						new Server("E-X.not.fyi", Server.ConnectionType.SSL, 50002),
 						new Server("btc.electroncash.dk", Server.ConnectionType.SSL, 60002),
-						new Server("electrum.blockstream.info", Server.ConnectionType.TCP, 50001),
-						new Server("electrum.blockstream.info", Server.ConnectionType.SSL, 50002),
+						new Server("electrumx.electricnewyear.net", Server.ConnectionType.SSL, 50002),
+						new Server("dxm.no-ip.biz", Server.ConnectionType.TCP, 50001),
+						new Server("kirsche.emzy.de", Server.ConnectionType.TCP, 50001),
+						new Server("2AZZARITA.hopto.org", Server.ConnectionType.TCP, 50001),
+						new Server("xtrum.com", Server.ConnectionType.TCP, 50001),
+						new Server("electrum.srvmin.network", Server.ConnectionType.TCP, 50001),
+						new Server("electrumx.alexridevski.net", Server.ConnectionType.TCP, 50001),
+						new Server("bitcoin.lukechilds.co", Server.ConnectionType.TCP, 50001),
+						new Server("electrum.poiuty.com", Server.ConnectionType.TCP, 50001),
+						new Server("horsey.cryptocowboys.net", Server.ConnectionType.TCP, 50001),
+						new Server("electrum.emzy.de", Server.ConnectionType.TCP, 50001),
+						new Server("electrum-server.ninja", Server.ConnectionType.TCP, 50081),
+						new Server("bitcoin.electrumx.multicoin.co", Server.ConnectionType.TCP, 50001),
+						new Server("esx.geekhosters.com", Server.ConnectionType.TCP, 50001),
+						new Server("bitcoin.grey.pw", Server.ConnectionType.TCP, 50003),
+						new Server("exs.ignorelist.com", Server.ConnectionType.TCP, 50001),
+						new Server("electrum.coinext.com.br", Server.ConnectionType.TCP, 50001),
+						new Server("bitcoin.aranguren.org", Server.ConnectionType.TCP, 50001),
+						new Server("skbxmit.coinjoined.com", Server.ConnectionType.TCP, 50001),
+						new Server("alviss.coinjoined.com", Server.ConnectionType.TCP, 50001),
+						new Server("electrum2.privateservers.network", Server.ConnectionType.TCP, 50001),
+						new Server("electrumx.schulzemic.net", Server.ConnectionType.TCP, 50001),
+						new Server("bitcoins.sk", Server.ConnectionType.TCP, 56001),
+						new Server("node.mendonca.xyz", Server.ConnectionType.TCP, 50001),
 						new Server("bitcoin.aranguren.org", Server.ConnectionType.TCP, 50001)));
 				break;
 

src/main/java/org/qortal/network/Network.java

@@ -50,7 +50,6 @@ import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
 import org.qortal.settings.Settings;
-import org.qortal.transform.Transformer;
 import org.qortal.utils.ExecuteProduceConsume;
 // import org.qortal.utils.ExecutorDumper;
 import org.qortal.utils.ExecuteProduceConsume.StatsSnapshot;
@@ -91,56 +90,41 @@ public class Network {
 	public static final int MAX_SIGNATURES_PER_REPLY = 500;
 	public static final int MAX_BLOCK_SUMMARIES_PER_REPLY = 500;
 
-	private final Ed25519PrivateKeyParameters edPrivateKeyParams;
-	private final Ed25519PublicKeyParameters edPublicKeyParams;
-	private final String ourNodeId;
+	// Generate our node keys / ID
+	private final Ed25519PrivateKeyParameters edPrivateKeyParams = new Ed25519PrivateKeyParameters(new SecureRandom());
+	private final Ed25519PublicKeyParameters edPublicKeyParams = edPrivateKeyParams.generatePublicKey();
+	private final String ourNodeId = Crypto.toNodeAddress(edPublicKeyParams.getEncoded());
 
 	private final int maxMessageSize;
+	private final int minOutboundPeers;
+	private final int maxPeers;
 
-	private List<PeerData> allKnownPeers;
-	private List<Peer> connectedPeers;
-	private List<PeerAddress> selfPeers;
+	private final List<PeerData> allKnownPeers = new ArrayList<>();
+	private final List<Peer> connectedPeers = new ArrayList<>();
+	private final List<PeerAddress> selfPeers = new ArrayList<>();
 
-	private ExecuteProduceConsume networkEPC;
+	private final ExecuteProduceConsume networkEPC;
 	private Selector channelSelector;
 	private ServerSocketChannel serverChannel;
 	private Iterator<SelectionKey> channelIterator = null;
 
-	private int minOutboundPeers;
-	private int maxPeers;
-	private long nextConnectTaskTimestamp;
+	// volatile because value is updated inside any one of the EPC threads
+	private volatile long nextConnectTaskTimestamp = 0L; // ms - try first connect once NTP syncs
 
-	private ExecutorService broadcastExecutor;
-	private long nextBroadcastTimestamp;
+	private ExecutorService broadcastExecutor = Executors.newCachedThreadPool();
+	// volatile because value is updated inside any one of the EPC threads
+	private volatile long nextBroadcastTimestamp = 0L; // ms - try first broadcast once NTP syncs
 
-	private Lock mergePeersLock;
+	private final Lock mergePeersLock = new ReentrantLock();
 
 	// Constructors
 
 	private Network() {
-		connectedPeers = new ArrayList<>();
-		selfPeers = new ArrayList<>();
-
-		// Generate our ID
-		byte[] seed = new byte[Transformer.PRIVATE_KEY_LENGTH];
-		new SecureRandom().nextBytes(seed);
-
-		edPrivateKeyParams = new Ed25519PrivateKeyParameters(seed, 0);
-		edPublicKeyParams = edPrivateKeyParams.generatePublicKey();
-		ourNodeId = Crypto.toNodeAddress(edPublicKeyParams.getEncoded());
-
 		maxMessageSize = 4 + 1 + 4 + BlockChain.getInstance().getMaxBlockSize();
 
 		minOutboundPeers = Settings.getInstance().getMinOutboundPeers();
 		maxPeers = Settings.getInstance().getMaxPeers();
 
-		nextConnectTaskTimestamp = 0; // First connect once NTP syncs
-
-		broadcastExecutor = Executors.newCachedThreadPool();
-		nextBroadcastTimestamp = 0; // First broadcast once NTP syncs
-
-		mergePeersLock = new ReentrantLock();
-
 		// We'll use a cached thread pool but with more aggressive timeout.
 		ExecutorService networkExecutor = new ThreadPoolExecutor(1,
 				Settings.getInstance().getMaxNetworkThreadPoolSize(),
@@ -177,7 +161,9 @@ public class Network {
 
 		// Load all known peers from repository
 		try (final Repository repository = RepositoryManager.getRepository()) {
-			allKnownPeers = repository.getNetworkRepository().getAllPeers();
+			synchronized (this.allKnownPeers) {
+				this.allKnownPeers.addAll(repository.getNetworkRepository().getAllPeers());
+			}
 		}
 
 		// Start up first networking thread
@@ -445,35 +431,38 @@ public class Network {
 		private Task maybeProduceChannelTask(boolean canBlock) throws InterruptedException {
 			final SelectionKey nextSelectionKey;
 
-			// anything to do?
-			if (channelIterator == null) {
-				try {
-					if (canBlock)
-						channelSelector.select(1000L);
-					else
-						channelSelector.selectNow();
-				} catch (IOException e) {
-					LOGGER.warn(String.format("Channel selection threw IOException: %s", e.getMessage()));
-					return null;
+			// Synchronization here to enforce thread-safety on channelIterator
+			synchronized (channelSelector) {
+				// anything to do?
+				if (channelIterator == null) {
+					try {
+						if (canBlock)
+							channelSelector.select(1000L);
+						else
+							channelSelector.selectNow();
+					} catch (IOException e) {
+						LOGGER.warn(String.format("Channel selection threw IOException: %s", e.getMessage()));
+						return null;
+					}
+
+					if (Thread.currentThread().isInterrupted())
+						throw new InterruptedException();
+
+					channelIterator = channelSelector.selectedKeys().iterator();
 				}
 
-				if (Thread.currentThread().isInterrupted())
-					throw new InterruptedException();
+				if (channelIterator.hasNext()) {
+					nextSelectionKey = channelIterator.next();
+					channelIterator.remove();
+				} else {
+					nextSelectionKey = null;
+					channelIterator = null; // Nothing to do so reset iterator to cause new select
+				}
 
-				channelIterator = channelSelector.selectedKeys().iterator();
+				LOGGER.trace(() -> String.format("Thread %d, nextSelectionKey %s, channelIterator now %s",
+						Thread.currentThread().getId(), nextSelectionKey, channelIterator));
 			}
 
-			if (channelIterator.hasNext()) {
-				nextSelectionKey = channelIterator.next();
-				channelIterator.remove();
-			} else {
-				nextSelectionKey = null;
-				channelIterator = null; // Nothing to do so reset iterator to cause new select
-			}
-
-			LOGGER.trace(() -> String.format("Thread %d, nextSelectionKey %s, channelIterator now %s",
-					Thread.currentThread().getId(), nextSelectionKey, channelIterator));
-
 			if (nextSelectionKey == null)
 				return null;
 

src/main/java/org/qortal/repository/TransactionRepository.java

@@ -91,6 +91,22 @@ public interface TransactionRepository {
 	public List<byte[]> getSignaturesMatchingCriteria(TransactionType txType, byte[] publicKey,
 			ConfirmationStatus confirmationStatus, Integer limit, Integer offset, Boolean reverse) throws DataException;
 
+	/**
+	 * Returns signatures for transactions that match search criteria.
+	 * <p>
+	 * Simpler version that only checks accepts one (optional) transaction type,
+	 * and one (optional) public key, within an block height range.
+	 * 
+	 * @param txType
+	 * @param publicKey
+	 * @param minBlockHeight
+	 * @param maxBlockHeight
+	 * @return
+	 * @throws DataException
+	 */
+	public List<byte[]> getSignaturesMatchingCriteria(TransactionType txType, byte[] publicKey,
+			Integer minBlockHeight, Integer maxBlockHeight) throws DataException;
+
 	/**
 	 * Returns signature for latest auto-update transaction.
 	 * <p>

src/main/java/org/qortal/repository/hsqldb/HSQLDBATRepository.java

@@ -10,6 +10,8 @@ import org.qortal.data.at.ATStateData;
 import org.qortal.repository.ATRepository;
 import org.qortal.repository.DataException;
 
+import com.google.common.primitives.Longs;
+
 public class HSQLDBATRepository implements ATRepository {
 
 	protected HSQLDBRepository repository;
@@ -267,9 +269,10 @@ public class HSQLDBATRepository implements ATRepository {
 		String sql = "SELECT height, created_when, state_data, state_hash, fees, is_initial "
 				+ "FROM ATStates "
 				+ "WHERE AT_address = ? "
-				+ "ORDER BY height DESC "
-				+ "LIMIT 1 "
-				+ "USING INDEX";
+				// AT_address then height so the compound primary key is used as an index
+				// Both must be the same direction also
+				+ "ORDER BY AT_address DESC, height DESC "
+				+ "LIMIT 1 ";
 
 		try (ResultSet resultSet = this.repository.checkedExecute(sql, atAddress)) {
 			if (resultSet == null)
@@ -298,10 +301,17 @@ public class HSQLDBATRepository implements ATRepository {
 				+ "CROSS JOIN LATERAL("
 					+ "SELECT height, created_when, state_data, state_hash, fees, is_initial "
 					+ "FROM ATStates "
-					+ "WHERE ATStates.AT_address = ATs.AT_address "
-					+ "ORDER BY height DESC "
+					+ "WHERE ATStates.AT_address = ATs.AT_address ");
+
+		if (minimumFinalHeight != null) {
+			sql.append("AND height >= ");
+			sql.append(minimumFinalHeight);
+		}
+
+		// AT_address then height so the compound primary key is used as an index
+		// Both must be the same direction also
+		sql.append(	"ORDER BY AT_address DESC, height DESC "
 					+ "LIMIT 1 "
-					+ "USING INDEX"
 				+ ") AS FinalATStates "
 				+ "WHERE code_hash = ? ");
 
@@ -309,24 +319,19 @@ public class HSQLDBATRepository implements ATRepository {
 		bindParams.add(codeHash);
 
 		if (isFinished != null) {
-			sql.append("AND is_finished = ?");
+			sql.append("AND is_finished = ? ");
 			bindParams.add(isFinished);
 		}
 
 		if (dataByteOffset != null && expectedValue != null) {
-			sql.append("AND RAWTOHEX(SUBSTRING(state_data FROM ? FOR 8)) = ? ");
+			sql.append("AND SUBSTRING(state_data FROM ? FOR 8) = ? ");
 
-			// We convert our long to hex Java-side to control endian
-			String expectedHexValue = String.format("%016x", expectedValue); // left-zero-padding and conversion
+			// We convert our long on Java-side to control endian
+			byte[] rawExpectedValue = Longs.toByteArray(expectedValue);
 
 			// SQL binary data offsets start at 1
 			bindParams.add(dataByteOffset + 1);
-			bindParams.add(expectedHexValue);
-		}
-
-		if (minimumFinalHeight != null) {
-			sql.append("AND height >= ");
-			sql.append(minimumFinalHeight);
+			bindParams.add(rawExpectedValue);
 		}
 
 		sql.append(" ORDER BY height ");

src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java

@@ -586,6 +586,69 @@ public class HSQLDBTransactionRepository implements TransactionRepository {
 		}
 	}
 
+	@Override
+	public List<byte[]> getSignaturesMatchingCriteria(TransactionType txType, byte[] publicKey,
+			Integer minBlockHeight, Integer maxBlockHeight) throws DataException {
+		List<byte[]> signatures = new ArrayList<>();
+
+		StringBuilder sql = new StringBuilder(1024);
+		sql.append("SELECT signature FROM Transactions ");
+
+		List<String> whereClauses = new ArrayList<>();
+		List<Object> bindParams = new ArrayList<>();
+
+		if (txType != null) {
+			whereClauses.add("type = ?");
+			bindParams.add(txType.value);
+		}
+
+		if (publicKey != null) {
+			whereClauses.add("creator = ?");
+			bindParams.add(publicKey);
+		}
+
+		if (minBlockHeight != null) {
+			whereClauses.add("Transactions.block_height >= ?");
+			bindParams.add(minBlockHeight);
+		}
+
+		if (maxBlockHeight != null) {
+			whereClauses.add("Transactions.block_height <= ?");
+			bindParams.add(maxBlockHeight);
+		}
+
+		if (!whereClauses.isEmpty()) {
+			sql.append(" WHERE ");
+
+			final int whereClausesSize = whereClauses.size();
+			for (int wci = 0; wci < whereClausesSize; ++wci) {
+				if (wci != 0)
+					sql.append(" AND ");
+
+				sql.append(whereClauses.get(wci));
+			}
+		}
+
+		sql.append(" ORDER BY Transactions.created_when");
+
+		LOGGER.trace(() -> String.format("Transaction search SQL: %s", sql));
+
+		try (ResultSet resultSet = this.repository.checkedExecute(sql.toString(), bindParams.toArray())) {
+			if (resultSet == null)
+				return signatures;
+
+			do {
+				byte[] signature = resultSet.getBytes(1);
+
+				signatures.add(signature);
+			} while (resultSet.next());
+
+			return signatures;
+		} catch (SQLException e) {
+			throw new DataException("Unable to fetch matching transaction signatures from repository", e);
+		}
+	}
+
 	@Override
 	public byte[] getLatestAutoUpdateTransaction(TransactionType txType, int txGroupId, Integer service) throws DataException {
 		StringBuilder sql = new StringBuilder(1024);

src/main/resources/i18n/ApiError_en.properties

@@ -8,6 +8,12 @@ BLOCKCHAIN_NEEDS_SYNC = blockchain needs to synchronize first
 # Blocks
 BLOCK_UNKNOWN = block unknown
 
+BTC_BALANCE_ISSUE = insufficient Bitcoin balance
+
+BTC_NETWORK_ISSUE = Bitcoin/ElectrumX network issue
+
+BTC_TOO_SOON = too soon to broadcast Bitcoin transaction (lockTime/median block time)
+
 CANNOT_MINT = account cannot mint
 
 GROUP_UNKNOWN = group unknown
@@ -15,7 +21,7 @@ GROUP_UNKNOWN = group unknown
 INVALID_ADDRESS = invalid address
 
 # Assets
-INVALID_ASSET_ID = invalid asset id
+INVALID_ASSET_ID = invalid asset ID
 
 INVALID_CRITERIA = invalid search criteria
 
@@ -36,18 +42,21 @@ INVALID_REFERENCE = invalid reference
 # Validation
 INVALID_SIGNATURE = invalid signature
 
-JSON = failed to parse json message
+JSON = failed to parse JSON message
 
 NAME_UNKNOWN = name unknown
 
 NON_PRODUCTION = this API call is not permitted for production systems
 
+NO_TIME_SYNC = no clock synchronization yet
+
 ORDER_UNKNOWN = unknown asset order ID
 
 PUBLIC_KEY_NOT_FOUND = public key not found
 
 REPOSITORY_ISSUE = repository error
 
+# This one is special in that caller expected to pass two additional strings, hence the two %s
 TRANSACTION_INVALID = transaction invalid: %s (%s)
 
 TRANSACTION_UNKNOWN = transaction unknown

src/main/resources/i18n/ApiError_ru.properties

@@ -0,0 +1,53 @@
+#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
+# Keys are from api.ApiError enum
+
+ADDRESS_UNKNOWN = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D1\u0083\u00D1\u0087\u00D0\u00B5\u00D1\u0082\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D0\u00B7\u00D0\u00B0\u00D0\u00BF\u00D0\u00B8\u00D1\u0081\u00D1\u008C
+
+# Blocks
+BLOCK_UNKNOWN = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B1\u00D0\u00BB\u00D0\u00BE\u00D0\u00BA
+
+CANNOT_MINT = \u00D0\u00B0\u00D0\u00BA\u00D0\u00BA\u00D0\u00B0\u00D1\u0083\u00D0\u00BD\u00D1\u0082 \u00D0\u00BD\u00D0\u00B5 \u00D0\u00BC\u00D0\u00BE\u00D0\u00B6\u00D0\u00B5\u00D1\u0082 \u00D1\u0087\u00D0\u00B5\u00D0\u00BA\u00D0\u00B0\u00D0\u00BD\u00D0\u00B8\u00D1\u0082\u00D1\u008C
+
+GROUP_UNKNOWN = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D0\u00B0
+
+INVALID_ADDRESS = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B0\u00D0\u00B4\u00D1\u0080\u00D0\u00B5\u00D1\u0081
+
+# Assets
+INVALID_ASSET_ID = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B8\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D1\u0082\u00D0\u00B8\u00D1\u0084\u00D0\u00B8\u00D0\u00BA\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0080 \u00D0\u00B0\u00D0\u00BA\u00D1\u0082\u00D0\u00B8\u00D0\u00B2\u00D0\u00B0
+
+INVALID_CRITERIA = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D1\u008B\u00D0\u00B5 \u00D0\u00BA\u00D1\u0080\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D1\u0080\u00D0\u00B8\u00D0\u00B8 \u00D0\u00BF\u00D0\u00BE\u00D0\u00B8\u00D1\u0081\u00D0\u00BA\u00D0\u00B0
+
+INVALID_DATA = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D1\u008B\u00D0\u00B5 \u00D0\u00B4\u00D0\u00B0\u00D0\u00BD\u00D0\u00BD\u00D1\u008B\u00D0\u00B5
+
+INVALID_HEIGHT = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D0\u00B0\u00D1\u008F \u00D0\u00B2\u00D1\u008B\u00D1\u0081\u00D0\u00BE\u00D1\u0082\u00D0\u00B0 \u00D0\u00B1\u00D0\u00BB\u00D0\u00BE\u00D0\u00BA\u00D0\u00B0
+
+INVALID_NETWORK_ADDRESS = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D1\u0081\u00D0\u00B5\u00D1\u0082\u00D0\u00B5\u00D0\u00B2\u00D0\u00BE\u00D0\u00B9 \u00D0\u00B0\u00D0\u00B4\u00D1\u0080\u00D0\u00B5\u00D1\u0081
+
+INVALID_ORDER_ID = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B8\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D1\u0082\u00D0\u00B8\u00D1\u0084\u00D0\u00B8\u00D0\u00BA\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0080 \u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D0\u00B0\u00D0\u00B7\u00D0\u00B0 \u00D0\u00B0\u00D0\u00BA\u00D1\u0082\u00D0\u00B8\u00D0\u00B2\u00D0\u00B0
+
+INVALID_PRIVATE_KEY = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00BF\u00D1\u0080\u00D0\u00B8\u00D0\u00B2\u00D0\u00B0\u00D1\u0082\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00BA\u00D0\u00BB\u00D1\u008E\u00D1\u0087
+
+INVALID_PUBLIC_KEY = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00BE\u00D1\u0082\u00D0\u00BA\u00D1\u0080\u00D1\u008B\u00D1\u0082\u00D1\u008B\u00D0\u00B9 \u00D0\u00BA\u00D0\u00BB\u00D1\u008E\u00D1\u0087
+
+INVALID_REFERENCE = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D1\u0081\u00D1\u0081\u00D1\u008B\u00D0\u00BB\u00D0\u00BA\u00D0\u00B0
+
+# Validation
+INVALID_SIGNATURE = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D0\u00BF\u00D0\u00BE\u00D0\u00B4\u00D0\u00BF\u00D0\u00B8\u00D1\u0081\u00D1\u008C
+
+JSON = \u00D0\u00BD\u00D0\u00B5 \u00D1\u0083\u00D0\u00B4\u00D0\u00B0\u00D0\u00BB\u00D0\u00BE\u00D1\u0081\u00D1\u008C \u00D1\u0080\u00D0\u00B0\u00D0\u00B7\u00D0\u00BE\u00D0\u00B1\u00D1\u0080\u00D0\u00B0\u00D1\u0082\u00D1\u008C \u00D1\u0081\u00D0\u00BE\u00D0\u00BE\u00D0\u00B1\u00D1\u0089\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D0\u00B5 json
+
+NAME_UNKNOWN = \u00D0\u00B8\u00D0\u00BC\u00D1\u008F \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D0\u00BE
+
+ORDER_UNKNOWN = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B8\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D1\u0082\u00D0\u00B8\u00D1\u0084\u00D0\u00B8\u00D0\u00BA\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0080 \u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D0\u00B0\u00D0\u00B7\u00D0\u00B0 \u00D0\u00B0\u00D0\u00BA\u00D1\u0082\u00D0\u00B8\u00D0\u00B2\u00D0\u00B0
+
+PUBLIC_KEY_NOT_FOUND = \u00D0\u00BE\u00D1\u0082\u00D0\u00BA\u00D1\u0080\u00D1\u008B\u00D1\u0082\u00D1\u008B\u00D0\u00B9 \u00D0\u00BA\u00D0\u00BB\u00D1\u008E\u00D1\u0087 \u00D0\u00BD\u00D0\u00B5 \u00D0\u00BD\u00D0\u00B0\u00D0\u00B9\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD
+
+REPOSITORY_ISSUE = \u00D0\u00BE\u00D1\u0088\u00D0\u00B8\u00D0\u00B1\u00D0\u00BA\u00D0\u00B0 \u00D1\u0080\u00D0\u00B5\u00D0\u00BF\u00D0\u00BE\u00D0\u00B7\u00D0\u00B8\u00D1\u0082\u00D0\u00BE\u00D1\u0080\u00D0\u00B8\u00D1\u008F
+
+TRANSACTION_INVALID = \u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D0\u00BD\u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D1\u0086\u00D0\u00B8\u00D1\u008F \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D0\u00B0: %s (%s)
+
+TRANSACTION_UNKNOWN = \u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D0\u00BD\u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D1\u0086\u00D0\u00B8\u00D1\u008F \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D0\u00B0
+
+TRANSFORMATION_ERROR = \u00D0\u00BD\u00D0\u00B5 \u00D1\u0083\u00D0\u00B4\u00D0\u00B0\u00D0\u00BB\u00D0\u00BE\u00D1\u0081\u00D1\u008C \u00D0\u00BF\u00D1\u0080\u00D0\u00B5\u00D0\u00BE\u00D0\u00B1\u00D1\u0080\u00D0\u00B0\u00D0\u00B7\u00D0\u00BE\u00D0\u00B2\u00D0\u00B0\u00D1\u0082\u00D1\u008C JSON \u00D0\u00B2 \u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D0\u00BD\u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D1\u0086\u00D0\u00B8\u00D1\u008E
+
+UNAUTHORIZED = \u00D0\u00B2\u00D1\u008B\u00D0\u00B7\u00D0\u00BE\u00D0\u00B2 API \u00D0\u00BD\u00D0\u00B5 \u00D0\u00B0\u00D0\u00B2\u00D1\u0082\u00D0\u00BE\u00D1\u0080\u00D0\u00B8\u00D0\u00B7\u00D0\u00BE\u00D0\u00B2\u00D0\u00B0\u00D0\u00BD

src/main/resources/i18n/SysTray_ru.properties

@@ -0,0 +1,41 @@
+#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
+# SysTray pop-up menu
+
+APPLYING_UPDATE_AND_RESTARTING = Применение автоматического обновления и перезапуска...
+
+AUTO_UPDATE = Автоматическое обновление
+
+BLOCK_HEIGHT = Высота блока
+
+CHECK_TIME_ACCURACY = Проверка точного времени
+
+CONNECTING = Подключение
+
+CONNECTION = Соединение
+
+CONNECTIONS = Соединений
+
+CREATING_BACKUP_OF_DB_FILES = Создание резервной копии файлов базы данных...
+
+DB_BACKUP = Резервное копирование базы данных
+
+EXIT = Выход
+
+MINTING_DISABLED = Чеканка отключена
+
+MINTING_ENABLED = Чеканка активна
+
+# Nagging about lack of NTP time sync
+NTP_NAG_CAPTION = Часы компьютера неточны!
+
+NTP_NAG_TEXT_UNIX = Установите службу NTP, чтобы получить точное время
+
+NTP_NAG_TEXT_WINDOWS = Выберите "Синхронизация времени" из меню, чтобы исправить
+
+OPEN_UI = Открыть пользовательский интерфейс
+
+SYNCHRONIZE_CLOCK = Синхронизировать время
+
+SYNCHRONIZING_BLOCKCHAIN = Синхронизация цепи
+
+SYNCHRONIZING_CLOCK = Проверка времени

src/main/resources/i18n/TransactionValidity_en.properties

@@ -11,166 +11,174 @@ ALREADY_VOTED_FOR_THAT_OPTION = already voted for that option
 
 ASSET_ALREADY_EXISTS = asset already exists
 
-ASSET_DOES_NOT_EXIST = ASSET_DOES_NOT_EXIST
+ASSET_DOES_NOT_EXIST = asset does not exist
 
-ASSET_DOES_NOT_MATCH_AT = ASSET_DOES_NOT_MATCH_AT
+ASSET_DOES_NOT_MATCH_AT = asset does not match AT's asset
 
-ASSET_NOT_SPENDABLE = ASSET_NOT_SPENDABLE
+ASSET_NOT_SPENDABLE = asset is not spendable
 
-AT_ALREADY_EXISTS = AT_ALREADY_EXISTS
+AT_ALREADY_EXISTS = AT already exists
 
-AT_IS_FINISHED = AT_IS_FINISHED
+AT_IS_FINISHED = AT has finished
 
-AT_UNKNOWN = AT_UNKNOWN
+AT_UNKNOWN = AT unknown
 
-BANNED_FROM_GROUP = BANNED_FROM_GROUP
+BANNED_FROM_GROUP = banned from group
 
-BAN_EXISTS = BAN_EXISTS
+BAN_EXISTS = ban already exists
 
-BAN_UNKNOWN = BAN_UNKNOWN
+BAN_UNKNOWN = ban unknown
 
-BUYER_ALREADY_OWNER = BUYER_ALREADY_OWNER
+BUYER_ALREADY_OWNER = buyer is already owner
 
-CLOCK_NOT_SYNCED = CLOCK_NOT_SYNCED
+CHAT = CHAT transactions are never valid for inclusion into blocks
 
-DUPLICATE_OPTION = DUPLICATE_OPTION
+CLOCK_NOT_SYNCED = clock not synchronized
 
-GROUP_ALREADY_EXISTS = GROUP_ALREADY_EXISTS
+DUPLICATE_OPTION = duplicate option
 
-GROUP_APPROVAL_DECIDED = GROUP_APPROVAL_DECIDED
+GROUP_ALREADY_EXISTS = group already exists
 
-GROUP_APPROVAL_NOT_REQUIRED = GROUP_APPROVAL_NOT_REQUIRED
+GROUP_APPROVAL_DECIDED = group-approval already decided
 
-GROUP_DOES_NOT_EXIST = GROUP_DOES_NOT_EXIST
+GROUP_APPROVAL_NOT_REQUIRED = group-approval not required
 
-GROUP_ID_MISMATCH = GROUP_ID_MISMATCH
+GROUP_DOES_NOT_EXIST = group does not exist
 
-GROUP_OWNER_CANNOT_LEAVE = GROUP_OWNER_CANNOT_LEAVE
+GROUP_ID_MISMATCH = group ID mismatch
 
-HAVE_EQUALS_WANT = HAVE_EQUALS_WANT
+GROUP_OWNER_CANNOT_LEAVE = group owner cannot leave group
 
-INSUFFICIENT_FEE = INSUFFICIENT_FEE
+HAVE_EQUALS_WANT = have-asset is the same as want-asset
 
-INVALID_ADDRESS = INVALID_ADDRESS
+INCORRECT_NONCE = incorrect PoW nonce
 
-INVALID_AMOUNT = INVALID_AMOUNT
+INSUFFICIENT_FEE = insufficient fee
 
-INVALID_ASSET_OWNER = INVALID_ASSET_OWNER
+INVALID_ADDRESS = invalid address
 
-INVALID_AT_TRANSACTION = INVALID_AT_TRANSACTION
+INVALID_AMOUNT = invalid amount
 
-INVALID_AT_TYPE_LENGTH = INVALID_AT_TYPE_LENGTH
+INVALID_ASSET_OWNER = invalid asset owner
 
-INVALID_CREATION_BYTES = INVALID_CREATION_BYTES
+INVALID_AT_TRANSACTION = invalid AT transaction
 
-INVALID_DATA_LENGTH = INVALID_DATA_LENGTH
+INVALID_AT_TYPE_LENGTH = invalid AT 'type' length
 
-INVALID_DESCRIPTION_LENGTH = INVALID_DESCRIPTION_LENGTH
+INVALID_CREATION_BYTES = invalid creation bytes
 
-INVALID_GROUP_APPROVAL_THRESHOLD = INVALID_GROUP_APPROVAL_THRESHOLD
+INVALID_DATA_LENGTH = invalid data length
 
-INVALID_GROUP_ID = INVALID_GROUP_ID
+INVALID_DESCRIPTION_LENGTH = invalid description length
 
-INVALID_GROUP_OWNER = INVALID_GROUP_OWNER
+INVALID_GROUP_APPROVAL_THRESHOLD = invalid group-approval threshold
 
-INVALID_LIFETIME = INVALID_LIFETIME
+INVALID_GROUP_BLOCK_DELAY = invalid group-approval block delay
 
-INVALID_NAME_LENGTH = INVALID_NAME_LENGTH
+INVALID_GROUP_ID = invalid group ID
 
-INVALID_NAME_OWNER = INVALID_NAME_OWNER
+INVALID_GROUP_OWNER = invalid group owner
 
-INVALID_OPTIONS_COUNT = INVALID_OPTIONS_COUNT
+INVALID_LIFETIME = invalid lifetime
 
-INVALID_OPTION_LENGTH = INVALID_OPTION_LENGTH
+INVALID_NAME_LENGTH = invalid name length
 
-INVALID_ORDER_CREATOR = INVALID_ORDER_CREATOR
+INVALID_NAME_OWNER = invalid name owner
 
-INVALID_PAYMENTS_COUNT = INVALID_PAYMENTS_COUNT
+INVALID_OPTIONS_COUNT = invalid options count
 
-INVALID_PUBLIC_KEY = INVALID_PUBLIC_KEY
+INVALID_OPTION_LENGTH = invalid options length
 
-INVALID_QUANTITY = INVALID_QUANTITY
+INVALID_ORDER_CREATOR = invalid order creator
 
-INVALID_REFERENCE = INVALID_REFERENCE
+INVALID_PAYMENTS_COUNT = invalid payments count
 
-INVALID_RETURN = INVALID_RETURN
+INVALID_PUBLIC_KEY = invalid public key
 
-INVALID_REWARD_SHARE_PERCENT = INVALID_REWARD_SHARE_PERCENT
+INVALID_QUANTITY = invalid quantity
 
-INVALID_SELLER = INVALID_SELLER
+INVALID_REFERENCE = invalid reference
 
-INVALID_TAGS_LENGTH = INVALID_TAGS_LENGTH
+INVALID_RETURN = invalid return
 
-INVALID_TX_GROUP_ID = INVALID_TX_GROUP_ID
+INVALID_REWARD_SHARE_PERCENT = invalid reward-share percent
 
-INVALID_VALUE_LENGTH = INVALID_VALUE_LENGTH
+INVALID_SELLER = invalid seller
 
-INVITE_UNKNOWN = INVITE_UNKNOWN
+INVALID_TAGS_LENGTH = invalid 'tags' length
 
-JOIN_REQUEST_EXISTS = JOIN_REQUEST_EXISTS
+INVALID_TX_GROUP_ID = invalid transaction group ID
 
-MAXIMUM_REWARD_SHARES = MAXIMUM_REWARD_SHARES
+INVALID_VALUE_LENGTH = invalid 'value' length
 
-MISSING_CREATOR = MISSING_CREATOR
+INVITE_UNKNOWN = group invite unknown
 
-MULTIPLE_NAMES_FORBIDDEN = MULTIPLE_NAMES_FORBIDDEN
+JOIN_REQUEST_EXISTS = group join request already exists
 
-NAME_ALREADY_FOR_SALE = NAME_ALREADY_FOR_SALE
+MAXIMUM_REWARD_SHARES = already at maximum number of reward-shares for this account
 
-NAME_ALREADY_REGISTERED = NAME_ALREADY_REGISTERED
+MISSING_CREATOR = missing creator
 
-NAME_DOES_NOT_EXIST = NAME_DOES_NOT_EXIST
+MULTIPLE_NAMES_FORBIDDEN = multiple registered names per account is forbidden
 
-NAME_NOT_FOR_SALE = NAME_NOT_FOR_SALE
+NAME_ALREADY_FOR_SALE = name already for sale
 
-NAME_NOT_LOWER_CASE = NAME_NOT_LOWER_CASE
+NAME_ALREADY_REGISTERED = name already registered
 
-NEGATIVE_AMOUNT = NEGATIVE_AMOUNT
+NAME_DOES_NOT_EXIST = name does not exist
 
-NEGATIVE_FEE = NEGATIVE_FEE
+NAME_NOT_FOR_SALE = name is not for sale
 
-NEGATIVE_PRICE = NEGATIVE_PRICE
+NAME_NOT_NORMALIZED = name not in Unicode 'normalized' form
 
-NOT_GROUP_ADMIN = NOT_GROUP_ADMIN
+NEGATIVE_AMOUNT = invalid/negative amount
 
-NOT_GROUP_MEMBER = NOT_GROUP_MEMBER
+NEGATIVE_FEE = invalid/negative fee
 
-NOT_MINTING_ACCOUNT = NOT_MINTING_ACCOUNT
+NEGATIVE_PRICE = invalid/negative price
 
-NOT_YET_RELEASED = NOT_YET_RELEASED
+NOT_GROUP_ADMIN = account is not a group admin
 
-NO_BALANCE = NO_BALANCE
+NOT_GROUP_MEMBER = account is not a group member
+
+NOT_MINTING_ACCOUNT = account cannot mint
+
+NOT_YET_RELEASED = feature not yet released
+
+NO_BALANCE = insufficient balance
 
 NO_BLOCKCHAIN_LOCK = node's blockchain currently busy
 
-NO_FLAG_PERMISSION = NO_FLAG_PERMISSION
+NO_FLAG_PERMISSION = account does not have that permission
 
 OK = OK
 
-ORDER_ALREADY_CLOSED = ORDER_ALREADY_CLOSED
+ORDER_ALREADY_CLOSED = asset trade order is already closed
 
-ORDER_DOES_NOT_EXIST = ORDER_DOES_NOT_EXIST
+ORDER_DOES_NOT_EXIST = asset trade order does not exist
 
-POLL_ALREADY_EXISTS = POLL_ALREADY_EXISTS
+POLL_ALREADY_EXISTS = poll already exists
 
-POLL_DOES_NOT_EXIST = POLL_DOES_NOT_EXIST
+POLL_DOES_NOT_EXIST = poll does not exist
 
-POLL_OPTION_DOES_NOT_EXIST = POLL_OPTION_DOES_NOT_EXIST
+POLL_OPTION_DOES_NOT_EXIST = poll option does not exist
 
-PUBLIC_KEY_UNKNOWN = PUBLIC_KEY_UNKNOWN
+PUBLIC_KEY_UNKNOWN = public key unknown
 
-SELF_SHARE_EXISTS = SELF_SHARE_EXISTS
+REWARD_SHARE_UNKNOWN = reward-share unknown
 
-TIMESTAMP_TOO_NEW = TIMESTAMP_TOO_NEW
+SELF_SHARE_EXISTS = self-share (reward-share) already exists
 
-TIMESTAMP_TOO_OLD = TIMESTAMP_TOO_OLD
+TIMESTAMP_TOO_NEW = timestamp too new
 
-TOO_MANY_UNCONFIRMED = TOO_MANY_UNCONFIRMED
+TIMESTAMP_TOO_OLD = timestamp too old
 
-TRANSACTION_ALREADY_CONFIRMED = TRANSACTION_ALREADY_CONFIRMED
+TOO_MANY_UNCONFIRMED = account has too many unconfirmed transactions pending
 
-TRANSACTION_ALREADY_EXISTS = TRANSACTION_ALREADY_EXISTS
+TRANSACTION_ALREADY_CONFIRMED = transaction has already confirmed
 
-TRANSACTION_UNKNOWN = TRANSACTION_UNKNOWN
+TRANSACTION_ALREADY_EXISTS = transaction already exists
 
-TX_GROUP_ID_MISMATCH = TX_GROUP_ID_MISMATCH
+TRANSACTION_UNKNOWN = transaction unknown
+
+TX_GROUP_ID_MISMATCH = transaction's group ID does not match

src/main/resources/i18n/TransactionValidity_ru.properties

@@ -0,0 +1,164 @@
+
+ACCOUNT_ALREADY_EXISTS = \u00D0\u00B0\u00D0\u00BA\u00D0\u00BA\u00D0\u00B0\u00D1\u0083\u00D0\u00BD\u00D1\u0082 \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+ACCOUNT_CANNOT_REWARD_SHARE = \u00D0\u00B0\u00D0\u00BA\u00D0\u00BA\u00D0\u00B0\u00D1\u0083\u00D0\u00BD\u00D1\u0082 \u00D0\u00BD\u00D0\u00B5 \u00D0\u00BC\u00D0\u00BE\u00D0\u00B6\u00D0\u00B5\u00D1\u0082 \u00D0\u00B4\u00D0\u00B5\u00D0\u00BB\u00D0\u00B8\u00D1\u0082\u00D1\u008C\u00D1\u0081\u00D1\u008F \u00D0\u00B2\u00D0\u00BE\u00D0\u00B7\u00D0\u00BD\u00D0\u00B0\u00D0\u00B3\u00D1\u0080\u00D0\u00B0\u00D0\u00B6\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D0\u00B5\u00D0\u00BC
+
+ALREADY_GROUP_ADMIN = \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D0\u00B0\u00D0\u00B4\u00D0\u00BC\u00D0\u00B8\u00D0\u00BD\u00D0\u00B8\u00D1\u0081\u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0080 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+ALREADY_GROUP_MEMBER = \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D1\u0087\u00D0\u00BB\u00D0\u00B5\u00D0\u00BD \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+ALREADY_VOTED_FOR_THAT_OPTION = \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D0\u00BF\u00D1\u0080\u00D0\u00BE\u00D0\u00B3\u00D0\u00BE\u00D0\u00BB\u00D0\u00BE\u00D1\u0081\u00D0\u00BE\u00D0\u00B2\u00D0\u00B0\u00D0\u00BB\u00D0\u00B8 \u00D0\u00B7\u00D0\u00B0 \u00D1\u008D\u00D1\u0082\u00D0\u00BE\u00D1\u0082 \u00D0\u00B2\u00D0\u00B0\u00D1\u0080\u00D0\u00B8\u00D0\u00B0\u00D0\u00BD\u00D1\u0082
+
+ASSET_ALREADY_EXISTS = \u00D0\u00B0\u00D0\u00BA\u00D1\u0082\u00D0\u00B8\u00D0\u00B2 \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+ASSET_DOES_NOT_EXIST = \u00D0\u0090\u00D0\u00BA\u00D1\u0082\u00D0\u00B8\u00D0\u00B2 \u00D0\u00BD\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+ASSET_DOES_NOT_MATCH_AT = \u00D0\u00B0\u00D0\u00BA\u00D1\u0082\u00D0\u00B8\u00D0\u00B2 \u00D0\u00BD\u00D0\u00B5 \u00D1\u0081\u00D0\u00BE\u00D0\u00B2\u00D0\u00BF\u00D0\u00B0\u00D0\u00B4\u00D0\u00B0\u00D0\u00B5\u00D1\u0082 \u00D1\u0081 \u00D0\u0090\u00D0\u00A2
+
+AT_ALREADY_EXISTS = AT \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+AT_IS_FINISHED = AT \u00D0\u00B2 \u00D0\u00B7\u00D0\u00B0\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D1\u0088\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D0\u00B8
+
+AT_UNKNOWN = \u00D0\u00BD\u00D0\u00B5 \u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u0090\u00D0\u00A2
+
+BANNED_FROM_GROUP = \u00D0\u00B8\u00D1\u0081\u00D0\u00BA\u00D0\u00BB\u00D1\u008E\u00D1\u0087\u00D0\u00B5\u00D0\u00BD \u00D0\u00B8\u00D0\u00B7 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+BAN_EXISTS = \u00D0\u0091\u00D0\u00B0\u00D0\u00BD
+
+BAN_UNKNOWN = \u00D0\u00BD\u00D0\u00B5 \u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B1\u00D0\u00B0\u00D0\u00BD
+
+BUYER_ALREADY_OWNER = \u00D0\u00BF\u00D0\u00BE\u00D0\u00BA\u00D1\u0083\u00D0\u00BF\u00D0\u00B0\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D1\u0081\u00D0\u00BE\u00D0\u00B1\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B5\u00D0\u00BD\u00D0\u00BD\u00D0\u00B8\u00D0\u00BA
+
+DUPLICATE_OPTION = \u00D0\u00B4\u00D1\u0083\u00D0\u00B1\u00D0\u00BB\u00D0\u00B8\u00D1\u0080\u00D0\u00BE\u00D0\u00B2\u00D0\u00B0\u00D1\u0082\u00D1\u008C \u00D0\u00B2\u00D0\u00B0\u00D1\u0080\u00D0\u00B8\u00D0\u00B0\u00D0\u00BD\u00D1\u0082
+
+GROUP_ALREADY_EXISTS = \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D0\u00B0 \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+GROUP_APPROVAL_DECIDED = \u00D0\u00B3\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D0\u00B0 \u00D0\u00BE\u00D0\u00B4\u00D0\u00BE\u00D0\u00B1\u00D1\u0080\u00D0\u00B5\u00D0\u00BD\u00D0\u00B0
+
+GROUP_APPROVAL_NOT_REQUIRED = \u00D0\u00B3\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D0\u00BE\u00D0\u00B2\u00D0\u00BE\u00D0\u00B5 \u00D0\u00BE\u00D0\u00B4\u00D0\u00BE\u00D0\u00B1\u00D1\u0080\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D0\u00B5 \u00D0\u00BD\u00D0\u00B5 \u00D1\u0082\u00D1\u0080\u00D0\u00B5\u00D0\u00B1\u00D1\u0083\u00D0\u00B5\u00D1\u0082\u00D1\u0081\u00D1\u008F
+
+GROUP_DOES_NOT_EXIST = \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D0\u00B0 \u00D0\u00BD\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+GROUP_ID_MISMATCH = \u00D0\u00BD\u00D0\u00B5 \u00D1\u0081\u00D0\u00BE\u00D0\u00BE\u00D1\u0082\u00D0\u00B2\u00D0\u00B5\u00D1\u0082\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D0\u00B5 \u00D0\u00B8\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D1\u0082\u00D0\u00B8\u00D1\u0084\u00D0\u00B8\u00D0\u00BA\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0080\u00D0\u00B0 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+GROUP_OWNER_CANNOT_LEAVE = \u00D0\u00B2\u00D0\u00BB\u00D0\u00B0\u00D0\u00B4\u00D0\u00B5\u00D0\u00BB\u00D0\u00B5\u00D1\u0086 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B \u00D0\u00BD\u00D0\u00B5 \u00D0\u00BC\u00D0\u00BE\u00D0\u00B6\u00D0\u00B5\u00D1\u0082 \u00D1\u0083\u00D0\u00B9\u00D1\u0082\u00D0\u00B8
+
+HAVE_EQUALS_WANT = \u00D0\u00B8\u00D0\u00BC\u00D0\u00BC\u00D0\u00B5\u00D1\u008E\u00D1\u0082\u00D1\u0081\u00D1\u008F \u00D1\u0080\u00D0\u00B0\u00D0\u00B2\u00D0\u00BD\u00D1\u008B\u00D0\u00B5 \u00D0\u00B6\u00D0\u00B5\u00D0\u00BB\u00D0\u00B0\u00D0\u00BD\u00D0\u00B8\u00D1\u008F
+
+INSUFFICIENT_FEE = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D1\u0081\u00D1\u0082\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0087\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D0\u00BF\u00D0\u00BB\u00D0\u00B0\u00D1\u0082\u00D0\u00B0
+
+INVALID_ADDRESS = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B0\u00D0\u00B4\u00D1\u0080\u00D0\u00B5\u00D1\u0081
+
+INVALID_AMOUNT = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D0\u00B0\u00D1\u008F \u00D1\u0081\u00D1\u0083\u00D0\u00BC\u00D0\u00BC\u00D0\u00B0
+
+INVALID_ASSET_OWNER = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B2\u00D0\u00BB\u00D0\u00B0\u00D0\u00B4\u00D0\u00B5\u00D0\u00BB\u00D0\u00B5\u00D1\u0086 \u00D0\u00B0\u00D0\u00BA\u00D1\u0082\u00D0\u00B8\u00D0\u00B2\u00D0\u00B0
+
+INVALID_AT_TRANSACTION = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D0\u0090\u00D0\u00A2 \u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D0\u00BD\u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D1\u0086\u00D0\u00B8\u00D1\u008F
+
+INVALID_AT_TYPE_LENGTH = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D0\u00BE \u00D0\u00B4\u00D0\u00BB\u00D1\u008F \u00D1\u0082\u00D0\u00B8\u00D0\u00BF\u00D0\u00B0 \u00D0\u00B4\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD\u00D1\u008B AT
+
+INVALID_CREATION_BYTES = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D1\u008B\u00D0\u00B5 \u00D0\u00B1\u00D0\u00B0\u00D0\u00B9\u00D1\u0082\u00D1\u008B \u00D1\u0081\u00D0\u00BE\u00D0\u00B7\u00D0\u00B4\u00D0\u00B0\u00D0\u00BD\u00D0\u00B8\u00D1\u008F
+
+INVALID_DESCRIPTION_LENGTH = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D0\u00B0\u00D1\u008F \u00D0\u00B4\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD\u00D0\u00B0 \u00D0\u00BE\u00D0\u00BF\u00D0\u00B8\u00D1\u0081\u00D0\u00B0\u00D0\u00BD\u00D0\u00B8\u00D1\u008F
+
+INVALID_GROUP_APPROVAL_THRESHOLD = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D1\u008B\u00D0\u00B9 \u00D0\u00BF\u00D0\u00BE\u00D1\u0080\u00D0\u00BE\u00D0\u00B3 \u00D1\u0083\u00D1\u0082\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00B6\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D1\u008F \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+INVALID_GROUP_ID = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D1\u008B\u00D0\u00B9 \u00D0\u00B8\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D1\u0082\u00D0\u00B8\u00D1\u0084\u00D0\u00B8\u00D0\u00BA\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0080 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+INVALID_GROUP_OWNER = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083 \u00D0\u00B2\u00D0\u00BB\u00D0\u00B0\u00D0\u00B4\u00D0\u00B5\u00D0\u00BB\u00D0\u00B5\u00D1\u0086 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+INVALID_LIFETIME = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083 \u00D1\u0081\u00D1\u0080\u00D0\u00BE\u00D0\u00BA \u00D1\u0081\u00D0\u00BB\u00D1\u0083\u00D0\u00B6\u00D0\u00B1\u00D1\u008B
+
+INVALID_NAME_LENGTH = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D0\u00B0\u00D1\u008F \u00D0\u00B4\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD\u00D0\u00B0 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+INVALID_NAME_OWNER = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D0\u00BE\u00D0\u00B5 \u00D0\u00B8\u00D0\u00BC\u00D1\u008F \u00D0\u00B2\u00D0\u00BB\u00D0\u00B0\u00D0\u00B4\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D1\u0086\u00D0\u00B0
+
+INVALID_OPTIONS_COUNT = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D0\u00BE\u00D0\u00B5 \u00D0\u00BA\u00D0\u00BE\u00D0\u00BB\u00D0\u00B8\u00D1\u0087\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00BE \u00D0\u00BE\u00D0\u00BF\u00D1\u0086\u00D0\u00B8\u00D0\u00B9
+
+INVALID_OPTION_LENGTH = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D0\u00B0\u00D1\u008F \u00D0\u00B4\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD\u00D0\u00B0 \u00D0\u00BE\u00D0\u00BF\u00D1\u0086\u00D0\u00B8\u00D0\u00B8
+
+INVALID_ORDER_CREATOR = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D1\u008B\u00D0\u00B9 \u00D1\u0081\u00D0\u00BE\u00D0\u00B7\u00D0\u00B4\u00D0\u00B0\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C \u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D0\u00B0\u00D0\u00B7\u00D0\u00B0
+
+INVALID_PAYMENTS_COUNT = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00BF\u00D0\u00BE\u00D0\u00B4\u00D1\u0081\u00D1\u0087\u00D0\u00B5\u00D1\u0082 \u00D0\u00BF\u00D0\u00BB\u00D0\u00B0\u00D1\u0082\u00D0\u00B5\u00D0\u00B6\u00D0\u00B5\u00D0\u00B9
+
+INVALID_PUBLIC_KEY = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00BE\u00D1\u0082\u00D0\u00BA\u00D1\u0080\u00D1\u008B\u00D1\u0082\u00D1\u008B\u00D0\u00B9 \u00D0\u00BA\u00D0\u00BB\u00D1\u008E\u00D1\u0087
+
+INVALID_QUANTITY = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D0\u00BE\u00D0\u00B5 \u00D0\u00BA\u00D0\u00BE\u00D0\u00BB\u00D0\u00B8\u00D1\u0087\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00BE
+
+INVALID_REFERENCE = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D1\u0081\u00D1\u0081\u00D1\u008B\u00D0\u00BB\u00D0\u00BA\u00D0\u00B0
+
+INVALID_RETURN = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D1\u008B\u00D0\u00B9 \u00D0\u00B2\u00D0\u00BE\u00D0\u00B7\u00D0\u00B2\u00D1\u0080\u00D0\u00B0\u00D1\u0082
+
+INVALID_REWARD_SHARE_PERCENT = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00BF\u00D1\u0080\u00D0\u00BE\u00D1\u0086\u00D0\u00B5\u00D0\u00BD\u00D1\u0082 \u00D0\u00BD\u00D0\u00B0\u00D0\u00B3\u00D1\u0080\u00D0\u00B0\u00D0\u00B6\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D1\u008F
+
+INVALID_SELLER = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00BF\u00D1\u0080\u00D0\u00BE\u00D0\u00B4\u00D0\u00B0\u00D0\u00B2\u00D0\u00B5\u00D1\u0086
+
+INVALID_TAGS_LENGTH = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D0\u00B4\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD\u00D0\u00B0 \u00D1\u0082\u00D1\u008D\u00D0\u00B3\u00D0\u00BE\u00D0\u00B2
+
+INVALID_TX_GROUP_ID = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00B5\u00D0\u00B9\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D0\u00B8\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D0\u00B8\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D1\u0082\u00D0\u00B8\u00D1\u0084\u00D0\u00B8\u00D0\u00BA\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0080 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B \u00D0\u00BF\u00D0\u00B5\u00D1\u0080\u00D0\u00B5\u00D0\u00B4\u00D0\u00B0\u00D1\u0087\u00D0\u00B8
+
+INVALID_VALUE_LENGTH = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D0\u00BF\u00D1\u0083\u00D1\u0081\u00D1\u0082\u00D0\u00B8\u00D0\u00BC\u00D0\u00BE\u00D0\u00B5 \u00D0\u00B7\u00D0\u00BD\u00D0\u00B0\u00D1\u0087\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D0\u00B5 \u00D0\u00B4\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD\u00D1\u008B
+
+JOIN_REQUEST_EXISTS = \u00D0\u00B7\u00D0\u00B0\u00D0\u00BF\u00D1\u0080\u00D0\u00BE\u00D1\u0081 \u00D0\u00BD\u00D0\u00B0 \u00D0\u00BF\u00D1\u0080\u00D0\u00B8\u00D1\u0081\u00D0\u00BE\u00D0\u00B5\u00D0\u00B4\u00D0\u00B8\u00D0\u00BD\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+MAXIMUM_REWARD_SHARES = \u00D0\u00BC\u00D0\u00B0\u00D0\u00BA\u00D1\u0081\u00D0\u00B8\u00D0\u00BC\u00D0\u00B0\u00D0\u00BB\u00D1\u008C\u00D0\u00BD\u00D0\u00BE\u00D0\u00B5 \u00D0\u00B2\u00D0\u00BE\u00D0\u00B7\u00D0\u00BD\u00D0\u00B0\u00D0\u00B3\u00D1\u0080\u00D0\u00B0\u00D0\u00B6\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D0\u00B5
+
+MISSING_CREATOR = \u00D0\u00BE\u00D1\u0082\u00D1\u0081\u00D1\u0083\u00D1\u0082\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D1\u008E\u00D1\u0089\u00D0\u00B8\u00D0\u00B9 \u00D1\u0081\u00D0\u00BE\u00D0\u00B7\u00D0\u00B4\u00D0\u00B0\u00D1\u0082\u00D0\u00B5\u00D0\u00BB\u00D1\u008C
+
+MULTIPLE_NAMES_FORBIDDEN = \u00D0\u00BD\u00D0\u00B5\u00D1\u0081\u00D0\u00BA\u00D0\u00BE\u00D0\u00BB\u00D1\u008C\u00D0\u00BA\u00D0\u00BE \u00D0\u00B8\u00D0\u00BC\u00D0\u00B5\u00D0\u00BD \u00D0\u00B7\u00D0\u00B0\u00D0\u00BF\u00D1\u0080\u00D0\u00B5\u00D1\u0089\u00D0\u00B5\u00D0\u00BD\u00D0\u00BE
+
+NAME_ALREADY_FOR_SALE = \u00D0\u00B8\u00D0\u00BC\u00D1\u008F \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D0\u00B2 \u00D0\u00BF\u00D1\u0080\u00D0\u00BE\u00D0\u00B4\u00D0\u00B0\u00D0\u00B6\u00D0\u00B5
+
+NAME_ALREADY_REGISTERED = \u00D0\u00B8\u00D0\u00BC\u00D1\u008F \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D0\u00B7\u00D0\u00B0\u00D1\u0080\u00D0\u00B5\u00D0\u00B3\u00D0\u00B8\u00D1\u0081\u00D1\u0082\u00D1\u0080\u00D0\u00B8\u00D1\u0080\u00D0\u00BE\u00D0\u00B2\u00D0\u00B0\u00D0\u00BD\u00D0\u00BE
+
+NAME_DOES_NOT_EXIST = \u00D0\u00B8\u00D0\u00BC\u00D1\u008F \u00D0\u00BD\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+NAME_NOT_FOR_SALE = \u00D0\u00B8\u00D0\u00BC\u00D1\u008F \u00D0\u00BD\u00D0\u00B5 \u00D0\u00BF\u00D1\u0080\u00D0\u00BE\u00D0\u00B4\u00D0\u00B0\u00D0\u00B5\u00D1\u0082\u00D1\u0081\u00D1\u008F
+
+NAME_NOT_LOWER_CASE = \u00D0\u00B8\u00D0\u00BC\u00D0\u00BC\u00D1\u008F \u00D0\u00BD\u00D0\u00B5 \u00D0\u00B4\u00D0\u00BE\u00D0\u00BB\u00D0\u00B6\u00D0\u00BD\u00D0\u00BE \u00D1\u0081\u00D0\u00BE\u00D0\u00B4\u00D0\u00B5\u00D1\u0080\u00D0\u00B6\u00D0\u00B0\u00D1\u0082\u00D1\u008C \u00D1\u0081\u00D1\u0082\u00D1\u0080\u00D0\u00BE\u00D1\u0087\u00D0\u00BD\u00D1\u008B\u00D0\u00B9 \u00D1\u0080\u00D0\u00B5\u00D0\u00B3\u00D0\u00B8\u00D1\u0081\u00D1\u0082\u00D1\u0080
+
+NEGATIVE_AMOUNT = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D1\u0081\u00D1\u0082\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0087\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D1\u0081\u00D1\u0083\u00D0\u00BC\u00D0\u00BC\u00D0\u00B0
+
+NEGATIVE_FEE = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D1\u0081\u00D1\u0082\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0087\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D0\u00BA\u00D0\u00BE\u00D0\u00BC\u00D0\u00B8\u00D1\u0081\u00D1\u0081\u00D0\u00B8\u00D1\u008F
+
+NEGATIVE_PRICE = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B4\u00D0\u00BE\u00D1\u0081\u00D1\u0082\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0087\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D1\u0081\u00D1\u0082\u00D0\u00BE\u00D0\u00B8\u00D0\u00BC\u00D0\u00BE\u00D1\u0081\u00D1\u0082\u00D1\u008C
+
+NOT_GROUP_ADMIN = \u00D0\u00BD\u00D0\u00B5 \u00D0\u00B0\u00D0\u00B4\u00D0\u00BC\u00D0\u00B8\u00D0\u00BD\u00D0\u00B8\u00D1\u0081\u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D1\u0082\u00D0\u00BE\u00D1\u0080 \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+NOT_GROUP_MEMBER = \u00D0\u00BD\u00D0\u00B5 \u00D1\u0087\u00D0\u00BB\u00D0\u00B5\u00D0\u00BD \u00D0\u00B3\u00D1\u0080\u00D1\u0083\u00D0\u00BF\u00D0\u00BF\u00D1\u008B
+
+NOT_MINTING_ACCOUNT = \u00D1\u0081\u00D1\u0087\u00D0\u00B5\u00D1\u0082 \u00D0\u00BD\u00D0\u00B5 \u00D1\u0087\u00D0\u00B5\u00D0\u00BA\u00D0\u00B0\u00D0\u00BD\u00D0\u00B8\u00D1\u0082
+
+NOT_YET_RELEASED = \u00D0\u00B5\u00D1\u0089\u00D0\u00B5 \u00D0\u00BD\u00D0\u00B5 \u00D0\u00B2\u00D1\u008B\u00D0\u00BF\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D0\u00BD\u00D0\u00BE
+
+NO_BALANCE = \u00D0\u00BD\u00D0\u00B5\u00D1\u0082 \u00D0\u00B1\u00D0\u00B0\u00D0\u00BB\u00D0\u00B0\u00D0\u00BD\u00D1\u0081\u00D0\u00B0
+
+NO_BLOCKCHAIN_LOCK = \u00D0\u00B1\u00D0\u00BB\u00D0\u00BE\u00D0\u00BA\u00D1\u0087\u00D0\u00B5\u00D0\u00B9\u00D0\u00BD \u00D1\u0083\u00D0\u00B7\u00D0\u00BB\u00D0\u00B0 \u00D0\u00B2 \u00D0\u00BD\u00D0\u00B0\u00D1\u0081\u00D1\u0082\u00D0\u00BE\u00D1\u008F\u00D1\u0089\u00D0\u00B5\u00D0\u00B5 \u00D0\u00B2\u00D1\u0080\u00D0\u00B5\u00D0\u00BC\u00D1\u008F \u00D0\u00B7\u00D0\u00B0\u00D0\u00BD\u00D1\u008F\u00D1\u0082
+
+NO_FLAG_PERMISSION = \u00D0\u00BD\u00D0\u00B5\u00D1\u0082 \u00D1\u0080\u00D0\u00B0\u00D0\u00B7\u00D1\u0080\u00D0\u00B5\u00D1\u0088\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8\u00D1\u008F \u00D0\u00BD\u00D0\u00B0 \u00D1\u0084\u00D0\u00BB\u00D0\u00B0\u00D0\u00B3
+
+OK = OK
+
+ORDER_ALREADY_CLOSED = \u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D0\u00B0\u00D0\u00B7 \u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D1\u0080\u00D1\u008B\u00D1\u0082
+
+ORDER_DOES_NOT_EXIST = \u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D0\u00B0\u00D0\u00B7\u00D0\u00B0 \u00D0\u00BD\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+POLL_ALREADY_EXISTS = \u00D0\u00BE\u00D0\u00BF\u00D1\u0080\u00D0\u00BE\u00D1\u0081 \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+POLL_DOES_NOT_EXIST = \u00D0\u00BE\u00D0\u00BF\u00D1\u0080\u00D0\u00BE\u00D1\u0081\u00D0\u00B0 \u00D0\u00BD\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+POLL_OPTION_DOES_NOT_EXIST = \u00D0\u00B2\u00D0\u00B0\u00D1\u0080\u00D0\u00B8\u00D0\u00B0\u00D0\u00BD\u00D1\u0082\u00D0\u00BE\u00D0\u00B2 \u00D0\u00BE\u00D1\u0082\u00D0\u00B2\u00D0\u00B5\u00D1\u0082\u00D0\u00B0 \u00D0\u00BD\u00D0\u00B5 \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+PUBLIC_KEY_UNKNOWN = \u00D0\u00BE\u00D1\u0082\u00D0\u00BA\u00D1\u0080\u00D1\u008B\u00D1\u0082\u00D1\u008B\u00D0\u00B9 \u00D0\u00BA\u00D0\u00BB\u00D1\u008E\u00D1\u0087 \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B5\u00D0\u00BD
+
+SELF_SHARE_EXISTS = \u00D0\u00BF\u00D0\u00BE\u00D0\u00B4\u00D0\u00B5\u00D0\u00BB\u00D0\u00B8\u00D1\u0082\u00D1\u008C\u00D1\u0081\u00D1\u008F \u00D0\u00B4\u00D0\u00BE\u00D0\u00BB\u00D0\u00B5\u00D0\u00B9
+
+TIMESTAMP_TOO_NEW = \u00D0\u00BD\u00D0\u00BE\u00D0\u00B2\u00D0\u00B0\u00D1\u008F \u00D0\u00BC\u00D0\u00B5\u00D1\u0082\u00D0\u00BA\u00D0\u00B0 \u00D0\u00B2\u00D1\u0080\u00D0\u00B5\u00D0\u00BC\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8
+
+TIMESTAMP_TOO_OLD = \u00D1\u0081\u00D1\u0082\u00D0\u00B0\u00D1\u0080\u00D0\u00B0\u00D1\u008F \u00D0\u00BC\u00D0\u00B5\u00D1\u0082\u00D0\u00BA\u00D0\u00B0 \u00D0\u00B2\u00D1\u0080\u00D0\u00B5\u00D0\u00BC\u00D0\u00B5\u00D0\u00BD\u00D0\u00B8
+
+TRANSACTION_ALREADY_CONFIRMED = \u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D0\u00BD\u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D1\u0086\u00D0\u00B8\u00D1\u008F \u00D1\u0083\u00D0\u00B6\u00D0\u00B5 \u00D0\u00BF\u00D0\u00BE\u00D0\u00B4\u00D1\u0082\u00D0\u00B2\u00D0\u00B5\u00D1\u0080\u00D0\u00B6\u00D0\u00B4\u00D0\u00B5\u00D0\u00BD\u00D0\u00B0
+
+TRANSACTION_ALREADY_EXISTS = \u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D0\u00BD\u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D1\u0086\u00D0\u00B8\u00D1\u008F \u00D1\u0081\u00D1\u0083\u00D1\u0089\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00B2\u00D1\u0083\u00D0\u00B5\u00D1\u0082
+
+TRANSACTION_UNKNOWN = \u00D0\u00BD\u00D0\u00B5\u00D0\u00B8\u00D0\u00B7\u00D0\u00B2\u00D0\u00B5\u00D1\u0081\u00D1\u0082\u00D0\u00BD\u00D0\u00B0\u00D1\u008F \u00D1\u0082\u00D1\u0080\u00D0\u00B0\u00D0\u00BD\u00D0\u00B7\u00D0\u00B0\u00D0\u00BA\u00D1\u0086\u00D0\u00B8\u00D1\u008F

src/test/java/org/qortal/test/RepositoryTests.java

@@ -13,6 +13,7 @@ import org.qortal.test.common.Common;
 
 import static org.junit.Assert.*;
 
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -95,6 +96,28 @@ public class RepositoryTests extends Common {
 		}
 	}
 
+	@Test
+	public void testUpdateReadDeadlock() throws DataException {
+		// Open connection 1
+		try (final Repository repository1 = RepositoryManager.getRepository()) {
+			// Mint blocks so we have data (online account signatures) to work with
+			for (int i = 0; i < 10; ++i)
+				BlockUtils.mintBlock(repository1);
+
+			// Perform database 'update', but don't commit at this stage
+			repository1.getBlockRepository().trimOldOnlineAccountsSignatures(System.currentTimeMillis());
+
+			// Open connection 2
+			try (final Repository repository2 = RepositoryManager.getRepository()) {
+				// Perform database read on same blocks - this should not deadlock
+				repository2.getBlockRepository().getTimestampFromHeight(5);
+			}
+
+			// Save updates - this should not deadlock
+			repository1.saveChanges();
+		}
+	}
+
 	/** Check that the <i>sub-query</i> used to fetch highest block height is optimized by HSQLDB. */
 	@Test
 	public void testBlockHeightSpeed() throws DataException, SQLException {
@@ -158,6 +181,44 @@ public class RepositoryTests extends Common {
 		}
 	}
 
+	/** Test HSQLDB bug-fix for INSERT INTO...ON DUPLICATE KEY UPDATE... bug */
+	@Test
+	public void testOnDuplicateKeyUpdateBugFix() throws SQLException, DataException {
+		ResultSet resultSet;
+
+		try (final HSQLDBRepository hsqldb = (HSQLDBRepository) RepositoryManager.getRepository()) {
+			hsqldb.prepareStatement("DROP TABLE IF EXISTS bugtest").execute();
+			hsqldb.prepareStatement("CREATE TABLE bugtest (id INT NOT NULL, counter INT NOT NULL, PRIMARY KEY(id))").execute();
+
+			hsqldb.prepareStatement("INSERT INTO bugtest (id, counter) VALUES (1, 1) ON DUPLICATE KEY UPDATE counter = counter + 1").execute();
+			resultSet = hsqldb.checkedExecute("SELECT counter FROM bugtest WHERE id = 1");
+			assertNotNull(resultSet);
+			assertEquals(1, resultSet.getInt(1));
+
+			hsqldb.prepareStatement("INSERT INTO bugtest (id, counter) VALUES (1, 100) ON DUPLICATE KEY UPDATE counter = counter + 1").execute();
+			resultSet = hsqldb.checkedExecute("SELECT counter FROM bugtest WHERE id = 1");
+			assertNotNull(resultSet);
+			assertEquals(2, resultSet.getInt(1));
+		}
+	}
+
+	/** Test HSQLDB bug-fix for "General Error" in non-fully-qualified columns inside LATERAL() */
+	@Test
+	public void testOnLateralGeneralError() throws SQLException, DataException {
+		try (final HSQLDBRepository hsqldb = (HSQLDBRepository) RepositoryManager.getRepository()) {
+			hsqldb.prepareStatement("DROP TABLE IF EXISTS tableA").execute();
+			hsqldb.prepareStatement("DROP TABLE IF EXISTS tableB").execute();
+			hsqldb.prepareStatement("DROP TABLE IF EXISTS tableC").execute();
+
+			hsqldb.prepareStatement("CREATE TABLE tableA (col1 INT)").execute();
+			hsqldb.prepareStatement("CREATE TABLE tableB (col1 INT)").execute();
+			hsqldb.prepareStatement("CREATE TABLE tableC (col2 INT, PRIMARY KEY (col2))").execute();
+
+			// Prior to bug-fix this would throw a General Error SQL Exception
+			hsqldb.prepareStatement("SELECT col3 FROM tableA JOIN tableB USING (col1) CROSS JOIN LATERAL(SELECT col2 FROM tableC WHERE col2 = col1) AS tableC (col3)").execute();
+		}
+	}
+
 	public static void hsqldbSleep(int millis) throws SQLException {
 		System.out.println(String.format("HSQLDB sleep() thread ID: %s", Thread.currentThread().getId()));
 

src/test/java/org/qortal/test/TransactionSearchTests.java

@@ -0,0 +1,76 @@
+package org.qortal.test;
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.qortal.account.PrivateKeyAccount;
+import org.qortal.repository.DataException;
+import org.qortal.repository.Repository;
+import org.qortal.repository.RepositoryManager;
+import org.qortal.test.common.AccountUtils;
+import org.qortal.test.common.BlockUtils;
+import org.qortal.test.common.Common;
+import org.qortal.transaction.Transaction.TransactionType;
+
+public class TransactionSearchTests extends Common {
+
+	@Before
+	public void beforeTest() throws DataException {
+		Common.useDefaultSettings();
+	}
+
+	@Test
+	public void testFindingSpecificTransactionsWithinHeight() throws DataException {
+		try (final Repository repository = RepositoryManager.getRepository()) {
+			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
+			PrivateKeyAccount chloe = Common.getTestAccount(repository, "chloe");
+
+			// Block 2
+			BlockUtils.mintBlock(repository);
+
+			// Block 3
+			AccountUtils.pay(repository, alice, chloe.getAddress(), 1234L);
+
+			// Block 4
+			AccountUtils.pay(repository, chloe, alice.getAddress(), 5678L);
+
+			// Block 5
+			BlockUtils.mintBlock(repository);
+
+			List<byte[]> signatures;
+
+			// No transactions with this type
+			signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(TransactionType.GROUP_KICK, null, null, null);
+			assertEquals(0, signatures.size());
+
+			// 2 payments
+			signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(TransactionType.PAYMENT, null, null, null);
+			assertEquals(2, signatures.size());
+
+			// 1 payment by Alice
+			signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(TransactionType.PAYMENT, alice.getPublicKey(), null, null);
+			assertEquals(1, signatures.size());
+
+			// 1 transaction by Chloe
+			signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(null, chloe.getPublicKey(), null, null);
+			assertEquals(1, signatures.size());
+
+			// 1 transaction from blocks 4 onwards
+			signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(null, null, 4, null);
+			assertEquals(1, signatures.size());
+
+			// 1 transaction from blocks 2 to 3
+			signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(null, null, 2, 3);
+			assertEquals(1, signatures.size());
+
+			// No transaction of this type from blocks 2 to 5
+			signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(TransactionType.ISSUE_ASSET, null, 2, 5);
+			assertEquals(0, signatures.size());
+		}
+
+	}
+
+}

src/test/java/org/qortal/test/TransferPrivsTests.java

@@ -7,7 +7,7 @@ import org.qortal.account.Account;
 import org.qortal.account.PrivateKeyAccount;
 import org.qortal.account.PublicKeyAccount;
 import org.qortal.block.BlockChain;
-import org.qortal.block.BlockMinter;
+import org.qortal.controller.BlockMinter;
 import org.qortal.data.account.AccountData;
 import org.qortal.data.transaction.BaseTransactionData;
 import org.qortal.data.transaction.PaymentTransactionData;

src/test/java/org/qortal/test/api/CrossChainApiTests.java

@@ -0,0 +1,38 @@
+package org.qortal.test.api;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.qortal.api.ApiError;
+import org.qortal.api.resource.CrossChainResource;
+import org.qortal.test.common.ApiCommon;
+
+public class CrossChainApiTests extends ApiCommon {
+
+	private CrossChainResource crossChainResource;
+
+	@Before
+	public void buildResource() {
+		this.crossChainResource = (CrossChainResource) ApiCommon.buildResource(CrossChainResource.class);
+	}
+
+	@Test
+	public void testGetTradeOffers() {
+		assertNoApiError((limit, offset, reverse) -> this.crossChainResource.getTradeOffers(limit, offset, reverse));
+	}
+
+	@Test
+	public void testGetCompletedTrades() {
+		assertNoApiError((limit, offset, reverse) -> this.crossChainResource.getCompletedTrades(System.currentTimeMillis() /*minimumTimestamp*/, limit, offset, reverse));
+	}
+
+	@Test
+	public void testInvalidGetCompletedTrades() {
+		Integer limit = null;
+		Integer offset = null;
+		Boolean reverse = null;
+
+		assertApiError(ApiError.INVALID_CRITERIA, () -> this.crossChainResource.getCompletedTrades(-1L /*minimumTimestamp*/, limit, offset, reverse));
+		assertApiError(ApiError.INVALID_CRITERIA, () -> this.crossChainResource.getCompletedTrades(0L /*minimumTimestamp*/, limit, offset, reverse));
+	}
+
+}

src/test/java/org/qortal/test/apps/LaunchExeWIthJvmOptions.java

@@ -0,0 +1,63 @@
+package org.qortal.test.apps;
+
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class LaunchExeWIthJvmOptions {
+
+	private static final String JAR_FILENAME = "qortal.jar";
+	private static final String WINDOWS_EXE_LAUNCHER = "qortal.exe";
+	private static final String JAVA_TOOL_OPTIONS_NAME = "JAVA_TOOL_OPTIONS";
+	private static final String JAVA_TOOL_OPTIONS_VALUE = "-XX:MaxRAMFraction=4";
+
+	public static void main(String[] args) {
+		String javaHome = System.getProperty("java.home");
+		System.out.println(String.format("Java home: %s", javaHome));
+
+		Path javaBinary = Paths.get(javaHome, "bin", "java");
+		System.out.println(String.format("Java binary: %s", javaBinary));
+
+		Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER);
+		System.out.println(String.format("Windows EXE launcher: %s", exeLauncher));
+
+		List<String> javaCmd;
+		if (Files.exists(exeLauncher)) {
+			javaCmd = Arrays.asList(exeLauncher.toString());
+		} else {
+			javaCmd = new ArrayList<>();
+			// Java runtime binary itself
+			javaCmd.add(javaBinary.toString());
+
+			// JVM arguments
+			javaCmd.addAll(ManagementFactory.getRuntimeMXBean().getInputArguments());
+
+			// Call mainClass in JAR
+			javaCmd.addAll(Arrays.asList("-jar", JAR_FILENAME));
+
+			// Add saved command-line args
+			javaCmd.addAll(Arrays.asList(args));
+		}
+
+		try {
+			System.out.println(String.format("Restarting node with: %s", String.join(" ", javaCmd)));
+
+			ProcessBuilder processBuilder = new ProcessBuilder(javaCmd);
+
+			if (Files.exists(exeLauncher)) {
+				System.out.println(String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE));
+				processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE);
+			}
+
+			processBuilder.start();
+		} catch (IOException e) {
+			System.err.println(String.format("Failed to restart node (BAD): %s", e.getMessage()));
+		}
+	}
+
+}

src/test/java/org/qortal/test/btcacct/BtcTests.java

@@ -104,4 +104,17 @@ public class BtcTests extends Common {
 		assertEquals(balance, repeatBalance);
 	}
 
+	@Test
+	public void testGetUnusedReceiveAddress() {
+		BTC btc = BTC.getInstance();
+
+		String xprv58 = "tprv8ZgxMBicQKsPdahhFSrCdvC1bsWyzHHZfTneTVqUXN6s1wEtZLwAkZXzFP6TYLg2aQMecZLXLre5bTVGajEB55L1HYJcawpdFG66STVAWPJ";
+
+		String address = btc.getUnusedReceiveAddress(xprv58);
+
+		assertNotNull(address);
+
+		System.out.println(address);
+	}
+
 }

src/test/java/org/qortal/test/btcacct/Refund.java

@@ -186,7 +186,7 @@ public class Refund {
 			Coin refundAmount = Coin.valueOf(p2shBalance).subtract(bitcoinFee);
 			System.out.println(String.format("Spending %s of output, with %s as mining fee", BTC.format(refundAmount), BTC.format(bitcoinFee)));
 
-			Transaction redeemTransaction = BTCP2SH.buildRefundTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, lockTime);
+			Transaction redeemTransaction = BTCP2SH.buildRefundTransaction(refundAmount, refundKey, fundingOutputs, redeemScriptBytes, lockTime, refundKey.getPubKeyHash());
 
 			byte[] redeemBytes = redeemTransaction.bitcoinSerialize();
 

src/test/java/org/qortal/test/common/ApiCommon.java

@@ -1,16 +1,30 @@
 package org.qortal.test.common;
 
+import static org.junit.Assert.*;
+
 import java.lang.reflect.Field;
 
 import org.eclipse.jetty.server.Request;
 import org.junit.Before;
+import org.qortal.api.ApiError;
+import org.qortal.api.ApiException;
 import org.qortal.repository.DataException;
 
 public class ApiCommon extends Common {
 
+	public static final long MAX_API_RESPONSE_PERIOD = 2_000L; // ms
+
 	public static final Boolean[] ALL_BOOLEAN_VALUES = new Boolean[] { null, true, false };
 	public static final Boolean[] TF_BOOLEAN_VALUES = new Boolean[] { true, false };
 
+	public static final Integer[] SAMPLE_LIMIT_VALUES = new Integer[] { null, 0, 1, 20 };
+	public static final Integer[] SAMPLE_OFFSET_VALUES = new Integer[] { null, 0, 1, 5 };
+
+	@FunctionalInterface
+	public interface SlicedApiCall {
+		public abstract void call(Integer limit, Integer offset, Boolean reverse);
+	}
+
 	public static class FakeRequest extends Request {
 		public FakeRequest() {
 			super(null, null);
@@ -48,4 +62,50 @@ public class ApiCommon extends Common {
 		}
 	}
 
+	public static void assertApiError(ApiError expectedApiError, Runnable apiCall, Long maxResponsePeriod) {
+		try {
+			long beforeTimestamp = System.currentTimeMillis();
+			apiCall.run();
+
+			if (maxResponsePeriod != null) {
+				long responsePeriod = System.currentTimeMillis() - beforeTimestamp;
+				if (responsePeriod > maxResponsePeriod)
+					fail(String.format("API call response period %d ms greater than max allowed (%d ms)", responsePeriod, maxResponsePeriod));
+			}
+		} catch (ApiException e) {
+			ApiError actualApiError = ApiError.fromCode(e.error);
+			assertEquals(expectedApiError, actualApiError);
+		}
+	}
+
+	public static void assertApiError(ApiError expectedApiError, Runnable apiCall) {
+		assertApiError(expectedApiError, apiCall, MAX_API_RESPONSE_PERIOD);
+	}
+
+	public static void assertNoApiError(Runnable apiCall, Long maxResponsePeriod) {
+		try {
+			long beforeTimestamp = System.currentTimeMillis();
+			apiCall.run();
+
+			if (maxResponsePeriod != null) {
+				long responsePeriod = System.currentTimeMillis() - beforeTimestamp;
+				if (responsePeriod > maxResponsePeriod)
+					fail(String.format("API call response period %d ms greater than max allowed (%d ms)", responsePeriod, maxResponsePeriod));
+			}
+		} catch (ApiException e) {
+			fail("ApiException unexpected");
+		}
+	}
+
+	public static void assertNoApiError(Runnable apiCall) {
+		assertNoApiError(apiCall, MAX_API_RESPONSE_PERIOD);
+	}
+
+	public static void assertNoApiError(SlicedApiCall apiCall) {
+		for (Integer limit : SAMPLE_LIMIT_VALUES)
+			for (Integer offset : SAMPLE_OFFSET_VALUES)
+				for (Boolean reverse : ALL_BOOLEAN_VALUES)
+					assertNoApiError(() -> apiCall.call(limit, offset, reverse));
+	}
+
 }

src/test/java/org/qortal/test/common/BlockUtils.java

@@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger;
 import org.qortal.account.PrivateKeyAccount;
 import org.qortal.block.Block;
 import org.qortal.block.BlockChain;
-import org.qortal.block.BlockMinter;
+import org.qortal.controller.BlockMinter;
 import org.qortal.data.block.BlockData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;

src/test/java/org/qortal/test/minting/BlocksMintedCountTests.java

@@ -7,7 +7,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.qortal.account.PrivateKeyAccount;
-import org.qortal.block.BlockMinter;
+import org.qortal.controller.BlockMinter;
 import org.qortal.controller.Controller;
 import org.qortal.data.account.RewardShareData;
 import org.qortal.repository.DataException;

src/test/java/org/qortal/test/minting/DisagreementTests.java

@@ -10,7 +10,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.qortal.account.PrivateKeyAccount;
-import org.qortal.block.BlockMinter;
+import org.qortal.controller.BlockMinter;
 import org.qortal.controller.Controller;
 import org.qortal.data.account.RewardShareData;
 import org.qortal.data.block.BlockData;

src/test/java/org/qortal/test/minting/RewardTests.java

@@ -14,8 +14,8 @@ import org.junit.Test;
 import org.qortal.account.PrivateKeyAccount;
 import org.qortal.asset.Asset;
 import org.qortal.block.BlockChain;
-import org.qortal.block.BlockMinter;
 import org.qortal.block.BlockChain.RewardByHeight;
+import org.qortal.controller.BlockMinter;
 import org.qortal.data.account.AccountBalanceData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;