Bump version to 3.8.9

Add new ElectrumX servers

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:{6C93A96C-E3AF-42FD-BE11-7EC3734905C6} 1049:{754F5347-82E5-4251-AED0-F4141CDD11F5} 2052:{413BD7B3-A3F8-47D0-BCA4-5C7694A40936} 2057:{71450AC8-1E6F-4469-852D-0591FA693680} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{CB85115E-ECCE-4B3D-BB7F-6251A2764922} 1049:{09AC1C62-4E33-4312-826A-38F597ED1B17} 2052:{3CF701B3-E118-4A31-A4B7-156CEA19FBCC} 2057:{468F337D-0EF8-41D1-B5DE-4EEE66BA2AF6} " Type="16"/>
     <ROW Property="ProductLanguage" Value="2057"/>
     <ROW Property="ProductName" Value="Qortal"/>
-    <ROW Property="ProductVersion" Value="3.8.3" Type="32"/>
+    <ROW Property="ProductVersion" Value="3.8.5" 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="{EC7B4AD9-F2D9-48C4-A586-C4697D9C380C}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
+    <ROW Component="AI_CustomARPName" ComponentId="{094B5D07-2258-4A39-9917-2E2F7F6E210B}" 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"/>

pom.xml

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

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

@@ -60,7 +60,7 @@ public class BootstrapResource {
 			bootstrap.validateBlockchain();
 			return bootstrap.create();
 
-		} catch (DataException | InterruptedException | IOException e) {
+		} catch (Exception e) {
 			LOGGER.info("Unable to create bootstrap", e);
 			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.REPOSITORY_ISSUE, e.getMessage());
 		}

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

@@ -84,6 +84,8 @@ public enum Service {
     QCHAT_IMAGE(420, true, 500*1024L, null),
     VIDEO(500, false, null, null),
     AUDIO(600, false, null, null),
+    QCHAT_AUDIO(610, true, 10*1024*1024L, null),
+    QCHAT_VOICE(620, true, 10*1024*1024L, null),
     BLOG(700, false, null, null),
     BLOG_POST(777, false, null, null),
     BLOG_COMMENT(778, false, null, null),

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

@@ -39,9 +39,10 @@ public class AtStatesPruner implements Runnable {
 
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			int pruneStartHeight = repository.getATRepository().getAtPruneHeight();
+			int maxLatestAtStatesHeight = PruneManager.getMaxHeightForLatestAtStates(repository);
 
 			repository.discardChanges();
-			repository.getATRepository().rebuildLatestAtStates();
+			repository.getATRepository().rebuildLatestAtStates(maxLatestAtStatesHeight);
 			repository.saveChanges();
 
 			while (!Controller.isStopping()) {
@@ -92,7 +93,8 @@ public class AtStatesPruner implements Runnable {
 					if (upperPrunableHeight > upperBatchHeight) {
 						pruneStartHeight = upperBatchHeight;
 						repository.getATRepository().setAtPruneHeight(pruneStartHeight);
-						repository.getATRepository().rebuildLatestAtStates();
+						maxLatestAtStatesHeight = PruneManager.getMaxHeightForLatestAtStates(repository);
+						repository.getATRepository().rebuildLatestAtStates(maxLatestAtStatesHeight);
 						repository.saveChanges();
 
 						final int finalPruneStartHeight = pruneStartHeight;

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

@@ -26,9 +26,10 @@ public class AtStatesTrimmer implements Runnable {
 
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			int trimStartHeight = repository.getATRepository().getAtTrimHeight();
+			int maxLatestAtStatesHeight = PruneManager.getMaxHeightForLatestAtStates(repository);
 
 			repository.discardChanges();
-			repository.getATRepository().rebuildLatestAtStates();
+			repository.getATRepository().rebuildLatestAtStates(maxLatestAtStatesHeight);
 			repository.saveChanges();
 
 			while (!Controller.isStopping()) {
@@ -70,7 +71,8 @@ public class AtStatesTrimmer implements Runnable {
 					if (upperTrimmableHeight > upperBatchHeight) {
 						trimStartHeight = upperBatchHeight;
 						repository.getATRepository().setAtTrimHeight(trimStartHeight);
-						repository.getATRepository().rebuildLatestAtStates();
+						maxLatestAtStatesHeight = PruneManager.getMaxHeightForLatestAtStates(repository);
+						repository.getATRepository().rebuildLatestAtStates(maxLatestAtStatesHeight);
 						repository.saveChanges();
 
 						final int finalTrimStartHeight = trimStartHeight;

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

@@ -157,4 +157,18 @@ public class PruneManager {
         return (height < latestUnprunedHeight);
     }
 
+    /**
+     * When rebuilding the latest AT states, we need to specify a maxHeight, so that we aren't tracking
+     * very recent AT states that could potentially be orphaned. This method ensures that AT states
+     * are given a sufficient number of blocks to confirm before being tracked as a latest AT state.
+     */
+    public static int getMaxHeightForLatestAtStates(Repository repository) throws DataException {
+        // Get current chain height, and subtract a certain number of "confirmation" blocks
+        // This is to ensure we are basing our latest AT states data on confirmed blocks -
+        // ones that won't be orphaned in any normal circumstances
+        final int confirmationBlocks = 250;
+        final int chainHeight = repository.getBlockRepository().getBlockchainHeight();
+        return chainHeight - confirmationBlocks;
+    }
+
 }

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

@@ -45,6 +45,7 @@ public class Digibyte extends Bitcoiny {
 				return Arrays.asList(
 						// Servers chosen on NO BASIS WHATSOEVER from various sources!
 						// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=dgb
+						new Server("electrum.qortal.link", Server.ConnectionType.SSL, 55002),
 						new Server("electrum-dgb.qortal.online", ConnectionType.SSL, 50002),
 						new Server("electrum1-dgb.qortal.online", ConnectionType.SSL, 50002),
 						new Server("electrum1.cipig.net", ConnectionType.SSL, 20059),

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

@@ -46,6 +46,7 @@ public class Dogecoin extends Bitcoiny {
 				return Arrays.asList(
 						// Servers chosen on NO BASIS WHATSOEVER from various sources!
 						// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=doge
+						new Server("electrum.qortal.link", Server.ConnectionType.SSL, 54002),
 						new Server("electrum-doge.qortal.online", ConnectionType.SSL, 50002),
 						new Server("electrum1-doge.qortal.online", ConnectionType.SSL, 50002),
 						new Server("electrum1.cipig.net", ConnectionType.SSL, 20060),

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

@@ -50,6 +50,7 @@ public class Litecoin extends Bitcoiny {
 						//BEHIND new Server("62.171.169.176", Server.ConnectionType.SSL, 50002),
 						//PHISHY new Server("electrum-ltc.bysh.me", Server.ConnectionType.SSL, 50002),
 						new Server("backup.electrum-ltc.org", Server.ConnectionType.SSL, 443),
+						new Server("electrum.qortal.link", Server.ConnectionType.SSL, 50002),
 						new Server("electrum.ltc.xurious.com", Server.ConnectionType.SSL, 50002),
 						new Server("electrum-ltc.petrkr.net", Server.ConnectionType.SSL, 60002),
 						new Server("electrum-ltc.qortal.online", Server.ConnectionType.SSL, 50002),

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

@@ -48,6 +48,7 @@ public class Ravencoin extends Bitcoiny {
 						//CLOSED new Server("aethyn.com", ConnectionType.SSL, 50002),
 						//CLOSED new Server("electrum2.rvn.rocks", ConnectionType.SSL, 50002),
 						//BEHIND new Server("electrum3.rvn.rocks", ConnectionType.SSL, 50002),
+						new Server("electrum.qortal.link", Server.ConnectionType.SSL, 56002),
 						new Server("electrum-rvn.qortal.online", ConnectionType.SSL, 50002),
 						new Server("electrum1-rvn.qortal.online", ConnectionType.SSL, 50002),
 						new Server("electrum1.cipig.net", ConnectionType.SSL, 20051),

src/main/java/org/qortal/data/chat/ActiveChats.java

@@ -17,17 +17,21 @@ public class ActiveChats {
 		private Long timestamp;
 		private String sender;
 		private String senderName;
+		private byte[] signature;
+		private byte[] data;
 
 		protected GroupChat() {
 			/* JAXB */
 		}
 
-		public GroupChat(int groupId, String groupName, Long timestamp, String sender, String senderName) {
+		public GroupChat(int groupId, String groupName, Long timestamp, String sender, String senderName, byte[] signature, byte[] data) {
 			this.groupId = groupId;
 			this.groupName = groupName;
 			this.timestamp = timestamp;
 			this.sender = sender;
 			this.senderName = senderName;
+			this.signature = signature;
+			this.data = data;
 		}
 
 		public int getGroupId() {
@@ -49,6 +53,14 @@ public class ActiveChats {
 		public String getSenderName() {
 			return this.senderName;
 		}
+
+		public byte[] getSignature() {
+			return this.signature;
+		}
+
+		public byte[] getData() {
+			return this.data;
+		}
 	}
 
 	@XmlAccessorType(XmlAccessType.FIELD)
@@ -118,4 +130,4 @@ public class ActiveChats {
 		return this.direct;
 	}
 
-}
+}

src/main/java/org/qortal/naming/Name.java

@@ -16,6 +16,8 @@ import org.qortal.repository.Repository;
 import org.qortal.transaction.Transaction.TransactionType;
 import org.qortal.utils.Unicode;
 
+import java.util.Objects;
+
 public class Name {
 
 	// Properties
@@ -116,7 +118,7 @@ public class Name {
 
 		this.repository.getNameRepository().save(this.nameData);
 
-		if (!updateNameTransactionData.getNewName().isEmpty())
+		if (!updateNameTransactionData.getNewName().isEmpty() && !Objects.equals(updateNameTransactionData.getName(), updateNameTransactionData.getNewName()))
 			// Name has changed, delete old entry
 			this.repository.getNameRepository().delete(updateNameTransactionData.getNewName());
 

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

@@ -119,7 +119,7 @@ public interface ATRepository {
 	 * <p>
 	 * NOTE: performs implicit <tt>repository.saveChanges()</tt>.
 	 */
-	public void rebuildLatestAtStates() throws DataException;
+	public void rebuildLatestAtStates(int maxHeight) throws DataException;
 
 
 	/** Returns height of first trimmable AT state. */

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

@@ -279,7 +279,9 @@ public class Bootstrap {
 
             LOGGER.info("Generating checksum file...");
             String checksum = Crypto.digestHexString(compressedOutputPath.toFile(), 1024*1024);
+            LOGGER.info("checksum: {}", checksum);
             Path checksumPath = Paths.get(String.format("%s.sha256", compressedOutputPath.toString()));
+            LOGGER.info("Writing checksum to path: {}", checksumPath);
             Files.writeString(checksumPath, checksum, StandardOpenOption.CREATE);
 
             // Return the path to the compressed bootstrap file

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

@@ -603,7 +603,7 @@ public class HSQLDBATRepository implements ATRepository {
 
 
 	@Override
-	public void rebuildLatestAtStates() throws DataException {
+	public void rebuildLatestAtStates(int maxHeight) throws DataException {
 		// latestATStatesLock is to prevent concurrent updates on LatestATStates
 		// that could result in one process using a partial or empty dataset
 		// because it was in the process of being rebuilt by another thread
@@ -624,11 +624,12 @@ public class HSQLDBATRepository implements ATRepository {
 					+ "CROSS JOIN LATERAL("
 					+ "SELECT height FROM ATStates "
 					+ "WHERE ATStates.AT_address = ATs.AT_address "
+					+ "AND height <= ?"
 					+ "ORDER BY AT_address DESC, height DESC LIMIT 1"
 					+ ") "
 					+ ")";
 			try {
-				this.repository.executeCheckedUpdate(insertSql);
+				this.repository.executeCheckedUpdate(insertSql, maxHeight);
 			} catch (SQLException e) {
 				repository.examineException(e);
 				throw new DataException("Unable to populate temporary latest AT states cache in repository", e);

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

@@ -177,11 +177,11 @@ public class HSQLDBChatRepository implements ChatRepository {
 
 	private List<GroupChat> getActiveGroupChats(String address) throws DataException {
 		// Find groups where address is a member and potential latest message details
-		String groupsSql = "SELECT group_id, group_name, latest_timestamp, sender, sender_name "
+		String groupsSql = "SELECT group_id, group_name, latest_timestamp, sender, sender_name, signature, data "
 				+ "FROM GroupMembers "
 				+ "JOIN Groups USING (group_id) "
 				+ "LEFT OUTER JOIN LATERAL("
-					+ "SELECT created_when AS latest_timestamp, sender, name AS sender_name "
+					+ "SELECT created_when AS latest_timestamp, sender, name AS sender_name, signature, data "
 					+ "FROM ChatTransactions "
 					+ "JOIN Transactions USING (signature) "
 					+ "LEFT OUTER JOIN Names AS SenderNames ON SenderNames.owner = sender "
@@ -205,8 +205,10 @@ public class HSQLDBChatRepository implements ChatRepository {
 
 					String sender = resultSet.getString(4);
 					String senderName = resultSet.getString(5);
+					byte[] signature = resultSet.getBytes(6);
+					byte[] data = resultSet.getBytes(7);
 
-					GroupChat groupChat = new GroupChat(groupId, groupName, timestamp, sender, senderName);
+					GroupChat groupChat = new GroupChat(groupId, groupName, timestamp, sender, senderName, signature, data);
 					groupChats.add(groupChat);
 				} while (resultSet.next());
 			}
@@ -215,7 +217,7 @@ public class HSQLDBChatRepository implements ChatRepository {
 		}
 
 		// We need different SQL to handle group-less chat
-		String grouplessSql = "SELECT created_when, sender, SenderNames.name "
+		String grouplessSql = "SELECT created_when, sender, SenderNames.name, signature, data "
 				+ "FROM ChatTransactions "
 				+ "JOIN Transactions USING (signature) "
 				+ "LEFT OUTER JOIN Names AS SenderNames ON SenderNames.owner = sender "
@@ -228,15 +230,19 @@ public class HSQLDBChatRepository implements ChatRepository {
 			Long timestamp = null;
 			String sender = null;
 			String senderName = null;
+			byte[] signature = null;
+			byte[] data = null;
 
 			if (resultSet != null) {
 				// We found a recipient-less, group-less CHAT message, so report its details
 				timestamp = resultSet.getLong(1);
 				sender = resultSet.getString(2);
 				senderName = resultSet.getString(3);
+				signature = resultSet.getBytes(4);
+				data = resultSet.getBytes(5);
 			}
 
-			GroupChat groupChat = new GroupChat(0, null, timestamp, sender, senderName);
+			GroupChat groupChat = new GroupChat(0, null, timestamp, sender, senderName, signature, data);
 			groupChats.add(groupChat);
 		} catch (SQLException e) {
 			throw new DataException("Unable to fetch active group chats from repository", e);
@@ -291,4 +297,4 @@ public class HSQLDBChatRepository implements ChatRepository {
 		return directChats;
 	}
 
-}
+}

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

@@ -99,7 +99,7 @@ public class HSQLDBDatabasePruning {
 
         // It's essential that we rebuild the latest AT states here, as we are using this data in the next query.
         // Failing to do this will result in important AT states being deleted, rendering the database unusable.
-        repository.getATRepository().rebuildLatestAtStates();
+        repository.getATRepository().rebuildLatestAtStates(endHeight);
 
 
         // Loop through all the LatestATStates and copy them to the new table

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

@@ -215,7 +215,7 @@ public class Settings {
 	public long recoveryModeTimeout = 10 * 60 * 1000L;
 
 	/** Minimum peer version number required in order to sync with them */
-	private String minPeerVersion = "3.8.2";
+	private String minPeerVersion = "3.8.7";
 	/** 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 */

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.qortal.account.Account;
 import org.qortal.asset.Asset;
+import org.qortal.controller.repository.NamesDatabaseIntegrityCheck;
 import org.qortal.data.naming.NameData;
 import org.qortal.data.transaction.CancelSellNameTransactionData;
 import org.qortal.data.transaction.TransactionData;
@@ -81,7 +82,13 @@ public class CancelSellNameTransaction extends Transaction {
 
 	@Override
 	public void preProcess() throws DataException {
-		// Nothing to do
+		CancelSellNameTransactionData cancelSellNameTransactionData = (CancelSellNameTransactionData) transactionData;
+
+		// Rebuild this name in the Names table from the transaction history
+		// This is necessary because in some rare cases names can be missing from the Names table after registration
+		// but we have been unable to reproduce the issue and track down the root cause
+		NamesDatabaseIntegrityCheck namesDatabaseIntegrityCheck = new NamesDatabaseIntegrityCheck();
+		namesDatabaseIntegrityCheck.rebuildName(cancelSellNameTransactionData.getName(), this.repository);
 	}
 
 	@Override

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

@@ -23,7 +23,6 @@ import org.qortal.transform.TransformationException;
 import org.qortal.transform.block.BlockTransformation;
 import org.qortal.utils.BlockArchiveUtils;
 import org.qortal.utils.NTP;
-import org.qortal.utils.Triple;
 
 import java.io.File;
 import java.io.IOException;
@@ -314,9 +313,10 @@ public class BlockArchiveTests extends Common {
 			repository.getBlockRepository().setBlockPruneHeight(901);
 
 			// Prune the AT states for the archived blocks
-			repository.getATRepository().rebuildLatestAtStates();
+			repository.getATRepository().rebuildLatestAtStates(900);
+			repository.saveChanges();
 			int numATStatesPruned = repository.getATRepository().pruneAtStates(0, 900);
-			assertEquals(900-1, numATStatesPruned);
+			assertEquals(900-2, numATStatesPruned); // Minus 1 for genesis block, and another for the latest AT state
 			repository.getATRepository().setAtPruneHeight(901);
 
 			// Now ensure the SQL repository is missing blocks 2 and 900...
@@ -563,16 +563,23 @@ public class BlockArchiveTests extends Common {
 			// Trim the first 500 blocks
 			repository.getBlockRepository().trimOldOnlineAccountsSignatures(0, 500);
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(501);
+			repository.getATRepository().rebuildLatestAtStates(500);
 			repository.getATRepository().trimAtStates(0, 500, 1000);
 			repository.getATRepository().setAtTrimHeight(501);
 
-			// Now block 500 should only have the AT state data hash
-			block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500);
-			atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500);
+			// Now block 499 should only have the AT state data hash
+			List<ATStateData> block499AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(499);
+			atStatesData = repository.getATRepository().getATStateAtHeight(block499AtStatesData.get(0).getATAddress(), 499);
 			assertNotNull(atStatesData.getStateHash());
 			assertNull(atStatesData.getStateData());
 
-			// ... but block 501 should have the full data
+			// ... but block 500 should have the full data (due to being retained as the "latest" AT state in the trimmed range
+			block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500);
+			atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500);
+			assertNotNull(atStatesData.getStateHash());
+			assertNotNull(atStatesData.getStateData());
+
+			// ... and block 501 should also have the full data
 			List<ATStateData> block501AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(501);
 			atStatesData = repository.getATRepository().getATStateAtHeight(block501AtStatesData.get(0).getATAddress(), 501);
 			assertNotNull(atStatesData.getStateHash());
@@ -612,9 +619,10 @@ public class BlockArchiveTests extends Common {
 			repository.getBlockRepository().setBlockPruneHeight(501);
 
 			// Prune the AT states for the archived blocks
-			repository.getATRepository().rebuildLatestAtStates();
+			repository.getATRepository().rebuildLatestAtStates(500);
+			repository.saveChanges();
 			int numATStatesPruned = repository.getATRepository().pruneAtStates(2, 500);
-			assertEquals(499, numATStatesPruned);
+			assertEquals(498, numATStatesPruned); // Minus 1 for genesis block, and another for the latest AT state
 			repository.getATRepository().setAtPruneHeight(501);
 
 			// Now ensure the SQL repository is missing blocks 2 and 500...

src/test/java/org/qortal/test/BootstrapTests.java

@@ -176,7 +176,8 @@ public class BootstrapTests extends Common {
         repository.getBlockRepository().setBlockPruneHeight(901);
 
         // Prune the AT states for the archived blocks
-        repository.getATRepository().rebuildLatestAtStates();
+        repository.getATRepository().rebuildLatestAtStates(900);
+        repository.saveChanges();
         repository.getATRepository().pruneAtStates(0, 900);
         repository.getATRepository().setAtPruneHeight(901);
 

src/test/java/org/qortal/test/PruneTests.java

@@ -1,16 +1,33 @@
 package org.qortal.test;
 
+import com.google.common.hash.HashCode;
 import org.junit.Before;
 import org.junit.Test;
+import org.qortal.account.Account;
 import org.qortal.account.PrivateKeyAccount;
+import org.qortal.asset.Asset;
+import org.qortal.block.Block;
 import org.qortal.controller.BlockMinter;
+import org.qortal.crosschain.AcctMode;
+import org.qortal.crosschain.LitecoinACCTv3;
+import org.qortal.data.at.ATData;
 import org.qortal.data.at.ATStateData;
 import org.qortal.data.block.BlockData;
+import org.qortal.data.crosschain.CrossChainTradeData;
+import org.qortal.data.transaction.BaseTransactionData;
+import org.qortal.data.transaction.DeployAtTransactionData;
+import org.qortal.data.transaction.MessageTransactionData;
+import org.qortal.data.transaction.TransactionData;
+import org.qortal.group.Group;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
 import org.qortal.test.common.AtUtils;
+import org.qortal.test.common.BlockUtils;
 import org.qortal.test.common.Common;
+import org.qortal.test.common.TransactionUtils;
+import org.qortal.transaction.DeployAtTransaction;
+import org.qortal.transaction.MessageTransaction;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,6 +36,13 @@ import static org.junit.Assert.*;
 
 public class PruneTests extends Common {
 
+    // Constants for test AT (an LTC ACCT)
+    public static final byte[] litecoinPublicKeyHash = HashCode.fromString("bb00bb11bb22bb33bb44bb55bb66bb77bb88bb99").asBytes();
+    public static final int tradeTimeout = 20; // blocks
+    public static final long redeemAmount = 80_40200000L;
+    public static final long fundingAmount = 123_45600000L;
+    public static final long litecoinAmount = 864200L; // 0.00864200 LTC
+
     @Before
     public void beforeTest() throws DataException {
         Common.useDefaultSettings();
@@ -62,23 +86,32 @@ public class PruneTests extends Common {
             repository.getBlockRepository().setBlockPruneHeight(6);
 
             // Prune AT states for blocks 2-5
+            repository.getATRepository().rebuildLatestAtStates(5);
+            repository.saveChanges();
             int numATStatesPruned = repository.getATRepository().pruneAtStates(0, 5);
-            assertEquals(4, numATStatesPruned);
+            assertEquals(3, numATStatesPruned);
             repository.getATRepository().setAtPruneHeight(6);
 
-            // Make sure that blocks 2-5 are now missing block data and AT states data
-            for (Integer i=2; i <= 5; i++) {
+            // Make sure that blocks 2-4 are now missing block data and AT states data
+            for (Integer i=2; i <= 4; i++) {
                 BlockData blockData = repository.getBlockRepository().fromHeight(i);
                 assertNull(blockData);
                 List<ATStateData> atStatesDataList = repository.getATRepository().getBlockATStatesAtHeight(i);
                 assertTrue(atStatesDataList.isEmpty());
             }
 
-            // ... but blocks 6-10 have block data and full AT states data
+            // Block 5 should have full AT states data even though it was pruned.
+            // This is because we identified that as the "latest" AT state in that block range
+            BlockData blockData = repository.getBlockRepository().fromHeight(5);
+            assertNull(blockData);
+            List<ATStateData> atStatesDataList = repository.getATRepository().getBlockATStatesAtHeight(5);
+            assertEquals(1, atStatesDataList.size());
+
+            // Blocks 6-10 have block data and full AT states data
             for (Integer i=6; i <= 10; i++) {
-                BlockData blockData = repository.getBlockRepository().fromHeight(i);
+                blockData = repository.getBlockRepository().fromHeight(i);
                 assertNotNull(blockData.getSignature());
-                List<ATStateData> atStatesDataList = repository.getATRepository().getBlockATStatesAtHeight(i);
+                atStatesDataList = repository.getATRepository().getBlockATStatesAtHeight(i);
                 assertNotNull(atStatesDataList);
                 assertFalse(atStatesDataList.isEmpty());
                 ATStateData atStatesData = repository.getATRepository().getATStateAtHeight(atStatesDataList.get(0).getATAddress(), i);
@@ -88,4 +121,102 @@ public class PruneTests extends Common {
         }
     }
 
+    @Test
+    public void testPruneSleepingAt() throws DataException {
+        try (final Repository repository = RepositoryManager.getRepository()) {
+            PrivateKeyAccount deployer = Common.getTestAccount(repository, "chloe");
+            PrivateKeyAccount tradeAccount = Common.getTestAccount(repository, "alice");
+
+            DeployAtTransaction deployAtTransaction = doDeploy(repository, deployer, tradeAccount.getAddress());
+            Account at = deployAtTransaction.getATAccount();
+            String atAddress = at.getAddress();
+
+            // Mint enough blocks to take the original DEPLOY_AT past the prune threshold (in this case 20)
+            Block block = BlockUtils.mintBlocks(repository, 25);
+
+            // Send creator's address to AT, instead of typical partner's address
+            byte[] messageData = LitecoinACCTv3.getInstance().buildCancelMessage(deployer.getAddress());
+            long txTimestamp = block.getBlockData().getTimestamp();
+            MessageTransaction messageTransaction = sendMessage(repository, deployer, messageData, atAddress, txTimestamp);
+
+            // AT should process 'cancel' message in next block
+            BlockUtils.mintBlock(repository);
+
+            // Prune AT states up to block 20
+            repository.getATRepository().rebuildLatestAtStates(20);
+            repository.saveChanges();
+            int numATStatesPruned = repository.getATRepository().pruneAtStates(0, 20);
+            assertEquals(1, numATStatesPruned); // deleted state at heights 2, but state at height 3 remains
+
+            // Check AT is finished
+            ATData atData = repository.getATRepository().fromATAddress(atAddress);
+            assertTrue(atData.getIsFinished());
+
+            // AT should be in CANCELLED mode
+            CrossChainTradeData tradeData = LitecoinACCTv3.getInstance().populateTradeData(repository, atData);
+            assertEquals(AcctMode.CANCELLED, tradeData.mode);
+
+            // Test orphaning - should be possible because the previous AT state at height 3 is still available
+            BlockUtils.orphanLastBlock(repository);
+        }
+    }
+
+
+    // Helper methods for AT testing
+    private DeployAtTransaction doDeploy(Repository repository, PrivateKeyAccount deployer, String tradeAddress) throws DataException {
+        byte[] creationBytes = LitecoinACCTv3.buildQortalAT(tradeAddress, litecoinPublicKeyHash, redeemAmount, litecoinAmount, tradeTimeout);
+
+        long txTimestamp = System.currentTimeMillis();
+        byte[] lastReference = deployer.getLastReference();
+
+        if (lastReference == null) {
+            System.err.println(String.format("Qortal account %s has no last reference", deployer.getAddress()));
+            System.exit(2);
+        }
+
+        Long fee = null;
+        String name = "QORT-LTC cross-chain trade";
+        String description = String.format("Qortal-Litecoin cross-chain trade");
+        String atType = "ACCT";
+        String tags = "QORT-LTC ACCT";
+
+        BaseTransactionData baseTransactionData = new BaseTransactionData(txTimestamp, Group.NO_GROUP, lastReference, deployer.getPublicKey(), fee, null);
+        TransactionData deployAtTransactionData = new DeployAtTransactionData(baseTransactionData, name, description, atType, tags, creationBytes, fundingAmount, Asset.QORT);
+
+        DeployAtTransaction deployAtTransaction = new DeployAtTransaction(repository, deployAtTransactionData);
+
+        fee = deployAtTransaction.calcRecommendedFee();
+        deployAtTransactionData.setFee(fee);
+
+        TransactionUtils.signAndMint(repository, deployAtTransactionData, deployer);
+
+        return deployAtTransaction;
+    }
+
+    private MessageTransaction sendMessage(Repository repository, PrivateKeyAccount sender, byte[] data, String recipient, long txTimestamp) throws DataException {
+        byte[] lastReference = sender.getLastReference();
+
+        if (lastReference == null) {
+            System.err.println(String.format("Qortal account %s has no last reference", sender.getAddress()));
+            System.exit(2);
+        }
+
+        Long fee = null;
+        int version = 4;
+        int nonce = 0;
+        long amount = 0;
+        Long assetId = null; // because amount is zero
+
+        BaseTransactionData baseTransactionData = new BaseTransactionData(txTimestamp, Group.NO_GROUP, lastReference, sender.getPublicKey(), fee, null);
+        TransactionData messageTransactionData = new MessageTransactionData(baseTransactionData, version, nonce, recipient, amount, assetId, data, false, false);
+
+        MessageTransaction messageTransaction = new MessageTransaction(repository, messageTransactionData);
+
+        fee = messageTransaction.calcRecommendedFee();
+        messageTransactionData.setFee(fee);
+
+        TransactionUtils.signAndMint(repository, messageTransactionData, sender);
+
+        return messageTransaction;
+    }
 }

src/test/java/org/qortal/test/at/AtRepositoryTests.java

@@ -2,29 +2,20 @@ package org.qortal.test.at;
 
 import static org.junit.Assert.*;
 
-import java.nio.ByteBuffer;
 import java.util.List;
 
-import org.ciyam.at.CompilationException;
 import org.ciyam.at.MachineState;
-import org.ciyam.at.OpCode;
 import org.junit.Before;
 import org.junit.Test;
 import org.qortal.account.PrivateKeyAccount;
-import org.qortal.asset.Asset;
 import org.qortal.data.at.ATData;
 import org.qortal.data.at.ATStateData;
-import org.qortal.data.transaction.BaseTransactionData;
-import org.qortal.data.transaction.DeployAtTransactionData;
-import org.qortal.data.transaction.TransactionData;
-import org.qortal.group.Group;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
 import org.qortal.test.common.AtUtils;
 import org.qortal.test.common.BlockUtils;
 import org.qortal.test.common.Common;
-import org.qortal.test.common.TransactionUtils;
 import org.qortal.transaction.DeployAtTransaction;
 
 public class AtRepositoryTests extends Common {
@@ -76,7 +67,7 @@ public class AtRepositoryTests extends Common {
 			Integer testHeight = maxHeight - 2;
 
 			// Trim AT state data
-			repository.getATRepository().rebuildLatestAtStates();
+			repository.getATRepository().rebuildLatestAtStates(maxHeight);
 			repository.getATRepository().trimAtStates(2, maxHeight, 1000);
 
 			ATStateData atStateData = repository.getATRepository().getATStateAtHeight(atAddress, testHeight);
@@ -130,7 +121,7 @@ public class AtRepositoryTests extends Common {
 			Integer testHeight = blockchainHeight;
 
 			// Trim AT state data
-			repository.getATRepository().rebuildLatestAtStates();
+			repository.getATRepository().rebuildLatestAtStates(maxHeight);
 			// COMMIT to check latest AT states persist / TEMPORARY table interaction
 			repository.saveChanges();
 
@@ -163,8 +154,8 @@ public class AtRepositoryTests extends Common {
 			int maxTrimHeight = blockchainHeight - 4;
 			Integer testHeight = maxTrimHeight + 1;
 
-			// Trim AT state data
-			repository.getATRepository().rebuildLatestAtStates();
+			// Trim AT state data (using a max height of maxTrimHeight + 1, so it is beyond the trimmed range)
+			repository.getATRepository().rebuildLatestAtStates(maxTrimHeight + 1);
 			repository.saveChanges();
 			repository.getATRepository().trimAtStates(2, maxTrimHeight, 1000);
 
@@ -333,7 +324,7 @@ public class AtRepositoryTests extends Common {
 			Integer testHeight = maxHeight - 2;
 
 			// Trim AT state data
-			repository.getATRepository().rebuildLatestAtStates();
+			repository.getATRepository().rebuildLatestAtStates(maxHeight);
 			repository.getATRepository().trimAtStates(2, maxHeight, 1000);
 
 			List<ATStateData> atStates = repository.getATRepository().getBlockATStatesAtHeight(testHeight);

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

@@ -20,6 +20,15 @@ public class BlockUtils {
 		return BlockMinter.mintTestingBlock(repository, mintingAccount);
 	}
 
+	/** Mints multiple blocks using "alice-reward-share" test account, and returns the final block. */
+	public static Block mintBlocks(Repository repository, int count) throws DataException {
+		Block block = null;
+		for (int i=0; i<count; i++) {
+			block = BlockUtils.mintBlock(repository);
+		}
+		return block;
+	}
+
 	public static Long getNextBlockReward(Repository repository) throws DataException {
 		int currentHeight = repository.getBlockRepository().getBlockchainHeight();
 

src/test/java/org/qortal/test/naming/UpdateTests.java

@@ -219,6 +219,65 @@ public class UpdateTests extends Common {
 		}
 	}
 
+	// Test that multiple UPDATE_NAME transactions work as expected, when using a matching name and newName string
+	@Test
+	public void testDoubleUpdateNameWithMatchingNewName() throws DataException {
+		try (final Repository repository = RepositoryManager.getRepository()) {
+			// Register-name
+			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
+			String name = "name";
+			String reducedName = "name";
+			String data = "{\"age\":30}";
+
+			TransactionData initialTransactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
+			initialTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(initialTransactionData.getTimestamp()));
+			TransactionUtils.signAndMint(repository, initialTransactionData, alice);
+
+			// Check name exists
+			assertTrue(repository.getNameRepository().nameExists(name));
+			assertNotNull(repository.getNameRepository().fromReducedName(reducedName));
+
+			// Update name
+			TransactionData middleTransactionData = new UpdateNameTransactionData(TestTransaction.generateBase(alice), name, name, data);
+			TransactionUtils.signAndMint(repository, middleTransactionData, alice);
+
+			// Check name still exists
+			assertTrue(repository.getNameRepository().nameExists(name));
+			assertNotNull(repository.getNameRepository().fromReducedName(reducedName));
+
+			// Update name again
+			TransactionData newestTransactionData = new UpdateNameTransactionData(TestTransaction.generateBase(alice), name, name, data);
+			TransactionUtils.signAndMint(repository, newestTransactionData, alice);
+
+			// Check name still exists
+			assertTrue(repository.getNameRepository().nameExists(name));
+			assertNotNull(repository.getNameRepository().fromReducedName(reducedName));
+
+			// Check updated timestamp is correct
+			assertEquals((Long) newestTransactionData.getTimestamp(), repository.getNameRepository().fromName(name).getUpdated());
+
+			// orphan and recheck
+			BlockUtils.orphanLastBlock(repository);
+
+			// Check name still exists
+			assertTrue(repository.getNameRepository().nameExists(name));
+			assertNotNull(repository.getNameRepository().fromReducedName(reducedName));
+
+			// Check updated timestamp is correct
+			assertEquals((Long) middleTransactionData.getTimestamp(), repository.getNameRepository().fromName(name).getUpdated());
+
+			// orphan and recheck
+			BlockUtils.orphanLastBlock(repository);
+
+			// Check name still exists
+			assertTrue(repository.getNameRepository().nameExists(name));
+			assertNotNull(repository.getNameRepository().fromReducedName(reducedName));
+
+			// Check updated timestamp is empty
+			assertNull(repository.getNameRepository().fromName(name).getUpdated());
+		}
+	}
+
 	// Test that reverting using previous UPDATE_NAME works as expected
 	@Test
 	public void testIntermediateUpdateName() throws DataException {