Bump version to 3.6.4

This should help to workaround deserialization and missing response issues.

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:{E5597539-098E-4BA6-99DF-4D22018BC0D3} 1049:{2B5E55A2-142A-4BED-B3B9-5657162282B7} 2052:{6F19171F-4743-4127-B191-AAFA3FA885D2} 2057:{A1B3108D-EC5D-47A1-AEE4-DBD956E682FB} " 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.3" 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="{F17029E8-CCC4-456D-B4AC-1854C81C46B6}" 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"/>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.qortal</groupId>
 	<artifactId>qortal</artifactId>
-	<version>3.5.0</version>
+	<version>3.6.4</version>
 	<packaging>jar</packaging>
 	<properties>
 		<skipTests>true</skipTests>

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/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

@@ -15,6 +15,7 @@ import java.io.*;
 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;
@@ -44,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;
@@ -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);

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/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/block/Block.java

@@ -89,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;
 
@@ -367,8 +368,14 @@ public class Block {
 
 		// Fetch our list of online accounts
 		List<OnlineAccountData> onlineAccounts = OnlineAccountsManager.getInstance().getOnlineAccounts(onlineAccountsTimestamp);
+
+		// If mempow is active, remove any legacy accounts that are missing a nonce
+		if (timestamp >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp()) {
+			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;
 		}
 
@@ -396,23 +403,37 @@ 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];
-			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);
+		// Aggregated, single signature
+		byte[] onlineAccountsSignatures = Qortal25519Extras.aggregateSignatures(signaturesToAggregate);
+
+		// Add nonces to the end of the online accounts signatures if mempow is active
+		if (timestamp >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp()) {
+			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);
+					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;
 			}
 		}
 
@@ -1023,12 +1044,15 @@ 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)
+		final int signaturesLength = Transformer.SIGNATURE_LENGTH;
+		final int noncesLength = onlineRewardShares.size() * Transformer.INT_LENGTH;
+
+		if (this.blockData.getTimestamp() >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp()) {
+			// We expect nonces to be appended to the online accounts signatures
+			if (this.blockData.getOnlineAccountsSignatures().length != signaturesLength + noncesLength)
 				return ValidationResult.ONLINE_ACCOUNT_SIGNATURES_MALFORMED;
 		} else {
-			if (this.blockData.getOnlineAccountsSignatures().length != onlineRewardShares.size() * Transformer.SIGNATURE_LENGTH)
+			if (this.blockData.getOnlineAccountsSignatures().length != signaturesLength)
 				return ValidationResult.ONLINE_ACCOUNT_SIGNATURES_MALFORMED;
 		}
 
@@ -1036,30 +1060,23 @@ public class Block {
 		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
+		if (this.blockData.getTimestamp() >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp()) {
+			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);
-
-			// 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
+			// 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 < onlineAccountsSignatures.size(); ++i) {
-				byte[] signature = onlineAccountsSignatures.get(i);
+			for (int i = 0; i < onlineRewardShares.size(); ++i) {
+				Integer nonce = nonces.get(i);
 				byte[] publicKey = onlineRewardShares.get(i).getRewardSharePublicKey();
 
-				OnlineAccountData onlineAccountData = new OnlineAccountData(onlineTimestamp, signature, publicKey);
+				OnlineAccountData onlineAccountData = new OnlineAccountData(onlineTimestamp, null, publicKey, nonce);
 				onlineAccounts.add(onlineAccountData);
 			}
 
@@ -1068,13 +1085,26 @@ public class Block {
 
 			// 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);
+				if (!OnlineAccountsManager.getInstance().verifyMemoryPoW(onlineAccount, this.blockData.getTimestamp()))
+					return ValidationResult.ONLINE_ACCOUNT_NONCE_INCORRECT;
 		}
 
+		// 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;
 

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

@@ -73,8 +73,7 @@ public class BlockChain {
 		calcChainWeightTimestamp,
 		transactionV5Timestamp,
 		transactionV6Timestamp,
-		disableReferenceTimestamp,
-		aggregateSignatureTimestamp;
+		disableReferenceTimestamp;
 	}
 
 	// Custom transaction fees
@@ -196,6 +195,10 @@ public class BlockChain {
 	 * featureTriggers because unit tests need to set this value via Reflection. */
 	private long onlineAccountsModulusV2Timestamp;
 
+	/** Feature trigger timestamp for online accounts mempow verification. Can't use featureTriggers
+	 * because unit tests need to set this value via Reflection. */
+	private long onlineAccountsMemoryPoWTimestamp;
+
 	/** Max reward shares by block height */
 	public static class MaxRewardSharesByTimestamp {
 		public long timestamp;
@@ -356,6 +359,10 @@ public class BlockChain {
 		return this.onlineAccountsModulusV2Timestamp;
 	}
 
+	public long getOnlineAccountsMemoryPoWTimestamp() {
+		return this.onlineAccountsMemoryPoWTimestamp;
+	}
+
 	/** Returns true if approval-needing transaction types require a txGroupId other than NO_GROUP. */
 	public boolean getRequireGroupForApproval() {
 		return this.requireGroupForApproval;
@@ -479,9 +486,6 @@ public class BlockChain {
 		return this.featureTriggers.get(FeatureTrigger.disableReferenceTimestamp.name()).longValue();
 	}
 
-	public long getAggregateSignatureTimestamp() {
-		return this.featureTriggers.get(FeatureTrigger.aggregateSignatureTimestamp.name()).longValue();
-	}
 
 	// More complex getters for aspects that change by height or timestamp
 

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;
@@ -433,11 +436,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) {
@@ -727,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 -> {
@@ -1007,8 +1010,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
@@ -1215,6 +1217,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;
@@ -1232,25 +1238,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;
@@ -1374,8 +1375,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");
@@ -1424,11 +1427,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");
 
@@ -1484,7 +1491,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");
@@ -1559,18 +1568,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();
@@ -1586,8 +1636,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");
@@ -1622,8 +1672,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");
@@ -1666,8 +1716,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");
@@ -1703,8 +1753,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");
@@ -1738,8 +1788,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");
@@ -1787,14 +1837,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;
 			}

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,20 @@ 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
+    public final int POW_BUFFER_SIZE = 1 * 1024 * 1024; // bytes
+    public int POW_DIFFICULTY = 18; // leading zero bits
 
     private final ScheduledExecutorService executor = Executors.newScheduledThreadPool(4, new NamedThreadFactory("OnlineAccounts"));
     private volatile boolean isStopping = false;
@@ -77,6 +88,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 +108,10 @@ public class OnlineAccountsManager {
         return (now / onlineTimestampModulus) * onlineTimestampModulus;
     }
 
+    public static long toOnlineAccountTimestamp(long timestamp) {
+        return (timestamp / getOnlineTimestampModulus()) * getOnlineTimestampModulus();
+    }
+
     private OnlineAccountsManager() {
     }
 
@@ -110,16 +127,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 +156,18 @@ public class OnlineAccountsManager {
             return;
 
         byte[] timestampBytes = Longs.toByteArray(onlineAccountsTimestamp);
-        final boolean useAggregateCompatibleSignature = onlineAccountsTimestamp >= BlockChain.getInstance().getAggregateSignatureTimestamp();
+        final boolean mempowActive = onlineAccountsTimestamp >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp();
 
         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 = mempowActive ? new Random().nextInt(500000) : null;
+
+            OnlineAccountData ourOnlineAccountData = new OnlineAccountData(onlineAccountsTimestamp, signature, publicKey, nonce);
             replacementAccounts.add(ourOnlineAccountData);
         }
 
@@ -168,28 +185,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.computeIfAbsent(onlineAccountData.getTimestamp(), k -> ConcurrentHashMap.newKeySet());
+                if (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 +300,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 +321,15 @@ public class OnlineAccountsManager {
             return false;
         }
 
+        // Validate mempow if feature trigger is active (or if online account's timestamp is past the trigger timestamp)
+        long memoryPoWStartTimestamp = BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp();
+        if (now >= memoryPoWStartTimestamp || onlineAccountTimestamp >= memoryPoWStartTimestamp) {
+            if (!getInstance().verifyMemoryPoW(onlineAccountData, now)) {
+                LOGGER.trace(() -> String.format("Rejecting online reward-share for account %s due to invalid PoW nonce", mintingAccount.getAddress()));
+                return false;
+            }
+        }
+
         return true;
     }
 
@@ -269,7 +351,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 +377,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 +387,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 +417,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 +428,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 +469,28 @@ public class OnlineAccountsManager {
             return;
         }
 
+        // 'next' timestamp (prioritize this as it's the most important, if mempow active)
+        final long nextOnlineAccountsTimestamp = toOnlineAccountTimestamp(now) + getOnlineTimestampModulus();
+        if (isMemoryPoWActive(now)) {
+            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 +513,72 @@ 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;
+            if (isMemoryPoWActive(NTP.getTime())) {
+                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;
+                }
+            }
+            else {
+                // Send -1 if we haven't computed a nonce due to feature trigger timestamp
+                nonce = -1;
+            }
+
+            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, NTP.getTime())) {
+                ourOnlineAccounts.add(ourOnlineAccountData);
+            }
         }
 
         this.hasOurOnlineAccounts = !ourOnlineAccounts.isEmpty();
@@ -447,23 +586,88 @@ 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 boolean isMemoryPoWActive(Long timestamp) {
+        if (timestamp >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp() || Settings.getInstance().isOnlineAccountsMemPoWEnabled()) {
+            return true;
+        }
+        return false;
+    }
+    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 {
+        if (!isMemoryPoWActive(NTP.getTime())) {
+            LOGGER.info("Mempow start timestamp not yet reached, and onlineAccountsMemPoWEnabled not enabled in settings");
+            return null;
+        }
+
+        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;
+
+        Integer nonce = MemoryPoW.compute2(bytes, POW_BUFFER_SIZE, POW_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, POW_BUFFER_SIZE, POW_DIFFICULTY, minutes, seconds, hashRate));
+
+        return nonce;
+    }
+
+    public boolean verifyMemoryPoW(OnlineAccountData onlineAccountData, Long timestamp) {
+        long memoryPoWStartTimestamp = BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp();
+        if (timestamp < memoryPoWStartTimestamp && onlineAccountData.getTimestamp() < memoryPoWStartTimestamp) {
+            // Not active yet, so treat it as valid
+            return true;
+        }
+
+        // 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, POW_BUFFER_SIZE, POW_DIFFICULTY, nonce);
+    }
+
+
     /**
      * Returns whether online accounts manager has any online accounts with timestamp recent enough to be considered currently online.
      */
@@ -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

@@ -4,6 +4,7 @@ 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;
@@ -99,14 +100,19 @@ public class PirateChainWalletController extends Thread {
                 LOGGER.debug("Syncing Pirate Chain wallet...");
                 String response = LiteWalletJni.execute("sync", "");
                 LOGGER.debug("sync response: {}", response);
-                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);
+                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
@@ -238,10 +244,10 @@ public class PirateChainWalletController extends Thread {
         if (osName.equals("Mac OS X") && osArchitecture.equals("x86_64")) {
             return "librust-macos-x86_64.dylib";
         }
-        else if (osName.equals("Linux") && osArchitecture.equals("aarch64")) {
+        else if ((osName.equals("Linux") || osName.equals("FreeBSD")) && osArchitecture.equals("aarch64")) {
             return "librust-linux-aarch64.so";
         }
-        else if (osName.equals("Linux") && osArchitecture.equals("amd64")) {
+        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")) {

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,6 +53,9 @@ 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?
 
+	/** Maximum number of consecutive failed sync attempts before marking peer as misbehaved */
+	private static final int MAX_CONSECUTIVE_FAILED_SYNC_ATTEMPTS = 3;
+
 	private static final long RECOVERY_MODE_TIMEOUT = 10 * 60 * 1000L; // ms
 
 
@@ -282,7 +284,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 +314,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 +322,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 +344,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 +372,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));
 			}
@@ -513,13 +515,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 +639,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 +729,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 +828,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 +936,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 +1249,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 +1323,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;
@@ -1553,12 +1563,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 +1594,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/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/DogecoinACCTv2TradeBot.java

@@ -1,884 +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 DogecoinACCTv2TradeBot implements AcctTradeBot {
-
-	private static final Logger LOGGER = LogManager.getLogger(DogecoinACCTv2TradeBot.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 DogecoinACCTv2TradeBot 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() {
-	}
-
-	public static synchronized DogecoinACCTv2TradeBot getInstance() {
-		if (instance == null)
-			instance = new DogecoinACCTv2TradeBot();
-
-		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 DOGE.
-	 * <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 Dogecoin) 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>QORT amount on offer by Bob</li>
-	 * 	<li>DOGE 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 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);
-		}
-		if (dogecoinReceivingAddress.getOutputScriptType() != ScriptType.P2PKH)
-			throw new DataException("Unsupported Dogecoin receiving address: " + tradeBotCreateRequest.receivingAddress);
-
-		byte[] dogecoinReceivingAccountInfo = dogecoinReceivingAddress.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/DOGE ACCT";
-		String description = "QORT/DOGE cross-chain trade";
-		String aTType = "ACCT";
-		String tags = "ACCT QORT DOGE";
-		byte[] creationBytes = DogecoinACCTv2.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, DogecoinACCTv2.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(),
-				tradeForeignPublicKey, tradeForeignPublicKeyHash,
-				tradeBotCreateRequest.foreignAmount, null, null, null, dogecoinReceivingAccountInfo);
-
-		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 DOGE 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>.
-	 * <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,
-	 * 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 Dogecoin main-net)
-	 * or 'tprv' for (Dogecoin 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'.
-	 * <p>
-	 * If the Dogecoin 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
-	 * @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, DogecoinACCTv2.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(),
-				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 = Dogecoin.getInstance().getP2shFee(now);
-		} catch (ForeignBlockchainException e) {
-			LOGGER.debug("Couldn't estimate Dogecoin 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 = Dogecoin.getInstance().deriveP2shAddress(redeemScriptBytes);
-
-		// 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?");
-			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());
-		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:
-				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 = DogecoinACCTv2.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 Dogecoin 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;
-		}
-
-		Dogecoin dogecoin = Dogecoin.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 Dogecoin pubkeyhash and lockTime-A
-			byte[] messageData = messageTransactionData.getData();
-			DogecoinACCTv2.OfferMessageData offerMessageData = DogecoinACCTv2.extractOfferMessageData(messageData);
-			if (offerMessageData == null)
-				continue;
-
-			byte[] aliceForeignPublicKeyHash = offerMessageData.partnerDogecoinPKH;
-			byte[] hashOfSecretA = offerMessageData.hashOfSecretA;
-			int lockTimeA = (int) offerMessageData.lockTimeA;
-			long messageTimestamp = messageTransactionData.getTimestamp();
-			int refundTimeout = DogecoinACCTv2.calcRefundTimeout(messageTimestamp, lockTimeA);
-
-			// Determine P2SH-A address and confirm funded
-			byte[] redeemScriptA = BitcoinyHTLC.buildScript(aliceForeignPublicKeyHash, lockTimeA, tradeBotData.getTradeForeignPublicKeyHash(), hashOfSecretA);
-			String p2shAddressA = dogecoin.deriveP2shAddress(redeemScriptA);
-
-			long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-			long p2shFee = Dogecoin.getInstance().getP2shFee(feeTimestamp);
-			final long minimumAmountA = tradeBotData.getForeignAmount() + p2shFee;
-
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(dogecoin.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 = DogecoinACCTv2.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 DOGE 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;
-
-		Dogecoin dogecoin = Dogecoin.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);
-
-			long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-			long p2shFee = Dogecoin.getInstance().getP2shFee(feeTimestamp);
-			long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(dogecoin.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 = DogecoinACCTv2.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 = DogecoinACCTv2.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 DOGE 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.
-	 * <p>
-	 * (This could potentially be 'improved' to send DOGE 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 DOGE
-			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);
-		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
-
-		Dogecoin dogecoin = Dogecoin.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);
-
-		// Fee for redeem/refund is subtracted from P2SH-A balance.
-		long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-		long p2shFee = Dogecoin.getInstance().getP2shFee(feeTimestamp);
-		long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-		BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(dogecoin.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 = dogecoin.getUnspentOutputs(p2shAddressA);
-
-				Transaction p2shRedeemTransaction = BitcoinyHTLC.buildRedeemTransaction(dogecoin.getNetworkParameters(), redeemAmount, redeemKey,
-						fundingOutputs, redeemScriptA, secretA, receivingAccountInfo);
-
-				dogecoin.broadcastTransaction(p2shRedeemTransaction);
-				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));
-	}
-
-	/**
-	 * 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;
-
-		Dogecoin dogecoin = Dogecoin.getInstance();
-
-		// We can't refund P2SH-A until median block time has passed lockTime-A (see BIP113)
-		int medianBlockTime = dogecoin.getMedianBlockTime();
-		if (medianBlockTime <= lockTimeA)
-			return;
-
-		byte[] redeemScriptA = BitcoinyHTLC.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTimeA, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
-		String p2shAddressA = dogecoin.deriveP2shAddress(redeemScriptA);
-
-		// Fee for redeem/refund is subtracted from P2SH-A balance.
-		long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
-		long p2shFee = Dogecoin.getInstance().getP2shFee(feeTimestamp);
-		long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-		BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(dogecoin.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 = dogecoin.getUnspentOutputs(p2shAddressA);
-
-				// 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);
-				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/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/PirateChainACCTv3TradeBot.java

@@ -523,7 +523,7 @@ public class PirateChainACCTv3TradeBot implements AcctTradeBot {
 			long p2shFee = PirateChain.getInstance().getP2shFee(feeTimestamp);
 			final long minimumAmountA = tradeBotData.getForeignAmount() + p2shFee;
 
-			PirateChainHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
+			BitcoinyHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
 
 			switch (htlcStatusA) {
 				case UNFUNDED:
@@ -613,7 +613,7 @@ public class PirateChainACCTv3TradeBot implements AcctTradeBot {
 			long p2shFee = PirateChain.getInstance().getP2shFee(feeTimestamp);
 			long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
 
-			PirateChainHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
+			BitcoinyHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
 
 			switch (htlcStatusA) {
 				case UNFUNDED:
@@ -751,7 +751,7 @@ public class PirateChainACCTv3TradeBot implements AcctTradeBot {
 		long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
 		String receivingAddress = Bech32.encode("zs", receivingAccountInfo);
 
-		PirateChainHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
+		BitcoinyHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
 
 		switch (htlcStatusA) {
 			case UNFUNDED:
@@ -822,7 +822,7 @@ public class PirateChainACCTv3TradeBot implements AcctTradeBot {
 		long feeTimestamp = calcFeeTimestamp(lockTimeA, crossChainTradeData.tradeTimeout);
 		long p2shFee = PirateChain.getInstance().getP2shFee(feeTimestamp);
 		long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-		PirateChainHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
+		BitcoinyHTLC.Status htlcStatusA = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmountA);
 
 		switch (htlcStatusA) {
 			case UNFUNDED:

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

@@ -96,10 +96,8 @@ 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);
@@ -470,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
 		);
@@ -639,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/DogecoinACCTv2.java

@@ -1,861 +0,0 @@
-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;
-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 Dogecoin & 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 Dogecoin & Qortal 'trade' keys</li>
- * 			<li>Alice funds Dogecoin 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>
- * 				</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 Dogecoin 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 Dogecoin trade key and secret-A</li>
- * 			<li>P2SH-A DOGE funds end up at Dogecoin address determined by redeem transaction output(s)</li>
- * 		</ul>
- * </li>
- * </ul>
- */
-public class DogecoinACCTv2 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 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[] partnerDogecoinPKH;
-		public byte[] hashOfSecretA;
-		public long lockTimeA;
-	}
-	public static final int OFFER_MESSAGE_LENGTH = 20 /*partnerDogecoinPKH*/ + 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)*/
-			+ 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 DogecoinACCTv2() {
-	}
-
-	public static synchronized DogecoinACCTv2 getInstance() {
-		if (instance == null)
-			instance = new DogecoinACCTv2();
-
-		return instance;
-	}
-
-	@Override
-	public byte[] getCodeBytesHash() {
-		return CODE_BYTES_HASH;
-	}
-
-	@Override
-	public int getModeByteOffset() {
-		return MODE_BYTE_OFFSET;
-	}
-
-	@Override
-	public ForeignBlockchain getBlockchain() {
-		return Dogecoin.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 dogecoinPublicKeyHash 20-byte HASH160 of creator's trade Dogecoin 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 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");
-
-		// 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 addrDogecoinPublicKeyHash = addrCounter;
-		addrCounter += 4;
-
-		final int addrQortAmount = addrCounter++;
-		final int addrDogecoinAmount = 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 addrTradeMessagePartnerDogecoinPKHOffset = addrCounter++;
-		final int addrPartnerDogecoinPKHPointer = 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 addrPartnerDogecoinPKH = 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));
-
-		// Dogecoin public key hash
-		assert dataByteBuffer.position() == addrDogecoinPublicKeyHash * MachineState.VALUE_SIZE : "addrDogecoinPublicKeyHash incorrect";
-		dataByteBuffer.put(Bytes.ensureCapacity(dogecoinPublicKeyHash, 32, 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);
-
-		// 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 Dogecoin PKH
-		assert dataByteBuffer.position() == addrTradeMessagePartnerDogecoinPKHOffset * MachineState.VALUE_SIZE : "addrTradeMessagePartnerDogecoinPKHOffset 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 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 */
-
-				/* 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));
-
-				// 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 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));
-
-				// 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 DOGE-QORT ACCT?", e);
-			}
-		}
-
-		codeByteBuffer.flip();
-
-		byte[] codeBytes = new byte[codeByteBuffer.limit()];
-		codeByteBuffer.get(codeBytes);
-
-		assert Arrays.equals(Crypto.digest(codeBytes), DogecoinACCTv2.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.DOGECOIN.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 Dogecoin/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 DOGE 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 Dogecoin PKH
-		dataByteBuffer.position(dataByteBuffer.position() + 8);
-
-		// Skip pointer to partner's Dogecoin 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 Dogecoin PKH
-		byte[] partnerDogecoinPKH = new byte[20];
-		dataByteBuffer.get(partnerDogecoinPKH);
-		dataByteBuffer.position(dataByteBuffer.position() + 32 - partnerDogecoinPKH.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 = partnerDogecoinPKH;
-			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.partnerDogecoinPKH = 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/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

@@ -4,6 +4,12 @@ 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;
@@ -352,6 +358,12 @@ public class PirateChain extends Bitcoiny {
 		}
 	}
 
+	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);

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

@@ -3,25 +3,17 @@ package org.qortal.crosschain;
 import com.google.common.hash.HashCode;
 import com.google.common.primitives.Bytes;
 import org.bitcoinj.core.*;
-import org.bitcoinj.core.Transaction.SigHash;
-import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.script.Script;
-import org.bitcoinj.script.ScriptBuilder;
 import org.bitcoinj.script.ScriptChunk;
-import org.bitcoinj.script.ScriptOpCodes;
 import org.qortal.crypto.Crypto;
 import org.qortal.utils.Base58;
 import org.qortal.utils.BitTwiddling;
 
 import java.util.*;
-import java.util.function.Function;
+import static org.qortal.crosschain.BitcoinyHTLC.Status;
 
 public class PirateChainHTLC {
 
-	public enum Status {
-		UNFUNDED, FUNDING_IN_PROGRESS, FUNDED, REDEEM_IN_PROGRESS, REDEEMED, REFUND_IN_PROGRESS, REFUNDED
-	}
-
 	public static final int SECRET_LENGTH = 32;
 	public static final int MIN_LOCKTIME = 1500000000;
 

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

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;

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/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/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) {

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;
@@ -148,7 +148,7 @@ 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
@@ -353,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() {
@@ -904,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/settings/Settings.java

@@ -204,7 +204,7 @@ public class Settings {
 	private int maxRetries = 2;
 
 	/** 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 */
@@ -290,6 +290,11 @@ public class Settings {
 	/** Additional offset added to values returned by NTP.getTime() */
 	private Long testNtpOffset = null;
 
+	// Online accounts
+
+	/** Whether to opt-in to mempow computations for online accounts, ahead of general release */
+	private boolean onlineAccountsMemPoWEnabled = false;
+
 
 	/* Foreign chains */
 
@@ -795,6 +800,10 @@ public class Settings {
 		return this.testNtpOffset;
 	}
 
+	public boolean isOnlineAccountsMemPoWEnabled() {
+		return this.onlineAccountsMemPoWEnabled;
+	}
+
 	public long getRepositoryBackupInterval() {
 		return this.repositoryBackupInterval;
 	}

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/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 = getOnlineAccountSignaturesLength(onlineAccountsSignaturesCount, onlineAccountsCount, timestamp);
 			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,54 @@ 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 int getOnlineAccountSignaturesLength(int onlineAccountsSignaturesCount, int onlineAccountCount, long blockTimestamp) {
+		if (blockTimestamp >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp()) {
+			// Once mempow is active, we expect the online account signatures to be appended with the nonce values
+			return (onlineAccountsSignaturesCount * Transformer.SIGNATURE_LENGTH) + (onlineAccountCount * INT_LENGTH);
+		}
+		else {
+			// Before mempow, only the online account signatures were included (which will likely be a single signature)
+			return onlineAccountsSignaturesCount * Transformer.SIGNATURE_LENGTH;
+		}
+	}
+
+	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/resources/blockchain.json

@@ -24,6 +24,7 @@
 	"onlineAccountSignaturesMinLifetime": 43200000,
 	"onlineAccountSignaturesMaxLifetime": 86400000,
 	"onlineAccountsModulusV2Timestamp": 1659801600000,
+	"onlineAccountsMemoryPoWTimestamp": 1666454400000,
 	"rewardsByHeight": [
 		{ "height": 1, "reward": 5.00 },
 		{ "height": 259201, "reward": 4.75 },
@@ -55,7 +56,7 @@
 	],
 	"qoraHoldersShareByHeight": [
 		{ "height": 1, "share": 0.20 },
-		{ "height": 9999999, "share": 0.01 }
+		{ "height": 1010000, "share": 0.01 }
 	],
 	"qoraPerQortReward": 250,
 	"minAccountsToActivateShareBin": 30,
@@ -74,13 +75,12 @@
 		"atFindNextTransactionFix": 275000,
 		"newBlockSigHeight": 320000,
 		"shareBinFix": 399000,
-		"sharesByLevelV2Height": 9999999,
+		"sharesByLevelV2Height": 1010000,
 		"rewardShareLimitTimestamp": 1657382400000,
 		"calcChainWeightTimestamp": 1620579600000,
 		"transactionV5Timestamp": 1642176000000,
 		"transactionV6Timestamp": 9999999999999,
-		"disableReferenceTimestamp": 1655222400000,
-		"aggregateSignatureTimestamp": 1656864000000
+		"disableReferenceTimestamp": 1655222400000
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/java/org/qortal/test/BlockArchiveTests.java

@@ -361,7 +361,7 @@ public class BlockArchiveTests extends Common {
 			assertEquals(0, repository.getBlockArchiveRepository().getBlockArchiveHeight());
 
 			// Write blocks 2-900 to the archive (using bulk method)
-			int fileSizeTarget = 425000; // Pre-calculated size of 900 blocks
+			int fileSizeTarget = 428600; // Pre-calculated size of 900 blocks
 			assertTrue(HSQLDBDatabaseArchiving.buildBlockArchive(repository, fileSizeTarget));
 
 			// Ensure the block archive height has increased
@@ -455,7 +455,7 @@ public class BlockArchiveTests extends Common {
 			assertEquals(0, repository.getBlockArchiveRepository().getBlockArchiveHeight());
 
 			// Write blocks 2-900 to the archive (using bulk method)
-			int fileSizeTarget = 42000; // Pre-calculated size of approx 90 blocks
+			int fileSizeTarget = 42360; // Pre-calculated size of approx 90 blocks
 			assertTrue(HSQLDBDatabaseArchiving.buildBlockArchive(repository, fileSizeTarget));
 
 			// Ensure 10 archive files have been created

src/test/java/org/qortal/test/SchnorrTests.java

@@ -8,6 +8,7 @@ import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
 import org.junit.Test;
 import org.qortal.crypto.Qortal25519Extras;
 import org.qortal.data.network.OnlineAccountData;
+import org.qortal.test.common.AccountUtils;
 import org.qortal.transform.Transformer;
 
 import java.math.BigInteger;
@@ -28,8 +29,6 @@ public class SchnorrTests extends Qortal25519Extras {
         Security.insertProviderAt(new BouncyCastleJsseProvider(), 1);
     }
 
-    private static final SecureRandom SECURE_RANDOM = new SecureRandom();
-
     @Test
     public void testConversion() {
         // Scalar form
@@ -130,7 +129,7 @@ public class SchnorrTests extends Qortal25519Extras {
 
     @Test
     public void testSimpleAggregate() {
-        List<OnlineAccountData> onlineAccounts = generateOnlineAccounts(1);
+        List<OnlineAccountData> onlineAccounts = AccountUtils.generateOnlineAccounts(1);
 
         byte[] aggregatePublicKey = aggregatePublicKeys(onlineAccounts.stream().map(OnlineAccountData::getPublicKey).collect(Collectors.toUnmodifiableList()));
         System.out.printf("Aggregate public key: %s%n", HashCode.fromBytes(aggregatePublicKey));
@@ -151,7 +150,7 @@ public class SchnorrTests extends Qortal25519Extras {
 
     @Test
     public void testMultipleAggregate() {
-        List<OnlineAccountData> onlineAccounts = generateOnlineAccounts(5000);
+        List<OnlineAccountData> onlineAccounts = AccountUtils.generateOnlineAccounts(5000);
 
         byte[] aggregatePublicKey = aggregatePublicKeys(onlineAccounts.stream().map(OnlineAccountData::getPublicKey).collect(Collectors.toUnmodifiableList()));
         System.out.printf("Aggregate public key: %s%n", HashCode.fromBytes(aggregatePublicKey));
@@ -166,25 +165,4 @@ public class SchnorrTests extends Qortal25519Extras {
         byte[] timestampBytes = Longs.toByteArray(timestamp);
         assertTrue(verifyAggregated(aggregatePublicKey, aggregateSignature, timestampBytes));
     }
-
-    private List<OnlineAccountData> generateOnlineAccounts(int numAccounts) {
-        List<OnlineAccountData> onlineAccounts = new ArrayList<>();
-
-        long timestamp = System.currentTimeMillis();
-        byte[] timestampBytes = Longs.toByteArray(timestamp);
-
-        for (int a = 0; a < numAccounts; ++a) {
-            byte[] privateKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
-            SECURE_RANDOM.nextBytes(privateKey);
-
-            byte[] publicKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
-            Qortal25519Extras.generatePublicKey(privateKey, 0, publicKey, 0);
-
-            byte[] signature = signForAggregation(privateKey, timestampBytes);
-
-            onlineAccounts.add(new OnlineAccountData(timestamp, signature, publicKey));
-        }
-
-        return onlineAccounts;
-    }
 }

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

@@ -1,12 +1,17 @@
 package org.qortal.test.common;
 
 import static org.junit.Assert.assertEquals;
+import static org.qortal.crypto.Qortal25519Extras.signForAggregation;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.security.SecureRandom;
+import java.util.*;
 
+import com.google.common.primitives.Longs;
 import org.qortal.account.PrivateKeyAccount;
+import org.qortal.block.BlockChain;
 import org.qortal.crypto.Crypto;
+import org.qortal.crypto.Qortal25519Extras;
+import org.qortal.data.network.OnlineAccountData;
 import org.qortal.data.transaction.BaseTransactionData;
 import org.qortal.data.transaction.PaymentTransactionData;
 import org.qortal.data.transaction.RewardShareTransactionData;
@@ -14,6 +19,7 @@ import org.qortal.data.transaction.TransactionData;
 import org.qortal.group.Group;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
+import org.qortal.transform.Transformer;
 import org.qortal.utils.Amounts;
 
 public class AccountUtils {
@@ -21,6 +27,8 @@ public class AccountUtils {
 	public static final int txGroupId = Group.NO_GROUP;
 	public static final long fee = 1L * Amounts.MULTIPLIER;
 
+	private static final SecureRandom SECURE_RANDOM = new SecureRandom();
+
 	public static void pay(Repository repository, String testSenderName, String testRecipientName, long amount) throws DataException {
 		PrivateKeyAccount sendingAccount = Common.getTestAccount(repository, testSenderName);
 		PrivateKeyAccount recipientAccount = Common.getTestAccount(repository, testRecipientName);
@@ -109,4 +117,30 @@ public class AccountUtils {
 		assertEquals(String.format("%s's %s [%d] balance incorrect", accountName, assetName, assetId), expectedBalance, actualBalance);
 	}
 
+
+	public static List<OnlineAccountData> generateOnlineAccounts(int numAccounts) {
+		List<OnlineAccountData> onlineAccounts = new ArrayList<>();
+
+		long timestamp = System.currentTimeMillis();
+		byte[] timestampBytes = Longs.toByteArray(timestamp);
+
+		final boolean mempowActive = timestamp >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp();
+
+		for (int a = 0; a < numAccounts; ++a) {
+			byte[] privateKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
+			SECURE_RANDOM.nextBytes(privateKey);
+
+			byte[] publicKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
+			Qortal25519Extras.generatePublicKey(privateKey, 0, publicKey, 0);
+
+			byte[] signature = signForAggregation(privateKey, timestampBytes);
+
+			Integer nonce = mempowActive ? new Random().nextInt(500000) : null;
+
+			onlineAccounts.add(new OnlineAccountData(timestamp, signature, publicKey, nonce));
+		}
+
+		return onlineAccounts;
+	}
+
 }

src/test/java/org/qortal/test/crosschain/PirateChainTests.java

@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.*;
-import static org.qortal.crosschain.PirateChainHTLC.Status.*;
+import static org.qortal.crosschain.BitcoinyHTLC.Status.*;
 
 public class PirateChainTests extends Common {
 
@@ -121,7 +121,7 @@ public class PirateChainTests extends Common {
 		String p2shAddress = "ba6Q5HWrWtmfU2WZqQbrFdRYsafA45cUAt";
 		long p2shFee = 10000;
 		final long minimumAmount = 10000 + p2shFee;
-		PirateChainHTLC.Status htlcStatus = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmount);
+		BitcoinyHTLC.Status htlcStatus = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmount);
 		assertEquals(FUNDED, htlcStatus);
 	}
 
@@ -130,7 +130,7 @@ public class PirateChainTests extends Common {
 		String p2shAddress = "bYZrzSSgGp8aEGvihukoMGU8sXYrx19Wka";
 		long p2shFee = 10000;
 		final long minimumAmount = 10000 + p2shFee;
-		PirateChainHTLC.Status htlcStatus = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmount);
+		BitcoinyHTLC.Status htlcStatus = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmount);
 		assertEquals(REDEEMED, htlcStatus);
 	}
 
@@ -139,7 +139,7 @@ public class PirateChainTests extends Common {
 		String p2shAddress = "bE49izfVxz8odhu8c2BcUaVFUnt7NLFRgv";
 		long p2shFee = 10000;
 		final long minimumAmount = 10000 + p2shFee;
-		PirateChainHTLC.Status htlcStatus = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmount);
+		BitcoinyHTLC.Status htlcStatus = PirateChainHTLC.determineHtlcStatus(pirateChain.getBlockchainProvider(), p2shAddress, minimumAmount);
 		assertEquals(REFUNDED, htlcStatus);
 	}
 

src/test/java/org/qortal/test/network/OnlineAccountsTests.java

@@ -1,26 +1,29 @@
 package org.qortal.test.network;
 
+import com.google.common.primitives.Ints;
+import io.druid.extendedset.intset.ConciseSet;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.qortal.account.PrivateKeyAccount;
 import org.qortal.block.Block;
 import org.qortal.block.BlockChain;
 import org.qortal.controller.BlockMinter;
-import org.qortal.controller.OnlineAccountsManager;
 import org.qortal.data.network.OnlineAccountData;
 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.test.common.AccountUtils;
 import org.qortal.test.common.Common;
 import org.qortal.transform.Transformer;
 import org.qortal.utils.Base58;
 import org.qortal.utils.NTP;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.Security;
@@ -43,7 +46,7 @@ public class OnlineAccountsTests extends Common {
 
     @Before
     public void beforeTest() throws DataException, IOException {
-        Common.useSettingsAndDb("test-settings-v2-no-sig-agg.json", false);
+        Common.useSettingsAndDb("test-settings-v2.json", false);
         NTP.setFixedOffset(Settings.getInstance().getTestNtpOffset());
     }
 
@@ -168,38 +171,29 @@ public class OnlineAccountsTests extends Common {
     }
 
     @Test
-    public void testOnlineAccountsModulusV2() throws IllegalAccessException, DataException {
-        try (final Repository repository = RepositoryManager.getRepository()) {
+    @Ignore(value = "For informational use")
+    public void testOnlineAccountNonceCompression() throws IOException {
+        List<OnlineAccountData> onlineAccounts = AccountUtils.generateOnlineAccounts(5000);
 
-            // Set feature trigger timestamp to 0 so that it is active
-            FieldUtils.writeField(BlockChain.getInstance(), "onlineAccountsModulusV2Timestamp", 0L, true);
-
-            List<String> onlineAccountSignatures = new ArrayList<>();
-            long fakeNTPOffset = 0L;
-
-            // Mint a block and store its timestamp
-            Block block = BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
-            long lastBlockTimestamp = block.getBlockData().getTimestamp();
-
-            // Mint some blocks and keep track of the different online account signatures
-            for (int i = 0; i < 30; i++) {
-                block = BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
-
-                // Increase NTP fixed offset by the block time, to simulate time passing
-                long blockTimeDelta = block.getBlockData().getTimestamp() - lastBlockTimestamp;
-                lastBlockTimestamp = block.getBlockData().getTimestamp();
-                fakeNTPOffset += blockTimeDelta;
-                NTP.setFixedOffset(fakeNTPOffset);
-
-                String lastOnlineAccountSignatures58 = Base58.encode(block.getBlockData().getOnlineAccountsSignatures());
-                if (!onlineAccountSignatures.contains(lastOnlineAccountSignatures58)) {
-                    onlineAccountSignatures.add(lastOnlineAccountSignatures58);
-                }
-            }
-
-            // We expect 1-3 unique signatures over 30 blocks
-            System.out.println(String.format("onlineAccountSignatures count: %d", onlineAccountSignatures.size()));
-            assertTrue(onlineAccountSignatures.size() >= 1 && onlineAccountSignatures.size() <= 3);
+        // Build array of nonce values
+        List<Integer> accountNonces = new ArrayList<>();
+        for (OnlineAccountData onlineAccountData : onlineAccounts) {
+            accountNonces.add(onlineAccountData.getNonce());
         }
+
+        // Write nonces into ConciseSet
+        ConciseSet nonceSet = new ConciseSet();
+        nonceSet = nonceSet.convert(accountNonces);
+        byte[] conciseEncodedNonces = nonceSet.toByteBuffer().array();
+
+        // Also write to regular byte array of ints, for comparison
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        for (Integer nonce : accountNonces) {
+            bytes.write(Ints.toByteArray(nonce));
+        }
+        byte[] standardEncodedNonces = bytes.toByteArray();
+
+        System.out.println(String.format("Standard: %d", standardEncodedNonces.length));
+        System.out.println(String.format("Concise: %d", conciseEncodedNonces.length));
     }
 }

src/test/resources/test-chain-v2-block-timestamps.json

@@ -69,8 +69,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 9999999999999,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-disable-reference.json

@@ -72,8 +72,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 0,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-founder-rewards.json

@@ -73,8 +73,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-leftover-reward.json

@@ -73,8 +73,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-minting.json

@@ -73,8 +73,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-no-sig-agg.json

@@ -1,95 +0,0 @@
-{
-	"isTestChain": true,
-	"blockTimestampMargin": 500,
-	"transactionExpiryPeriod": 86400000,
-	"maxBlockSize": 2097152,
-	"maxBytesPerUnitFee": 1024,
-	"unitFee": "0.1",
-	"nameRegistrationUnitFees": [
-		{ "timestamp": 1645372800000, "fee": "5" }
-	],
-	"requireGroupForApproval": false,
-	"minAccountLevelToRewardShare": 5,
-	"maxRewardSharesPerMintingAccount": 20,
-	"founderEffectiveMintingLevel": 10,
-	"onlineAccountSignaturesMinLifetime": 3600000,
-	"onlineAccountSignaturesMaxLifetime": 86400000,
-	"onlineAccountsModulusV2Timestamp": 9999999999999,
-	"rewardsByHeight": [
-		{ "height": 1, "reward": 100 },
-		{ "height": 11, "reward": 10 },
-		{ "height": 21, "reward": 1 }
-	],
-	"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 }
-	],
-	"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 }
-	],
-	"qoraHoldersShare": 0.20,
-	"qoraPerQortReward": 250,
-	"blocksNeededByLevel": [ 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 ],
-	"blockTimingsByHeight": [
-		{ "height": 1, "target": 60000, "deviation": 30000, "power": 0.2 }
-	],
-	"ciyamAtSettings": {
-		"feePerStep": "0.0001",
-		"maxStepsPerRound": 500,
-		"stepsPerFunctionCall": 10,
-		"minutesPerBlock": 1
-	},
-	"featureTriggers": {
-		"messageHeight": 0,
-		"atHeight": 0,
-		"assetsTimestamp": 0,
-		"votingTimestamp": 0,
-		"arbitraryTimestamp": 0,
-		"powfixTimestamp": 0,
-		"qortalTimestamp": 0,
-		"newAssetPricingTimestamp": 0,
-		"groupApprovalTimestamp": 0,
-		"atFindNextTransactionFix": 0,
-		"newBlockSigHeight": 999999,
-		"shareBinFix": 999999,
-		"sharesByLevelV2Height": 999999,
-		"rewardShareLimitTimestamp": 9999999999999,
-		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0,
-		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 9999999999999
-	},
-	"genesisInfo": {
-		"version": 4,
-		"timestamp": 0,
-		"transactions": [
-			{ "type": "ISSUE_ASSET", "assetName": "QORT", "description": "QORT native coin", "data": "", "quantity": 0, "isDivisible": true, "fee": 0 },
-			{ "type": "ISSUE_ASSET", "assetName": "Legacy-QORA", "description": "Representative legacy QORA", "quantity": 0, "isDivisible": true, "data": "{}", "isUnspendable": true },
-			{ "type": "ISSUE_ASSET", "assetName": "QORT-from-QORA", "description": "QORT gained from holding legacy QORA", "quantity": 0, "isDivisible": true, "data": "{}", "isUnspendable": true },
-
-			{ "type": "GENESIS", "recipient": "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v", "amount": "1000000000" },
-			{ "type": "GENESIS", "recipient": "QixPbJUwsaHsVEofJdozU9zgVqkK6aYhrK", "amount": "1000000" },
-			{ "type": "GENESIS", "recipient": "QaUpHNhT3Ygx6avRiKobuLdusppR5biXjL", "amount": "1000000" },
-			{ "type": "GENESIS", "recipient": "Qci5m9k4rcwe4ruKrZZQKka4FzUUMut3er", "amount": "1000000" },
-
-			{ "type": "CREATE_GROUP", "creatorPublicKey": "2tiMr5LTpaWCgbRvkPK8TFd7k63DyHJMMFFsz9uBf1ZP", "groupName": "dev-group", "description": "developer group", "isOpen": false, "approvalThreshold": "PCT100", "minimumBlockDelay": 0, "maximumBlockDelay": 1440 },
-
-			{ "type": "ISSUE_ASSET", "issuerPublicKey": "2tiMr5LTpaWCgbRvkPK8TFd7k63DyHJMMFFsz9uBf1ZP", "assetName": "TEST", "description": "test asset", "data": "", "quantity": "1000000", "isDivisible": true, "fee": 0 },
-			{ "type": "ISSUE_ASSET", "issuerPublicKey": "C6wuddsBV3HzRrXUtezE7P5MoRXp5m3mEDokRDGZB6ry", "assetName": "OTHER", "description": "other test asset", "data": "", "quantity": "1000000", "isDivisible": true, "fee": 0 },
-			{ "type": "ISSUE_ASSET", "issuerPublicKey": "2tiMr5LTpaWCgbRvkPK8TFd7k63DyHJMMFFsz9uBf1ZP", "assetName": "GOLD", "description": "gold test asset", "data": "", "quantity": "1000000", "isDivisible": true, "fee": 0 },
-
-			{ "type": "ACCOUNT_FLAGS", "target": "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v", "andMask": -1, "orMask": 1, "xorMask": 0 },
-			{ "type": "REWARD_SHARE", "minterPublicKey": "2tiMr5LTpaWCgbRvkPK8TFd7k63DyHJMMFFsz9uBf1ZP", "recipient": "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v", "rewardSharePublicKey": "7PpfnvLSG7y4HPh8hE7KoqAjLCkv7Ui6xw4mKAkbZtox", "sharePercent": "100" },
-
-			{ "type": "ACCOUNT_LEVEL", "target": "Qci5m9k4rcwe4ruKrZZQKka4FzUUMut3er", "level": 5 }
-		]
-	}
-}

src/test/resources/test-chain-v2-qora-holder-extremes.json

@@ -73,8 +73,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-qora-holder.json

@@ -73,8 +73,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-reward-levels.json

@@ -73,8 +73,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-reward-scaling.json

@@ -73,8 +73,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-reward-shares.json

@@ -73,8 +73,7 @@
 		"newConsensusTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2.json

@@ -73,8 +73,7 @@
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
-		"disableReferenceTimestamp": 9999999999999,
-		"aggregateSignatureTimestamp": 0
+		"disableReferenceTimestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-settings-v2-no-sig-agg.json

@@ -1,19 +0,0 @@
-{
-  "repositoryPath": "testdb",
-  "bitcoinNet": "TEST3",
-  "litecoinNet": "TEST3",
-  "restrictedApi": false,
-  "blockchainConfig": "src/test/resources/test-chain-v2-no-sig-agg.json",
-  "exportPath": "qortal-backup-test",
-  "bootstrap": false,
-  "wipeUnconfirmedOnStart": false,
-  "testNtpOffset": 0,
-  "minPeers": 0,
-  "pruneBlockLimit": 100,
-  "bootstrapFilenamePrefix": "test-",
-  "dataPath": "data-test",
-  "tempDataPath": "data-test/_temp",
-  "listsPath": "lists-test",
-  "storagePolicy": "FOLLOWED_OR_VIEWED",
-  "maxStorageCapacity": 104857600
-}

tools/build-zip.sh

@@ -58,6 +58,9 @@ git show HEAD:log4j2.properties > ${build_dir}/log4j2.properties
 git show HEAD:start.sh > ${build_dir}/start.sh
 git show HEAD:stop.sh > ${build_dir}/stop.sh
 
+chmod +x ${build_dir}/start.sh
+chmod +x ${build_dir}/stop.sh
+
 printf "{\n}\n" > ${build_dir}/settings.json
 
 gtouch -d ${commit_ts%%+??:??} ${build_dir} ${build_dir}/*