Script updates to support add/remove dev group admins

Proof of concept: speed up QORT buying

TestNets.md

@@ -52,14 +52,13 @@
 
 ## Single-node testnet
 
-A single-node testnet is possible with code modifications, for basic testing, or to more easily start a new testnet.
-To do so, follow these steps:
-- Comment out the `if (mintedLastBlock) { }` conditional in BlockMinter.java
-- Comment out the `minBlockchainPeers` validation in Settings.validate()
-- Set `minBlockchainPeers` to 0 in settings.json
-- Set `Synchronizer.RECOVERY_MODE_TIMEOUT` to `0`
-- All other steps should remain the same. Only a single reward share key is needed.
-- Remember to put these values back after introducing other nodes
+A single-node testnet is possible with an additional settings, or to more easily start a new testnet.
+Just add this setting:
+```
+"singleNodeTestnet": true
+```
+This will automatically allow multiple consecutive blocks to be minted, as well as setting minBlockchainPeers to 0.
+Remember to put these values back after introducing other nodes
 
 ## Fixed network
 
@@ -93,3 +92,32 @@ Your options are:
 - `qort` tool, but prepend with one-time shell variable: `BASE_URL=some-node-hostname-or-ip:port qort ......`
 - `peer-heights`, but use `-t` option, or `BASE_URL` shell variable as above
 
+## Example settings-test.json
+```
+{
+  "isTestNet": true,
+  "bitcoinNet": "TEST3",
+  "repositoryPath": "db-testnet",
+  "blockchainConfig": "testchain.json",
+  "minBlockchainPeers": 1,
+  "apiDocumentationEnabled": true,
+  "apiRestricted": false,
+  "bootstrap": false,
+  "maxPeerConnectionTime": 999999999,
+  "localAuthBypassEnabled": true,
+  "singleNodeTestnet": true,
+  "recoveryModeTimeout": 0
+}
+```
+
+## Quick start
+Here are some steps to quickly get a single node testnet up and running with a generic minting account:
+1. Start with template `settings-test.json`, and create a `testchain.json` based on mainnet's blockchain.json (or obtain one from Qortal developers). These should be in the same directory as the jar.
+2. Make sure feature triggers and other timestamp/height activations are correctly set. Generally these would be `0` so that they are enabled from the start.
+3. Set a recent genesis `timestamp` in testchain.json, and add this reward share entry:
+`{ "type": "REWARD_SHARE", "minterPublicKey": "DwcUnhxjamqppgfXCLgbYRx8H9XFPUc2qYRy3CEvQWEw", "recipient": "QbTDMss7NtRxxQaSqBZtSLSNdSYgvGaqFf", "rewardSharePublicKey": "CRvQXxFfUMfr4q3o1PcUZPA4aPCiubBsXkk47GzRo754", "sharePercent": 0 },`
+4. Start the node, passing in settings-test.json, e.g: `java -jar qortal.jar settings-test.json`
+5. Once started, add the corresponding minting key to the node:
+`curl -X POST "http://localhost:62391/admin/mintingaccounts" -d "F48mYJycFgRdqtc58kiovwbcJgVukjzRE4qRRtRsK9ix"`
+6. Alternatively you can use your own minting account instead of the generic one above.
+7. After a short while, blocks should be minted from the genesis timestamp until the current time.

WindowsInstaller/Qortal.aip

@@ -17,10 +17,10 @@
     <ROW Property="Manufacturer" Value="Qortal"/>
     <ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
     <ROW Property="NTP_GOOD" Value="false"/>
-    <ROW Property="ProductCode" Value="1033:{BB0A4CEC-D437-4D1B-9569-44CD644D073A} 1049:{A3131099-E63A-4926-A449-6A394E2B895A} 2052:{39D2F92F-C2EE-43EA-BEC9-870333921BC0} 2057:{FE9EFD1A-E4DF-4F02-A049-6A0FBFA2AAEF} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{ADE0C9E9-F7D9-4829-8626-8571C735C4D7} 1049:{F5230C0A-9D8C-4C70-AC72-17CECC8273B8} 2052:{D5A0760C-E5B3-4C4C-97B0-81CC445F07B9} 2057:{EF5EF0BE-0B00-4F5C-A2A0-DF2CB82FF20D} " Type="16"/>
     <ROW Property="ProductLanguage" Value="2057"/>
     <ROW Property="ProductName" Value="Qortal"/>
-    <ROW Property="ProductVersion" Value="3.4.2" Type="32"/>
+    <ROW Property="ProductVersion" Value="3.6.3" Type="32"/>
     <ROW Property="RECONFIG_NTP" Value="true"/>
     <ROW Property="REMOVE_BLOCKCHAIN" Value="YES" Type="4"/>
     <ROW Property="REPAIR_BLOCKCHAIN" Value="YES" Type="4"/>
@@ -212,7 +212,7 @@
     <ROW Component="ADDITIONAL_LICENSE_INFO_71" ComponentId="{12A3ADBE-BB7A-496C-8869-410681E6232F}" Directory_="jdk.zipfs_Dir" Attributes="0" KeyPath="ADDITIONAL_LICENSE_INFO_71" Type="0"/>
     <ROW Component="ADDITIONAL_LICENSE_INFO_8" ComponentId="{D53AD95E-CF96-4999-80FC-5812277A7456}" Directory_="java.naming_Dir" Attributes="0" KeyPath="ADDITIONAL_LICENSE_INFO_8" Type="0"/>
     <ROW Component="ADDITIONAL_LICENSE_INFO_9" ComponentId="{6B7EA9B0-5D17-47A8-B78C-FACE86D15E01}" Directory_="java.net.http_Dir" Attributes="0" KeyPath="ADDITIONAL_LICENSE_INFO_9" Type="0"/>
-    <ROW Component="AI_CustomARPName" ComponentId="{9CE2B8C0-C0A1-481A-8A34-48830F2785EE}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
+    <ROW Component="AI_CustomARPName" ComponentId="{F4F774B9-18DC-4740-9552-EA16B98801C9}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
     <ROW Component="AI_ExePath" ComponentId="{3644948D-AE0B-41BB-9FAF-A79E70490A08}" Directory_="APPDIR" Attributes="260" KeyPath="AI_ExePath"/>
     <ROW Component="APPDIR" ComponentId="{680DFDDE-3FB4-47A5-8FF5-934F576C6F91}" Directory_="APPDIR" Attributes="0"/>
     <ROW Component="AccessBridgeCallbacks.h" ComponentId="{288055D1-1062-47A3-AA44-5601B4E38AED}" Directory_="bridge_Dir" Attributes="0" KeyPath="AccessBridgeCallbacks.h" Type="0"/>
@@ -1173,7 +1173,7 @@
     <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
     <ROW Action="AI_SetPermissions" Type="11265" Source="userAccounts.dll" Target="OnSetPermissions" WithoutSeq="true"/>
     <ROW Action="CustomizeLog4j2PropertiesScript" Type="3109" Target="Script Text" TargetUnformatted="var actionData = Session.Property(&quot;CustomActionData&quot;);&#13;&#10;var actionDataArray = actionData.split(&quot;|&quot;);&#13;&#10;var appDir = actionDataArray[0];&#13;&#10;var dataFolder = actionDataArray[1] + actionDataArray[2] + &quot;\\&quot;;&#13;&#10;&#13;&#10;var ForReading = 1, ForWriting = 2, ForAppending = 8;&#13;&#10;var fso = new ActiveXObject(&quot;Scripting.FileSystemObject&quot;);&#13;&#10;&#13;&#10;// Make copy&#13;&#10;fso.CopyFile(appDir + &quot;log4j2.properties&quot;, appDir + &quot;log4j2-orig.properties&quot;, true); // overwrite&#13;&#10;&#13;&#10;// Rewrite %AppDir%\log4j2.properties to update logfile storage path&#13;&#10;var fin = fso.OpenTextFile(appDir + &quot;log4j2-orig.properties&quot;, ForReading, false); // no create&#13;&#10;var fout = fso.OpenTextFile(appDir + &quot;log4j2.properties&quot;, ForWriting, true); // can create&#13;&#10;&#13;&#10;// Copy lines with rewriting where necessary&#13;&#10;while( !fin.AtEndOfStream ) {&#13;&#10;&#9;var line = fin.ReadLine();&#13;&#10;&#13;&#10;&#9;var start = line.indexOf(&quot;property.dirname&quot;);&#13;&#10;&#9;if (start &gt; 0) {&#13;&#10;&#9;&#9;// line: # property.dirname = ...appdata...&#13;&#10;&#9;&#9;// uncomment/replace this line for Windows&#13;&#10;&#9;&#9;fout.WriteLine( &quot;property.dirname = &quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) );&#13;&#10;&#9;} else {&#13;&#10;&#9;&#9;// not found - output verbatim&#13;&#10;&#9;&#9;fout.WriteLine( line );&#13;&#10;&#9;}&#13;&#10;}&#13;&#10;&#13;&#10;fin.Close();&#13;&#10;fout.Close();&#13;&#10;" AdditionalSeq="AI_DATA_SETTER_4"/>
-    <ROW Action="CustomizeSettingsJsonScript" Type="3109" Target="Script Text" TargetUnformatted="var actionData = Session.Property(&quot;CustomActionData&quot;);&#13;&#10;var actionDataArray = actionData.split(&quot;|&quot;);&#13;&#10;var appDir = actionDataArray[0];&#13;&#10;var dataFolder = actionDataArray[1] + actionDataArray[2] + &quot;\\&quot;;&#13;&#10;&#13;&#10;var ForReading = 1, ForWriting = 2, ForAppending = 8;&#13;&#10;var fso = new ActiveXObject(&quot;Scripting.FileSystemObject&quot;);&#13;&#10;&#13;&#10;// Create basic %APPDIR%\settings.json with path to real settings.json in dataFolder&#13;&#10;var fts = fso.OpenTextFile(appDir + &quot;settings.json&quot;, ForWriting, true);&#13;&#10;&#13;&#10;fts.WriteLine( &quot;{&quot; );&#13;&#10;// We need to escape Windows path backslashes to keep JSON valid&#13;&#10;fts.WriteLine( &quot;  \&quot;userPath\&quot;: \&quot;&quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) + &quot;\&quot;&quot; );&#13;&#10;fts.WriteLine( &quot;}&quot; );&#13;&#10;&#13;&#10;fts.Close();&#13;&#10;&#13;&#10;// Make copy&#13;&#10;fso.CopyFile(dataFolder + &quot;settings.json&quot;, dataFolder + &quot;settings-orig.json&quot;, true); // overwrite&#13;&#10;&#13;&#10;// Rewrite settings.json to update repository path&#13;&#10;var fin = fso.OpenTextFile(dataFolder + &quot;settings-orig.json&quot;, ForReading, false);&#13;&#10;var fout = fso.OpenTextFile(dataFolder + &quot;settings.json&quot;, ForWriting, true);&#13;&#10;&#13;&#10;// First line should contain opening brace&#13;&#10;fout.WriteLine( fin.ReadLine() );&#13;&#10;&#13;&#10;// Append our entries&#13;&#10;fout.WriteLine( &quot;  \&quot;repositoryPath\&quot;: \&quot;&quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) + &quot;db\&quot;,&quot; );&#13;&#10;fout.WriteLine( &quot;  \&quot;dataPath\&quot;: \&quot;&quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) + &quot;data\&quot;,&quot; );&#13;&#10;&#13;&#10;// copy rest of settings&#13;&#10;while( !fin.AtEndOfStream ) {&#13;&#10;&#9;fout.WriteLine( fin.ReadLine() );&#13;&#10;}&#13;&#10;&#13;&#10;fin.Close();&#13;&#10;fout.Close();&#13;&#10;" AdditionalSeq="AI_DATA_SETTER_3"/>
+    <ROW Action="CustomizeSettingsJsonScript" Type="3109" Target="Script Text" TargetUnformatted="var actionData = Session.Property(&quot;CustomActionData&quot;);&#13;&#10;var actionDataArray = actionData.split(&quot;|&quot;);&#13;&#10;var appDir = actionDataArray[0];&#13;&#10;var dataFolder = actionDataArray[1] + actionDataArray[2] + &quot;\\&quot;;&#13;&#10;&#13;&#10;var ForReading = 1, ForWriting = 2, ForAppending = 8;&#13;&#10;var fso = new ActiveXObject(&quot;Scripting.FileSystemObject&quot;);&#13;&#10;&#13;&#10;// Create basic %APPDIR%\settings.json with path to real settings.json in dataFolder&#13;&#10;var fts = fso.OpenTextFile(appDir + &quot;settings.json&quot;, ForWriting, true);&#13;&#10;&#13;&#10;fts.WriteLine( &quot;{&quot; );&#13;&#10;// We need to escape Windows path backslashes to keep JSON valid&#13;&#10;fts.WriteLine( &quot;  \&quot;userPath\&quot;: \&quot;&quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) + &quot;\&quot;&quot; );&#13;&#10;fts.WriteLine( &quot;}&quot; );&#13;&#10;&#13;&#10;fts.Close();&#13;&#10;&#13;&#10;// Make copy&#13;&#10;fso.CopyFile(dataFolder + &quot;settings.json&quot;, dataFolder + &quot;settings-orig.json&quot;, true); // overwrite&#13;&#10;&#13;&#10;// Rewrite settings.json to update repository path&#13;&#10;var fin = fso.OpenTextFile(dataFolder + &quot;settings-orig.json&quot;, ForReading, false);&#13;&#10;var fout = fso.OpenTextFile(dataFolder + &quot;settings.json&quot;, ForWriting, true);&#13;&#10;&#13;&#10;// First line should contain opening brace&#13;&#10;fout.WriteLine( fin.ReadLine() );&#13;&#10;&#13;&#10;// Append our entries&#13;&#10;fout.WriteLine( &quot;  \&quot;repositoryPath\&quot;: \&quot;&quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) + &quot;db\&quot;,&quot; );&#13;&#10;fout.WriteLine( &quot;  \&quot;dataPath\&quot;: \&quot;&quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) + &quot;data\&quot;,&quot; );&#13;&#10;fout.WriteLine( &quot;  \&quot;walletsPath\&quot;: \&quot;&quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) + &quot;wallets\&quot;,&quot; );&#13;&#10;fout.WriteLine( &quot;  \&quot;listsPath\&quot;: \&quot;&quot; + dataFolder.split(&apos;\\&apos;).join(&apos;\\\\&apos;) + &quot;lists\&quot;,&quot; );&#13;&#10;&#13;&#10;// copy rest of settings&#13;&#10;while( !fin.AtEndOfStream ) {&#13;&#10;&#9;fout.WriteLine( fin.ReadLine() );&#13;&#10;}&#13;&#10;&#13;&#10;fin.Close();&#13;&#10;fout.Close();&#13;&#10;" AdditionalSeq="AI_DATA_SETTER_3"/>
     <ROW Action="DetectRunningProcess" Type="1" Source="aicustact.dll" Target="DetectProcess" Options="3" AdditionalSeq="AI_DATA_SETTER_8"/>
     <ROW Action="DetectW32Time" Type="1" Source="aicustact.dll" Target="DetectService" Options="3" AdditionalSeq="AI_DATA_SETTER_11"/>
     <ROW Action="NTP_config" Type="3090" Source="ntpcfg.bat"/>

lib/org/ciyam/AT/1.4.0/AT-1.4.0.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.ciyam</groupId>
+  <artifactId>AT</artifactId>
+  <version>1.4.0</version>
+  <description>POM was created from install:install-file</description>
+</project>

lib/org/ciyam/AT/maven-metadata-local.xml

@@ -3,14 +3,15 @@
   <groupId>org.ciyam</groupId>
   <artifactId>AT</artifactId>
   <versioning>
-    <release>1.3.8</release>
+    <release>1.4.0</release>
     <versions>
       <version>1.3.4</version>
       <version>1.3.5</version>
       <version>1.3.6</version>
       <version>1.3.7</version>
       <version>1.3.8</version>
+      <version>1.4.0</version>
     </versions>
-    <lastUpdated>20200925114415</lastUpdated>
+    <lastUpdated>20221105114346</lastUpdated>
   </versioning>
 </metadata>

pom.xml

@@ -3,15 +3,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.qortal</groupId>
 	<artifactId>qortal</artifactId>
-	<version>3.4.3</version>
+	<version>3.6.4</version>
 	<packaging>jar</packaging>
 	<properties>
 		<skipTests>true</skipTests>
-		<altcoinj.version>6628cfd</altcoinj.version>
+		<altcoinj.version>7dc8c6f</altcoinj.version>
 		<bitcoinj.version>0.15.10</bitcoinj.version>
-		<bouncycastle.version>1.64</bouncycastle.version>
+		<bouncycastle.version>1.69</bouncycastle.version>
 		<build.timestamp>${maven.build.timestamp}</build.timestamp>
-		<ciyam-at.version>1.3.8</ciyam-at.version>
+		<ciyam-at.version>1.4.0</ciyam-at.version>
 		<commons-net.version>3.6</commons-net.version>
 		<commons-text.version>1.8</commons-text.version>
 		<commons-io.version>2.6</commons-io.version>
@@ -34,6 +34,8 @@
 		<package-info-maven-plugin.version>1.1.0</package-info-maven-plugin.version>
 		<jsoup.version>1.13.1</jsoup.version>
 		<java-diff-utils.version>4.10</java-diff-utils.version>
+		<grpc.version>1.45.1</grpc.version>
+		<protobuf.version>3.19.4</protobuf.version>
 	</properties>
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
@@ -705,5 +707,25 @@
 			<artifactId>java-diff-utils</artifactId>
 			<version>${java-diff-utils.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-netty</artifactId>
+			<version>${grpc.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-protobuf</artifactId>
+			<version>${grpc.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-stub</artifactId>
+			<version>${grpc.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.protobuf</groupId>
+			<artifactId>protobuf-java</artifactId>
+			<version>${protobuf.version}</version>
+		</dependency>
 	</dependencies>
 </project>

src/main/java/com/rust/litewalletjni/LiteWalletJni.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * LiteWalletJni code based on https://github.com/PirateNetwork/cordova-plugin-litewallet
+ *
+ * MIT License
+ *
+ * Copyright (c) 2020 Zero Currency Coin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.rust.litewalletjni;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.qortal.controller.PirateChainWalletController;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class LiteWalletJni {
+
+    protected static final Logger LOGGER = LogManager.getLogger(LiteWalletJni.class);
+
+    public static native String initlogging();
+    public static native String initnew(final String serveruri, final String params, final String saplingOutputb64, final String saplingSpendb64);
+    public static native String initfromseed(final String serveruri, final String params, final String seed, final String birthday, final String saplingOutputb64, final String saplingSpendb64);
+    public static native String initfromb64(final String serveruri, final String params, final String datab64, final String saplingOutputb64, final String saplingSpendb64);
+    public static native String save();
+
+    public static native String execute(final String cmd, final String args);
+    public static native String getseedphrase();
+    public static native String getseedphrasefromentropyb64(final String entropy64);
+    public static native String checkseedphrase(final String input);
+
+
+    private static boolean loaded = false;
+
+    public static void loadLibrary() {
+        if (loaded) {
+            return;
+        }
+        String osName = System.getProperty("os.name");
+        String osArchitecture = System.getProperty("os.arch");
+
+        LOGGER.info("OS Name: {}", osName);
+        LOGGER.info("OS Architecture: {}", osArchitecture);
+
+        try {
+            String libFileName = PirateChainWalletController.getRustLibFilename();
+            if (libFileName == null) {
+                LOGGER.info("Library not found for OS: {}, arch: {}", osName, osArchitecture);
+                return;
+            }
+
+            Path libPath = Paths.get(PirateChainWalletController.getRustLibOuterDirectory().toString(), libFileName);
+            System.load(libPath.toAbsolutePath().toString());
+            loaded = true;
+        }
+        catch (UnsatisfiedLinkError e) {
+            LOGGER.info("Unable to load library");
+        }
+    }
+
+    public static boolean isLoaded() {
+        return loaded;
+    }
+
+}

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

@@ -1,7 +1,7 @@
 package org.qortal.api.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.qortal.data.network.PeerChainTipData;
+import org.qortal.data.block.BlockSummaryData;
 import org.qortal.data.network.PeerData;
 import org.qortal.network.Handshake;
 import org.qortal.network.Peer;
@@ -63,11 +63,11 @@ public class ConnectedPeer {
             this.age = "connecting...";
         }
 
-        PeerChainTipData peerChainTipData = peer.getChainTipData();
+        BlockSummaryData peerChainTipData = peer.getChainTipData();
         if (peerChainTipData != null) {
-            this.lastHeight = peerChainTipData.getLastHeight();
-            this.lastBlockSignature = peerChainTipData.getLastBlockSignature();
-            this.lastBlockTimestamp = peerChainTipData.getLastBlockTimestamp();
+            this.lastHeight = peerChainTipData.getHeight();
+            this.lastBlockSignature = peerChainTipData.getSignature();
+            this.lastBlockTimestamp = peerChainTipData.getTimestamp();
         }
     }
 

src/main/java/org/qortal/api/model/crosschain/PirateChainSendRequest.java

@@ -0,0 +1,32 @@
+package org.qortal.api.model.crosschain;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+public class PirateChainSendRequest {
+
+	@Schema(description = "32 bytes of entropy, Base58 encoded", example = "5oSXF53qENtdUyKhqSxYzP57m6RhVFP9BJKRr9E5kRGV")
+	public String entropy58;
+
+	@Schema(description = "Recipient's Pirate Chain address", example = "zc...")
+	public String receivingAddress;
+
+	@Schema(description = "Amount of ARRR to send", type = "number")
+	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
+	public long arrrAmount;
+
+	@Schema(description = "Transaction fee per byte (optional). Default is 0.00000100 ARRR (100 sats) per byte", example = "0.00000100", type = "number")
+	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
+	public Long feePerByte;
+
+	@Schema(description = "Optional memo to include information for the recipient", example = "zc...")
+	public String memo;
+
+	public PirateChainSendRequest() {
+	}
+
+}

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

@@ -205,6 +205,10 @@ public class AddressesResource {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			List<OnlineAccountLevel> onlineAccountLevels = new ArrayList<>();
 
+			// Prepopulate all levels
+			for (int i=0; i<=10; i++)
+				onlineAccountLevels.add(new OnlineAccountLevel(i, 0));
+
 			for (OnlineAccountData onlineAccountData : onlineAccounts) {
 				try {
 					final int minterLevel = Account.getRewardShareEffectiveMintingLevelIncludingLevelZero(repository, onlineAccountData.getPublicKey());

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

@@ -728,6 +728,49 @@ public class AdminResource {
 		}
 	}
 
+	@POST
+	@Path("/repository/importarchivedtrades")
+	@Operation(
+			summary = "Imports archived trades from TradeBotStatesArchive.json",
+			description = "This can be used to recover trades that exist in the archive only, which may be needed if a<br />" +
+					"problem occurred during the proof-of-work computation stage of a buy request.",
+			responses = {
+					@ApiResponse(
+							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
+					)
+			}
+	)
+	@ApiErrors({ApiError.REPOSITORY_ISSUE})
+	@SecurityRequirement(name = "apiKey")
+	public boolean importArchivedTrades(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
+		Security.checkApiCallAllowed(request);
+
+		try (final Repository repository = RepositoryManager.getRepository()) {
+			ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
+
+			blockchainLock.lockInterruptibly();
+
+			try {
+				repository.importDataFromFile("qortal-backup/TradeBotStatesArchive.json");
+				repository.saveChanges();
+
+				return true;
+
+			} catch (IOException e) {
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA, e);
+
+			} finally {
+				blockchainLock.unlock();
+			}
+		} catch (InterruptedException e) {
+			// We couldn't lock blockchain to perform import
+			return false;
+		} catch (DataException e) {
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
+		}
+	}
+
+
 
 	@POST
 	@Path("/apikey/generate")

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

@@ -12,10 +12,10 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.servlet.ServletContext;
@@ -45,6 +45,7 @@ import org.qortal.data.arbitrary.*;
 import org.qortal.data.naming.NameData;
 import org.qortal.data.transaction.ArbitraryTransactionData;
 import org.qortal.data.transaction.TransactionData;
+import org.qortal.list.ResourceListManager;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
@@ -56,6 +57,7 @@ import org.qortal.transaction.Transaction.ValidationResult;
 import org.qortal.transform.TransformationException;
 import org.qortal.transform.transaction.ArbitraryTransactionTransformer;
 import org.qortal.transform.transaction.TransactionTransformer;
+import org.qortal.utils.ArbitraryTransactionUtils;
 import org.qortal.utils.Base58;
 import org.qortal.utils.NTP;
 import org.qortal.utils.ZipUtils;
@@ -91,6 +93,7 @@ public class ArbitraryResource {
 			@Parameter(ref = "limit") @QueryParam("limit") Integer limit,
 			@Parameter(ref = "offset") @QueryParam("offset") Integer offset,
 			@Parameter(ref = "reverse") @QueryParam("reverse") Boolean reverse,
+			@Parameter(description = "Filter names by list") @QueryParam("namefilter") String nameFilter,
 			@Parameter(description = "Include status") @QueryParam("includestatus") Boolean includeStatus,
 			@Parameter(description = "Include metadata") @QueryParam("includemetadata") Boolean includeMetadata) {
 
@@ -107,8 +110,18 @@ public class ArbitraryResource {
 				throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_CRITERIA, "identifier cannot be specified when requesting a default resource");
 			}
 
+			// Load filter from list if needed
+			List<String> names = null;
+			if (nameFilter != null) {
+				names = ResourceListManager.getInstance().getStringsInList(nameFilter);
+				if (names.isEmpty()) {
+					// List doesn't exist or is empty - so there will be no matches
+					return new ArrayList<>();
+				}
+			}
+
 			List<ArbitraryResourceInfo> resources = repository.getArbitraryRepository()
-					.getArbitraryResources(service, identifier, null, defaultRes, limit, offset, reverse);
+					.getArbitraryResources(service, identifier, names, defaultRes, limit, offset, reverse);
 
 			if (resources == null) {
 				return new ArrayList<>();
@@ -216,7 +229,7 @@ public class ArbitraryResource {
 				String name = creatorName.name;
 				if (name != null) {
 					List<ArbitraryResourceInfo> resources = repository.getArbitraryRepository()
-							.getArbitraryResources(service, identifier, name, defaultRes, null, null, reverse);
+							.getArbitraryResources(service, identifier, Arrays.asList(name), defaultRes, null, null, reverse);
 
 					if (includeStatus != null && includeStatus) {
 						resources = this.addStatusToResources(resources);
@@ -254,7 +267,7 @@ public class ArbitraryResource {
 															@QueryParam("build") Boolean build) {
 
 		Security.requirePriorAuthorizationOrApiKey(request, name, service, null);
-		return this.getStatus(service, name, null, build);
+		return ArbitraryTransactionUtils.getStatus(service, name, null, build);
 	}
 
 	@GET
@@ -276,7 +289,7 @@ public class ArbitraryResource {
 													 @QueryParam("build") Boolean build) {
 
 		Security.requirePriorAuthorizationOrApiKey(request, name, service, identifier);
-		return this.getStatus(service, name, identifier, build);
+		return ArbitraryTransactionUtils.getStatus(service, name, identifier, build);
 	}
 
 
@@ -1247,24 +1260,6 @@ public class ArbitraryResource {
 	}
 
 
-	private ArbitraryResourceStatus getStatus(Service service, String name, String identifier, Boolean build) {
-
-		// If "build=true" has been specified in the query string, build the resource before returning its status
-		if (build != null && build == true) {
-			ArbitraryDataReader reader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service, null);
-			try {
-				if (!reader.isBuilding()) {
-					reader.loadSynchronously(false);
-				}
-			} catch (Exception e) {
-				// No need to handle exception, as it will be reflected in the status
-			}
-		}
-
-		ArbitraryDataResource resource = new ArbitraryDataResource(name, ResourceIdType.NAME, service, identifier);
-		return resource.getStatus(false);
-	}
-
 	private List<ArbitraryResourceInfo> addStatusToResources(List<ArbitraryResourceInfo> resources) {
 		// Determine and add the status of each resource
 		List<ArbitraryResourceInfo> updatedResources = new ArrayList<>();

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

@@ -69,6 +69,7 @@ public class ChatResource {
 	public List<ChatMessage> searchChat(@QueryParam("before") Long before, @QueryParam("after") Long after,
 			@QueryParam("txGroupId") Integer txGroupId,
 			@QueryParam("involving") List<String> involvingAddresses,
+			@QueryParam("reference") String reference,
 			@Parameter(ref = "limit") @QueryParam("limit") Integer limit,
 			@Parameter(ref = "offset") @QueryParam("offset") Integer offset,
 			@Parameter(ref = "reverse") @QueryParam("reverse") Boolean reverse) {
@@ -87,11 +88,16 @@ public class ChatResource {
 		if (after != null && after < 1500000000000L)
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
 
+		byte[] referenceBytes = null;
+		if (reference != null)
+			referenceBytes = Base58.decode(reference);
+
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			return repository.getChatRepository().getMessagesMatchingCriteria(
 					before,
 					after,
 					txGroupId,
+					referenceBytes,
 					involvingAddresses,
 					limit, offset, reverse);
 		} catch (DataException e) {
@@ -99,6 +105,38 @@ public class ChatResource {
 		}
 	}
 
+	@GET
+	@Path("/message/{signature}")
+	@Operation(
+			summary = "Find chat message by signature",
+			responses = {
+					@ApiResponse(
+							description = "CHAT message",
+							content = @Content(
+										schema = @Schema(
+												implementation = ChatMessage.class
+										)
+							)
+					)
+			}
+	)
+	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.REPOSITORY_ISSUE})
+	public ChatMessage getMessageBySignature(@PathParam("signature") String signature58) {
+		byte[] signature = Base58.decode(signature58);
+
+		try (final Repository repository = RepositoryManager.getRepository()) {
+
+			ChatTransactionData chatTransactionData = (ChatTransactionData) repository.getTransactionRepository().fromSignature(signature);
+			if (chatTransactionData == null) {
+				throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_CRITERIA, "Message not found");
+			}
+
+			return repository.getChatRepository().toChatMessage(chatTransactionData);
+		} catch (DataException e) {
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
+		}
+	}
+
 	@GET
 	@Path("/active/{address}")
 	@Operation(

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

@@ -1,5 +1,6 @@
 package org.qortal.api.resource;
 
+import com.google.common.hash.HashCode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,8 +8,11 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.locks.ReentrantLock;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -21,6 +25,7 @@ import org.bitcoinj.core.*;
 import org.bitcoinj.script.Script;
 import org.qortal.api.*;
 import org.qortal.api.model.CrossChainBitcoinyHTLCStatus;
+import org.qortal.controller.Controller;
 import org.qortal.crosschain.*;
 import org.qortal.crypto.Crypto;
 import org.qortal.data.at.ATData;
@@ -284,6 +289,12 @@ public class CrossChainHtlcResource {
 					continue;
 				}
 
+				Bitcoiny bitcoiny = (Bitcoiny) acct.getBlockchain();
+				if (Objects.equals(bitcoiny.getCurrencyCode(), "ARRR")) {
+					LOGGER.info("Skipping AT {} because ARRR is currently unsupported", atAddress);
+					continue;
+				}
+
 				CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
 				if (crossChainTradeData == null) {
 					LOGGER.info("Couldn't find crosschain trade data for AT {}", atAddress);
@@ -363,10 +374,6 @@ public class CrossChainHtlcResource {
 			// Use secret-A to redeem P2SH-A
 
 			Bitcoiny bitcoiny = (Bitcoiny) acct.getBlockchain();
-			if (bitcoiny.getClass() == Bitcoin.class) {
-				LOGGER.info("Redeeming a Bitcoin HTLC is not yet supported");
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-			}
 
 			int lockTime = crossChainTradeData.lockTimeA;
 			byte[] redeemScriptA = BitcoinyHTLC.buildScript(crossChainTradeData.partnerForeignPKH, lockTime, crossChainTradeData.creatorForeignPKH, crossChainTradeData.hashOfSecretA);
@@ -574,7 +581,7 @@ public class CrossChainHtlcResource {
 			// If the AT is "finished" then it will have a zero balance
 			// In these cases we should avoid HTLC refunds if tbe QORT haven't been returned to the seller
 			if (atData.getIsFinished() && crossChainTradeData.mode != AcctMode.REFUNDED && crossChainTradeData.mode != AcctMode.CANCELLED) {
-				LOGGER.info(String.format("Skipping AT %s because the QORT has already been redemed", atAddress));
+				LOGGER.info(String.format("Skipping AT %s because the QORT has already been redeemed by the buyer", atAddress));
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
 			}
 
@@ -584,11 +591,6 @@ public class CrossChainHtlcResource {
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
 
 			Bitcoiny bitcoiny = (Bitcoiny) acct.getBlockchain();
-			if (bitcoiny.getClass() == Bitcoin.class) {
-				LOGGER.info("Refunding a Bitcoin HTLC is not yet supported");
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-			}
-
 			int lockTime = tradeBotData.getLockTimeA();
 
 			// We can't refund P2SH-A until lockTime-A has passed
@@ -600,15 +602,26 @@ public class CrossChainHtlcResource {
 			if (medianBlockTime <= lockTime)
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_TOO_SOON);
 
-			byte[] redeemScriptA = BitcoinyHTLC.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTime, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
-			String p2shAddressA = bitcoiny.deriveP2shAddress(redeemScriptA);
-			LOGGER.info(String.format("Refunding P2SH address: %s", p2shAddressA));
-
 			// Fee for redeem/refund is subtracted from P2SH-A balance.
 			long feeTimestamp = calcFeeTimestamp(lockTime, crossChainTradeData.tradeTimeout);
 			long p2shFee = bitcoiny.getP2shFee(feeTimestamp);
 			long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(bitcoiny.getBlockchainProvider(), p2shAddressA, minimumAmountA);
+
+			// Create redeem script based on destination chain
+			byte[] redeemScriptA;
+			String p2shAddressA;
+			BitcoinyHTLC.Status htlcStatusA;
+			if (Objects.equals(bitcoiny.getCurrencyCode(), "ARRR")) {
+				redeemScriptA = PirateChainHTLC.buildScript(tradeBotData.getTradeForeignPublicKey(), lockTime, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
+				p2shAddressA = PirateChain.getInstance().deriveP2shAddressBPrefix(redeemScriptA);
+				htlcStatusA = PirateChainHTLC.determineHtlcStatus(bitcoiny.getBlockchainProvider(), p2shAddressA, minimumAmountA);
+			}
+			else {
+				redeemScriptA = BitcoinyHTLC.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTime, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
+				p2shAddressA = bitcoiny.deriveP2shAddress(redeemScriptA);
+				htlcStatusA = BitcoinyHTLC.determineHtlcStatus(bitcoiny.getBlockchainProvider(), p2shAddressA, minimumAmountA);
+			}
+			LOGGER.info(String.format("Refunding P2SH address: %s", p2shAddressA));
 
 			switch (htlcStatusA) {
 				case UNFUNDED:
@@ -625,18 +638,45 @@ public class CrossChainHtlcResource {
 
 				case FUNDED:{
 					Coin refundAmount = Coin.valueOf(crossChainTradeData.expectedForeignAmount);
-					ECKey refundKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
-					List<TransactionOutput> fundingOutputs = bitcoiny.getUnspentOutputs(p2shAddressA);
 
-					// Validate the destination foreign blockchain address
-					Address receiving = Address.fromString(bitcoiny.getNetworkParameters(), receiveAddress);
-					if (receiving.getOutputScriptType() != Script.ScriptType.P2PKH)
-						throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
+					if (Objects.equals(bitcoiny.getCurrencyCode(), "ARRR")) {
+						// Pirate Chain custom integration
 
-					Transaction p2shRefundTransaction = BitcoinyHTLC.buildRefundTransaction(bitcoiny.getNetworkParameters(), refundAmount, refundKey,
-							fundingOutputs, redeemScriptA, lockTime, receiving.getHash());
+						PirateChain pirateChain = PirateChain.getInstance();
+						String p2shAddressT3 = pirateChain.deriveP2shAddress(redeemScriptA);
+
+						// Get funding txid
+						String fundingTxidHex = PirateChainHTLC.getUnspentFundingTxid(pirateChain.getBlockchainProvider(), p2shAddressA, minimumAmountA);
+						if (fundingTxidHex == null) {
+							throw new ForeignBlockchainException("Missing funding txid when refunding P2SH");
+						}
+						String fundingTxid58 = Base58.encode(HashCode.fromString(fundingTxidHex).asBytes());
+
+						byte[] privateKey = tradeBotData.getTradePrivateKey();
+						String privateKey58 = Base58.encode(privateKey);
+						String redeemScript58 = Base58.encode(redeemScriptA);
+
+						String txid = PirateChain.getInstance().refundP2sh(p2shAddressT3,
+								receiveAddress, refundAmount.value, redeemScript58, fundingTxid58, lockTime, privateKey58);
+						LOGGER.info("Refund txid: {}", txid);
+					}
+					else {
+						// ElectrumX coins
+
+						ECKey refundKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
+						List<TransactionOutput> fundingOutputs = bitcoiny.getUnspentOutputs(p2shAddressA);
+
+						// Validate the destination foreign blockchain address
+						Address receiving = Address.fromString(bitcoiny.getNetworkParameters(), receiveAddress);
+						if (receiving.getOutputScriptType() != Script.ScriptType.P2PKH)
+							throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
+
+						Transaction p2shRefundTransaction = BitcoinyHTLC.buildRefundTransaction(bitcoiny.getNetworkParameters(), refundAmount, refundKey,
+								fundingOutputs, redeemScriptA, lockTime, receiving.getHash());
+
+						bitcoiny.broadcastTransaction(p2shRefundTransaction);
+					}
 
-					bitcoiny.broadcastTransaction(p2shRefundTransaction);
 					return true;
 				}
 			}

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

@@ -0,0 +1,229 @@
+package org.qortal.api.resource;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.qortal.api.ApiError;
+import org.qortal.api.ApiErrors;
+import org.qortal.api.ApiExceptionFactory;
+import org.qortal.api.Security;
+import org.qortal.api.model.crosschain.PirateChainSendRequest;
+import org.qortal.crosschain.ForeignBlockchainException;
+import org.qortal.crosschain.PirateChain;
+import org.qortal.crosschain.SimpleTransaction;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+@Path("/crosschain/arrr")
+@Tag(name = "Cross-Chain (Pirate Chain)")
+public class CrossChainPirateChainResource {
+
+	@Context
+	HttpServletRequest request;
+
+	@POST
+	@Path("/walletbalance")
+	@Operation(
+		summary = "Returns ARRR balance",
+		description = "Supply 32 bytes of entropy, Base58 encoded",
+		requestBody = @RequestBody(
+			required = true,
+			content = @Content(
+				mediaType = MediaType.TEXT_PLAIN,
+				schema = @Schema(
+						type = "string",
+						description = "32 bytes of entropy, Base58 encoded",
+						example = "5oSXF53qENtdUyKhqSxYzP57m6RhVFP9BJKRr9E5kRGV"
+				)
+			)
+		),
+		responses = {
+			@ApiResponse(
+				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string", description = "balance (satoshis)"))
+			)
+		}
+	)
+	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
+	@SecurityRequirement(name = "apiKey")
+	public String getPirateChainWalletBalance(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String entropy58) {
+		Security.checkApiCallAllowed(request);
+
+		PirateChain pirateChain = PirateChain.getInstance();
+
+		try {
+			Long balance = pirateChain.getWalletBalance(entropy58);
+			if (balance == null)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
+
+			return balance.toString();
+
+		} catch (ForeignBlockchainException e) {
+			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE, e.getMessage());
+		}
+	}
+
+	@POST
+	@Path("/wallettransactions")
+	@Operation(
+		summary = "Returns transactions",
+		description = "Supply 32 bytes of entropy, Base58 encoded",
+		requestBody = @RequestBody(
+			required = true,
+			content = @Content(
+				mediaType = MediaType.TEXT_PLAIN,
+				schema = @Schema(
+						type = "string",
+						description = "32 bytes of entropy, Base58 encoded",
+						example = "5oSXF53qENtdUyKhqSxYzP57m6RhVFP9BJKRr9E5kRGV"
+				)
+			)
+		),
+		responses = {
+			@ApiResponse(
+				content = @Content(array = @ArraySchema( schema = @Schema( implementation = SimpleTransaction.class ) ) )
+			)
+		}
+	)
+	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
+	@SecurityRequirement(name = "apiKey")
+	public List<SimpleTransaction> getPirateChainWalletTransactions(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String entropy58) {
+		Security.checkApiCallAllowed(request);
+
+		PirateChain pirateChain = PirateChain.getInstance();
+
+		try {
+			return pirateChain.getWalletTransactions(entropy58);
+		} catch (ForeignBlockchainException e) {
+			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE, e.getMessage());
+		}
+	}
+
+	@POST
+	@Path("/send")
+	@Operation(
+		summary = "Sends ARRR from wallet",
+		description = "Currently supports 'legacy' P2PKH PirateChain addresses and Native SegWit (P2WPKH) addresses. Supply BIP32 'm' private key in base58, starting with 'xprv' for mainnet, 'tprv' for testnet",
+		requestBody = @RequestBody(
+			required = true,
+			content = @Content(
+				mediaType = MediaType.TEXT_PLAIN,
+				schema = @Schema(
+						type = "string",
+						description = "32 bytes of entropy, Base58 encoded",
+						example = "5oSXF53qENtdUyKhqSxYzP57m6RhVFP9BJKRr9E5kRGV"
+				)
+			)
+		),
+		responses = {
+			@ApiResponse(
+				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string", description = "transaction hash"))
+			)
+		}
+	)
+	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
+	@SecurityRequirement(name = "apiKey")
+	public String sendBitcoin(@HeaderParam(Security.API_KEY_HEADER) String apiKey, PirateChainSendRequest pirateChainSendRequest) {
+		Security.checkApiCallAllowed(request);
+
+		if (pirateChainSendRequest.arrrAmount <= 0)
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
+
+		if (pirateChainSendRequest.feePerByte != null && pirateChainSendRequest.feePerByte <= 0)
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
+
+		PirateChain pirateChain = PirateChain.getInstance();
+
+		try {
+			return pirateChain.sendCoins(pirateChainSendRequest);
+
+		} catch (ForeignBlockchainException e) {
+			// TODO
+			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE, e.getMessage());
+		}
+	}
+
+
+	@POST
+	@Path("/walletaddress")
+	@Operation(
+			summary = "Returns main wallet address",
+			description = "Supply 32 bytes of entropy, Base58 encoded",
+			requestBody = @RequestBody(
+					required = true,
+					content = @Content(
+							mediaType = MediaType.TEXT_PLAIN,
+							schema = @Schema(
+									type = "string",
+									description = "32 bytes of entropy, Base58 encoded",
+									example = "5oSXF53qENtdUyKhqSxYzP57m6RhVFP9BJKRr9E5kRGV"
+							)
+					)
+			),
+			responses = {
+					@ApiResponse(
+							content = @Content(array = @ArraySchema( schema = @Schema( implementation = SimpleTransaction.class ) ) )
+					)
+			}
+	)
+	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
+	@SecurityRequirement(name = "apiKey")
+	public String getPirateChainWalletAddress(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String entropy58) {
+		Security.checkApiCallAllowed(request);
+
+		PirateChain pirateChain = PirateChain.getInstance();
+
+		try {
+			return pirateChain.getWalletAddress(entropy58);
+		} catch (ForeignBlockchainException e) {
+			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE, e.getMessage());
+		}
+	}
+
+
+	@POST
+	@Path("/syncstatus")
+	@Operation(
+			summary = "Returns synchronization status",
+			description = "Supply 32 bytes of entropy, Base58 encoded",
+			requestBody = @RequestBody(
+					required = true,
+					content = @Content(
+							mediaType = MediaType.TEXT_PLAIN,
+							schema = @Schema(
+									type = "string",
+									description = "32 bytes of entropy, Base58 encoded",
+									example = "5oSXF53qENtdUyKhqSxYzP57m6RhVFP9BJKRr9E5kRGV"
+							)
+					)
+			),
+			responses = {
+					@ApiResponse(
+							content = @Content(array = @ArraySchema( schema = @Schema( implementation = SimpleTransaction.class ) ) )
+					)
+			}
+	)
+	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
+	@SecurityRequirement(name = "apiKey")
+	public String getPirateChainSyncStatus(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String entropy58) {
+		Security.checkApiCallAllowed(request);
+
+		PirateChain pirateChain = PirateChain.getInstance();
+
+		try {
+			return pirateChain.getSyncStatus(entropy58);
+		} catch (ForeignBlockchainException e) {
+			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE, e.getMessage());
+		}
+	}
+}

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

@@ -155,7 +155,7 @@ public class CrossChainTradeBotResource {
 
 			return Base58.encode(unsignedBytes);
 		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
+			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.REPOSITORY_ISSUE, e.getMessage());
 		}
 	}
 
@@ -240,7 +240,7 @@ public class CrossChainTradeBotResource {
 					return "false";
 			}
 		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
+			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.REPOSITORY_ISSUE, e.getMessage());
 		}
 	}
 

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

@@ -748,7 +748,7 @@ public class TransactionsResource {
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_SIGNATURE);
 
 			ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
-			if (!blockchainLock.tryLock(30, TimeUnit.SECONDS))
+			if (!blockchainLock.tryLock(60, TimeUnit.SECONDS))
 				throw createTransactionInvalidException(request, ValidationResult.NO_BLOCKCHAIN_LOCK);
 
 			try {

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

@@ -46,6 +46,7 @@ public class ChatMessagesWebSocket extends ApiWebSocket {
 						null,
 						txGroupId,
 						null,
+						null,
 						null, null, null);
 
 				sendMessages(session, chatMessages);
@@ -72,6 +73,7 @@ public class ChatMessagesWebSocket extends ApiWebSocket {
 					null,
 					null,
 					null,
+					null,
 					involvingAddresses,
 					null, null, null);
 

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

@@ -2,10 +2,7 @@ package org.qortal.api.websocket;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import org.eclipse.jetty.websocket.api.Session;
@@ -85,6 +82,7 @@ public class TradeBotWebSocket extends ApiWebSocket implements Listener {
 	@Override
 	public void onWebSocketConnect(Session session) {
 		Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
+		final boolean excludeInitialData = queryParams.get("excludeInitialData") != null;
 
 		List<String> foreignBlockchains = queryParams.get("foreignBlockchain");
 		final String foreignBlockchain = foreignBlockchains == null ? null : foreignBlockchains.get(0);
@@ -98,15 +96,22 @@ public class TradeBotWebSocket extends ApiWebSocket implements Listener {
 		// save session's preferred blockchain (if any)
 		sessionBlockchain.put(session, foreignBlockchain);
 
-		// Send all known trade-bot entries
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			List<TradeBotData> tradeBotEntries = repository.getCrossChainRepository().getAllTradeBotData();
 
-			// Optional filtering
-			if (foreignBlockchain != null)
-				tradeBotEntries = tradeBotEntries.stream()
-						.filter(tradeBotData -> tradeBotData.getForeignBlockchain().equals(foreignBlockchain))
-						.collect(Collectors.toList());
+
+		// Maybe send all known trade-bot entries
+		try (final Repository repository = RepositoryManager.getRepository()) {
+			List<TradeBotData> tradeBotEntries = new ArrayList<>();
+
+			// We might need to exclude the initial data from the response
+			if (!excludeInitialData) {
+				tradeBotEntries = repository.getCrossChainRepository().getAllTradeBotData();
+
+				// Optional filtering
+				if (foreignBlockchain != null)
+					tradeBotEntries = tradeBotEntries.stream()
+							.filter(tradeBotData -> tradeBotData.getForeignBlockchain().equals(foreignBlockchain))
+							.collect(Collectors.toList());
+			}
 
 			if (!sendEntries(session, tradeBotEntries)) {
 				session.close(4002, "websocket issue");

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

@@ -173,6 +173,7 @@ public class TradeOffersWebSocket extends ApiWebSocket implements Listener {
 	public void onWebSocketConnect(Session session) {
 		Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
 		final boolean includeHistoric = queryParams.get("includeHistoric") != null;
+		final boolean excludeInitialData = queryParams.get("excludeInitialData") != null;
 
 		List<String> foreignBlockchains = queryParams.get("foreignBlockchain");
 		final String foreignBlockchain = foreignBlockchains == null ? null : foreignBlockchains.get(0);
@@ -189,20 +190,23 @@ public class TradeOffersWebSocket extends ApiWebSocket implements Listener {
 
 		List<CrossChainOfferSummary> crossChainOfferSummaries = new ArrayList<>();
 
-		synchronized (cachedInfoByBlockchain) {
-			Collection<CachedOfferInfo> cachedInfos;
+		// We might need to exclude the initial data from the response
+		if (!excludeInitialData) {
+			synchronized (cachedInfoByBlockchain) {
+				Collection<CachedOfferInfo> cachedInfos;
 
-			if (foreignBlockchain == null)
-				// No preferred blockchain, so iterate through all of them
-				cachedInfos = cachedInfoByBlockchain.values();
-			else
-				cachedInfos = Collections.singleton(cachedInfoByBlockchain.computeIfAbsent(foreignBlockchain, k -> new CachedOfferInfo()));
+				if (foreignBlockchain == null)
+					// No preferred blockchain, so iterate through all of them
+					cachedInfos = cachedInfoByBlockchain.values();
+				else
+					cachedInfos = Collections.singleton(cachedInfoByBlockchain.computeIfAbsent(foreignBlockchain, k -> new CachedOfferInfo()));
 
-			for (CachedOfferInfo cachedInfo : cachedInfos) {
-				crossChainOfferSummaries.addAll(cachedInfo.currentSummaries.values());
+				for (CachedOfferInfo cachedInfo : cachedInfos) {
+					crossChainOfferSummaries.addAll(cachedInfo.currentSummaries.values());
 
-				if (includeHistoric)
-					crossChainOfferSummaries.addAll(cachedInfo.historicSummaries.values());
+					if (includeHistoric)
+						crossChainOfferSummaries.addAll(cachedInfo.historicSummaries.values());
+				}
 			}
 		}
 

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

@@ -65,11 +65,15 @@ public class TradePresenceWebSocket extends ApiWebSocket implements Listener {
 	@Override
 	public void onWebSocketConnect(Session session) {
 		Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
+		final boolean excludeInitialData = queryParams.get("excludeInitialData") != null;
 
-		List<TradePresenceData> tradePresences;
+		List<TradePresenceData> tradePresences = new ArrayList<>();
 
-		synchronized (currentEntries) {
-			tradePresences = List.copyOf(currentEntries.values());
+		// We might need to exclude the initial data from the response
+		if (!excludeInitialData) {
+			synchronized (currentEntries) {
+				tradePresences = List.copyOf(currentEntries.values());
+			}
 		}
 
 		if (!sendTradePresences(session, tradePresences)) {

src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java

@@ -170,6 +170,7 @@ public class ArbitraryDataReader {
             this.validate();
 
         } catch (DataException e) {
+            LOGGER.info("DataException when trying to load QDN resource", e);
             this.deleteWorkingDirectory();
             throw new DataException(e.getMessage());
 
@@ -208,8 +209,13 @@ public class ArbitraryDataReader {
      * serve a cached version of the resource for subsequent requests.
      * @throws IOException
      */
-    private void deleteWorkingDirectory() throws IOException {
-        FilesystemUtils.safeDeleteDirectory(this.workingPath, true);
+    private void deleteWorkingDirectory() {
+        try {
+            FilesystemUtils.safeDeleteDirectory(this.workingPath, true);
+        } catch (IOException e) {
+            // Ignore failures as this isn't an essential step
+            LOGGER.info("Unable to delete working path {}: {}", this.workingPath, e.getMessage());
+        }
     }
 
     private void createUncompressedDirectory() throws DataException {
@@ -408,6 +414,7 @@ public class ArbitraryDataReader {
             this.decryptUsingAlgo("AES/CBC/PKCS5Padding");
 
         } catch (DataException e) {
+            LOGGER.info("Unable to decrypt using specific parameters: {}", e.getMessage());
             // Something went wrong, so fall back to default AES params (necessary for legacy resource support)
             this.decryptUsingAlgo("AES");
 
@@ -420,8 +427,9 @@ public class ArbitraryDataReader {
         byte[] secret = this.secret58 != null ? Base58.decode(this.secret58) : null;
         if (secret != null && secret.length == Transformer.AES256_LENGTH) {
             try {
+                LOGGER.info("Decrypting using algorithm {}...", algorithm);
                 Path unencryptedPath = Paths.get(this.workingPath.toString(), "zipped.zip");
-                SecretKey aesKey = new SecretKeySpec(secret, 0, secret.length, algorithm);
+                SecretKey aesKey = new SecretKeySpec(secret, 0, secret.length, "AES");
                 AES.decryptFile(algorithm, aesKey, this.filePath.toString(), unencryptedPath.toString());
 
                 // Replace filePath pointer with the encrypted file path
@@ -430,7 +438,8 @@ public class ArbitraryDataReader {
 
             } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException | NoSuchPaddingException
                     | BadPaddingException | IllegalBlockSizeException | IOException | InvalidKeyException e) {
-                throw new DataException(String.format("Unable to decrypt file at path %s: %s", this.filePath, e.getMessage()));
+                LOGGER.info(String.format("Exception when decrypting using algorithm %s", algorithm), e);
+                throw new DataException(String.format("Unable to decrypt file at path %s using algorithm %s: %s", this.filePath, algorithm, e.getMessage()));
             }
         } else {
             // Assume it is unencrypted. This will be the case when we have built a custom path by combining
@@ -477,7 +486,12 @@ public class ArbitraryDataReader {
         // Delete original compressed file
         if (FilesystemUtils.pathInsideDataOrTempPath(this.filePath)) {
             if (Files.exists(this.filePath)) {
-                Files.delete(this.filePath);
+                try {
+                    Files.delete(this.filePath);
+                } catch (IOException e) {
+                    // Ignore failures as this isn't an essential step
+                    LOGGER.info("Unable to delete file at path {}", this.filePath);
+                }
             }
         }
 

src/main/java/org/qortal/arbitrary/misc/Service.java

@@ -1,16 +1,18 @@
 package org.qortal.arbitrary.misc;
 
+import org.apache.commons.io.FilenameUtils;
 import org.json.JSONObject;
 import org.qortal.arbitrary.ArbitraryDataRenderer;
 import org.qortal.transaction.Transaction;
 import org.qortal.utils.FilesystemUtils;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toMap;
@@ -38,6 +40,7 @@ public enum Service {
     GIT_REPOSITORY(300, false, null, null),
     IMAGE(400, true, 10*1024*1024L, null),
     THUMBNAIL(410, true, 500*1024L, null),
+    QCHAT_IMAGE(420, true, 500*1024L, null),
     VIDEO(500, false, null, null),
     AUDIO(600, false, null, null),
     BLOG(700, false, null, null),
@@ -48,7 +51,30 @@ public enum Service {
     PLAYLIST(910, true, null, null),
     APP(1000, false, null, null),
     METADATA(1100, false, null, null),
-    QORTAL_METADATA(1111, true, 10*1024L, Arrays.asList("title", "description", "tags"));
+    GIF_REPOSITORY(1200, true, 25*1024*1024L, null) {
+        @Override
+        public ValidationResult validate(Path path) {
+            // Custom validation function to require .gif files only, and at least 1
+            int gifCount = 0;
+            File[] files = path.toFile().listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    if (file.isDirectory()) {
+                        return ValidationResult.DIRECTORIES_NOT_ALLOWED;
+                    }
+                    String extension = FilenameUtils.getExtension(file.getName()).toLowerCase();
+                    if (!Objects.equals(extension, "gif")) {
+                        return ValidationResult.INVALID_FILE_EXTENSION;
+                    }
+                    gifCount++;
+                }
+            }
+            if (gifCount == 0) {
+                return ValidationResult.MISSING_DATA;
+            }
+            return ValidationResult.OK;
+        }
+    };
 
     public final int value;
     private final boolean requiresValidation;
@@ -114,7 +140,10 @@ public enum Service {
         OK(1),
         MISSING_KEYS(2),
         EXCEEDS_SIZE_LIMIT(3),
-        MISSING_INDEX_FILE(4);
+        MISSING_INDEX_FILE(4),
+        DIRECTORIES_NOT_ALLOWED(5),
+        INVALID_FILE_EXTENSION(6),
+        MISSING_DATA(7);
 
         public final int value;
 

src/main/java/org/qortal/block/Block.java

@@ -10,7 +10,6 @@ import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
-import java.text.MessageFormat;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -90,7 +89,8 @@ public class Block {
 		ONLINE_ACCOUNT_UNKNOWN(71),
 		ONLINE_ACCOUNT_SIGNATURES_MISSING(72),
 		ONLINE_ACCOUNT_SIGNATURES_MALFORMED(73),
-		ONLINE_ACCOUNT_SIGNATURE_INCORRECT(74);
+		ONLINE_ACCOUNT_SIGNATURE_INCORRECT(74),
+		ONLINE_ACCOUNT_NONCE_INCORRECT(75);
 
 		public final int value;
 
@@ -185,8 +185,11 @@ public class Block {
 			if (accountLevel <= 0)
 				return null; // level 0 isn't included in any share bins
 
+			// Select the correct set of share bins based on block height
 			final BlockChain blockChain = BlockChain.getInstance();
-			final AccountLevelShareBin[] shareBinsByLevel = blockChain.getShareBinsByAccountLevel();
+			final AccountLevelShareBin[] shareBinsByLevel = (blockHeight >= blockChain.getSharesByLevelV2Height()) ?
+					blockChain.getShareBinsByAccountLevelV2() : blockChain.getShareBinsByAccountLevelV1();
+
 			if (accountLevel > shareBinsByLevel.length)
 				return null;
 
@@ -363,10 +366,11 @@ public class Block {
 		long timestamp = calcTimestamp(parentBlockData, minter.getPublicKey(), minterLevel);
 		long onlineAccountsTimestamp = OnlineAccountsManager.getCurrentOnlineAccountTimestamp();
 
-		// Fetch our list of online accounts
+		// Fetch our list of online accounts, removing any that are missing a nonce
 		List<OnlineAccountData> onlineAccounts = OnlineAccountsManager.getInstance().getOnlineAccounts(onlineAccountsTimestamp);
+		onlineAccounts.removeIf(a -> a.getNonce() == null || a.getNonce() < 0);
 		if (onlineAccounts.isEmpty()) {
-			LOGGER.error("No online accounts - not even our own?");
+			LOGGER.debug("No online accounts - not even our own?");
 			return null;
 		}
 
@@ -394,24 +398,36 @@ public class Block {
 		byte[] encodedOnlineAccounts = BlockTransformer.encodeOnlineAccounts(onlineAccountsSet);
 		int onlineAccountsCount = onlineAccountsSet.size();
 
-		byte[] onlineAccountsSignatures;
-		if (timestamp >= BlockChain.getInstance().getAggregateSignatureTimestamp()) {
-			// Collate all signatures
-			Collection<byte[]> signaturesToAggregate = indexedOnlineAccounts.values()
-					.stream()
-					.map(OnlineAccountData::getSignature)
-					.collect(Collectors.toList());
+		// Collate all signatures
+		Collection<byte[]> signaturesToAggregate = indexedOnlineAccounts.values()
+				.stream()
+				.map(OnlineAccountData::getSignature)
+				.collect(Collectors.toList());
 
-			// Aggregated, single signature
-			onlineAccountsSignatures = Qortal25519Extras.aggregateSignatures(signaturesToAggregate);
-		} else {
-			// Concatenate online account timestamp signatures (in correct order)
-			onlineAccountsSignatures = new byte[onlineAccountsCount * Transformer.SIGNATURE_LENGTH];
+		// Aggregated, single signature
+		byte[] onlineAccountsSignatures = Qortal25519Extras.aggregateSignatures(signaturesToAggregate);
+
+		// Add nonces to the end of the online accounts signatures
+		try {
+			// Create ordered list of nonce values
+			List<Integer> nonces = new ArrayList<>();
 			for (int i = 0; i < onlineAccountsCount; ++i) {
 				Integer accountIndex = accountIndexes.get(i);
 				OnlineAccountData onlineAccountData = indexedOnlineAccounts.get(accountIndex);
-				System.arraycopy(onlineAccountData.getSignature(), 0, onlineAccountsSignatures, i * Transformer.SIGNATURE_LENGTH, Transformer.SIGNATURE_LENGTH);
+				nonces.add(onlineAccountData.getNonce());
 			}
+
+			// Encode the nonces to a byte array
+			byte[] encodedNonces = BlockTransformer.encodeOnlineAccountNonces(nonces);
+
+			// Append the encoded nonces to the encoded online account signatures
+			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+			outputStream.write(onlineAccountsSignatures);
+			outputStream.write(encodedNonces);
+			onlineAccountsSignatures = outputStream.toByteArray();
+		}
+		catch (TransformationException | IOException e) {
+			return null;
 		}
 
 		byte[] minterSignature = minter.sign(BlockTransformer.getBytesForMinterSignature(parentBlockData,
@@ -1021,58 +1037,63 @@ public class Block {
 		if (this.blockData.getOnlineAccountsSignatures() == null || this.blockData.getOnlineAccountsSignatures().length == 0)
 			return ValidationResult.ONLINE_ACCOUNT_SIGNATURES_MISSING;
 
-		if (this.blockData.getTimestamp() >= BlockChain.getInstance().getAggregateSignatureTimestamp()) {
-			// We expect just the one, aggregated signature
-			if (this.blockData.getOnlineAccountsSignatures().length != Transformer.SIGNATURE_LENGTH)
-				return ValidationResult.ONLINE_ACCOUNT_SIGNATURES_MALFORMED;
-		} else {
-			if (this.blockData.getOnlineAccountsSignatures().length != onlineRewardShares.size() * Transformer.SIGNATURE_LENGTH)
-				return ValidationResult.ONLINE_ACCOUNT_SIGNATURES_MALFORMED;
-		}
+		final int signaturesLength = Transformer.SIGNATURE_LENGTH;
+		final int noncesLength = onlineRewardShares.size() * Transformer.INT_LENGTH;
+
+		// We expect nonces to be appended to the online accounts signatures
+		if (this.blockData.getOnlineAccountsSignatures().length != signaturesLength + noncesLength)
+			return ValidationResult.ONLINE_ACCOUNT_SIGNATURES_MALFORMED;
 
 		// Check signatures
 		long onlineTimestamp = this.blockData.getOnlineAccountsTimestamp();
 		byte[] onlineTimestampBytes = Longs.toByteArray(onlineTimestamp);
 
-		// Extract online accounts' timestamp signatures from block data. Only one signature if aggregated.
-		List<byte[]> onlineAccountsSignatures = BlockTransformer.decodeTimestampSignatures(this.blockData.getOnlineAccountsSignatures());
+		byte[] encodedOnlineAccountSignatures = this.blockData.getOnlineAccountsSignatures();
 
-		if (this.blockData.getTimestamp() >= BlockChain.getInstance().getAggregateSignatureTimestamp()) {
-			// Aggregate all public keys
-			Collection<byte[]> publicKeys = onlineRewardShares.stream()
-					.map(RewardShareData::getRewardSharePublicKey)
-					.collect(Collectors.toList());
+		// Split online account signatures into signature(s) + nonces, then validate the nonces
+		byte[] extractedSignatures = BlockTransformer.extract(encodedOnlineAccountSignatures, 0, signaturesLength);
+		byte[] extractedNonces = BlockTransformer.extract(encodedOnlineAccountSignatures, signaturesLength, onlineRewardShares.size() * Transformer.INT_LENGTH);
+		encodedOnlineAccountSignatures = extractedSignatures;
 
-			byte[] aggregatePublicKey = Qortal25519Extras.aggregatePublicKeys(publicKeys);
+		List<Integer> nonces = BlockTransformer.decodeOnlineAccountNonces(extractedNonces);
 
-			byte[] aggregateSignature = onlineAccountsSignatures.get(0);
+		// Build block's view of online accounts (without signatures, as we don't need them here)
+		Set<OnlineAccountData> onlineAccounts = new HashSet<>();
+		for (int i = 0; i < onlineRewardShares.size(); ++i) {
+			Integer nonce = nonces.get(i);
+			byte[] publicKey = onlineRewardShares.get(i).getRewardSharePublicKey();
 
-			// One-step verification of aggregate signature using aggregate public key
-			if (!Qortal25519Extras.verifyAggregated(aggregatePublicKey, aggregateSignature, onlineTimestampBytes))
-				return ValidationResult.ONLINE_ACCOUNT_SIGNATURE_INCORRECT;
-		} else {
-			// Build block's view of online accounts
-			Set<OnlineAccountData> onlineAccounts = new HashSet<>();
-			for (int i = 0; i < onlineAccountsSignatures.size(); ++i) {
-				byte[] signature = onlineAccountsSignatures.get(i);
-				byte[] publicKey = onlineRewardShares.get(i).getRewardSharePublicKey();
-
-				OnlineAccountData onlineAccountData = new OnlineAccountData(onlineTimestamp, signature, publicKey);
-				onlineAccounts.add(onlineAccountData);
-			}
-
-			// Remove those already validated & cached by online accounts manager - no need to re-validate them
-			OnlineAccountsManager.getInstance().removeKnown(onlineAccounts, onlineTimestamp);
-
-			// Validate the rest
-			for (OnlineAccountData onlineAccount : onlineAccounts)
-				if (!Crypto.verify(onlineAccount.getPublicKey(), onlineAccount.getSignature(), onlineTimestampBytes))
-					return ValidationResult.ONLINE_ACCOUNT_SIGNATURE_INCORRECT;
-
-			// We've validated these, so allow online accounts manager to cache
-			OnlineAccountsManager.getInstance().addBlocksOnlineAccounts(onlineAccounts, onlineTimestamp);
+			OnlineAccountData onlineAccountData = new OnlineAccountData(onlineTimestamp, null, publicKey, nonce);
+			onlineAccounts.add(onlineAccountData);
 		}
 
+		// Remove those already validated & cached by online accounts manager - no need to re-validate them
+		OnlineAccountsManager.getInstance().removeKnown(onlineAccounts, onlineTimestamp);
+
+		// Validate the rest
+		for (OnlineAccountData onlineAccount : onlineAccounts)
+			if (!OnlineAccountsManager.getInstance().verifyMemoryPoW(onlineAccount, null))
+				return ValidationResult.ONLINE_ACCOUNT_NONCE_INCORRECT;
+
+		// Cache the valid online accounts as they will likely be needed for the next block
+		OnlineAccountsManager.getInstance().addBlocksOnlineAccounts(onlineAccounts, onlineTimestamp);
+
+		// Extract online accounts' timestamp signatures from block data. Only one signature if aggregated.
+		List<byte[]> onlineAccountsSignatures = BlockTransformer.decodeTimestampSignatures(encodedOnlineAccountSignatures);
+
+		// Aggregate all public keys
+		Collection<byte[]> publicKeys = onlineRewardShares.stream()
+				.map(RewardShareData::getRewardSharePublicKey)
+				.collect(Collectors.toList());
+
+		byte[] aggregatePublicKey = Qortal25519Extras.aggregatePublicKeys(publicKeys);
+
+		byte[] aggregateSignature = onlineAccountsSignatures.get(0);
+
+		// One-step verification of aggregate signature using aggregate public key
+		if (!Qortal25519Extras.verifyAggregated(aggregatePublicKey, aggregateSignature, onlineTimestampBytes))
+			return ValidationResult.ONLINE_ACCOUNT_SIGNATURE_INCORRECT;
+
 		// All online accounts valid, so save our list of online accounts for potential later use
 		this.cachedOnlineRewardShares = onlineRewardShares;
 
@@ -1220,6 +1241,7 @@ public class Block {
 				}
 			}
 		} catch (DataException e) {
+			LOGGER.info("DataException during transaction validation", e);
 			return ValidationResult.TRANSACTION_INVALID;
 		} finally {
 			// Rollback repository changes made by test-processing transactions above
@@ -1895,10 +1917,14 @@ public class Block {
 		final List<ExpandedAccount> onlineFounderAccounts = expandedAccounts.stream().filter(expandedAccount -> expandedAccount.isMinterFounder).collect(Collectors.toList());
 		final boolean haveFounders = !onlineFounderAccounts.isEmpty();
 
+		// Select the correct set of share bins based on block height
+		List<AccountLevelShareBin> accountLevelShareBinsForBlock = (this.blockData.getHeight() >= BlockChain.getInstance().getSharesByLevelV2Height()) ?
+				BlockChain.getInstance().getAccountLevelShareBinsV2() : BlockChain.getInstance().getAccountLevelShareBinsV1();
+
 		// Determine reward candidates based on account level
 		// This needs a deep copy, so the shares can be modified when tiers aren't activated yet
 		List<AccountLevelShareBin> accountLevelShareBins = new ArrayList<>();
-		for (AccountLevelShareBin accountLevelShareBin : BlockChain.getInstance().getAccountLevelShareBins()) {
+		for (AccountLevelShareBin accountLevelShareBin : accountLevelShareBinsForBlock) {
 			accountLevelShareBins.add((AccountLevelShareBin) accountLevelShareBin.clone());
 		}
 
@@ -1974,7 +2000,7 @@ public class Block {
 		// Fetch list of legacy QORA holders who haven't reached their cap of QORT reward.
 		List<EligibleQoraHolderData> qoraHolders = this.repository.getAccountRepository().getEligibleLegacyQoraHolders(isProcessingNotOrphaning ? null : this.blockData.getHeight());
 		final boolean haveQoraHolders = !qoraHolders.isEmpty();
-		final long qoraHoldersShare = BlockChain.getInstance().getQoraHoldersShare();
+		final long qoraHoldersShare = BlockChain.getInstance().getQoraHoldersShareAtHeight(this.blockData.getHeight());
 
 		// Perform account-level-based reward scaling if appropriate
 		if (!haveFounders) {

src/main/java/org/qortal/block/BlockChain.java

@@ -68,12 +68,13 @@ public class BlockChain {
 		atFindNextTransactionFix,
 		newBlockSigHeight,
 		shareBinFix,
+		sharesByLevelV2Height,
 		rewardShareLimitTimestamp,
 		calcChainWeightTimestamp,
 		transactionV5Timestamp,
 		transactionV6Timestamp,
 		disableReferenceTimestamp,
-		aggregateSignatureTimestamp;
+		increaseOnlineAccountsDifficultyTimestamp;
 	}
 
 	// Custom transaction fees
@@ -122,13 +123,19 @@ public class BlockChain {
 			return shareBinCopy;
 		}
 	}
-	private List<AccountLevelShareBin> sharesByLevel;
+	private List<AccountLevelShareBin> sharesByLevelV1;
+	private List<AccountLevelShareBin> sharesByLevelV2;
 	/** Generated lookup of share-bin by account level */
-	private AccountLevelShareBin[] shareBinsByLevel;
+	private AccountLevelShareBin[] shareBinsByLevelV1;
+	private AccountLevelShareBin[] shareBinsByLevelV2;
 
-	/** Share of block reward/fees to legacy QORA coin holders */
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	private Long qoraHoldersShare;
+	/** Share of block reward/fees to legacy QORA coin holders, by block height */
+	public static class ShareByHeight {
+		public int height;
+		@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
+		public long share;
+	}
+	private List<ShareByHeight> qoraHoldersShareByHeight;
 
 	/** How many legacy QORA per 1 QORT of block reward. */
 	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
@@ -366,12 +373,20 @@ public class BlockChain {
 		return this.rewardsByHeight;
 	}
 
-	public List<AccountLevelShareBin> getAccountLevelShareBins() {
-		return this.sharesByLevel;
+	public List<AccountLevelShareBin> getAccountLevelShareBinsV1() {
+		return this.sharesByLevelV1;
 	}
 
-	public AccountLevelShareBin[] getShareBinsByAccountLevel() {
-		return this.shareBinsByLevel;
+	public List<AccountLevelShareBin> getAccountLevelShareBinsV2() {
+		return this.sharesByLevelV2;
+	}
+
+	public AccountLevelShareBin[] getShareBinsByAccountLevelV1() {
+		return this.shareBinsByLevelV1;
+	}
+
+	public AccountLevelShareBin[] getShareBinsByAccountLevelV2() {
+		return this.shareBinsByLevelV2;
 	}
 
 	public List<Integer> getBlocksNeededByLevel() {
@@ -382,10 +397,6 @@ public class BlockChain {
 		return this.cumulativeBlocksByLevel;
 	}
 
-	public long getQoraHoldersShare() {
-		return this.qoraHoldersShare;
-	}
-
 	public long getQoraPerQortReward() {
 		return this.qoraPerQortReward;
 	}
@@ -444,6 +455,10 @@ public class BlockChain {
 		return this.featureTriggers.get(FeatureTrigger.shareBinFix.name()).intValue();
 	}
 
+	public int getSharesByLevelV2Height() {
+		return this.featureTriggers.get(FeatureTrigger.sharesByLevelV2Height.name()).intValue();
+	}
+
 	public long getRewardShareLimitTimestamp() {
 		return this.featureTriggers.get(FeatureTrigger.rewardShareLimitTimestamp.name()).longValue();
 	}
@@ -464,10 +479,11 @@ public class BlockChain {
 		return this.featureTriggers.get(FeatureTrigger.disableReferenceTimestamp.name()).longValue();
 	}
 
-	public long getAggregateSignatureTimestamp() {
-		return this.featureTriggers.get(FeatureTrigger.aggregateSignatureTimestamp.name()).longValue();
+	public long getIncreaseOnlineAccountsDifficultyTimestamp() {
+		return this.featureTriggers.get(FeatureTrigger.increaseOnlineAccountsDifficultyTimestamp.name()).longValue();
 	}
 
+
 	// More complex getters for aspects that change by height or timestamp
 
 	public long getRewardAtHeight(int ourHeight) {
@@ -504,6 +520,15 @@ public class BlockChain {
 		return 0;
 	}
 
+	public long getQoraHoldersShareAtHeight(int ourHeight) {
+		// Scan through for QORA share at our height
+		for (int i = qoraHoldersShareByHeight.size() - 1; i >= 0; --i)
+			if (qoraHoldersShareByHeight.get(i).height <= ourHeight)
+				return qoraHoldersShareByHeight.get(i).share;
+
+		return 0;
+	}
+
 	/** Validate blockchain config read from JSON */
 	private void validateConfig() {
 		if (this.genesisInfo == null)
@@ -512,11 +537,14 @@ public class BlockChain {
 		if (this.rewardsByHeight == null)
 			Settings.throwValidationError("No \"rewardsByHeight\" entry found in blockchain config");
 
-		if (this.sharesByLevel == null)
-			Settings.throwValidationError("No \"sharesByLevel\" entry found in blockchain config");
+		if (this.sharesByLevelV1 == null)
+			Settings.throwValidationError("No \"sharesByLevelV1\" entry found in blockchain config");
 
-		if (this.qoraHoldersShare == null)
-			Settings.throwValidationError("No \"qoraHoldersShare\" entry found in blockchain config");
+		if (this.sharesByLevelV2 == null)
+			Settings.throwValidationError("No \"sharesByLevelV2\" entry found in blockchain config");
+
+		if (this.qoraHoldersShareByHeight == null)
+			Settings.throwValidationError("No \"qoraHoldersShareByHeight\" entry found in blockchain config");
 
 		if (this.qoraPerQortReward == null)
 			Settings.throwValidationError("No \"qoraPerQortReward\" entry found in blockchain config");
@@ -553,13 +581,22 @@ public class BlockChain {
 			if (!this.featureTriggers.containsKey(featureTrigger.name()))
 				Settings.throwValidationError(String.format("Missing feature trigger \"%s\" in blockchain config", featureTrigger.name()));
 
-		// Check block reward share bounds
-		long totalShare = this.qoraHoldersShare;
+		// Check block reward share bounds (V1)
+		long totalShareV1 = this.qoraHoldersShareByHeight.get(0).share;
 		// Add share percents for account-level-based rewards
-		for (AccountLevelShareBin accountLevelShareBin : this.sharesByLevel)
-			totalShare += accountLevelShareBin.share;
+		for (AccountLevelShareBin accountLevelShareBin : this.sharesByLevelV1)
+			totalShareV1 += accountLevelShareBin.share;
 
-		if (totalShare < 0 || totalShare > 1_00000000L)
+		if (totalShareV1 < 0 || totalShareV1 > 1_00000000L)
+			Settings.throwValidationError("Total non-founder share out of bounds (0<x<1e8)");
+
+		// Check block reward share bounds (V2)
+		long totalShareV2 = this.qoraHoldersShareByHeight.get(1).share;
+		// Add share percents for account-level-based rewards
+		for (AccountLevelShareBin accountLevelShareBin : this.sharesByLevelV2)
+			totalShareV2 += accountLevelShareBin.share;
+
+		if (totalShareV2 < 0 || totalShareV2 > 1_00000000L)
 			Settings.throwValidationError("Total non-founder share out of bounds (0<x<1e8)");
 	}
 
@@ -575,23 +612,34 @@ public class BlockChain {
 				cumulativeBlocks += this.blocksNeededByLevel.get(level);
 		}
 
-		// Generate lookup-array for account-level share bins
-		AccountLevelShareBin lastAccountLevelShareBin = this.sharesByLevel.get(this.sharesByLevel.size() - 1);
-		final int lastLevel = lastAccountLevelShareBin.levels.get(lastAccountLevelShareBin.levels.size() - 1);
-		this.shareBinsByLevel = new AccountLevelShareBin[lastLevel];
-
-		for (AccountLevelShareBin accountLevelShareBin : this.sharesByLevel)
+		// Generate lookup-array for account-level share bins (V1)
+		AccountLevelShareBin lastAccountLevelShareBinV1 = this.sharesByLevelV1.get(this.sharesByLevelV1.size() - 1);
+		final int lastLevelV1 = lastAccountLevelShareBinV1.levels.get(lastAccountLevelShareBinV1.levels.size() - 1);
+		this.shareBinsByLevelV1 = new AccountLevelShareBin[lastLevelV1];
+		for (AccountLevelShareBin accountLevelShareBin : this.sharesByLevelV1)
 			for (int level : accountLevelShareBin.levels)
 				// level 1 stored at index 0, level 2 stored at index 1, etc.
 				// level 0 not allowed
-				this.shareBinsByLevel[level - 1] = accountLevelShareBin;
+				this.shareBinsByLevelV1[level - 1] = accountLevelShareBin;
+
+		// Generate lookup-array for account-level share bins (V2)
+		AccountLevelShareBin lastAccountLevelShareBinV2 = this.sharesByLevelV2.get(this.sharesByLevelV2.size() - 1);
+		final int lastLevelV2 = lastAccountLevelShareBinV2.levels.get(lastAccountLevelShareBinV2.levels.size() - 1);
+		this.shareBinsByLevelV2 = new AccountLevelShareBin[lastLevelV2];
+		for (AccountLevelShareBin accountLevelShareBin : this.sharesByLevelV2)
+			for (int level : accountLevelShareBin.levels)
+				// level 1 stored at index 0, level 2 stored at index 1, etc.
+				// level 0 not allowed
+				this.shareBinsByLevelV2[level - 1] = accountLevelShareBin;
 
 		// Convert collections to unmodifiable form
 		this.rewardsByHeight = Collections.unmodifiableList(this.rewardsByHeight);
-		this.sharesByLevel = Collections.unmodifiableList(this.sharesByLevel);
+		this.sharesByLevelV1 = Collections.unmodifiableList(this.sharesByLevelV1);
+		this.sharesByLevelV2 = Collections.unmodifiableList(this.sharesByLevelV2);
 		this.blocksNeededByLevel = Collections.unmodifiableList(this.blocksNeededByLevel);
 		this.cumulativeBlocksByLevel = Collections.unmodifiableList(this.cumulativeBlocksByLevel);
 		this.blockTimingsByHeight = Collections.unmodifiableList(this.blockTimingsByHeight);
+		this.qoraHoldersShareByHeight = Collections.unmodifiableList(this.qoraHoldersShareByHeight);
 	}
 
 	/**

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

@@ -26,6 +26,9 @@ import org.qortal.data.block.CommonBlockData;
 import org.qortal.data.transaction.TransactionData;
 import org.qortal.network.Network;
 import org.qortal.network.Peer;
+import org.qortal.network.message.BlockSummariesV2Message;
+import org.qortal.network.message.HeightV2Message;
+import org.qortal.network.message.Message;
 import org.qortal.repository.BlockRepository;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
@@ -90,6 +93,8 @@ public class BlockMinter extends Thread {
 
 		List<Block> newBlocks = new ArrayList<>();
 
+		final boolean isSingleNodeTestnet = Settings.getInstance().isSingleNodeTestnet();
+
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			// Going to need this a lot...
 			BlockRepository blockRepository = repository.getBlockRepository();
@@ -108,8 +113,9 @@ public class BlockMinter extends Thread {
 					// Free up any repository locks
 					repository.discardChanges();
 
-					// Sleep for a while
-					Thread.sleep(1000);
+					// Sleep for a while.
+					// It's faster on single node testnets, to allow lots of blocks to be minted quickly.
+					Thread.sleep(isSingleNodeTestnet ? 50 : 1000);
 
 					isMintingPossible = false;
 
@@ -220,9 +226,10 @@ public class BlockMinter extends Thread {
 					List<PrivateKeyAccount> newBlocksMintingAccounts = mintingAccountsData.stream().map(accountData -> new PrivateKeyAccount(repository, accountData.getPrivateKey())).collect(Collectors.toList());
 
 					// We might need to sit the next block out, if one of our minting accounts signed the previous one
+					// Skip this check for single node testnets, since they definitely need to mint every block
 					byte[] previousBlockMinter = previousBlockData.getMinterPublicKey();
 					boolean mintedLastBlock = mintingAccountsData.stream().anyMatch(mintingAccount -> Arrays.equals(mintingAccount.getPublicKey(), previousBlockMinter));
-					if (mintedLastBlock) {
+					if (mintedLastBlock && !isSingleNodeTestnet) {
 						LOGGER.trace(String.format("One of our keys signed the last block, so we won't sign the next one"));
 						continue;
 					}
@@ -241,7 +248,7 @@ public class BlockMinter extends Thread {
 							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"));
+								moderatedLog(() -> LOGGER.info("Couldn't build a to-be-minted block"));
 								continue;
 							}
 
@@ -433,11 +440,9 @@ public class BlockMinter extends Thread {
 
 					if (newBlockMinted) {
 						// Broadcast our new chain to network
-						BlockData newBlockData = newBlock.getBlockData();
-
-						Network network = Network.getInstance();
-						network.broadcast(broadcastPeer -> network.buildHeightMessage(broadcastPeer, newBlockData));
+						Network.getInstance().broadcastOurChain();
 					}
+
 				} catch (InterruptedException e) {
 					// We've been interrupted - time to exit
 					return;

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

@@ -45,7 +45,6 @@ import org.qortal.data.account.AccountData;
 import org.qortal.data.block.BlockData;
 import org.qortal.data.block.BlockSummaryData;
 import org.qortal.data.naming.NameData;
-import org.qortal.data.network.PeerChainTipData;
 import org.qortal.data.network.PeerData;
 import org.qortal.data.transaction.ChatTransactionData;
 import org.qortal.data.transaction.TransactionData;
@@ -317,6 +316,10 @@ public class Controller extends Thread {
 		}
 	}
 
+	public static long uptime() {
+		return System.currentTimeMillis() - Controller.startTime;
+	}
+
 	/** Returns highest block, or null if it's not available. */
 	public BlockData getChainTip() {
 		synchronized (this.latestBlocks) {
@@ -497,6 +500,9 @@ public class Controller extends Thread {
 			AutoUpdate.getInstance().start();
 		}
 
+		LOGGER.info("Starting wallets");
+		PirateChainWalletController.getInstance().start();
+
 		LOGGER.info(String.format("Starting API on port %d", Settings.getInstance().getApiPort()));
 		try {
 			ApiService apiService = ApiService.getInstance();
@@ -724,25 +730,25 @@ public class Controller extends Thread {
 
 	public static final Predicate<Peer> hasNoRecentBlock = peer -> {
 		final Long minLatestBlockTimestamp = getMinimumLatestBlockTimestamp();
-		final PeerChainTipData peerChainTipData = peer.getChainTipData();
-		return peerChainTipData == null || peerChainTipData.getLastBlockTimestamp() == null || peerChainTipData.getLastBlockTimestamp() < minLatestBlockTimestamp;
+		final BlockSummaryData peerChainTipData = peer.getChainTipData();
+		return peerChainTipData == null || peerChainTipData.getTimestamp() == null || peerChainTipData.getTimestamp() < minLatestBlockTimestamp;
 	};
 
 	public static final Predicate<Peer> hasNoOrSameBlock = peer -> {
 		final BlockData latestBlockData = getInstance().getChainTip();
-		final PeerChainTipData peerChainTipData = peer.getChainTipData();
-		return peerChainTipData == null || peerChainTipData.getLastBlockSignature() == null || Arrays.equals(latestBlockData.getSignature(), peerChainTipData.getLastBlockSignature());
+		final BlockSummaryData peerChainTipData = peer.getChainTipData();
+		return peerChainTipData == null || peerChainTipData.getSignature() == null || Arrays.equals(latestBlockData.getSignature(), peerChainTipData.getSignature());
 	};
 
 	public static final Predicate<Peer> hasOnlyGenesisBlock = peer -> {
-		final PeerChainTipData peerChainTipData = peer.getChainTipData();
-		return peerChainTipData == null || peerChainTipData.getLastHeight() == null || peerChainTipData.getLastHeight() == 1;
+		final BlockSummaryData peerChainTipData = peer.getChainTipData();
+		return peerChainTipData == null || peerChainTipData.getHeight() == 1;
 	};
 
 	public static final Predicate<Peer> hasInferiorChainTip = peer -> {
-		final PeerChainTipData peerChainTipData = peer.getChainTipData();
+		final BlockSummaryData peerChainTipData = peer.getChainTipData();
 		final List<ByteArray> inferiorChainTips = Synchronizer.getInstance().inferiorChainSignatures;
-		return peerChainTipData == null || peerChainTipData.getLastBlockSignature() == null || inferiorChainTips.contains(ByteArray.wrap(peerChainTipData.getLastBlockSignature()));
+		return peerChainTipData == null || peerChainTipData.getSignature() == null || inferiorChainTips.contains(ByteArray.wrap(peerChainTipData.getSignature()));
 	};
 
 	public static final Predicate<Peer> hasOldVersion = peer -> {
@@ -832,6 +838,12 @@ public class Controller extends Thread {
 		String tooltip = String.format("%s - %d %s", actionText, numberOfPeers, connectionsText);
 		if (!Settings.getInstance().isLite()) {
 			tooltip = tooltip.concat(String.format(" - %s %d", heightText, height));
+
+			final Integer blocksRemaining = Synchronizer.getInstance().getBlocksRemaining();
+			if (blocksRemaining != null && blocksRemaining > 0) {
+				String blocksRemainingText = Translator.INSTANCE.translate("SysTray", "BLOCKS_REMAINING");
+				tooltip = tooltip.concat(String.format(" - %d %s", blocksRemaining, blocksRemainingText));
+			}
 		}
 		tooltip = tooltip.concat(String.format("\n%s: %s", Translator.INSTANCE.translate("SysTray", "BUILD_VERSION"), this.buildVersion));
 		SysTray.getInstance().setToolTipText(tooltip);
@@ -890,6 +902,9 @@ public class Controller extends Thread {
 				LOGGER.info("Shutting down API");
 				ApiService.getInstance().stop();
 
+				LOGGER.info("Shutting down wallets");
+				PirateChainWalletController.getInstance().shutdown();
+
 				if (Settings.getInstance().isAutoUpdateEnabled()) {
 					LOGGER.info("Shutting down auto-update");
 					AutoUpdate.getInstance().shutdown();
@@ -1001,8 +1016,7 @@ public class Controller extends Thread {
 		network.broadcast(peer -> peer.isOutbound() ? network.buildPeersMessage(peer) : new GetPeersMessage());
 
 		// Send our current height
-		BlockData latestBlockData = getChainTip();
-		network.broadcast(peer -> network.buildHeightMessage(peer, latestBlockData));
+		network.broadcastOurChain();
 
 		// Request unconfirmed transaction signatures, but only if we're up-to-date.
 		// If we're NOT up-to-date then priority is synchronizing first
@@ -1209,6 +1223,10 @@ public class Controller extends Thread {
 				onNetworkHeightV2Message(peer, message);
 				break;
 
+			case BLOCK_SUMMARIES_V2:
+				onNetworkBlockSummariesV2Message(peer, message);
+				break;
+
 			case GET_TRANSACTION:
 				TransactionImporter.getInstance().onNetworkGetTransactionMessage(peer, message);
 				break;
@@ -1226,25 +1244,20 @@ public class Controller extends Thread {
 				break;
 
 			case GET_ONLINE_ACCOUNTS:
-				OnlineAccountsManager.getInstance().onNetworkGetOnlineAccountsMessage(peer, message);
-				break;
-
 			case ONLINE_ACCOUNTS:
-				OnlineAccountsManager.getInstance().onNetworkOnlineAccountsMessage(peer, message);
-				break;
-
 			case GET_ONLINE_ACCOUNTS_V2:
-				OnlineAccountsManager.getInstance().onNetworkGetOnlineAccountsV2Message(peer, message);
-				break;
-
 			case ONLINE_ACCOUNTS_V2:
-				OnlineAccountsManager.getInstance().onNetworkOnlineAccountsV2Message(peer, message);
+				// No longer supported - to be eventually removed
 				break;
 
 			case GET_ONLINE_ACCOUNTS_V3:
 				OnlineAccountsManager.getInstance().onNetworkGetOnlineAccountsV3Message(peer, message);
 				break;
 
+			case ONLINE_ACCOUNTS_V3:
+				OnlineAccountsManager.getInstance().onNetworkOnlineAccountsV3Message(peer, message);
+				break;
+
 			case GET_ARBITRARY_DATA:
 				// Not currently supported
 				break;
@@ -1368,8 +1381,10 @@ public class Controller extends Thread {
 				// Send valid, yet unexpected message type in response, so peer's synchronizer doesn't have to wait for timeout
 				LOGGER.debug(() -> String.format("Sending 'block unknown' response to peer %s for GET_BLOCK request for unknown block %s", peer, Base58.encode(signature)));
 
-				// We'll send empty block summaries message as it's very short
-				Message blockUnknownMessage = new BlockSummariesMessage(Collections.emptyList());
+				// Send generic 'unknown' message as it's very short
+				Message blockUnknownMessage = peer.getPeersVersion() >= GenericUnknownMessage.MINIMUM_PEER_VERSION
+						? new GenericUnknownMessage()
+						: new BlockSummariesMessage(Collections.emptyList());
 				blockUnknownMessage.setId(message.getId());
 				if (!peer.sendMessage(blockUnknownMessage))
 					peer.disconnect("failed to send block-unknown response");
@@ -1418,11 +1433,15 @@ public class Controller extends Thread {
 		this.stats.getBlockSummariesStats.requests.incrementAndGet();
 
 		// If peer's parent signature matches our latest block signature
-		// then we can short-circuit with an empty response
+		// then we have no blocks after that and can short-circuit with an empty response
 		BlockData chainTip = getChainTip();
 		if (chainTip != null && Arrays.equals(parentSignature, chainTip.getSignature())) {
-			Message blockSummariesMessage = new BlockSummariesMessage(Collections.emptyList());
+			Message blockSummariesMessage = peer.getPeersVersion() >= BlockSummariesV2Message.MINIMUM_PEER_VERSION
+					? new BlockSummariesV2Message(Collections.emptyList())
+					: new BlockSummariesMessage(Collections.emptyList());
+
 			blockSummariesMessage.setId(message.getId());
+
 			if (!peer.sendMessage(blockSummariesMessage))
 				peer.disconnect("failed to send block summaries");
 
@@ -1478,7 +1497,9 @@ public class Controller extends Thread {
 				this.stats.getBlockSummariesStats.fullyFromCache.incrementAndGet();
 		}
 
-		Message blockSummariesMessage = new BlockSummariesMessage(blockSummaries);
+		Message blockSummariesMessage = peer.getPeersVersion() >= BlockSummariesV2Message.MINIMUM_PEER_VERSION
+				? new BlockSummariesV2Message(blockSummaries)
+				: new BlockSummariesMessage(blockSummaries);
 		blockSummariesMessage.setId(message.getId());
 		if (!peer.sendMessage(blockSummariesMessage))
 			peer.disconnect("failed to send block summaries");
@@ -1553,18 +1574,59 @@ public class Controller extends Thread {
 			// If peer is inbound and we've not updated their height
 			// then this is probably their initial HEIGHT_V2 message
 			// so they need a corresponding HEIGHT_V2 message from us
-			if (!peer.isOutbound() && (peer.getChainTipData() == null || peer.getChainTipData().getLastHeight() == null))
-				peer.sendMessage(Network.getInstance().buildHeightMessage(peer, getChainTip()));
+			if (!peer.isOutbound() && peer.getChainTipData() == null) {
+				Message responseMessage = Network.getInstance().buildHeightOrChainTipInfo(peer);
+
+				if (responseMessage == null || !peer.sendMessage(responseMessage)) {
+					peer.disconnect("failed to send our chain tip info");
+					return;
+				}
+			}
 		}
 
 		// Update peer chain tip data
-		PeerChainTipData newChainTipData = new PeerChainTipData(heightV2Message.getHeight(), heightV2Message.getSignature(), heightV2Message.getTimestamp(), heightV2Message.getMinterPublicKey());
+		BlockSummaryData newChainTipData = new BlockSummaryData(heightV2Message.getHeight(), heightV2Message.getSignature(), heightV2Message.getMinterPublicKey(), heightV2Message.getTimestamp());
 		peer.setChainTipData(newChainTipData);
 
 		// Potentially synchronize
 		Synchronizer.getInstance().requestSync();
 	}
 
+	private void onNetworkBlockSummariesV2Message(Peer peer, Message message) {
+		BlockSummariesV2Message blockSummariesV2Message = (BlockSummariesV2Message) message;
+
+		if (!Settings.getInstance().isLite()) {
+			// If peer is inbound and we've not updated their height
+			// then this is probably their initial BLOCK_SUMMARIES_V2 message
+			// so they need a corresponding BLOCK_SUMMARIES_V2 message from us
+			if (!peer.isOutbound() && peer.getChainTipData() == null) {
+				Message responseMessage = Network.getInstance().buildHeightOrChainTipInfo(peer);
+
+				if (responseMessage == null || !peer.sendMessage(responseMessage)) {
+					peer.disconnect("failed to send our chain tip info");
+					return;
+				}
+			}
+		}
+
+		if (message.hasId()) {
+			/*
+			 * Experimental proof-of-concept: discard messages with ID
+			 * These are 'late' reply messages received after timeout has expired,
+			 * having been passed upwards from Peer to Network to Controller.
+			 * Hence, these are NOT simple "here's my chain tip" broadcasts from other peers.
+			 */
+			LOGGER.debug("Discarding late {} message with ID {} from {}", message.getType().name(), message.getId(), peer);
+			return;
+		}
+
+		// Update peer chain tip data
+		peer.setChainTipSummaries(blockSummariesV2Message.getBlockSummaries());
+
+		// Potentially synchronize
+		Synchronizer.getInstance().requestSync();
+	}
+
 	private void onNetworkGetAccountMessage(Peer peer, Message message) {
 		GetAccountMessage getAccountMessage = (GetAccountMessage) message;
 		String address = getAccountMessage.getAddress();
@@ -1580,8 +1642,8 @@ public class Controller extends Thread {
 				// Send valid, yet unexpected message type in response, so peer doesn't have to wait for timeout
 				LOGGER.debug(() -> String.format("Sending 'account unknown' response to peer %s for GET_ACCOUNT request for unknown account %s", peer, address));
 
-				// We'll send empty block summaries message as it's very short
-				Message accountUnknownMessage = new BlockSummariesMessage(Collections.emptyList());
+				// Send generic 'unknown' message as it's very short
+				Message accountUnknownMessage = new GenericUnknownMessage();
 				accountUnknownMessage.setId(message.getId());
 				if (!peer.sendMessage(accountUnknownMessage))
 					peer.disconnect("failed to send account-unknown response");
@@ -1616,8 +1678,8 @@ public class Controller extends Thread {
 				// Send valid, yet unexpected message type in response, so peer doesn't have to wait for timeout
 				LOGGER.debug(() -> String.format("Sending 'account unknown' response to peer %s for GET_ACCOUNT_BALANCE request for unknown account %s and asset ID %d", peer, address, assetId));
 
-				// We'll send empty block summaries message as it's very short
-				Message accountUnknownMessage = new BlockSummariesMessage(Collections.emptyList());
+				// Send generic 'unknown' message as it's very short
+				Message accountUnknownMessage = new GenericUnknownMessage();
 				accountUnknownMessage.setId(message.getId());
 				if (!peer.sendMessage(accountUnknownMessage))
 					peer.disconnect("failed to send account-unknown response");
@@ -1660,8 +1722,8 @@ public class Controller extends Thread {
 				// Send valid, yet unexpected message type in response, so peer doesn't have to wait for timeout
 				LOGGER.debug(() -> String.format("Sending 'account unknown' response to peer %s for GET_ACCOUNT_TRANSACTIONS request for unknown account %s", peer, address));
 
-				// We'll send empty block summaries message as it's very short
-				Message accountUnknownMessage = new BlockSummariesMessage(Collections.emptyList());
+				// Send generic 'unknown' message as it's very short
+				Message accountUnknownMessage = new GenericUnknownMessage();
 				accountUnknownMessage.setId(message.getId());
 				if (!peer.sendMessage(accountUnknownMessage))
 					peer.disconnect("failed to send account-unknown response");
@@ -1697,8 +1759,8 @@ public class Controller extends Thread {
 				// Send valid, yet unexpected message type in response, so peer doesn't have to wait for timeout
 				LOGGER.debug(() -> String.format("Sending 'account unknown' response to peer %s for GET_ACCOUNT_NAMES request for unknown account %s", peer, address));
 
-				// We'll send empty block summaries message as it's very short
-				Message accountUnknownMessage = new BlockSummariesMessage(Collections.emptyList());
+				// Send generic 'unknown' message as it's very short
+				Message accountUnknownMessage = new GenericUnknownMessage();
 				accountUnknownMessage.setId(message.getId());
 				if (!peer.sendMessage(accountUnknownMessage))
 					peer.disconnect("failed to send account-unknown response");
@@ -1732,8 +1794,8 @@ public class Controller extends Thread {
 				// Send valid, yet unexpected message type in response, so peer doesn't have to wait for timeout
 				LOGGER.debug(() -> String.format("Sending 'name unknown' response to peer %s for GET_NAME request for unknown name %s", peer, name));
 
-				// We'll send empty block summaries message as it's very short
-				Message nameUnknownMessage = new BlockSummariesMessage(Collections.emptyList());
+				// Send generic 'unknown' message as it's very short
+				Message nameUnknownMessage = new GenericUnknownMessage();
 				nameUnknownMessage.setId(message.getId());
 				if (!peer.sendMessage(nameUnknownMessage))
 					peer.disconnect("failed to send name-unknown response");
@@ -1781,14 +1843,14 @@ public class Controller extends Thread {
 				continue;
 			}
 
-			final PeerChainTipData peerChainTipData = peer.getChainTipData();
+			BlockSummaryData peerChainTipData = peer.getChainTipData();
 			if (peerChainTipData == null) {
 				iterator.remove();
 				continue;
 			}
 
 			// Disregard peers that don't have a recent block
-			if (peerChainTipData.getLastBlockTimestamp() == null || peerChainTipData.getLastBlockTimestamp() < minLatestBlockTimestamp) {
+			if (peerChainTipData.getTimestamp() == null || peerChainTipData.getTimestamp() < minLatestBlockTimestamp) {
 				iterator.remove();
 				continue;
 			}
@@ -1816,6 +1878,10 @@ public class Controller extends Thread {
 		if (latestBlockData == null || latestBlockData.getTimestamp() < minLatestBlockTimestamp)
 			return false;
 
+		if (Settings.getInstance().isSingleNodeTestnet())
+			// Single node testnets won't have peers, so we can assume up to date from this point
+			return true;
+
 		// Needs a mutable copy of the unmodifiableList
 		List<Peer> peers = new ArrayList<>(Network.getInstance().getImmutableHandshakedPeers());
 		if (peers == null)

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

@@ -9,6 +9,7 @@ import org.qortal.account.PrivateKeyAccount;
 import org.qortal.block.Block;
 import org.qortal.block.BlockChain;
 import org.qortal.crypto.Crypto;
+import org.qortal.crypto.MemoryPoW;
 import org.qortal.crypto.Qortal25519Extras;
 import org.qortal.data.account.MintingAccountData;
 import org.qortal.data.account.RewardShareData;
@@ -19,10 +20,13 @@ import org.qortal.network.message.*;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
+import org.qortal.settings.Settings;
 import org.qortal.utils.Base58;
 import org.qortal.utils.NTP;
 import org.qortal.utils.NamedThreadFactory;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -49,13 +53,30 @@ public class OnlineAccountsManager {
      */
     private static final int MAX_BLOCKS_CACHED_ONLINE_ACCOUNTS = 3;
 
-    private static final long ONLINE_ACCOUNTS_QUEUE_INTERVAL = 100L; //ms
+    private static final long ONLINE_ACCOUNTS_QUEUE_INTERVAL = 100L; // ms
     private static final long ONLINE_ACCOUNTS_TASKS_INTERVAL = 10 * 1000L; // ms
-    private static final long ONLINE_ACCOUNTS_LEGACY_BROADCAST_INTERVAL = 60 * 1000L; // ms
-    private static final long ONLINE_ACCOUNTS_BROADCAST_INTERVAL = 15 * 1000L; // ms
+    private static final long ONLINE_ACCOUNTS_COMPUTE_INTERVAL = 5 * 1000L; // ms
+    private static final long ONLINE_ACCOUNTS_BROADCAST_INTERVAL = 60 * 1000L; // ms
+    // After switching to a new online timestamp, we "burst" the online accounts requests
+    // at an increased interval for a specified amount of time
+    private static final long ONLINE_ACCOUNTS_BROADCAST_BURST_INTERVAL = 5 * 1000L; // ms
+    private static final long ONLINE_ACCOUNTS_BROADCAST_BURST_LENGTH = 5 * 60 * 1000L; // ms
 
-    private static final long ONLINE_ACCOUNTS_V2_PEER_VERSION = 0x0300020000L; // v3.2.0
-    private static final long ONLINE_ACCOUNTS_V3_PEER_VERSION = 0x0300040000L; // v3.4.0
+    private static final long ONLINE_ACCOUNTS_COMPUTE_INITIAL_SLEEP_INTERVAL = 30 * 1000L; // ms
+
+    // MemoryPoW - mainnet
+    public static final int POW_BUFFER_SIZE = 1 * 1024 * 1024; // bytes
+    public static final int POW_DIFFICULTY_V1 = 18; // leading zero bits
+    public static final int POW_DIFFICULTY_V2 = 19; // leading zero bits
+
+    // MemoryPoW - testnet
+    public static final int POW_BUFFER_SIZE_TESTNET = 1 * 1024 * 1024; // bytes
+    public static final int POW_DIFFICULTY_TESTNET = 5; // leading zero bits
+
+    // IMPORTANT: if we ever need to dynamically modify the buffer size using a feature trigger, the
+    // pre-allocated buffer below will NOT work, and we should instead use a dynamically allocated
+    // one for the transition period.
+    private static long[] POW_VERIFY_WORK_BUFFER = new long[getPoWBufferSize() / 8];
 
     private final ScheduledExecutorService executor = Executors.newScheduledThreadPool(4, new NamedThreadFactory("OnlineAccounts"));
     private volatile boolean isStopping = false;
@@ -77,6 +98,8 @@ public class OnlineAccountsManager {
      */
     private final SortedMap<Long, Set<OnlineAccountData>> latestBlocksOnlineAccounts = new ConcurrentSkipListMap<>();
 
+    private long lastOnlineAccountsRequest = 0;
+
     private boolean hasOurOnlineAccounts = false;
 
     public static long getOnlineTimestampModulus() {
@@ -95,6 +118,27 @@ public class OnlineAccountsManager {
         return (now / onlineTimestampModulus) * onlineTimestampModulus;
     }
 
+    public static long toOnlineAccountTimestamp(long timestamp) {
+        return (timestamp / getOnlineTimestampModulus()) * getOnlineTimestampModulus();
+    }
+
+    private static int getPoWBufferSize() {
+        if (Settings.getInstance().isTestNet())
+            return POW_BUFFER_SIZE_TESTNET;
+
+        return POW_BUFFER_SIZE;
+    }
+
+    private static int getPoWDifficulty(long timestamp) {
+        if (Settings.getInstance().isTestNet())
+            return POW_DIFFICULTY_TESTNET;
+
+        if (timestamp >= BlockChain.getInstance().getIncreaseOnlineAccountsDifficultyTimestamp())
+            return POW_DIFFICULTY_V2;
+
+        return POW_DIFFICULTY_V1;
+    }
+
     private OnlineAccountsManager() {
     }
 
@@ -110,16 +154,16 @@ public class OnlineAccountsManager {
         // Expire old online accounts signatures
         executor.scheduleAtFixedRate(this::expireOldOnlineAccounts, ONLINE_ACCOUNTS_TASKS_INTERVAL, ONLINE_ACCOUNTS_TASKS_INTERVAL, TimeUnit.MILLISECONDS);
 
-        // Send our online accounts
-        executor.scheduleAtFixedRate(this::sendOurOnlineAccountsInfo, ONLINE_ACCOUNTS_BROADCAST_INTERVAL, ONLINE_ACCOUNTS_BROADCAST_INTERVAL, TimeUnit.MILLISECONDS);
-
-        // Request online accounts from peers (legacy)
-        executor.scheduleAtFixedRate(this::requestLegacyRemoteOnlineAccounts, ONLINE_ACCOUNTS_LEGACY_BROADCAST_INTERVAL, ONLINE_ACCOUNTS_LEGACY_BROADCAST_INTERVAL, TimeUnit.MILLISECONDS);
-        // Request online accounts from peers (V3+)
-        executor.scheduleAtFixedRate(this::requestRemoteOnlineAccounts, ONLINE_ACCOUNTS_BROADCAST_INTERVAL, ONLINE_ACCOUNTS_BROADCAST_INTERVAL, TimeUnit.MILLISECONDS);
+        // Request online accounts from peers
+        executor.scheduleAtFixedRate(this::requestRemoteOnlineAccounts, ONLINE_ACCOUNTS_BROADCAST_BURST_INTERVAL, ONLINE_ACCOUNTS_BROADCAST_BURST_INTERVAL, TimeUnit.MILLISECONDS);
 
         // Process import queue
         executor.scheduleWithFixedDelay(this::processOnlineAccountsImportQueue, ONLINE_ACCOUNTS_QUEUE_INTERVAL, ONLINE_ACCOUNTS_QUEUE_INTERVAL, TimeUnit.MILLISECONDS);
+
+        // Send our online accounts (using increased initial delay)
+        // This allows some time for initial online account lists to be retrieved, and
+        // reduces the chances of the same nonce being computed twice
+        executor.scheduleAtFixedRate(this::sendOurOnlineAccountsInfo, ONLINE_ACCOUNTS_COMPUTE_INITIAL_SLEEP_INTERVAL, ONLINE_ACCOUNTS_COMPUTE_INTERVAL, TimeUnit.MILLISECONDS);
     }
 
     public void shutdown() {
@@ -139,18 +183,17 @@ public class OnlineAccountsManager {
             return;
 
         byte[] timestampBytes = Longs.toByteArray(onlineAccountsTimestamp);
-        final boolean useAggregateCompatibleSignature = onlineAccountsTimestamp >= BlockChain.getInstance().getAggregateSignatureTimestamp();
 
         Set<OnlineAccountData> replacementAccounts = new HashSet<>();
         for (PrivateKeyAccount onlineAccount : onlineAccounts) {
             // Check mintingAccount is actually reward-share?
 
-            byte[] signature = useAggregateCompatibleSignature
-                    ? Qortal25519Extras.signForAggregation(onlineAccount.getPrivateKey(), timestampBytes)
-                    : onlineAccount.sign(timestampBytes);
+            byte[] signature = Qortal25519Extras.signForAggregation(onlineAccount.getPrivateKey(), timestampBytes);
             byte[] publicKey = onlineAccount.getPublicKey();
 
-            OnlineAccountData ourOnlineAccountData = new OnlineAccountData(onlineAccountsTimestamp, signature, publicKey);
+            Integer nonce = new Random().nextInt(500000);
+
+            OnlineAccountData ourOnlineAccountData = new OnlineAccountData(onlineAccountsTimestamp, signature, publicKey, nonce);
             replacementAccounts.add(ourOnlineAccountData);
         }
 
@@ -168,28 +211,86 @@ public class OnlineAccountsManager {
         LOGGER.debug("Processing online accounts import queue (size: {})", this.onlineAccountsImportQueue.size());
 
         Set<OnlineAccountData> onlineAccountsToAdd = new HashSet<>();
+        Set<OnlineAccountData> onlineAccountsToRemove = new HashSet<>();
         try (final Repository repository = RepositoryManager.getRepository()) {
             for (OnlineAccountData onlineAccountData : this.onlineAccountsImportQueue) {
                 if (isStopping)
                     return;
 
+                // Skip this account if it's already validated
+                Set<OnlineAccountData> onlineAccounts = this.currentOnlineAccounts.get(onlineAccountData.getTimestamp());
+                if (onlineAccounts != null && onlineAccounts.contains(onlineAccountData)) {
+                    // We have already validated this online account
+                    onlineAccountsImportQueue.remove(onlineAccountData);
+                    continue;
+                }
+
                 boolean isValid = this.isValidCurrentAccount(repository, onlineAccountData);
                 if (isValid)
                     onlineAccountsToAdd.add(onlineAccountData);
 
-                // Remove from queue
-                onlineAccountsImportQueue.remove(onlineAccountData);
+                // Don't remove from the queue yet - we'll do this at the end of the process
+                // This prevents duplicates being added to the queue whilst it's being processed
+                onlineAccountsToRemove.add(onlineAccountData);
             }
         } catch (DataException e) {
             LOGGER.error("Repository issue while verifying online accounts", e);
-        }
 
-        if (!onlineAccountsToAdd.isEmpty()) {
-            LOGGER.debug("Merging {} validated online accounts from import queue", onlineAccountsToAdd.size());
-            addAccounts(onlineAccountsToAdd);
+        } finally {
+            if (!onlineAccountsToAdd.isEmpty()) {
+                LOGGER.debug("Merging {} validated online accounts from import queue", onlineAccountsToAdd.size());
+                addAccounts(onlineAccountsToAdd);
+            }
+            onlineAccountsImportQueue.removeAll(onlineAccountsToRemove);
         }
     }
 
+    /**
+     * Check if supplied onlineAccountData is superior (i.e. has a nonce value) than existing record.
+     * Two entries are considered equal even if the nonce differs, to prevent multiple variations
+     * co-existing. For this reason, we need to be able to check if a new OnlineAccountData entry should
+     * replace the existing one, which may be missing the nonce.
+     * @param onlineAccountData
+     * @return true if supplied data is superior to existing entry
+     */
+    private boolean isOnlineAccountsDataSuperior(OnlineAccountData onlineAccountData) {
+        if (onlineAccountData.getNonce() == null || onlineAccountData.getNonce() < 0) {
+            // New online account data has no usable nonce value, so it won't be better than anything we already have
+            return false;
+        }
+
+        // New online account data has a nonce value, so check if there is any existing data to compare against
+        Set<OnlineAccountData> existingOnlineAccountsForTimestamp = this.currentOnlineAccounts.get(onlineAccountData.getTimestamp());
+        if (existingOnlineAccountsForTimestamp == null) {
+            // No existing online accounts data with this timestamp yet
+            return false;
+        }
+
+        // Check if a duplicate entry exists
+        OnlineAccountData existingOnlineAccountData = null;
+        for (OnlineAccountData existingAccount : existingOnlineAccountsForTimestamp) {
+            if (existingAccount.equals(onlineAccountData)) {
+                // Found existing online account data
+                existingOnlineAccountData = existingAccount;
+                break;
+            }
+        }
+
+        if (existingOnlineAccountData == null) {
+            // No existing online accounts data, so nothing to compare
+            return false;
+        }
+
+        if (existingOnlineAccountData.getNonce() == null || existingOnlineAccountData.getNonce() < 0) {
+            // Existing data has no usable nonce value(s) so we want to replace it with the new one
+            return true;
+        }
+
+        // Both new and old data have nonce values so the new data isn't considered superior
+        return false;
+    }
+
+
     // Utilities
 
     public static byte[] xorByteArrayInPlace(byte[] inplaceArray, byte[] otherArray) {
@@ -225,9 +326,7 @@ public class OnlineAccountsManager {
 
         // Verify signature
         byte[] data = Longs.toByteArray(onlineAccountData.getTimestamp());
-        boolean isSignatureValid = onlineAccountTimestamp >= BlockChain.getInstance().getAggregateSignatureTimestamp()
-                ? Qortal25519Extras.verifyAggregated(rewardSharePublicKey, onlineAccountData.getSignature(), data)
-                : Crypto.verify(rewardSharePublicKey, onlineAccountData.getSignature(), data);
+        boolean isSignatureValid = Qortal25519Extras.verifyAggregated(rewardSharePublicKey, onlineAccountData.getSignature(), data);
         if (!isSignatureValid) {
             LOGGER.trace(() -> String.format("Rejecting invalid online account %s", Base58.encode(rewardSharePublicKey)));
             return false;
@@ -248,6 +347,12 @@ public class OnlineAccountsManager {
             return false;
         }
 
+        // Validate mempow
+        if (!getInstance().verifyMemoryPoW(onlineAccountData, POW_VERIFY_WORK_BUFFER)) {
+            LOGGER.trace(() -> String.format("Rejecting online reward-share for account %s due to invalid PoW nonce", mintingAccount.getAddress()));
+            return false;
+        }
+
         return true;
     }
 
@@ -269,7 +374,7 @@ public class OnlineAccountsManager {
         for (var entry : hashesToRebuild.entrySet()) {
             Long timestamp = entry.getKey();
 
-            LOGGER.debug(() -> String.format("Rehashing for timestamp %d and leading bytes %s",
+            LOGGER.trace(() -> String.format("Rehashing for timestamp %d and leading bytes %s",
                             timestamp,
                             entry.getValue().stream().sorted(Byte::compareUnsigned).map(leadingByte -> String.format("%02x", leadingByte)).collect(Collectors.joining(", "))
                     )
@@ -295,7 +400,7 @@ public class OnlineAccountsManager {
             }
         }
 
-        LOGGER.debug(String.format("we have online accounts for timestamps: %s", String.join(", ", this.currentOnlineAccounts.keySet().stream().map(l -> Long.toString(l)).collect(Collectors.joining(", ")))));
+        LOGGER.trace(String.format("we have online accounts for timestamps: %s", String.join(", ", this.currentOnlineAccounts.keySet().stream().map(l -> Long.toString(l)).collect(Collectors.joining(", ")))));
 
         return true;
     }
@@ -305,6 +410,12 @@ public class OnlineAccountsManager {
         long onlineAccountTimestamp = onlineAccountData.getTimestamp();
 
         Set<OnlineAccountData> onlineAccounts = this.currentOnlineAccounts.computeIfAbsent(onlineAccountTimestamp, k -> ConcurrentHashMap.newKeySet());
+
+        boolean isSuperiorEntry = isOnlineAccountsDataSuperior(onlineAccountData);
+        if (isSuperiorEntry)
+            // Remove existing inferior entry so it can be re-added below (it's likely the existing copy is missing a nonce value)
+            onlineAccounts.remove(onlineAccountData);
+
         boolean isNewEntry = onlineAccounts.add(onlineAccountData);
 
         if (isNewEntry)
@@ -329,30 +440,7 @@ public class OnlineAccountsManager {
     }
 
     /**
-     * Request data from other peers. (Pre-V3)
-     */
-    private void requestLegacyRemoteOnlineAccounts() {
-        final Long now = NTP.getTime();
-        if (now == null)
-            return;
-
-        // Don't bother if we're not up to date
-        if (!Controller.getInstance().isUpToDate())
-            return;
-
-        List<OnlineAccountData> mergedOnlineAccounts = Set.copyOf(this.currentOnlineAccounts.values()).stream().flatMap(Set::stream).collect(Collectors.toList());
-
-        Message messageV2 = new GetOnlineAccountsV2Message(mergedOnlineAccounts);
-
-        Network.getInstance().broadcast(peer ->
-                peer.getPeersVersion() < ONLINE_ACCOUNTS_V3_PEER_VERSION
-                        ? messageV2
-                        : null
-        );
-    }
-
-    /**
-     * Request data from other peers. V3+
+     * Request data from other peers
      */
     private void requestRemoteOnlineAccounts() {
         final Long now = NTP.getTime();
@@ -363,13 +451,25 @@ public class OnlineAccountsManager {
         if (!Controller.getInstance().isUpToDate())
             return;
 
-        Message messageV3 = new GetOnlineAccountsV3Message(currentOnlineAccountsHashes);
+        long onlineAccountsTimestamp = getCurrentOnlineAccountTimestamp();
+        if (now - onlineAccountsTimestamp >= ONLINE_ACCOUNTS_BROADCAST_BURST_LENGTH) {
+            // New online timestamp started more than 5 mins ago - we probably don't need to request so frequently
 
-        Network.getInstance().broadcast(peer ->
-                peer.getPeersVersion() >= ONLINE_ACCOUNTS_V3_PEER_VERSION
-                        ? messageV3
-                        : null
-        );
+            if (Controller.uptime() < ONLINE_ACCOUNTS_BROADCAST_BURST_LENGTH) {
+                // The node recently started up, so we should request at the burst interval
+                // This could allow accounts to move around the network more easily when an auto update is occurring
+            }
+            else if (now - lastOnlineAccountsRequest < ONLINE_ACCOUNTS_BROADCAST_INTERVAL) {
+                // We already requested online accounts in the last minute, so no need to request again
+                return;
+            }
+        }
+
+        LOGGER.debug("Requesting online accounts via broadcast...");
+
+        lastOnlineAccountsRequest = now;
+        Message messageV3 = new GetOnlineAccountsV3Message(currentOnlineAccountsHashes);
+        Network.getInstance().broadcast(peer -> messageV3);
     }
 
     /**
@@ -392,13 +492,26 @@ public class OnlineAccountsManager {
             return;
         }
 
+        // 'next' timestamp (prioritize this as it's the most important, if mempow active)
+        final long nextOnlineAccountsTimestamp = toOnlineAccountTimestamp(now) + getOnlineTimestampModulus();
+        boolean success = computeOurAccountsForTimestamp(nextOnlineAccountsTimestamp);
+        if (!success) {
+            // We didn't compute the required nonce value(s), and so can't proceed until they have been retried
+            return;
+        }
+
+        // 'current' timestamp
+        computeOurAccountsForTimestamp(onlineAccountsTimestamp);
+    }
+
+    private boolean computeOurAccountsForTimestamp(long onlineAccountsTimestamp) {
         List<MintingAccountData> mintingAccounts;
         try (final Repository repository = RepositoryManager.getRepository()) {
             mintingAccounts = repository.getAccountRepository().getMintingAccounts();
 
             // We have no accounts to send
             if (mintingAccounts.isEmpty())
-                return;
+                return false;
 
             // Only active reward-shares allowed
             Iterator<MintingAccountData> iterator = mintingAccounts.iterator();
@@ -421,25 +534,66 @@ public class OnlineAccountsManager {
             }
         } catch (DataException e) {
             LOGGER.warn(String.format("Repository issue trying to fetch minting accounts: %s", e.getMessage()));
-            return;
+            return false;
         }
 
-        final boolean useAggregateCompatibleSignature = onlineAccountsTimestamp >= BlockChain.getInstance().getAggregateSignatureTimestamp();
-
         byte[] timestampBytes = Longs.toByteArray(onlineAccountsTimestamp);
         List<OnlineAccountData> ourOnlineAccounts = new ArrayList<>();
 
+        int remaining = mintingAccounts.size();
         for (MintingAccountData mintingAccountData : mintingAccounts) {
+            remaining--;
             byte[] privateKey = mintingAccountData.getPrivateKey();
             byte[] publicKey = Crypto.toPublicKey(privateKey);
 
-            byte[] signature = useAggregateCompatibleSignature
-                    ? Qortal25519Extras.signForAggregation(privateKey, timestampBytes)
-                    : Crypto.sign(privateKey, timestampBytes);
+            // We don't want to compute the online account nonce and signature again if it already exists
+            Set<OnlineAccountData> onlineAccounts = this.currentOnlineAccounts.computeIfAbsent(onlineAccountsTimestamp, k -> ConcurrentHashMap.newKeySet());
+            boolean alreadyExists = onlineAccounts.stream().anyMatch(a -> Arrays.equals(a.getPublicKey(), publicKey));
+            if (alreadyExists) {
+                this.hasOurOnlineAccounts = true;
+
+                if (remaining > 0) {
+                    // Move on to next account
+                    continue;
+                }
+                else {
+                    // Everything exists, so return true
+                    return true;
+                }
+            }
+
+            // Generate bytes for mempow
+            byte[] mempowBytes;
+            try {
+                mempowBytes = this.getMemoryPoWBytes(publicKey, onlineAccountsTimestamp);
+            }
+            catch (IOException e) {
+                LOGGER.info("Unable to create bytes for MemoryPoW. Moving on to next account...");
+                continue;
+            }
+
+            // Compute nonce
+            Integer nonce;
+            try {
+                nonce = this.computeMemoryPoW(mempowBytes, publicKey, onlineAccountsTimestamp);
+                if (nonce == null) {
+                    // A nonce is required
+                    return false;
+                }
+            } catch (TimeoutException e) {
+                LOGGER.info(String.format("Timed out computing nonce for account %.8s", Base58.encode(publicKey)));
+                return false;
+            }
+
+            byte[] signature = Qortal25519Extras.signForAggregation(privateKey, timestampBytes);
 
             // Our account is online
-            OnlineAccountData ourOnlineAccountData = new OnlineAccountData(onlineAccountsTimestamp, signature, publicKey);
-            ourOnlineAccounts.add(ourOnlineAccountData);
+            OnlineAccountData ourOnlineAccountData = new OnlineAccountData(onlineAccountsTimestamp, signature, publicKey, nonce);
+
+            // Make sure to verify before adding
+            if (verifyMemoryPoW(ourOnlineAccountData, null)) {
+                ourOnlineAccounts.add(ourOnlineAccountData);
+            }
         }
 
         this.hasOurOnlineAccounts = !ourOnlineAccounts.isEmpty();
@@ -447,23 +601,72 @@ public class OnlineAccountsManager {
         boolean hasInfoChanged = addAccounts(ourOnlineAccounts);
 
         if (!hasInfoChanged)
-            return;
+            return false;
 
-        Message messageV1 = new OnlineAccountsMessage(ourOnlineAccounts);
-        Message messageV2 = new OnlineAccountsV2Message(ourOnlineAccounts);
-        Message messageV3 = new OnlineAccountsV2Message(ourOnlineAccounts); // TODO: V3 message
-
-        Network.getInstance().broadcast(peer ->
-                peer.getPeersVersion() >= ONLINE_ACCOUNTS_V3_PEER_VERSION
-                        ? messageV3
-                        : peer.getPeersVersion() >= ONLINE_ACCOUNTS_V2_PEER_VERSION
-                        ? messageV2
-                        : messageV1
-        );
+        Network.getInstance().broadcast(peer -> new OnlineAccountsV3Message(ourOnlineAccounts));
 
         LOGGER.debug("Broadcasted {} online account{} with timestamp {}", ourOnlineAccounts.size(), (ourOnlineAccounts.size() != 1 ? "s" : ""), onlineAccountsTimestamp);
+
+        return true;
     }
 
+
+
+    // MemoryPoW
+
+    private byte[] getMemoryPoWBytes(byte[] publicKey, long onlineAccountsTimestamp) throws IOException {
+        byte[] timestampBytes = Longs.toByteArray(onlineAccountsTimestamp);
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        outputStream.write(publicKey);
+        outputStream.write(timestampBytes);
+
+        return outputStream.toByteArray();
+    }
+
+    private Integer computeMemoryPoW(byte[] bytes, byte[] publicKey, long onlineAccountsTimestamp) throws TimeoutException {
+        LOGGER.info(String.format("Computing nonce for account %.8s and timestamp %d...", Base58.encode(publicKey), onlineAccountsTimestamp));
+
+        // Calculate the time until the next online timestamp and use it as a timeout when computing the nonce
+        Long startTime = NTP.getTime();
+        final long nextOnlineAccountsTimestamp = toOnlineAccountTimestamp(startTime) + getOnlineTimestampModulus();
+        long timeUntilNextTimestamp = nextOnlineAccountsTimestamp - startTime;
+
+        int difficulty = getPoWDifficulty(onlineAccountsTimestamp);
+        Integer nonce = MemoryPoW.compute2(bytes, getPoWBufferSize(), difficulty, timeUntilNextTimestamp);
+
+        double totalSeconds = (NTP.getTime() - startTime) / 1000.0f;
+        int minutes = (int) ((totalSeconds % 3600) / 60);
+        int seconds = (int) (totalSeconds % 60);
+        double hashRate = nonce / totalSeconds;
+
+        LOGGER.info(String.format("Computed nonce for timestamp %d and account %.8s: %d. Buffer size: %d. Difficulty: %d. " +
+                        "Time taken: %02d:%02d. Hashrate: %f", onlineAccountsTimestamp, Base58.encode(publicKey),
+                nonce, getPoWBufferSize(), difficulty, minutes, seconds, hashRate));
+
+        return nonce;
+    }
+
+    public boolean verifyMemoryPoW(OnlineAccountData onlineAccountData, long[] workBuffer) {
+        // Require a valid nonce value
+        if (onlineAccountData.getNonce() == null || onlineAccountData.getNonce() < 0) {
+            return false;
+        }
+
+        int nonce = onlineAccountData.getNonce();
+
+        byte[] mempowBytes;
+        try {
+            mempowBytes = this.getMemoryPoWBytes(onlineAccountData.getPublicKey(), onlineAccountData.getTimestamp());
+        } catch (IOException e) {
+            return false;
+        }
+
+        // Verify the nonce
+        return MemoryPoW.verify2(mempowBytes, workBuffer, getPoWBufferSize(), getPoWDifficulty(onlineAccountData.getTimestamp()), nonce);
+    }
+
+
     /**
      * Returns whether online accounts manager has any online accounts with timestamp recent enough to be considered currently online.
      */
@@ -498,7 +701,7 @@ public class OnlineAccountsManager {
      */
     // Block::mint() - only wants online accounts with (online) timestamp that matches block's (online) timestamp so they can be added to new block
     public List<OnlineAccountData> getOnlineAccounts(long onlineTimestamp) {
-        LOGGER.info(String.format("caller's timestamp: %d, our timestamps: %s", onlineTimestamp, String.join(", ", this.currentOnlineAccounts.keySet().stream().map(l -> Long.toString(l)).collect(Collectors.joining(", ")))));
+        LOGGER.debug(String.format("caller's timestamp: %d, our timestamps: %s", onlineTimestamp, String.join(", ", this.currentOnlineAccounts.keySet().stream().map(l -> Long.toString(l)).collect(Collectors.joining(", ")))));
 
         return new ArrayList<>(Set.copyOf(this.currentOnlineAccounts.getOrDefault(onlineTimestamp, Collections.emptySet())));
     }
@@ -544,11 +747,12 @@ public class OnlineAccountsManager {
      * Typically called by {@link Block#areOnlineAccountsValid()}
      */
     public void addBlocksOnlineAccounts(Set<OnlineAccountData> blocksOnlineAccounts, Long timestamp) {
-        // We want to add to 'current' in preference if possible
-        if (this.currentOnlineAccounts.containsKey(timestamp)) {
-            addAccounts(blocksOnlineAccounts);
+        // If these are current accounts, then there is no need to cache them, and should instead rely
+        // on the more complete entries we already have in self.currentOnlineAccounts.
+        // Note: since sig-agg, we no longer have individual signatures included in blocks, so we
+        // mustn't add anything to currentOnlineAccounts from here.
+        if (this.currentOnlineAccounts.containsKey(timestamp))
             return;
-        }
 
         // Add to block cache instead
         this.latestBlocksOnlineAccounts.computeIfAbsent(timestamp, k -> ConcurrentHashMap.newKeySet())
@@ -568,106 +772,6 @@ public class OnlineAccountsManager {
 
     // Network handlers
 
-    public void onNetworkGetOnlineAccountsMessage(Peer peer, Message message) {
-        GetOnlineAccountsMessage getOnlineAccountsMessage = (GetOnlineAccountsMessage) message;
-
-        List<OnlineAccountData> excludeAccounts = getOnlineAccountsMessage.getOnlineAccounts();
-
-        // Send online accounts info, excluding entries with matching timestamp & public key from excludeAccounts
-        List<OnlineAccountData> accountsToSend = Set.copyOf(this.currentOnlineAccounts.values()).stream().flatMap(Set::stream).collect(Collectors.toList());
-        int prefilterSize = accountsToSend.size();
-
-        Iterator<OnlineAccountData> iterator = accountsToSend.iterator();
-        while (iterator.hasNext()) {
-            OnlineAccountData onlineAccountData = iterator.next();
-
-            for (OnlineAccountData excludeAccountData : excludeAccounts) {
-                if (onlineAccountData.getTimestamp() == excludeAccountData.getTimestamp() && Arrays.equals(onlineAccountData.getPublicKey(), excludeAccountData.getPublicKey())) {
-                    iterator.remove();
-                    break;
-                }
-            }
-        }
-
-        if (accountsToSend.isEmpty())
-            return;
-
-        Message onlineAccountsMessage = new OnlineAccountsMessage(accountsToSend);
-        peer.sendMessage(onlineAccountsMessage);
-
-        LOGGER.debug("Sent {} of our {} online accounts to {}", accountsToSend.size(), prefilterSize, peer);
-    }
-
-    public void onNetworkOnlineAccountsMessage(Peer peer, Message message) {
-        OnlineAccountsMessage onlineAccountsMessage = (OnlineAccountsMessage) message;
-
-        List<OnlineAccountData> peersOnlineAccounts = onlineAccountsMessage.getOnlineAccounts();
-        LOGGER.debug("Received {} online accounts from {}", peersOnlineAccounts.size(), peer);
-
-        int importCount = 0;
-
-        // Add any online accounts to the queue that aren't already present
-        for (OnlineAccountData onlineAccountData : peersOnlineAccounts) {
-            boolean isNewEntry = onlineAccountsImportQueue.add(onlineAccountData);
-
-            if (isNewEntry)
-                importCount++;
-        }
-
-        if (importCount > 0)
-            LOGGER.debug("Added {} online accounts to queue", importCount);
-    }
-
-    public void onNetworkGetOnlineAccountsV2Message(Peer peer, Message message) {
-        GetOnlineAccountsV2Message getOnlineAccountsMessage = (GetOnlineAccountsV2Message) message;
-
-        List<OnlineAccountData> excludeAccounts = getOnlineAccountsMessage.getOnlineAccounts();
-
-        // Send online accounts info, excluding entries with matching timestamp & public key from excludeAccounts
-        List<OnlineAccountData> accountsToSend = Set.copyOf(this.currentOnlineAccounts.values()).stream().flatMap(Set::stream).collect(Collectors.toList());
-        int prefilterSize = accountsToSend.size();
-
-        Iterator<OnlineAccountData> iterator = accountsToSend.iterator();
-        while (iterator.hasNext()) {
-            OnlineAccountData onlineAccountData = iterator.next();
-
-            for (OnlineAccountData excludeAccountData : excludeAccounts) {
-                if (onlineAccountData.getTimestamp() == excludeAccountData.getTimestamp() && Arrays.equals(onlineAccountData.getPublicKey(), excludeAccountData.getPublicKey())) {
-                    iterator.remove();
-                    break;
-                }
-            }
-        }
-
-        if (accountsToSend.isEmpty())
-            return;
-
-        Message onlineAccountsMessage = new OnlineAccountsV2Message(accountsToSend);
-        peer.sendMessage(onlineAccountsMessage);
-
-        LOGGER.debug("Sent {} of our {} online accounts to {}", accountsToSend.size(), prefilterSize, peer);
-    }
-
-    public void onNetworkOnlineAccountsV2Message(Peer peer, Message message) {
-        OnlineAccountsV2Message onlineAccountsMessage = (OnlineAccountsV2Message) message;
-
-        List<OnlineAccountData> peersOnlineAccounts = onlineAccountsMessage.getOnlineAccounts();
-        LOGGER.debug("Received {} online accounts from {}", peersOnlineAccounts.size(), peer);
-
-        int importCount = 0;
-
-        // Add any online accounts to the queue that aren't already present
-        for (OnlineAccountData onlineAccountData : peersOnlineAccounts) {
-            boolean isNewEntry = onlineAccountsImportQueue.add(onlineAccountData);
-
-            if (isNewEntry)
-                importCount++;
-        }
-
-        if (importCount > 0)
-            LOGGER.debug("Added {} online accounts to queue", importCount);
-    }
-
     public void onNetworkGetOnlineAccountsV3Message(Peer peer, Message message) {
         GetOnlineAccountsV3Message getOnlineAccountsMessage = (GetOnlineAccountsV3Message) message;
 
@@ -688,7 +792,7 @@ public class OnlineAccountsManager {
                 Set<OnlineAccountData> timestampsOnlineAccounts = this.currentOnlineAccounts.getOrDefault(timestamp, Collections.emptySet());
                 outgoingOnlineAccounts.addAll(timestampsOnlineAccounts);
 
-                LOGGER.debug(() -> String.format("Going to send all %d online accounts for timestamp %d", timestampsOnlineAccounts.size(), timestamp));
+                LOGGER.trace(() -> String.format("Going to send all %d online accounts for timestamp %d", timestampsOnlineAccounts.size(), timestamp));
             } else {
                 // Quick cache of which leading bytes to send so we only have to filter once
                 Set<Byte> outgoingLeadingBytes = new HashSet<>();
@@ -712,7 +816,7 @@ public class OnlineAccountsManager {
                         .forEach(outgoingOnlineAccounts::add);
 
                 if (outgoingOnlineAccounts.size() > beforeAddSize)
-                    LOGGER.debug(String.format("Going to send %d online accounts for timestamp %d and leading bytes %s",
+                    LOGGER.trace(String.format("Going to send %d online accounts for timestamp %d and leading bytes %s",
                             outgoingOnlineAccounts.size() - beforeAddSize,
                             timestamp,
                             outgoingLeadingBytes.stream().sorted(Byte::compareUnsigned).map(leadingByte -> String.format("%02x", leadingByte)).collect(Collectors.joining(", "))
@@ -721,9 +825,34 @@ public class OnlineAccountsManager {
             }
         }
 
-        Message onlineAccountsMessage = new OnlineAccountsV2Message(outgoingOnlineAccounts); // TODO: V3 message
-        peer.sendMessage(onlineAccountsMessage);
+        peer.sendMessage(new OnlineAccountsV3Message(outgoingOnlineAccounts));
 
-        LOGGER.debug("Sent {} online accounts to {}", outgoingOnlineAccounts.size(), peer);
+        LOGGER.trace("Sent {} online accounts to {}", outgoingOnlineAccounts.size(), peer);
+    }
+
+    public void onNetworkOnlineAccountsV3Message(Peer peer, Message message) {
+        OnlineAccountsV3Message onlineAccountsMessage = (OnlineAccountsV3Message) message;
+
+        List<OnlineAccountData> peersOnlineAccounts = onlineAccountsMessage.getOnlineAccounts();
+        LOGGER.trace("Received {} online accounts from {}", peersOnlineAccounts.size(), peer);
+
+        int importCount = 0;
+
+        // Add any online accounts to the queue that aren't already present
+        for (OnlineAccountData onlineAccountData : peersOnlineAccounts) {
+
+            Set<OnlineAccountData> onlineAccounts = this.currentOnlineAccounts.computeIfAbsent(onlineAccountData.getTimestamp(), k -> ConcurrentHashMap.newKeySet());
+            if (onlineAccounts.contains(onlineAccountData))
+                // We have already validated this online account
+                continue;
+
+            boolean isNewEntry = onlineAccountsImportQueue.add(onlineAccountData);
+
+            if (isNewEntry)
+                importCount++;
+        }
+
+        if (importCount > 0)
+            LOGGER.debug("Added {} online accounts to queue", importCount);
     }
 }

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

@@ -0,0 +1,404 @@
+package org.qortal.controller;
+
+import com.rust.litewalletjni.LiteWalletJni;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qortal.arbitrary.ArbitraryDataFile;
+import org.qortal.arbitrary.ArbitraryDataReader;
+import org.qortal.arbitrary.ArbitraryDataResource;
+import org.qortal.arbitrary.exception.MissingDataException;
+import org.qortal.crosschain.ForeignBlockchainException;
+import org.qortal.crosschain.PirateWallet;
+import org.qortal.data.arbitrary.ArbitraryResourceStatus;
+import org.qortal.data.transaction.ArbitraryTransactionData;
+import org.qortal.data.transaction.TransactionData;
+import org.qortal.network.Network;
+import org.qortal.network.Peer;
+import org.qortal.repository.DataException;
+import org.qortal.repository.Repository;
+import org.qortal.repository.RepositoryManager;
+import org.qortal.settings.Settings;
+import org.qortal.transaction.ArbitraryTransaction;
+import org.qortal.utils.ArbitraryTransactionUtils;
+import org.qortal.utils.Base58;
+import org.qortal.utils.FilesystemUtils;
+import org.qortal.utils.NTP;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Objects;
+
+public class PirateChainWalletController extends Thread {
+
+    protected static final Logger LOGGER = LogManager.getLogger(PirateChainWalletController.class);
+
+    private static PirateChainWalletController instance;
+
+    final private static long SAVE_INTERVAL = 60 * 60 * 1000L; // 1 hour
+    private long lastSaveTime = 0L;
+
+    private boolean running;
+    private PirateWallet currentWallet = null;
+    private boolean shouldLoadWallet = false;
+    private String loadStatus = null;
+
+    private static String qdnWalletSignature = "EsfUw54perxkEtfoUoL7Z97XPrNsZRZXePVZPz3cwRm9qyEPSofD5KmgVpDqVitQp7LhnZRmL6z2V9hEe1YS45T";
+
+
+    private PirateChainWalletController() {
+        this.running = true;
+    }
+
+    public static PirateChainWalletController getInstance() {
+        if (instance == null)
+            instance = new PirateChainWalletController();
+
+        return instance;
+    }
+
+    @Override
+    public void run() {
+        Thread.currentThread().setName("Pirate Chain Wallet Controller");
+
+        try {
+            while (running && !Controller.isStopping()) {
+                Thread.sleep(1000);
+
+                // Wait until we have a request to load the wallet
+                if (!shouldLoadWallet) {
+                    continue;
+                }
+
+                if (!LiteWalletJni.isLoaded()) {
+                    this.loadLibrary();
+
+                    // If still not loaded, sleep to prevent too many requests
+                    if (!LiteWalletJni.isLoaded()) {
+                        Thread.sleep(5 * 1000);
+                        continue;
+                    }
+                }
+
+                // Wallet is downloaded, so clear the status
+                this.loadStatus = null;
+
+                if (this.currentWallet == null) {
+                    // Nothing to do yet
+                    continue;
+                }
+                if (this.currentWallet.isNullSeedWallet()) {
+                    // Don't sync the null seed wallet
+                    continue;
+                }
+
+                LOGGER.debug("Syncing Pirate Chain wallet...");
+                String response = LiteWalletJni.execute("sync", "");
+                LOGGER.debug("sync response: {}", response);
+
+                try {
+                    JSONObject json = new JSONObject(response);
+                    if (json.has("result")) {
+                        String result = json.getString("result");
+
+                        // We may have to set wallet to ready if this is the first ever successful sync
+                        if (Objects.equals(result, "success")) {
+                            this.currentWallet.setReady(true);
+                        }
+                    }
+                } catch (JSONException e) {
+                    LOGGER.info("Unable to interpret JSON", e);
+                }
+
+                // Rate limit sync attempts
+                Thread.sleep(30000);
+
+                // Save wallet if needed
+                Long now = NTP.getTime();
+                if (now != null && now-SAVE_INTERVAL >= this.lastSaveTime) {
+                    this.saveCurrentWallet();
+                }
+            }
+        } catch (InterruptedException e) {
+            // Fall-through to exit
+        }
+    }
+
+    public void shutdown() {
+        // Save the wallet
+        this.saveCurrentWallet();
+
+        this.running = false;
+        this.interrupt();
+    }
+
+
+    // QDN & wallet libraries
+
+    private void loadLibrary() throws InterruptedException {
+        try (final Repository repository = RepositoryManager.getRepository()) {
+
+            // Check if architecture is supported
+            String libFileName = PirateChainWalletController.getRustLibFilename();
+            if (libFileName == null) {
+                String osName = System.getProperty("os.name");
+                String osArchitecture = System.getProperty("os.arch");
+                this.loadStatus = String.format("Unsupported architecture (%s %s)", osName, osArchitecture);
+                return;
+            }
+
+            // Check if the library exists in the wallets folder
+            Path libDirectory = PirateChainWalletController.getRustLibOuterDirectory();
+            Path libPath = Paths.get(libDirectory.toString(), libFileName);
+            if (Files.exists(libPath)) {
+                // Already downloaded; we can load the library right away
+                LiteWalletJni.loadLibrary();
+                return;
+            }
+
+            // Library not found, so check if we've fetched the resource from QDN
+            ArbitraryTransactionData t = this.getTransactionData(repository);
+            if (t == null) {
+                // Can't find the transaction - maybe on a different chain?
+                return;
+            }
+
+            // Wait until we have a sufficient number of peers to attempt QDN downloads
+            List<Peer> handshakedPeers = Network.getInstance().getImmutableHandshakedPeers();
+            if (handshakedPeers.size() < Settings.getInstance().getMinBlockchainPeers()) {
+                // Wait for more peers
+                this.loadStatus = String.format("Searching for peers...");
+                return;
+            }
+
+            // Build resource
+            ArbitraryDataReader arbitraryDataReader = new ArbitraryDataReader(t.getName(),
+                    ArbitraryDataFile.ResourceIdType.NAME, t.getService(), t.getIdentifier());
+            try {
+                arbitraryDataReader.loadSynchronously(false);
+            } catch (MissingDataException e) {
+                LOGGER.info("Missing data when loading Pirate Chain library");
+            }
+
+            // Check its status
+            ArbitraryResourceStatus status = ArbitraryTransactionUtils.getStatus(
+                    t.getService(), t.getName(), t.getIdentifier(), false);
+
+            if (status.getStatus() != ArbitraryResourceStatus.Status.READY) {
+                LOGGER.info("Not ready yet: {}", status.getTitle());
+                this.loadStatus = String.format("Downloading files from QDN... (%d / %d)", status.getLocalChunkCount(), status.getTotalChunkCount());
+                return;
+            }
+
+            // Files are downloaded, so copy the necessary files to the wallets folder
+            // Delete the wallets/*/lib directory first, in case earlier versions of the wallet are present
+            Path walletsLibDirectory = PirateChainWalletController.getWalletsLibDirectory();
+            if (Files.exists(walletsLibDirectory)) {
+                FilesystemUtils.safeDeleteDirectory(walletsLibDirectory, false);
+            }
+            Files.createDirectories(libDirectory);
+            FileUtils.copyDirectory(arbitraryDataReader.getFilePath().toFile(), libDirectory.toFile());
+
+            // Clear reader cache so only one copy exists
+            ArbitraryDataResource resource = new ArbitraryDataResource(t.getName(),
+                    ArbitraryDataFile.ResourceIdType.NAME, t.getService(), t.getIdentifier());
+            resource.deleteCache();
+
+            // Finally, load the library
+            LiteWalletJni.loadLibrary();
+
+        } catch (DataException e) {
+            LOGGER.error("Repository issue when loading Pirate Chain library", e);
+        } catch (IOException e) {
+            LOGGER.error("Error when loading Pirate Chain library", e);
+        }
+    }
+
+    private ArbitraryTransactionData getTransactionData(Repository repository) {
+        try {
+            byte[] signature = Base58.decode(qdnWalletSignature);
+            TransactionData transactionData = repository.getTransactionRepository().fromSignature(signature);
+            if (!(transactionData instanceof ArbitraryTransactionData))
+                return null;
+
+            ArbitraryTransaction arbitraryTransaction = new ArbitraryTransaction(repository, transactionData);
+            if (arbitraryTransaction != null) {
+                return (ArbitraryTransactionData) arbitraryTransaction.getTransactionData();
+            }
+
+            return null;
+        } catch (DataException e) {
+            return null;
+        }
+    }
+
+    public static String getRustLibFilename() {
+        String osName = System.getProperty("os.name");
+        String osArchitecture = System.getProperty("os.arch");
+
+        if (osName.equals("Mac OS X") && osArchitecture.equals("x86_64")) {
+            return "librust-macos-x86_64.dylib";
+        }
+        else if ((osName.equals("Linux") || osName.equals("FreeBSD")) && osArchitecture.equals("aarch64")) {
+            return "librust-linux-aarch64.so";
+        }
+        else if ((osName.equals("Linux") || osName.equals("FreeBSD")) && osArchitecture.equals("amd64")) {
+            return "librust-linux-x86_64.so";
+        }
+        else if (osName.contains("Windows") && osArchitecture.equals("amd64")) {
+            return "librust-windows-x86_64.dll";
+        }
+
+        return null;
+    }
+
+    public static Path getWalletsLibDirectory() {
+        return Paths.get(Settings.getInstance().getWalletsPath(), "PirateChain", "lib");
+    }
+
+    public static Path getRustLibOuterDirectory() {
+        String sigPrefix = qdnWalletSignature.substring(0, 8);
+        return Paths.get(Settings.getInstance().getWalletsPath(), "PirateChain", "lib", sigPrefix);
+    }
+
+
+    // Wallet functions
+
+    public boolean initWithEntropy58(String entropy58) {
+        return this.initWithEntropy58(entropy58, false);
+    }
+
+    public boolean initNullSeedWallet() {
+        return this.initWithEntropy58(Base58.encode(new byte[32]), true);
+    }
+
+    private boolean initWithEntropy58(String entropy58, boolean isNullSeedWallet) {
+        // If the JNI library isn't loaded yet then we can't proceed
+        if (!LiteWalletJni.isLoaded()) {
+            shouldLoadWallet = true;
+            return false;
+        }
+
+        byte[] entropyBytes = Base58.decode(entropy58);
+
+        if (entropyBytes == null || entropyBytes.length != 32) {
+            LOGGER.info("Invalid entropy bytes");
+            return false;
+        }
+
+        if (this.currentWallet != null) {
+            if (this.currentWallet.entropyBytesEqual(entropyBytes)) {
+                // Wallet already active - nothing to do
+                return true;
+            }
+            else {
+                // Different wallet requested - close the existing one and switch over
+                this.closeCurrentWallet();
+            }
+        }
+
+        try {
+            this.currentWallet = new PirateWallet(entropyBytes, isNullSeedWallet);
+            if (!this.currentWallet.isReady()) {
+                // Don't persist wallets that aren't ready
+                this.currentWallet = null;
+            }
+            return true;
+        } catch (IOException e) {
+            LOGGER.info("Unable to initialize wallet: {}", e.getMessage());
+        }
+
+        return false;
+    }
+
+    private void saveCurrentWallet() {
+        if (this.currentWallet == null) {
+            // Nothing to do
+            return;
+        }
+        try {
+            if (this.currentWallet.save()) {
+                Long now = NTP.getTime();
+                if (now != null) {
+                    this.lastSaveTime = now;
+                }
+            }
+        } catch (IOException e) {
+            LOGGER.info("Unable to save wallet");
+        }
+    }
+
+    public PirateWallet getCurrentWallet() {
+        return this.currentWallet;
+    }
+
+    private void closeCurrentWallet() {
+        this.saveCurrentWallet();
+        this.currentWallet = null;
+    }
+
+    public void ensureInitialized() throws ForeignBlockchainException {
+        if (!LiteWalletJni.isLoaded() || this.currentWallet == null || !this.currentWallet.isInitialized()) {
+            throw new ForeignBlockchainException("Pirate wallet isn't initialized yet");
+        }
+    }
+
+    public void ensureNotNullSeed() throws ForeignBlockchainException {
+        // Safety check to make sure funds aren't sent to a null seed wallet
+        if (this.currentWallet == null || this.currentWallet.isNullSeedWallet()) {
+            throw new ForeignBlockchainException("Invalid wallet");
+        }
+    }
+
+    public void ensureSynchronized() throws ForeignBlockchainException {
+        if (this.currentWallet == null || !this.currentWallet.isSynchronized()) {
+            throw new ForeignBlockchainException("Wallet isn't synchronized yet");
+        }
+
+        String response = LiteWalletJni.execute("syncStatus", "");
+        JSONObject json = new JSONObject(response);
+        if (json.has("syncing")) {
+            boolean isSyncing = Boolean.valueOf(json.getString("syncing"));
+            if (isSyncing) {
+                long syncedBlocks = json.getLong("synced_blocks");
+                long totalBlocks = json.getLong("total_blocks");
+
+                throw new ForeignBlockchainException(String.format("Sync in progress (%d / %d). Please try again later.", syncedBlocks, totalBlocks));
+            }
+        }
+    }
+
+    public String getSyncStatus() {
+        if (this.currentWallet == null || !this.currentWallet.isInitialized()) {
+            if (this.loadStatus != null) {
+                return this.loadStatus;
+            }
+
+            return "Not initialized yet";
+        }
+
+        String syncStatusResponse = LiteWalletJni.execute("syncStatus", "");
+        org.json.JSONObject json = new JSONObject(syncStatusResponse);
+        if (json.has("syncing")) {
+            boolean isSyncing = Boolean.valueOf(json.getString("syncing"));
+            if (isSyncing) {
+                long syncedBlocks = json.getLong("synced_blocks");
+                long totalBlocks = json.getLong("total_blocks");
+                return String.format("Sync in progress (%d / %d)", syncedBlocks, totalBlocks);
+            }
+        }
+
+        boolean isSynchronized = this.currentWallet.isSynchronized();
+        if (isSynchronized) {
+            return "Synchronized";
+        }
+
+        return "Initializing wallet...";
+    }
+
+}

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

@@ -19,7 +19,6 @@ import org.qortal.block.BlockChain;
 import org.qortal.data.block.BlockData;
 import org.qortal.data.block.BlockSummaryData;
 import org.qortal.data.block.CommonBlockData;
-import org.qortal.data.network.PeerChainTipData;
 import org.qortal.data.transaction.RewardShareTransactionData;
 import org.qortal.data.transaction.TransactionData;
 import org.qortal.event.Event;
@@ -54,7 +53,8 @@ public class Synchronizer extends Thread {
 	/** Maximum number of block signatures we ask from peer in one go */
 	private static final int MAXIMUM_REQUEST_SIZE = 200; // XXX move to Settings?
 
-	private static final long RECOVERY_MODE_TIMEOUT = 10 * 60 * 1000L; // ms
+	/** Maximum number of consecutive failed sync attempts before marking peer as misbehaved */
+	private static final int MAX_CONSECUTIVE_FAILED_SYNC_ATTEMPTS = 3;
 
 
 	private boolean running;
@@ -76,6 +76,8 @@ public class Synchronizer extends Thread {
 	private volatile boolean isSynchronizing = false;
 	/** Temporary estimate of synchronization progress for SysTray use. */
 	private volatile int syncPercent = 0;
+	/** Temporary estimate of blocks remaining for SysTray use. */
+	private volatile int blocksRemaining = 0;
 
 	private static volatile boolean requestSync = false;
 	private boolean syncRequestPending = false;
@@ -181,6 +183,18 @@ public class Synchronizer extends Thread {
 		}
 	}
 
+	public Integer getBlocksRemaining() {
+		synchronized (this.syncLock) {
+			// Report as 0 blocks remaining if the latest block is within the last 60 mins
+			final Long minLatestBlockTimestamp = NTP.getTime() - (60 * 60 * 1000L);
+			if (Controller.getInstance().isUpToDate(minLatestBlockTimestamp)) {
+				return 0;
+			}
+
+			return this.isSynchronizing ? this.blocksRemaining : null;
+		}
+	}
+
 	public void requestSync() {
 		requestSync = true;
 	}
@@ -282,7 +296,7 @@ public class Synchronizer extends Thread {
 		BlockData priorChainTip = Controller.getInstance().getChainTip();
 
 		synchronized (this.syncLock) {
-			this.syncPercent = (priorChainTip.getHeight() * 100) / peer.getChainTipData().getLastHeight();
+			this.syncPercent = (priorChainTip.getHeight() * 100) / peer.getChainTipData().getHeight();
 
 			// Only update SysTray if we're potentially changing height
 			if (this.syncPercent < 100) {
@@ -312,7 +326,7 @@ public class Synchronizer extends Thread {
 
 				case INFERIOR_CHAIN: {
 					// Update our list of inferior chain tips
-					ByteArray inferiorChainSignature = ByteArray.wrap(peer.getChainTipData().getLastBlockSignature());
+					ByteArray inferiorChainSignature = ByteArray.wrap(peer.getChainTipData().getSignature());
 					if (!inferiorChainSignatures.contains(inferiorChainSignature))
 						inferiorChainSignatures.add(inferiorChainSignature);
 
@@ -320,7 +334,8 @@ public class Synchronizer extends Thread {
 					LOGGER.debug(() -> String.format("Refused to synchronize with peer %s (%s)", peer, syncResult.name()));
 
 					// Notify peer of our superior chain
-					if (!peer.sendMessage(Network.getInstance().buildHeightMessage(peer, priorChainTip)))
+					Message message = Network.getInstance().buildHeightOrChainTipInfo(peer);
+					if (message == null || !peer.sendMessage(message))
 						peer.disconnect("failed to notify peer of our superior chain");
 					break;
 				}
@@ -341,7 +356,7 @@ public class Synchronizer extends Thread {
 					// fall-through...
 				case NOTHING_TO_DO: {
 					// Update our list of inferior chain tips
-					ByteArray inferiorChainSignature = ByteArray.wrap(peer.getChainTipData().getLastBlockSignature());
+					ByteArray inferiorChainSignature = ByteArray.wrap(peer.getChainTipData().getSignature());
 					if (!inferiorChainSignatures.contains(inferiorChainSignature))
 						inferiorChainSignatures.add(inferiorChainSignature);
 
@@ -369,8 +384,7 @@ public class Synchronizer extends Thread {
 				// Reset our cache of inferior chains
 				inferiorChainSignatures.clear();
 
-				Network network = Network.getInstance();
-				network.broadcast(broadcastPeer -> network.buildHeightMessage(broadcastPeer, newChainTip));
+				Network.getInstance().broadcastOurChain();
 
 				EventBus.INSTANCE.notify(new NewChainTipEvent(priorChainTip, newChainTip));
 			}
@@ -397,9 +411,10 @@ public class Synchronizer extends Thread {
 					timePeersLastAvailable = NTP.getTime();
 
 				// If enough time has passed, enter recovery mode, which lifts some restrictions on who we can sync with and when we can mint
-				if (NTP.getTime() - timePeersLastAvailable > RECOVERY_MODE_TIMEOUT) {
+				long recoveryModeTimeout = Settings.getInstance().getRecoveryModeTimeout();
+				if (NTP.getTime() - timePeersLastAvailable > recoveryModeTimeout) {
 					if (recoveryMode == false) {
-						LOGGER.info(String.format("Peers have been unavailable for %d minutes. Entering recovery mode...", RECOVERY_MODE_TIMEOUT/60/1000));
+						LOGGER.info(String.format("Peers have been unavailable for %d minutes. Entering recovery mode...", recoveryModeTimeout/60/1000));
 						recoveryMode = true;
 					}
 				}
@@ -513,13 +528,13 @@ public class Synchronizer extends Thread {
 			final BlockData ourLatestBlockData = repository.getBlockRepository().getLastBlock();
 			final int ourInitialHeight = ourLatestBlockData.getHeight();
 
-			PeerChainTipData peerChainTipData = peer.getChainTipData();
-			int peerHeight = peerChainTipData.getLastHeight();
-			byte[] peersLastBlockSignature = peerChainTipData.getLastBlockSignature();
+			BlockSummaryData peerChainTipData = peer.getChainTipData();
+			int peerHeight = peerChainTipData.getHeight();
+			byte[] peersLastBlockSignature = peerChainTipData.getSignature();
 
 			byte[] ourLastBlockSignature = ourLatestBlockData.getSignature();
 			LOGGER.debug(String.format("Fetching summaries from peer %s at height %d, sig %.8s, ts %d; our height %d, sig %.8s, ts %d", peer,
-					peerHeight, Base58.encode(peersLastBlockSignature), peer.getChainTipData().getLastBlockTimestamp(),
+					peerHeight, Base58.encode(peersLastBlockSignature), peerChainTipData.getTimestamp(),
 					ourInitialHeight, Base58.encode(ourLastBlockSignature), ourLatestBlockData.getTimestamp()));
 
 			List<BlockSummaryData> peerBlockSummaries = new ArrayList<>();
@@ -637,9 +652,9 @@ public class Synchronizer extends Thread {
 							return peers;
 
 						// Count the number of blocks this peer has beyond our common block
-						final PeerChainTipData peerChainTipData = peer.getChainTipData();
-						final int peerHeight = peerChainTipData.getLastHeight();
-						final byte[] peerLastBlockSignature = peerChainTipData.getLastBlockSignature();
+						final BlockSummaryData peerChainTipData = peer.getChainTipData();
+						final int peerHeight = peerChainTipData.getHeight();
+						final byte[] peerLastBlockSignature = peerChainTipData.getSignature();
 						final int peerAdditionalBlocksAfterCommonBlock = peerHeight - commonBlockSummary.getHeight();
 						// Limit the number of blocks we are comparing. FUTURE: we could request more in batches, but there may not be a case when this is needed
 						int summariesRequired = Math.min(peerAdditionalBlocksAfterCommonBlock, MAXIMUM_REQUEST_SIZE);
@@ -727,8 +742,9 @@ public class Synchronizer extends Thread {
 
 					LOGGER.debug(String.format("Listing peers with common block %.8s...", Base58.encode(commonBlockSummary.getSignature())));
 					for (Peer peer : peersSharingCommonBlock) {
-						final int peerHeight = peer.getChainTipData().getLastHeight();
-						final Long peerLastBlockTimestamp = peer.getChainTipData().getLastBlockTimestamp();
+						BlockSummaryData peerChainTipData = peer.getChainTipData();
+						final int peerHeight = peerChainTipData.getHeight();
+						final Long peerLastBlockTimestamp = peerChainTipData.getTimestamp();
 						final int peerAdditionalBlocksAfterCommonBlock = peerHeight - commonBlockSummary.getHeight();
 						final CommonBlockData peerCommonBlockData = peer.getCommonBlockData();
 
@@ -825,7 +841,7 @@ public class Synchronizer extends Thread {
 		// Calculate the length of the shortest peer chain sharing this common block
 		int minChainLength = 0;
 		for (Peer peer : peersSharingCommonBlock) {
-			final int peerHeight = peer.getChainTipData().getLastHeight();
+			final int peerHeight = peer.getChainTipData().getHeight();
 			final int peerAdditionalBlocksAfterCommonBlock = peerHeight - commonBlockSummary.getHeight();
 
 			if (peerAdditionalBlocksAfterCommonBlock < minChainLength || minChainLength == 0)
@@ -933,13 +949,13 @@ public class Synchronizer extends Thread {
 					final BlockData ourLatestBlockData = repository.getBlockRepository().getLastBlock();
 					final int ourInitialHeight = ourLatestBlockData.getHeight();
 
-					PeerChainTipData peerChainTipData = peer.getChainTipData();
-					int peerHeight = peerChainTipData.getLastHeight();
-					byte[] peersLastBlockSignature = peerChainTipData.getLastBlockSignature();
+					BlockSummaryData peerChainTipData = peer.getChainTipData();
+					int peerHeight = peerChainTipData.getHeight();
+					byte[] peersLastBlockSignature = peerChainTipData.getSignature();
 
 					byte[] ourLastBlockSignature = ourLatestBlockData.getSignature();
 					String syncString = String.format("Synchronizing with peer %s at height %d, sig %.8s, ts %d; our height %d, sig %.8s, ts %d", peer,
-							peerHeight, Base58.encode(peersLastBlockSignature), peer.getChainTipData().getLastBlockTimestamp(),
+							peerHeight, Base58.encode(peersLastBlockSignature), peerChainTipData.getTimestamp(),
 							ourInitialHeight, Base58.encode(ourLastBlockSignature), ourLatestBlockData.getTimestamp());
 					LOGGER.info(syncString);
 
@@ -1246,7 +1262,14 @@ public class Synchronizer extends Thread {
 		int numberSignaturesRequired = additionalPeerBlocksAfterCommonBlock - peerBlockSignatures.size();
 
 		int retryCount = 0;
-		while (height < peerHeight) {
+
+		// Keep fetching blocks from peer until we reach their tip, or reach a count of MAXIMUM_COMMON_DELTA blocks.
+		// We need to limit the total number, otherwise too much can be loaded into memory, causing an
+		// OutOfMemoryException. This is common when syncing from 1000+ blocks behind the chain tip, after starting
+		// from a small fork that didn't become part of the main chain. This causes the entire sync process to
+		// use syncToPeerChain(), resulting in potentially thousands of blocks being held in memory if the limit
+		// below isn't applied.
+		while (height < peerHeight && peerBlocks.size() <= MAXIMUM_COMMON_DELTA) {
 			if (Controller.isStopping())
 				return SynchronizationResult.SHUTTING_DOWN;
 
@@ -1313,7 +1336,7 @@ public class Synchronizer extends Thread {
 			// Final check to make sure the peer isn't out of date (except for when we're in recovery mode)
 			if (!recoveryMode && peer.getChainTipData() != null) {
 				final Long minLatestBlockTimestamp = Controller.getMinimumLatestBlockTimestamp();
-				final Long peerLastBlockTimestamp = peer.getChainTipData().getLastBlockTimestamp();
+				final Long peerLastBlockTimestamp = peer.getChainTipData().getTimestamp();
 				if (peerLastBlockTimestamp == null || peerLastBlockTimestamp < minLatestBlockTimestamp) {
 					LOGGER.info(String.format("Peer %s is out of date, so abandoning sync attempt", peer));
 					return SynchronizationResult.CHAIN_TIP_TOO_OLD;
@@ -1448,6 +1471,12 @@ public class Synchronizer extends Thread {
 
 			repository.saveChanges();
 
+			synchronized (this.syncLock) {
+				if (peer.getChainTipData() != null) {
+					this.blocksRemaining = peer.getChainTipData().getHeight() - newBlock.getBlockData().getHeight();
+				}
+			}
+
 			Controller.getInstance().onNewBlock(newBlock.getBlockData());
 		}
 
@@ -1543,6 +1572,12 @@ public class Synchronizer extends Thread {
 
 			repository.saveChanges();
 
+			synchronized (this.syncLock) {
+				if (peer.getChainTipData() != null) {
+					this.blocksRemaining = peer.getChainTipData().getHeight() - newBlock.getBlockData().getHeight();
+				}
+			}
+
 			Controller.getInstance().onNewBlock(newBlock.getBlockData());
 		}
 
@@ -1553,12 +1588,19 @@ public class Synchronizer extends Thread {
 		Message getBlockSummariesMessage = new GetBlockSummariesMessage(parentSignature, numberRequested);
 
 		Message message = peer.getResponse(getBlockSummariesMessage);
-		if (message == null || message.getType() != MessageType.BLOCK_SUMMARIES)
+		if (message == null)
 			return null;
 
-		BlockSummariesMessage blockSummariesMessage = (BlockSummariesMessage) message;
+		if (message.getType() == MessageType.BLOCK_SUMMARIES) {
+			BlockSummariesMessage blockSummariesMessage = (BlockSummariesMessage) message;
+			return blockSummariesMessage.getBlockSummaries();
+		}
+		else if (message.getType() == MessageType.BLOCK_SUMMARIES_V2) {
+			BlockSummariesV2Message blockSummariesMessage = (BlockSummariesV2Message) message;
+			return blockSummariesMessage.getBlockSummaries();
+		}
 
-		return blockSummariesMessage.getBlockSummaries();
+		return null;
 	}
 
 	private List<byte[]> getBlockSignatures(Peer peer, byte[] parentSignature, int numberRequested) throws InterruptedException {
@@ -1577,8 +1619,20 @@ public class Synchronizer extends Thread {
 		Message getBlockMessage = new GetBlockMessage(signature);
 
 		Message message = peer.getResponse(getBlockMessage);
-		if (message == null)
+		if (message == null) {
+			peer.getPeerData().incrementFailedSyncCount();
+			if (peer.getPeerData().getFailedSyncCount() >= MAX_CONSECUTIVE_FAILED_SYNC_ATTEMPTS) {
+				// Several failed attempts, so mark peer as misbehaved
+				LOGGER.info("Marking peer {} as misbehaved due to {} failed sync attempts", peer, peer.getPeerData().getFailedSyncCount());
+				Network.getInstance().peerMisbehaved(peer);
+			}
 			return null;
+		}
+
+		// Reset failed sync count now that we have a block response
+		// FUTURE: we could move this to the end of the sync process, but to reduce risk this can be done
+		// at a later stage. For now we are only defending against serialization errors or no responses.
+		peer.getPeerData().setFailedSyncCount(0);
 
 		switch (message.getType()) {
 			case BLOCK: {

src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java

@@ -123,12 +123,22 @@ public class ArbitraryDataFileListManager {
             }
         }
 
-        // Then allow another 5 attempts, each 5 minutes apart
+        // Then allow another 3 attempts, each 5 minutes apart
         if (timeSinceLastAttempt > 5 * 60 * 1000L) {
             // We haven't tried for at least 5 minutes
 
-            if (networkBroadcastCount < 5) {
-                // We've made less than 5 total attempts
+            if (networkBroadcastCount < 6) {
+                // We've made less than 6 total attempts
+                return true;
+            }
+        }
+
+        // Then allow another 4 attempts, each 30 minutes apart
+        if (timeSinceLastAttempt > 30 * 60 * 1000L) {
+            // We haven't tried for at least 5 minutes
+
+            if (networkBroadcastCount < 10) {
+                // We've made less than 10 total attempts
                 return true;
             }
         }
@@ -187,8 +197,8 @@ public class ArbitraryDataFileListManager {
             }
         }
 
-        if (timeSinceLastAttempt > 24 * 60 * 60 * 1000L) {
-            // We haven't tried for at least 24 hours
+        if (timeSinceLastAttempt > 60 * 60 * 1000L) {
+            // We haven't tried for at least 1 hour
             return true;
         }
 

src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java

@@ -595,9 +595,10 @@ public class ArbitraryDataFileManager extends Thread {
                 // Send valid, yet unexpected message type in response, so peer's synchronizer doesn't have to wait for timeout
                 LOGGER.debug(String.format("Sending 'file unknown' response to peer %s for GET_FILE request for unknown file %s", peer, arbitraryDataFile));
 
-                // We'll send empty block summaries message as it's very short
-                // TODO: use a different message type here
-                Message fileUnknownMessage = new BlockSummariesMessage(Collections.emptyList());
+                // Send generic 'unknown' message as it's very short
+                Message fileUnknownMessage = peer.getPeersVersion() >= GenericUnknownMessage.MINIMUM_PEER_VERSION
+                        ? new GenericUnknownMessage()
+                        : new BlockSummariesMessage(Collections.emptyList());
                 fileUnknownMessage.setId(message.getId());
                 if (!peer.sendMessage(fileUnknownMessage)) {
                     LOGGER.debug("Couldn't sent file-unknown response");

src/main/java/org/qortal/controller/repository/BlockArchiver.java

@@ -16,7 +16,7 @@ public class BlockArchiver implements Runnable {
 
 	private static final Logger LOGGER = LogManager.getLogger(BlockArchiver.class);
 
-	private static final long INITIAL_SLEEP_PERIOD = 0L; // TODO: 5 * 60 * 1000L + 1234L; // ms
+	private static final long INITIAL_SLEEP_PERIOD = 5 * 60 * 1000L + 1234L; // ms
 
 	public void run() {
 		Thread.currentThread().setName("Block archiver");

src/main/java/org/qortal/controller/tradebot/LitecoinACCTv2TradeBot.java

@@ -1,885 +0,0 @@
-package org.qortal.controller.tradebot;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bitcoinj.core.*;
-import org.bitcoinj.script.Script.ScriptType;
-import org.qortal.account.PrivateKeyAccount;
-import org.qortal.account.PublicKeyAccount;
-import org.qortal.api.model.crosschain.TradeBotCreateRequest;
-import org.qortal.asset.Asset;
-import org.qortal.crosschain.*;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.at.ATData;
-import org.qortal.data.crosschain.CrossChainTradeData;
-import org.qortal.data.crosschain.TradeBotData;
-import org.qortal.data.transaction.BaseTransactionData;
-import org.qortal.data.transaction.DeployAtTransactionData;
-import org.qortal.data.transaction.MessageTransactionData;
-import org.qortal.group.Group;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.transaction.DeployAtTransaction;
-import org.qortal.transaction.MessageTransaction;
-import org.qortal.transaction.Transaction.ValidationResult;
-import org.qortal.transform.TransformationException;
-import org.qortal.transform.transaction.DeployAtTransactionTransformer;
-import org.qortal.utils.Base58;
-import org.qortal.utils.NTP;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toMap;
-
-/**
- * Performing cross-chain trading steps on behalf of user.
- * <p>
- * We deal with three different independent state-spaces here:
- * <ul>
- * 	<li>Qortal blockchain</li>
- * 	<li>Foreign blockchain</li>
- * 	<li>Trade-bot entries</li>
- * </ul>
- */
-public class LitecoinACCTv2TradeBot implements AcctTradeBot {
-
-	private static final Logger LOGGER = LogManager.getLogger(LitecoinACCTv2TradeBot.class);
-
-	public enum State implements TradeBot.StateNameAndValueSupplier {
-		BOB_WAITING_FOR_AT_CONFIRM(10, false, false),
-		BOB_WAITING_FOR_MESSAGE(15, true, true),
-		BOB_WAITING_FOR_AT_REDEEM(25, true, true),
-		BOB_DONE(30, false, false),
-		BOB_REFUNDED(35, false, false),
-
-		ALICE_WAITING_FOR_AT_LOCK(85, true, true),
-		ALICE_DONE(95, false, false),
-		ALICE_REFUNDING_A(105, true, true),
-		ALICE_REFUNDED(110, false, false);
-
-		private static final Map<Integer, State> map = stream(State.values()).collect(toMap(state -> state.value, state -> state));
-
-		public final int value;
-		public final boolean requiresAtData;
-		public final boolean requiresTradeData;
-
-		State(int value, boolean requiresAtData, boolean requiresTradeData) {
-			this.value = value;
-			this.requiresAtData = requiresAtData;
-			this.requiresTradeData = requiresTradeData;
-		}
-
-		public static State valueOf(int value) {
-			return map.get(value);
-		}
-
-		@Override
-		public String getState() {
-			return this.name();
-		}
-
-		@Override
-		public int getStateValue() {
-			return this.value;
-		}
-	}
-
-	/** Maximum time Bob waits for his AT creation transaction to be confirmed into a block. (milliseconds) */
-	private static final long MAX_AT_CONFIRMATION_PERIOD = 24 * 60 * 60 * 1000L; // ms
-
-	private static LitecoinACCTv2TradeBot instance;
-
-	private final List<String> endStates = Arrays.asList(State.BOB_DONE, State.BOB_REFUNDED, State.ALICE_DONE, State.ALICE_REFUNDING_A, State.ALICE_REFUNDED).stream()
-			.map(State::name)
-			.collect(Collectors.toUnmodifiableList());
-
-	private LitecoinACCTv2TradeBot() {
-	}
-
-	public static synchronized LitecoinACCTv2TradeBot getInstance() {
-		if (instance == null)
-			instance = new LitecoinACCTv2TradeBot();
-
-		return instance;
-	}
-
-	@Override
-	public List<String> getEndStates() {
-		return this.endStates;
-	}
-
-	/**
-	 * Creates a new trade-bot entry from the "Bob" viewpoint, i.e. OFFERing QORT in exchange for LTC.
-	 * <p>
-	 * Generates:
-	 * <ul>
-	 * 	<li>new 'trade' private key</li>
-	 * </ul>
-	 * Derives:
-	 * <ul>
-	 * 	<li>'native' (as in Qortal) public key, public key hash, address (starting with Q)</li>
-	 * 	<li>'foreign' (as in Litecoin) public key, public key hash</li>
-	 * </ul>
-	 * A Qortal AT is then constructed including the following as constants in the 'data segment':
-	 * <ul>
-	 * 	<li>'native'/Qortal 'trade' address - used as a MESSAGE contact</li>
-	 * 	<li>'foreign'/Litecoin public key hash - used by Alice's P2SH scripts to allow redeem</li>
-	 * 	<li>QORT amount on offer by Bob</li>
-	 * 	<li>LTC amount expected in return by Bob (from Alice)</li>
-	 * 	<li>trading timeout, in case things go wrong and everyone needs to refund</li>
-	 * </ul>
-	 * Returns a DEPLOY_AT transaction that needs to be signed and broadcast to the Qortal network.
-	 * <p>
-	 * Trade-bot will wait for Bob's AT to be deployed before taking next step.
-	 * <p>
-	 * @param repository
-	 * @param tradeBotCreateRequest
-	 * @return raw, unsigned DEPLOY_AT transaction
-	 * @throws DataException
-	 */
-	public byte[] createTrade(Repository repository, TradeBotCreateRequest tradeBotCreateRequest) throws DataException {
-		byte[] tradePrivateKey = TradeBot.generateTradePrivateKey();
-
-		byte[] tradeNativePublicKey = TradeBot.deriveTradeNativePublicKey(tradePrivateKey);
-		byte[] tradeNativePublicKeyHash = Crypto.hash160(tradeNativePublicKey);
-		String tradeNativeAddress = Crypto.toAddress(tradeNativePublicKey);
-
-		byte[] tradeForeignPublicKey = TradeBot.deriveTradeForeignPublicKey(tradePrivateKey);
-		byte[] tradeForeignPublicKeyHash = Crypto.hash160(tradeForeignPublicKey);
-
-		// Convert Litecoin receiving address into public key hash (we only support P2PKH at this time)
-		Address litecoinReceivingAddress;
-		try {
-			litecoinReceivingAddress = Address.fromString(Litecoin.getInstance().getNetworkParameters(), tradeBotCreateRequest.receivingAddress);
-		} catch (AddressFormatException e) {
-			throw new DataException("Unsupported Litecoin receiving address: " + tradeBotCreateRequest.receivingAddress);
-		}
-		if (litecoinReceivingAddress.getOutputScriptType() != ScriptType.P2PKH)
-			throw new DataException("Unsupported Litecoin receiving address: " + tradeBotCreateRequest.receivingAddress);
-
-		byte[] litecoinReceivingAccountInfo = litecoinReceivingAddress.getHash();
-
-		PublicKeyAccount creator = new PublicKeyAccount(repository, tradeBotCreateRequest.creatorPublicKey);
-
-		// Deploy AT
-		long timestamp = NTP.getTime();
-		byte[] reference = creator.getLastReference();
-		long fee = 0L;
-		byte[] signature = null;
-		BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, Group.NO_GROUP, reference, creator.getPublicKey(), fee, signature);
-
-		String name = "QORT/LTC ACCT";
-		String description = "QORT/LTC cross-chain trade";
-		String aTType = "ACCT";
-		String tags = "ACCT QORT LTC";
-		byte[] creationBytes = LitecoinACCTv2.buildQortalAT(tradeNativeAddress, tradeForeignPublicKeyHash, tradeBotCreateRequest.qortAmount,
-				tradeBotCreateRequest.foreignAmount, tradeBotCreateRequest.tradeTimeout);
-		long amount = tradeBotCreateRequest.fundingQortAmount;
-
-		DeployAtTransactionData deployAtTransactionData = new DeployAtTransactionData(baseTransactionData, name, description, aTType, tags, creationBytes, amount, Asset.QORT);
-
-		DeployAtTransaction deployAtTransaction = new DeployAtTransaction(repository, deployAtTransactionData);
-		fee = deployAtTransaction.calcRecommendedFee();
-		deployAtTransactionData.setFee(fee);
-
-		DeployAtTransaction.ensureATAddress(deployAtTransactionData);
-		String atAddress = deployAtTransactionData.getAtAddress();
-
-		TradeBotData tradeBotData =  new TradeBotData(tradePrivateKey, LitecoinACCTv2.NAME,
-				State.BOB_WAITING_FOR_AT_CONFIRM.name(), State.BOB_WAITING_FOR_AT_CONFIRM.value,
-				creator.getAddress(), atAddress, timestamp, tradeBotCreateRequest.qortAmount,
-				tradeNativePublicKey, tradeNativePublicKeyHash, tradeNativeAddress,
-				null, null,
-				SupportedBlockchain.LITECOIN.name(),
-				tradeForeignPublicKey, tradeForeignPublicKeyHash,
-				tradeBotCreateRequest.foreignAmount, null, null, null, litecoinReceivingAccountInfo);
-
-		TradeBot.updateTradeBotState(repository, tradeBotData, () -> String.format("Built AT %s. Waiting for deployment", atAddress));
-
-		// Attempt to backup the trade bot data
-		TradeBot.backupTradeBotData(repository, null);
-
-		// Return to user for signing and broadcast as we don't have their Qortal private key
-		try {
-			return DeployAtTransactionTransformer.toBytes(deployAtTransactionData);
-		} catch (TransformationException e) {
-			throw new DataException("Failed to transform DEPLOY_AT transaction?", e);
-		}
-	}
-
-	/**
-	 * Creates a trade-bot entry from the 'Alice' viewpoint, i.e. matching LTC to an existing offer.
-	 * <p>
-	 * Requires a chosen trade offer from Bob, passed by <tt>crossChainTradeData</tt>
-	 * and access to a Litecoin wallet via <tt>xprv58</tt>.
-	 * <p>
-	 * The <tt>crossChainTradeData</tt> contains the current trade offer state
-	 * as extracted from the AT's data segment.
-	 * <p>
-	 * Access to a funded wallet is via a Litecoin BIP32 hierarchical deterministic key,
-	 * passed via <tt>xprv58</tt>.
-	 * <b>This key will be stored in your node's database</b>
-	 * to allow trade-bot to create/fund the necessary P2SH transactions!
-	 * However, due to the nature of BIP32 keys, it is possible to give the trade-bot
-	 * only a subset of wallet access (see BIP32 for more details).
-	 * <p>
-	 * As an example, the xprv58 can be extract from a <i>legacy, password-less</i>
-	 * Electrum wallet by going to the console tab and entering:<br>
-	 * <tt>wallet.keystore.xprv</tt><br>
-	 * which should result in a base58 string starting with either 'xprv' (for Litecoin main-net)
-	 * or 'tprv' for (Litecoin test-net).
-	 * <p>
-	 * It is envisaged that the value in <tt>xprv58</tt> will actually come from a Qortal-UI-managed wallet.
-	 * <p>
-	 * If sufficient funds are available, <b>this method will actually fund the P2SH-A</b>
-	 * with the Litecoin amount expected by 'Bob'.
-	 * <p>
-	 * If the Litecoin transaction is successfully broadcast to the network then
-	 * we also send a MESSAGE to Bob's trade-bot to let them know.
-	 * <p>
-	 * The trade-bot entry is saved to the repository and the cross-chain trading process commences.
-	 * <p>
-	 * @param repository
-	 * @param crossChainTradeData chosen trade OFFER that Alice wants to match
-	 * @param xprv58 funded wallet xprv in base58
-	 * @return true if P2SH-A funding transaction successfully broadcast to Litecoin network, false otherwise
-	 * @throws DataException
-	 */
-	public ResponseResult startResponse(Repository repository, ATData atData, ACCT acct, CrossChainTradeData crossChainTradeData, String xprv58, String receivingAddress) throws DataException {
-		byte[] tradePrivateKey = TradeBot.generateTradePrivateKey();
-		byte[] secretA = TradeBot.generateSecret();
-		byte[] hashOfSecretA = Crypto.hash160(secretA);
-
-		byte[] tradeNativePublicKey = TradeBot.deriveTradeNativePublicKey(tradePrivateKey);
-		byte[] tradeNativePublicKeyHash = Crypto.hash160(tradeNativePublicKey);
-		String tradeNativeAddress = Crypto.toAddress(tradeNativePublicKey);
-
-		byte[] tradeForeignPublicKey = TradeBot.deriveTradeForeignPublicKey(tradePrivateKey);
-		byte[] tradeForeignPublicKeyHash = Crypto.hash160(tradeForeignPublicKey);
-		byte[] receivingPublicKeyHash = Base58.decode(receivingAddress); // Actually the whole address, not just PKH
-
-		// We need to generate lockTime-A: add tradeTimeout to now
-		long now = NTP.getTime();
-		int lockTimeA = crossChainTradeData.tradeTimeout * 60 + (int) (now / 1000L);
-
-		TradeBotData tradeBotData =  new TradeBotData(tradePrivateKey, LitecoinACCTv2.NAME,
-				State.ALICE_WAITING_FOR_AT_LOCK.name(), State.ALICE_WAITING_FOR_AT_LOCK.value,
-				receivingAddress, crossChainTradeData.qortalAtAddress, now, crossChainTradeData.qortAmount,
-				tradeNativePublicKey, tradeNativePublicKeyHash, tradeNativeAddress,
-				secretA, hashOfSecretA,
-				SupportedBlockchain.LITECOIN.name(),
-				tradeForeignPublicKey, tradeForeignPublicKeyHash,
-				crossChainTradeData.expectedForeignAmount, xprv58, null, lockTimeA, receivingPublicKeyHash);
-
-		// Attempt to backup the trade bot data
-		// Include tradeBotData as an additional parameter, since it's not in the repository yet
-		TradeBot.backupTradeBotData(repository, Arrays.asList(tradeBotData));
-
-		// Check we have enough funds via xprv58 to fund P2SH to cover expectedForeignAmount
-		long p2shFee;
-		try {
-			p2shFee = Litecoin.getInstance().getP2shFee(now);
-		} catch (ForeignBlockchainException e) {
-			LOGGER.debug("Couldn't estimate Litecoin fees?");
-			return ResponseResult.NETWORK_ISSUE;
-		}
-
-		// Fee for redeem/refund is subtracted from P2SH-A balance.
-		// Do not include fee for funding transaction as this is covered by buildSpend()
-		long amountA = crossChainTradeData.expectedForeignAmount + p2shFee /*redeeming/refunding P2SH-A*/;
-
-		// P2SH-A to be funded
-		byte[] redeemScriptBytes = BitcoinyHTLC.buildScript(tradeForeignPublicKeyHash, lockTimeA, crossChainTradeData.creatorForeignPKH, hashOfSecretA);
-		String p2shAddress = Litecoin.getInstance().deriveP2shAddress(redeemScriptBytes);
-
-		// Build transaction for funding P2SH-A
-		Transaction p2shFundingTransaction = Litecoin.getInstance().buildSpend(tradeBotData.getForeignKey(), p2shAddress, amountA);
-		if (p2shFundingTransaction == null) {
-			LOGGER.debug("Unable to build P2SH-A funding transaction - lack of funds?");
-			return ResponseResult.BALANCE_ISSUE;
-		}
-
-		try {
-			Litecoin.getInstance().broadcastTransaction(p2shFundingTransaction);
-		} catch (ForeignBlockchainException e) {
-			// We couldn't fund P2SH-A at this time
-			LOGGER.debug("Couldn't broadcast P2SH-A funding transaction?");
-			return ResponseResult.NETWORK_ISSUE;
-		}
-
-		// Attempt to send MESSAGE to Bob's Qortal trade address
-		byte[] messageData = LitecoinACCTv2.buildOfferMessage(tradeBotData.getTradeForeignPublicKeyHash(), tradeBotData.getHashOfSecret(), tradeBotData.getLockTimeA());
-		String messageRecipient = crossChainTradeData.qortalCreatorTradeAddress;
-
-		boolean isMessageAlreadySent = repository.getMessageRepository().exists(tradeBotData.getTradeNativePublicKey(), messageRecipient, messageData);
-		if (!isMessageAlreadySent) {
-			PrivateKeyAccount sender = new PrivateKeyAccount(repository, tradeBotData.getTradePrivateKey());
-			MessageTransaction messageTransaction = MessageTransaction.build(repository, sender, Group.NO_GROUP, messageRecipient, messageData, false, false);
-
-			messageTransaction.computeNonce();
-			messageTransaction.sign(sender);
-
-			// reset repository state to prevent deadlock
-			repository.discardChanges();
-			ValidationResult result = messageTransaction.importAsUnconfirmed();
-
-			if (result != ValidationResult.OK) {
-				LOGGER.warn(() -> String.format("Unable to send MESSAGE to Bob's trade-bot %s: %s", messageRecipient, result.name()));
-				return ResponseResult.NETWORK_ISSUE;
-			}
-		}
-
-		TradeBot.updateTradeBotState(repository, tradeBotData, () -> String.format("Funding P2SH-A %s. Messaged Bob. Waiting for AT-lock", p2shAddress));
-
-		return ResponseResult.OK;
-	}
-
-	@Override
-	public boolean canDelete(Repository repository, TradeBotData tradeBotData) throws DataException {
-		State tradeBotState = State.valueOf(tradeBotData.getStateValue());
-		if (tradeBotState == null)
-			return true;
-
-		// If the AT doesn't exist then we might as well let the user tidy up
-		if (!repository.getATRepository().exists(tradeBotData.getAtAddress()))
-			return true;
-
-		switch (tradeBotState) {
-			case BOB_WAITING_FOR_AT_CONFIRM:
-			case ALICE_DONE:
-			case BOB_DONE:
-			case ALICE_REFUNDED:
-			case BOB_REFUNDED:
-			case ALICE_REFUNDING_A:
-				return true;
-
-			default:
-				return false;
-		}
-	}
-
-	@Override
-	public void progress(Repository repository, TradeBotData tradeBotData) throws DataException, ForeignBlockchainException {
-		State tradeBotState = State.valueOf(tradeBotData.getStateValue());
-		if (tradeBotState == null) {
-			LOGGER.info(() -> String.format("Trade-bot entry for AT %s has invalid state?", tradeBotData.getAtAddress()));
-			return;
-		}
-
-		ATData atData = null;
-		CrossChainTradeData tradeData = null;
-
-		if (tradeBotState.requiresAtData) {
-			// Attempt to fetch AT data
-			atData = repository.getATRepository().fromATAddress(tradeBotData.getAtAddress());
-			if (atData == null) {
-				LOGGER.debug(() -> String.format("Unable to fetch trade AT %s from repository", tradeBotData.getAtAddress()));
-				return;
-			}
-
-			if (tradeBotState.requiresTradeData) {
-				tradeData = LitecoinACCTv2.getInstance().populateTradeData(repository, atData);
-				if (tradeData == null) {
-					LOGGER.warn(() -> String.format("Unable to fetch ACCT trade data for AT %s from repository", tradeBotData.getAtAddress()));
-					return;
-				}
-			}
-		}
-
-		switch (tradeBotState) {
-			case BOB_WAITING_FOR_AT_CONFIRM:
-				handleBobWaitingForAtConfirm(repository, tradeBotData);
-				break;
-
-			case BOB_WAITING_FOR_MESSAGE:
-				TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
-				handleBobWaitingForMessage(repository, tradeBotData, atData, tradeData);
-				break;
-
-			case ALICE_WAITING_FOR_AT_LOCK:
-				TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
-				handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
-				break;
-
-			case BOB_WAITING_FOR_AT_REDEEM:
-				TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
-				handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
-				break;
-
-			case ALICE_DONE:
-			case BOB_DONE:
-				break;
-
-			case ALICE_REFUNDING_A:
-				TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
-				handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
-				break;
-
-			case ALICE_REFUNDED:
-			case BOB_REFUNDED:
-				break;
-		}
-	}
-
-	/**
-	 * Trade-bot is waiting for Bob's AT to deploy.
-	 * <p>
-	 * If AT is deployed, then trade-bot's next step is to wait for MESSAGE from Alice.
-	 */
-	private void handleBobWaitingForAtConfirm(Repository repository, TradeBotData tradeBotData) throws DataException {
-		if (!repository.getATRepository().exists(tradeBotData.getAtAddress())) {
-			if (NTP.getTime() - tradeBotData.getTimestamp() <= MAX_AT_CONFIRMATION_PERIOD)
-				return;
-
-			// We've waited ages for AT to be confirmed into a block but something has gone awry.
-			// After this long we assume transaction loss so give up with trade-bot entry too.
-			tradeBotData.setState(State.BOB_REFUNDED.name());
-			tradeBotData.setStateValue(State.BOB_REFUNDED.value);
-			tradeBotData.setTimestamp(NTP.getTime());
-			// We delete trade-bot entry here instead of saving, hence not using updateTradeBotState()
-			repository.getCrossChainRepository().delete(tradeBotData.getTradePrivateKey());
-			repository.saveChanges();
-
-			LOGGER.info(() -> String.format("AT %s never confirmed. Giving up on trade", tradeBotData.getAtAddress()));
-			TradeBot.notifyStateChange(tradeBotData);
-			return;
-		}
-
-		TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_WAITING_FOR_MESSAGE,
-				() -> String.format("AT %s confirmed ready. Waiting for trade message", tradeBotData.getAtAddress()));
-	}
-
-	/**
-	 * Trade-bot is waiting for MESSAGE from Alice's trade-bot, containing Alice's trade info.
-	 * <p>
-	 * It's possible Bob has cancelling his trade offer, receiving an automatic QORT refund,
-	 * in which case trade-bot is done with this specific trade and finalizes on refunded state.
-	 * <p>
-	 * Assuming trade is still on offer, trade-bot checks the contents of MESSAGE from Alice's trade-bot.
-	 * <p>
-	 * Details from Alice are used to derive P2SH-A address and this is checked for funding balance.
-	 * <p>
-	 * Assuming P2SH-A has at least expected Litecoin balance,
-	 * Bob's trade-bot constructs a zero-fee, PoW MESSAGE to send to Bob's AT with more trade details.
-	 * <p>
-	 * On processing this MESSAGE, Bob's AT should switch into 'TRADE' mode and only trade with Alice.
-	 * <p>
-	 * Trade-bot's next step is to wait for Alice to redeem the AT, which will allow Bob to
-	 * extract secret-A needed to redeem Alice's P2SH.
-	 * @throws ForeignBlockchainException
-	 */
-	private void handleBobWaitingForMessage(Repository repository, TradeBotData tradeBotData,
-			ATData atData, CrossChainTradeData crossChainTradeData) throws DataException, ForeignBlockchainException {
-		// If AT has finished then Bob likely cancelled his trade offer
-		if (atData.getIsFinished()) {
-			TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_REFUNDED,
-					() -> String.format("AT %s cancelled - trading aborted", tradeBotData.getAtAddress()));
-			return;
-		}
-
-		Litecoin litecoin = Litecoin.getInstance();
-
-		String address = tradeBotData.getTradeNativeAddress();
-		List<MessageTransactionData> messageTransactionsData = repository.getMessageRepository().getMessagesByParticipants(null, address, null, null, null);
-
-		for (MessageTransactionData messageTransactionData : messageTransactionsData) {
-			if (messageTransactionData.isText())
-				continue;
-
-			// We're expecting: HASH160(secret-A), Alice's Litecoin pubkeyhash and lockTime-A
-			byte[] messageData = messageTransactionData.getData();
-			LitecoinACCTv2.OfferMessageData offerMessageData = LitecoinACCTv2.extractOfferMessageData(messageData);
-			if (offerMessageData == null)
-				continue;
-
-			byte[] aliceForeignPublicKeyHash = offerMessageData.partnerLitecoinPKH;
-			byte[] hashOfSecretA = offerMessageData.hashOfSecretA;
-			int lockTimeA = (int) offerMessageData.lockTimeA;
-			long messageTimestamp = messageTransactionData.getTimestamp();
-			int refundTimeout = LitecoinACCTv2.calcRefundTimeout(messageTimestamp, lockTimeA);
-
-			// Determine P2SH-A address and confirm funded
-			byte[] redeemScriptA = BitcoinyHTLC.buildScript(aliceForeignPublicKeyHash, lockTimeA, tradeBotData.getTradeForeignPublicKeyHash(), hashOfSecretA);
-			String p2shAddressA = litecoin.deriveP2shAddress(redeemScriptA);
-
-			long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-			long p2shFee = Litecoin.getInstance().getP2shFee(feeTimestamp);
-			final long minimumAmountA = tradeBotData.getForeignAmount() + p2shFee;
-
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(litecoin.getBlockchainProvider(), p2shAddressA, minimumAmountA);
-
-			switch (htlcStatusA) {
-				case UNFUNDED:
-				case FUNDING_IN_PROGRESS:
-					// There might be another MESSAGE from someone else with an actually funded P2SH-A...
-					continue;
-
-				case REDEEM_IN_PROGRESS:
-				case REDEEMED:
-					// We've already redeemed this?
-					TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_DONE,
-							() -> String.format("P2SH-A %s already spent? Assuming trade complete", p2shAddressA));
-					return;
-
-				case REFUND_IN_PROGRESS:
-				case REFUNDED:
-					// This P2SH-A is burnt, but there might be another MESSAGE from someone else with an actually funded P2SH-A...
-					continue;
-
-				case FUNDED:
-					// Fall-through out of switch...
-					break;
-			}
-
-			// Good to go - send MESSAGE to AT
-
-			String aliceNativeAddress = Crypto.toAddress(messageTransactionData.getCreatorPublicKey());
-
-			// Build outgoing message, padding each part to 32 bytes to make it easier for AT to consume
-			byte[] outgoingMessageData = LitecoinACCTv2.buildTradeMessage(aliceNativeAddress, aliceForeignPublicKeyHash, hashOfSecretA, lockTimeA, refundTimeout);
-			String messageRecipient = tradeBotData.getAtAddress();
-
-			boolean isMessageAlreadySent = repository.getMessageRepository().exists(tradeBotData.getTradeNativePublicKey(), messageRecipient, outgoingMessageData);
-			if (!isMessageAlreadySent) {
-				PrivateKeyAccount sender = new PrivateKeyAccount(repository, tradeBotData.getTradePrivateKey());
-				MessageTransaction outgoingMessageTransaction = MessageTransaction.build(repository, sender, Group.NO_GROUP, messageRecipient, outgoingMessageData, false, false);
-
-				outgoingMessageTransaction.computeNonce();
-				outgoingMessageTransaction.sign(sender);
-
-				// reset repository state to prevent deadlock
-				repository.discardChanges();
-				ValidationResult result = outgoingMessageTransaction.importAsUnconfirmed();
-
-				if (result != ValidationResult.OK) {
-					LOGGER.warn(() -> String.format("Unable to send MESSAGE to AT %s: %s", messageRecipient, result.name()));
-					return;
-				}
-			}
-
-			TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_WAITING_FOR_AT_REDEEM,
-					() -> String.format("Locked AT %s to %s. Waiting for AT redeem", tradeBotData.getAtAddress(), aliceNativeAddress));
-
-			return;
-		}
-	}
-
-	/**
-	 * Trade-bot is waiting for Bob's AT to switch to TRADE mode and lock trade to Alice only.
-	 * <p>
-	 * It's possible that Bob has cancelled his trade offer in the mean time, or that somehow
-	 * this process has taken so long that we've reached P2SH-A's locktime, or that someone else
-	 * has managed to trade with Bob. In any of these cases, trade-bot switches to begin the refunding process.
-	 * <p>
-	 * Assuming Bob's AT is locked to Alice, trade-bot checks AT's state data to make sure it is correct.
-	 * <p>
-	 * If all is well, trade-bot then redeems AT using Alice's secret-A, releasing Bob's QORT to Alice.
-	 * <p>
-	 * In revealing a valid secret-A, Bob can then redeem the LTC funds from P2SH-A.
-	 * <p>
-	 * @throws ForeignBlockchainException
-	 */
-	private void handleAliceWaitingForAtLock(Repository repository, TradeBotData tradeBotData,
-			ATData atData, CrossChainTradeData crossChainTradeData) throws DataException, ForeignBlockchainException {
-		if (aliceUnexpectedState(repository, tradeBotData, atData, crossChainTradeData))
-			return;
-
-		Litecoin litecoin = Litecoin.getInstance();
-		int lockTimeA = tradeBotData.getLockTimeA();
-
-		// Refund P2SH-A if we've passed lockTime-A
-		if (NTP.getTime() >= lockTimeA * 1000L) {
-			byte[] redeemScriptA = BitcoinyHTLC.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTimeA, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
-			String p2shAddressA = litecoin.deriveP2shAddress(redeemScriptA);
-
-			long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-			long p2shFee = Litecoin.getInstance().getP2shFee(feeTimestamp);
-			long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(litecoin.getBlockchainProvider(), p2shAddressA, minimumAmountA);
-
-			switch (htlcStatusA) {
-				case UNFUNDED:
-				case FUNDING_IN_PROGRESS:
-				case FUNDED:
-					break;
-
-				case REDEEM_IN_PROGRESS:
-				case REDEEMED:
-					// Already redeemed?
-					TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_DONE,
-							() -> String.format("P2SH-A %s already spent? Assuming trade completed", p2shAddressA));
-					return;
-
-				case REFUND_IN_PROGRESS:
-				case REFUNDED:
-					TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_REFUNDED,
-							() -> String.format("P2SH-A %s already refunded. Trade aborted", p2shAddressA));
-					return;
-
-			}
-
-			TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_REFUNDING_A,
-					() -> atData.getIsFinished()
-					? String.format("AT %s cancelled. Refunding P2SH-A %s - aborting trade", tradeBotData.getAtAddress(), p2shAddressA)
-					: String.format("LockTime-A reached, refunding P2SH-A %s - aborting trade", p2shAddressA));
-
-			return;
-		}
-
-		// We're waiting for AT to be in TRADE mode
-		if (crossChainTradeData.mode != AcctMode.TRADING)
-			return;
-
-		// AT is in TRADE mode and locked to us as checked by aliceUnexpectedState() above
-
-		// Find our MESSAGE to AT from previous state
-		List<MessageTransactionData> messageTransactionsData = repository.getMessageRepository().getMessagesByParticipants(tradeBotData.getTradeNativePublicKey(),
-				crossChainTradeData.qortalCreatorTradeAddress, null, null, null);
-		if (messageTransactionsData == null || messageTransactionsData.isEmpty()) {
-			LOGGER.warn(() -> String.format("Unable to find our message to trade creator %s?", crossChainTradeData.qortalCreatorTradeAddress));
-			return;
-		}
-
-		long recipientMessageTimestamp = messageTransactionsData.get(0).getTimestamp();
-		int refundTimeout = LitecoinACCTv2.calcRefundTimeout(recipientMessageTimestamp, lockTimeA);
-
-		// Our calculated refundTimeout should match AT's refundTimeout
-		if (refundTimeout != crossChainTradeData.refundTimeout) {
-			LOGGER.debug(() -> String.format("Trade AT refundTimeout '%d' doesn't match our refundTimeout '%d'", crossChainTradeData.refundTimeout, refundTimeout));
-			// We'll eventually refund
-			return;
-		}
-
-		// We're good to redeem AT
-
-		// Send 'redeem' MESSAGE to AT using both secret
-		byte[] secretA = tradeBotData.getSecret();
-		String qortalReceivingAddress = Base58.encode(tradeBotData.getReceivingAccountInfo()); // Actually contains whole address, not just PKH
-		byte[] messageData = LitecoinACCTv2.buildRedeemMessage(secretA, qortalReceivingAddress);
-		String messageRecipient = tradeBotData.getAtAddress();
-
-		boolean isMessageAlreadySent = repository.getMessageRepository().exists(tradeBotData.getTradeNativePublicKey(), messageRecipient, messageData);
-		if (!isMessageAlreadySent) {
-			PrivateKeyAccount sender = new PrivateKeyAccount(repository, tradeBotData.getTradePrivateKey());
-			MessageTransaction messageTransaction = MessageTransaction.build(repository, sender, Group.NO_GROUP, messageRecipient, messageData, false, false);
-
-			messageTransaction.computeNonce();
-			messageTransaction.sign(sender);
-
-			// Reset repository state to prevent deadlock
-			repository.discardChanges();
-			ValidationResult result = messageTransaction.importAsUnconfirmed();
-
-			if (result != ValidationResult.OK) {
-				LOGGER.warn(() -> String.format("Unable to send MESSAGE to AT %s: %s", messageRecipient, result.name()));
-				return;
-			}
-		}
-
-		TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_DONE,
-				() -> String.format("Redeeming AT %s. Funds should arrive at %s",
-						tradeBotData.getAtAddress(), qortalReceivingAddress));
-	}
-
-	/**
-	 * Trade-bot is waiting for Alice to redeem Bob's AT, thus revealing secret-A which is required to spend the LTC funds from P2SH-A.
-	 * <p>
-	 * It's possible that Bob's AT has reached its trading timeout and automatically refunded QORT back to Bob. In which case,
-	 * trade-bot is done with this specific trade and finalizes in refunded state.
-	 * <p>
-	 * Assuming trade-bot can extract a valid secret-A from Alice's MESSAGE then trade-bot uses that to redeem the LTC funds from P2SH-A
-	 * to Bob's 'foreign'/Litecoin trade legacy-format address, as derived from trade private key.
-	 * <p>
-	 * (This could potentially be 'improved' to send LTC to any address of Bob's choosing by changing the transaction output).
-	 * <p>
-	 * If trade-bot successfully broadcasts the transaction, then this specific trade is done.
-	 * @throws ForeignBlockchainException
-	 */
-	private void handleBobWaitingForAtRedeem(Repository repository, TradeBotData tradeBotData,
-			ATData atData, CrossChainTradeData crossChainTradeData) throws DataException, ForeignBlockchainException {
-		// AT should be 'finished' once Alice has redeemed QORT funds
-		if (!atData.getIsFinished())
-			// Not finished yet
-			return;
-
-		// If AT is REFUNDED or CANCELLED then something has gone wrong
-		if (crossChainTradeData.mode == AcctMode.REFUNDED || crossChainTradeData.mode == AcctMode.CANCELLED) {
-			// Alice hasn't redeemed the QORT, so there is no point in trying to redeem the LTC
-			TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_REFUNDED,
-					() -> String.format("AT %s has auto-refunded - trade aborted", tradeBotData.getAtAddress()));
-
-			return;
-		}
-
-		byte[] secretA = LitecoinACCTv2.getInstance().findSecretA(repository, crossChainTradeData);
-		if (secretA == null) {
-			LOGGER.debug(() -> String.format("Unable to find secret-A from redeem message to AT %s?", tradeBotData.getAtAddress()));
-			return;
-		}
-
-		// Use secret-A to redeem P2SH-A
-
-		Litecoin litecoin = Litecoin.getInstance();
-
-		byte[] receivingAccountInfo = tradeBotData.getReceivingAccountInfo();
-		int lockTimeA = crossChainTradeData.lockTimeA;
-		byte[] redeemScriptA = BitcoinyHTLC.buildScript(crossChainTradeData.partnerForeignPKH, lockTimeA, crossChainTradeData.creatorForeignPKH, crossChainTradeData.hashOfSecretA);
-		String p2shAddressA = litecoin.deriveP2shAddress(redeemScriptA);
-
-		// Fee for redeem/refund is subtracted from P2SH-A balance.
-		long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-		long p2shFee = Litecoin.getInstance().getP2shFee(feeTimestamp);
-		long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-		BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(litecoin.getBlockchainProvider(), p2shAddressA, minimumAmountA);
-
-		switch (htlcStatusA) {
-			case UNFUNDED:
-			case FUNDING_IN_PROGRESS:
-				// P2SH-A suddenly not funded? Our best bet at this point is to hope for AT auto-refund
-				return;
-
-			case REDEEM_IN_PROGRESS:
-			case REDEEMED:
-				// Double-check that we have redeemed P2SH-A...
-				break;
-
-			case REFUND_IN_PROGRESS:
-			case REFUNDED:
-				// Wait for AT to auto-refund
-				return;
-
-			case FUNDED: {
-				Coin redeemAmount = Coin.valueOf(crossChainTradeData.expectedForeignAmount);
-				ECKey redeemKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
-				List<TransactionOutput> fundingOutputs = litecoin.getUnspentOutputs(p2shAddressA);
-
-				Transaction p2shRedeemTransaction = BitcoinyHTLC.buildRedeemTransaction(litecoin.getNetworkParameters(), redeemAmount, redeemKey,
-						fundingOutputs, redeemScriptA, secretA, receivingAccountInfo);
-
-				litecoin.broadcastTransaction(p2shRedeemTransaction);
-				break;
-			}
-		}
-
-		String receivingAddress = litecoin.pkhToAddress(receivingAccountInfo);
-
-		TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_DONE,
-				() -> String.format("P2SH-A %s redeemed. Funds should arrive at %s", tradeBotData.getAtAddress(), receivingAddress));
-	}
-
-	/**
-	 * Trade-bot is attempting to refund P2SH-A.
-	 * @throws ForeignBlockchainException
-	 */
-	private void handleAliceRefundingP2shA(Repository repository, TradeBotData tradeBotData,
-			ATData atData, CrossChainTradeData crossChainTradeData) throws DataException, ForeignBlockchainException {
-		int lockTimeA = tradeBotData.getLockTimeA();
-
-		// We can't refund P2SH-A until lockTime-A has passed
-		if (NTP.getTime() <= lockTimeA * 1000L)
-			return;
-
-		Litecoin litecoin = Litecoin.getInstance();
-
-		// We can't refund P2SH-A until median block time has passed lockTime-A (see BIP113)
-		int medianBlockTime = litecoin.getMedianBlockTime();
-		if (medianBlockTime <= lockTimeA)
-			return;
-
-		byte[] redeemScriptA = BitcoinyHTLC.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTimeA, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
-		String p2shAddressA = litecoin.deriveP2shAddress(redeemScriptA);
-
-		// Fee for redeem/refund is subtracted from P2SH-A balance.
-		long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-		long p2shFee = Litecoin.getInstance().getP2shFee(feeTimestamp);
-		long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-		BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(litecoin.getBlockchainProvider(), p2shAddressA, minimumAmountA);
-
-		switch (htlcStatusA) {
-			case UNFUNDED:
-			case FUNDING_IN_PROGRESS:
-				// Still waiting for P2SH-A to be funded...
-				return;
-
-			case REDEEM_IN_PROGRESS:
-			case REDEEMED:
-				// Too late!
-				TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_DONE,
-						() -> String.format("P2SH-A %s already spent!", p2shAddressA));
-				return;
-
-			case REFUND_IN_PROGRESS:
-			case REFUNDED:
-				break;
-
-			case FUNDED:{
-				Coin refundAmount = Coin.valueOf(crossChainTradeData.expectedForeignAmount);
-				ECKey refundKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
-				List<TransactionOutput> fundingOutputs = litecoin.getUnspentOutputs(p2shAddressA);
-
-				// Determine receive address for refund
-				String receiveAddress = litecoin.getUnusedReceiveAddress(tradeBotData.getForeignKey());
-				Address receiving = Address.fromString(litecoin.getNetworkParameters(), receiveAddress);
-
-				Transaction p2shRefundTransaction = BitcoinyHTLC.buildRefundTransaction(litecoin.getNetworkParameters(), refundAmount, refundKey,
-						fundingOutputs, redeemScriptA, lockTimeA, receiving.getHash());
-
-				litecoin.broadcastTransaction(p2shRefundTransaction);
-				break;
-			}
-		}
-
-		TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_REFUNDED,
-				() -> String.format("LockTime-A reached. Refunded P2SH-A %s. Trade aborted", p2shAddressA));
-	}
-
-	/**
-	 * Returns true if Alice finds AT unexpectedly cancelled, refunded, redeemed or locked to someone else.
-	 * <p>
-	 * Will automatically update trade-bot state to <tt>ALICE_REFUNDING_A</tt> or <tt>ALICE_DONE</tt> as necessary.
-	 * 
-	 * @throws DataException
-	 * @throws ForeignBlockchainException
-	 */
-	private boolean aliceUnexpectedState(Repository repository, TradeBotData tradeBotData,
-			ATData atData, CrossChainTradeData crossChainTradeData) throws DataException, ForeignBlockchainException {
-		// This is OK
-		if (!atData.getIsFinished() && crossChainTradeData.mode == AcctMode.OFFERING)
-			return false;
-
-		boolean isAtLockedToUs = tradeBotData.getTradeNativeAddress().equals(crossChainTradeData.qortalPartnerAddress);
-
-		if (!atData.getIsFinished() && crossChainTradeData.mode == AcctMode.TRADING)
-			if (isAtLockedToUs) {
-				// AT is trading with us - OK
-				return false;
-			} else {
-				TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_REFUNDING_A,
-						() -> String.format("AT %s trading with someone else: %s. Refunding & aborting trade", tradeBotData.getAtAddress(), crossChainTradeData.qortalPartnerAddress));
-
-				return true;
-			}
-
-		if (atData.getIsFinished() && crossChainTradeData.mode == AcctMode.REDEEMED && isAtLockedToUs) {
-			// We've redeemed already?
-			TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_DONE,
-					() -> String.format("AT %s already redeemed by us. Trade completed", tradeBotData.getAtAddress()));
-		} else {
-			// Any other state is not good, so start defensive refund
-			TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_REFUNDING_A,
-					() -> String.format("AT %s cancelled/refunded/redeemed by someone else/invalid state. Refunding & aborting trade", tradeBotData.getAtAddress()));
-		}
-
-		return true;
-	}
-
-	private long calcFeeTimestamp(int lockTimeA, int tradeTimeout) {
-		return (lockTimeA - tradeTimeout * 60) * 1000L;
-	}
-
-}

src/main/java/org/qortal/controller/tradebot/LitecoinACCTv3TradeBot.java

@@ -19,6 +19,7 @@ import org.qortal.data.transaction.MessageTransactionData;
 import org.qortal.group.Group;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
+import org.qortal.repository.RepositoryManager;
 import org.qortal.transaction.DeployAtTransaction;
 import org.qortal.transaction.MessageTransaction;
 import org.qortal.transaction.Transaction.ValidationResult;
@@ -317,20 +318,27 @@ public class LitecoinACCTv3TradeBot implements AcctTradeBot {
 
 		boolean isMessageAlreadySent = repository.getMessageRepository().exists(tradeBotData.getTradeNativePublicKey(), messageRecipient, messageData);
 		if (!isMessageAlreadySent) {
-			PrivateKeyAccount sender = new PrivateKeyAccount(repository, tradeBotData.getTradePrivateKey());
-			MessageTransaction messageTransaction = MessageTransaction.build(repository, sender, Group.NO_GROUP, messageRecipient, messageData, false, false);
+			// Do this in a new thread so caller doesn't have to wait for computeNonce()
+			// In the unlikely event that the transaction doesn't validate then the buy won't happen and eventually Alice's AT will be refunded
+			new Thread(() -> {
+				try (final Repository threadsRepository = RepositoryManager.getRepository()) {
+					PrivateKeyAccount sender = new PrivateKeyAccount(threadsRepository, tradeBotData.getTradePrivateKey());
+					MessageTransaction messageTransaction = MessageTransaction.build(threadsRepository, sender, Group.NO_GROUP, messageRecipient, messageData, false, false);
 
-			messageTransaction.computeNonce();
-			messageTransaction.sign(sender);
+					messageTransaction.computeNonce();
+					messageTransaction.sign(sender);
 
-			// reset repository state to prevent deadlock
-			repository.discardChanges();
-			ValidationResult result = messageTransaction.importAsUnconfirmed();
+					// reset repository state to prevent deadlock
+					threadsRepository.discardChanges();
+					ValidationResult result = messageTransaction.importAsUnconfirmed();
 
-			if (result != ValidationResult.OK) {
-				LOGGER.warn(() -> String.format("Unable to send MESSAGE to Bob's trade-bot %s: %s", messageRecipient, result.name()));
-				return ResponseResult.NETWORK_ISSUE;
-			}
+					if (result != ValidationResult.OK) {
+						LOGGER.warn(() -> String.format("Unable to send MESSAGE to Bob's trade-bot %s: %s", messageRecipient, result.name()));
+					}
+				} catch (DataException e) {
+					LOGGER.warn(() -> String.format("Unable to send MESSAGE to Bob's trade-bot %s: %s", messageRecipient, e.getMessage()));
+				}
+			}, "TradeBot response").start();
 		}
 
 		TradeBot.updateTradeBotState(repository, tradeBotData, () -> String.format("Funding P2SH-A %s. Messaged Bob. Waiting for AT-lock", p2shAddress));

src/main/java/org/qortal/controller/tradebot/PirateChainACCTv3TradeBot.java

@@ -1,9 +1,10 @@
 package org.qortal.controller.tradebot;
 
+import com.google.common.hash.HashCode;
+import com.rust.litewalletjni.LiteWalletJni;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bitcoinj.core.*;
-import org.bitcoinj.script.Script.ScriptType;
 import org.qortal.account.PrivateKeyAccount;
 import org.qortal.account.PublicKeyAccount;
 import org.qortal.api.model.crosschain.TradeBotCreateRequest;
@@ -45,9 +46,9 @@ import static java.util.stream.Collectors.toMap;
  * 	<li>Trade-bot entries</li>
  * </ul>
  */
-public class DogecoinACCTv2TradeBot implements AcctTradeBot {
+public class PirateChainACCTv3TradeBot implements AcctTradeBot {
 
-	private static final Logger LOGGER = LogManager.getLogger(DogecoinACCTv2TradeBot.class);
+	private static final Logger LOGGER = LogManager.getLogger(PirateChainACCTv3TradeBot.class);
 
 	public enum State implements TradeBot.StateNameAndValueSupplier {
 		BOB_WAITING_FOR_AT_CONFIRM(10, false, false),
@@ -91,18 +92,18 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 	/** Maximum time Bob waits for his AT creation transaction to be confirmed into a block. (milliseconds) */
 	private static final long MAX_AT_CONFIRMATION_PERIOD = 24 * 60 * 60 * 1000L; // ms
 
-	private static DogecoinACCTv2TradeBot instance;
+	private static PirateChainACCTv3TradeBot instance;
 
 	private final List<String> endStates = Arrays.asList(State.BOB_DONE, State.BOB_REFUNDED, State.ALICE_DONE, State.ALICE_REFUNDING_A, State.ALICE_REFUNDED).stream()
 			.map(State::name)
 			.collect(Collectors.toUnmodifiableList());
 
-	private DogecoinACCTv2TradeBot() {
+	private PirateChainACCTv3TradeBot() {
 	}
 
-	public static synchronized DogecoinACCTv2TradeBot getInstance() {
+	public static synchronized PirateChainACCTv3TradeBot getInstance() {
 		if (instance == null)
-			instance = new DogecoinACCTv2TradeBot();
+			instance = new PirateChainACCTv3TradeBot();
 
 		return instance;
 	}
@@ -113,7 +114,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 	}
 
 	/**
-	 * Creates a new trade-bot entry from the "Bob" viewpoint, i.e. OFFERing QORT in exchange for DOGE.
+	 * Creates a new trade-bot entry from the "Bob" viewpoint, i.e. OFFERing QORT in exchange for ARRR.
 	 * <p>
 	 * Generates:
 	 * <ul>
@@ -122,14 +123,14 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 	 * Derives:
 	 * <ul>
 	 * 	<li>'native' (as in Qortal) public key, public key hash, address (starting with Q)</li>
-	 * 	<li>'foreign' (as in Dogecoin) public key, public key hash</li>
+	 * 	<li>'foreign' (as in PirateChain) public key, public key hash</li>
 	 * </ul>
 	 * A Qortal AT is then constructed including the following as constants in the 'data segment':
 	 * <ul>
 	 * 	<li>'native'/Qortal 'trade' address - used as a MESSAGE contact</li>
-	 * 	<li>'foreign'/Dogecoin public key hash - used by Alice's P2SH scripts to allow redeem</li>
+	 * 	<li>'foreign'/PirateChain public key hash - used by Alice's P2SH scripts to allow redeem</li>
 	 * 	<li>QORT amount on offer by Bob</li>
-	 * 	<li>DOGE amount expected in return by Bob (from Alice)</li>
+	 * 	<li>ARRR amount expected in return by Bob (from Alice)</li>
 	 * 	<li>trading timeout, in case things go wrong and everyone needs to refund</li>
 	 * </ul>
 	 * Returns a DEPLOY_AT transaction that needs to be signed and broadcast to the Qortal network.
@@ -151,17 +152,18 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		byte[] tradeForeignPublicKey = TradeBot.deriveTradeForeignPublicKey(tradePrivateKey);
 		byte[] tradeForeignPublicKeyHash = Crypto.hash160(tradeForeignPublicKey);
 
-		// Convert Dogecoin receiving address into public key hash (we only support P2PKH at this time)
-		Address dogecoinReceivingAddress;
-		try {
-			dogecoinReceivingAddress = Address.fromString(Dogecoin.getInstance().getNetworkParameters(), tradeBotCreateRequest.receivingAddress);
-		} catch (AddressFormatException e) {
-			throw new DataException("Unsupported Dogecoin receiving address: " + tradeBotCreateRequest.receivingAddress);
+		// ARRR wallet must be loaded before a trade can be created
+		// This is to stop trades from nodes on unsupported architectures (e.g. 32bit)
+		if (!LiteWalletJni.isLoaded()) {
+			throw new DataException("Pirate wallet not found. Check wallets screen for details.");
 		}
-		if (dogecoinReceivingAddress.getOutputScriptType() != ScriptType.P2PKH)
-			throw new DataException("Unsupported Dogecoin receiving address: " + tradeBotCreateRequest.receivingAddress);
 
-		byte[] dogecoinReceivingAccountInfo = dogecoinReceivingAddress.getHash();
+		if (!PirateChain.getInstance().isValidAddress(tradeBotCreateRequest.receivingAddress)) {
+			throw new DataException("Unsupported Pirate Chain receiving address: " + tradeBotCreateRequest.receivingAddress);
+		}
+
+		Bech32.Bech32Data decodedReceivingAddress = Bech32.decode(tradeBotCreateRequest.receivingAddress);
+		byte[] pirateChainReceivingAccountInfo = decodedReceivingAddress.data;
 
 		PublicKeyAccount creator = new PublicKeyAccount(repository, tradeBotCreateRequest.creatorPublicKey);
 
@@ -172,11 +174,11 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		byte[] signature = null;
 		BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, Group.NO_GROUP, reference, creator.getPublicKey(), fee, signature);
 
-		String name = "QORT/DOGE ACCT";
-		String description = "QORT/DOGE cross-chain trade";
+		String name = "QORT/ARRR ACCT";
+		String description = "QORT/ARRR cross-chain trade";
 		String aTType = "ACCT";
-		String tags = "ACCT QORT DOGE";
-		byte[] creationBytes = DogecoinACCTv2.buildQortalAT(tradeNativeAddress, tradeForeignPublicKeyHash, tradeBotCreateRequest.qortAmount,
+		String tags = "ACCT QORT ARRR";
+		byte[] creationBytes = PirateChainACCTv3.buildQortalAT(tradeNativeAddress, tradeForeignPublicKey, tradeBotCreateRequest.qortAmount,
 				tradeBotCreateRequest.foreignAmount, tradeBotCreateRequest.tradeTimeout);
 		long amount = tradeBotCreateRequest.fundingQortAmount;
 
@@ -189,14 +191,14 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		DeployAtTransaction.ensureATAddress(deployAtTransactionData);
 		String atAddress = deployAtTransactionData.getAtAddress();
 
-		TradeBotData tradeBotData =  new TradeBotData(tradePrivateKey, DogecoinACCTv2.NAME,
+		TradeBotData tradeBotData =  new TradeBotData(tradePrivateKey, PirateChainACCTv3.NAME,
 				State.BOB_WAITING_FOR_AT_CONFIRM.name(), State.BOB_WAITING_FOR_AT_CONFIRM.value,
 				creator.getAddress(), atAddress, timestamp, tradeBotCreateRequest.qortAmount,
 				tradeNativePublicKey, tradeNativePublicKeyHash, tradeNativeAddress,
 				null, null,
-				SupportedBlockchain.DOGECOIN.name(),
+				SupportedBlockchain.PIRATECHAIN.name(),
 				tradeForeignPublicKey, tradeForeignPublicKeyHash,
-				tradeBotCreateRequest.foreignAmount, null, null, null, dogecoinReceivingAccountInfo);
+				tradeBotCreateRequest.foreignAmount, null, null, null, pirateChainReceivingAccountInfo);
 
 		TradeBot.updateTradeBotState(repository, tradeBotData, () -> String.format("Built AT %s. Waiting for deployment", atAddress));
 
@@ -212,15 +214,15 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 	}
 
 	/**
-	 * Creates a trade-bot entry from the 'Alice' viewpoint, i.e. matching DOGE to an existing offer.
+	 * Creates a trade-bot entry from the 'Alice' viewpoint, i.e. matching ARRR to an existing offer.
 	 * <p>
 	 * Requires a chosen trade offer from Bob, passed by <tt>crossChainTradeData</tt>
-	 * and access to a Dogecoin wallet via <tt>xprv58</tt>.
+	 * and access to a PirateChain wallet via <tt>xprv58</tt>.
 	 * <p>
 	 * The <tt>crossChainTradeData</tt> contains the current trade offer state
 	 * as extracted from the AT's data segment.
 	 * <p>
-	 * Access to a funded wallet is via a Dogecoin BIP32 hierarchical deterministic key,
+	 * Access to a funded wallet is via a PirateChain BIP32 hierarchical deterministic key,
 	 * passed via <tt>xprv58</tt>.
 	 * <b>This key will be stored in your node's database</b>
 	 * to allow trade-bot to create/fund the necessary P2SH transactions!
@@ -230,26 +232,26 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 	 * As an example, the xprv58 can be extract from a <i>legacy, password-less</i>
 	 * Electrum wallet by going to the console tab and entering:<br>
 	 * <tt>wallet.keystore.xprv</tt><br>
-	 * which should result in a base58 string starting with either 'xprv' (for Dogecoin main-net)
-	 * or 'tprv' for (Dogecoin test-net).
+	 * which should result in a base58 string starting with either 'xprv' (for PirateChain main-net)
+	 * or 'tprv' for (PirateChain test-net).
 	 * <p>
 	 * It is envisaged that the value in <tt>xprv58</tt> will actually come from a Qortal-UI-managed wallet.
 	 * <p>
 	 * If sufficient funds are available, <b>this method will actually fund the P2SH-A</b>
-	 * with the Dogecoin amount expected by 'Bob'.
+	 * with the PirateChain amount expected by 'Bob'.
 	 * <p>
-	 * If the Dogecoin transaction is successfully broadcast to the network then
+	 * If the PirateChain transaction is successfully broadcast to the network then
 	 * we also send a MESSAGE to Bob's trade-bot to let them know.
 	 * <p>
 	 * The trade-bot entry is saved to the repository and the cross-chain trading process commences.
 	 * <p>
 	 * @param repository
 	 * @param crossChainTradeData chosen trade OFFER that Alice wants to match
-	 * @param xprv58 funded wallet xprv in base58
-	 * @return true if P2SH-A funding transaction successfully broadcast to Dogecoin network, false otherwise
+	 * @param seed58 funded wallet xprv in base58
+	 * @return true if P2SH-A funding transaction successfully broadcast to PirateChain network, false otherwise
 	 * @throws DataException
 	 */
-	public ResponseResult startResponse(Repository repository, ATData atData, ACCT acct, CrossChainTradeData crossChainTradeData, String xprv58, String receivingAddress) throws DataException {
+	public ResponseResult startResponse(Repository repository, ATData atData, ACCT acct, CrossChainTradeData crossChainTradeData, String seed58, String receivingAddress) throws DataException {
 		byte[] tradePrivateKey = TradeBot.generateTradePrivateKey();
 		byte[] secretA = TradeBot.generateSecret();
 		byte[] hashOfSecretA = Crypto.hash160(secretA);
@@ -262,18 +264,22 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		byte[] tradeForeignPublicKeyHash = Crypto.hash160(tradeForeignPublicKey);
 		byte[] receivingPublicKeyHash = Base58.decode(receivingAddress); // Actually the whole address, not just PKH
 
+		String tradePrivateKey58 = Base58.encode(tradePrivateKey);
+        String tradeForeignPublicKey58 = Base58.encode(tradeForeignPublicKey);
+		String secret58 = Base58.encode(secretA);
+
 		// We need to generate lockTime-A: add tradeTimeout to now
 		long now = NTP.getTime();
 		int lockTimeA = crossChainTradeData.tradeTimeout * 60 + (int) (now / 1000L);
 
-		TradeBotData tradeBotData =  new TradeBotData(tradePrivateKey, DogecoinACCTv2.NAME,
+		TradeBotData tradeBotData =  new TradeBotData(tradePrivateKey, PirateChainACCTv3.NAME,
 				State.ALICE_WAITING_FOR_AT_LOCK.name(), State.ALICE_WAITING_FOR_AT_LOCK.value,
 				receivingAddress, crossChainTradeData.qortalAtAddress, now, crossChainTradeData.qortAmount,
 				tradeNativePublicKey, tradeNativePublicKeyHash, tradeNativeAddress,
 				secretA, hashOfSecretA,
-				SupportedBlockchain.DOGECOIN.name(),
+				SupportedBlockchain.PIRATECHAIN.name(),
 				tradeForeignPublicKey, tradeForeignPublicKeyHash,
-				crossChainTradeData.expectedForeignAmount, xprv58, null, lockTimeA, receivingPublicKeyHash);
+				crossChainTradeData.expectedForeignAmount, seed58, null, lockTimeA, receivingPublicKeyHash);
 
 		// Attempt to backup the trade bot data
 		// Include tradeBotData as an additional parameter, since it's not in the repository yet
@@ -282,9 +288,9 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		// Check we have enough funds via xprv58 to fund P2SH to cover expectedForeignAmount
 		long p2shFee;
 		try {
-			p2shFee = Dogecoin.getInstance().getP2shFee(now);
+			p2shFee = PirateChain.getInstance().getP2shFee(now);
 		} catch (ForeignBlockchainException e) {
-			LOGGER.debug("Couldn't estimate Dogecoin fees?");
+			LOGGER.debug("Couldn't estimate PirateChain fees?");
 			return ResponseResult.NETWORK_ISSUE;
 		}
 
@@ -293,26 +299,23 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		long amountA = crossChainTradeData.expectedForeignAmount + p2shFee /*redeeming/refunding P2SH-A*/;
 
 		// P2SH-A to be funded
-		byte[] redeemScriptBytes = BitcoinyHTLC.buildScript(tradeForeignPublicKeyHash, lockTimeA, crossChainTradeData.creatorForeignPKH, hashOfSecretA);
-		String p2shAddress = Dogecoin.getInstance().deriveP2shAddress(redeemScriptBytes);
+		byte[] redeemScriptBytes = PirateChainHTLC.buildScript(tradeForeignPublicKey, lockTimeA, crossChainTradeData.creatorForeignPKH, hashOfSecretA);
+		String p2shAddressT3 = PirateChain.getInstance().deriveP2shAddress(redeemScriptBytes); // Use t3 prefix when funding
+		byte[] redeemScriptWithPrefixBytes = PirateChainHTLC.buildScriptWithPrefix(tradeForeignPublicKey, lockTimeA, crossChainTradeData.creatorForeignPKH, hashOfSecretA);
+		String redeemScriptWithPrefix58 = Base58.encode(redeemScriptWithPrefixBytes);
 
-		// Build transaction for funding P2SH-A
-		Transaction p2shFundingTransaction = Dogecoin.getInstance().buildSpend(tradeBotData.getForeignKey(), p2shAddress, amountA);
-		if (p2shFundingTransaction == null) {
-			LOGGER.debug("Unable to build P2SH-A funding transaction - lack of funds?");
+		// Send to P2SH address
+		try {
+			String txid = PirateChain.getInstance().fundP2SH(seed58, p2shAddressT3, amountA, redeemScriptWithPrefix58);
+			LOGGER.info("fundingTxidHex: {}", txid);
+
+		} catch (ForeignBlockchainException e) {
+			LOGGER.debug("Unable to build and send P2SH-A funding transaction - lack of funds?");
 			return ResponseResult.BALANCE_ISSUE;
 		}
 
-		try {
-			Dogecoin.getInstance().broadcastTransaction(p2shFundingTransaction);
-		} catch (ForeignBlockchainException e) {
-			// We couldn't fund P2SH-A at this time
-			LOGGER.debug("Couldn't broadcast P2SH-A funding transaction?");
-			return ResponseResult.NETWORK_ISSUE;
-		}
-
 		// Attempt to send MESSAGE to Bob's Qortal trade address
-		byte[] messageData = DogecoinACCTv2.buildOfferMessage(tradeBotData.getTradeForeignPublicKeyHash(), tradeBotData.getHashOfSecret(), tradeBotData.getLockTimeA());
+		byte[] messageData = PirateChainACCTv3.buildOfferMessage(tradeBotData.getTradeForeignPublicKey(), tradeBotData.getHashOfSecret(), tradeBotData.getLockTimeA());
 		String messageRecipient = crossChainTradeData.qortalCreatorTradeAddress;
 
 		boolean isMessageAlreadySent = repository.getMessageRepository().exists(tradeBotData.getTradeNativePublicKey(), messageRecipient, messageData);
@@ -333,11 +336,21 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 			}
 		}
 
-		TradeBot.updateTradeBotState(repository, tradeBotData, () -> String.format("Funding P2SH-A %s. Messaged Bob. Waiting for AT-lock", p2shAddress));
+		TradeBot.updateTradeBotState(repository, tradeBotData, () -> String.format("Funding P2SH-A %s. Messaged Bob. Waiting for AT-lock", p2shAddressT3));
 
 		return ResponseResult.OK;
 	}
 
+	public static String hex(byte[] bytes) {
+		StringBuilder result = new StringBuilder();
+		for (byte aByte : bytes) {
+			result.append(String.format("%02x", aByte));
+			// upper case
+			// result.append(String.format("%02X", aByte));
+		}
+		return result.toString();
+	}
+
 	@Override
 	public boolean canDelete(Repository repository, TradeBotData tradeBotData) throws DataException {
 		State tradeBotState = State.valueOf(tradeBotData.getStateValue());
@@ -354,6 +367,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 			case BOB_DONE:
 			case ALICE_REFUNDED:
 			case BOB_REFUNDED:
+			case ALICE_REFUNDING_A:
 				return true;
 
 			default:
@@ -381,7 +395,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 			}
 
 			if (tradeBotState.requiresTradeData) {
-				tradeData = DogecoinACCTv2.getInstance().populateTradeData(repository, atData);
+				tradeData = PirateChainACCTv3.getInstance().populateTradeData(repository, atData);
 				if (tradeData == null) {
 					LOGGER.warn(() -> String.format("Unable to fetch ACCT trade data for AT %s from repository", tradeBotData.getAtAddress()));
 					return;
@@ -462,7 +476,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 	 * <p>
 	 * Details from Alice are used to derive P2SH-A address and this is checked for funding balance.
 	 * <p>
-	 * Assuming P2SH-A has at least expected Dogecoin balance,
+	 * Assuming P2SH-A has at least expected PirateChain balance,
 	 * Bob's trade-bot constructs a zero-fee, PoW MESSAGE to send to Bob's AT with more trade details.
 	 * <p>
 	 * On processing this MESSAGE, Bob's AT should switch into 'TRADE' mode and only trade with Alice.
@@ -480,7 +494,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 			return;
 		}
 
-		Dogecoin dogecoin = Dogecoin.getInstance();
+		PirateChain pirateChain = PirateChain.getInstance();
 
 		String address = tradeBotData.getTradeNativeAddress();
 		List<MessageTransactionData> messageTransactionsData = repository.getMessageRepository().getMessagesByParticipants(null, address, null, null, null);
@@ -489,27 +503,27 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 			if (messageTransactionData.isText())
 				continue;
 
-			// We're expecting: HASH160(secret-A), Alice's Dogecoin pubkeyhash and lockTime-A
+			// We're expecting: HASH160(secret-A), Alice's PirateChain pubkeyhash and lockTime-A
 			byte[] messageData = messageTransactionData.getData();
-			DogecoinACCTv2.OfferMessageData offerMessageData = DogecoinACCTv2.extractOfferMessageData(messageData);
+			PirateChainACCTv3.OfferMessageData offerMessageData = PirateChainACCTv3.extractOfferMessageData(messageData);
 			if (offerMessageData == null)
 				continue;
 
-			byte[] aliceForeignPublicKeyHash = offerMessageData.partnerDogecoinPKH;
+			byte[] aliceForeignPublicKey = offerMessageData.partnerPirateChainPublicKey;
 			byte[] hashOfSecretA = offerMessageData.hashOfSecretA;
 			int lockTimeA = (int) offerMessageData.lockTimeA;
 			long messageTimestamp = messageTransactionData.getTimestamp();
-			int refundTimeout = DogecoinACCTv2.calcRefundTimeout(messageTimestamp, lockTimeA);
+			int refundTimeout = PirateChainACCTv3.calcRefundTimeout(messageTimestamp, lockTimeA);
 
 			// Determine P2SH-A address and confirm funded
-			byte[] redeemScriptA = BitcoinyHTLC.buildScript(aliceForeignPublicKeyHash, lockTimeA, tradeBotData.getTradeForeignPublicKeyHash(), hashOfSecretA);
-			String p2shAddressA = dogecoin.deriveP2shAddress(redeemScriptA);
+			byte[] redeemScriptA = PirateChainHTLC.buildScript(aliceForeignPublicKey, lockTimeA, tradeBotData.getTradeForeignPublicKey(), hashOfSecretA);
+			String p2shAddress = pirateChain.deriveP2shAddressBPrefix(redeemScriptA); // Use 'b' prefix when checking status
 
 			long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-			long p2shFee = Dogecoin.getInstance().getP2shFee(feeTimestamp);
+			long p2shFee = PirateChain.getInstance().getP2shFee(feeTimestamp);
 			final long minimumAmountA = tradeBotData.getForeignAmount() + p2shFee;
 
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(dogecoin.getBlockchainProvider(), p2shAddressA, minimumAmountA);
+			BitcoinyHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
 
 			switch (htlcStatusA) {
 				case UNFUNDED:
@@ -521,7 +535,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 				case REDEEMED:
 					// We've already redeemed this?
 					TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_DONE,
-							() -> String.format("P2SH-A %s already spent? Assuming trade complete", p2shAddressA));
+							() -> String.format("P2SH-A %s already spent? Assuming trade complete", p2shAddress));
 					return;
 
 				case REFUND_IN_PROGRESS:
@@ -539,7 +553,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 			String aliceNativeAddress = Crypto.toAddress(messageTransactionData.getCreatorPublicKey());
 
 			// Build outgoing message, padding each part to 32 bytes to make it easier for AT to consume
-			byte[] outgoingMessageData = DogecoinACCTv2.buildTradeMessage(aliceNativeAddress, aliceForeignPublicKeyHash, hashOfSecretA, lockTimeA, refundTimeout);
+			byte[] outgoingMessageData = PirateChainACCTv3.buildTradeMessage(aliceNativeAddress, aliceForeignPublicKey, hashOfSecretA, lockTimeA, refundTimeout);
 			String messageRecipient = tradeBotData.getAtAddress();
 
 			boolean isMessageAlreadySent = repository.getMessageRepository().exists(tradeBotData.getTradeNativePublicKey(), messageRecipient, outgoingMessageData);
@@ -578,7 +592,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 	 * <p>
 	 * If all is well, trade-bot then redeems AT using Alice's secret-A, releasing Bob's QORT to Alice.
 	 * <p>
-	 * In revealing a valid secret-A, Bob can then redeem the DOGE funds from P2SH-A.
+	 * In revealing a valid secret-A, Bob can then redeem the ARRR funds from P2SH-A.
 	 * <p>
 	 * @throws ForeignBlockchainException
 	 */
@@ -587,19 +601,19 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		if (aliceUnexpectedState(repository, tradeBotData, atData, crossChainTradeData))
 			return;
 
-		Dogecoin dogecoin = Dogecoin.getInstance();
+		PirateChain pirateChain = PirateChain.getInstance();
 		int lockTimeA = tradeBotData.getLockTimeA();
 
 		// Refund P2SH-A if we've passed lockTime-A
 		if (NTP.getTime() >= lockTimeA * 1000L) {
-			byte[] redeemScriptA = BitcoinyHTLC.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTimeA, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
-			String p2shAddressA = dogecoin.deriveP2shAddress(redeemScriptA);
+			byte[] redeemScriptA = PirateChainHTLC.buildScript(tradeBotData.getTradeForeignPublicKey(), lockTimeA, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
+			String p2shAddress = pirateChain.deriveP2shAddressBPrefix(redeemScriptA); // Use 'b' prefix when checking status
 
 			long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-			long p2shFee = Dogecoin.getInstance().getP2shFee(feeTimestamp);
+			long p2shFee = PirateChain.getInstance().getP2shFee(feeTimestamp);
 			long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
 
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(dogecoin.getBlockchainProvider(), p2shAddressA, minimumAmountA);
+			BitcoinyHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
 
 			switch (htlcStatusA) {
 				case UNFUNDED:
@@ -611,21 +625,21 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 				case REDEEMED:
 					// Already redeemed?
 					TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_DONE,
-							() -> String.format("P2SH-A %s already spent? Assuming trade completed", p2shAddressA));
+							() -> String.format("P2SH-A %s already spent? Assuming trade completed", p2shAddress));
 					return;
 
 				case REFUND_IN_PROGRESS:
 				case REFUNDED:
 					TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_REFUNDED,
-							() -> String.format("P2SH-A %s already refunded. Trade aborted", p2shAddressA));
+							() -> String.format("P2SH-A %s already refunded. Trade aborted", p2shAddress));
 					return;
 
 			}
 
 			TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_REFUNDING_A,
 					() -> atData.getIsFinished()
-					? String.format("AT %s cancelled. Refunding P2SH-A %s - aborting trade", tradeBotData.getAtAddress(), p2shAddressA)
-					: String.format("LockTime-A reached, refunding P2SH-A %s - aborting trade", p2shAddressA));
+					? String.format("AT %s cancelled. Refunding P2SH-A %s - aborting trade", tradeBotData.getAtAddress(), p2shAddress)
+					: String.format("LockTime-A reached, refunding P2SH-A %s - aborting trade", p2shAddress));
 
 			return;
 		}
@@ -645,7 +659,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		}
 
 		long recipientMessageTimestamp = messageTransactionsData.get(0).getTimestamp();
-		int refundTimeout = DogecoinACCTv2.calcRefundTimeout(recipientMessageTimestamp, lockTimeA);
+		int refundTimeout = PirateChainACCTv3.calcRefundTimeout(recipientMessageTimestamp, lockTimeA);
 
 		// Our calculated refundTimeout should match AT's refundTimeout
 		if (refundTimeout != crossChainTradeData.refundTimeout) {
@@ -659,7 +673,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		// Send 'redeem' MESSAGE to AT using both secret
 		byte[] secretA = tradeBotData.getSecret();
 		String qortalReceivingAddress = Base58.encode(tradeBotData.getReceivingAccountInfo()); // Actually contains whole address, not just PKH
-		byte[] messageData = DogecoinACCTv2.buildRedeemMessage(secretA, qortalReceivingAddress);
+		byte[] messageData = PirateChainACCTv3.buildRedeemMessage(secretA, qortalReceivingAddress);
 		String messageRecipient = tradeBotData.getAtAddress();
 
 		boolean isMessageAlreadySent = repository.getMessageRepository().exists(tradeBotData.getTradeNativePublicKey(), messageRecipient, messageData);
@@ -686,15 +700,15 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 	}
 
 	/**
-	 * Trade-bot is waiting for Alice to redeem Bob's AT, thus revealing secret-A which is required to spend the DOGE funds from P2SH-A.
+	 * Trade-bot is waiting for Alice to redeem Bob's AT, thus revealing secret-A which is required to spend the ARRR funds from P2SH-A.
 	 * <p>
 	 * It's possible that Bob's AT has reached its trading timeout and automatically refunded QORT back to Bob. In which case,
 	 * trade-bot is done with this specific trade and finalizes in refunded state.
 	 * <p>
-	 * Assuming trade-bot can extract a valid secret-A from Alice's MESSAGE then trade-bot uses that to redeem the DOGE funds from P2SH-A
-	 * to Bob's 'foreign'/Dogecoin trade legacy-format address, as derived from trade private key.
+	 * Assuming trade-bot can extract a valid secret-A from Alice's MESSAGE then trade-bot uses that to redeem the ARRR funds from P2SH-A
+	 * to Bob's 'foreign'/PirateChain trade legacy-format address, as derived from trade private key.
 	 * <p>
-	 * (This could potentially be 'improved' to send DOGE to any address of Bob's choosing by changing the transaction output).
+	 * (This could potentially be 'improved' to send ARRR to any address of Bob's choosing by changing the transaction output).
 	 * <p>
 	 * If trade-bot successfully broadcasts the transaction, then this specific trade is done.
 	 * @throws ForeignBlockchainException
@@ -708,14 +722,14 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 
 		// If AT is REFUNDED or CANCELLED then something has gone wrong
 		if (crossChainTradeData.mode == AcctMode.REFUNDED || crossChainTradeData.mode == AcctMode.CANCELLED) {
-			// Alice hasn't redeemed the QORT, so there is no point in trying to redeem the DOGE
+			// Alice hasn't redeemed the QORT, so there is no point in trying to redeem the ARRR
 			TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_REFUNDED,
 					() -> String.format("AT %s has auto-refunded - trade aborted", tradeBotData.getAtAddress()));
 
 			return;
 		}
 
-		byte[] secretA = DogecoinACCTv2.getInstance().findSecretA(repository, crossChainTradeData);
+		byte[] secretA = PirateChainACCTv3.getInstance().findSecretA(repository, crossChainTradeData);
 		if (secretA == null) {
 			LOGGER.debug(() -> String.format("Unable to find secret-A from redeem message to AT %s?", tradeBotData.getAtAddress()));
 			return;
@@ -723,18 +737,21 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 
 		// Use secret-A to redeem P2SH-A
 
-		Dogecoin dogecoin = Dogecoin.getInstance();
+		PirateChain pirateChain = PirateChain.getInstance();
 
 		byte[] receivingAccountInfo = tradeBotData.getReceivingAccountInfo();
 		int lockTimeA = crossChainTradeData.lockTimeA;
-		byte[] redeemScriptA = BitcoinyHTLC.buildScript(crossChainTradeData.partnerForeignPKH, lockTimeA, crossChainTradeData.creatorForeignPKH, crossChainTradeData.hashOfSecretA);
-		String p2shAddressA = dogecoin.deriveP2shAddress(redeemScriptA);
+		byte[] redeemScriptA = PirateChainHTLC.buildScript(crossChainTradeData.partnerForeignPKH, lockTimeA, crossChainTradeData.creatorForeignPKH, crossChainTradeData.hashOfSecretA);
+		String p2shAddress = pirateChain.deriveP2shAddressBPrefix(redeemScriptA); // Use 'b' prefix when checking status
+		String p2shAddressT3 = pirateChain.deriveP2shAddress(redeemScriptA); // Use 't3' prefix when refunding
 
 		// Fee for redeem/refund is subtracted from P2SH-A balance.
 		long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-		long p2shFee = Dogecoin.getInstance().getP2shFee(feeTimestamp);
+		long p2shFee = PirateChain.getInstance().getP2shFee(feeTimestamp);
 		long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-		BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(dogecoin.getBlockchainProvider(), p2shAddressA, minimumAmountA);
+		String receivingAddress = Bech32.encode("zs", receivingAccountInfo);
+
+		BitcoinyHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
 
 		switch (htlcStatusA) {
 			case UNFUNDED:
@@ -753,20 +770,27 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 				return;
 
 			case FUNDED: {
+				// Get funding txid
+				String fundingTxidHex = PirateChainHTLC.getUnspentFundingTxid(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
+				if (fundingTxidHex == null) {
+					throw new ForeignBlockchainException("Missing funding txid when redeeming P2SH");
+				}
+				String fundingTxid58 = Base58.encode(HashCode.fromString(fundingTxidHex).asBytes());
+
+				// Redeem P2SH
 				Coin redeemAmount = Coin.valueOf(crossChainTradeData.expectedForeignAmount);
-				ECKey redeemKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
-				List<TransactionOutput> fundingOutputs = dogecoin.getUnspentOutputs(p2shAddressA);
+				byte[] privateKey = tradeBotData.getTradePrivateKey();
+				String secret58 = Base58.encode(secretA);
+				String privateKey58 = Base58.encode(privateKey);
+				String redeemScript58 = Base58.encode(redeemScriptA);
 
-				Transaction p2shRedeemTransaction = BitcoinyHTLC.buildRedeemTransaction(dogecoin.getNetworkParameters(), redeemAmount, redeemKey,
-						fundingOutputs, redeemScriptA, secretA, receivingAccountInfo);
-
-				dogecoin.broadcastTransaction(p2shRedeemTransaction);
+				String txid = PirateChain.getInstance().redeemP2sh(p2shAddressT3, receivingAddress, redeemAmount.value,
+						redeemScript58, fundingTxid58, secret58, privateKey58);
+				LOGGER.info("Redeem txid: {}", txid);
 				break;
 			}
 		}
 
-		String receivingAddress = dogecoin.pkhToAddress(receivingAccountInfo);
-
 		TradeBot.updateTradeBotState(repository, tradeBotData, State.BOB_DONE,
 				() -> String.format("P2SH-A %s redeemed. Funds should arrive at %s", tradeBotData.getAtAddress(), receivingAddress));
 	}
@@ -783,21 +807,22 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 		if (NTP.getTime() <= lockTimeA * 1000L)
 			return;
 
-		Dogecoin dogecoin = Dogecoin.getInstance();
+		PirateChain pirateChain = PirateChain.getInstance();
 
 		// We can't refund P2SH-A until median block time has passed lockTime-A (see BIP113)
-		int medianBlockTime = dogecoin.getMedianBlockTime();
+		int medianBlockTime = pirateChain.getMedianBlockTime();
 		if (medianBlockTime <= lockTimeA)
 			return;
 
-		byte[] redeemScriptA = BitcoinyHTLC.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTimeA, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
-		String p2shAddressA = dogecoin.deriveP2shAddress(redeemScriptA);
+		byte[] redeemScriptA = PirateChainHTLC.buildScript(tradeBotData.getTradeForeignPublicKey(), lockTimeA, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
+		String p2shAddress = pirateChain.deriveP2shAddressBPrefix(redeemScriptA); // Use 'b' prefix when checking status
+		String p2shAddressT3 = pirateChain.deriveP2shAddress(redeemScriptA); // Use 't3' prefix when refunding
 
 		// Fee for redeem/refund is subtracted from P2SH-A balance.
 		long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-		long p2shFee = Dogecoin.getInstance().getP2shFee(feeTimestamp);
+		long p2shFee = PirateChain.getInstance().getP2shFee(feeTimestamp);
 		long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-		BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(dogecoin.getBlockchainProvider(), p2shAddressA, minimumAmountA);
+		BitcoinyHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
 
 		switch (htlcStatusA) {
 			case UNFUNDED:
@@ -809,7 +834,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 			case REDEEMED:
 				// Too late!
 				TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_DONE,
-						() -> String.format("P2SH-A %s already spent!", p2shAddressA));
+						() -> String.format("P2SH-A %s already spent!", p2shAddress));
 				return;
 
 			case REFUND_IN_PROGRESS:
@@ -817,24 +842,28 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
 				break;
 
 			case FUNDED:{
+				// Get funding txid
+				String fundingTxidHex = PirateChainHTLC.getUnspentFundingTxid(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
+				if (fundingTxidHex == null) {
+					throw new ForeignBlockchainException("Missing funding txid when refunding P2SH");
+				}
+				String fundingTxid58 = Base58.encode(HashCode.fromString(fundingTxidHex).asBytes());
+
 				Coin refundAmount = Coin.valueOf(crossChainTradeData.expectedForeignAmount);
-				ECKey refundKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
-				List<TransactionOutput> fundingOutputs = dogecoin.getUnspentOutputs(p2shAddressA);
+				byte[] privateKey = tradeBotData.getTradePrivateKey();
+				String privateKey58 = Base58.encode(privateKey);
+				String redeemScript58 = Base58.encode(redeemScriptA);
+				String receivingAddress = pirateChain.getWalletAddress(tradeBotData.getForeignKey());
 
-				// Determine receive address for refund
-				String receiveAddress = dogecoin.getUnusedReceiveAddress(tradeBotData.getForeignKey());
-				Address receiving = Address.fromString(dogecoin.getNetworkParameters(), receiveAddress);
-
-				Transaction p2shRefundTransaction = BitcoinyHTLC.buildRefundTransaction(dogecoin.getNetworkParameters(), refundAmount, refundKey,
-						fundingOutputs, redeemScriptA, lockTimeA, receiving.getHash());
-
-				dogecoin.broadcastTransaction(p2shRefundTransaction);
+				String txid = PirateChain.getInstance().refundP2sh(p2shAddressT3,
+						receivingAddress, refundAmount.value, redeemScript58, fundingTxid58, lockTimeA, privateKey58);
+				LOGGER.info("Refund txid: {}", txid);
 				break;
 			}
 		}
 
 		TradeBot.updateTradeBotState(repository, tradeBotData, State.ALICE_REFUNDED,
-				() -> String.format("LockTime-A reached. Refunded P2SH-A %s. Trade aborted", p2shAddressA));
+				() -> String.format("LockTime-A reached. Refunded P2SH-A %s. Trade aborted", p2shAddress));
 	}
 
 	/**

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

@@ -96,13 +96,12 @@ public class TradeBot implements Listener {
 		acctTradeBotSuppliers.put(BitcoinACCTv1.class, BitcoinACCTv1TradeBot::getInstance);
 		acctTradeBotSuppliers.put(BitcoinACCTv3.class, BitcoinACCTv3TradeBot::getInstance);
 		acctTradeBotSuppliers.put(LitecoinACCTv1.class, LitecoinACCTv1TradeBot::getInstance);
-		acctTradeBotSuppliers.put(LitecoinACCTv2.class, LitecoinACCTv2TradeBot::getInstance);
 		acctTradeBotSuppliers.put(LitecoinACCTv3.class, LitecoinACCTv3TradeBot::getInstance);
 		acctTradeBotSuppliers.put(DogecoinACCTv1.class, DogecoinACCTv1TradeBot::getInstance);
-		acctTradeBotSuppliers.put(DogecoinACCTv2.class, DogecoinACCTv2TradeBot::getInstance);
 		acctTradeBotSuppliers.put(DogecoinACCTv3.class, DogecoinACCTv3TradeBot::getInstance);
 		acctTradeBotSuppliers.put(DigibyteACCTv3.class, DigibyteACCTv3TradeBot::getInstance);
 		acctTradeBotSuppliers.put(RavencoinACCTv3.class, RavencoinACCTv3TradeBot::getInstance);
+		acctTradeBotSuppliers.put(PirateChainACCTv3.class, PirateChainACCTv3TradeBot::getInstance);
 	}
 
 	private static TradeBot instance;
@@ -299,7 +298,7 @@ public class TradeBot implements Listener {
 		return ECKey.fromPrivate(privateKey).getPubKey();
 	}
 
-	/*package*/ static byte[] generateSecret() {
+	/*package*/ public static byte[] generateSecret() {
 		byte[] secret = new byte[32];
 		RANDOM.nextBytes(secret);
 		return secret;
@@ -469,9 +468,6 @@ public class TradeBot implements Listener {
 
 		List<TradePresenceData> safeTradePresences = List.copyOf(this.safeAllTradePresencesByPubkey.values());
 
-		if (safeTradePresences.isEmpty())
-			return;
-
 		LOGGER.debug("Broadcasting all {} known trade presences. Next broadcast timestamp: {}",
 				safeTradePresences.size(), nextTradePresenceBroadcastTimestamp
 		);
@@ -638,7 +634,7 @@ public class TradeBot implements Listener {
 		}
 
 		if (newCount > 0) {
-			LOGGER.debug("New trade presences: {}", newCount);
+			LOGGER.debug("New trade presences: {}, all trade presences: {}", newCount, allTradePresencesByPubkey.size());
 			rebuildSafeAllTradePresences();
 		}
 	}

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

@@ -174,6 +174,8 @@ public class Bitcoin extends Bitcoiny {
 			Context bitcoinjContext = new Context(bitcoinNet.getParams());
 
 			instance = new Bitcoin(bitcoinNet, electrumX, bitcoinjContext, CURRENCY_CODE);
+
+			electrumX.setBlockchain(instance);
 		}
 
 		return instance;

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

@@ -43,7 +43,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 
 	public static final int HASH160_LENGTH = 20;
 
-	protected final BitcoinyBlockchainProvider blockchain;
+	protected final BitcoinyBlockchainProvider blockchainProvider;
 	protected final Context bitcoinjContext;
 	protected final String currencyCode;
 
@@ -67,8 +67,8 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 
 	// Constructors and instance
 
-	protected Bitcoiny(BitcoinyBlockchainProvider blockchain, Context bitcoinjContext, String currencyCode) {
-		this.blockchain = blockchain;
+	protected Bitcoiny(BitcoinyBlockchainProvider blockchainProvider, Context bitcoinjContext, String currencyCode) {
+		this.blockchainProvider = blockchainProvider;
 		this.bitcoinjContext = bitcoinjContext;
 		this.currencyCode = currencyCode;
 
@@ -78,7 +78,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	// Getters & setters
 
 	public BitcoinyBlockchainProvider getBlockchainProvider() {
-		return this.blockchain;
+		return this.blockchainProvider;
 	}
 
 	public Context getBitcoinjContext() {
@@ -151,10 +151,10 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 * @throws ForeignBlockchainException if error occurs
 	 */
 	public int getMedianBlockTime() throws ForeignBlockchainException {
-		int height = this.blockchain.getCurrentHeight();
+		int height = this.blockchainProvider.getCurrentHeight();
 
 		// Grab latest 11 blocks
-		List<byte[]> blockHeaders = this.blockchain.getRawBlockHeaders(height - 11, 11);
+		List<byte[]> blockHeaders = this.blockchainProvider.getRawBlockHeaders(height - 11, 11);
 		if (blockHeaders.size() < 11)
 			throw new ForeignBlockchainException("Not enough blocks to determine median block time");
 
@@ -193,7 +193,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 * @throws ForeignBlockchainException if there was an error
 	 */
 	public long getConfirmedBalance(String base58Address) throws ForeignBlockchainException {
-		return this.blockchain.getConfirmedBalance(addressToScriptPubKey(base58Address));
+		return this.blockchainProvider.getConfirmedBalance(addressToScriptPubKey(base58Address));
 	}
 
 	/**
@@ -204,7 +204,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 */
 	// TODO: don't return bitcoinj-based objects like TransactionOutput, use BitcoinyTransaction.Output instead
 	public List<TransactionOutput> getUnspentOutputs(String base58Address) throws ForeignBlockchainException {
-		List<UnspentOutput> unspentOutputs = this.blockchain.getUnspentOutputs(addressToScriptPubKey(base58Address), false);
+		List<UnspentOutput> unspentOutputs = this.blockchainProvider.getUnspentOutputs(addressToScriptPubKey(base58Address), false);
 
 		List<TransactionOutput> unspentTransactionOutputs = new ArrayList<>();
 		for (UnspentOutput unspentOutput : unspentOutputs) {
@@ -224,7 +224,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 */
 	// TODO: don't return bitcoinj-based objects like TransactionOutput, use BitcoinyTransaction.Output instead
 	public List<TransactionOutput> getOutputs(byte[] txHash) throws ForeignBlockchainException {
-		byte[] rawTransactionBytes = this.blockchain.getRawTransaction(txHash);
+		byte[] rawTransactionBytes = this.blockchainProvider.getRawTransaction(txHash);
 
 		Context.propagate(bitcoinjContext);
 		Transaction transaction = new Transaction(this.params, rawTransactionBytes);
@@ -241,7 +241,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 		ForeignBlockchainException e2 = null;
 		while (retries <= 3) {
 			try {
-				return this.blockchain.getAddressTransactions(scriptPubKey, includeUnconfirmed);
+				return this.blockchainProvider.getAddressTransactions(scriptPubKey, includeUnconfirmed);
 			} catch (ForeignBlockchainException e) {
 				e2 = e;
 				retries++;
@@ -257,7 +257,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 * @throws ForeignBlockchainException if there was an error.
 	 */
 	public List<TransactionHash> getAddressTransactions(String base58Address, boolean includeUnconfirmed) throws ForeignBlockchainException {
-		return this.blockchain.getAddressTransactions(addressToScriptPubKey(base58Address), includeUnconfirmed);
+		return this.blockchainProvider.getAddressTransactions(addressToScriptPubKey(base58Address), includeUnconfirmed);
 	}
 
 	/**
@@ -266,11 +266,11 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 * @throws ForeignBlockchainException if there was an error
 	 */
 	public List<byte[]> getAddressTransactions(String base58Address) throws ForeignBlockchainException {
-		List<TransactionHash> transactionHashes = this.blockchain.getAddressTransactions(addressToScriptPubKey(base58Address), false);
+		List<TransactionHash> transactionHashes = this.blockchainProvider.getAddressTransactions(addressToScriptPubKey(base58Address), false);
 
 		List<byte[]> rawTransactions = new ArrayList<>();
 		for (TransactionHash transactionInfo : transactionHashes) {
-			byte[] rawTransaction = this.blockchain.getRawTransaction(HashCode.fromString(transactionInfo.txHash).asBytes());
+			byte[] rawTransaction = this.blockchainProvider.getRawTransaction(HashCode.fromString(transactionInfo.txHash).asBytes());
 			rawTransactions.add(rawTransaction);
 		}
 
@@ -288,7 +288,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 		ForeignBlockchainException e2 = null;
 		while (retries <= 3) {
 			try {
-				return this.blockchain.getTransaction(txHash);
+				return this.blockchainProvider.getTransaction(txHash);
 			} catch (ForeignBlockchainException e) {
 				e2 = e;
 				retries++;
@@ -303,7 +303,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 * @throws ForeignBlockchainException if error occurs
 	 */
 	public void broadcastTransaction(Transaction transaction) throws ForeignBlockchainException {
-		this.blockchain.broadcastTransaction(transaction.bitcoinSerialize());
+		this.blockchainProvider.broadcastTransaction(transaction.bitcoinSerialize());
 	}
 
 	/**
@@ -356,17 +356,20 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 	 * @param key58 BIP32/HD extended Bitcoin private/public key
 	 * @return unspent BTC balance, or null if unable to determine balance
 	 */
-	public Long getWalletBalance(String key58) {
-		Context.propagate(bitcoinjContext);
+	public Long getWalletBalance(String key58) throws ForeignBlockchainException {
+		// It's more accurate to calculate the balance from the transactions, rather than asking Bitcoinj
+		return this.getWalletBalanceFromTransactions(key58);
 
-		Wallet wallet = walletFromDeterministicKey58(key58);
-		wallet.setUTXOProvider(new WalletAwareUTXOProvider(this, wallet));
-
-		Coin balance = wallet.getBalance();
-		if (balance == null)
-			return null;
-
-		return balance.value;
+//		Context.propagate(bitcoinjContext);
+//
+//		Wallet wallet = walletFromDeterministicKey58(key58);
+//		wallet.setUTXOProvider(new WalletAwareUTXOProvider(this, wallet));
+//
+//		Coin balance = wallet.getBalance();
+//		if (balance == null)
+//			return null;
+//
+//		return balance.value;
 	}
 
 	public Long getWalletBalanceFromTransactions(String key58) throws ForeignBlockchainException {
@@ -531,7 +534,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 			amount = 0;
 		}
 		long timestampMillis = t.timestamp * 1000L;
-		return new SimpleTransaction(t.txHash, timestampMillis, amount, fee, inputs, outputs);
+		return new SimpleTransaction(t.txHash, timestampMillis, amount, fee, inputs, outputs, null);
 	}
 
 	/**
@@ -567,7 +570,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 				Address address = Address.fromKey(this.params, dKey, ScriptType.P2PKH);
 				byte[] script = ScriptBuilder.createOutputScript(address).getProgram();
 
-				List<UnspentOutput> unspentOutputs = this.blockchain.getUnspentOutputs(script, false);
+				List<UnspentOutput> unspentOutputs = this.blockchainProvider.getUnspentOutputs(script, false);
 
 				/*
 				 * If there are no unspent outputs then either:
@@ -585,7 +588,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 					}
 
 					// Ask for transaction history - if it's empty then key has never been used
-					List<TransactionHash> historicTransactionHashes = this.blockchain.getAddressTransactions(script, false);
+					List<TransactionHash> historicTransactionHashes = this.blockchainProvider.getAddressTransactions(script, false);
 
 					if (!historicTransactionHashes.isEmpty()) {
 						// Fully spent key - case (a)
@@ -644,7 +647,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 
 					List<UnspentOutput> unspentOutputs;
 					try {
-						unspentOutputs = this.bitcoiny.blockchain.getUnspentOutputs(script, false);
+						unspentOutputs = this.bitcoiny.blockchainProvider.getUnspentOutputs(script, false);
 					} catch (ForeignBlockchainException e) {
 						throw new UTXOProviderException(String.format("Unable to fetch unspent outputs for %s", address));
 					}
@@ -668,7 +671,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 						// Ask for transaction history - if it's empty then key has never been used
 						List<TransactionHash> historicTransactionHashes;
 						try {
-							historicTransactionHashes = this.bitcoiny.blockchain.getAddressTransactions(script, false);
+							historicTransactionHashes = this.bitcoiny.blockchainProvider.getAddressTransactions(script, false);
 						} catch (ForeignBlockchainException e) {
 							throw new UTXOProviderException(String.format("Unable to fetch transaction history for %s", address));
 						}
@@ -721,7 +724,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
 		@Override
 		public int getChainHeadHeight() throws UTXOProviderException {
 			try {
-				return this.bitcoiny.blockchain.getCurrentHeight();
+				return this.bitcoiny.blockchainProvider.getCurrentHeight();
 			} catch (ForeignBlockchainException e) {
 				throw new UTXOProviderException("Unable to determine Bitcoiny chain height");
 			}

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

@@ -1,5 +1,7 @@
 package org.qortal.crosschain;
 
+import cash.z.wallet.sdk.rpc.CompactFormats.*;
+
 import java.util.List;
 
 public abstract class BitcoinyBlockchainProvider {
@@ -7,18 +9,32 @@ public abstract class BitcoinyBlockchainProvider {
 	public static final boolean INCLUDE_UNCONFIRMED = true;
 	public static final boolean EXCLUDE_UNCONFIRMED = false;
 
+	/** Sets the blockchain using this provider instance */
+	public abstract void setBlockchain(Bitcoiny blockchain);
+
 	/** Returns ID unique to bitcoiny network (e.g. "Litecoin-TEST3") */
 	public abstract String getNetId();
 
 	/** Returns current blockchain height. */
 	public abstract int getCurrentHeight() throws ForeignBlockchainException;
 
+	/** Returns a list of compact blocks, starting at <tt>startHeight</tt> (inclusive), up to <tt>count</tt> max.
+	 * Used for Pirate/Zcash only. If ever needed for other blockchains, the response format will need to be
+	 * made generic. */
+	public abstract List<CompactBlock> getCompactBlocks(int startHeight, int count) throws ForeignBlockchainException;
+
 	/** Returns a list of raw block headers, starting at <tt>startHeight</tt> (inclusive), up to <tt>count</tt> max. */
 	public abstract List<byte[]> getRawBlockHeaders(int startHeight, int count) throws ForeignBlockchainException;
 
+	/** Returns a list of block timestamps, starting at <tt>startHeight</tt> (inclusive), up to <tt>count</tt> max. */
+	public abstract List<Long> getBlockTimestamps(int startHeight, int count) throws ForeignBlockchainException;
+
 	/** Returns balance of address represented by <tt>scriptPubKey</tt>. */
 	public abstract long getConfirmedBalance(byte[] scriptPubKey) throws ForeignBlockchainException;
 
+	/** Returns balance of base58 encoded address. */
+	public abstract long getConfirmedAddressBalance(String base58Address) throws ForeignBlockchainException;
+
 	/** Returns raw, serialized, transaction bytes given <tt>txHash</tt>. */
 	public abstract byte[] getRawTransaction(String txHash) throws ForeignBlockchainException;
 
@@ -31,6 +47,12 @@ public abstract class BitcoinyBlockchainProvider {
 	/** Returns list of transaction hashes (and heights) for address represented by <tt>scriptPubKey</tt>, optionally including unconfirmed transactions. */
 	public abstract List<TransactionHash> getAddressTransactions(byte[] scriptPubKey, boolean includeUnconfirmed) throws ForeignBlockchainException;
 
+	/** Returns list of BitcoinyTransaction objects for <tt>address</tt>, optionally including unconfirmed transactions. */
+	public abstract List<BitcoinyTransaction> getAddressBitcoinyTransactions(String address, boolean includeUnconfirmed) throws ForeignBlockchainException;
+
+		/** Returns list of unspent transaction outputs for <tt>address</tt>, optionally including unconfirmed transactions. */
+	public abstract List<UnspentOutput> getUnspentOutputs(String address, boolean includeUnconfirmed) throws ForeignBlockchainException;
+
 	/** Returns list of unspent transaction outputs for address represented by <tt>scriptPubKey</tt>, optionally including unconfirmed transactions. */
 	public abstract List<UnspentOutput> getUnspentOutputs(byte[] scriptPubKey, boolean includeUnconfirmed) throws ForeignBlockchainException;
 

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

@@ -1,5 +1,6 @@
 package org.qortal.crosschain;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -10,8 +11,13 @@ import javax.xml.bind.annotation.XmlTransient;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BitcoinyTransaction {
 
+	public static final Comparator<BitcoinyTransaction> CONFIRMED_FIRST = (a, b) -> Boolean.compare(a.height != 0, b.height != 0);
+
 	public final String txHash;
 
+	@XmlTransient
+	public Integer height;
+
 	@XmlTransient
 	public final int size;
 
@@ -113,6 +119,10 @@ public class BitcoinyTransaction {
 		this.totalAmount = outputs.stream().map(output -> output.value).reduce(0L, Long::sum);
 	}
 
+	public int getHeight() {
+		return this.height;
+	}
+
 	public String toString() {
 		return String.format("txHash %s, size %d, locktime %d, timestamp %d\n"
 				+ "\tinputs: [%s]\n"

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

@@ -135,6 +135,8 @@ public class Dogecoin extends Bitcoiny {
 			Context bitcoinjContext = new Context(dogecoinNet.getParams());
 
 			instance = new Dogecoin(dogecoinNet, electrumX, bitcoinjContext, CURRENCY_CODE);
+
+			electrumX.setBlockchain(instance);
 		}
 
 		return instance;

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

@@ -11,6 +11,7 @@ import java.util.regex.Pattern;
 
 import javax.net.ssl.SSLSocketFactory;
 
+import cash.z.wallet.sdk.rpc.CompactFormats.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.simple.JSONArray;
@@ -107,6 +108,7 @@ public class ElectrumX extends BitcoinyBlockchainProvider {
 	private final String netId;
 	private final String expectedGenesisHash;
 	private final Map<Server.ConnectionType, Integer> defaultPorts = new EnumMap<>(Server.ConnectionType.class);
+	private Bitcoiny blockchain;
 
 	private final Object serverLock = new Object();
 	private Server currentServer;
@@ -135,6 +137,11 @@ public class ElectrumX extends BitcoinyBlockchainProvider {
 
 	// Methods for use by other classes
 
+	@Override
+	public void setBlockchain(Bitcoiny blockchain) {
+		this.blockchain = blockchain;
+	}
+
 	@Override
 	public String getNetId() {
 		return this.netId;
@@ -161,6 +168,16 @@ public class ElectrumX extends BitcoinyBlockchainProvider {
 		return ((Long) heightObj).intValue();
 	}
 
+	/**
+	 * Returns list of raw blocks, starting from <tt>startHeight</tt> inclusive.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public List<CompactBlock> getCompactBlocks(int startHeight, int count) throws ForeignBlockchainException {
+		throw new ForeignBlockchainException("getCompactBlocks not implemented for ElectrumX due to being specific to zcash");
+	}
+
 	/**
 	 * Returns list of raw block headers, starting from <tt>startHeight</tt> inclusive.
 	 * <p>
@@ -222,6 +239,17 @@ public class ElectrumX extends BitcoinyBlockchainProvider {
 		return rawBlockHeaders;
 	}
 
+	/**
+	 * Returns list of raw block timestamps, starting from <tt>startHeight</tt> inclusive.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public List<Long> getBlockTimestamps(int startHeight, int count) throws ForeignBlockchainException {
+		// FUTURE: implement this if needed. For now we use getRawBlockHeaders directly
+		throw new ForeignBlockchainException("getBlockTimestamps not yet implemented for ElectrumX");
+	}
+
 	/**
 	 * Returns confirmed balance, based on passed payment script.
 	 * <p>
@@ -247,6 +275,29 @@ public class ElectrumX extends BitcoinyBlockchainProvider {
 		return (Long) balanceJson.get("confirmed");
 	}
 
+	/**
+	 * Returns confirmed balance, based on passed base58 encoded address.
+	 * <p>
+	 * @return confirmed balance, or zero if address unknown
+	 * @throws ForeignBlockchainException if there was an error
+	 */
+	@Override
+	public long getConfirmedAddressBalance(String base58Address) throws ForeignBlockchainException {
+		throw new ForeignBlockchainException("getConfirmedAddressBalance not yet implemented for ElectrumX");
+	}
+
+	/**
+	 * Returns list of unspent outputs pertaining to passed address.
+	 * <p>
+	 * @return list of unspent outputs, or empty list if address unknown
+	 * @throws ForeignBlockchainException if there was an error.
+	 */
+	@Override
+	public List<UnspentOutput> getUnspentOutputs(String address, boolean includeUnconfirmed) throws ForeignBlockchainException {
+		byte[] script = this.blockchain.addressToScriptPubKey(address);
+		return this.getUnspentOutputs(script, includeUnconfirmed);
+	}
+
 	/**
 	 * Returns list of unspent outputs pertaining to passed payment script.
 	 * <p>
@@ -482,6 +533,12 @@ public class ElectrumX extends BitcoinyBlockchainProvider {
 		return transactionHashes;
 	}
 
+	@Override
+	public List<BitcoinyTransaction> getAddressBitcoinyTransactions(String address, boolean includeUnconfirmed) throws ForeignBlockchainException {
+		// FUTURE: implement this if needed. For now we use getAddressTransactions() + getTransaction()
+		throw new ForeignBlockchainException("getAddressBitcoinyTransactions not yet implemented for ElectrumX");
+	}
+
 	/**
 	 * Broadcasts raw transaction to network.
 	 * <p>
@@ -682,6 +739,10 @@ public class ElectrumX extends BitcoinyBlockchainProvider {
 		} catch (IOException | NoSuchElementException e) {
 			// Unable to send, or receive -- try another server?
 			return null;
+		} catch (NoSuchMethodError e) {
+			// Likely an SSL dependency issue - retries are unlikely to succeed
+			LOGGER.error("ElectrumX output stream error", e);
+			return null;
 		}
 
 		long endTime = System.currentTimeMillis();

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

@@ -0,0 +1,254 @@
+/*
+ * Copyright 2011 Google Inc.
+ * Copyright 2014 Giannis Dzegoutanis
+ * Copyright 2015 Andreas Schildbach
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Updated for Zcash in May 2022 by Qortal core dev team. Modifications allow
+* correct encoding of P2SH (t3) addresses only. */
+
+package org.qortal.crosschain;
+
+import org.bitcoinj.core.*;
+import org.bitcoinj.params.Networks;
+import org.bitcoinj.script.Script.ScriptType;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * <p>A Bitcoin address looks like 1MsScoe2fTJoq4ZPdQgqyhgWeoNamYPevy and is derived from an elliptic curve public key
+ * plus a set of network parameters. Not to be confused with a {@link PeerAddress} or {@link AddressMessage}
+ * which are about network (TCP) addresses.</p>
+ *
+ * <p>A standard address is built by taking the RIPE-MD160 hash of the public key bytes, with a version prefix and a
+ * checksum suffix, then encoding it textually as base58. The version prefix is used to both denote the network for
+ * which the address is valid (see {@link NetworkParameters}, and also to indicate how the bytes inside the address
+ * should be interpreted. Whilst almost all addresses today are hashes of public keys, another (currently unsupported
+ * type) can contain a hash of a script instead.</p>
+ */
+public class LegacyZcashAddress extends Address {
+    /**
+     * An address is a RIPEMD160 hash of a public key, therefore is always 160 bits or 20 bytes.
+     */
+    public static final int LENGTH = 20;
+
+    /** True if P2SH, false if P2PKH. */
+    public final boolean p2sh;
+
+    /* Zcash P2SH header bytes */
+    private static int P2SH_HEADER_1 = 28;
+    private static int P2SH_HEADER_2 = 189;
+
+    /**
+     * Private constructor. Use {@link #fromBase58(NetworkParameters, String)},
+     * {@link #fromPubKeyHash(NetworkParameters, byte[])}, {@link #fromScriptHash(NetworkParameters, byte[])} or
+     * {@link #fromKey(NetworkParameters, ECKey)}.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param p2sh
+     *            true if hash160 is hash of a script, false if it is hash of a pubkey
+     * @param hash160
+     *            20-byte hash of pubkey or script
+     */
+    private LegacyZcashAddress(NetworkParameters params, boolean p2sh, byte[] hash160) throws AddressFormatException {
+        super(params, hash160);
+        if (hash160.length != 20)
+            throw new AddressFormatException.InvalidDataLength(
+                    "Legacy addresses are 20 byte (160 bit) hashes, but got: " + hash160.length);
+        this.p2sh = p2sh;
+    }
+
+    /**
+     * Construct a {@link LegacyZcashAddress} that represents the given pubkey hash. The resulting address will be a P2PKH type of
+     * address.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param hash160
+     *            20-byte pubkey hash
+     * @return constructed address
+     */
+    public static LegacyZcashAddress fromPubKeyHash(NetworkParameters params, byte[] hash160) throws AddressFormatException {
+        return new LegacyZcashAddress(params, false, hash160);
+    }
+
+    /**
+     * Construct a {@link LegacyZcashAddress} that represents the public part of the given {@link ECKey}. Note that an address is
+     * derived from a hash of the public key and is not the public key itself.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param key
+     *            only the public part is used
+     * @return constructed address
+     */
+    public static LegacyZcashAddress fromKey(NetworkParameters params, ECKey key) {
+        return fromPubKeyHash(params, key.getPubKeyHash());
+    }
+
+    /**
+     * Construct a {@link LegacyZcashAddress} that represents the given P2SH script hash.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param hash160
+     *            P2SH script hash
+     * @return constructed address
+     */
+    public static LegacyZcashAddress fromScriptHash(NetworkParameters params, byte[] hash160) throws AddressFormatException {
+        return new LegacyZcashAddress(params, true, hash160);
+    }
+
+    /**
+     * Construct a {@link LegacyZcashAddress} from its base58 form.
+     * 
+     * @param params
+     *            expected network this address is valid for, or null if if the network should be derived from the
+     *            base58
+     * @param base58
+     *            base58-encoded textual form of the address
+     * @throws AddressFormatException
+     *             if the given base58 doesn't parse or the checksum is invalid
+     * @throws AddressFormatException.WrongNetwork
+     *             if the given address is valid but for a different chain (eg testnet vs mainnet)
+     */
+    public static LegacyZcashAddress fromBase58(@Nullable NetworkParameters params, String base58)
+            throws AddressFormatException, AddressFormatException.WrongNetwork {
+        byte[] versionAndDataBytes = Base58.decodeChecked(base58);
+        int version = versionAndDataBytes[0] & 0xFF;
+        byte[] bytes = Arrays.copyOfRange(versionAndDataBytes, 1, versionAndDataBytes.length);
+        if (params == null) {
+            for (NetworkParameters p : Networks.get()) {
+                if (version == p.getAddressHeader())
+                    return new LegacyZcashAddress(p, false, bytes);
+                else if (version == p.getP2SHHeader())
+                    return new LegacyZcashAddress(p, true, bytes);
+            }
+            throw new AddressFormatException.InvalidPrefix("No network found for " + base58);
+        } else {
+            if (version == params.getAddressHeader())
+                return new LegacyZcashAddress(params, false, bytes);
+            else if (version == params.getP2SHHeader())
+                return new LegacyZcashAddress(params, true, bytes);
+            throw new AddressFormatException.WrongNetwork(version);
+        }
+    }
+
+    /**
+     * Get the version header of an address. This is the first byte of a base58 encoded address.
+     * 
+     * @return version header as one byte
+     */
+    public int getVersion() {
+        return p2sh ? params.getP2SHHeader() : params.getAddressHeader();
+    }
+
+    /**
+     * Returns the base58-encoded textual form, including version and checksum bytes.
+     * 
+     * @return textual form
+     */
+    public String toBase58() {
+        return this.encodeChecked(getVersion(), bytes);
+    }
+
+    /** The (big endian) 20 byte hash that is the core of a Bitcoin address. */
+    @Override
+    public byte[] getHash() {
+        return bytes;
+    }
+
+    /**
+     * Get the type of output script that will be used for sending to the address. This is either
+     * {@link ScriptType#P2PKH} or {@link ScriptType#P2SH}.
+     * 
+     * @return type of output script
+     */
+    @Override
+    public ScriptType getOutputScriptType() {
+        return p2sh ? ScriptType.P2SH : ScriptType.P2PKH;
+    }
+
+    /**
+     * Given an address, examines the version byte and attempts to find a matching NetworkParameters. If you aren't sure
+     * which network the address is intended for (eg, it was provided by a user), you can use this to decide if it is
+     * compatible with the current wallet.
+     * 
+     * @return network the address is valid for
+     * @throws AddressFormatException if the given base58 doesn't parse or the checksum is invalid
+     */
+    public static NetworkParameters getParametersFromAddress(String address) throws AddressFormatException {
+        return LegacyZcashAddress.fromBase58(null, address).getParameters();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        LegacyZcashAddress other = (LegacyZcashAddress) o;
+        return super.equals(other) && this.p2sh == other.p2sh;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), p2sh);
+    }
+
+    @Override
+    public String toString() {
+        return toBase58();
+    }
+
+    @Override
+    public LegacyZcashAddress clone() throws CloneNotSupportedException {
+        return (LegacyZcashAddress) super.clone();
+    }
+
+    public static String encodeChecked(int version, byte[] payload) {
+        if (version < 0 || version > 255)
+            throw new IllegalArgumentException("Version not in range.");
+
+        // A stringified buffer is:
+        // 1 byte version + data bytes + 4 bytes check code (a truncated hash)
+        byte[] addressBytes = new byte[2 + payload.length + 4];
+        addressBytes[0] = (byte) P2SH_HEADER_1;
+        addressBytes[1] = (byte) P2SH_HEADER_2;
+        System.arraycopy(payload, 0, addressBytes, 2, payload.length);
+        byte[] checksum = Sha256Hash.hashTwice(addressBytes, 0, payload.length + 2);
+        System.arraycopy(checksum, 0, addressBytes, payload.length + 2, 4);
+        return Base58.encode(addressBytes);
+    }
+
+//    // Comparator for LegacyAddress, left argument must be LegacyAddress, right argument can be any Address
+//    private static final Comparator<Address> LEGACY_ADDRESS_COMPARATOR = Address.PARTIAL_ADDRESS_COMPARATOR
+//            .thenComparingInt(a -> ((LegacyZcashAddress) a).getVersion())                    // Then compare Legacy address version byte
+//            .thenComparing(a -> a.bytes, UnsignedBytes.lexicographicalComparator());    // Then compare Legacy bytes
+//
+//    /**
+//     * {@inheritDoc}
+//     *
+//     * @param o other {@code Address} object
+//     * @return comparison result
+//     */
+//    @Override
+//    public int compareTo(Address o) {
+//       return LEGACY_ADDRESS_COMPARATOR.compare(this, o);
+//    }
+}

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

@@ -145,6 +145,8 @@ public class Litecoin extends Bitcoiny {
 			Context bitcoinjContext = new Context(litecoinNet.getParams());
 
 			instance = new Litecoin(litecoinNet, electrumX, bitcoinjContext, CURRENCY_CODE);
+
+			electrumX.setBlockchain(instance);
 		}
 
 		return instance;

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

@@ -1,854 +0,0 @@
-package org.qortal.crosschain;
-
-import com.google.common.hash.HashCode;
-import com.google.common.primitives.Bytes;
-import org.ciyam.at.*;
-import org.qortal.account.Account;
-import org.qortal.asset.Asset;
-import org.qortal.at.QortalFunctionCode;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.at.ATData;
-import org.qortal.data.at.ATStateData;
-import org.qortal.data.crosschain.CrossChainTradeData;
-import org.qortal.data.transaction.MessageTransactionData;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.utils.Base58;
-import org.qortal.utils.BitTwiddling;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.ciyam.at.OpCode.calcOffset;
-
-/**
- * Cross-chain trade AT
- * 
- * <p>
- * <ul>
- * <li>Bob generates Litecoin & Qortal 'trade' keys
- * 		<ul>
- * 			<li>private key required to sign P2SH redeem tx</li>
- * 			<li>private key could be used to create 'secret' (e.g. double-SHA256)</li>
- * 			<li>encrypted private key could be stored in Qortal AT for access by Bob from any node</li>
- * 		</ul>
- * </li>
- * <li>Bob deploys Qortal AT
- * 		<ul>
- * 		</ul>
- * </li>
- * <li>Alice finds Qortal AT and wants to trade
- * 		<ul>
- * 			<li>Alice generates Litecoin & Qortal 'trade' keys</li>
- * 			<li>Alice funds Litecoin P2SH-A</li>
- * 			<li>Alice sends 'offer' MESSAGE to Bob from her Qortal trade address, containing:
- * 				<ul>
- * 					<li>hash-of-secret-A</li>
- * 					<li>her 'trade' Litecoin PKH</li>
- * 				</ul>
- * 			</li>
- * 		</ul>
- * </li>
- * <li>Bob receives "offer" MESSAGE
- * 		<ul>
- * 			<li>Checks Alice's P2SH-A</li>
- * 			<li>Sends 'trade' MESSAGE to Qortal AT from his trade address, containing:
- * 				<ul>
- * 					<li>Alice's trade Qortal address</li>
- * 					<li>Alice's trade Litecoin PKH</li>
- * 					<li>hash-of-secret-A</li>
- * 				</ul>
- * 			</li>
- * 		</ul>
- * </li>
- * <li>Alice checks Qortal AT to confirm it's locked to her
- * 		<ul>
- * 			<li>Alice sends 'redeem' MESSAGE to Qortal AT from her trade address, containing:
- * 				<ul>
- * 					<li>secret-A</li>
- * 					<li>Qortal receiving address of her chosing</li>
- * 				</ul>
- * 			</li>
- * 			<li>AT's QORT funds are sent to Qortal receiving address</li>
- * 		</ul>
- * </li>
- * <li>Bob checks AT, extracts secret-A
- * 		<ul>
- * 			<li>Bob redeems P2SH-A using his Litecoin trade key and secret-A</li>
- * 			<li>P2SH-A LTC funds end up at Litecoin address determined by redeem transaction output(s)</li>
- * 		</ul>
- * </li>
- * </ul>
- */
-public class LitecoinACCTv2 implements ACCT {
-
-	public static final String NAME = LitecoinACCTv2.class.getSimpleName();
-	public static final byte[] CODE_BYTES_HASH = HashCode.fromString("d5ea386a41441180c854ca8d7bbc620bfd53a97df2650a2b162b52324caf6e19").asBytes(); // SHA256 of AT code bytes
-
-	public static final int SECRET_LENGTH = 32;
-
-	/** <b>Value</b> offset into AT segment where 'mode' variable (long) is stored. (Multiply by MachineState.VALUE_SIZE for byte offset). */
-	private static final int MODE_VALUE_OFFSET = 61;
-	/** <b>Byte</b> offset into AT state data where 'mode' variable (long) is stored. */
-	public static final int MODE_BYTE_OFFSET = MachineState.HEADER_LENGTH + (MODE_VALUE_OFFSET * MachineState.VALUE_SIZE);
-
-	public static class OfferMessageData {
-		public byte[] partnerLitecoinPKH;
-		public byte[] hashOfSecretA;
-		public long lockTimeA;
-	}
-	public static final int OFFER_MESSAGE_LENGTH = 20 /*partnerLitecoinPKH*/ + 20 /*hashOfSecretA*/ + 8 /*lockTimeA*/;
-	public static final int TRADE_MESSAGE_LENGTH = 32 /*partner's Qortal trade address (padded from 25 to 32)*/
-			+ 24 /*partner's Litecoin PKH (padded from 20 to 24)*/
-			+ 8 /*AT trade timeout (minutes)*/
-			+ 24 /*hash of secret-A (padded from 20 to 24)*/
-			+ 8 /*lockTimeA*/;
-	public static final int REDEEM_MESSAGE_LENGTH = 32 /*secret-A*/ + 32 /*partner's Qortal receiving address padded from 25 to 32*/;
-	public static final int CANCEL_MESSAGE_LENGTH = 32 /*AT creator's Qortal address*/;
-
-	private static LitecoinACCTv2 instance;
-
-	private LitecoinACCTv2() {
-	}
-
-	public static synchronized LitecoinACCTv2 getInstance() {
-		if (instance == null)
-			instance = new LitecoinACCTv2();
-
-		return instance;
-	}
-
-	@Override
-	public byte[] getCodeBytesHash() {
-		return CODE_BYTES_HASH;
-	}
-
-	@Override
-	public int getModeByteOffset() {
-		return MODE_BYTE_OFFSET;
-	}
-
-	@Override
-	public ForeignBlockchain getBlockchain() {
-		return Litecoin.getInstance();
-	}
-
-	/**
-	 * Returns Qortal AT creation bytes for cross-chain trading AT.
-	 * <p>
-	 * <tt>tradeTimeout</tt> (minutes) is the time window for the trade partner to send the
-	 * 32-byte secret to the AT, before the AT automatically refunds the AT's creator.
-	 * 
-	 * @param creatorTradeAddress AT creator's trade Qortal address
-	 * @param litecoinPublicKeyHash 20-byte HASH160 of creator's trade Litecoin public key
-	 * @param qortAmount how much QORT to pay trade partner if they send correct 32-byte secrets to AT
-	 * @param litecoinAmount how much LTC the AT creator is expecting to trade
-	 * @param tradeTimeout suggested timeout for entire trade
-	 */
-	public static byte[] buildQortalAT(String creatorTradeAddress, byte[] litecoinPublicKeyHash, long qortAmount, long litecoinAmount, int tradeTimeout) {
-		if (litecoinPublicKeyHash.length != 20)
-			throw new IllegalArgumentException("Litecoin public key hash should be 20 bytes");
-
-		// Labels for data segment addresses
-		int addrCounter = 0;
-
-		// Constants (with corresponding dataByteBuffer.put*() calls below)
-
-		final int addrCreatorTradeAddress1 = addrCounter++;
-		final int addrCreatorTradeAddress2 = addrCounter++;
-		final int addrCreatorTradeAddress3 = addrCounter++;
-		final int addrCreatorTradeAddress4 = addrCounter++;
-
-		final int addrLitecoinPublicKeyHash = addrCounter;
-		addrCounter += 4;
-
-		final int addrQortAmount = addrCounter++;
-		final int addrLitecoinAmount = addrCounter++;
-		final int addrTradeTimeout = addrCounter++;
-
-		final int addrMessageTxnType = addrCounter++;
-		final int addrExpectedTradeMessageLength = addrCounter++;
-		final int addrExpectedRedeemMessageLength = addrCounter++;
-
-		final int addrCreatorAddressPointer = addrCounter++;
-		final int addrQortalPartnerAddressPointer = addrCounter++;
-		final int addrMessageSenderPointer = addrCounter++;
-
-		final int addrTradeMessagePartnerLitecoinPKHOffset = addrCounter++;
-		final int addrPartnerLitecoinPKHPointer = addrCounter++;
-		final int addrTradeMessageHashOfSecretAOffset = addrCounter++;
-		final int addrHashOfSecretAPointer = addrCounter++;
-
-		final int addrRedeemMessageReceivingAddressOffset = addrCounter++;
-
-		final int addrMessageDataPointer = addrCounter++;
-		final int addrMessageDataLength = addrCounter++;
-
-		final int addrPartnerReceivingAddressPointer = addrCounter++;
-
-		final int addrEndOfConstants = addrCounter;
-
-		// Variables
-
-		final int addrCreatorAddress1 = addrCounter++;
-		final int addrCreatorAddress2 = addrCounter++;
-		final int addrCreatorAddress3 = addrCounter++;
-		final int addrCreatorAddress4 = addrCounter++;
-
-		final int addrQortalPartnerAddress1 = addrCounter++;
-		final int addrQortalPartnerAddress2 = addrCounter++;
-		final int addrQortalPartnerAddress3 = addrCounter++;
-		final int addrQortalPartnerAddress4 = addrCounter++;
-
-		final int addrLockTimeA = addrCounter++;
-		final int addrRefundTimeout = addrCounter++;
-		final int addrRefundTimestamp = addrCounter++;
-		final int addrLastTxnTimestamp = addrCounter++;
-		final int addrBlockTimestamp = addrCounter++;
-		final int addrTxnType = addrCounter++;
-		final int addrResult = addrCounter++;
-
-		final int addrMessageSender1 = addrCounter++;
-		final int addrMessageSender2 = addrCounter++;
-		final int addrMessageSender3 = addrCounter++;
-		final int addrMessageSender4 = addrCounter++;
-
-		final int addrMessageLength = addrCounter++;
-
-		final int addrMessageData = addrCounter;
-		addrCounter += 4;
-
-		final int addrHashOfSecretA = addrCounter;
-		addrCounter += 4;
-
-		final int addrPartnerLitecoinPKH = addrCounter;
-		addrCounter += 4;
-
-		final int addrPartnerReceivingAddress = addrCounter;
-		addrCounter += 4;
-
-		final int addrMode = addrCounter++;
-		assert addrMode == MODE_VALUE_OFFSET : String.format("addrMode %d does not match MODE_VALUE_OFFSET %d", addrMode, MODE_VALUE_OFFSET);
-
-		// Data segment
-		ByteBuffer dataByteBuffer = ByteBuffer.allocate(addrCounter * MachineState.VALUE_SIZE);
-
-		// AT creator's trade Qortal address, decoded from Base58
-		assert dataByteBuffer.position() == addrCreatorTradeAddress1 * MachineState.VALUE_SIZE : "addrCreatorTradeAddress1 incorrect";
-		byte[] creatorTradeAddressBytes = Base58.decode(creatorTradeAddress);
-		dataByteBuffer.put(Bytes.ensureCapacity(creatorTradeAddressBytes, 32, 0));
-
-		// Litecoin public key hash
-		assert dataByteBuffer.position() == addrLitecoinPublicKeyHash * MachineState.VALUE_SIZE : "addrLitecoinPublicKeyHash incorrect";
-		dataByteBuffer.put(Bytes.ensureCapacity(litecoinPublicKeyHash, 32, 0));
-
-		// Redeem Qort amount
-		assert dataByteBuffer.position() == addrQortAmount * MachineState.VALUE_SIZE : "addrQortAmount incorrect";
-		dataByteBuffer.putLong(qortAmount);
-
-		// Expected Litecoin amount
-		assert dataByteBuffer.position() == addrLitecoinAmount * MachineState.VALUE_SIZE : "addrLitecoinAmount incorrect";
-		dataByteBuffer.putLong(litecoinAmount);
-
-		// Suggested trade timeout (minutes)
-		assert dataByteBuffer.position() == addrTradeTimeout * MachineState.VALUE_SIZE : "addrTradeTimeout incorrect";
-		dataByteBuffer.putLong(tradeTimeout);
-
-		// We're only interested in MESSAGE transactions
-		assert dataByteBuffer.position() == addrMessageTxnType * MachineState.VALUE_SIZE : "addrMessageTxnType incorrect";
-		dataByteBuffer.putLong(API.ATTransactionType.MESSAGE.value);
-
-		// Expected length of 'trade' MESSAGE data from AT creator
-		assert dataByteBuffer.position() == addrExpectedTradeMessageLength * MachineState.VALUE_SIZE : "addrExpectedTradeMessageLength incorrect";
-		dataByteBuffer.putLong(TRADE_MESSAGE_LENGTH);
-
-		// Expected length of 'redeem' MESSAGE data from trade partner
-		assert dataByteBuffer.position() == addrExpectedRedeemMessageLength * MachineState.VALUE_SIZE : "addrExpectedRedeemMessageLength incorrect";
-		dataByteBuffer.putLong(REDEEM_MESSAGE_LENGTH);
-
-		// Index into data segment of AT creator's address, used by GET_B_IND
-		assert dataByteBuffer.position() == addrCreatorAddressPointer * MachineState.VALUE_SIZE : "addrCreatorAddressPointer incorrect";
-		dataByteBuffer.putLong(addrCreatorAddress1);
-
-		// Index into data segment of partner's Qortal address, used by SET_B_IND
-		assert dataByteBuffer.position() == addrQortalPartnerAddressPointer * MachineState.VALUE_SIZE : "addrQortalPartnerAddressPointer incorrect";
-		dataByteBuffer.putLong(addrQortalPartnerAddress1);
-
-		// Index into data segment of (temporary) transaction's sender's address, used by GET_B_IND
-		assert dataByteBuffer.position() == addrMessageSenderPointer * MachineState.VALUE_SIZE : "addrMessageSenderPointer incorrect";
-		dataByteBuffer.putLong(addrMessageSender1);
-
-		// Offset into 'trade' MESSAGE data payload for extracting partner's Litecoin PKH
-		assert dataByteBuffer.position() == addrTradeMessagePartnerLitecoinPKHOffset * MachineState.VALUE_SIZE : "addrTradeMessagePartnerLitecoinPKHOffset incorrect";
-		dataByteBuffer.putLong(32L);
-
-		// Index into data segment of partner's Litecoin PKH, used by GET_B_IND
-		assert dataByteBuffer.position() == addrPartnerLitecoinPKHPointer * MachineState.VALUE_SIZE : "addrPartnerLitecoinPKHPointer incorrect";
-		dataByteBuffer.putLong(addrPartnerLitecoinPKH);
-
-		// Offset into 'trade' MESSAGE data payload for extracting hash-of-secret-A
-		assert dataByteBuffer.position() == addrTradeMessageHashOfSecretAOffset * MachineState.VALUE_SIZE : "addrTradeMessageHashOfSecretAOffset incorrect";
-		dataByteBuffer.putLong(64L);
-
-		// Index into data segment to hash of secret A, used by GET_B_IND
-		assert dataByteBuffer.position() == addrHashOfSecretAPointer * MachineState.VALUE_SIZE : "addrHashOfSecretAPointer incorrect";
-		dataByteBuffer.putLong(addrHashOfSecretA);
-
-		// Offset into 'redeem' MESSAGE data payload for extracting Qortal receiving address
-		assert dataByteBuffer.position() == addrRedeemMessageReceivingAddressOffset * MachineState.VALUE_SIZE : "addrRedeemMessageReceivingAddressOffset incorrect";
-		dataByteBuffer.putLong(32L);
-
-		// Source location and length for hashing any passed secret
-		assert dataByteBuffer.position() == addrMessageDataPointer * MachineState.VALUE_SIZE : "addrMessageDataPointer incorrect";
-		dataByteBuffer.putLong(addrMessageData);
-		assert dataByteBuffer.position() == addrMessageDataLength * MachineState.VALUE_SIZE : "addrMessageDataLength incorrect";
-		dataByteBuffer.putLong(32L);
-
-		// Pointer into data segment of where to save partner's receiving Qortal address, used by GET_B_IND
-		assert dataByteBuffer.position() == addrPartnerReceivingAddressPointer * MachineState.VALUE_SIZE : "addrPartnerReceivingAddressPointer incorrect";
-		dataByteBuffer.putLong(addrPartnerReceivingAddress);
-
-		assert dataByteBuffer.position() == addrEndOfConstants * MachineState.VALUE_SIZE : "dataByteBuffer position not at end of constants";
-
-		// Code labels
-		Integer labelRefund = null;
-
-		Integer labelTradeTxnLoop = null;
-		Integer labelCheckTradeTxn = null;
-		Integer labelCheckCancelTxn = null;
-		Integer labelNotTradeNorCancelTxn = null;
-		Integer labelCheckNonRefundTradeTxn = null;
-		Integer labelTradeTxnExtract = null;
-		Integer labelRedeemTxnLoop = null;
-		Integer labelCheckRedeemTxn = null;
-		Integer labelCheckRedeemTxnSender = null;
-		Integer labelPayout = null;
-
-		ByteBuffer codeByteBuffer = ByteBuffer.allocate(768);
-
-		// Two-pass version
-		for (int pass = 0; pass < 2; ++pass) {
-			codeByteBuffer.clear();
-
-			try {
-				/* Initialization */
-
-				// Use AT creation 'timestamp' as starting point for finding transactions sent to AT
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_CREATION_TIMESTAMP, addrLastTxnTimestamp));
-
-				// Load B register with AT creator's address so we can save it into addrCreatorAddress1-4
-				codeByteBuffer.put(OpCode.EXT_FUN.compile(FunctionCode.PUT_CREATOR_INTO_B));
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrCreatorAddressPointer));
-
-				// Set restart position to after this opcode
-				codeByteBuffer.put(OpCode.SET_PCS.compile());
-
-				/* Loop, waiting for message from AT creator's trade address containing trade partner details, or AT owner's address to cancel offer */
-
-				/* Transaction processing loop */
-				labelTradeTxnLoop = codeByteBuffer.position();
-
-				/* Sleep until message arrives */
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.SLEEP_UNTIL_MESSAGE.value, addrLastTxnTimestamp));
-
-				// Find next transaction (if any) to this AT since the last one (referenced by addrLastTxnTimestamp)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.PUT_TX_AFTER_TIMESTAMP_INTO_A, addrLastTxnTimestamp));
-				// If no transaction found, A will be zero. If A is zero, set addrResult to 1, otherwise 0.
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.CHECK_A_IS_ZERO, addrResult));
-				// If addrResult is zero (i.e. A is non-zero, transaction was found) then go check transaction
-				codeByteBuffer.put(OpCode.BZR_DAT.compile(addrResult, calcOffset(codeByteBuffer, labelCheckTradeTxn)));
-				// Stop and wait for next block
-				codeByteBuffer.put(OpCode.STP_IMD.compile());
-
-				/* Check transaction */
-				labelCheckTradeTxn = codeByteBuffer.position();
-
-				// Update our 'last found transaction's timestamp' using 'timestamp' from transaction
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_TIMESTAMP_FROM_TX_IN_A, addrLastTxnTimestamp));
-				// Extract transaction type (message/payment) from transaction and save type in addrTxnType
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_TYPE_FROM_TX_IN_A, addrTxnType));
-				// If transaction type is not MESSAGE type then go look for another transaction
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrTxnType, addrMessageTxnType, calcOffset(codeByteBuffer, labelTradeTxnLoop)));
-
-				/* Check transaction's sender. We're expecting AT creator's trade address for 'trade' message, or AT creator's own address for 'cancel' message. */
-
-				// Extract sender address from transaction into B register
-				codeByteBuffer.put(OpCode.EXT_FUN.compile(FunctionCode.PUT_ADDRESS_FROM_TX_IN_A_INTO_B));
-				// Save B register into data segment starting at addrMessageSender1 (as pointed to by addrMessageSenderPointer)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrMessageSenderPointer));
-				// Compare each part of message sender's address with AT creator's trade address. If they don't match, check for cancel situation.
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender1, addrCreatorTradeAddress1, calcOffset(codeByteBuffer, labelCheckCancelTxn)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender2, addrCreatorTradeAddress2, calcOffset(codeByteBuffer, labelCheckCancelTxn)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender3, addrCreatorTradeAddress3, calcOffset(codeByteBuffer, labelCheckCancelTxn)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender4, addrCreatorTradeAddress4, calcOffset(codeByteBuffer, labelCheckCancelTxn)));
-				// Message sender's address matches AT creator's trade address so go process 'trade' message
-				codeByteBuffer.put(OpCode.JMP_ADR.compile(labelCheckNonRefundTradeTxn == null ? 0 : labelCheckNonRefundTradeTxn));
-
-				/* Checking message sender for possible cancel message */
-				labelCheckCancelTxn = codeByteBuffer.position();
-
-				// Compare each part of message sender's address with AT creator's address. If they don't match, look for another transaction.
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender1, addrCreatorAddress1, calcOffset(codeByteBuffer, labelNotTradeNorCancelTxn)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender2, addrCreatorAddress2, calcOffset(codeByteBuffer, labelNotTradeNorCancelTxn)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender3, addrCreatorAddress3, calcOffset(codeByteBuffer, labelNotTradeNorCancelTxn)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender4, addrCreatorAddress4, calcOffset(codeByteBuffer, labelNotTradeNorCancelTxn)));
-				// Partner address is AT creator's address, so cancel offer and finish.
-				codeByteBuffer.put(OpCode.SET_VAL.compile(addrMode, AcctMode.CANCELLED.value));
-				// We're finished forever (finishing auto-refunds remaining balance to AT creator)
-				codeByteBuffer.put(OpCode.FIN_IMD.compile());
-
-				/* Not trade nor cancel message */
-				labelNotTradeNorCancelTxn = codeByteBuffer.position();
-
-				// Loop to find another transaction
-				codeByteBuffer.put(OpCode.JMP_ADR.compile(labelTradeTxnLoop == null ? 0 : labelTradeTxnLoop));
-
-				/* Possible switch-to-trade-mode message */
-				labelCheckNonRefundTradeTxn = codeByteBuffer.position();
-
-				// Check 'trade' message we received has expected number of message bytes
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(QortalFunctionCode.GET_MESSAGE_LENGTH_FROM_TX_IN_A.value, addrMessageLength));
-				// If message length matches, branch to info extraction code
-				codeByteBuffer.put(OpCode.BEQ_DAT.compile(addrMessageLength, addrExpectedTradeMessageLength, calcOffset(codeByteBuffer, labelTradeTxnExtract)));
-				// Message length didn't match - go back to finding another 'trade' MESSAGE transaction
-				codeByteBuffer.put(OpCode.JMP_ADR.compile(labelTradeTxnLoop == null ? 0 : labelTradeTxnLoop));
-
-				/* Extracting info from 'trade' MESSAGE transaction */
-				labelTradeTxnExtract = codeByteBuffer.position();
-
-				// Extract message from transaction into B register
-				codeByteBuffer.put(OpCode.EXT_FUN.compile(FunctionCode.PUT_MESSAGE_FROM_TX_IN_A_INTO_B));
-				// Save B register into data segment starting at addrQortalPartnerAddress1 (as pointed to by addrQortalPartnerAddressPointer)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrQortalPartnerAddressPointer));
-
-				// Extract trade partner's Litecoin public key hash (PKH) from message into B
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.PUT_PARTIAL_MESSAGE_FROM_TX_IN_A_INTO_B.value, addrTradeMessagePartnerLitecoinPKHOffset));
-				// Store partner's Litecoin PKH (we only really use values from B1-B3)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrPartnerLitecoinPKHPointer));
-				// Extract AT trade timeout (minutes) (from B4)
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_B4, addrRefundTimeout));
-
-				// Grab next 32 bytes
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.PUT_PARTIAL_MESSAGE_FROM_TX_IN_A_INTO_B.value, addrTradeMessageHashOfSecretAOffset));
-
-				// Extract hash-of-secret-A (we only really use values from B1-B3)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrHashOfSecretAPointer));
-				// Extract lockTime-A (from B4)
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_B4, addrLockTimeA));
-
-				// Calculate trade timeout refund 'timestamp' by adding addrRefundTimeout minutes to this transaction's 'timestamp', then save into addrRefundTimestamp
-				codeByteBuffer.put(OpCode.EXT_FUN_RET_DAT_2.compile(FunctionCode.ADD_MINUTES_TO_TIMESTAMP, addrRefundTimestamp, addrLastTxnTimestamp, addrRefundTimeout));
-
-				/* We are in 'trade mode' */
-				codeByteBuffer.put(OpCode.SET_VAL.compile(addrMode, AcctMode.TRADING.value));
-
-				// Set restart position to after this opcode
-				codeByteBuffer.put(OpCode.SET_PCS.compile());
-
-				/* Loop, waiting for trade timeout or 'redeem' MESSAGE from Qortal trade partner */
-
-				// Fetch current block 'timestamp'
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_BLOCK_TIMESTAMP, addrBlockTimestamp));
-				// If we're not past refund 'timestamp' then look for next transaction
-				codeByteBuffer.put(OpCode.BLT_DAT.compile(addrBlockTimestamp, addrRefundTimestamp, calcOffset(codeByteBuffer, labelRedeemTxnLoop)));
-				// We're past refund 'timestamp' so go refund everything back to AT creator
-				codeByteBuffer.put(OpCode.JMP_ADR.compile(labelRefund == null ? 0 : labelRefund));
-
-				/* Transaction processing loop */
-				labelRedeemTxnLoop = codeByteBuffer.position();
-
-				/* Sleep until message arrives */
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.SLEEP_UNTIL_MESSAGE.value, addrLastTxnTimestamp));
-
-				// Find next transaction to this AT since the last one (if any)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.PUT_TX_AFTER_TIMESTAMP_INTO_A, addrLastTxnTimestamp));
-				// If no transaction found, A will be zero. If A is zero, set addrComparator to 1, otherwise 0.
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.CHECK_A_IS_ZERO, addrResult));
-				// If addrResult is zero (i.e. A is non-zero, transaction was found) then go check transaction
-				codeByteBuffer.put(OpCode.BZR_DAT.compile(addrResult, calcOffset(codeByteBuffer, labelCheckRedeemTxn)));
-				// Stop and wait for next block
-				codeByteBuffer.put(OpCode.STP_IMD.compile());
-
-				/* Check transaction */
-				labelCheckRedeemTxn = codeByteBuffer.position();
-
-				// Update our 'last found transaction's timestamp' using 'timestamp' from transaction
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_TIMESTAMP_FROM_TX_IN_A, addrLastTxnTimestamp));
-				// Extract transaction type (message/payment) from transaction and save type in addrTxnType
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_TYPE_FROM_TX_IN_A, addrTxnType));
-				// If transaction type is not MESSAGE type then go look for another transaction
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrTxnType, addrMessageTxnType, calcOffset(codeByteBuffer, labelRedeemTxnLoop)));
-
-				/* Check message payload length */
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(QortalFunctionCode.GET_MESSAGE_LENGTH_FROM_TX_IN_A.value, addrMessageLength));
-				// If message length matches, branch to sender checking code
-				codeByteBuffer.put(OpCode.BEQ_DAT.compile(addrMessageLength, addrExpectedRedeemMessageLength, calcOffset(codeByteBuffer, labelCheckRedeemTxnSender)));
-				// Message length didn't match - go back to finding another 'redeem' MESSAGE transaction
-				codeByteBuffer.put(OpCode.JMP_ADR.compile(labelRedeemTxnLoop == null ? 0 : labelRedeemTxnLoop));
-
-				/* Check transaction's sender */
-				labelCheckRedeemTxnSender = codeByteBuffer.position();
-
-				// Extract sender address from transaction into B register
-				codeByteBuffer.put(OpCode.EXT_FUN.compile(FunctionCode.PUT_ADDRESS_FROM_TX_IN_A_INTO_B));
-				// Save B register into data segment starting at addrMessageSender1 (as pointed to by addrMessageSenderPointer)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrMessageSenderPointer));
-				// Compare each part of transaction's sender's address with expected address. If they don't match, look for another transaction.
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender1, addrQortalPartnerAddress1, calcOffset(codeByteBuffer, labelRedeemTxnLoop)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender2, addrQortalPartnerAddress2, calcOffset(codeByteBuffer, labelRedeemTxnLoop)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender3, addrQortalPartnerAddress3, calcOffset(codeByteBuffer, labelRedeemTxnLoop)));
-				codeByteBuffer.put(OpCode.BNE_DAT.compile(addrMessageSender4, addrQortalPartnerAddress4, calcOffset(codeByteBuffer, labelRedeemTxnLoop)));
-
-				/* Check 'secret-A' in transaction's message */
-
-				// Extract secret-A from first 32 bytes of message from transaction into B register
-				codeByteBuffer.put(OpCode.EXT_FUN.compile(FunctionCode.PUT_MESSAGE_FROM_TX_IN_A_INTO_B));
-				// Save B register into data segment starting at addrMessageData (as pointed to by addrMessageDataPointer)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrMessageDataPointer));
-				// Load B register with expected hash result (as pointed to by addrHashOfSecretAPointer)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.SET_B_IND, addrHashOfSecretAPointer));
-				// Perform HASH160 using source data at addrMessageData. (Location and length specified via addrMessageDataPointer and addrMessageDataLength).
-				// Save the equality result (1 if they match, 0 otherwise) into addrResult.
-				codeByteBuffer.put(OpCode.EXT_FUN_RET_DAT_2.compile(FunctionCode.CHECK_HASH160_WITH_B, addrResult, addrMessageDataPointer, addrMessageDataLength));
-				// If hashes don't match, addrResult will be zero so go find another transaction
-				codeByteBuffer.put(OpCode.BNZ_DAT.compile(addrResult, calcOffset(codeByteBuffer, labelPayout)));
-				codeByteBuffer.put(OpCode.JMP_ADR.compile(labelRedeemTxnLoop == null ? 0 : labelRedeemTxnLoop));
-
-				/* Success! Pay arranged amount to receiving address */
-				labelPayout = codeByteBuffer.position();
-
-				// Extract Qortal receiving address from next 32 bytes of message from transaction into B register
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.PUT_PARTIAL_MESSAGE_FROM_TX_IN_A_INTO_B.value, addrRedeemMessageReceivingAddressOffset));
-				// Save B register into data segment starting at addrPartnerReceivingAddress (as pointed to by addrPartnerReceivingAddressPointer)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrPartnerReceivingAddressPointer));
-				// Pay AT's balance to receiving address
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.PAY_TO_ADDRESS_IN_B, addrQortAmount));
-				// Set redeemed mode
-				codeByteBuffer.put(OpCode.SET_VAL.compile(addrMode, AcctMode.REDEEMED.value));
-				// We're finished forever (finishing auto-refunds remaining balance to AT creator)
-				codeByteBuffer.put(OpCode.FIN_IMD.compile());
-
-				// Fall-through to refunding any remaining balance back to AT creator
-
-				/* Refund balance back to AT creator */
-				labelRefund = codeByteBuffer.position();
-
-				// Set refunded mode
-				codeByteBuffer.put(OpCode.SET_VAL.compile(addrMode, AcctMode.REFUNDED.value));
-				// We're finished forever (finishing auto-refunds remaining balance to AT creator)
-				codeByteBuffer.put(OpCode.FIN_IMD.compile());
-			} catch (CompilationException e) {
-				throw new IllegalStateException("Unable to compile LTC-QORT ACCT?", e);
-			}
-		}
-
-		codeByteBuffer.flip();
-
-		byte[] codeBytes = new byte[codeByteBuffer.limit()];
-		codeByteBuffer.get(codeBytes);
-
-		assert Arrays.equals(Crypto.digest(codeBytes), LitecoinACCTv2.CODE_BYTES_HASH)
-			: String.format("BTCACCT.CODE_BYTES_HASH mismatch: expected %s, actual %s", HashCode.fromBytes(CODE_BYTES_HASH), HashCode.fromBytes(Crypto.digest(codeBytes)));
-
-		final short ciyamAtVersion = 2;
-		final short numCallStackPages = 0;
-		final short numUserStackPages = 0;
-		final long minActivationAmount = 0L;
-
-		return MachineState.toCreationBytes(ciyamAtVersion, codeBytes, dataByteBuffer.array(), numCallStackPages, numUserStackPages, minActivationAmount);
-	}
-
-	/**
-	 * Returns CrossChainTradeData with useful info extracted from AT.
-	 */
-	@Override
-	public CrossChainTradeData populateTradeData(Repository repository, ATData atData) throws DataException {
-		ATStateData atStateData = repository.getATRepository().getLatestATState(atData.getATAddress());
-		return populateTradeData(repository, atData.getCreatorPublicKey(), atData.getCreation(), atStateData);
-	}
-
-	/**
-	 * Returns CrossChainTradeData with useful info extracted from AT.
-	 */
-	@Override
-	public CrossChainTradeData populateTradeData(Repository repository, ATStateData atStateData) throws DataException {
-		ATData atData = repository.getATRepository().fromATAddress(atStateData.getATAddress());
-		return populateTradeData(repository, atData.getCreatorPublicKey(), atData.getCreation(), atStateData);
-	}
-
-	/**
-	 * Returns CrossChainTradeData with useful info extracted from AT.
-	 */
-	public CrossChainTradeData populateTradeData(Repository repository, byte[] creatorPublicKey, long creationTimestamp, ATStateData atStateData) throws DataException {
-		byte[] addressBytes = new byte[25]; // for general use
-		String atAddress = atStateData.getATAddress();
-
-		CrossChainTradeData tradeData = new CrossChainTradeData();
-
-		tradeData.foreignBlockchain = SupportedBlockchain.LITECOIN.name();
-		tradeData.acctName = NAME;
-
-		tradeData.qortalAtAddress = atAddress;
-		tradeData.qortalCreator = Crypto.toAddress(creatorPublicKey);
-		tradeData.creationTimestamp = creationTimestamp;
-
-		Account atAccount = new Account(repository, atAddress);
-		tradeData.qortBalance = atAccount.getConfirmedBalance(Asset.QORT);
-
-		byte[] stateData = atStateData.getStateData();
-		ByteBuffer dataByteBuffer = ByteBuffer.wrap(stateData);
-		dataByteBuffer.position(MachineState.HEADER_LENGTH);
-
-		/* Constants */
-
-		// Skip creator's trade address
-		dataByteBuffer.get(addressBytes);
-		tradeData.qortalCreatorTradeAddress = Base58.encode(addressBytes);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - addressBytes.length);
-
-		// Creator's Litecoin/foreign public key hash
-		tradeData.creatorForeignPKH = new byte[20];
-		dataByteBuffer.get(tradeData.creatorForeignPKH);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - tradeData.creatorForeignPKH.length); // skip to 32 bytes
-
-		// We don't use secret-B
-		tradeData.hashOfSecretB = null;
-
-		// Redeem payout
-		tradeData.qortAmount = dataByteBuffer.getLong();
-
-		// Expected LTC amount
-		tradeData.expectedForeignAmount = dataByteBuffer.getLong();
-
-		// Trade timeout
-		tradeData.tradeTimeout = (int) dataByteBuffer.getLong();
-
-		// Skip MESSAGE transaction type
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip expected 'trade' message length
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip expected 'redeem' message length
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip pointer to creator's address
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip pointer to partner's Qortal trade address
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip pointer to message sender
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip 'trade' message data offset for partner's Litecoin PKH
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip pointer to partner's Litecoin PKH
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip 'trade' message data offset for hash-of-secret-A
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip pointer to hash-of-secret-A
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip 'redeem' message data offset for partner's Qortal receiving address
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip pointer to message data
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip message data length
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip pointer to partner's receiving address
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		/* End of constants / begin variables */
-
-		// Skip AT creator's address
-		dataByteBuffer.position(dataByteBuffer.position() + 8 * 4);
-
-		// Partner's trade address (if present)
-		dataByteBuffer.get(addressBytes);
-		String qortalRecipient = Base58.encode(addressBytes);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - addressBytes.length);
-
-		// Potential lockTimeA (if in trade mode)
-		int lockTimeA = (int) dataByteBuffer.getLong();
-
-		// AT refund timeout (probably only useful for debugging)
-		int refundTimeout = (int) dataByteBuffer.getLong();
-
-		// Trade-mode refund timestamp (AT 'timestamp' converted to Qortal block height)
-		long tradeRefundTimestamp = dataByteBuffer.getLong();
-
-		// Skip last transaction timestamp
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip block timestamp
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip transaction type
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip temporary result
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip temporary message sender
-		dataByteBuffer.position(dataByteBuffer.position() + 8 * 4);
-
-		// Skip message length
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip temporary message data
-		dataByteBuffer.position(dataByteBuffer.position() + 8 * 4);
-
-		// Potential hash160 of secret A
-		byte[] hashOfSecretA = new byte[20];
-		dataByteBuffer.get(hashOfSecretA);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - hashOfSecretA.length); // skip to 32 bytes
-
-		// Potential partner's Litecoin PKH
-		byte[] partnerLitecoinPKH = new byte[20];
-		dataByteBuffer.get(partnerLitecoinPKH);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - partnerLitecoinPKH.length); // skip to 32 bytes
-
-		// Partner's receiving address (if present)
-		byte[] partnerReceivingAddress = new byte[25];
-		dataByteBuffer.get(partnerReceivingAddress);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - partnerReceivingAddress.length); // skip to 32 bytes
-
-		// Trade AT's 'mode'
-		long modeValue = dataByteBuffer.getLong();
-		AcctMode mode = AcctMode.valueOf((int) (modeValue & 0xffL));
-
-		/* End of variables */
-
-		if (mode != null && mode != AcctMode.OFFERING) {
-			tradeData.mode = mode;
-			tradeData.refundTimeout = refundTimeout;
-			tradeData.tradeRefundHeight = new Timestamp(tradeRefundTimestamp).blockHeight;
-			tradeData.qortalPartnerAddress = qortalRecipient;
-			tradeData.hashOfSecretA = hashOfSecretA;
-			tradeData.partnerForeignPKH = partnerLitecoinPKH;
-			tradeData.lockTimeA = lockTimeA;
-
-			if (mode == AcctMode.REDEEMED)
-				tradeData.qortalPartnerReceivingAddress = Base58.encode(partnerReceivingAddress);
-		} else {
-			tradeData.mode = AcctMode.OFFERING;
-		}
-
-		tradeData.duplicateDeprecated();
-
-		return tradeData;
-	}
-
-	/** Returns 'offer' MESSAGE payload for trade partner to send to AT creator's trade address. */
-	public static byte[] buildOfferMessage(byte[] partnerBitcoinPKH, byte[] hashOfSecretA, int lockTimeA) {
-		byte[] lockTimeABytes = BitTwiddling.toBEByteArray((long) lockTimeA);
-		return Bytes.concat(partnerBitcoinPKH, hashOfSecretA, lockTimeABytes);
-	}
-
-	/** Returns info extracted from 'offer' MESSAGE payload sent by trade partner to AT creator's trade address, or null if not valid. */
-	public static OfferMessageData extractOfferMessageData(byte[] messageData) {
-		if (messageData == null || messageData.length != OFFER_MESSAGE_LENGTH)
-			return null;
-
-		OfferMessageData offerMessageData = new OfferMessageData();
-		offerMessageData.partnerLitecoinPKH = Arrays.copyOfRange(messageData, 0, 20);
-		offerMessageData.hashOfSecretA = Arrays.copyOfRange(messageData, 20, 40);
-		offerMessageData.lockTimeA = BitTwiddling.longFromBEBytes(messageData, 40);
-
-		return offerMessageData;
-	}
-
-	/** Returns 'trade' MESSAGE payload for AT creator to send to AT. */
-	public static byte[] buildTradeMessage(String partnerQortalTradeAddress, byte[] partnerBitcoinPKH, byte[] hashOfSecretA, int lockTimeA, int refundTimeout) {
-		byte[] data = new byte[TRADE_MESSAGE_LENGTH];
-		byte[] partnerQortalAddressBytes = Base58.decode(partnerQortalTradeAddress);
-		byte[] lockTimeABytes = BitTwiddling.toBEByteArray((long) lockTimeA);
-		byte[] refundTimeoutBytes = BitTwiddling.toBEByteArray((long) refundTimeout);
-
-		System.arraycopy(partnerQortalAddressBytes, 0, data, 0, partnerQortalAddressBytes.length);
-		System.arraycopy(partnerBitcoinPKH, 0, data, 32, partnerBitcoinPKH.length);
-		System.arraycopy(refundTimeoutBytes, 0, data, 56, refundTimeoutBytes.length);
-		System.arraycopy(hashOfSecretA, 0, data, 64, hashOfSecretA.length);
-		System.arraycopy(lockTimeABytes, 0, data, 88, lockTimeABytes.length);
-
-		return data;
-	}
-
-	/** Returns 'cancel' MESSAGE payload for AT creator to cancel trade AT. */
-	@Override
-	public byte[] buildCancelMessage(String creatorQortalAddress) {
-		byte[] data = new byte[CANCEL_MESSAGE_LENGTH];
-		byte[] creatorQortalAddressBytes = Base58.decode(creatorQortalAddress);
-
-		System.arraycopy(creatorQortalAddressBytes, 0, data, 0, creatorQortalAddressBytes.length);
-
-		return data;
-	}
-
-	/** Returns 'redeem' MESSAGE payload for trade partner to send to AT. */
-	public static byte[] buildRedeemMessage(byte[] secretA, String qortalReceivingAddress) {
-		byte[] data = new byte[REDEEM_MESSAGE_LENGTH];
-		byte[] qortalReceivingAddressBytes = Base58.decode(qortalReceivingAddress);
-
-		System.arraycopy(secretA, 0, data, 0, secretA.length);
-		System.arraycopy(qortalReceivingAddressBytes, 0, data, 32, qortalReceivingAddressBytes.length);
-
-		return data;
-	}
-
-	/** Returns refund timeout (minutes) based on trade partner's 'offer' MESSAGE timestamp and P2SH-A locktime. */
-	public static int calcRefundTimeout(long offerMessageTimestamp, int lockTimeA) {
-		// refund should be triggered halfway between offerMessageTimestamp and lockTimeA
-		return (int) ((lockTimeA - (offerMessageTimestamp / 1000L)) / 2L / 60L);
-	}
-
-	@Override
-	public byte[] findSecretA(Repository repository, CrossChainTradeData crossChainTradeData) throws DataException {
-		String atAddress = crossChainTradeData.qortalAtAddress;
-		String redeemerAddress = crossChainTradeData.qortalPartnerAddress;
-
-		// We don't have partner's public key so we check every message to AT
-		List<MessageTransactionData> messageTransactionsData = repository.getMessageRepository().getMessagesByParticipants(null, atAddress, null, null, null);
-		if (messageTransactionsData == null)
-			return null;
-
-		// Find 'redeem' message
-		for (MessageTransactionData messageTransactionData : messageTransactionsData) {
-			// Check message payload type/encryption
-			if (messageTransactionData.isText() || messageTransactionData.isEncrypted())
-				continue;
-
-			// Check message payload size
-			byte[] messageData = messageTransactionData.getData();
-			if (messageData.length != REDEEM_MESSAGE_LENGTH)
-				// Wrong payload length
-				continue;
-
-			// Check sender
-			if (!Crypto.toAddress(messageTransactionData.getSenderPublicKey()).equals(redeemerAddress))
-				// Wrong sender;
-				continue;
-
-			// Extract secretA
-			byte[] secretA = new byte[32];
-			System.arraycopy(messageData, 0, secretA, 0, secretA.length);
-
-			byte[] hashOfSecretA = Crypto.hash160(secretA);
-			if (!Arrays.equals(hashOfSecretA, crossChainTradeData.hashOfSecretA))
-				continue;
-
-			return secretA;
-		}
-
-		return null;
-	}
-
-}

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

@@ -0,0 +1,659 @@
+package org.qortal.crosschain;
+
+import cash.z.wallet.sdk.rpc.CompactFormats;
+import com.google.common.hash.HashCode;
+import com.rust.litewalletjni.LiteWalletJni;
+import org.bitcoinj.core.*;
+import org.bitcoinj.crypto.ChildNumber;
+import org.bitcoinj.crypto.DeterministicKey;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.wallet.DeterministicKeyChain;
+import org.bitcoinj.wallet.Wallet;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.libdohj.params.LitecoinRegTestParams;
+import org.libdohj.params.LitecoinTestNet3Params;
+import org.libdohj.params.PirateChainMainNetParams;
+import org.qortal.api.model.crosschain.PirateChainSendRequest;
+import org.qortal.controller.PirateChainWalletController;
+import org.qortal.crosschain.PirateLightClient.Server;
+import org.qortal.crosschain.PirateLightClient.Server.ConnectionType;
+import org.qortal.crypto.Crypto;
+import org.qortal.settings.Settings;
+import org.qortal.transform.TransformationException;
+import org.qortal.utils.BitTwiddling;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+
+public class PirateChain extends Bitcoiny {
+
+	public static final String CURRENCY_CODE = "ARRR";
+
+	private static final Coin DEFAULT_FEE_PER_KB = Coin.valueOf(10000); // 0.0001 ARRR per 1000 bytes
+
+	private static final long MINIMUM_ORDER_AMOUNT = 10000; // 0.0001 ARRR minimum order, to avoid dust errors // TODO: increase this
+
+	// Temporary values until a dynamic fee system is written.
+	private static final long MAINNET_FEE = 10000L; // 0.0001 ARRR
+	private static final long NON_MAINNET_FEE = 10000L; // 0.0001 ARRR
+
+	private static final Map<ConnectionType, Integer> DEFAULT_LITEWALLET_PORTS = new EnumMap<>(ConnectionType.class);
+	static {
+		DEFAULT_LITEWALLET_PORTS.put(ConnectionType.TCP, 9067);
+		DEFAULT_LITEWALLET_PORTS.put(ConnectionType.SSL, 443);
+	}
+
+	public enum PirateChainNet {
+		MAIN {
+			@Override
+			public NetworkParameters getParams() {
+				return PirateChainMainNetParams.get();
+			}
+
+			@Override
+			public Collection<Server> getServers() {
+				return Arrays.asList(
+						// Servers chosen on NO BASIS WHATSOEVER from various sources!
+						new Server("arrrlightd.qortal.online", ConnectionType.SSL, 443),
+						new Server("arrrlightd1.qortal.online", ConnectionType.SSL, 443),
+						new Server("arrrlightd2.qortal.online", ConnectionType.SSL, 443),
+						new Server("lightd.pirate.black", ConnectionType.SSL, 443));
+			}
+
+			@Override
+			public String getGenesisHash() {
+				return "027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71";
+			}
+
+			@Override
+			public long getP2shFee(Long timestamp) {
+				// TODO: This will need to be replaced with something better in the near future!
+				return MAINNET_FEE;
+			}
+		},
+		TEST3 {
+			@Override
+			public NetworkParameters getParams() {
+				return LitecoinTestNet3Params.get();
+			}
+
+			@Override
+			public Collection<Server> getServers() {
+				return Arrays.asList();
+			}
+
+			@Override
+			public String getGenesisHash() {
+				return "4966625a4b2851d9fdee139e56211a0d88575f59ed816ff5e6a63deb4e3e29a0";
+			}
+
+			@Override
+			public long getP2shFee(Long timestamp) {
+				return NON_MAINNET_FEE;
+			}
+		},
+		REGTEST {
+			@Override
+			public NetworkParameters getParams() {
+				return LitecoinRegTestParams.get();
+			}
+
+			@Override
+			public Collection<Server> getServers() {
+				return Arrays.asList(
+						new Server("localhost", ConnectionType.TCP, 9067),
+						new Server("localhost", ConnectionType.SSL, 443));
+			}
+
+			@Override
+			public String getGenesisHash() {
+				// This is unique to each regtest instance
+				return null;
+			}
+
+			@Override
+			public long getP2shFee(Long timestamp) {
+				return NON_MAINNET_FEE;
+			}
+		};
+
+		public abstract NetworkParameters getParams();
+		public abstract Collection<Server> getServers();
+		public abstract String getGenesisHash();
+		public abstract long getP2shFee(Long timestamp) throws ForeignBlockchainException;
+	}
+
+	private static PirateChain instance;
+
+	private final PirateChainNet pirateChainNet;
+
+	// Constructors and instance
+
+	private PirateChain(PirateChainNet pirateChainNet, BitcoinyBlockchainProvider blockchain, Context bitcoinjContext, String currencyCode) {
+		super(blockchain, bitcoinjContext, currencyCode);
+		this.pirateChainNet = pirateChainNet;
+
+		LOGGER.info(() -> String.format("Starting Pirate Chain support using %s", this.pirateChainNet.name()));
+	}
+
+	public static synchronized PirateChain getInstance() {
+		if (instance == null) {
+			PirateChainNet pirateChainNet = Settings.getInstance().getPirateChainNet();
+
+			BitcoinyBlockchainProvider pirateLightClient = new PirateLightClient("PirateChain-" + pirateChainNet.name(), pirateChainNet.getGenesisHash(), pirateChainNet.getServers(), DEFAULT_LITEWALLET_PORTS);
+			Context bitcoinjContext = new Context(pirateChainNet.getParams());
+
+			instance = new PirateChain(pirateChainNet, pirateLightClient, bitcoinjContext, CURRENCY_CODE);
+
+			pirateLightClient.setBlockchain(instance);
+		}
+
+		return instance;
+	}
+
+	// Getters & setters
+
+	public static synchronized void resetForTesting() {
+		instance = null;
+	}
+
+	// Actual useful methods for use by other classes
+
+	/** Default Litecoin fee is lower than Bitcoin: only 10sats/byte. */
+	@Override
+	public Coin getFeePerKb() {
+		return DEFAULT_FEE_PER_KB;
+	}
+
+	@Override
+	public long getMinimumOrderAmount() {
+		return MINIMUM_ORDER_AMOUNT;
+	}
+
+	/**
+	 * Returns estimated LTC fee, in sats per 1000bytes, optionally for historic timestamp.
+	 * 
+	 * @param timestamp optional milliseconds since epoch, or null for 'now'
+	 * @return sats per 1000bytes, or throws ForeignBlockchainException if something went wrong
+	 */
+	@Override
+	public long getP2shFee(Long timestamp) throws ForeignBlockchainException {
+		return this.pirateChainNet.getP2shFee(timestamp);
+	}
+
+	/**
+	 * Returns confirmed balance, based on passed payment script.
+	 * <p>
+	 * @return confirmed balance, or zero if balance unknown
+	 * @throws ForeignBlockchainException if there was an error
+	 */
+	public long getConfirmedBalance(String base58Address) throws ForeignBlockchainException {
+		return this.blockchainProvider.getConfirmedAddressBalance(base58Address);
+	}
+
+	/**
+	 * Returns median timestamp from latest 11 blocks, in seconds.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public int getMedianBlockTime() throws ForeignBlockchainException {
+		int height = this.blockchainProvider.getCurrentHeight();
+
+		// Grab latest 11 blocks
+		List<Long> blockTimestamps = this.blockchainProvider.getBlockTimestamps(height - 11, 11);
+		if (blockTimestamps.size() < 11)
+			throw new ForeignBlockchainException("Not enough blocks to determine median block time");
+
+		// Descending order
+		blockTimestamps.sort((a, b) -> Long.compare(b, a));
+
+		// Pick median
+		return Math.toIntExact(blockTimestamps.get(5));
+	}
+
+	/**
+	 * Returns list of compact blocks
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	public List<CompactFormats.CompactBlock> getCompactBlocks(int startHeight, int count) throws ForeignBlockchainException {
+		return this.blockchainProvider.getCompactBlocks(startHeight, count);
+	}
+
+
+	@Override
+	public boolean isValidAddress(String address) {
+		// Start with some simple checks
+		if (address == null || !address.toLowerCase().startsWith("zs") || address.length() != 78) {
+			return false;
+		}
+
+		// Now try Bech32 decoding the address (which includes checksum verification)
+		try {
+			Bech32.Bech32Data decoded = Bech32.decode(address);
+			return (decoded != null && Objects.equals("zs", decoded.hrp));
+		}
+		catch (AddressFormatException e) {
+			// Invalid address, checksum failed, etc
+			return false;
+		}
+	}
+
+	@Override
+	public boolean isValidWalletKey(String walletKey) {
+		// For Pirate Chain, we only care that the key is a random string
+		// 32 characters in length, as it is used as entropy for the seed.
+		return walletKey != null && Base58.decode(walletKey).length == 32;
+	}
+
+	/** Returns 't3' prefixed P2SH address using passed redeem script. */
+	public String deriveP2shAddress(byte[] redeemScriptBytes) {
+		Context.propagate(bitcoinjContext);
+		byte[] redeemScriptHash = Crypto.hash160(redeemScriptBytes);
+		return LegacyZcashAddress.fromScriptHash(this.params, redeemScriptHash).toString();
+	}
+
+	/** Returns 'b' prefixed P2SH address using passed redeem script. */
+	public String deriveP2shAddressBPrefix(byte[] redeemScriptBytes) {
+		Context.propagate(bitcoinjContext);
+		byte[] redeemScriptHash = Crypto.hash160(redeemScriptBytes);
+		return LegacyAddress.fromScriptHash(this.params, redeemScriptHash).toString();
+	}
+
+	public Long getWalletBalance(String entropy58) throws ForeignBlockchainException {
+		synchronized (this) {
+			PirateChainWalletController walletController = PirateChainWalletController.getInstance();
+			walletController.initWithEntropy58(entropy58);
+			walletController.ensureInitialized();
+			walletController.ensureSynchronized();
+			walletController.ensureNotNullSeed();
+
+			// Get balance
+			String response = LiteWalletJni.execute("balance", "");
+			JSONObject json = new JSONObject(response);
+			if (json.has("zbalance")) {
+				return json.getLong("zbalance");
+			}
+
+			throw new ForeignBlockchainException("Unable to determine balance");
+		}
+	}
+
+	public List<SimpleTransaction> getWalletTransactions(String entropy58) throws ForeignBlockchainException {
+		synchronized (this) {
+			PirateChainWalletController walletController = PirateChainWalletController.getInstance();
+			walletController.initWithEntropy58(entropy58);
+			walletController.ensureInitialized();
+			walletController.ensureSynchronized();
+			walletController.ensureNotNullSeed();
+
+			List<SimpleTransaction> transactions = new ArrayList<>();
+
+			// Get transactions list
+			String response = LiteWalletJni.execute("list", "");
+			JSONArray transactionsJson = new JSONArray(response);
+			if (transactionsJson != null) {
+				for (int i = 0; i < transactionsJson.length(); i++) {
+					JSONObject transactionJson = transactionsJson.getJSONObject(i);
+
+					if (transactionJson.has("txid")) {
+						String txId = transactionJson.getString("txid");
+						Long timestamp = transactionJson.getLong("datetime");
+						Long amount = transactionJson.getLong("amount");
+						Long fee = transactionJson.getLong("fee");
+						String memo = null;
+
+						if (transactionJson.has("incoming_metadata")) {
+							JSONArray incomingMetadatas = transactionJson.getJSONArray("incoming_metadata");
+							if (incomingMetadatas != null) {
+								for (int j = 0; j < incomingMetadatas.length(); j++) {
+									JSONObject incomingMetadata = incomingMetadatas.getJSONObject(j);
+									if (incomingMetadata.has("value")) {
+										//String address = incomingMetadata.getString("address");
+										Long value = incomingMetadata.getLong("value");
+										amount = value; // TODO: figure out how to parse transactions with multiple incomingMetadata entries
+									}
+
+									if (incomingMetadata.has("memo") && !incomingMetadata.isNull("memo")) {
+										memo = incomingMetadata.getString("memo");
+									}
+								}
+							}
+						}
+
+						if (transactionJson.has("outgoing_metadata")) {
+							JSONArray outgoingMetadatas = transactionJson.getJSONArray("outgoing_metadata");
+							for (int j = 0; j < outgoingMetadatas.length(); j++) {
+								JSONObject outgoingMetadata = outgoingMetadatas.getJSONObject(j);
+
+								if (outgoingMetadata.has("memo") && !outgoingMetadata.isNull("memo")) {
+									memo = outgoingMetadata.getString("memo");
+								}
+							}
+						}
+
+						long timestampMillis = Math.toIntExact(timestamp) * 1000L;
+						SimpleTransaction transaction = new SimpleTransaction(txId, timestampMillis, amount, fee, null, null, memo);
+						transactions.add(transaction);
+					}
+				}
+			}
+
+			return transactions;
+		}
+	}
+
+	public String getWalletAddress(String entropy58) throws ForeignBlockchainException {
+		synchronized (this) {
+			PirateChainWalletController walletController = PirateChainWalletController.getInstance();
+			walletController.initWithEntropy58(entropy58);
+			walletController.ensureInitialized();
+			walletController.ensureNotNullSeed();
+
+			return walletController.getCurrentWallet().getWalletAddress();
+		}
+	}
+
+	public String getUnusedReceiveAddress(String key58) throws ForeignBlockchainException {
+		// For now, return the main wallet address
+		// FUTURE: generate an unused one
+		return this.getWalletAddress(key58);
+	}
+
+	public String sendCoins(PirateChainSendRequest pirateChainSendRequest) throws ForeignBlockchainException {
+		PirateChainWalletController walletController = PirateChainWalletController.getInstance();
+		walletController.initWithEntropy58(pirateChainSendRequest.entropy58);
+		walletController.ensureInitialized();
+		walletController.ensureSynchronized();
+		walletController.ensureNotNullSeed();
+
+		// Unlock wallet
+		walletController.getCurrentWallet().unlock();
+
+		// Build spend
+		JSONObject txn = new JSONObject();
+		txn.put("input", walletController.getCurrentWallet().getWalletAddress());
+		txn.put("fee", MAINNET_FEE);
+
+		JSONObject output = new JSONObject();
+		output.put("address", pirateChainSendRequest.receivingAddress);
+		output.put("amount", pirateChainSendRequest.arrrAmount);
+		output.put("memo", pirateChainSendRequest.memo);
+
+		JSONArray outputs = new JSONArray();
+		outputs.put(output);
+		txn.put("output", outputs);
+
+		String txnString = txn.toString();
+
+		// Send the coins
+		String response = LiteWalletJni.execute("send", txnString);
+		JSONObject json = new JSONObject(response);
+		try {
+			if (json.has("txid")) { // Success
+				return json.getString("txid");
+			}
+			else if (json.has("error")) {
+				String error = json.getString("error");
+				throw new ForeignBlockchainException(error);
+			}
+
+		} catch (JSONException e) {
+			throw new ForeignBlockchainException(e.getMessage());
+		}
+
+		throw new ForeignBlockchainException("Something went wrong");
+	}
+
+	public String fundP2SH(String entropy58, String receivingAddress, long amount,
+						   String redeemScript58) throws ForeignBlockchainException {
+
+		PirateChainWalletController walletController = PirateChainWalletController.getInstance();
+		walletController.initWithEntropy58(entropy58);
+		walletController.ensureInitialized();
+		walletController.ensureSynchronized();
+		walletController.ensureNotNullSeed();
+
+		// Unlock wallet
+		walletController.getCurrentWallet().unlock();
+
+		// Build spend
+		JSONObject txn = new JSONObject();
+		txn.put("input", walletController.getCurrentWallet().getWalletAddress());
+		txn.put("fee", MAINNET_FEE);
+
+		JSONObject output = new JSONObject();
+		output.put("address", receivingAddress);
+		output.put("amount", amount);
+		//output.put("memo", memo);
+
+		JSONArray outputs = new JSONArray();
+		outputs.put(output);
+		txn.put("output", outputs);
+		txn.put("script", redeemScript58);
+
+		String txnString = txn.toString();
+
+		// Send the coins
+		String response = LiteWalletJni.execute("sendp2sh", txnString);
+		JSONObject json = new JSONObject(response);
+		try {
+			if (json.has("txid")) { // Success
+				return json.getString("txid");
+			}
+			else if (json.has("error")) {
+				String error = json.getString("error");
+				throw new ForeignBlockchainException(error);
+			}
+
+		} catch (JSONException e) {
+			throw new ForeignBlockchainException(e.getMessage());
+		}
+
+		throw new ForeignBlockchainException("Something went wrong");
+	}
+
+	public String redeemP2sh(String p2shAddress, String receivingAddress, long amount, String redeemScript58,
+							 String fundingTxid58, String secret58, String privateKey58) throws ForeignBlockchainException {
+
+		// Use null seed wallet since we may not have the entropy bytes for a real wallet's seed
+		PirateChainWalletController walletController = PirateChainWalletController.getInstance();
+		walletController.initNullSeedWallet();
+		walletController.ensureInitialized();
+
+		walletController.getCurrentWallet().unlock();
+
+		// Build spend
+		JSONObject txn = new JSONObject();
+		txn.put("input", p2shAddress);
+		txn.put("fee", MAINNET_FEE);
+
+		JSONObject output = new JSONObject();
+		output.put("address", receivingAddress);
+		output.put("amount", amount);
+		// output.put("memo", ""); // Maybe useful in future to include trade details?
+
+		JSONArray outputs = new JSONArray();
+		outputs.put(output);
+		txn.put("output", outputs);
+
+		txn.put("script", redeemScript58);
+		txn.put("txid", fundingTxid58);
+		txn.put("locktime", 0); // Must be 0 when redeeming
+		txn.put("secret", secret58);
+		txn.put("privkey", privateKey58);
+
+		String txnString = txn.toString();
+
+		// Redeem the P2SH
+		String response = LiteWalletJni.execute("redeemp2sh", txnString);
+		JSONObject json = new JSONObject(response);
+		try {
+			if (json.has("txid")) { // Success
+				return json.getString("txid");
+			}
+			else if (json.has("error")) {
+				String error = json.getString("error");
+				throw new ForeignBlockchainException(error);
+			}
+
+		} catch (JSONException e) {
+			throw new ForeignBlockchainException(e.getMessage());
+		}
+
+		throw new ForeignBlockchainException("Something went wrong");
+	}
+
+	public String refundP2sh(String p2shAddress, String receivingAddress, long amount, String redeemScript58,
+							 String fundingTxid58, int lockTime, String privateKey58) throws ForeignBlockchainException {
+
+		// Use null seed wallet since we may not have the entropy bytes for a real wallet's seed
+		PirateChainWalletController walletController = PirateChainWalletController.getInstance();
+		walletController.initNullSeedWallet();
+		walletController.ensureInitialized();
+
+		walletController.getCurrentWallet().unlock();
+
+		// Build spend
+		JSONObject txn = new JSONObject();
+		txn.put("input", p2shAddress);
+		txn.put("fee", MAINNET_FEE);
+
+		JSONObject output = new JSONObject();
+		output.put("address", receivingAddress);
+		output.put("amount", amount);
+		// output.put("memo", ""); // Maybe useful in future to include trade details?
+
+		JSONArray outputs = new JSONArray();
+		outputs.put(output);
+		txn.put("output", outputs);
+
+		txn.put("script", redeemScript58);
+		txn.put("txid", fundingTxid58);
+		txn.put("locktime", lockTime);
+		txn.put("secret", ""); // Must be blank when refunding
+		txn.put("privkey", privateKey58);
+
+		String txnString = txn.toString();
+
+		// Redeem the P2SH
+		String response = LiteWalletJni.execute("redeemp2sh", txnString);
+		JSONObject json = new JSONObject(response);
+		try {
+			if (json.has("txid")) { // Success
+				return json.getString("txid");
+			}
+			else if (json.has("error")) {
+				String error = json.getString("error");
+				throw new ForeignBlockchainException(error);
+			}
+
+		} catch (JSONException e) {
+			throw new ForeignBlockchainException(e.getMessage());
+		}
+
+		throw new ForeignBlockchainException("Something went wrong");
+	}
+
+	public String getSyncStatus(String entropy58) throws ForeignBlockchainException {
+		synchronized (this) {
+			PirateChainWalletController walletController = PirateChainWalletController.getInstance();
+			walletController.initWithEntropy58(entropy58);
+
+			return walletController.getSyncStatus();
+		}
+	}
+
+	public static BitcoinyTransaction deserializeRawTransaction(String rawTransactionHex) throws TransformationException {
+		byte[] rawTransactionData = HashCode.fromString(rawTransactionHex).asBytes();
+		ByteBuffer byteBuffer = ByteBuffer.wrap(rawTransactionData);
+
+		// Header
+		int header = BitTwiddling.readU32(byteBuffer);
+		boolean overwintered = ((header >> 31 & 0xff) == 255);
+		int version = header & 0x7FFFFFFF;
+
+		// Version group ID
+		int versionGroupId = 0;
+		if (overwintered) {
+			versionGroupId = BitTwiddling.readU32(byteBuffer);
+		}
+
+		boolean isOverwinterV3 = overwintered && versionGroupId == 0x03C48270 && version == 3;
+		boolean isSaplingV4 = overwintered && versionGroupId == 0x892F2085 && version == 4;
+		if (overwintered && !(isOverwinterV3 || isSaplingV4)) {
+			throw new TransformationException("Unknown transaction format");
+		}
+
+		// Inputs
+		List<BitcoinyTransaction.Input> inputs = new ArrayList<>();
+		int vinCount = BitTwiddling.readU8(byteBuffer);
+		for (int i=0; i<vinCount; i++) {
+			// Outpoint hash
+			byte[] outpointHashBytes = new byte[32];
+			byteBuffer.get(outpointHashBytes);
+			String outpointHash = HashCode.fromBytes(outpointHashBytes).toString();
+
+			// vout
+			int vout = BitTwiddling.readU32(byteBuffer);
+
+			// scriptSig
+			int scriptSigLength = BitTwiddling.readU8(byteBuffer);
+			byte[] scriptSigBytes = new byte[scriptSigLength];
+			byteBuffer.get(scriptSigBytes);
+			String scriptSig = HashCode.fromBytes(scriptSigBytes).toString();
+
+			int sequence = BitTwiddling.readU32(byteBuffer);
+
+			BitcoinyTransaction.Input input = new BitcoinyTransaction.Input(scriptSig, sequence, outpointHash, vout);
+			inputs.add(input);
+		}
+
+		// Outputs
+		List<BitcoinyTransaction.Output> outputs = new ArrayList<>();
+		int voutCount = BitTwiddling.readU8(byteBuffer);
+		for (int i=0; i<voutCount; i++) {
+			// Amount
+			byte[] amountBytes = new byte[8];
+			byteBuffer.get(amountBytes);
+			long amount = BitTwiddling.longFromLEBytes(amountBytes, 0);
+
+			// Script pubkey
+			int scriptPubkeySize = BitTwiddling.readU8(byteBuffer);
+			byte[] scriptPubkeyBytes = new byte[scriptPubkeySize];
+			byteBuffer.get(scriptPubkeyBytes);
+			String scriptPubKey = HashCode.fromBytes(scriptPubkeyBytes).toString();
+
+			outputs.add(new BitcoinyTransaction.Output(scriptPubKey, amount, null));
+		}
+
+		// Locktime
+		byte[] locktimeBytes = new byte[4];
+		byteBuffer.get(locktimeBytes);
+		int locktime = BitTwiddling.intFromLEBytes(locktimeBytes, 0);
+
+		// Expiry height
+		int expiryHeight = 0;
+		if (isOverwinterV3 || isSaplingV4) {
+			byte[] expiryHeightBytes = new byte[4];
+			byteBuffer.get(expiryHeightBytes);
+			expiryHeight = BitTwiddling.intFromLEBytes(expiryHeightBytes, 0);
+		}
+
+		String txHash = null; // Not present in raw transaction data
+		int size = 0; // Not present in raw transaction data
+		Integer timestamp = null; // Not present in raw transaction data
+
+		// Note: this is incomplete, as sapling spend info is not yet parsed. We don't need it for our
+		// current trade bot implementation, but it could be added in the future, for completeness.
+		// See link below for reference:
+		// https://github.com/PirateNetwork/librustzcash/blob/2981c4d2860f7cd73282fed885daac0323ff0280/zcash_primitives/src/transaction/mod.rs#L197
+
+		return new BitcoinyTransaction(txHash, size, locktime, timestamp, inputs, outputs);
+	}
+
+}

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

@@ -2,8 +2,6 @@ package org.qortal.crosschain;
 
 import com.google.common.hash.HashCode;
 import com.google.common.primitives.Bytes;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.ciyam.at.*;
 import org.qortal.account.Account;
 import org.qortal.asset.Asset;
@@ -29,7 +27,7 @@ import static org.ciyam.at.OpCode.calcOffset;
  * 
  * <p>
  * <ul>
- * <li>Bob generates Dogecoin & Qortal 'trade' keys
+ * <li>Bob generates PirateChain & Qortal 'trade' keys
  * 		<ul>
  * 			<li>private key required to sign P2SH redeem tx</li>
  * 			<li>private key could be used to create 'secret' (e.g. double-SHA256)</li>
@@ -42,12 +40,12 @@ import static org.ciyam.at.OpCode.calcOffset;
  * </li>
  * <li>Alice finds Qortal AT and wants to trade
  * 		<ul>
- * 			<li>Alice generates Dogecoin & Qortal 'trade' keys</li>
- * 			<li>Alice funds Dogecoin P2SH-A</li>
+ * 			<li>Alice generates PirateChain & Qortal 'trade' keys</li>
+ * 			<li>Alice funds PirateChain P2SH-A</li>
  * 			<li>Alice sends 'offer' MESSAGE to Bob from her Qortal trade address, containing:
  * 				<ul>
  * 					<li>hash-of-secret-A</li>
- * 					<li>her 'trade' Dogecoin PKH</li>
+ * 					<li>her 'trade' Pirate Chain public key</li>
  * 				</ul>
  * 			</li>
  * 		</ul>
@@ -58,7 +56,7 @@ import static org.ciyam.at.OpCode.calcOffset;
  * 			<li>Sends 'trade' MESSAGE to Qortal AT from his trade address, containing:
  * 				<ul>
  * 					<li>Alice's trade Qortal address</li>
- * 					<li>Alice's trade Dogecoin PKH</li>
+ * 					<li>Alice's trade Pirate Chain public key</li>
  * 					<li>hash-of-secret-A</li>
  * 				</ul>
  * 			</li>
@@ -77,48 +75,46 @@ import static org.ciyam.at.OpCode.calcOffset;
  * </li>
  * <li>Bob checks AT, extracts secret-A
  * 		<ul>
- * 			<li>Bob redeems P2SH-A using his Dogecoin trade key and secret-A</li>
- * 			<li>P2SH-A DOGE funds end up at Dogecoin address determined by redeem transaction output(s)</li>
+ * 			<li>Bob redeems P2SH-A using his PirateChain trade key and secret-A</li>
+ * 			<li>P2SH-A ARRR funds end up at PirateChain address determined by redeem transaction output(s)</li>
  * 		</ul>
  * </li>
  * </ul>
  */
-public class DogecoinACCTv2 implements ACCT {
+public class PirateChainACCTv3 implements ACCT {
 
-	private static final Logger LOGGER = LogManager.getLogger(DogecoinACCTv2.class);
-
-	public static final String NAME = DogecoinACCTv2.class.getSimpleName();
-	public static final byte[] CODE_BYTES_HASH = HashCode.fromString("6fff38d6eeb06568a9c879c5628527730319844aa0de53f5f4ffab5506efe885").asBytes(); // SHA256 of AT code bytes
+	public static final String NAME = PirateChainACCTv3.class.getSimpleName();
+	public static final byte[] CODE_BYTES_HASH = HashCode.fromString("fc2818ac0819ab658a065ab0d050e75f167921e2dce5969b9b7741e47e477d83").asBytes(); // SHA256 of AT code bytes
 
 	public static final int SECRET_LENGTH = 32;
 
 	/** <b>Value</b> offset into AT segment where 'mode' variable (long) is stored. (Multiply by MachineState.VALUE_SIZE for byte offset). */
-	private static final int MODE_VALUE_OFFSET = 61;
+	private static final int MODE_VALUE_OFFSET = 68;
 	/** <b>Byte</b> offset into AT state data where 'mode' variable (long) is stored. */
 	public static final int MODE_BYTE_OFFSET = MachineState.HEADER_LENGTH + (MODE_VALUE_OFFSET * MachineState.VALUE_SIZE);
 
 	public static class OfferMessageData {
-		public byte[] partnerDogecoinPKH;
+		public byte[] partnerPirateChainPublicKey;
 		public byte[] hashOfSecretA;
 		public long lockTimeA;
 	}
-	public static final int OFFER_MESSAGE_LENGTH = 20 /*partnerDogecoinPKH*/ + 20 /*hashOfSecretA*/ + 8 /*lockTimeA*/;
+	public static final int OFFER_MESSAGE_LENGTH = 33 /*partnerPirateChainPublicKey*/ + 20 /*hashOfSecretA*/ + 8 /*lockTimeA*/;
 	public static final int TRADE_MESSAGE_LENGTH = 32 /*partner's Qortal trade address (padded from 25 to 32)*/
-			+ 24 /*partner's Dogecoin PKH (padded from 20 to 24)*/
+			+ 40 /*partner's Pirate Chain public key (padded from 33 to 40)*/
 			+ 8 /*AT trade timeout (minutes)*/
 			+ 24 /*hash of secret-A (padded from 20 to 24)*/
 			+ 8 /*lockTimeA*/;
 	public static final int REDEEM_MESSAGE_LENGTH = 32 /*secret-A*/ + 32 /*partner's Qortal receiving address padded from 25 to 32*/;
 	public static final int CANCEL_MESSAGE_LENGTH = 32 /*AT creator's Qortal address*/;
 
-	private static DogecoinACCTv2 instance;
+	private static PirateChainACCTv3 instance;
 
-	private DogecoinACCTv2() {
+	private PirateChainACCTv3() {
 	}
 
-	public static synchronized DogecoinACCTv2 getInstance() {
+	public static synchronized PirateChainACCTv3 getInstance() {
 		if (instance == null)
-			instance = new DogecoinACCTv2();
+			instance = new PirateChainACCTv3();
 
 		return instance;
 	}
@@ -135,7 +131,7 @@ public class DogecoinACCTv2 implements ACCT {
 
 	@Override
 	public ForeignBlockchain getBlockchain() {
-		return Dogecoin.getInstance();
+		return PirateChain.getInstance();
 	}
 
 	/**
@@ -145,14 +141,14 @@ public class DogecoinACCTv2 implements ACCT {
 	 * 32-byte secret to the AT, before the AT automatically refunds the AT's creator.
 	 * 
 	 * @param creatorTradeAddress AT creator's trade Qortal address
-	 * @param dogecoinPublicKeyHash 20-byte HASH160 of creator's trade Dogecoin public key
+	 * @param pirateChainPublicKeyHash 33-byte creator's trade PirateChain public key
 	 * @param qortAmount how much QORT to pay trade partner if they send correct 32-byte secrets to AT
-	 * @param dogecoinAmount how much DOGE the AT creator is expecting to trade
+	 * @param arrrAmount how much ARRR the AT creator is expecting to trade
 	 * @param tradeTimeout suggested timeout for entire trade
 	 */
-	public static byte[] buildQortalAT(String creatorTradeAddress, byte[] dogecoinPublicKeyHash, long qortAmount, long dogecoinAmount, int tradeTimeout) {
-		if (dogecoinPublicKeyHash.length != 20)
-			throw new IllegalArgumentException("Dogecoin public key hash should be 20 bytes");
+	public static byte[] buildQortalAT(String creatorTradeAddress, byte[] pirateChainPublicKeyHash, long qortAmount, long arrrAmount, int tradeTimeout) {
+		if (pirateChainPublicKeyHash.length != 33)
+			throw new IllegalArgumentException("PirateChain public key hash should be 33 bytes");
 
 		// Labels for data segment addresses
 		int addrCounter = 0;
@@ -164,11 +160,11 @@ public class DogecoinACCTv2 implements ACCT {
 		final int addrCreatorTradeAddress3 = addrCounter++;
 		final int addrCreatorTradeAddress4 = addrCounter++;
 
-		final int addrDogecoinPublicKeyHash = addrCounter;
-		addrCounter += 4;
+		final int addrPirateChainPublicKeyHash = addrCounter;
+		addrCounter += 5;
 
 		final int addrQortAmount = addrCounter++;
-		final int addrDogecoinAmount = addrCounter++;
+		final int addrarrrAmount = addrCounter++;
 		final int addrTradeTimeout = addrCounter++;
 
 		final int addrMessageTxnType = addrCounter++;
@@ -179,8 +175,10 @@ public class DogecoinACCTv2 implements ACCT {
 		final int addrQortalPartnerAddressPointer = addrCounter++;
 		final int addrMessageSenderPointer = addrCounter++;
 
-		final int addrTradeMessagePartnerDogecoinPKHOffset = addrCounter++;
-		final int addrPartnerDogecoinPKHPointer = addrCounter++;
+		final int addrTradeMessagePartnerPirateChainPublicKeyFirst32BytesOffset = addrCounter++;
+		final int addrTradeMessagePartnerPirateChainPublicKeyLastByteOffset = addrCounter++; // Remainder of public key, plus timeout
+		final int addrPartnerPirateChainPublicKeyFirst32BytesPointer = addrCounter++;
+		final int addrPartnerPirateChainPublicKeyLastBytePointer = addrCounter++; // Remainder of public key
 		final int addrTradeMessageHashOfSecretAOffset = addrCounter++;
 		final int addrHashOfSecretAPointer = addrCounter++;
 
@@ -226,9 +224,12 @@ public class DogecoinACCTv2 implements ACCT {
 		final int addrHashOfSecretA = addrCounter;
 		addrCounter += 4;
 
-		final int addrPartnerDogecoinPKH = addrCounter;
+		final int addrPartnerPirateChainPublicKeyFirst32Bytes = addrCounter;
 		addrCounter += 4;
 
+		final int addrPartnerPirateChainPublicKeyLastByte = addrCounter;
+		addrCounter += 4; // We retrieve using GET_B_IND, so need to allow space for the full 32 bytes
+
 		final int addrPartnerReceivingAddress = addrCounter;
 		addrCounter += 4;
 
@@ -243,17 +244,17 @@ public class DogecoinACCTv2 implements ACCT {
 		byte[] creatorTradeAddressBytes = Base58.decode(creatorTradeAddress);
 		dataByteBuffer.put(Bytes.ensureCapacity(creatorTradeAddressBytes, 32, 0));
 
-		// Dogecoin public key hash
-		assert dataByteBuffer.position() == addrDogecoinPublicKeyHash * MachineState.VALUE_SIZE : "addrDogecoinPublicKeyHash incorrect";
-		dataByteBuffer.put(Bytes.ensureCapacity(dogecoinPublicKeyHash, 32, 0));
+		// PirateChain public key hash
+		assert dataByteBuffer.position() == addrPirateChainPublicKeyHash * MachineState.VALUE_SIZE : "addrPirateChainPublicKeyHash incorrect";
+		dataByteBuffer.put(Bytes.ensureCapacity(pirateChainPublicKeyHash, 40, 0));
 
 		// Redeem Qort amount
 		assert dataByteBuffer.position() == addrQortAmount * MachineState.VALUE_SIZE : "addrQortAmount incorrect";
 		dataByteBuffer.putLong(qortAmount);
 
-		// Expected Dogecoin amount
-		assert dataByteBuffer.position() == addrDogecoinAmount * MachineState.VALUE_SIZE : "addrDogecoinAmount incorrect";
-		dataByteBuffer.putLong(dogecoinAmount);
+		// Expected PirateChain amount
+		assert dataByteBuffer.position() == addrarrrAmount * MachineState.VALUE_SIZE : "addrarrrAmount incorrect";
+		dataByteBuffer.putLong(arrrAmount);
 
 		// Suggested trade timeout (minutes)
 		assert dataByteBuffer.position() == addrTradeTimeout * MachineState.VALUE_SIZE : "addrTradeTimeout incorrect";
@@ -283,17 +284,25 @@ public class DogecoinACCTv2 implements ACCT {
 		assert dataByteBuffer.position() == addrMessageSenderPointer * MachineState.VALUE_SIZE : "addrMessageSenderPointer incorrect";
 		dataByteBuffer.putLong(addrMessageSender1);
 
-		// Offset into 'trade' MESSAGE data payload for extracting partner's Dogecoin PKH
-		assert dataByteBuffer.position() == addrTradeMessagePartnerDogecoinPKHOffset * MachineState.VALUE_SIZE : "addrTradeMessagePartnerDogecoinPKHOffset incorrect";
+		// Offset into 'trade' MESSAGE data payload for extracting first 32 bytes of partner's Pirate Chain public key
+		assert dataByteBuffer.position() == addrTradeMessagePartnerPirateChainPublicKeyFirst32BytesOffset * MachineState.VALUE_SIZE : "addrTradeMessagePartnerPirateChainPublicKeyFirst32BytesOffset incorrect";
 		dataByteBuffer.putLong(32L);
 
-		// Index into data segment of partner's Dogecoin PKH, used by GET_B_IND
-		assert dataByteBuffer.position() == addrPartnerDogecoinPKHPointer * MachineState.VALUE_SIZE : "addrPartnerDogecoinPKHPointer incorrect";
-		dataByteBuffer.putLong(addrPartnerDogecoinPKH);
+		// Offset into 'trade' MESSAGE data payload for extracting last byte of public key
+		assert dataByteBuffer.position() == addrTradeMessagePartnerPirateChainPublicKeyLastByteOffset * MachineState.VALUE_SIZE : "addrTradeMessagePartnerPirateChainPublicKeyLastByteOffset incorrect";
+		dataByteBuffer.putLong(64L);
+
+		// Index into data segment of partner's Pirate Chain public key, used by GET_B_IND
+		assert dataByteBuffer.position() == addrPartnerPirateChainPublicKeyFirst32BytesPointer * MachineState.VALUE_SIZE : "addrPartnerPirateChainPublicKeyFirst32BytesPointer incorrect";
+		dataByteBuffer.putLong(addrPartnerPirateChainPublicKeyFirst32Bytes);
+
+		// Index into data segment of remainder of partner's Pirate Chain public key, used by GET_B_IND
+		assert dataByteBuffer.position() == addrPartnerPirateChainPublicKeyLastBytePointer * MachineState.VALUE_SIZE : "addrPartnerPirateChainPublicKeyLastBytePointer incorrect";
+		dataByteBuffer.putLong(addrPartnerPirateChainPublicKeyLastByte);
 
 		// Offset into 'trade' MESSAGE data payload for extracting hash-of-secret-A
 		assert dataByteBuffer.position() == addrTradeMessageHashOfSecretAOffset * MachineState.VALUE_SIZE : "addrTradeMessageHashOfSecretAOffset incorrect";
-		dataByteBuffer.putLong(64L);
+		dataByteBuffer.putLong(80L);
 
 		// Index into data segment to hash of secret A, used by GET_B_IND
 		assert dataByteBuffer.position() == addrHashOfSecretAPointer * MachineState.VALUE_SIZE : "addrHashOfSecretAPointer incorrect";
@@ -338,9 +347,6 @@ public class DogecoinACCTv2 implements ACCT {
 			try {
 				/* Initialization */
 
-				/* NOP - to ensure DOGECOIN ACCT is unique */
-				codeByteBuffer.put(OpCode.NOP.compile());
-
 				// Use AT creation 'timestamp' as starting point for finding transactions sent to AT
 				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_CREATION_TIMESTAMP, addrLastTxnTimestamp));
 
@@ -429,12 +435,17 @@ public class DogecoinACCTv2 implements ACCT {
 				// Save B register into data segment starting at addrQortalPartnerAddress1 (as pointed to by addrQortalPartnerAddressPointer)
 				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrQortalPartnerAddressPointer));
 
-				// Extract trade partner's Dogecoin public key hash (PKH) from message into B
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.PUT_PARTIAL_MESSAGE_FROM_TX_IN_A_INTO_B.value, addrTradeMessagePartnerDogecoinPKHOffset));
-				// Store partner's Dogecoin PKH (we only really use values from B1-B3)
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrPartnerDogecoinPKHPointer));
-				// Extract AT trade timeout (minutes) (from B4)
-				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_B4, addrRefundTimeout));
+				// Extract first 32 bytes of trade partner's Pirate Chain public key from message into B
+				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.PUT_PARTIAL_MESSAGE_FROM_TX_IN_A_INTO_B.value, addrTradeMessagePartnerPirateChainPublicKeyFirst32BytesOffset));
+				// Store first 32 bytes of partner's Pirate Chain public key
+				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrPartnerPirateChainPublicKeyFirst32BytesPointer));
+
+				// Extract last byte of public key, plus trade timeout, from message into B
+				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.PUT_PARTIAL_MESSAGE_FROM_TX_IN_A_INTO_B.value, addrTradeMessagePartnerPirateChainPublicKeyLastByteOffset));
+				// Store last byte of partner's Pirate Chain public key
+				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.GET_B_IND, addrPartnerPirateChainPublicKeyLastBytePointer));
+				// Extract AT trade timeout (minutes) (from B2)
+				codeByteBuffer.put(OpCode.EXT_FUN_RET.compile(FunctionCode.GET_B2, addrRefundTimeout));
 
 				// Grab next 32 bytes
 				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.PUT_PARTIAL_MESSAGE_FROM_TX_IN_A_INTO_B.value, addrTradeMessageHashOfSecretAOffset));
@@ -465,9 +476,6 @@ public class DogecoinACCTv2 implements ACCT {
 				/* Transaction processing loop */
 				labelRedeemTxnLoop = codeByteBuffer.position();
 
-				/* Sleep until message arrives */
-				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(QortalFunctionCode.SLEEP_UNTIL_MESSAGE.value, addrLastTxnTimestamp));
-
 				// Find next transaction to this AT since the last one (if any)
 				codeByteBuffer.put(OpCode.EXT_FUN_DAT.compile(FunctionCode.PUT_TX_AFTER_TIMESTAMP_INTO_A, addrLastTxnTimestamp));
 				// If no transaction found, A will be zero. If A is zero, set addrComparator to 1, otherwise 0.
@@ -546,7 +554,7 @@ public class DogecoinACCTv2 implements ACCT {
 				// We're finished forever (finishing auto-refunds remaining balance to AT creator)
 				codeByteBuffer.put(OpCode.FIN_IMD.compile());
 			} catch (CompilationException e) {
-				throw new IllegalStateException("Unable to compile DOGE-QORT ACCT?", e);
+				throw new IllegalStateException("Unable to compile ARRR-QORT ACCT?", e);
 			}
 		}
 
@@ -555,7 +563,7 @@ public class DogecoinACCTv2 implements ACCT {
 		byte[] codeBytes = new byte[codeByteBuffer.limit()];
 		codeByteBuffer.get(codeBytes);
 
-		assert Arrays.equals(Crypto.digest(codeBytes), DogecoinACCTv2.CODE_BYTES_HASH)
+		assert Arrays.equals(Crypto.digest(codeBytes), PirateChainACCTv3.CODE_BYTES_HASH)
 			: String.format("BTCACCT.CODE_BYTES_HASH mismatch: expected %s, actual %s", HashCode.fromBytes(CODE_BYTES_HASH), HashCode.fromBytes(Crypto.digest(codeBytes)));
 
 		final short ciyamAtVersion = 2;
@@ -593,7 +601,7 @@ public class DogecoinACCTv2 implements ACCT {
 
 		CrossChainTradeData tradeData = new CrossChainTradeData();
 
-		tradeData.foreignBlockchain = SupportedBlockchain.DOGECOIN.name();
+		tradeData.foreignBlockchain = SupportedBlockchain.PIRATECHAIN.name();
 		tradeData.acctName = NAME;
 
 		tradeData.qortalAtAddress = atAddress;
@@ -614,10 +622,10 @@ public class DogecoinACCTv2 implements ACCT {
 		tradeData.qortalCreatorTradeAddress = Base58.encode(addressBytes);
 		dataByteBuffer.position(dataByteBuffer.position() + 32 - addressBytes.length);
 
-		// Creator's Dogecoin/foreign public key hash
-		tradeData.creatorForeignPKH = new byte[20];
+		// Creator's PirateChain/foreign public key (full 33 bytes, not hashed, so ignore references to "PKH")
+		tradeData.creatorForeignPKH = new byte[33];
 		dataByteBuffer.get(tradeData.creatorForeignPKH);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - tradeData.creatorForeignPKH.length); // skip to 32 bytes
+		dataByteBuffer.position(dataByteBuffer.position() + 40 - tradeData.creatorForeignPKH.length); // skip to 40 bytes
 
 		// We don't use secret-B
 		tradeData.hashOfSecretB = null;
@@ -625,7 +633,7 @@ public class DogecoinACCTv2 implements ACCT {
 		// Redeem payout
 		tradeData.qortAmount = dataByteBuffer.getLong();
 
-		// Expected DOGE amount
+		// Expected ARRR amount
 		tradeData.expectedForeignAmount = dataByteBuffer.getLong();
 
 		// Trade timeout
@@ -649,10 +657,16 @@ public class DogecoinACCTv2 implements ACCT {
 		// Skip pointer to message sender
 		dataByteBuffer.position(dataByteBuffer.position() + 8);
 
-		// Skip 'trade' message data offset for partner's Dogecoin PKH
+		// Skip 'trade' message data offset for first 32 bytes of partner's Pirate Chain public key
 		dataByteBuffer.position(dataByteBuffer.position() + 8);
 
-		// Skip pointer to partner's Dogecoin PKH
+		// Skip 'trade' message data offset for last 32 byte of partner's Pirate Chain public key
+		dataByteBuffer.position(dataByteBuffer.position() + 8);
+
+		// Skip pointer to partner's Pirate Chain public key (first 32 bytes)
+		dataByteBuffer.position(dataByteBuffer.position() + 8);
+
+		// Skip pointer to partner's Pirate Chain public key (last byte)
 		dataByteBuffer.position(dataByteBuffer.position() + 8);
 
 		// Skip 'trade' message data offset for hash-of-secret-A
@@ -718,10 +732,10 @@ public class DogecoinACCTv2 implements ACCT {
 		dataByteBuffer.get(hashOfSecretA);
 		dataByteBuffer.position(dataByteBuffer.position() + 32 - hashOfSecretA.length); // skip to 32 bytes
 
-		// Potential partner's Dogecoin PKH
-		byte[] partnerDogecoinPKH = new byte[20];
-		dataByteBuffer.get(partnerDogecoinPKH);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - partnerDogecoinPKH.length); // skip to 32 bytes
+		// Potential partner's PirateChain public key
+		byte[] partnerPirateChainPublicKey = new byte[33];
+		dataByteBuffer.get(partnerPirateChainPublicKey);
+		dataByteBuffer.position(dataByteBuffer.position() + 64 - partnerPirateChainPublicKey.length); // skip to 64 bytes
 
 		// Partner's receiving address (if present)
 		byte[] partnerReceivingAddress = new byte[25];
@@ -740,7 +754,7 @@ public class DogecoinACCTv2 implements ACCT {
 			tradeData.tradeRefundHeight = new Timestamp(tradeRefundTimestamp).blockHeight;
 			tradeData.qortalPartnerAddress = qortalRecipient;
 			tradeData.hashOfSecretA = hashOfSecretA;
-			tradeData.partnerForeignPKH = partnerDogecoinPKH;
+			tradeData.partnerForeignPKH = partnerPirateChainPublicKey; // Not hashed
 			tradeData.lockTimeA = lockTimeA;
 
 			if (mode == AcctMode.REDEEMED)
@@ -755,9 +769,9 @@ public class DogecoinACCTv2 implements ACCT {
 	}
 
 	/** Returns 'offer' MESSAGE payload for trade partner to send to AT creator's trade address. */
-	public static byte[] buildOfferMessage(byte[] partnerBitcoinPKH, byte[] hashOfSecretA, int lockTimeA) {
+	public static byte[] buildOfferMessage(byte[] partnerBitcoinPublicKey, byte[] hashOfSecretA, int lockTimeA) {
 		byte[] lockTimeABytes = BitTwiddling.toBEByteArray((long) lockTimeA);
-		return Bytes.concat(partnerBitcoinPKH, hashOfSecretA, lockTimeABytes);
+		return Bytes.concat(partnerBitcoinPublicKey, hashOfSecretA, lockTimeABytes);
 	}
 
 	/** Returns info extracted from 'offer' MESSAGE payload sent by trade partner to AT creator's trade address, or null if not valid. */
@@ -766,25 +780,25 @@ public class DogecoinACCTv2 implements ACCT {
 			return null;
 
 		OfferMessageData offerMessageData = new OfferMessageData();
-		offerMessageData.partnerDogecoinPKH = Arrays.copyOfRange(messageData, 0, 20);
-		offerMessageData.hashOfSecretA = Arrays.copyOfRange(messageData, 20, 40);
-		offerMessageData.lockTimeA = BitTwiddling.longFromBEBytes(messageData, 40);
+		offerMessageData.partnerPirateChainPublicKey = Arrays.copyOfRange(messageData, 0, 33);
+		offerMessageData.hashOfSecretA = Arrays.copyOfRange(messageData, 33, 53);
+		offerMessageData.lockTimeA = BitTwiddling.longFromBEBytes(messageData, 53);
 
 		return offerMessageData;
 	}
 
 	/** Returns 'trade' MESSAGE payload for AT creator to send to AT. */
-	public static byte[] buildTradeMessage(String partnerQortalTradeAddress, byte[] partnerBitcoinPKH, byte[] hashOfSecretA, int lockTimeA, int refundTimeout) {
+	public static byte[] buildTradeMessage(String partnerQortalTradeAddress, byte[] partnerBitcoinPublicKey, byte[] hashOfSecretA, int lockTimeA, int refundTimeout) {
 		byte[] data = new byte[TRADE_MESSAGE_LENGTH];
 		byte[] partnerQortalAddressBytes = Base58.decode(partnerQortalTradeAddress);
 		byte[] lockTimeABytes = BitTwiddling.toBEByteArray((long) lockTimeA);
 		byte[] refundTimeoutBytes = BitTwiddling.toBEByteArray((long) refundTimeout);
 
 		System.arraycopy(partnerQortalAddressBytes, 0, data, 0, partnerQortalAddressBytes.length);
-		System.arraycopy(partnerBitcoinPKH, 0, data, 32, partnerBitcoinPKH.length);
-		System.arraycopy(refundTimeoutBytes, 0, data, 56, refundTimeoutBytes.length);
-		System.arraycopy(hashOfSecretA, 0, data, 64, hashOfSecretA.length);
-		System.arraycopy(lockTimeABytes, 0, data, 88, lockTimeABytes.length);
+		System.arraycopy(partnerBitcoinPublicKey, 0, data, 32, partnerBitcoinPublicKey.length);
+		System.arraycopy(refundTimeoutBytes, 0, data, 72, refundTimeoutBytes.length);
+		System.arraycopy(hashOfSecretA, 0, data, 80, hashOfSecretA.length);
+		System.arraycopy(lockTimeABytes, 0, data, 104, lockTimeABytes.length);
 
 		return data;
 	}

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

@@ -0,0 +1,404 @@
+package org.qortal.crosschain;
+
+import com.google.common.hash.HashCode;
+import com.google.common.primitives.Bytes;
+import org.bitcoinj.core.*;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptChunk;
+import org.qortal.crypto.Crypto;
+import org.qortal.utils.Base58;
+import org.qortal.utils.BitTwiddling;
+
+import java.util.*;
+import static org.qortal.crosschain.BitcoinyHTLC.Status;
+
+public class PirateChainHTLC {
+
+	public static final int SECRET_LENGTH = 32;
+	public static final int MIN_LOCKTIME = 1500000000;
+
+	public static final long NO_LOCKTIME_NO_RBF_SEQUENCE = 0xFFFFFFFFL;
+	public static final long LOCKTIME_NO_RBF_SEQUENCE = NO_LOCKTIME_NO_RBF_SEQUENCE - 1;
+
+	// Assuming node's trade-bot has no more than 100 entries?
+	private static final int MAX_CACHE_ENTRIES = 100;
+
+	// Max time-to-live for cache entries (milliseconds)
+	private static final long CACHE_TIMEOUT = 30_000L;
+
+	@SuppressWarnings("serial")
+	private static final Map<String, byte[]> SECRET_CACHE = new LinkedHashMap<>(MAX_CACHE_ENTRIES + 1, 0.75F, true) {
+		// This method is called just after a new entry has been added
+		@Override
+		public boolean removeEldestEntry(Map.Entry<String, byte[]> eldest) {
+			return size() > MAX_CACHE_ENTRIES;
+		}
+	};
+	private static final byte[] NO_SECRET_CACHE_ENTRY = new byte[0];
+
+	@SuppressWarnings("serial")
+	private static final Map<String, Status> STATUS_CACHE = new LinkedHashMap<>(MAX_CACHE_ENTRIES + 1, 0.75F, true) {
+		// This method is called just after a new entry has been added
+		@Override
+		public boolean removeEldestEntry(Map.Entry<String, Status> eldest) {
+			return size() > MAX_CACHE_ENTRIES;
+		}
+	};
+
+	/*
+	 * OP_RETURN + OP_PUSHDATA1 + bytes (not part of actual redeem script - used for "push only" secondary output when funding P2SH)
+	 *
+	 * OP_IF (if top stack value isn't false) (true=refund; false=redeem) (boolean is then removed from stack)
+	 * 		<push 4 bytes> <intended locktime>
+	 * 		OP_CHECKLOCKTIMEVERIFY (if stack locktime greater than transaction's lock time - i.e. refunding but too soon - then fail validation)
+	 * 		OP_DROP (remove locktime from top of stack)
+	 * 		<push 33 bytes> <intended refunder public key>
+	 * 		OP_CHECKSIG (check signature and public key are correct; returns 1 or 0)
+	 * OP_ELSE (if top stack value was false, i.e. attempting to redeem)
+	 * 		OP_SIZE (push length of top item - the secret - to the top of the stack)
+	 * 		<push 1 byte> 32
+	 * 		OP_EQUALVERIFY (unhashed secret must be 32 bytes in length)
+	 * 		OP_HASH160 (hash the secret)
+	 * 		<push 20 bytes> <intended secret hash>
+	 * 		OP_EQUALVERIFY (ensure hash of supplied secret matches intended secret hash; transaction invalid if no match)
+	 * 		<push 33 bytes> <intended redeemer public key>
+	 * 		OP_CHECKSIG (check signature and public key are correct; returns 1 or 0)
+	 * OP_ENDIF
+	 */
+
+	private static final byte[] pushOnlyPrefix = HashCode.fromString("6a4c").asBytes(); // OP_RETURN + push(redeem script)
+	private static final byte[] redeemScript1 = HashCode.fromString("6304").asBytes(); // OP_IF push(4 bytes locktime)
+	private static final byte[] redeemScript2 = HashCode.fromString("b17521").asBytes(); // OP_CHECKLOCKTIMEVERIFY OP_DROP push(33 bytes refund pubkey)
+	private static final byte[] redeemScript3 = HashCode.fromString("ac6782012088a914").asBytes(); // OP_CHECKSIG OP_ELSE OP_SIZE push(0x20) OP_EQUALVERIFY OP_HASH160 push(20 bytes hash of secret)
+	private static final byte[] redeemScript4 = HashCode.fromString("8821").asBytes(); // OP_EQUALVERIFY push(33 bytes redeem pubkey)
+	private static final byte[] redeemScript5 = HashCode.fromString("ac68").asBytes(); // OP_CHECKSIG OP_ENDIF
+
+	/**
+	 * Returns redeemScript used for cross-chain trading.
+	 * <p>
+	 * See comments in {@link PirateChainHTLC} for more details.
+	 * 
+	 * @param refunderPubKey 33-byte P2SH funder's public key, for refunding purposes
+	 * @param lockTime seconds-since-epoch threshold, after which P2SH funder can claim refund
+	 * @param redeemerPubKey 33-byte P2SH redeemer's public key
+	 * @param hashOfSecret 20-byte HASH160 of secret, used by P2SH redeemer to claim funds
+	 */
+	public static byte[] buildScript(byte[] refunderPubKey, int lockTime, byte[] redeemerPubKey, byte[] hashOfSecret) {
+		return Bytes.concat(redeemScript1, BitTwiddling.toLEByteArray((int) (lockTime & 0xffffffffL)), redeemScript2,
+				refunderPubKey, redeemScript3, hashOfSecret, redeemScript4, redeemerPubKey, redeemScript5);
+	}
+
+	/**
+	 * Alternative to buildScript() above, this time with a prefix suitable for adding the redeem script
+	 * to a "push only" output (via OP_RETURN followed by OP_PUSHDATA1)
+	 *
+	 * @param refunderPubKey 33-byte P2SH funder's public key, for refunding purposes
+	 * @param lockTime seconds-since-epoch threshold, after which P2SH funder can claim refund
+	 * @param redeemerPubKey 33-byte P2SH redeemer's public key
+	 * @param hashOfSecret 20-byte HASH160 of secret, used by P2SH redeemer to claim funds
+	 * @return
+	 */
+	public static byte[] buildScriptWithPrefix(byte[] refunderPubKey, int lockTime, byte[] redeemerPubKey, byte[] hashOfSecret) {
+		byte[] redeemScript = buildScript(refunderPubKey, lockTime, redeemerPubKey, hashOfSecret);
+		int size = redeemScript.length;
+		String sizeHex = Integer.toHexString(size & 0xFF);
+		return Bytes.concat(pushOnlyPrefix, HashCode.fromString(sizeHex).asBytes(), redeemScript);
+	}
+
+	/**
+	 * Returns 'secret', if any, given HTLC's P2SH address.
+	 * <p>
+	 * @throws ForeignBlockchainException
+	 */
+	public static byte[] findHtlcSecret(Bitcoiny bitcoiny, String p2shAddress) throws ForeignBlockchainException {
+		NetworkParameters params = bitcoiny.getNetworkParameters();
+		String compoundKey = String.format("%s-%s-%d", params.getId(), p2shAddress, System.currentTimeMillis() / CACHE_TIMEOUT);
+
+		byte[] secret = SECRET_CACHE.getOrDefault(compoundKey, NO_SECRET_CACHE_ENTRY);
+		if (secret != NO_SECRET_CACHE_ENTRY)
+			return secret;
+
+		List<byte[]> rawTransactions = bitcoiny.getAddressTransactions(p2shAddress);
+
+		for (byte[] rawTransaction : rawTransactions) {
+			Transaction transaction = new Transaction(params, rawTransaction);
+
+			// Cycle through inputs, looking for one that spends our HTLC
+			for (TransactionInput input : transaction.getInputs()) {
+				Script scriptSig = input.getScriptSig();
+				List<ScriptChunk> scriptChunks = scriptSig.getChunks();
+
+				// Expected number of script chunks for redeem. Refund might not have the same number.
+				int expectedChunkCount = 1 /*secret*/ + 1 /*sig*/ + 1 /*pubkey*/ + 1 /*redeemScript*/;
+				if (scriptChunks.size() != expectedChunkCount)
+					continue;
+
+				// We're expecting last chunk to contain the actual redeemScript
+				ScriptChunk lastChunk = scriptChunks.get(scriptChunks.size() - 1);
+				byte[] redeemScriptBytes = lastChunk.data;
+
+				// If non-push scripts, redeemScript will be null
+				if (redeemScriptBytes == null)
+					continue;
+
+				byte[] redeemScriptHash = Crypto.hash160(redeemScriptBytes);
+				Address inputAddress = LegacyAddress.fromScriptHash(params, redeemScriptHash);
+
+				if (!inputAddress.toString().equals(p2shAddress))
+					// Input isn't spending our HTLC
+					continue;
+
+				secret = scriptChunks.get(0).data;
+				if (secret.length != PirateChainHTLC.SECRET_LENGTH)
+					continue;
+
+				// Cache secret for a while
+				SECRET_CACHE.put(compoundKey, secret);
+
+				return secret;
+			}
+		}
+
+		// Cache negative result
+		SECRET_CACHE.put(compoundKey, null);
+
+		return null;
+	}
+
+	/**
+	 * Returns a string containing the txid of the transaction that funded supplied <tt>p2shAddress</tt>
+	 * We have to do this in a bit of a roundabout way due to the Pirate Light Client server omitting
+	 * transaction hashes from the raw transaction data.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	public static String getFundingTxid(BitcoinyBlockchainProvider blockchain, String p2shAddress) throws ForeignBlockchainException {
+		byte[] ourScriptPubKey = addressToScriptPubKey(p2shAddress);
+		// HASH160(redeem script) for this p2shAddress
+		byte[] ourRedeemScriptHash = addressToRedeemScriptHash(p2shAddress);
+
+
+		// Firstly look for an unspent output
+
+		// Note: we can't include unconfirmed transactions here because the Pirate light wallet server requires a block range
+		List<UnspentOutput> unspentOutputs = blockchain.getUnspentOutputs(p2shAddress, false);
+		for (UnspentOutput unspentOutput : unspentOutputs) {
+
+			if (!Arrays.equals(ourScriptPubKey, unspentOutput.script)) {
+				continue;
+			}
+
+			return HashCode.fromBytes(unspentOutput.hash).toString();
+		}
+
+
+		// No valid unspent outputs, so must be already spent...
+
+		// Note: we can't include unconfirmed transactions here because the Pirate light wallet server requires a block range
+		List<BitcoinyTransaction> transactions = blockchain.getAddressBitcoinyTransactions(p2shAddress, BitcoinyBlockchainProvider.EXCLUDE_UNCONFIRMED);
+
+		// Sort by confirmed first, followed by ascending height
+		transactions.sort(BitcoinyTransaction.CONFIRMED_FIRST.thenComparing(BitcoinyTransaction::getHeight));
+
+		for (BitcoinyTransaction bitcoinyTransaction : transactions) {
+
+			// Acceptable funding is one transaction output, so we're expecting only one input
+			if (bitcoinyTransaction.inputs.size() != 1)
+				// Wrong number of inputs
+				continue;
+
+			String scriptSig = bitcoinyTransaction.inputs.get(0).scriptSig;
+
+			List<byte[]> scriptSigChunks = extractScriptSigChunks(HashCode.fromString(scriptSig).asBytes());
+			if (scriptSigChunks.size() < 3 || scriptSigChunks.size() > 4)
+				// Not valid chunks for our form of HTLC
+				continue;
+
+			// Last chunk is redeem script
+			byte[] redeemScriptBytes = scriptSigChunks.get(scriptSigChunks.size() - 1);
+			byte[] redeemScriptHash = Crypto.hash160(redeemScriptBytes);
+			if (!Arrays.equals(redeemScriptHash, ourRedeemScriptHash))
+				// Not spending our specific HTLC redeem script
+				continue;
+
+			return bitcoinyTransaction.inputs.get(0).outputTxHash;
+
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns a string containing the unspent txid of the transaction that funded supplied <tt>p2shAddress</tt>
+	 * and is at least the value specified in <tt>minimumAmount</tt>
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	public static String getUnspentFundingTxid(BitcoinyBlockchainProvider blockchain, String p2shAddress, long minimumAmount) throws ForeignBlockchainException {
+		byte[] ourScriptPubKey = addressToScriptPubKey(p2shAddress);
+
+		// Note: we can't include unconfirmed transactions here because the Pirate light wallet server requires a block range
+		List<UnspentOutput> unspentOutputs = blockchain.getUnspentOutputs(p2shAddress, false);
+		for (UnspentOutput unspentOutput : unspentOutputs) {
+
+			if (!Arrays.equals(ourScriptPubKey, unspentOutput.script)) {
+				// Not funding our specific HTLC script hash
+				continue;
+			}
+
+			if (unspentOutput.value < minimumAmount) {
+				// Not funding the required amount
+				continue;
+			}
+
+			return HashCode.fromBytes(unspentOutput.hash).toString();
+		}
+
+
+		// No valid unspent outputs, so must be already spent
+		return null;
+	}
+
+	/**
+	 * Returns HTLC status, given P2SH address and expected redeem/refund amount
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	public static Status determineHtlcStatus(BitcoinyBlockchainProvider blockchain, String p2shAddress, long minimumAmount) throws ForeignBlockchainException {
+		String compoundKey = String.format("%s-%s-%d", blockchain.getNetId(), p2shAddress, System.currentTimeMillis() / CACHE_TIMEOUT);
+
+		Status cachedStatus = STATUS_CACHE.getOrDefault(compoundKey, null);
+		if (cachedStatus != null)
+			return cachedStatus;
+
+		byte[] ourScriptPubKey = addressToScriptPubKey(p2shAddress);
+
+		// Note: we can't include unconfirmed transactions here because the Pirate light wallet server requires a block range
+		List<BitcoinyTransaction> transactions = blockchain.getAddressBitcoinyTransactions(p2shAddress, BitcoinyBlockchainProvider.EXCLUDE_UNCONFIRMED);
+
+		// Sort by confirmed first, followed by ascending height
+		transactions.sort(BitcoinyTransaction.CONFIRMED_FIRST.thenComparing(BitcoinyTransaction::getHeight));
+
+		// Transaction cache
+		//Map<String, BitcoinyTransaction> transactionsByHash = new HashMap<>();
+		// HASH160(redeem script) for this p2shAddress
+		byte[] ourRedeemScriptHash = addressToRedeemScriptHash(p2shAddress);
+
+		// Check for spends first, caching full transaction info as we progress just in case we don't return in this loop
+		for (BitcoinyTransaction bitcoinyTransaction : transactions) {
+
+			// Cache for possible later reuse
+			// transactionsByHash.put(transactionInfo.txHash, bitcoinyTransaction);
+
+			// Acceptable funding is one transaction output, so we're expecting only one input
+			if (bitcoinyTransaction.inputs.size() != 1)
+				// Wrong number of inputs
+				continue;
+
+			String scriptSig = bitcoinyTransaction.inputs.get(0).scriptSig;
+
+			List<byte[]> scriptSigChunks = extractScriptSigChunks(HashCode.fromString(scriptSig).asBytes());
+			if (scriptSigChunks.size() < 3 || scriptSigChunks.size() > 4)
+				// Not valid chunks for our form of HTLC
+				continue;
+
+			// Last chunk is redeem script
+			byte[] redeemScriptBytes = scriptSigChunks.get(scriptSigChunks.size() - 1);
+			byte[] redeemScriptHash = Crypto.hash160(redeemScriptBytes);
+			if (!Arrays.equals(redeemScriptHash, ourRedeemScriptHash))
+				// Not spending our specific HTLC redeem script
+				continue;
+
+			if (scriptSigChunks.size() == 4)
+				// If we have 4 chunks, then secret is present, hence redeem
+				cachedStatus = bitcoinyTransaction.height == 0 ? Status.REDEEM_IN_PROGRESS : Status.REDEEMED;
+			else
+				cachedStatus = bitcoinyTransaction.height == 0 ? Status.REFUND_IN_PROGRESS : Status.REFUNDED;
+
+			STATUS_CACHE.put(compoundKey, cachedStatus);
+			return cachedStatus;
+		}
+
+		String ourScriptPubKeyHex = HashCode.fromBytes(ourScriptPubKey).toString();
+
+		// Check for funding
+		for (BitcoinyTransaction bitcoinyTransaction : transactions) {
+			if (bitcoinyTransaction == null)
+				// Should be present in map!
+				throw new ForeignBlockchainException("Cached Bitcoin transaction now missing?");
+
+			// Check outputs for our specific P2SH
+			for (BitcoinyTransaction.Output output : bitcoinyTransaction.outputs) {
+				// Check amount
+				if (output.value < minimumAmount)
+					// Output amount too small (not taking fees into account)
+					continue;
+
+				String scriptPubKeyHex = output.scriptPubKey;
+				if (!scriptPubKeyHex.equals(ourScriptPubKeyHex))
+					// Not funding our specific P2SH
+					continue;
+
+				cachedStatus = bitcoinyTransaction.height == 0 ? Status.FUNDING_IN_PROGRESS : Status.FUNDED;
+				STATUS_CACHE.put(compoundKey, cachedStatus);
+				return cachedStatus;
+			}
+		}
+
+		cachedStatus = Status.UNFUNDED;
+		STATUS_CACHE.put(compoundKey, cachedStatus);
+		return cachedStatus;
+	}
+
+	private static List<byte[]> extractScriptSigChunks(byte[] scriptSigBytes) {
+		List<byte[]> chunks = new ArrayList<>();
+
+		int offset = 0;
+		int previousOffset = 0;
+		while (offset < scriptSigBytes.length) {
+			byte pushOp = scriptSigBytes[offset++];
+
+			if (pushOp < 0 || pushOp > 0x4c)
+				// Unacceptable OP
+				return Collections.emptyList();
+
+			// Special treatment for OP_PUSHDATA1
+			if (pushOp == 0x4c) {
+				if (offset >= scriptSigBytes.length)
+					// Run out of scriptSig bytes?
+					return Collections.emptyList();
+
+				pushOp = scriptSigBytes[offset++];
+			}
+
+			previousOffset = offset;
+			offset += Byte.toUnsignedInt(pushOp);
+
+			byte[] chunk = Arrays.copyOfRange(scriptSigBytes, previousOffset, offset);
+			chunks.add(chunk);
+		}
+
+		return chunks;
+	}
+
+	private static byte[] addressToScriptPubKey(String p2shAddress) {
+		// We want the HASH160 part of the P2SH address
+		byte[] p2shAddressBytes = Base58.decode(p2shAddress);
+
+		byte[] scriptPubKey = new byte[1 + 1 + 20 + 1];
+		scriptPubKey[0x00] = (byte) 0xa9; /* OP_HASH160 */
+		scriptPubKey[0x01] = (byte) 0x14; /* PUSH 0x14 bytes */
+		System.arraycopy(p2shAddressBytes, 1, scriptPubKey, 2, 0x14);
+		scriptPubKey[0x16] = (byte) 0x87; /* OP_EQUAL */
+
+		return scriptPubKey;
+	}
+
+	private static byte[] addressToRedeemScriptHash(String p2shAddress) {
+		// We want the HASH160 part of the P2SH address
+		byte[] p2shAddressBytes = Base58.decode(p2shAddress);
+
+		return Arrays.copyOfRange(p2shAddressBytes, 1, 1 + 20);
+	}
+
+}

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

@@ -0,0 +1,649 @@
+package org.qortal.crosschain;
+
+import cash.z.wallet.sdk.rpc.CompactFormats.*;
+import cash.z.wallet.sdk.rpc.CompactTxStreamerGrpc;
+import cash.z.wallet.sdk.rpc.Service;
+import cash.z.wallet.sdk.rpc.Service.*;
+import com.google.common.hash.HashCode;
+import com.google.protobuf.ByteString;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.qortal.settings.Settings;
+import org.qortal.transform.TransformationException;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/** Pirate Chain network support for querying Bitcoiny-related info like block headers, transaction outputs, etc. */
+public class PirateLightClient extends BitcoinyBlockchainProvider {
+
+	private static final Logger LOGGER = LogManager.getLogger(PirateLightClient.class);
+	private static final Random RANDOM = new Random();
+
+	private static final int RESPONSE_TIME_READINGS = 5;
+	private static final long MAX_AVG_RESPONSE_TIME = 500L; // ms
+
+	public static class Server {
+		String hostname;
+
+		public enum ConnectionType { TCP, SSL }
+		ConnectionType connectionType;
+
+		int port;
+		private List<Long> responseTimes = new ArrayList<>();
+
+		public Server(String hostname, ConnectionType connectionType, int port) {
+			this.hostname = hostname;
+			this.connectionType = connectionType;
+			this.port = port;
+		}
+
+		public void addResponseTime(long responseTime) {
+			while (this.responseTimes.size() > RESPONSE_TIME_READINGS) {
+				this.responseTimes.remove(0);
+			}
+			this.responseTimes.add(responseTime);
+		}
+
+		public long averageResponseTime() {
+			if (this.responseTimes.size() < RESPONSE_TIME_READINGS) {
+				// Not enough readings yet
+				return 0L;
+			}
+			OptionalDouble average = this.responseTimes.stream().mapToDouble(a -> a).average();
+			if (average.isPresent()) {
+				return Double.valueOf(average.getAsDouble()).longValue();
+			}
+			return 0L;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (other == this)
+				return true;
+
+			if (!(other instanceof Server))
+				return false;
+
+			Server otherServer = (Server) other;
+
+			return this.connectionType == otherServer.connectionType
+					&& this.port == otherServer.port
+					&& this.hostname.equals(otherServer.hostname);
+		}
+
+		@Override
+		public int hashCode() {
+			return this.hostname.hashCode() ^ this.port;
+		}
+
+		@Override
+		public String toString() {
+			return String.format("%s:%s:%d", this.connectionType.name(), this.hostname, this.port);
+		}
+	}
+	private Set<Server> servers = new HashSet<>();
+	private List<Server> remainingServers = new ArrayList<>();
+	private Set<Server> uselessServers = Collections.synchronizedSet(new HashSet<>());
+
+	private final String netId;
+	private final String expectedGenesisHash;
+	private final Map<Server.ConnectionType, Integer> defaultPorts = new EnumMap<>(Server.ConnectionType.class);
+	private Bitcoiny blockchain;
+
+	private final Object serverLock = new Object();
+	private Server currentServer;
+	private ManagedChannel channel;
+	private int nextId = 1;
+
+	private static final int TX_CACHE_SIZE = 1000;
+	@SuppressWarnings("serial")
+	private final Map<String, BitcoinyTransaction> transactionCache = Collections.synchronizedMap(new LinkedHashMap<>(TX_CACHE_SIZE + 1, 0.75F, true) {
+		// This method is called just after a new entry has been added
+		@Override
+		public boolean removeEldestEntry(Map.Entry<String, BitcoinyTransaction> eldest) {
+			return size() > TX_CACHE_SIZE;
+		}
+	});
+
+	// Constructors
+
+	public PirateLightClient(String netId, String genesisHash, Collection<Server> initialServerList, Map<Server.ConnectionType, Integer> defaultPorts) {
+		this.netId = netId;
+		this.expectedGenesisHash = genesisHash;
+		this.servers.addAll(initialServerList);
+		this.defaultPorts.putAll(defaultPorts);
+	}
+
+	// Methods for use by other classes
+
+	@Override
+	public void setBlockchain(Bitcoiny blockchain) {
+		this.blockchain = blockchain;
+	}
+
+	@Override
+	public String getNetId() {
+		return this.netId;
+	}
+
+	/**
+	 * Returns current blockchain height.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public int getCurrentHeight() throws ForeignBlockchainException {
+		BlockID latestBlock = this.getCompactTxStreamerStub().getLatestBlock(null);
+
+		if (!(latestBlock instanceof BlockID))
+			throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain getLatestBlock gRPC");
+
+		return (int)latestBlock.getHeight();
+	}
+
+	/**
+	 * Returns list of compact blocks, starting from <tt>startHeight</tt> inclusive.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 * @return
+	 */
+	@Override
+	public List<CompactBlock> getCompactBlocks(int startHeight, int count) throws ForeignBlockchainException {
+		BlockID startBlock = BlockID.newBuilder().setHeight(startHeight).build();
+		BlockID endBlock = BlockID.newBuilder().setHeight(startHeight + count - 1).build();
+		BlockRange range = BlockRange.newBuilder().setStart(startBlock).setEnd(endBlock).build();
+
+		Iterator<CompactBlock> blocksIterator = this.getCompactTxStreamerStub().getBlockRange(range);
+
+		// Map from Iterator to List
+		List<CompactBlock> blocks = new ArrayList<>();
+		blocksIterator.forEachRemaining(blocks::add);
+
+		return blocks;
+	}
+
+	/**
+	 * Returns list of raw block headers, starting from <tt>startHeight</tt> inclusive.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public List<byte[]> getRawBlockHeaders(int startHeight, int count) throws ForeignBlockchainException {
+		BlockID startBlock = BlockID.newBuilder().setHeight(startHeight).build();
+		BlockID endBlock = BlockID.newBuilder().setHeight(startHeight + count - 1).build();
+		BlockRange range = BlockRange.newBuilder().setStart(startBlock).setEnd(endBlock).build();
+
+		Iterator<CompactBlock> blocks = this.getCompactTxStreamerStub().getBlockRange(range);
+
+		List<byte[]> rawBlockHeaders = new ArrayList<>();
+
+		while (blocks.hasNext()) {
+			CompactBlock block = blocks.next();
+
+			if (block.getHeader() == null) {
+				throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain getBlockRange gRPC");
+			}
+
+			rawBlockHeaders.add(block.getHeader().toByteArray());
+		}
+
+		return rawBlockHeaders;
+	}
+
+	/**
+	 * Returns list of raw block timestamps, starting from <tt>startHeight</tt> inclusive.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public List<Long> getBlockTimestamps(int startHeight, int count) throws ForeignBlockchainException {
+		BlockID startBlock = BlockID.newBuilder().setHeight(startHeight).build();
+		BlockID endBlock = BlockID.newBuilder().setHeight(startHeight + count - 1).build();
+		BlockRange range = BlockRange.newBuilder().setStart(startBlock).setEnd(endBlock).build();
+
+		Iterator<CompactBlock> blocks = this.getCompactTxStreamerStub().getBlockRange(range);
+
+		List<Long> rawBlockTimestamps = new ArrayList<>();
+
+		while (blocks.hasNext()) {
+			CompactBlock block = blocks.next();
+
+			if (block.getTime() <= 0) {
+				throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain getBlockRange gRPC");
+			}
+
+			rawBlockTimestamps.add(Long.valueOf(block.getTime()));
+		}
+
+		return rawBlockTimestamps;
+	}
+
+	/**
+	 * Returns confirmed balance, based on passed payment script.
+	 * <p>
+	 * @return confirmed balance, or zero if script unknown
+	 * @throws ForeignBlockchainException if there was an error
+	 */
+	@Override
+	public long getConfirmedBalance(byte[] script) throws ForeignBlockchainException {
+		throw new ForeignBlockchainException("getConfirmedBalance not yet implemented for Pirate Chain");
+	}
+
+	/**
+	 * Returns confirmed balance, based on passed base58 encoded address.
+	 * <p>
+	 * @return confirmed balance, or zero if address unknown
+	 * @throws ForeignBlockchainException if there was an error
+	 */
+	@Override
+	public long getConfirmedAddressBalance(String base58Address) throws ForeignBlockchainException {
+		AddressList addressList = AddressList.newBuilder().addAddresses(base58Address).build();
+		Balance balance = this.getCompactTxStreamerStub().getTaddressBalance(addressList);
+
+		if (!(balance instanceof Balance))
+			throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain getConfirmedAddressBalance gRPC");
+
+		return balance.getValueZat();
+	}
+
+	/**
+	 * Returns list of unspent outputs pertaining to passed address.
+	 * <p>
+	 * @return list of unspent outputs, or empty list if address unknown
+	 * @throws ForeignBlockchainException if there was an error.
+	 */
+	@Override
+	public List<UnspentOutput> getUnspentOutputs(String address, boolean includeUnconfirmed) throws ForeignBlockchainException {
+		GetAddressUtxosArg getAddressUtxosArg = GetAddressUtxosArg.newBuilder().addAddresses(address).build();
+		GetAddressUtxosReplyList replyList = this.getCompactTxStreamerStub().getAddressUtxos(getAddressUtxosArg);
+
+		if (!(replyList instanceof GetAddressUtxosReplyList))
+			throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain getUnspentOutputs gRPC");
+
+		List<GetAddressUtxosReply> unspentList = replyList.getAddressUtxosList();
+		if (unspentList == null)
+			throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain getUnspentOutputs gRPC");
+
+		List<UnspentOutput> unspentOutputs = new ArrayList<>();
+		for (GetAddressUtxosReply unspent : unspentList) {
+
+			int height = (int)unspent.getHeight();
+			// We only want unspent outputs from confirmed transactions (and definitely not mempool duplicates with height 0)
+			if (!includeUnconfirmed && height <= 0)
+				continue;
+
+			byte[] txHash = unspent.getTxid().toByteArray();
+			int outputIndex = unspent.getIndex();
+			long value = unspent.getValueZat();
+			byte[] script = unspent.getScript().toByteArray();
+			String addressRes = unspent.getAddress();
+
+			unspentOutputs.add(new UnspentOutput(txHash, outputIndex, height, value, script, addressRes));
+		}
+
+		return unspentOutputs;
+	}
+
+	/**
+	 * Returns list of unspent outputs pertaining to passed payment script.
+	 * <p>
+	 * @return list of unspent outputs, or empty list if script unknown
+	 * @throws ForeignBlockchainException if there was an error.
+	 */
+	@Override
+	public List<UnspentOutput> getUnspentOutputs(byte[] script, boolean includeUnconfirmed) throws ForeignBlockchainException {
+		String address = this.blockchain.deriveP2shAddress(script);
+		return this.getUnspentOutputs(address, includeUnconfirmed);
+	}
+
+	/**
+	 * Returns raw transaction for passed transaction hash.
+	 * <p>
+	 * NOTE: Do not mutate returned byte[]!
+	 *
+	 * @throws ForeignBlockchainException.NotFoundException if transaction not found
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public byte[] getRawTransaction(String txHash) throws ForeignBlockchainException {
+		return getRawTransaction(HashCode.fromString(txHash).asBytes());
+	}
+
+	/**
+	 * Returns raw transaction for passed transaction hash.
+	 * <p>
+	 * NOTE: Do not mutate returned byte[]!
+	 *
+	 * @throws ForeignBlockchainException.NotFoundException if transaction not found
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public byte[] getRawTransaction(byte[] txHash) throws ForeignBlockchainException {
+		ByteString byteString = ByteString.copyFrom(txHash);
+		TxFilter txFilter = TxFilter.newBuilder().setHash(byteString).build();
+		RawTransaction rawTransaction = this.getCompactTxStreamerStub().getTransaction(txFilter);
+
+		if (!(rawTransaction instanceof RawTransaction))
+			throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain getTransaction gRPC");
+
+		return rawTransaction.getData().toByteArray();
+	}
+
+	/**
+	 * Returns transaction info for passed transaction hash.
+	 * <p>
+	 * @throws ForeignBlockchainException.NotFoundException if transaction not found
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public BitcoinyTransaction getTransaction(String txHash) throws ForeignBlockchainException {
+		// Check cache first
+		BitcoinyTransaction transaction = transactionCache.get(txHash);
+		if (transaction != null)
+			return transaction;
+
+		ByteString byteString = ByteString.copyFrom(HashCode.fromString(txHash).asBytes());
+		TxFilter txFilter = TxFilter.newBuilder().setHash(byteString).build();
+		RawTransaction rawTransaction = this.getCompactTxStreamerStub().getTransaction(txFilter);
+
+		if (!(rawTransaction instanceof RawTransaction))
+			throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain getTransaction gRPC");
+
+		byte[] transactionData = rawTransaction.getData().toByteArray();
+		String transactionDataString = HashCode.fromBytes(transactionData).toString();
+
+		JSONParser parser = new JSONParser();
+		JSONObject transactionJson;
+		try {
+			transactionJson = (JSONObject) parser.parse(transactionDataString);
+		} catch (ParseException e) {
+			throw new ForeignBlockchainException.NetworkException("Expected JSON string from Pirate Chain getTransaction gRPC");
+		}
+
+		Object inputsObj = transactionJson.get("vin");
+		if (!(inputsObj instanceof JSONArray))
+			throw new ForeignBlockchainException.NetworkException("Expected JSONArray for 'vin' from Pirate Chain getTransaction gRPC");
+
+		Object outputsObj = transactionJson.get("vout");
+		if (!(outputsObj instanceof JSONArray))
+			throw new ForeignBlockchainException.NetworkException("Expected JSONArray for 'vout' from Pirate Chain getTransaction gRPC");
+
+		try {
+			int size = ((Long) transactionJson.get("size")).intValue();
+			int locktime = ((Long) transactionJson.get("locktime")).intValue();
+
+			// Timestamp might not be present, e.g. for unconfirmed transaction
+			Object timeObj = transactionJson.get("time");
+			Integer timestamp = timeObj != null
+					? ((Long) timeObj).intValue()
+					: null;
+
+			List<BitcoinyTransaction.Input> inputs = new ArrayList<>();
+			for (Object inputObj : (JSONArray) inputsObj) {
+				JSONObject inputJson = (JSONObject) inputObj;
+
+				String scriptSig = (String) ((JSONObject) inputJson.get("scriptSig")).get("hex");
+				int sequence = ((Long) inputJson.get("sequence")).intValue();
+				String outputTxHash = (String) inputJson.get("txid");
+				int outputVout = ((Long) inputJson.get("vout")).intValue();
+
+				inputs.add(new BitcoinyTransaction.Input(scriptSig, sequence, outputTxHash, outputVout));
+			}
+
+			List<BitcoinyTransaction.Output> outputs = new ArrayList<>();
+			for (Object outputObj : (JSONArray) outputsObj) {
+				JSONObject outputJson = (JSONObject) outputObj;
+
+				String scriptPubKey = (String) ((JSONObject) outputJson.get("scriptPubKey")).get("hex");
+				long value = BigDecimal.valueOf((Double) outputJson.get("value")).setScale(8).unscaledValue().longValue();
+
+				// address too, if present in the "addresses" array
+				List<String> addresses = null;
+				Object addressesObj = ((JSONObject) outputJson.get("scriptPubKey")).get("addresses");
+				if (addressesObj instanceof JSONArray) {
+					addresses = new ArrayList<>();
+					for (Object addressObj : (JSONArray) addressesObj) {
+						addresses.add((String) addressObj);
+					}
+				}
+
+				// some peers return a single "address" string
+				Object addressObj = ((JSONObject) outputJson.get("scriptPubKey")).get("address");
+				if (addressObj instanceof String) {
+					if (addresses == null) {
+						addresses = new ArrayList<>();
+					}
+					addresses.add((String) addressObj);
+				}
+
+				// For the purposes of Qortal we require all outputs to contain addresses
+				// Some servers omit this info, causing problems down the line with balance calculations
+				// Update: it turns out that they were just using a different key - "address" instead of "addresses"
+				// The code below can remain in place, just in case a peer returns a missing address in the future
+				if (addresses == null || addresses.isEmpty()) {
+					if (this.currentServer != null) {
+						this.uselessServers.add(this.currentServer);
+						this.closeServer(this.currentServer);
+					}
+					LOGGER.info("No output addresses returned for transaction {}", txHash);
+					throw new ForeignBlockchainException(String.format("No output addresses returned for transaction %s", txHash));
+				}
+
+				outputs.add(new BitcoinyTransaction.Output(scriptPubKey, value, addresses));
+			}
+
+			transaction = new BitcoinyTransaction(txHash, size, locktime, timestamp, inputs, outputs);
+
+			// Save into cache
+			transactionCache.put(txHash, transaction);
+
+			return transaction;
+		} catch (NullPointerException | ClassCastException e) {
+			// Unexpected / invalid response from ElectrumX server
+		}
+
+		throw new ForeignBlockchainException.NetworkException("Unexpected JSON format from Pirate Chain getTransaction gRPC");
+	}
+
+	/**
+	 * Returns list of transactions, relating to passed payment script.
+	 * <p>
+	 * @return list of related transactions, or empty list if script unknown
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public List<TransactionHash> getAddressTransactions(byte[] script, boolean includeUnconfirmed) throws ForeignBlockchainException {
+		// FUTURE: implement this if needed. Probably not very useful for private blockchains.
+		throw new ForeignBlockchainException("getAddressTransactions not yet implemented for Pirate Chain");
+	}
+
+	@Override
+	public List<BitcoinyTransaction> getAddressBitcoinyTransactions(String address, boolean includeUnconfirmed) throws ForeignBlockchainException {
+		try {
+			// Firstly we need to get the latest block
+			int defaultBirthday = Settings.getInstance().getArrrDefaultBirthday();
+			BlockID endBlock = this.getCompactTxStreamerStub().getLatestBlock(null);
+			BlockID startBlock = BlockID.newBuilder().setHeight(defaultBirthday).build();
+			BlockRange blockRange = BlockRange.newBuilder().setStart(startBlock).setEnd(endBlock).build();
+
+			TransparentAddressBlockFilter blockFilter = TransparentAddressBlockFilter.newBuilder()
+					.setAddress(address)
+					.setRange(blockRange)
+					.build();
+			Iterator<Service.RawTransaction> transactionIterator = this.getCompactTxStreamerStub().getTaddressTxids(blockFilter);
+
+			// Map from Iterator to List
+			List<RawTransaction> rawTransactions = new ArrayList<>();
+			transactionIterator.forEachRemaining(rawTransactions::add);
+
+			List<BitcoinyTransaction> transactions = new ArrayList<>();
+
+			for (RawTransaction rawTransaction : rawTransactions) {
+
+				Long height = rawTransaction.getHeight();
+				if (!includeUnconfirmed && (height == null || height == 0))
+					// We only want confirmed transactions
+					continue;
+
+				byte[] transactionData = rawTransaction.getData().toByteArray();
+				String transactionDataHex = HashCode.fromBytes(transactionData).toString();
+				BitcoinyTransaction bitcoinyTransaction = PirateChain.deserializeRawTransaction(transactionDataHex);
+				bitcoinyTransaction.height = height.intValue();
+				transactions.add(bitcoinyTransaction);
+			}
+
+			return transactions;
+		}
+		catch (RuntimeException | TransformationException e) {
+			throw new ForeignBlockchainException(String.format("Unable to get transactions for address %s: %s", address, e.getMessage()));
+		}
+	}
+
+	/**
+	 * Broadcasts raw transaction to network.
+	 * <p>
+	 * @throws ForeignBlockchainException if error occurs
+	 */
+	@Override
+	public void broadcastTransaction(byte[] transactionBytes) throws ForeignBlockchainException {
+		ByteString byteString = ByteString.copyFrom(transactionBytes);
+		RawTransaction rawTransaction = RawTransaction.newBuilder().setData(byteString).build();
+		SendResponse sendResponse = this.getCompactTxStreamerStub().sendTransaction(rawTransaction);
+
+		if (!(sendResponse instanceof SendResponse))
+			throw new ForeignBlockchainException.NetworkException("Unexpected output from Pirate Chain broadcastTransaction gRPC");
+
+		if (sendResponse.getErrorCode() != 0)
+			throw new ForeignBlockchainException.NetworkException(String.format("Unexpected error code from Pirate Chain broadcastTransaction gRPC: %d", sendResponse.getErrorCode()));
+	}
+
+	// Class-private utility methods
+
+
+	/**
+	 * Performs RPC call, with automatic reconnection to different server if needed.
+	 * <p>
+	 * @return "result" object from within JSON output
+	 * @throws ForeignBlockchainException if server returns error or something goes wrong
+	 */
+	private CompactTxStreamerGrpc.CompactTxStreamerBlockingStub getCompactTxStreamerStub() throws ForeignBlockchainException {
+		synchronized (this.serverLock) {
+			if (this.remainingServers.isEmpty())
+				this.remainingServers.addAll(this.servers);
+
+			while (haveConnection()) {
+				// If we have more servers and the last one replied slowly, try another
+				if (!this.remainingServers.isEmpty()) {
+					long averageResponseTime = this.currentServer.averageResponseTime();
+					if (averageResponseTime > MAX_AVG_RESPONSE_TIME) {
+						LOGGER.info("Slow average response time {}ms from {} - trying another server...", averageResponseTime, this.currentServer.hostname);
+						this.closeServer();
+						continue;
+					}
+				}
+
+				return CompactTxStreamerGrpc.newBlockingStub(this.channel);
+
+//				// Didn't work, try another server...
+//				this.closeServer();
+			}
+
+			// Failed to perform RPC - maybe lack of servers?
+			LOGGER.info("Error: No connected Pirate Light servers when trying to make RPC call");
+			throw new ForeignBlockchainException.NetworkException("No connected Pirate Light servers when trying to make RPC call");
+		}
+	}
+
+	/** Returns true if we have, or create, a connection to an ElectrumX server. */
+	private boolean haveConnection() throws ForeignBlockchainException {
+		if (this.currentServer != null && this.channel != null && !this.channel.isShutdown())
+			return true;
+
+		while (!this.remainingServers.isEmpty()) {
+			Server server = this.remainingServers.remove(RANDOM.nextInt(this.remainingServers.size()));
+			LOGGER.trace(() -> String.format("Connecting to %s", server));
+
+			try {
+				this.channel = ManagedChannelBuilder.forAddress(server.hostname, server.port).build();
+
+				CompactTxStreamerGrpc.CompactTxStreamerBlockingStub stub = CompactTxStreamerGrpc.newBlockingStub(this.channel);
+				LightdInfo lightdInfo = stub.getLightdInfo(Empty.newBuilder().build());
+
+				if (lightdInfo == null || lightdInfo.getBlockHeight() <= 0)
+					continue;
+
+				// TODO: find a way to verify that the server is using the expected chain
+
+//				if (featuresJson == null || Double.valueOf((String) featuresJson.get("protocol_min")) < MIN_PROTOCOL_VERSION)
+//					continue;
+
+//				if (this.expectedGenesisHash != null && !((String) featuresJson.get("genesis_hash")).equals(this.expectedGenesisHash))
+//					continue;
+
+				LOGGER.debug(() -> String.format("Connected to %s", server));
+				this.currentServer = server;
+				return true;
+			} catch (Exception e) {
+				// Didn't work, try another server...
+				closeServer();
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Closes connection to <tt>server</tt> if it is currently connected server.
+	 * @param server
+	 */
+	private void closeServer(Server server) {
+		synchronized (this.serverLock) {
+			if (this.currentServer == null || !this.currentServer.equals(server) || this.channel == null) {
+				return;
+			}
+
+			// Close the gRPC managed-channel if not shut down already.
+			if (!this.channel.isShutdown()) {
+				try {
+					this.channel.shutdown();
+					if (!this.channel.awaitTermination(10, TimeUnit.SECONDS)) {
+						LOGGER.warn("Timed out gracefully shutting down connection: {}. ", this.channel);
+					}
+				} catch (Exception e) {
+					LOGGER.error("Unexpected exception while waiting for channel termination", e);
+				}
+			}
+
+			// Forceful shut down if still not terminated.
+			if (!this.channel.isTerminated()) {
+				try {
+					this.channel.shutdownNow();
+					if (!this.channel.awaitTermination(15, TimeUnit.SECONDS)) {
+						LOGGER.warn("Timed out forcefully shutting down connection: {}. ", this.channel);
+					}
+				} catch (Exception e) {
+					LOGGER.error("Unexpected exception while waiting for channel termination", e);
+				}
+			}
+
+			this.channel = null;
+			this.currentServer = null;
+		}
+	}
+
+	/** Closes connection to currently connected server (if any). */
+	private void closeServer() {
+		synchronized (this.serverLock) {
+			this.closeServer(this.currentServer);
+		}
+	}
+
+}

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

@@ -0,0 +1,409 @@
+package org.qortal.crosschain;
+
+import com.rust.litewalletjni.LiteWalletJni;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bouncycastle.util.encoders.Base64;
+import org.bouncycastle.util.encoders.DecoderException;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qortal.controller.PirateChainWalletController;
+import org.qortal.crypto.Crypto;
+import org.qortal.settings.Settings;
+import org.qortal.utils.Base58;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Random;
+
+public class PirateWallet {
+
+    protected static final Logger LOGGER = LogManager.getLogger(PirateWallet.class);
+
+    private byte[] entropyBytes;
+    private final boolean isNullSeedWallet;
+    private String seedPhrase;
+    private boolean ready = false;
+
+    private String params;
+    private String saplingOutput64;
+    private String saplingSpend64;
+
+    private final static String COIN_PARAMS_FILENAME = "coinparams.json";
+    private final static String SAPLING_OUTPUT_FILENAME = "saplingoutput_base64";
+    private final static String SAPLING_SPEND_FILENAME = "saplingspend_base64";
+
+    public PirateWallet(byte[] entropyBytes, boolean isNullSeedWallet) throws IOException {
+        this.entropyBytes = entropyBytes;
+        this.isNullSeedWallet = isNullSeedWallet;
+
+        Path libDirectory = PirateChainWalletController.getRustLibOuterDirectory();
+        if (!Files.exists(Paths.get(libDirectory.toString(), COIN_PARAMS_FILENAME))) {
+            return;
+        }
+
+        this.params = Files.readString(Paths.get(libDirectory.toString(), COIN_PARAMS_FILENAME));
+        this.saplingOutput64 = Files.readString(Paths.get(libDirectory.toString(), SAPLING_OUTPUT_FILENAME));
+        this.saplingSpend64 = Files.readString(Paths.get(libDirectory.toString(), SAPLING_SPEND_FILENAME));
+
+        this.ready = this.initialize();
+    }
+
+    private boolean initialize() {
+        try {
+            LiteWalletJni.initlogging();
+
+            if (this.entropyBytes == null) {
+                return false;
+            }
+
+            // Pick a random server
+            PirateLightClient.Server server = this.getRandomServer();
+            String serverUri = String.format("https://%s:%d/", server.hostname, server.port);
+
+            // Pirate library uses base64 encoding
+            String entropy64 = Base64.toBase64String(this.entropyBytes);
+
+            // Derive seed phrase from entropy bytes
+            String inputSeedResponse = LiteWalletJni.getseedphrasefromentropyb64(entropy64);
+            JSONObject inputSeedJson =  new JSONObject(inputSeedResponse);
+            String inputSeedPhrase = null;
+            if (inputSeedJson.has("seedPhrase")) {
+                inputSeedPhrase = inputSeedJson.getString("seedPhrase");
+            }
+
+            String wallet = this.load();
+            if (wallet == null) {
+                // Wallet doesn't exist, so create a new one
+
+                int birthday = Settings.getInstance().getArrrDefaultBirthday();
+                if (this.isNullSeedWallet) {
+                    try {
+                        // Attempt to set birthday to the current block for null seed wallets
+                        birthday = PirateChain.getInstance().blockchainProvider.getCurrentHeight();
+                    }
+                    catch (ForeignBlockchainException e) {
+                        // Use the default height
+                    }
+                }
+
+                // Initialize new wallet
+                String birthdayString = String.format("%d", birthday);
+                String outputSeedResponse = LiteWalletJni.initfromseed(serverUri, this.params, inputSeedPhrase, birthdayString, this.saplingOutput64, this.saplingSpend64); // Thread-safe.
+                JSONObject outputSeedJson =  new JSONObject(outputSeedResponse);
+                String outputSeedPhrase = null;
+                if (outputSeedJson.has("seed")) {
+                    outputSeedPhrase = outputSeedJson.getString("seed");
+                }
+
+                // Ensure seed phrase in response matches supplied seed phrase
+                if (inputSeedPhrase == null || !Objects.equals(inputSeedPhrase, outputSeedPhrase)) {
+                    LOGGER.info("Unable to initialize Pirate Chain wallet: seed phrases do not match, or are null");
+                    return false;
+                }
+
+                this.seedPhrase = outputSeedPhrase;
+
+            } else {
+                // Restore existing wallet
+                String response = LiteWalletJni.initfromb64(serverUri, params, wallet, saplingOutput64, saplingSpend64);
+                if (response != null && !response.contains("\"initalized\":true")) {
+                    LOGGER.info("Unable to initialize Pirate Chain wallet: {}", response);
+                    return false;
+                }
+                this.seedPhrase = inputSeedPhrase;
+            }
+
+            // Check that we're able to communicate with the library
+            Integer ourHeight = this.getHeight();
+            return (ourHeight != null && ourHeight > 0);
+
+        } catch (IOException | JSONException | UnsatisfiedLinkError e) {
+            LOGGER.info("Unable to initialize Pirate Chain wallet: {}", e.getMessage());
+        }
+
+        return false;
+    }
+
+    public boolean isReady() {
+        return this.ready;
+    }
+
+    public void setReady(boolean ready) {
+        this.ready = ready;
+    }
+
+    public boolean entropyBytesEqual(byte[] testEntropyBytes) {
+        return Arrays.equals(testEntropyBytes, this.entropyBytes);
+    }
+
+    private void encrypt() {
+        if (this.isEncrypted()) {
+            // Nothing to do
+            return;
+        }
+
+        String encryptionKey = this.getEncryptionKey();
+        if (encryptionKey == null) {
+            // Can't encrypt without a key
+            return;
+        }
+
+        this.doEncrypt(encryptionKey);
+    }
+
+    private void decrypt() {
+        if (!this.isEncrypted()) {
+            // Nothing to do
+            return;
+        }
+
+        String encryptionKey = this.getEncryptionKey();
+        if (encryptionKey == null) {
+            // Can't encrypt without a key
+            return;
+        }
+
+        this.doDecrypt(encryptionKey);
+    }
+
+    public void unlock() {
+        if (!this.isEncrypted()) {
+            // Nothing to do
+            return;
+        }
+
+        String encryptionKey = this.getEncryptionKey();
+        if (encryptionKey == null) {
+            // Can't encrypt without a key
+            return;
+        }
+
+        this.doUnlock(encryptionKey);
+    }
+
+    public boolean save() throws IOException {
+        if (!isInitialized()) {
+            LOGGER.info("Error: can't save wallet, because no wallet it initialized");
+            return false;
+        }
+        if (this.isNullSeedWallet()) {
+            // Don't save wallets that have a null seed
+            return false;
+        }
+
+        // Encrypt first (will do nothing if already encrypted)
+        this.encrypt();
+
+        String wallet64 = LiteWalletJni.save();
+        byte[] wallet;
+        try {
+            wallet = Base64.decode(wallet64);
+        }
+        catch (DecoderException e) {
+            LOGGER.info("Unable to decode wallet");
+            return false;
+        }
+        if (wallet == null) {
+            LOGGER.info("Unable to save wallet");
+            return false;
+        }
+
+        Path walletPath = this.getCurrentWalletPath();
+        Files.createDirectories(walletPath.getParent());
+        Files.write(walletPath, wallet, StandardOpenOption.CREATE);
+
+        LOGGER.debug("Saved Pirate Chain wallet");
+
+        return true;
+    }
+
+    public String load() throws IOException {
+        if (this.isNullSeedWallet()) {
+            // Don't load wallets that have a null seed
+            return null;
+        }
+        Path walletPath = this.getCurrentWalletPath();
+        if (!Files.exists(walletPath)) {
+            return null;
+        }
+        byte[] wallet = Files.readAllBytes(walletPath);
+        if (wallet == null) {
+            return null;
+        }
+        String wallet64 = Base64.toBase64String(wallet);
+        return wallet64;
+    }
+
+    private String getEntropyHash58() {
+        if (this.entropyBytes == null) {
+            return null;
+        }
+        byte[] entropyHash = Crypto.digest(this.entropyBytes);
+        return Base58.encode(entropyHash);
+    }
+
+    public String getSeedPhrase() {
+        return this.seedPhrase;
+    }
+
+    private String getEncryptionKey() {
+        if (this.entropyBytes == null) {
+            return null;
+        }
+
+        // Prefix the bytes with a (deterministic) string, to ensure that the resulting hash is different
+        String prefix = "ARRRWalletEncryption";
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        try {
+            outputStream.write(prefix.getBytes(StandardCharsets.UTF_8));
+            outputStream.write(this.entropyBytes);
+
+        } catch (IOException e) {
+            return null;
+        }
+
+        byte[] encryptionKeyHash = Crypto.digest(outputStream.toByteArray());
+        return Base58.encode(encryptionKeyHash);
+    }
+
+    private Path getCurrentWalletPath() {
+        String entropyHash58 = this.getEntropyHash58();
+        String filename = String.format("wallet-%s.dat", entropyHash58);
+        return Paths.get(Settings.getInstance().getWalletsPath(), "PirateChain", filename);
+    }
+
+    public boolean isInitialized() {
+        return this.entropyBytes != null && this.ready;
+    }
+
+    public boolean isSynchronized() {
+        Integer height = this.getHeight();
+        Integer chainTip = this.getChainTip();
+
+        if (height == null || chainTip == null) {
+            return false;
+        }
+
+        // Assume synchronized if within 2 blocks of the chain tip
+        return height >= (chainTip - 2);
+    }
+
+
+    // APIs
+
+    public Integer getHeight() {
+        String response = LiteWalletJni.execute("height", "");
+        JSONObject json = new JSONObject(response);
+        if (json.has("height")) {
+            return json.getInt("height");
+        }
+        return null;
+    }
+
+    public Integer getChainTip() {
+        String response = LiteWalletJni.execute("info", "");
+        JSONObject json = new JSONObject(response);
+        if (json.has("latest_block_height")) {
+            return json.getInt("latest_block_height");
+        }
+        return null;
+    }
+
+    public boolean isNullSeedWallet() {
+        return this.isNullSeedWallet;
+    }
+
+    public Boolean isEncrypted() {
+        String response = LiteWalletJni.execute("encryptionstatus", "");
+        JSONObject json = new JSONObject(response);
+        if (json.has("encrypted")) {
+            return json.getBoolean("encrypted");
+        }
+        return null;
+    }
+
+    public boolean doEncrypt(String key) {
+        String response = LiteWalletJni.execute("encrypt", key);
+        JSONObject json = new JSONObject(response);
+        String result = json.getString("result");
+        if (json.has("result")) {
+            return (Objects.equals(result, "success"));
+        }
+        return false;
+    }
+
+    public boolean doDecrypt(String key) {
+        String response = LiteWalletJni.execute("decrypt", key);
+        JSONObject json = new JSONObject(response);
+        String result = json.getString("result");
+        if (json.has("result")) {
+            return (Objects.equals(result, "success"));
+        }
+        return false;
+    }
+
+    public boolean doUnlock(String key) {
+        String response = LiteWalletJni.execute("unlock", key);
+        JSONObject json = new JSONObject(response);
+        String result = json.getString("result");
+        if (json.has("result")) {
+            return (Objects.equals(result, "success"));
+        }
+        return false;
+    }
+
+    public String getWalletAddress() {
+        // Get balance, which also contains wallet addresses
+        String response = LiteWalletJni.execute("balance", "");
+        JSONObject json = new JSONObject(response);
+        String address = null;
+
+        if (json.has("z_addresses")) {
+            JSONArray z_addresses = json.getJSONArray("z_addresses");
+
+            if (z_addresses != null && !z_addresses.isEmpty()) {
+                JSONObject firstAddress = z_addresses.getJSONObject(0);
+                if (firstAddress.has("address")) {
+                    address = firstAddress.getString("address");
+                }
+            }
+        }
+        return address;
+    }
+
+    public String getPrivateKey() {
+        String response = LiteWalletJni.execute("export", "");
+        JSONArray addressesJson = new JSONArray(response);
+        if (!addressesJson.isEmpty()) {
+            JSONObject addressJson = addressesJson.getJSONObject(0);
+            if (addressJson.has("private_key")) {
+                //String address = addressJson.getString("address");
+                String privateKey = addressJson.getString("private_key");
+                //String viewingKey = addressJson.getString("viewing_key");
+
+                return privateKey;
+            }
+        }
+        return null;
+    }
+
+    public PirateLightClient.Server getRandomServer() {
+        PirateChain.PirateChainNet pirateChainNet = Settings.getInstance().getPirateChainNet();
+        Collection<PirateLightClient.Server> servers = pirateChainNet.getServers();
+        Random random = new Random();
+        int index = random.nextInt(servers.size());
+        return (PirateLightClient.Server) servers.toArray()[index];
+    }
+
+}

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

@@ -12,6 +12,7 @@ public class SimpleTransaction {
     private long feeAmount;
     private List<Input> inputs;
     private List<Output> outputs;
+    private String memo;
 
 
     @XmlAccessorType(XmlAccessType.FIELD)
@@ -74,13 +75,14 @@ public class SimpleTransaction {
     public SimpleTransaction() {
     }
 
-    public SimpleTransaction(String txHash, Long timestamp, long totalAmount, long feeAmount, List<Input> inputs, List<Output> outputs) {
+    public SimpleTransaction(String txHash, Long timestamp, long totalAmount, long feeAmount, List<Input> inputs, List<Output> outputs, String memo) {
         this.txHash = txHash;
         this.timestamp = timestamp;
         this.totalAmount = totalAmount;
         this.feeAmount = feeAmount;
         this.inputs = inputs;
         this.outputs = outputs;
+        this.memo = memo;
     }
 
     public String getTxHash() {

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

@@ -29,7 +29,6 @@ public enum SupportedBlockchain {
 
 	LITECOIN(Arrays.asList(
 			Triple.valueOf(LitecoinACCTv1.NAME, LitecoinACCTv1.CODE_BYTES_HASH, LitecoinACCTv1::getInstance),
-			Triple.valueOf(LitecoinACCTv2.NAME, LitecoinACCTv2.CODE_BYTES_HASH, LitecoinACCTv2::getInstance),
 			Triple.valueOf(LitecoinACCTv3.NAME, LitecoinACCTv3.CODE_BYTES_HASH, LitecoinACCTv3::getInstance)
 		)) {
 		@Override
@@ -45,7 +44,6 @@ public enum SupportedBlockchain {
 
 	DOGECOIN(Arrays.asList(
 			Triple.valueOf(DogecoinACCTv1.NAME, DogecoinACCTv1.CODE_BYTES_HASH, DogecoinACCTv1::getInstance),
-			Triple.valueOf(DogecoinACCTv2.NAME, DogecoinACCTv2.CODE_BYTES_HASH, DogecoinACCTv2::getInstance),
 			Triple.valueOf(DogecoinACCTv3.NAME, DogecoinACCTv3.CODE_BYTES_HASH, DogecoinACCTv3::getInstance)
 		)) {
 		@Override
@@ -85,6 +83,20 @@ public enum SupportedBlockchain {
 		public ACCT getLatestAcct() {
 			return RavencoinACCTv3.getInstance();
 		}
+	},
+
+	PIRATECHAIN(Arrays.asList(
+			Triple.valueOf(PirateChainACCTv3.NAME, PirateChainACCTv3.CODE_BYTES_HASH, PirateChainACCTv3::getInstance)
+	)) {
+		@Override
+		public ForeignBlockchain getInstance() {
+			return PirateChain.getInstance();
+		}
+
+		@Override
+		public ACCT getLatestAcct() {
+			return PirateChainACCTv3.getInstance();
+		}
 	};
 
 	private static final Map<ByteArray, Supplier<ACCT>> supportedAcctsByCodeHash = Arrays.stream(SupportedBlockchain.values())

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

@@ -7,10 +7,20 @@ public class UnspentOutput {
 	public final int height;
 	public final long value;
 
-	public UnspentOutput(byte[] hash, int index, int height, long value) {
+	// Optional fields returned by Pirate Light Client server
+	public final byte[] script;
+	public final String address;
+
+	public UnspentOutput(byte[] hash, int index, int height, long value, byte[] script, String address) {
 		this.hash = hash;
 		this.index = index;
 		this.height = height;
 		this.value = value;
+		this.script = script;
+		this.address = address;
+	}
+
+	public UnspentOutput(byte[] hash, int index, int height, long value) {
+		this(hash, index, height, value, null, null);
 	}
 }

src/main/java/org/qortal/crypto/MemoryPoW.java

@@ -1,10 +1,44 @@
 package org.qortal.crypto;
 
+import org.qortal.utils.NTP;
+
 import java.nio.ByteBuffer;
+import java.util.concurrent.TimeoutException;
 
 public class MemoryPoW {
 
+	/**
+	 * Compute a MemoryPoW nonce
+	 *
+	 * @param data
+	 * @param workBufferLength
+	 * @param difficulty
+	 * @return
+	 * @throws TimeoutException
+	 */
 	public static Integer compute2(byte[] data, int workBufferLength, long difficulty) {
+		try {
+			return MemoryPoW.compute2(data, workBufferLength, difficulty, null);
+
+		} catch (TimeoutException e) {
+			// This won't happen, because above timeout is null
+			return null;
+		}
+	}
+
+	/**
+	 * Compute a MemoryPoW nonce, with optional timeout
+	 *
+	 * @param data
+	 * @param workBufferLength
+	 * @param difficulty
+	 * @param timeout maximum number of milliseconds to compute for before giving up,<br>or null if no timeout
+	 * @return
+	 * @throws TimeoutException
+	 */
+	public static Integer compute2(byte[] data, int workBufferLength, long difficulty, Long timeout) throws TimeoutException {
+		long startTime = NTP.getTime();
+
 		// Hash data with SHA256
 		byte[] hash = Crypto.digest(data);
 
@@ -33,6 +67,13 @@ public class MemoryPoW {
 			if (Thread.currentThread().isInterrupted())
 				return -1;
 
+			if (timeout != null) {
+				long now = NTP.getTime();
+				if (now > startTime + timeout) {
+					throw new TimeoutException("Timeout reached");
+				}
+			}
+
 			seed *= seedMultiplier; // per nonce
 
 			state[0] = longHash[0] ^ seed;
@@ -58,6 +99,10 @@ public class MemoryPoW {
 	}
 
 	public static boolean verify2(byte[] data, int workBufferLength, long difficulty, int nonce) {
+		return verify2(data, null, workBufferLength, difficulty, nonce);
+	}
+
+	public static boolean verify2(byte[] data, long[] workBuffer, int workBufferLength, long difficulty, int nonce) {
 		// Hash data with SHA256
 		byte[] hash = Crypto.digest(data);
 
@@ -70,7 +115,10 @@ public class MemoryPoW {
 		byteBuffer = null;
 
 		int longBufferLength = workBufferLength / 8;
-		long[] workBuffer = new long[longBufferLength];
+
+		if (workBuffer == null)
+			workBuffer = new long[longBufferLength];
+
 		long[] state = new long[4];
 
 		long seed = 8682522807148012L;

src/main/java/org/qortal/data/arbitrary/ArbitraryResourceMetadata.java

@@ -24,7 +24,10 @@ public class ArbitraryResourceMetadata {
         this.description = description;
         this.tags = tags;
         this.category = category;
-        this.categoryName = category.getName();
+
+        if (category != null) {
+            this.categoryName = category.getName();
+        }
     }
 
     public static ArbitraryResourceMetadata fromTransactionMetadata(ArbitraryDataTransactionMetadata transactionMetadata) {

src/main/java/org/qortal/data/arbitrary/ArbitraryResourceStatus.java

@@ -26,6 +26,7 @@ public class ArbitraryResourceStatus {
         }
     }
 
+    private Status status;
     private String id;
     private String title;
     private String description;
@@ -37,6 +38,7 @@ public class ArbitraryResourceStatus {
     }
 
     public ArbitraryResourceStatus(Status status, Integer localChunkCount, Integer totalChunkCount) {
+        this.status = status;
         this.id = status.toString();
         this.title = status.title;
         this.description = status.description;
@@ -47,4 +49,20 @@ public class ArbitraryResourceStatus {
     public ArbitraryResourceStatus(Status status) {
         this(status, null, null);
     }
+
+    public Status getStatus() {
+        return this.status;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public Integer getLocalChunkCount() {
+        return this.localChunkCount;
+    }
+
+    public Integer getTotalChunkCount() {
+        return this.totalChunkCount;
+    }
 }

src/main/java/org/qortal/data/block/BlockData.java

@@ -211,6 +211,14 @@ public class BlockData implements Serializable {
 		this.onlineAccountsSignatures = onlineAccountsSignatures;
 	}
 
+	public int getOnlineAccountsSignaturesCount() {
+		if (this.onlineAccountsSignatures != null && this.onlineAccountsSignatures.length > 0) {
+			// Blocks use a single online accounts signature, so there is no need for this to be dynamic
+			return 1;
+		}
+		return 0;
+	}
+
 	public boolean isTrimmed() {
 		long onlineAccountSignaturesTrimmedTimestamp = NTP.getTime() - BlockChain.getInstance().getOnlineAccountSignaturesMaxLifetime();
 		long currentTrimmableTimestamp = NTP.getTime() - Settings.getInstance().getAtStatesMaxLifetime();

src/main/java/org/qortal/data/block/BlockSummaryData.java

@@ -11,11 +11,12 @@ public class BlockSummaryData {
 	private int height;
 	private byte[] signature;
 	private byte[] minterPublicKey;
-	private int onlineAccountsCount;
 
 	// Optional, set during construction
+	private Integer onlineAccountsCount;
 	private Long timestamp;
 	private Integer transactionCount;
+	private byte[] reference;
 
 	// Optional, set after construction
 	private Integer minterLevel;
@@ -25,6 +26,15 @@ public class BlockSummaryData {
 	protected BlockSummaryData() {
 	}
 
+	/** Constructor typically populated with fields from HeightV2Message */
+	public BlockSummaryData(int height, byte[] signature, byte[] minterPublicKey, long timestamp) {
+		this.height = height;
+		this.signature = signature;
+		this.minterPublicKey = minterPublicKey;
+		this.timestamp = timestamp;
+	}
+
+	/** Constructor typically populated with fields from BlockSummariesMessage */
 	public BlockSummaryData(int height, byte[] signature, byte[] minterPublicKey, int onlineAccountsCount) {
 		this.height = height;
 		this.signature = signature;
@@ -32,13 +42,16 @@ public class BlockSummaryData {
 		this.onlineAccountsCount = onlineAccountsCount;
 	}
 
-	public BlockSummaryData(int height, byte[] signature, byte[] minterPublicKey, int onlineAccountsCount, long timestamp, int transactionCount) {
+	/** Constructor typically populated with fields from BlockSummariesV2Message */
+	public BlockSummaryData(int height, byte[] signature, byte[] minterPublicKey, Integer onlineAccountsCount,
+							Long timestamp, Integer transactionCount, byte[] reference) {
 		this.height = height;
 		this.signature = signature;
 		this.minterPublicKey = minterPublicKey;
 		this.onlineAccountsCount = onlineAccountsCount;
 		this.timestamp = timestamp;
 		this.transactionCount = transactionCount;
+		this.reference = reference;
 	}
 
 	public BlockSummaryData(BlockData blockData) {
@@ -49,6 +62,7 @@ public class BlockSummaryData {
 
 		this.timestamp = blockData.getTimestamp();
 		this.transactionCount = blockData.getTransactionCount();
+		this.reference = blockData.getReference();
 	}
 
 	// Getters / setters
@@ -65,7 +79,7 @@ public class BlockSummaryData {
 		return this.minterPublicKey;
 	}
 
-	public int getOnlineAccountsCount() {
+	public Integer getOnlineAccountsCount() {
 		return this.onlineAccountsCount;
 	}
 
@@ -77,6 +91,10 @@ public class BlockSummaryData {
 		return this.transactionCount;
 	}
 
+	public byte[] getReference() {
+		return this.reference;
+	}
+
 	public Integer getMinterLevel() {
 		return this.minterLevel;
 	}

src/main/java/org/qortal/data/block/CommonBlockData.java

@@ -1,7 +1,5 @@
 package org.qortal.data.block;
 
-import org.qortal.data.network.PeerChainTipData;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import java.math.BigInteger;
@@ -14,14 +12,14 @@ public class CommonBlockData {
 	private BlockSummaryData commonBlockSummary = null;
 	private List<BlockSummaryData> blockSummariesAfterCommonBlock = null;
 	private BigInteger chainWeight = null;
-	private PeerChainTipData chainTipData = null;
+	private BlockSummaryData chainTipData = null;
 
 	// Constructors
 
 	protected CommonBlockData() {
 	}
 
-	public CommonBlockData(BlockSummaryData commonBlockSummary, PeerChainTipData chainTipData) {
+	public CommonBlockData(BlockSummaryData commonBlockSummary, BlockSummaryData chainTipData) {
 		this.commonBlockSummary = commonBlockSummary;
 		this.chainTipData = chainTipData;
 	}
@@ -49,7 +47,7 @@ public class CommonBlockData {
 		this.chainWeight = chainWeight;
 	}
 
-	public PeerChainTipData getChainTipData() {
+	public BlockSummaryData getChainTipData() {
 		return this.chainTipData;
 	}
 

src/main/java/org/qortal/data/network/OnlineAccountData.java

@@ -16,6 +16,7 @@ public class OnlineAccountData {
 	protected long timestamp;
 	protected byte[] signature;
 	protected byte[] publicKey;
+	protected Integer nonce;
 
 	@XmlTransient
 	private int hash;
@@ -26,10 +27,15 @@ public class OnlineAccountData {
 	protected OnlineAccountData() {
 	}
 
-	public OnlineAccountData(long timestamp, byte[] signature, byte[] publicKey) {
+	public OnlineAccountData(long timestamp, byte[] signature, byte[] publicKey, Integer nonce) {
 		this.timestamp = timestamp;
 		this.signature = signature;
 		this.publicKey = publicKey;
+		this.nonce = nonce;
+	}
+
+	public OnlineAccountData(long timestamp, byte[] signature, byte[] publicKey) {
+		this(timestamp, signature, publicKey, null);
 	}
 
 	public long getTimestamp() {
@@ -44,6 +50,10 @@ public class OnlineAccountData {
 		return this.publicKey;
 	}
 
+	public Integer getNonce() {
+		return this.nonce;
+	}
+
 	// For JAXB
 	@XmlElement(name = "address")
 	protected String getAddress() {

src/main/java/org/qortal/data/network/PeerChainTipData.java

@@ -1,37 +0,0 @@
-package org.qortal.data.network;
-
-public class PeerChainTipData {
-
-	/** Latest block height as reported by peer. */
-	private Integer lastHeight;
-	/** Latest block signature as reported by peer. */
-	private byte[] lastBlockSignature;
-	/** Latest block timestamp as reported by peer. */
-	private Long lastBlockTimestamp;
-	/** Latest block minter public key as reported by peer. */
-	private byte[] lastBlockMinter;
-
-	public PeerChainTipData(Integer lastHeight, byte[] lastBlockSignature, Long lastBlockTimestamp, byte[] lastBlockMinter) {
-		this.lastHeight = lastHeight;
-		this.lastBlockSignature = lastBlockSignature;
-		this.lastBlockTimestamp = lastBlockTimestamp;
-		this.lastBlockMinter = lastBlockMinter;
-	}
-
-	public Integer getLastHeight() {
-		return this.lastHeight;
-	}
-
-	public byte[] getLastBlockSignature() {
-		return this.lastBlockSignature;
-	}
-
-	public Long getLastBlockTimestamp() {
-		return this.lastBlockTimestamp;
-	}
-
-	public byte[] getLastBlockMinter() {
-		return this.lastBlockMinter;
-	}
-
-}

src/main/java/org/qortal/data/network/PeerData.java

@@ -28,6 +28,9 @@ public class PeerData {
 	private Long addedWhen;
 	private String addedBy;
 
+	/** The number of consecutive times we failed to sync with this peer */
+	private int failedSyncCount = 0;
+
 	// Constructors
 
 	// necessary for JAXB serialization
@@ -92,6 +95,18 @@ public class PeerData {
 		return this.addedBy;
 	}
 
+	public int getFailedSyncCount() {
+		return this.failedSyncCount;
+	}
+
+	public void setFailedSyncCount(int failedSyncCount) {
+		this.failedSyncCount = failedSyncCount;
+	}
+
+	public void incrementFailedSyncCount() {
+		this.failedSyncCount++;
+	}
+
 	// Pretty peerAddress getter for JAXB
 	@XmlElement(name = "address")
 	protected String getPrettyAddress() {

src/main/java/org/qortal/data/transaction/TransactionData.java

@@ -128,6 +128,10 @@ public abstract class TransactionData {
 		return this.txGroupId;
 	}
 
+	public void setTxGroupId(int txGroupId) {
+		this.txGroupId = txGroupId;
+	}
+
 	public byte[] getReference() {
 		return this.reference;
 	}

src/main/java/org/qortal/group/Group.java

@@ -80,6 +80,9 @@ public class Group {
 	// Useful constants
 	public static final int NO_GROUP = 0;
 
+	// Null owner address corresponds with public key "11111111111111111111111111111111"
+	public static String NULL_OWNER_ADDRESS = "QdSnUy6sUiEnaN87dWmE92g1uQjrvPgrWG";
+
 	public static final int MIN_NAME_SIZE = 3;
 	public static final int MAX_NAME_SIZE = 32;
 	public static final int MAX_DESCRIPTION_SIZE = 128;

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

@@ -11,6 +11,7 @@ import org.qortal.controller.arbitrary.ArbitraryDataFileListManager;
 import org.qortal.controller.arbitrary.ArbitraryDataManager;
 import org.qortal.crypto.Crypto;
 import org.qortal.data.block.BlockData;
+import org.qortal.data.block.BlockSummaryData;
 import org.qortal.data.network.PeerData;
 import org.qortal.data.transaction.TransactionData;
 import org.qortal.network.message.*;
@@ -90,6 +91,8 @@ public class Network {
 
     private static final long DISCONNECTION_CHECK_INTERVAL = 10 * 1000L; // milliseconds
 
+    private static final int BROADCAST_CHAIN_TIP_DEPTH = 7; // Just enough to fill a SINGLE TCP packet (~1440 bytes)
+
     // Generate our node keys / ID
     private final Ed25519PrivateKeyParameters edPrivateKeyParams = new Ed25519PrivateKeyParameters(new SecureRandom());
     private final Ed25519PublicKeyParameters edPublicKeyParams = edPrivateKeyParams.generatePublicKey();
@@ -1087,10 +1090,16 @@ public class Network {
 
         if (peer.isOutbound()) {
             if (!Settings.getInstance().isLite()) {
-                // Send our height
-                Message heightMessage = buildHeightMessage(peer, Controller.getInstance().getChainTip());
-                if (!peer.sendMessage(heightMessage)) {
-                    peer.disconnect("failed to send height/info");
+                // Send our height / chain tip info
+                Message message = this.buildHeightOrChainTipInfo(peer);
+
+                if (message == null) {
+                    peer.disconnect("Couldn't build our chain tip info");
+                    return;
+                }
+
+                if (!peer.sendMessage(message)) {
+                    peer.disconnect("failed to send height / chain tip info");
                     return;
                 }
             }
@@ -1164,10 +1173,47 @@ public class Network {
         return new PeersV2Message(peerAddresses);
     }
 
-    public Message buildHeightMessage(Peer peer, BlockData blockData) {
-        // HEIGHT_V2 contains way more useful info
-        return new HeightV2Message(blockData.getHeight(), blockData.getSignature(),
-                blockData.getTimestamp(), blockData.getMinterPublicKey());
+    /** Builds either (legacy) HeightV2Message or (newer) BlockSummariesV2Message, depending on peer version.
+     *
+     *  @return Message, or null if DataException was thrown.
+     */
+    public Message buildHeightOrChainTipInfo(Peer peer) {
+        if (peer.getPeersVersion() >= BlockSummariesV2Message.MINIMUM_PEER_VERSION) {
+            int latestHeight = Controller.getInstance().getChainHeight();
+
+            try (final Repository repository = RepositoryManager.getRepository()) {
+                List<BlockSummaryData> latestBlockSummaries = repository.getBlockRepository().getBlockSummaries(latestHeight - BROADCAST_CHAIN_TIP_DEPTH, latestHeight);
+                return new BlockSummariesV2Message(latestBlockSummaries);
+            } catch (DataException e) {
+                return null;
+            }
+        } else {
+            // For older peers
+            BlockData latestBlockData = Controller.getInstance().getChainTip();
+            return new HeightV2Message(latestBlockData.getHeight(), latestBlockData.getSignature(),
+                    latestBlockData.getTimestamp(), latestBlockData.getMinterPublicKey());
+        }
+    }
+
+    public void broadcastOurChain() {
+        BlockData latestBlockData = Controller.getInstance().getChainTip();
+        int latestHeight = latestBlockData.getHeight();
+
+        try (final Repository repository = RepositoryManager.getRepository()) {
+            List<BlockSummaryData> latestBlockSummaries = repository.getBlockRepository().getBlockSummaries(latestHeight - BROADCAST_CHAIN_TIP_DEPTH, latestHeight);
+            Message latestBlockSummariesMessage = new BlockSummariesV2Message(latestBlockSummaries);
+
+            // For older peers
+            Message heightMessage = new HeightV2Message(latestBlockData.getHeight(), latestBlockData.getSignature(),
+                    latestBlockData.getTimestamp(), latestBlockData.getMinterPublicKey());
+
+            Network.getInstance().broadcast(broadcastPeer -> broadcastPeer.getPeersVersion() >= BlockSummariesV2Message.MINIMUM_PEER_VERSION
+                    ? latestBlockSummariesMessage
+                    : heightMessage
+            );
+        } catch (DataException e) {
+            LOGGER.warn("Couldn't broadcast our chain tip info", e);
+        }
     }
 
     public Message buildNewTransactionMessage(Peer peer, TransactionData transactionData) {
@@ -1375,26 +1421,17 @@ public class Network {
                 // We attempted to connect within the last day
                 // but we last managed to connect over a week ago.
                 Predicate<PeerData> isNotOldPeer = peerData -> {
-
-                    // First check if there was a connection attempt within the last day
-                    if (peerData.getLastAttempted() != null
-                            && peerData.getLastAttempted() > now - OLD_PEER_ATTEMPTED_PERIOD) {
-
-                        // There was, so now check if we had a successful connection in the last 7 days
-                        if (peerData.getLastConnected() != null
-                                && peerData.getLastConnected() > now - OLD_PEER_CONNECTION_PERIOD) {
-
-                            // We did, so this is NOT an 'old' peer
-                            return true;
-                        }
-
-                        // Last successful connection was more than 1 week ago - this is an 'old' peer
-                        return false;
-                    }
-                    else {
-                        // Best to wait until we have a connection attempt - assume not an 'old' peer until then
+                    if (peerData.getLastAttempted() == null
+                            || peerData.getLastAttempted() < now - OLD_PEER_ATTEMPTED_PERIOD) {
                         return true;
                     }
+
+                    if (peerData.getLastConnected() == null
+                            || peerData.getLastConnected() > now - OLD_PEER_CONNECTION_PERIOD) {
+                        return true;
+                    }
+
+                    return false;
                 };
 
                 // Disregard peers that are NOT 'old'

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

@@ -6,8 +6,8 @@ import com.google.common.net.InetAddresses;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.qortal.controller.Controller;
+import org.qortal.data.block.BlockSummaryData;
 import org.qortal.data.block.CommonBlockData;
-import org.qortal.data.network.PeerChainTipData;
 import org.qortal.data.network.PeerData;
 import org.qortal.network.message.ChallengeMessage;
 import org.qortal.network.message.Message;
@@ -27,6 +27,8 @@ import java.nio.channels.SocketChannel;
 import java.security.SecureRandom;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.LongAccumulator;
+import java.util.concurrent.atomic.LongAdder;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -146,13 +148,23 @@ public class Peer {
     /**
      * Latest block info as reported by peer.
      */
-    private PeerChainTipData peersChainTipData;
+    private List<BlockSummaryData> peersChainTipData = Collections.emptyList();
 
     /**
      * Our common block with this peer
      */
     private CommonBlockData commonBlockData;
 
+    // Message stats
+
+    private static class MessageStats {
+        public final LongAdder count = new LongAdder();
+        public final LongAdder totalBytes = new LongAdder();
+    }
+
+    private final Map<MessageType, MessageStats> receivedMessageStats = new ConcurrentHashMap<>();
+    private final Map<MessageType, MessageStats> sentMessageStats = new ConcurrentHashMap<>();
+
     // Constructors
 
     /**
@@ -341,28 +353,34 @@ public class Peer {
         }
     }
 
-    public PeerChainTipData getChainTipData() {
-        synchronized (this.peerInfoLock) {
-            return this.peersChainTipData;
-        }
+    public BlockSummaryData getChainTipData() {
+        List<BlockSummaryData> chainTipSummaries = this.peersChainTipData;
+
+        if (chainTipSummaries.isEmpty())
+            return null;
+
+        // Return last entry, which should have greatest height
+        return chainTipSummaries.get(chainTipSummaries.size() - 1);
     }
 
-    public void setChainTipData(PeerChainTipData chainTipData) {
-        synchronized (this.peerInfoLock) {
-            this.peersChainTipData = chainTipData;
-        }
+    public void setChainTipData(BlockSummaryData chainTipData) {
+        this.peersChainTipData = Collections.singletonList(chainTipData);
+    }
+
+    public List<BlockSummaryData> getChainTipSummaries() {
+        return this.peersChainTipData;
+    }
+
+    public void setChainTipSummaries(List<BlockSummaryData> chainTipSummaries) {
+        this.peersChainTipData = List.copyOf(chainTipSummaries);
     }
 
     public CommonBlockData getCommonBlockData() {
-        synchronized (this.peerInfoLock) {
-            return this.commonBlockData;
-        }
+        return this.commonBlockData;
     }
 
     public void setCommonBlockData(CommonBlockData commonBlockData) {
-        synchronized (this.peerInfoLock) {
-            this.commonBlockData = commonBlockData;
-        }
+        this.commonBlockData = commonBlockData;
     }
 
     public boolean isSyncInProgress() {
@@ -542,11 +560,18 @@ public class Peer {
                     // Tidy up buffers:
                     this.byteBuffer.flip();
                     // Read-only, flipped buffer's position will be after end of message, so copy that
+                    long messageByteSize = readOnlyBuffer.position();
                     this.byteBuffer.position(readOnlyBuffer.position());
                     // Copy bytes after read message to front of buffer,
                     // adjusting position accordingly, reset limit to capacity
                     this.byteBuffer.compact();
 
+                    // Record message stats
+                    MessageStats messageStats = this.receivedMessageStats.computeIfAbsent(message.getType(), k -> new MessageStats());
+                    // Ideally these two operations would be atomic, we could pack 'count' in top X bits of the 64-bit long, but meh
+                    messageStats.count.increment();
+                    messageStats.totalBytes.add(messageByteSize);
+
                     // Unsupported message type? Discard with no further processing
                     if (message.getType() == MessageType.UNSUPPORTED)
                         continue;
@@ -609,6 +634,12 @@ public class Peer {
 
                     LOGGER.trace("[{}] Sending {} message with ID {} to peer {}",
                             this.peerConnectionId, this.outputMessageType, this.outputMessageId, this);
+
+                    // Record message stats
+                    MessageStats messageStats = this.sentMessageStats.computeIfAbsent(message.getType(), k -> new MessageStats());
+                    // Ideally these two operations would be atomic, we could pack 'count' in top X bits of the 64-bit long, but meh
+                    messageStats.count.increment();
+                    messageStats.totalBytes.add(this.outputBuffer.limit());
                 } catch (MessageException e) {
                     // Something went wrong converting message to bytes, so discard but allow another round
                     LOGGER.warn("[{}] Failed to send {} message with ID {} to peer {}: {}", this.peerConnectionId,
@@ -799,8 +830,11 @@ public class Peer {
     }
 
     public void shutdown() {
+        boolean logStats = false;
+
         if (!isStopping) {
             LOGGER.debug("[{}] Shutting down peer {}", this.peerConnectionId, this);
+            logStats = true;
         }
         isStopping = true;
 
@@ -812,8 +846,34 @@ public class Peer {
                 LOGGER.debug("[{}] IOException while trying to close peer {}", this.peerConnectionId, this);
             }
         }
+
+        if (logStats && this.receivedMessageStats.size() > 0) {
+            StringBuilder statsBuilder = new StringBuilder(1024);
+            statsBuilder.append("peer ").append(this).append(" message stats:\n=received=");
+            appendMessageStats(statsBuilder, this.receivedMessageStats);
+            statsBuilder.append("\n=sent=");
+            appendMessageStats(statsBuilder, this.sentMessageStats);
+
+            LOGGER.debug(statsBuilder.toString());
+        }
     }
 
+    private static void appendMessageStats(StringBuilder statsBuilder, Map<MessageType, MessageStats> messageStats) {
+        if (messageStats.isEmpty()) {
+            statsBuilder.append("\n  none");
+            return;
+        }
+
+        messageStats.keySet().stream()
+                .sorted(Comparator.comparing(MessageType::name))
+                .forEach(messageType -> {
+                    MessageStats stats = messageStats.get(messageType);
+
+                    statsBuilder.append("\n  ").append(messageType.name())
+                            .append(": count=").append(stats.count.sum())
+                            .append(", total bytes=").append(stats.totalBytes.sum());
+                });
+    }
 
     // Minimum version
 
@@ -850,20 +910,22 @@ public class Peer {
     // Common block data
 
     public boolean canUseCachedCommonBlockData() {
-        PeerChainTipData peerChainTipData = this.getChainTipData();
-        CommonBlockData commonBlockData = this.getCommonBlockData();
+        BlockSummaryData peerChainTipData = this.getChainTipData();
+        if (peerChainTipData == null || peerChainTipData.getSignature() == null)
+            return false;
 
-        if (peerChainTipData != null && commonBlockData != null) {
-            PeerChainTipData commonBlockChainTipData = commonBlockData.getChainTipData();
-            if (peerChainTipData.getLastBlockSignature() != null && commonBlockChainTipData != null
-                    && commonBlockChainTipData.getLastBlockSignature() != null) {
-                if (Arrays.equals(peerChainTipData.getLastBlockSignature(),
-                        commonBlockChainTipData.getLastBlockSignature())) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        CommonBlockData commonBlockData = this.getCommonBlockData();
+        if (commonBlockData == null)
+            return false;
+
+        BlockSummaryData commonBlockChainTipData = commonBlockData.getChainTipData();
+        if (commonBlockChainTipData == null || commonBlockChainTipData.getSignature() == null)
+            return false;
+
+        if (!Arrays.equals(peerChainTipData.getSignature(), commonBlockChainTipData.getSignature()))
+            return false;
+
+        return true;
     }
 
 

src/main/java/org/qortal/network/message/BlockSummariesV2Message.java

@@ -0,0 +1,109 @@
+package org.qortal.network.message;
+
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import org.qortal.data.block.BlockSummaryData;
+import org.qortal.transform.Transformer;
+import org.qortal.transform.block.BlockTransformer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockSummariesV2Message extends Message {
+
+	public static final long MINIMUM_PEER_VERSION = 0x0300060001L;
+
+	private static final int BLOCK_SUMMARY_V2_LENGTH = BlockTransformer.BLOCK_SIGNATURE_LENGTH /* block signature */
+			+ Transformer.PUBLIC_KEY_LENGTH /* minter public key */
+			+ Transformer.INT_LENGTH /* online accounts count */
+			+ Transformer.LONG_LENGTH /* block timestamp */
+			+ Transformer.INT_LENGTH /* transactions count */
+			+ BlockTransformer.BLOCK_SIGNATURE_LENGTH; /* block reference */
+
+	private List<BlockSummaryData> blockSummaries;
+
+	public BlockSummariesV2Message(List<BlockSummaryData> blockSummaries) {
+		super(MessageType.BLOCK_SUMMARIES_V2);
+
+		// Shortcut for when there are no summaries
+		if (blockSummaries.isEmpty()) {
+			this.dataBytes = Message.EMPTY_DATA_BYTES;
+			return;
+		}
+
+		ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+
+		try {
+			// First summary's height
+			bytes.write(Ints.toByteArray(blockSummaries.get(0).getHeight()));
+
+			for (BlockSummaryData blockSummary : blockSummaries) {
+				bytes.write(blockSummary.getSignature());
+				bytes.write(blockSummary.getMinterPublicKey());
+				bytes.write(Ints.toByteArray(blockSummary.getOnlineAccountsCount()));
+				bytes.write(Longs.toByteArray(blockSummary.getTimestamp()));
+				bytes.write(Ints.toByteArray(blockSummary.getTransactionCount()));
+				bytes.write(blockSummary.getReference());
+			}
+		} catch (IOException e) {
+			throw new AssertionError("IOException shouldn't occur with ByteArrayOutputStream");
+		}
+
+		this.dataBytes = bytes.toByteArray();
+		this.checksumBytes = Message.generateChecksum(this.dataBytes);
+	}
+
+	private BlockSummariesV2Message(int id, List<BlockSummaryData> blockSummaries) {
+		super(id, MessageType.BLOCK_SUMMARIES_V2);
+
+		this.blockSummaries = blockSummaries;
+	}
+
+	public List<BlockSummaryData> getBlockSummaries() {
+		return this.blockSummaries;
+	}
+
+	public static Message fromByteBuffer(int id, ByteBuffer bytes) {
+		List<BlockSummaryData> blockSummaries = new ArrayList<>();
+
+		// If there are no bytes remaining then we can treat this as an empty array of summaries
+		if (bytes.remaining() == 0)
+			return new BlockSummariesV2Message(id, blockSummaries);
+
+		int height = bytes.getInt();
+
+		// Expecting bytes remaining to be exact multiples of BLOCK_SUMMARY_V2_LENGTH
+		if (bytes.remaining() % BLOCK_SUMMARY_V2_LENGTH != 0)
+			throw new BufferUnderflowException();
+
+		while (bytes.hasRemaining()) {
+			byte[] signature = new byte[BlockTransformer.BLOCK_SIGNATURE_LENGTH];
+			bytes.get(signature);
+
+			byte[] minterPublicKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
+			bytes.get(minterPublicKey);
+
+			int onlineAccountsCount = bytes.getInt();
+
+			long timestamp = bytes.getLong();
+
+			int transactionsCount = bytes.getInt();
+
+			byte[] reference = new byte[BlockTransformer.BLOCK_SIGNATURE_LENGTH];
+			bytes.get(reference);
+
+			BlockSummaryData blockSummary = new BlockSummaryData(height, signature, minterPublicKey,
+					onlineAccountsCount, timestamp, transactionsCount, reference);
+			blockSummaries.add(blockSummary);
+
+			height++;
+		}
+
+		return new BlockSummariesV2Message(id, blockSummaries);
+	}
+
+}

src/main/java/org/qortal/network/message/GenericUnknownMessage.java

@@ -0,0 +1,23 @@
+package org.qortal.network.message;
+
+import java.nio.ByteBuffer;
+
+public class GenericUnknownMessage extends Message {
+
+    public static final long MINIMUM_PEER_VERSION = 0x0300060001L;
+
+    public GenericUnknownMessage() {
+        super(MessageType.GENERIC_UNKNOWN);
+
+        this.dataBytes = EMPTY_DATA_BYTES;
+    }
+
+    private GenericUnknownMessage(int id) {
+        super(id, MessageType.GENERIC_UNKNOWN);
+    }
+
+    public static Message fromByteBuffer(int id, ByteBuffer bytes) {
+        return new GenericUnknownMessage(id);
+    }
+
+}

src/main/java/org/qortal/network/message/MessageType.java

@@ -21,6 +21,7 @@ public enum MessageType {
     HEIGHT_V2(10, HeightV2Message::fromByteBuffer),
     PING(11, PingMessage::fromByteBuffer),
     PONG(12, PongMessage::fromByteBuffer),
+    GENERIC_UNKNOWN(13, GenericUnknownMessage::fromByteBuffer),
 
     // Requesting data
     PEERS_V2(20, PeersV2Message::fromByteBuffer),
@@ -41,12 +42,13 @@ public enum MessageType {
 
     BLOCK_SUMMARIES(70, BlockSummariesMessage::fromByteBuffer),
     GET_BLOCK_SUMMARIES(71, GetBlockSummariesMessage::fromByteBuffer),
+    BLOCK_SUMMARIES_V2(72, BlockSummariesV2Message::fromByteBuffer),
 
     ONLINE_ACCOUNTS(80, OnlineAccountsMessage::fromByteBuffer),
     GET_ONLINE_ACCOUNTS(81, GetOnlineAccountsMessage::fromByteBuffer),
     ONLINE_ACCOUNTS_V2(82, OnlineAccountsV2Message::fromByteBuffer),
     GET_ONLINE_ACCOUNTS_V2(83, GetOnlineAccountsV2Message::fromByteBuffer),
-    // ONLINE_ACCOUNTS_V3(84, OnlineAccountsV3Message::fromByteBuffer),
+    ONLINE_ACCOUNTS_V3(84, OnlineAccountsV3Message::fromByteBuffer),
     GET_ONLINE_ACCOUNTS_V3(85, GetOnlineAccountsV3Message::fromByteBuffer),
 
     ARBITRARY_DATA(90, ArbitraryDataMessage::fromByteBuffer),

src/main/java/org/qortal/network/message/OnlineAccountsV3Message.java

@@ -0,0 +1,121 @@
+package org.qortal.network.message;
+
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import org.qortal.data.network.OnlineAccountData;
+import org.qortal.transform.Transformer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * For sending online accounts info to remote peer.
+ *
+ * Same format as V2, but with added support for a mempow nonce.
+ */
+public class OnlineAccountsV3Message extends Message {
+
+	public static final long MIN_PEER_VERSION = 0x300060000L; // 3.6.0
+
+	private List<OnlineAccountData> onlineAccounts;
+
+	public OnlineAccountsV3Message(List<OnlineAccountData> onlineAccounts) {
+		super(MessageType.ONLINE_ACCOUNTS_V3);
+
+		// Shortcut in case we have no online accounts
+		if (onlineAccounts.isEmpty()) {
+			this.dataBytes = Ints.toByteArray(0);
+			this.checksumBytes = Message.generateChecksum(this.dataBytes);
+			return;
+		}
+
+		// How many of each timestamp
+		Map<Long, Integer> countByTimestamp = new HashMap<>();
+
+		for (OnlineAccountData onlineAccountData : onlineAccounts) {
+			Long timestamp = onlineAccountData.getTimestamp();
+			countByTimestamp.compute(timestamp, (k, v) -> v == null ? 1 : ++v);
+		}
+
+		// We should know exactly how many bytes to allocate now
+		int byteSize = countByTimestamp.size() * (Transformer.INT_LENGTH + Transformer.TIMESTAMP_LENGTH)
+				+ onlineAccounts.size() * (Transformer.SIGNATURE_LENGTH + Transformer.PUBLIC_KEY_LENGTH);
+
+		ByteArrayOutputStream bytes = new ByteArrayOutputStream(byteSize);
+
+		try {
+			for (long timestamp : countByTimestamp.keySet()) {
+				bytes.write(Ints.toByteArray(countByTimestamp.get(timestamp)));
+
+				bytes.write(Longs.toByteArray(timestamp));
+
+				for (OnlineAccountData onlineAccountData : onlineAccounts) {
+					if (onlineAccountData.getTimestamp() == timestamp) {
+						bytes.write(onlineAccountData.getSignature());
+						bytes.write(onlineAccountData.getPublicKey());
+
+						// Nonce is optional; use -1 as placeholder if missing
+						int nonce = onlineAccountData.getNonce() != null ? onlineAccountData.getNonce() : -1;
+						bytes.write(Ints.toByteArray(nonce));
+					}
+				}
+			}
+		} catch (IOException e) {
+			throw new AssertionError("IOException shouldn't occur with ByteArrayOutputStream");
+		}
+
+		this.dataBytes = bytes.toByteArray();
+		this.checksumBytes = Message.generateChecksum(this.dataBytes);
+	}
+
+	private OnlineAccountsV3Message(int id, List<OnlineAccountData> onlineAccounts) {
+		super(id, MessageType.ONLINE_ACCOUNTS_V3);
+
+		this.onlineAccounts = onlineAccounts;
+	}
+
+	public List<OnlineAccountData> getOnlineAccounts() {
+		return this.onlineAccounts;
+	}
+
+	public static Message fromByteBuffer(int id, ByteBuffer bytes) throws MessageException {
+		int accountCount = bytes.getInt();
+
+		List<OnlineAccountData> onlineAccounts = new ArrayList<>(accountCount);
+
+		while (accountCount > 0) {
+			long timestamp = bytes.getLong();
+
+			for (int i = 0; i < accountCount; ++i) {
+				byte[] signature = new byte[Transformer.SIGNATURE_LENGTH];
+				bytes.get(signature);
+
+				byte[] publicKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
+				bytes.get(publicKey);
+
+				// Nonce is optional - will be -1 if missing
+				Integer nonce = bytes.getInt();
+				if (nonce < 0) {
+					nonce = null;
+				}
+
+				onlineAccounts.add(new OnlineAccountData(timestamp, signature, publicKey, nonce));
+			}
+
+			if (bytes.hasRemaining()) {
+				accountCount = bytes.getInt();
+			} else {
+				// we've finished
+				accountCount = 0;
+			}
+		}
+
+		return new OnlineAccountsV3Message(id, onlineAccounts);
+	}
+
+}

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

@@ -24,7 +24,7 @@ public interface ArbitraryRepository {
 	public ArbitraryTransactionData getLatestTransaction(String name, Service service, Method method, String identifier) throws DataException;
 
 
-	public List<ArbitraryResourceInfo> getArbitraryResources(Service service, String identifier, String name, boolean defaultResource, Integer limit, Integer offset, Boolean reverse) throws DataException;
+	public List<ArbitraryResourceInfo> getArbitraryResources(Service service, String identifier, List<String> names, boolean defaultResource, Integer limit, Integer offset, Boolean reverse) throws DataException;
 
 	public List<ArbitraryResourceInfo> searchArbitraryResources(Service service, String query, boolean defaultResource, Integer limit, Integer offset, Boolean reverse) throws DataException;
 

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

@@ -14,7 +14,7 @@ public interface ChatRepository {
 	 * Expects EITHER non-null txGroupID OR non-null sender and recipient addresses.
 	 */
 	public List<ChatMessage> getMessagesMatchingCriteria(Long before, Long after,
-			Integer txGroupId, List<String> involving,
+			Integer txGroupId, byte[] reference, List<String> involving,
 			Integer limit, Integer offset, Boolean reverse) throws DataException;
 
 	public ChatMessage toChatMessage(ChatTransactionData chatTransactionData) throws DataException;

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

@@ -301,7 +301,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
 	}
 
 	@Override
-	public List<ArbitraryResourceInfo> getArbitraryResources(Service service, String identifier, String name,
+	public List<ArbitraryResourceInfo> getArbitraryResources(Service service, String identifier, List<String> names,
 															 boolean defaultResource, Integer limit, Integer offset, Boolean reverse) throws DataException {
 		StringBuilder sql = new StringBuilder(512);
 		List<Object> bindParams = new ArrayList<>();
@@ -325,9 +325,16 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
 			bindParams.add(identifier);
 		}
 
-		if (name != null) {
-			sql.append(" AND name = ?");
-			bindParams.add(name);
+		if (names != null && !names.isEmpty()) {
+			sql.append(" AND name IN (?");
+			bindParams.add(names.get(0));
+
+			for (int i = 1; i < names.size(); ++i) {
+				sql.append(", ?");
+				bindParams.add(names.get(i));
+			}
+
+			sql.append(")");
 		}
 
 		sql.append(" GROUP BY name, service, identifier ORDER BY name COLLATE SQL_TEXT_UCC_NO_PAD");

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

@@ -143,13 +143,17 @@ public class HSQLDBBlockArchiveRepository implements BlockArchiveRepository {
                 byte[] blockMinterPublicKey = resultSet.getBytes(3);
 
                 // Fetch additional info from the archive itself
-                int onlineAccountsCount = 0;
+                Integer onlineAccountsCount = null;
+                Long timestamp = null;
+                Integer transactionCount = null;
+                byte[] reference = null;
+
                 BlockData blockData = this.fromSignature(signature);
                 if (blockData != null) {
                     onlineAccountsCount = blockData.getOnlineAccountsCount();
                 }
 
-                BlockSummaryData blockSummary = new BlockSummaryData(height, signature, blockMinterPublicKey, onlineAccountsCount);
+                BlockSummaryData blockSummary = new BlockSummaryData(height, signature, blockMinterPublicKey, onlineAccountsCount, timestamp, transactionCount, reference);
                 blockSummaries.add(blockSummary);
             } while (resultSet.next());
 

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

@@ -297,7 +297,7 @@ public class HSQLDBBlockRepository implements BlockRepository {
 	@Override
 	public List<BlockSummaryData> getBlockSummariesBySigner(byte[] signerPublicKey, Integer limit, Integer offset, Boolean reverse) throws DataException {
 		StringBuilder sql = new StringBuilder(512);
-		sql.append("SELECT signature, height, Blocks.minter, online_accounts_count FROM ");
+		sql.append("SELECT signature, height, Blocks.minter, online_accounts_count, minted_when, transaction_count, Blocks.reference FROM ");
 
 		// List of minter account's public key and reward-share public keys with minter's public key
 		sql.append("(SELECT * FROM (VALUES (CAST(? AS QortalPublicKey))) UNION (SELECT reward_share_public_key FROM RewardShares WHERE minter_public_key = ?)) AS PublicKeys (public_key) ");
@@ -322,8 +322,12 @@ public class HSQLDBBlockRepository implements BlockRepository {
 				int height = resultSet.getInt(2);
 				byte[] blockMinterPublicKey = resultSet.getBytes(3);
 				int onlineAccountsCount = resultSet.getInt(4);
+				long timestamp = resultSet.getLong(5);
+				int transactionCount = resultSet.getInt(6);
+				byte[] reference = resultSet.getBytes(7);
 
-				BlockSummaryData blockSummary = new BlockSummaryData(height, signature, blockMinterPublicKey, onlineAccountsCount);
+				BlockSummaryData blockSummary = new BlockSummaryData(height, signature, blockMinterPublicKey, onlineAccountsCount,
+						timestamp, transactionCount, reference);
 				blockSummaries.add(blockSummary);
 			} while (resultSet.next());
 
@@ -355,7 +359,7 @@ public class HSQLDBBlockRepository implements BlockRepository {
 
 	@Override
 	public List<BlockSummaryData> getBlockSummaries(int firstBlockHeight, int lastBlockHeight) throws DataException {
-		String sql = "SELECT signature, height, minter, online_accounts_count, minted_when, transaction_count "
+		String sql = "SELECT signature, height, minter, online_accounts_count, minted_when, transaction_count, reference "
 				+ "FROM Blocks WHERE height BETWEEN ? AND ?";
 
 		List<BlockSummaryData> blockSummaries = new ArrayList<>();
@@ -371,9 +375,10 @@ public class HSQLDBBlockRepository implements BlockRepository {
 				int onlineAccountsCount = resultSet.getInt(4);
 				long timestamp = resultSet.getLong(5);
 				int transactionCount = resultSet.getInt(6);
+				byte[] reference = resultSet.getBytes(7);
 
 				BlockSummaryData blockSummary = new BlockSummaryData(height, signature, minterPublicKey, onlineAccountsCount,
-						timestamp, transactionCount);
+						timestamp, transactionCount, reference);
 				blockSummaries.add(blockSummary);
 			} while (resultSet.next());
 

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

@@ -23,7 +23,7 @@ public class HSQLDBChatRepository implements ChatRepository {
 	}
 
 	@Override
-	public List<ChatMessage> getMessagesMatchingCriteria(Long before, Long after, Integer txGroupId,
+	public List<ChatMessage> getMessagesMatchingCriteria(Long before, Long after, Integer txGroupId, byte[] referenceBytes,
 			List<String> involving, Integer limit, Integer offset, Boolean reverse)
 			throws DataException {
 		// Check args meet expectations
@@ -57,6 +57,11 @@ public class HSQLDBChatRepository implements ChatRepository {
 			bindParams.add(after);
 		}
 
+		if (referenceBytes != null) {
+			whereClauses.add("reference = ?");
+			bindParams.add(referenceBytes);
+		}
+
 		if (txGroupId != null) {
 			whereClauses.add("tx_group_id = " + txGroupId); // int safe to use literally
 			whereClauses.add("recipient IS NULL");

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

@@ -969,6 +969,12 @@ public class HSQLDBDatabaseUpdates {
 					stmt.execute("ALTER TABLE Blocks ALTER COLUMN online_accounts SET DATA TYPE VARBINARY(10240)");
 					break;
 
+				case 43:
+					// Pirate Chain requires storing addresses that are 78 bytes long (69 bytes when decoded), so increase
+					// from 32 to 128 to give some padding for potentially even larger addresses in the future
+					stmt.execute("ALTER TABLE TradeBotStates ALTER COLUMN receiving_account_info SET DATA TYPE VARBINARY(128)");
+					break;
+
 				default:
 					// nothing to do
 					return false;

src/main/java/org/qortal/settings/Settings.java

@@ -28,6 +28,7 @@ import org.qortal.crosschain.Litecoin.LitecoinNet;
 import org.qortal.crosschain.Dogecoin.DogecoinNet;
 import org.qortal.crosschain.Digibyte.DigibyteNet;
 import org.qortal.crosschain.Ravencoin.RavencoinNet;
+import org.qortal.crosschain.PirateChain.PirateChainNet;
 import org.qortal.utils.EnumUtils;
 
 // All properties to be converted to JSON via JAXB
@@ -183,6 +184,8 @@ public class Settings {
 
 	// Peer-to-peer related
 	private boolean isTestNet = false;
+	/** Single node testnet mode */
+	private boolean singleNodeTestnet = false;
 	/** Port number for inbound peer-to-peer connections. */
 	private Integer listenPort;
 	/** Whether to attempt to open the listen port via UPnP */
@@ -202,17 +205,20 @@ public class Settings {
 	/** Maximum number of retry attempts if a peer fails to respond with the requested data */
 	private int maxRetries = 2;
 
+	/** The number of seconds of no activity before recovery mode begins */
+	public long recoveryModeTimeout = 10 * 60 * 1000L;
+
 	/** Minimum peer version number required in order to sync with them */
-	private String minPeerVersion = "3.3.7";
+	private String minPeerVersion = "3.6.3";
 	/** Whether to allow connections with peers below minPeerVersion
 	 * If true, we won't sync with them but they can still sync with us, and will show in the peers list
 	 * If false, sync will be blocked both ways, and they will not appear in the peers list */
 	private boolean allowConnectionsWithOlderPeerVersions = true;
 
 	/** Minimum time (in seconds) that we should attempt to remain connected to a peer for */
-	private int minPeerConnectionTime = 5 * 60; // seconds
+	private int minPeerConnectionTime = 60 * 60; // seconds
 	/** Maximum time (in seconds) that we should attempt to remain connected to a peer for */
-	private int maxPeerConnectionTime = 60 * 60; // seconds
+	private int maxPeerConnectionTime = 4 * 60 * 60; // seconds
 	/** Maximum time (in seconds) that a peer should remain connected when requesting QDN data */
 	private int maxDataPeerConnectionTime = 2 * 60; // seconds
 
@@ -232,10 +238,16 @@ public class Settings {
 	private DogecoinNet dogecoinNet = DogecoinNet.MAIN;
 	private DigibyteNet digibyteNet = DigibyteNet.MAIN;
 	private RavencoinNet ravencoinNet = RavencoinNet.MAIN;
+	private PirateChainNet pirateChainNet = PirateChainNet.MAIN;
 	// Also crosschain-related:
 	/** Whether to show SysTray pop-up notifications when trade-bot entries change state */
 	private boolean tradebotSystrayEnabled = false;
 
+	/** Wallets path - used for storing encrypted wallet caches for coins that require them */
+	private String walletsPath = "wallets";
+
+	private int arrrDefaultBirthday = 2000000;
+
 	// Repository related
 	/** Queries that take longer than this are logged. (milliseconds) */
 	private Long slowQueryThreshold = null;
@@ -284,6 +296,7 @@ public class Settings {
 	private Long testNtpOffset = null;
 
 
+
 	/* Foreign chains */
 
 	/** The number of consecutive empty addresses required before treating a wallet's transaction set as complete */
@@ -478,7 +491,7 @@ public class Settings {
 
 	private void validate() {
 		// Validation goes here
-		if (this.minBlockchainPeers < 1)
+		if (this.minBlockchainPeers < 1 && !singleNodeTestnet)
 			throwValidationError("minBlockchainPeers must be at least 1");
 
 		if (this.apiKey != null && this.apiKey.trim().length() < 8)
@@ -635,6 +648,10 @@ public class Settings {
 		return this.isTestNet;
 	}
 
+	public boolean isSingleNodeTestnet() {
+		return this.singleNodeTestnet;
+	}
+
 	public int getListenPort() {
 		if (this.listenPort != null)
 			return this.listenPort;
@@ -655,6 +672,9 @@ public class Settings {
 	}
 
 	public int getMinBlockchainPeers() {
+		if (singleNodeTestnet)
+			return 0;
+
 		return this.minBlockchainPeers;
 	}
 
@@ -680,6 +700,10 @@ public class Settings {
 
 	public int getMaxRetries() { return this.maxRetries; }
 
+	public long getRecoveryModeTimeout() {
+		return recoveryModeTimeout;
+	}
+
 	public String getMinPeerVersion() { return this.minPeerVersion; }
 
 	public boolean getAllowConnectionsWithOlderPeerVersions() { return this.allowConnectionsWithOlderPeerVersions; }
@@ -716,6 +740,18 @@ public class Settings {
 		return this.ravencoinNet;
 	}
 
+	public PirateChainNet getPirateChainNet() {
+		return this.pirateChainNet;
+	}
+
+	public String getWalletsPath() {
+		return this.walletsPath;
+	}
+
+	public int getArrrDefaultBirthday() {
+		return this.arrrDefaultBirthday;
+	}
+
 	public boolean isTradebotSystrayEnabled() {
 		return this.tradebotSystrayEnabled;
 	}

src/main/java/org/qortal/transaction/AddGroupAdminTransaction.java

@@ -2,6 +2,7 @@ package org.qortal.transaction;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.qortal.account.Account;
 import org.qortal.asset.Asset;
@@ -64,15 +65,24 @@ public class AddGroupAdminTransaction extends Transaction {
 
 		Account owner = getOwner();
 		String groupOwner = this.repository.getGroupRepository().getOwner(groupId);
+		boolean groupOwnedByNullAccount = Objects.equals(groupOwner, Group.NULL_OWNER_ADDRESS);
 
-		// Check transaction's public key matches group's current owner
-		if (!owner.getAddress().equals(groupOwner))
+		// Require approval if transaction relates to a group owned by the null account
+		if (groupOwnedByNullAccount && !this.needsGroupApproval())
+			return ValidationResult.GROUP_APPROVAL_REQUIRED;
+
+		// Check transaction's public key matches group's current owner (except for groups owned by the null account)
+		if (!groupOwnedByNullAccount && !owner.getAddress().equals(groupOwner))
 			return ValidationResult.INVALID_GROUP_OWNER;
 
 		// Check address is a group member
 		if (!this.repository.getGroupRepository().memberExists(groupId, memberAddress))
 			return ValidationResult.NOT_GROUP_MEMBER;
 
+		// Check transaction creator is a group member
+		if (!this.repository.getGroupRepository().memberExists(groupId, this.getCreator().getAddress()))
+			return ValidationResult.NOT_GROUP_MEMBER;
+
 		// Check group member is not already an admin
 		if (this.repository.getGroupRepository().adminExists(groupId, memberAddress))
 			return ValidationResult.ALREADY_GROUP_ADMIN;

src/main/java/org/qortal/transaction/ChatTransaction.java

@@ -26,7 +26,7 @@ public class ChatTransaction extends Transaction {
 	private ChatTransactionData chatTransactionData;
 
 	// Other useful constants
-	public static final int MAX_DATA_SIZE = 256;
+	public static final int MAX_DATA_SIZE = 1024;
 	public static final int POW_BUFFER_SIZE = 8 * 1024 * 1024; // bytes
 	public static final int POW_DIFFICULTY_WITH_QORT = 8; // leading zero bits
 	public static final int POW_DIFFICULTY_NO_QORT = 12; // leading zero bits

src/main/java/org/qortal/transaction/RemoveGroupAdminTransaction.java

@@ -2,6 +2,7 @@ package org.qortal.transaction;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.qortal.account.Account;
 import org.qortal.asset.Asset;
@@ -65,11 +66,21 @@ public class RemoveGroupAdminTransaction extends Transaction {
 			return ValidationResult.GROUP_DOES_NOT_EXIST;
 
 		Account owner = getOwner();
+		String groupOwner = this.repository.getGroupRepository().getOwner(groupId);
+		boolean groupOwnedByNullAccount = Objects.equals(groupOwner, Group.NULL_OWNER_ADDRESS);
 
-		// Check transaction's public key matches group's current owner
-		if (!owner.getAddress().equals(groupData.getOwner()))
+		// Require approval if transaction relates to a group owned by the null account
+		if (groupOwnedByNullAccount && !this.needsGroupApproval())
+			return ValidationResult.GROUP_APPROVAL_REQUIRED;
+
+		// Check transaction's public key matches group's current owner (except for groups owned by the null account)
+		if (!groupOwnedByNullAccount && !owner.getAddress().equals(groupOwner))
 			return ValidationResult.INVALID_GROUP_OWNER;
 
+		// Check transaction creator is a group member
+		if (!this.repository.getGroupRepository().memberExists(groupId, this.getCreator().getAddress()))
+			return ValidationResult.NOT_GROUP_MEMBER;
+
 		Account admin = getAdmin();
 
 		// Check member is an admin

src/main/java/org/qortal/transaction/Transaction.java

@@ -1,13 +1,7 @@
 package org.qortal.transaction;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Predicate;
 
@@ -69,8 +63,8 @@ public abstract class Transaction {
 		AT(21, false),
 		CREATE_GROUP(22, true),
 		UPDATE_GROUP(23, true),
-		ADD_GROUP_ADMIN(24, false),
-		REMOVE_GROUP_ADMIN(25, false),
+		ADD_GROUP_ADMIN(24, true),
+		REMOVE_GROUP_ADMIN(25, true),
 		GROUP_BAN(26, false),
 		CANCEL_GROUP_BAN(27, false),
 		GROUP_KICK(28, false),
@@ -250,6 +244,7 @@ public abstract class Transaction {
 		INVALID_TIMESTAMP_SIGNATURE(95),
 		ADDRESS_BLOCKED(96),
 		NAME_BLOCKED(97),
+		GROUP_APPROVAL_REQUIRED(98),
 		INVALID_BUT_OK(999),
 		NOT_YET_RELEASED(1000);
 
@@ -760,9 +755,13 @@ public abstract class Transaction {
 			// Group no longer exists? Possibly due to blockchain orphaning undoing group creation?
 			return true; // stops tx being included in block but it will eventually expire
 
+		String groupOwner = this.repository.getGroupRepository().getOwner(txGroupId);
+		boolean groupOwnedByNullAccount = Objects.equals(groupOwner, Group.NULL_OWNER_ADDRESS);
+
 		// If transaction's creator is group admin (of group with ID txGroupId) then auto-approve
+		// This is disabled for null-owned groups, since these require approval from other admins
 		PublicKeyAccount creator = this.getCreator();
-		if (groupRepository.adminExists(txGroupId, creator.getAddress()))
+		if (!groupOwnedByNullAccount && groupRepository.adminExists(txGroupId, creator.getAddress()))
 			return false;
 
 		return true;

src/main/java/org/qortal/transform/block/BlockTransformer.java

@@ -235,7 +235,7 @@ public class BlockTransformer extends Transformer {
 			// Online accounts timestamp is only present if there are also signatures
 			onlineAccountsTimestamp = byteBuffer.getLong();
 
-			final int signaturesByteLength = onlineAccountsSignaturesCount * Transformer.SIGNATURE_LENGTH;
+			final int signaturesByteLength = (onlineAccountsSignaturesCount * Transformer.SIGNATURE_LENGTH) + (onlineAccountsCount * INT_LENGTH);
 			if (signaturesByteLength > BlockChain.getInstance().getMaxBlockSize())
 				throw new TransformationException("Byte data too long for online accounts signatures");
 
@@ -371,7 +371,7 @@ public class BlockTransformer extends Transformer {
 
 			if (onlineAccountsSignatures != null && onlineAccountsSignatures.length > 0) {
 				// Note: we write the number of signatures, not the number of bytes
-				bytes.write(Ints.toByteArray(onlineAccountsSignatures.length / Transformer.SIGNATURE_LENGTH));
+				bytes.write(Ints.toByteArray(blockData.getOnlineAccountsSignaturesCount()));
 
 				// We only write online accounts timestamp if we have signatures
 				bytes.write(Longs.toByteArray(blockData.getOnlineAccountsTimestamp()));
@@ -478,4 +478,44 @@ public class BlockTransformer extends Transformer {
 		return signatures;
 	}
 
+	public static byte[] encodeOnlineAccountNonces(List<Integer> nonces) throws TransformationException {
+		try {
+			final int length = nonces.size() * Transformer.INT_LENGTH;
+			ByteArrayOutputStream bytes = new ByteArrayOutputStream(length);
+
+			for (int i = 0; i < nonces.size(); ++i) {
+				Integer nonce = nonces.get(i);
+				if (nonce == null || nonce < 0) {
+					throw new TransformationException("Unable to serialize online account nonces due to invalid value");
+				}
+				bytes.write(Ints.toByteArray(nonce));
+			}
+
+			return bytes.toByteArray();
+
+		} catch (IOException e) {
+			throw new TransformationException("Unable to serialize online account nonces", e);
+		}
+	}
+
+	public static List<Integer> decodeOnlineAccountNonces(byte[] encodedNonces) {
+		List<Integer> nonces = new ArrayList<>();
+
+		ByteBuffer bytes = ByteBuffer.wrap(encodedNonces);
+		final int count = encodedNonces.length / Transformer.INT_LENGTH;
+
+		for (int i = 0; i < count; i++) {
+			Integer nonce = bytes.getInt();
+			nonces.add(nonce);
+		}
+
+		return nonces;
+	}
+
+	public static byte[] extract(byte[] input, int pos, int length) {
+		byte[] output = new byte[length];
+		System.arraycopy(input, pos, output, 0, length);
+		return output;
+	}
+
 }

src/main/java/org/qortal/utils/ArbitraryTransactionUtils.java

@@ -5,7 +5,10 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.qortal.arbitrary.ArbitraryDataFile;
 import org.qortal.arbitrary.ArbitraryDataFileChunk;
+import org.qortal.arbitrary.ArbitraryDataReader;
+import org.qortal.arbitrary.ArbitraryDataResource;
 import org.qortal.arbitrary.misc.Service;
+import org.qortal.data.arbitrary.ArbitraryResourceStatus;
 import org.qortal.data.transaction.ArbitraryTransactionData;
 import org.qortal.data.transaction.TransactionData;
 import org.qortal.repository.DataException;
@@ -410,4 +413,31 @@ public class ArbitraryTransactionUtils {
         return transactions.stream().skip(offset).limit(limit).collect(Collectors.toList());
     }
 
+
+    /**
+     * Lookup status of resource
+     * @param service
+     * @param name
+     * @param identifier
+     * @param build
+     * @return
+     */
+    public static ArbitraryResourceStatus getStatus(Service service, String name, String identifier, Boolean build) {
+
+        // If "build" has been specified, build the resource before returning its status
+        if (build != null && build == true) {
+            ArbitraryDataReader reader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service, null);
+            try {
+                if (!reader.isBuilding()) {
+                    reader.loadSynchronously(false);
+                }
+            } catch (Exception e) {
+                // No need to handle exception, as it will be reflected in the status
+            }
+        }
+
+        ArbitraryDataResource resource = new ArbitraryDataResource(name, ArbitraryDataFile.ResourceIdType.NAME, service, identifier);
+        return resource.getStatus(false);
+    }
+
 }

src/main/java/org/qortal/utils/BitTwiddling.java

@@ -1,5 +1,7 @@
 package org.qortal.utils;
 
+import java.nio.ByteBuffer;
+
 public class BitTwiddling {
 
 	/**
@@ -48,4 +50,25 @@ public class BitTwiddling {
 				| (bytes[start + 4] & 0xffL) << 24 | (bytes[start + 5] & 0xffL) << 16 | (bytes[start + 6] & 0xffL) << 8 | (bytes[start + 7] & 0xffL);
 	}
 
+	/** Convert little-endian bytes to long */
+	public static long longFromLEBytes(byte[] bytes, int start) {
+		return (bytes[start] & 0xffL) | (bytes[start + 1] & 0xffL) << 8 | (bytes[start + 2] & 0xffL) << 16 | (bytes[start + 3] & 0xffL) << 24
+				| (bytes[start + 4] & 0xffL) << 32 | (bytes[start + 5] & 0xffL) << 40 | (bytes[start + 6] & 0xffL) << 48 | (bytes[start + 7] & 0xffL) << 56;
+	}
+
+
+	/** Read 8-bit unsigned integer from byte buffer */
+	public static int readU8(ByteBuffer byteBuffer) {
+		byte[] sizeBytes = new byte[1];
+		byteBuffer.get(sizeBytes);
+		return sizeBytes[0] & 0xff;
+	}
+
+	/** Read 32-bit unsigned integer from byte buffer */
+	public static int readU32(ByteBuffer byteBuffer) {
+		byte[] bytes = new byte[4];
+		byteBuffer.get(bytes);
+		return BitTwiddling.intFromLEBytes(bytes, 0);
+	}
+
 }

src/main/resources/blockchain.json

@@ -39,14 +39,24 @@
 		{ "height": 2851201, "reward": 2.25 },
 		{ "height": 3110401, "reward": 2.00 }
 	],
-	"sharesByLevel": [
+	"sharesByLevelV1": [
 		{ "id": 1, "levels": [ 1, 2 ], "share": 0.05 },
 		{ "id": 2, "levels": [ 3, 4 ], "share": 0.10 },
 		{ "id": 3, "levels": [ 5, 6 ], "share": 0.15 },
 		{ "id": 4, "levels": [ 7, 8 ], "share": 0.20 },
 		{ "id": 5, "levels": [ 9, 10 ], "share": 0.25 }
 	],
-	"qoraHoldersShare": 0.20,
+	"sharesByLevelV2": [
+		{ "id": 1, "levels": [ 1, 2 ], "share": 0.06 },
+		{ "id": 2, "levels": [ 3, 4 ], "share": 0.13 },
+		{ "id": 3, "levels": [ 5, 6 ], "share": 0.19 },
+		{ "id": 4, "levels": [ 7, 8 ], "share": 0.26 },
+		{ "id": 5, "levels": [ 9, 10 ], "share": 0.32 }
+	],
+	"qoraHoldersShareByHeight": [
+		{ "height": 1, "share": 0.20 },
+		{ "height": 1010000, "share": 0.01 }
+	],
 	"qoraPerQortReward": 250,
 	"minAccountsToActivateShareBin": 30,
 	"shareBinActivationMinLevel": 7,
@@ -64,12 +74,13 @@
 		"atFindNextTransactionFix": 275000,
 		"newBlockSigHeight": 320000,
 		"shareBinFix": 399000,
+		"sharesByLevelV2Height": 1010000,
 		"rewardShareLimitTimestamp": 1657382400000,
 		"calcChainWeightTimestamp": 1620579600000,
 		"transactionV5Timestamp": 1642176000000,
 		"transactionV6Timestamp": 9999999999999,
 		"disableReferenceTimestamp": 1655222400000,
-		"aggregateSignatureTimestamp": 1656864000000
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/main/resources/i18n/SysTray_de.properties

@@ -7,6 +7,8 @@ AUTO_UPDATE = Automatisches Update
 
 BLOCK_HEIGHT = height
 
+BLOCKS_REMAINING = blocks remaining
+
 BUILD_VERSION = Build-Version
 
 CHECK_TIME_ACCURACY = Prüfe Zeitgenauigkeit

src/main/resources/i18n/SysTray_en.properties

@@ -7,6 +7,8 @@ AUTO_UPDATE = Auto Update
 
 BLOCK_HEIGHT = height
 
+BLOCKS_REMAINING = blocks remaining
+
 BUILD_VERSION = Build version
 
 CHECK_TIME_ACCURACY = Check time accuracy

src/main/resources/i18n/SysTray_es.properties

@@ -7,6 +7,8 @@ AUTO_UPDATE = Actualización automática
 
 BLOCK_HEIGHT = altura
 
+BLOCKS_REMAINING = blocks remaining
+
 BUILD_VERSION = Versión de compilación
 
 CHECK_TIME_ACCURACY = Comprobar la precisión del tiempo

src/main/resources/i18n/SysTray_fi.properties

@@ -7,6 +7,8 @@ AUTO_UPDATE = Automaattinen päivitys
 
 BLOCK_HEIGHT = korkeus
 
+BLOCKS_REMAINING = blocks remaining
+
 BUILD_VERSION = Versio
 
 CHECK_TIME_ACCURACY = Tarkista ajan tarkkuus

src/main/resources/i18n/SysTray_fr.properties

@@ -7,6 +7,8 @@ AUTO_UPDATE = Mise à jour automatique
 
 BLOCK_HEIGHT = hauteur
 
+BLOCKS_REMAINING = blocks remaining
+
 BUILD_VERSION = Numéro de version
 
 CHECK_TIME_ACCURACY = Vérifier l'heure

src/main/resources/i18n/SysTray_hu.properties

@@ -7,6 +7,8 @@ AUTO_UPDATE = Automatikus Frissítés
 
 BLOCK_HEIGHT = blokkmagasság
 
+BLOCKS_REMAINING = blocks remaining
+
 BUILD_VERSION = Verzió
 
 CHECK_TIME_ACCURACY = Óra pontosságának ellenőrzése

src/main/resources/i18n/SysTray_it.properties

@@ -7,6 +7,8 @@ AUTO_UPDATE = Aggiornamento automatico
 
 BLOCK_HEIGHT = altezza
 
+BLOCKS_REMAINING = blocks remaining
+
 BUILD_VERSION = Versione
 
 CHECK_TIME_ACCURACY = Controlla la precisione dell'ora

src/main/resources/i18n/SysTray_ko.properties

@@ -7,6 +7,8 @@ AUTO_UPDATE = 자동 업데이트
 
 BLOCK_HEIGHT = 높이
 
+BLOCKS_REMAINING = blocks remaining
+
 BUILD_VERSION = 빌드 버전
 
 CHECK_TIME_ACCURACY = 시간 정확도 점검