Merge pull request #74 from QuickMythril/4.6.1-unit-test-fix

4.6.1 unit test fix

src/test/java/org/qortal/test/BlockArchiveV1Tests.java

@@ -54,26 +54,39 @@ public class BlockArchiveV1Tests extends Common {
 	public void testWriter() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testWriter");
+
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// 900 blocks are trimmed (this specifies the first untrimmed height)
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
 			repository.getATRepository().setAtTrimHeight(901);
+			System.out.println("Set trim heights to 901.");
 
 			// Check the max archive height - this should be one less than the first untrimmed height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
 			assertEquals(900, maximumArchiveHeight);
 
 			// Write blocks 2-900 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
 			assertEquals(900 - 1, writer.getWrittenCount());
 
 			// Increment block archive height
@@ -84,6 +97,9 @@ public class BlockArchiveV1Tests extends Common {
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
+
+			System.out.println("testWriter completed successfully.");
 		}
 	}
 
@@ -91,26 +107,39 @@ public class BlockArchiveV1Tests extends Common {
 	public void testWriterAndReader() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testWriterAndReader");
+
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// 900 blocks are trimmed (this specifies the first untrimmed height)
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
 			repository.getATRepository().setAtTrimHeight(901);
+			System.out.println("Set trim heights to 901.");
 
 			// Check the max archive height - this should be one less than the first untrimmed height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
 			assertEquals(900, maximumArchiveHeight);
 
 			// Write blocks 2-900 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
 			assertEquals(900 - 1, writer.getWrittenCount());
 
 			// Increment block archive height
@@ -121,8 +150,10 @@ public class BlockArchiveV1Tests extends Common {
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
 
 			// Read block 2 from the archive
+			System.out.println("Reading block 2 from the archive...");
 			BlockArchiveReader reader = BlockArchiveReader.getInstance();
 			BlockTransformation block2Info = reader.fetchBlockAtHeight(2);
 			BlockData block2ArchiveData = block2Info.getBlockData();
@@ -131,6 +162,7 @@ public class BlockArchiveV1Tests extends Common {
 			BlockData block2RepositoryData = repository.getBlockRepository().fromHeight(2);
 
 			// Ensure the values match
+			System.out.println("Comparing block 2 data...");
 			assertEquals(block2ArchiveData.getHeight(), block2RepositoryData.getHeight());
 			assertArrayEquals(block2ArchiveData.getSignature(), block2RepositoryData.getSignature());
 
@@ -138,6 +170,7 @@ public class BlockArchiveV1Tests extends Common {
 			assertEquals(1, block2ArchiveData.getOnlineAccountsCount());
 
 			// Read block 900 from the archive
+			System.out.println("Reading block 900 from the archive...");
 			BlockTransformation block900Info = reader.fetchBlockAtHeight(900);
 			BlockData block900ArchiveData = block900Info.getBlockData();
 
@@ -145,12 +178,14 @@ public class BlockArchiveV1Tests extends Common {
 			BlockData block900RepositoryData = repository.getBlockRepository().fromHeight(900);
 
 			// Ensure the values match
+			System.out.println("Comparing block 900 data...");
 			assertEquals(block900ArchiveData.getHeight(), block900RepositoryData.getHeight());
 			assertArrayEquals(block900ArchiveData.getSignature(), block900RepositoryData.getSignature());
 
 			// Test some values in the archive
 			assertEquals(1, block900ArchiveData.getOnlineAccountsCount());
 
+			System.out.println("testWriterAndReader completed successfully.");
 		}
 	}
 
@@ -158,33 +193,48 @@ public class BlockArchiveV1Tests extends Common {
 	public void testArchivedAtStates() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testArchivedAtStates");
+
 			// Deploy an AT so that we have AT state data
+			System.out.println("Deploying AT...");
 			PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
 			byte[] creationBytes = AtUtils.buildSimpleAT();
 			long fundingAmount = 1_00000000L;
 			DeployAtTransaction deployAtTransaction =  AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
 			String atAddress = deployAtTransaction.getATAccount().getAddress();
+			System.out.println("AT deployed at address: " + atAddress);
 
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// 9 blocks are trimmed (this specifies the first untrimmed height)
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(10);
 			repository.getATRepository().setAtTrimHeight(10);
+			System.out.println("Set trim heights to 10.");
 
 			// Check the max archive height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height (Expected 9): " + maximumArchiveHeight);
 			assertEquals(9, maximumArchiveHeight);
 
 			// Write blocks 2-9 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 8)");
 			assertEquals(9 - 1, writer.getWrittenCount());
 
 			// Increment block archive height
@@ -195,10 +245,13 @@ public class BlockArchiveV1Tests extends Common {
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
 
 			// Check blocks 3-9
+			System.out.println("Checking blocks 3 to 9...");
 			for (Integer testHeight = 2; testHeight <= 9; testHeight++) {
 
+				System.out.println("Reading block " + testHeight + " from the archive...");
 				// Read a block from the archive
 				BlockArchiveReader reader = BlockArchiveReader.getInstance();
 				BlockTransformation blockInfo = reader.fetchBlockAtHeight(testHeight);
@@ -216,6 +269,7 @@ public class BlockArchiveV1Tests extends Common {
 
 				// Check the archived AT state
 				if (testHeight == 2) {
+					System.out.println("Checking block " + testHeight + " AT state data (expected null)...");
 					// Block 2 won't have an AT state hash because it's initial (and has the DEPLOY_AT in the same block)
 					assertNull(archivedAtStateData);
 
@@ -223,6 +277,7 @@ public class BlockArchiveV1Tests extends Common {
 					assertEquals(Transaction.TransactionType.DEPLOY_AT, archivedTransactions.get(0).getType());
 				}
 				else {
+					System.out.println("Checking block " + testHeight + " AT state data...");
 					// For blocks 3+, ensure the archive has the AT state data, but not the hashes
 					assertNotNull(archivedAtStateData.getStateHash());
 					assertNull(archivedAtStateData.getStateData());
@@ -255,10 +310,12 @@ public class BlockArchiveV1Tests extends Common {
 			}
 
 			// Check block 10 (unarchived)
+			System.out.println("Checking block 10 (should not be in archive)...");
 			BlockArchiveReader reader = BlockArchiveReader.getInstance();
 			BlockTransformation blockInfo = reader.fetchBlockAtHeight(10);
 			assertNull(blockInfo);
 
+			System.out.println("testArchivedAtStates completed successfully.");
 		}
 
 	}
@@ -267,32 +324,46 @@ public class BlockArchiveV1Tests extends Common {
 	public void testArchiveAndPrune() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testArchiveAndPrune");
+
 			// Deploy an AT so that we have AT state data
+			System.out.println("Deploying AT...");
 			PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
 			byte[] creationBytes = AtUtils.buildSimpleAT();
 			long fundingAmount = 1_00000000L;
 			AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
 
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// Assume 900 blocks are trimmed (this specifies the first untrimmed height)
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
 			repository.getATRepository().setAtTrimHeight(901);
+			System.out.println("Set trim heights to 901.");
 
 			// Check the max archive height - this should be one less than the first untrimmed height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
 			assertEquals(900, maximumArchiveHeight);
 
 			// Write blocks 2-900 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
 			assertEquals(900 - 1, writer.getWrittenCount());
 
 			// Increment block archive height
@@ -303,17 +374,21 @@ public class BlockArchiveV1Tests extends Common {
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
 
 			// Ensure the SQL repository contains blocks 2 and 900...
 			assertNotNull(repository.getBlockRepository().fromHeight(2));
 			assertNotNull(repository.getBlockRepository().fromHeight(900));
+			System.out.println("Blocks 2 and 900 exist in the repository.");
 
 			// Prune all the archived blocks
+			System.out.println("Pruning blocks 2 to 900...");
 			int numBlocksPruned = repository.getBlockRepository().pruneBlocks(0, 900);
 			assertEquals(900-1, numBlocksPruned);
 			repository.getBlockRepository().setBlockPruneHeight(901);
 
 			// Prune the AT states for the archived blocks
+			System.out.println("Pruning AT states up to height 900...");
 			repository.getATRepository().rebuildLatestAtStates(900);
 			repository.saveChanges();
 			int numATStatesPruned = repository.getATRepository().pruneAtStates(0, 900);
@@ -323,14 +398,19 @@ public class BlockArchiveV1Tests extends Common {
 			// Now ensure the SQL repository is missing blocks 2 and 900...
 			assertNull(repository.getBlockRepository().fromHeight(2));
 			assertNull(repository.getBlockRepository().fromHeight(900));
+			System.out.println("Blocks 2 and 900 have been pruned from the repository.");
 
 			// ... but it's not missing blocks 1 and 901 (we don't prune the genesis block)
 			assertNotNull(repository.getBlockRepository().fromHeight(1));
 			assertNotNull(repository.getBlockRepository().fromHeight(901));
+			System.out.println("Blocks 1 and 901 still exist in the repository.");
 
 			// Validate the latest block height in the repository
-			assertEquals(1002, (int) repository.getBlockRepository().getLastBlock().getHeight());
+			int lastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
+			System.out.println("Latest block height in repository (Expected 1002): " + lastBlockHeight);
+			assertEquals(1002, lastBlockHeight);
 
+			System.out.println("testArchiveAndPrune completed successfully.");
 		}
 	}
 
@@ -338,137 +418,190 @@ public class BlockArchiveV1Tests extends Common {
 	public void testTrimArchivePruneAndOrphan() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testTrimArchivePruneAndOrphan");
+
 			// Deploy an AT so that we have AT state data
+			System.out.println("Deploying AT...");
 			PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
 			byte[] creationBytes = AtUtils.buildSimpleAT();
 			long fundingAmount = 1_00000000L;
 			AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
+			System.out.println("AT deployed successfully.");
 
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// Make sure that block 500 has full AT state data and data hash
+			System.out.println("Verifying block 500 AT state data...");
 			List<ATStateData> block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500);
 			ATStateData atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500);
 			assertNotNull(atStatesData.getStateHash());
 			assertNotNull(atStatesData.getStateData());
+			System.out.println("Block 500 AT state data verified.");
 
 			// Trim the first 500 blocks
+			System.out.println("Trimming 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);
+			System.out.println("Trimming completed.");
 
 			// Now block 499 should only have the AT state data hash
+			System.out.println("Checking block 499 AT state data...");
 			List<ATStateData> block499AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(499);
 			atStatesData = repository.getATRepository().getATStateAtHeight(block499AtStatesData.get(0).getATAddress(), 499);
 			assertNotNull(atStatesData.getStateHash());
 			assertNull(atStatesData.getStateData());
+			System.out.println("Block 499 AT state data contains only state hash as expected.");
 
 			// ... but block 500 should have the full data (due to being retained as the "latest" AT state in the trimmed range
+			System.out.println("Verifying block 500 AT state data again...");
 			block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500);
 			atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500);
 			assertNotNull(atStatesData.getStateHash());
 			assertNotNull(atStatesData.getStateData());
+			System.out.println("Block 500 AT state data contains full data.");
 
 			// ... and block 501 should also have the full data
+			System.out.println("Verifying block 501 AT state data...");
 			List<ATStateData> block501AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(501);
 			atStatesData = repository.getATRepository().getATStateAtHeight(block501AtStatesData.get(0).getATAddress(), 501);
 			assertNotNull(atStatesData.getStateHash());
 			assertNotNull(atStatesData.getStateData());
+			System.out.println("Block 501 AT state data contains full data.");
 
 			// Check the max archive height - this should be one less than the first untrimmed height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height determined (Expected 500): " + maximumArchiveHeight);
 			assertEquals(500, maximumArchiveHeight);
 
 			BlockData block3DataPreArchive = repository.getBlockRepository().fromHeight(3);
 
 			// Write blocks 2-500 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Number of blocks written to archive (Expected 499): " + writer.getWrittenCount());
 			assertEquals(500 - 1, writer.getWrittenCount()); // -1 for the genesis block
 
 			// Increment block archive height
 			repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount());
 			repository.saveChanges();
 			assertEquals(500 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight());
+			System.out.println("Block archive height updated to: " + (500 - 1));
 
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
 
 			// Ensure the SQL repository contains blocks 2 and 500...
+			System.out.println("Verifying that blocks 2 and 500 exist in the repository...");
 			assertNotNull(repository.getBlockRepository().fromHeight(2));
 			assertNotNull(repository.getBlockRepository().fromHeight(500));
+			System.out.println("Blocks 2 and 500 are present in the repository.");
 
 			// Prune all the archived blocks
+			System.out.println("Pruning blocks 2 to 500...");
 			int numBlocksPruned = repository.getBlockRepository().pruneBlocks(0, 500);
+			System.out.println("Number of blocks pruned (Expected 499): " + numBlocksPruned);
 			assertEquals(500-1, numBlocksPruned);
 			repository.getBlockRepository().setBlockPruneHeight(501);
 
 			// Prune the AT states for the archived blocks
+			System.out.println("Pruning AT states up to height 500...");
 			repository.getATRepository().rebuildLatestAtStates(500);
 			repository.saveChanges();
 			int numATStatesPruned = repository.getATRepository().pruneAtStates(2, 500);
+			System.out.println("Number of AT states pruned (Expected 498): " + 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...
+			System.out.println("Verifying that blocks 2 and 500 have been pruned...");
 			assertNull(repository.getBlockRepository().fromHeight(2));
 			assertNull(repository.getBlockRepository().fromHeight(500));
+			System.out.println("Blocks 2 and 500 have been successfully pruned.");
 
 			// ... but it's not missing blocks 1 and 501 (we don't prune the genesis block)
+			System.out.println("Verifying that blocks 1 and 501 still exist...");
 			assertNotNull(repository.getBlockRepository().fromHeight(1));
 			assertNotNull(repository.getBlockRepository().fromHeight(501));
+			System.out.println("Blocks 1 and 501 are present in the repository.");
 
 			// Validate the latest block height in the repository
-			assertEquals(1002, (int) repository.getBlockRepository().getLastBlock().getHeight());
+			int lastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
+			System.out.println("Latest block height in repository (Expected 1002): " + lastBlockHeight);
+			assertEquals(1002, lastBlockHeight);
 
 			// Now orphan some unarchived blocks.
+			System.out.println("Orphaning 500 blocks...");
 			BlockUtils.orphanBlocks(repository, 500);
-			assertEquals(502, (int) repository.getBlockRepository().getLastBlock().getHeight());
+			int currentLastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
+			System.out.println("New last block height after orphaning (Expected 502): " + currentLastBlockHeight);
+			assertEquals(502, currentLastBlockHeight);
 
 			// We're close to the lower limit of the SQL database now, so
 			// we need to import some blocks from the archive
+			System.out.println("Importing blocks 401 to 500 from the archive...");
 			BlockArchiveUtils.importFromArchive(401, 500, repository);
 
 			// Ensure the SQL repository now contains block 401 but not 400...
+			System.out.println("Verifying that block 401 exists and block 400 does not...");
 			assertNotNull(repository.getBlockRepository().fromHeight(401));
 			assertNull(repository.getBlockRepository().fromHeight(400));
+			System.out.println("Block 401 exists, block 400 does not.");
 
 			// Import the remaining 399 blocks
+			System.out.println("Importing blocks 2 to 400 from the archive...");
 			BlockArchiveUtils.importFromArchive(2, 400, repository);
 
 			// Verify that block 3 matches the original
+			System.out.println("Verifying that block 3 matches the original data...");
 			BlockData block3DataPostArchive = repository.getBlockRepository().fromHeight(3);
 			assertArrayEquals(block3DataPreArchive.getSignature(), block3DataPostArchive.getSignature());
 			assertEquals(block3DataPreArchive.getHeight(), block3DataPostArchive.getHeight());
+			System.out.println("Block 3 data matches the original.");
 
 			// Orphan 1 more block, which should be the last one that is possible to be orphaned
+			System.out.println("Orphaning 1 more block...");
 			BlockUtils.orphanBlocks(repository, 1);
+			System.out.println("Orphaned 1 block successfully.");
 
 			// Orphan another block, which should fail
+			System.out.println("Attempting to orphan another block, which should fail...");
 			Exception exception = null;
 			try {
 				BlockUtils.orphanBlocks(repository, 1);
 			} catch (DataException e) {
 				exception = e;
+				System.out.println("Caught expected DataException: " + e.getMessage());
 			}
 
 			// Ensure that a DataException is thrown because there is no more AT states data available
 			assertNotNull(exception);
 			assertEquals(DataException.class, exception.getClass());
+			System.out.println("DataException confirmed due to lack of AT states data.");
 
 			// FUTURE: we may be able to retain unique AT states when trimming, to avoid this exception
 			// and allow orphaning back through blocks with trimmed AT states.
 
+			System.out.println("testTrimArchivePruneAndOrphan completed successfully.");
 		}
 	}
 
@@ -482,16 +615,26 @@ public class BlockArchiveV1Tests extends Common {
 	public void testMissingAtStatesHeightIndex() throws DataException, SQLException {
 		try (final HSQLDBRepository repository = (HSQLDBRepository) RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testMissingAtStatesHeightIndex");
+
 			// Firstly check that we're able to prune or archive when the index exists
+			System.out.println("Checking existence of ATStatesHeightIndex...");
 			assertTrue(repository.getATRepository().hasAtStatesHeightIndex());
 			assertTrue(RepositoryManager.canArchiveOrPrune());
+			System.out.println("ATStatesHeightIndex exists. Archiving and pruning are possible.");
 
 			// Delete the index
+			System.out.println("Dropping ATStatesHeightIndex...");
 			repository.prepareStatement("DROP INDEX ATSTATESHEIGHTINDEX").execute();
+			System.out.println("ATStatesHeightIndex dropped.");
 
 			// Ensure check that we're unable to prune or archive when the index doesn't exist
+			System.out.println("Verifying that ATStatesHeightIndex no longer exists...");
 			assertFalse(repository.getATRepository().hasAtStatesHeightIndex());
 			assertFalse(RepositoryManager.canArchiveOrPrune());
+			System.out.println("ATStatesHeightIndex does not exist. Archiving and pruning are disabled.");
+
+			System.out.println("testMissingAtStatesHeightIndex completed successfully.");
 		}
 	}
 
@@ -501,8 +644,10 @@ public class BlockArchiveV1Tests extends Common {
 		Path archivePath = Paths.get(Settings.getInstance().getRepositoryPath(), "archive").toAbsolutePath();
 		try {
 			FileUtils.deleteDirectory(archivePath.toFile());
+			System.out.println("Deleted archive directory at: " + archivePath);
 		} catch (IOException e) {
-
+			
+			System.out.println("Failed to delete archive directory: " + e.getMessage());
 		}
 	}
 

src/test/java/org/qortal/test/BlockArchiveV2Tests.java

@@ -54,26 +54,39 @@ public class BlockArchiveV2Tests extends Common {
 	public void testWriter() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testWriter");
+
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// 900 blocks are trimmed (this specifies the first untrimmed height)
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
 			repository.getATRepository().setAtTrimHeight(901);
+			System.out.println("Set trim heights to 901.");
 
 			// Check the max archive height - this should be one less than the first untrimmed height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
 			assertEquals(900, maximumArchiveHeight);
 
 			// Write blocks 2-900 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
 			assertEquals(900 - 1, writer.getWrittenCount());
 
 			// Increment block archive height
@@ -84,6 +97,9 @@ public class BlockArchiveV2Tests extends Common {
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
+
+			System.out.println("testWriter completed successfully.");
 		}
 	}
 
@@ -91,26 +107,39 @@ public class BlockArchiveV2Tests extends Common {
 	public void testWriterAndReader() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testWriterAndReader");
+
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// 900 blocks are trimmed (this specifies the first untrimmed height)
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
 			repository.getATRepository().setAtTrimHeight(901);
+			System.out.println("Set trim heights to 901.");
 
 			// Check the max archive height - this should be one less than the first untrimmed height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
 			assertEquals(900, maximumArchiveHeight);
 
 			// Write blocks 2-900 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
 			assertEquals(900 - 1, writer.getWrittenCount());
 
 			// Increment block archive height
@@ -121,8 +150,10 @@ public class BlockArchiveV2Tests extends Common {
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
 
 			// Read block 2 from the archive
+			System.out.println("Reading block 2 from the archive...");
 			BlockArchiveReader reader = BlockArchiveReader.getInstance();
 			BlockTransformation block2Info = reader.fetchBlockAtHeight(2);
 			BlockData block2ArchiveData = block2Info.getBlockData();
@@ -131,6 +162,7 @@ public class BlockArchiveV2Tests extends Common {
 			BlockData block2RepositoryData = repository.getBlockRepository().fromHeight(2);
 
 			// Ensure the values match
+			System.out.println("Comparing block 2 data...");
 			assertEquals(block2ArchiveData.getHeight(), block2RepositoryData.getHeight());
 			assertArrayEquals(block2ArchiveData.getSignature(), block2RepositoryData.getSignature());
 
@@ -138,6 +170,7 @@ public class BlockArchiveV2Tests extends Common {
 			assertEquals(1, block2ArchiveData.getOnlineAccountsCount());
 
 			// Read block 900 from the archive
+			System.out.println("Reading block 900 from the archive...");
 			BlockTransformation block900Info = reader.fetchBlockAtHeight(900);
 			BlockData block900ArchiveData = block900Info.getBlockData();
 
@@ -145,12 +178,14 @@ public class BlockArchiveV2Tests extends Common {
 			BlockData block900RepositoryData = repository.getBlockRepository().fromHeight(900);
 
 			// Ensure the values match
+			System.out.println("Comparing block 900 data...");
 			assertEquals(block900ArchiveData.getHeight(), block900RepositoryData.getHeight());
 			assertArrayEquals(block900ArchiveData.getSignature(), block900RepositoryData.getSignature());
 
 			// Test some values in the archive
 			assertEquals(1, block900ArchiveData.getOnlineAccountsCount());
 
+			System.out.println("testWriterAndReader completed successfully.");
 		}
 	}
 
@@ -158,47 +193,66 @@ public class BlockArchiveV2Tests extends Common {
 	public void testArchivedAtStates() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testArchivedAtStates");
+
 			// Deploy an AT so that we have AT state data
+			System.out.println("Deploying AT...");
 			PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
 			byte[] creationBytes = AtUtils.buildSimpleAT();
 			long fundingAmount = 1_00000000L;
 			DeployAtTransaction deployAtTransaction =  AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
 			String atAddress = deployAtTransaction.getATAccount().getAddress();
+			System.out.println("AT deployed at address: " + atAddress);
 
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// 9 blocks are trimmed (this specifies the first untrimmed height)
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(10);
 			repository.getATRepository().setAtTrimHeight(10);
+			System.out.println("Set trim heights to 10.");
 
 			// Check the max archive height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height (Expected 9): " + maximumArchiveHeight);
 			assertEquals(9, maximumArchiveHeight);
 
 			// Write blocks 2-9 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 8)");
 			assertEquals(9 - 1, writer.getWrittenCount());
 
 			// Increment block archive height
 			repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount());
 			repository.saveChanges();
 			assertEquals(9 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight());
+			System.out.println("Block archive height updated to: " + (9 - 1));
 
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
 
 			// Check blocks 3-9
+			System.out.println("Checking blocks 2 to 9...");
 			for (Integer testHeight = 2; testHeight <= 9; testHeight++) {
 
+				System.out.println("Reading block " + testHeight + " from the archive...");
 				// Read a block from the archive
 				BlockArchiveReader reader = BlockArchiveReader.getInstance();
 				BlockTransformation blockInfo = reader.fetchBlockAtHeight(testHeight);
@@ -216,15 +270,18 @@ public class BlockArchiveV2Tests extends Common {
 
 				// Check the archived AT state
 				if (testHeight == 2) {
+					System.out.println("Checking block " + testHeight + " AT state data (expected transactions)...");
 					assertEquals(1, archivedTransactions.size());
 					assertEquals(Transaction.TransactionType.DEPLOY_AT, archivedTransactions.get(0).getType());
 				}
 				else {
+					System.out.println("Checking block " + testHeight + " AT state data (no transactions expected)...");
 					// Blocks 3+ shouldn't have any transactions
 					assertTrue(archivedTransactions.isEmpty());
 				}
 
 				// Ensure the archive has the AT states hash
+				System.out.println("Checking block " + testHeight + " AT states hash...");
 				assertNotNull(archivedAtStateHash);
 
 				// Also check the online accounts count and height
@@ -232,6 +289,7 @@ public class BlockArchiveV2Tests extends Common {
 				assertEquals(testHeight, archivedBlockData.getHeight());
 
 				// Ensure the values match
+				System.out.println("Comparing block " + testHeight + " data...");
 				assertEquals(archivedBlockData.getHeight(), repositoryBlockData.getHeight());
 				assertArrayEquals(archivedBlockData.getSignature(), repositoryBlockData.getSignature());
 				assertEquals(archivedBlockData.getOnlineAccountsCount(), repositoryBlockData.getOnlineAccountsCount());
@@ -249,10 +307,12 @@ public class BlockArchiveV2Tests extends Common {
 			}
 
 			// Check block 10 (unarchived)
+			System.out.println("Checking block 10 (should not be in archive)...");
 			BlockArchiveReader reader = BlockArchiveReader.getInstance();
 			BlockTransformation blockInfo = reader.fetchBlockAtHeight(10);
 			assertNull(blockInfo);
 
+			System.out.println("testArchivedAtStates completed successfully.");
 		}
 
 	}
@@ -261,32 +321,47 @@ public class BlockArchiveV2Tests extends Common {
 	public void testArchiveAndPrune() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testArchiveAndPrune");
+
 			// Deploy an AT so that we have AT state data
+			System.out.println("Deploying AT...");
 			PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
 			byte[] creationBytes = AtUtils.buildSimpleAT();
 			long fundingAmount = 1_00000000L;
 			AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
+			System.out.println("AT deployed successfully.");
 
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// Assume 900 blocks are trimmed (this specifies the first untrimmed height)
 			repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
 			repository.getATRepository().setAtTrimHeight(901);
+			System.out.println("Set trim heights to 901.");
 
 			// Check the max archive height - this should be one less than the first untrimmed height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
 			assertEquals(900, maximumArchiveHeight);
 
 			// Write blocks 2-900 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
 			assertEquals(900 - 1, writer.getWrittenCount());
 
 			// Increment block archive height
@@ -297,34 +372,48 @@ public class BlockArchiveV2Tests extends Common {
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
 
 			// Ensure the SQL repository contains blocks 2 and 900...
+			System.out.println("Verifying that blocks 2 and 900 exist in the repository...");
 			assertNotNull(repository.getBlockRepository().fromHeight(2));
 			assertNotNull(repository.getBlockRepository().fromHeight(900));
+			System.out.println("Blocks 2 and 900 are present in the repository.");
 
 			// Prune all the archived blocks
+			System.out.println("Pruning blocks 2 to 900...");
 			int numBlocksPruned = repository.getBlockRepository().pruneBlocks(0, 900);
+			System.out.println("Number of blocks pruned (Expected 899): " + numBlocksPruned);
 			assertEquals(900-1, numBlocksPruned);
 			repository.getBlockRepository().setBlockPruneHeight(901);
 
 			// Prune the AT states for the archived blocks
+			System.out.println("Pruning AT states up to height 900...");
 			repository.getATRepository().rebuildLatestAtStates(900);
 			repository.saveChanges();
 			int numATStatesPruned = repository.getATRepository().pruneAtStates(0, 900);
+			System.out.println("Number of AT states pruned (Expected 898): " + 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...
+			System.out.println("Verifying that blocks 2 and 900 have been pruned...");
 			assertNull(repository.getBlockRepository().fromHeight(2));
 			assertNull(repository.getBlockRepository().fromHeight(900));
+			System.out.println("Blocks 2 and 900 have been successfully pruned.");
 
 			// ... but it's not missing blocks 1 and 901 (we don't prune the genesis block)
+			System.out.println("Verifying that blocks 1 and 901 still exist...");
 			assertNotNull(repository.getBlockRepository().fromHeight(1));
 			assertNotNull(repository.getBlockRepository().fromHeight(901));
+			System.out.println("Blocks 1 and 901 are present in the repository.");
 
 			// Validate the latest block height in the repository
-			assertEquals(1002, (int) repository.getBlockRepository().getLastBlock().getHeight());
+			int lastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
+			System.out.println("Latest block height in repository (Expected 1002): " + lastBlockHeight);
+			assertEquals(1002, lastBlockHeight);
 
+			System.out.println("testArchiveAndPrune completed successfully.");
 		}
 	}
 
@@ -332,138 +421,191 @@ public class BlockArchiveV2Tests extends Common {
 	public void testTrimArchivePruneAndOrphan() throws DataException, InterruptedException, TransformationException, IOException {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testTrimArchivePruneAndOrphan");
+
 			// Deploy an AT so that we have AT state data
+			System.out.println("Deploying AT...");
 			PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
 			byte[] creationBytes = AtUtils.buildSimpleAT();
 			long fundingAmount = 1_00000000L;
 			AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
+			System.out.println("AT deployed successfully.");
 
 			// Mint some blocks so that we are able to archive them later
+			System.out.println("Minting 1000 blocks...");
 			for (int i = 0; i < 1000; i++) {
 				BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
+				// Log every 100 blocks
+				if ((i + 1) % 100 == 0) {
+					System.out.println("Minted block " + (i + 1));
+				}
 			}
+			System.out.println("Finished minting blocks.");
 
 			// Make sure that block 500 has full AT state data and data hash
+			System.out.println("Verifying block 500 AT state data...");
 			List<ATStateData> block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500);
 			ATStateData atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500);
 			assertNotNull(atStatesData.getStateHash());
 			assertNotNull(atStatesData.getStateData());
+			System.out.println("Block 500 AT state data verified.");
 
 			// Trim the first 500 blocks
+			System.out.println("Trimming 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);
+			System.out.println("Trimming completed.");
 
 			// Now block 499 should only have the AT state data hash
+			System.out.println("Checking block 499 AT state data...");
 			List<ATStateData> block499AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(499);
 			atStatesData = repository.getATRepository().getATStateAtHeight(block499AtStatesData.get(0).getATAddress(), 499);
 			assertNotNull(atStatesData.getStateHash());
 			assertNull(atStatesData.getStateData());
+			System.out.println("Block 499 AT state data contains only state hash as expected.");
 
 			// ... but block 500 should have the full data (due to being retained as the "latest" AT state in the trimmed range
+			System.out.println("Verifying block 500 AT state data again...");
 			block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500);
 			atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500);
 			assertNotNull(atStatesData.getStateHash());
 			assertNotNull(atStatesData.getStateData());
+			System.out.println("Block 500 AT state data contains full data.");
 
 			// ... and block 501 should also have the full data
+			System.out.println("Verifying block 501 AT state data...");
 			List<ATStateData> block501AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(501);
 			atStatesData = repository.getATRepository().getATStateAtHeight(block501AtStatesData.get(0).getATAddress(), 501);
 			assertNotNull(atStatesData.getStateHash());
 			assertNotNull(atStatesData.getStateData());
+			System.out.println("Block 501 AT state data contains full data.");
 
 			// Check the max archive height - this should be one less than the first untrimmed height
 			final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
+			System.out.println("Maximum archive height determined (Expected 500): " + maximumArchiveHeight);
 			assertEquals(500, maximumArchiveHeight);
 
 			BlockData block3DataPreArchive = repository.getBlockRepository().fromHeight(3);
 
 			// Write blocks 2-500 to the archive
+			System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
 			BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
 			writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
 			BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
+			System.out.println("Finished writing blocks to archive. Result: " + result);
 			assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
 
 			// Make sure that the archive contains the correct number of blocks
+			System.out.println("Number of blocks written to archive (Expected 499): " + writer.getWrittenCount());
 			assertEquals(500 - 1, writer.getWrittenCount()); // -1 for the genesis block
 
 			// Increment block archive height
 			repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount());
 			repository.saveChanges();
 			assertEquals(500 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight());
+			System.out.println("Block archive height updated to: " + (500 - 1));
 
 			// Ensure the file exists
 			File outputFile = writer.getOutputPath().toFile();
 			assertTrue(outputFile.exists());
+			System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
 
 			// Ensure the SQL repository contains blocks 2 and 500...
+			System.out.println("Verifying that blocks 2 and 500 exist in the repository...");
 			assertNotNull(repository.getBlockRepository().fromHeight(2));
 			assertNotNull(repository.getBlockRepository().fromHeight(500));
+			System.out.println("Blocks 2 and 500 are present in the repository.");
 
 			// Prune all the archived blocks
+			System.out.println("Pruning blocks 2 to 500...");
 			int numBlocksPruned = repository.getBlockRepository().pruneBlocks(0, 500);
+			System.out.println("Number of blocks pruned (Expected 499): " + numBlocksPruned);
 			assertEquals(500-1, numBlocksPruned);
 			repository.getBlockRepository().setBlockPruneHeight(501);
 
 			// Prune the AT states for the archived blocks
+			System.out.println("Pruning AT states up to height 500...");
 			repository.getATRepository().rebuildLatestAtStates(500);
 			repository.saveChanges();
 			int numATStatesPruned = repository.getATRepository().pruneAtStates(2, 500);
+			System.out.println("Number of AT states pruned (Expected 498): " + 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...
+			System.out.println("Verifying that blocks 2 and 500 have been pruned...");
 			assertNull(repository.getBlockRepository().fromHeight(2));
 			assertNull(repository.getBlockRepository().fromHeight(500));
+			System.out.println("Blocks 2 and 500 have been successfully pruned.");
 
 			// ... but it's not missing blocks 1 and 501 (we don't prune the genesis block)
+			System.out.println("Verifying that blocks 1 and 501 still exist...");
 			assertNotNull(repository.getBlockRepository().fromHeight(1));
 			assertNotNull(repository.getBlockRepository().fromHeight(501));
+			System.out.println("Blocks 1 and 501 are present in the repository.");
 
 			// Validate the latest block height in the repository
-			assertEquals(1002, (int) repository.getBlockRepository().getLastBlock().getHeight());
+			int lastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
+			System.out.println("Latest block height in repository (Expected 1002): " + lastBlockHeight);
+			assertEquals(1002, lastBlockHeight);
 
 			// Now orphan some unarchived blocks.
+			System.out.println("Orphaning 500 blocks...");
 			BlockUtils.orphanBlocks(repository, 500);
-			assertEquals(502, (int) repository.getBlockRepository().getLastBlock().getHeight());
+			int currentLastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
+			System.out.println("New last block height after orphaning (Expected 502): " + currentLastBlockHeight);
+			assertEquals(502, currentLastBlockHeight);
 
 			// We're close to the lower limit of the SQL database now, so
 			// we need to import some blocks from the archive
+			System.out.println("Importing blocks 401 to 500 from the archive...");
 			BlockArchiveUtils.importFromArchive(401, 500, repository);
 
 			// Ensure the SQL repository now contains block 401 but not 400...
+			System.out.println("Verifying that block 401 exists and block 400 does not...");
 			assertNotNull(repository.getBlockRepository().fromHeight(401));
 			assertNull(repository.getBlockRepository().fromHeight(400));
+			System.out.println("Block 401 exists, block 400 does not.");
 
 			// Import the remaining 399 blocks
+			System.out.println("Importing blocks 2 to 400 from the archive...");
 			BlockArchiveUtils.importFromArchive(2, 400, repository);
 
 			// Verify that block 3 matches the original
+			System.out.println("Verifying that block 3 matches the original data...");
 			BlockData block3DataPostArchive = repository.getBlockRepository().fromHeight(3);
 			assertArrayEquals(block3DataPreArchive.getSignature(), block3DataPostArchive.getSignature());
 			assertEquals(block3DataPreArchive.getHeight(), block3DataPostArchive.getHeight());
+			System.out.println("Block 3 data matches the original.");
 
 			// Orphan 2 more block, which should be the last one that is possible to be orphaned
 			// TODO: figure out why this is 1 block more than in the equivalent block archive V1 test
+			System.out.println("Orphaning 2 more blocks...");
 			BlockUtils.orphanBlocks(repository, 2);
+			System.out.println("Orphaned 2 blocks successfully.");
 
 			// Orphan another block, which should fail
+			System.out.println("Attempting to orphan another block, which should fail...");
 			Exception exception = null;
 			try {
 				BlockUtils.orphanBlocks(repository, 1);
 			} catch (DataException e) {
 				exception = e;
+				System.out.println("Caught expected DataException: " + e.getMessage());
 			}
 
 			// Ensure that a DataException is thrown because there is no more AT states data available
 			assertNotNull(exception);
 			assertEquals(DataException.class, exception.getClass());
+			System.out.println("DataException confirmed due to lack of AT states data.");
 
 			// FUTURE: we may be able to retain unique AT states when trimming, to avoid this exception
 			// and allow orphaning back through blocks with trimmed AT states.
 
+			System.out.println("testTrimArchivePruneAndOrphan completed successfully.");
 		}
 	}
 
@@ -477,16 +619,26 @@ public class BlockArchiveV2Tests extends Common {
 	public void testMissingAtStatesHeightIndex() throws DataException, SQLException {
 		try (final HSQLDBRepository repository = (HSQLDBRepository) RepositoryManager.getRepository()) {
 
+			System.out.println("Starting testMissingAtStatesHeightIndex");
+
 			// Firstly check that we're able to prune or archive when the index exists
+			System.out.println("Checking existence of ATStatesHeightIndex...");
 			assertTrue(repository.getATRepository().hasAtStatesHeightIndex());
 			assertTrue(RepositoryManager.canArchiveOrPrune());
+			System.out.println("ATStatesHeightIndex exists. Archiving and pruning are possible.");
 
 			// Delete the index
+			System.out.println("Dropping ATStatesHeightIndex...");
 			repository.prepareStatement("DROP INDEX ATSTATESHEIGHTINDEX").execute();
+			System.out.println("ATStatesHeightIndex dropped.");
 
 			// Ensure check that we're unable to prune or archive when the index doesn't exist
+			System.out.println("Verifying that ATStatesHeightIndex no longer exists...");
 			assertFalse(repository.getATRepository().hasAtStatesHeightIndex());
 			assertFalse(RepositoryManager.canArchiveOrPrune());
+			System.out.println("ATStatesHeightIndex does not exist. Archiving and pruning are disabled.");
+
+			System.out.println("testMissingAtStatesHeightIndex completed successfully.");
 		}
 	}
 
@@ -496,8 +648,10 @@ public class BlockArchiveV2Tests extends Common {
 		Path archivePath = Paths.get(Settings.getInstance().getRepositoryPath(), "archive").toAbsolutePath();
 		try {
 			FileUtils.deleteDirectory(archivePath.toFile());
+			System.out.println("Deleted archive directory at: " + archivePath);
 		} catch (IOException e) {
 
+			System.out.println("Failed to delete archive directory: " + e.getMessage());
 		}
 	}
 

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

@@ -91,7 +91,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -94,7 +94,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 9999999999999,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -85,14 +85,20 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 99999999,
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"selfSponsorshipAlgoV2Height": 999999999,
+		"selfSponsorshipAlgoV3Height": 999999999,
 		"feeValidationFixTimestamp": 0,
 		"chatReferenceTimestamp": 0,
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
-		"selfSponsorshipAlgoV2Height": 9999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
 		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999,
 		"penaltyFixHeight": 5
 	},
 	"genesisInfo": {

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

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -96,7 +96,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 500,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-self-sponsorship-algo-v1.json

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-self-sponsorship-algo-v2.json

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,

src/test/resources/test-chain-v2-self-sponsorship-algo-v3.json

@@ -95,7 +95,12 @@
 		"arbitraryOptionalFeeTimestamp": 0,
 		"unconfirmableRewardSharesHeight": 99999999,
 		"disableTransferPrivsTimestamp": 9999999999500,
-		"enableTransferPrivsTimestamp": 9999999999950
+		"enableTransferPrivsTimestamp": 9999999999950,
+		"cancelSellNameValidationTimestamp": 9999999999999,
+		"disableRewardshareHeight": 9999999999990,
+		"enableRewardshareHeight": 9999999999999,
+		"onlyMintWithNameHeight": 9999999999999,
+		"groupMemberCheckHeight": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,