Bump version to 3.2.4

This reverts commit 311f41c610.

pom.xml

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

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

@@ -425,9 +425,8 @@ public class BlockChain {
 	}
 
 	public long getNameRegistrationUnitFeeAtTimestamp(long ourTimestamp) {
-		// Scan through for reward at our height
-		for (int i = 0; i < nameRegistrationUnitFees.size(); ++i)
-			if (ourTimestamp >= nameRegistrationUnitFees.get(i).timestamp)
+		for (int i = nameRegistrationUnitFees.size() - 1; i >= 0; --i)
+			if (nameRegistrationUnitFees.get(i).timestamp <= ourTimestamp)
 				return nameRegistrationUnitFees.get(i).fee;
 
 		// Default to system-wide unit fee

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

@@ -219,7 +219,7 @@ public class BlockMinter extends Thread {
 					// The last iteration found a higher weight block in the network, so sleep for a while
 					// to allow is to sync the higher weight chain. We are sleeping here rather than when
 					// detected as we don't want to hold the blockchain lock open.
-					LOGGER.info("Sleeping for 10 seconds...");
+					LOGGER.debug("Sleeping for 10 seconds...");
 					Thread.sleep(10 * 1000L);
 				}
 
@@ -328,13 +328,13 @@ public class BlockMinter extends Thread {
 							// If less than 30 seconds has passed since first detection the higher weight chain,
 							// we should skip our block submission to give us the opportunity to sync to the better chain
 							if (NTP.getTime() - timeOfLastLowWeightBlock < 30*1000L) {
-								LOGGER.info("Higher weight chain found in peers, so not signing a block this round");
-								LOGGER.info("Time since detected: {}", NTP.getTime() - timeOfLastLowWeightBlock);
+								LOGGER.debug("Higher weight chain found in peers, so not signing a block this round");
+								LOGGER.debug("Time since detected: {}ms", NTP.getTime() - timeOfLastLowWeightBlock);
 								continue;
 							}
 							else {
 								// More than 30 seconds have passed, so we should submit our block candidate anyway.
-								LOGGER.info("More than 30 seconds passed, so proceeding to submit block candidate...");
+								LOGGER.debug("More than 30 seconds passed, so proceeding to submit block candidate...");
 							}
 						}
 						else {

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

@@ -573,15 +573,20 @@ public class Controller extends Thread {
 								MessageType.INFO);
 
 					LOGGER.info("Starting scheduled repository maintenance. This can take a while...");
-					try (final Repository repository = RepositoryManager.getRepository()) {
+					int attempts = 0;
+					while (attempts <= 5) {
+						try (final Repository repository = RepositoryManager.getRepository()) {
+							attempts++;
 
-						// Timeout if the database isn't ready for maintenance after 60 seconds
-						long timeout = 60 * 1000L;
-						repository.performPeriodicMaintenance(timeout);
+							// Timeout if the database isn't ready for maintenance after 60 seconds
+							long timeout = 60 * 1000L;
+							repository.performPeriodicMaintenance(timeout);
 
-						LOGGER.info("Scheduled repository maintenance completed");
-					} catch (DataException | TimeoutException e) {
-						LOGGER.error("Scheduled repository maintenance failed", e);
+							LOGGER.info("Scheduled repository maintenance completed");
+							break;
+						} catch (DataException | TimeoutException e) {
+							LOGGER.info("Scheduled repository maintenance failed. Retrying up to 5 times...", e);
+						}
 					}
 
 					// Get a new random interval

src/main/java/org/qortal/gui/Gui.java

@@ -47,12 +47,12 @@ public class Gui {
 		this.splashFrame = SplashFrame.getInstance();
 	}
 
-	protected static BufferedImage loadImage(String resourceName) throws IOException {
+	protected static BufferedImage loadImage(String resourceName) {
 		try (InputStream in = Gui.class.getResourceAsStream("/images/" + resourceName)) {
 			return ImageIO.read(in);
 		} catch (IllegalArgumentException | IOException | ServiceConfigurationError e) {
 			LOGGER.warn(String.format("Couldn't locate image resource \"images/%s\"", resourceName));
-			throw new IOException(String.format("Couldn't locate image resource \"images/%s\"", resourceName));
+			return null;
 		}
 	}
 

src/main/java/org/qortal/gui/SplashFrame.java

@@ -1,7 +1,6 @@
 package org.qortal.gui;
 
 import java.awt.*;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.awt.image.BufferedImage;
@@ -30,23 +29,18 @@ public class SplashFrame {
 		private JLabel statusLabel;
 
 		public SplashPanel() {
-			try {
-				image = Gui.loadImage(defaultSplash);
-
-				// Add logo
-				JLabel imageLabel = new JLabel(new ImageIcon(image));
-				imageLabel.setSize(new Dimension(300, 300));
-				add(imageLabel);
-			}
-			catch (IOException e) {
-				LOGGER.warn("Unable to load splash panel image");
-			}
+			image = Gui.loadImage(defaultSplash);
 
 			setOpaque(true);
 			setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
 			setBorder(new EmptyBorder(10, 10, 10, 10));
 			setBackground(Color.BLACK);
 
+			// Add logo
+			JLabel imageLabel = new JLabel(new ImageIcon(image));
+			imageLabel.setSize(new Dimension(300, 300));
+			add(imageLabel);
+
 			// Add spacing
 			add(Box.createRigidArea(new Dimension(0, 16)));
 
@@ -81,20 +75,15 @@ public class SplashFrame {
 
 		this.splashDialog = new JFrame();
 
-		try {
-			List<Image> icons = new ArrayList<>();
-			icons.add(Gui.loadImage("icons/icon16.png"));
-			icons.add(Gui.loadImage("icons/qortal_ui_tray_synced.png"));
-			icons.add(Gui.loadImage("icons/qortal_ui_tray_syncing_time-alt.png"));
-			icons.add(Gui.loadImage("icons/qortal_ui_tray_minting.png"));
-			icons.add(Gui.loadImage("icons/qortal_ui_tray_syncing.png"));
-			icons.add(Gui.loadImage("icons/icon64.png"));
-			icons.add(Gui.loadImage("icons/Qlogo_128.png"));
-			this.splashDialog.setIconImages(icons);
-		}
-		catch (IOException e) {
-			LOGGER.warn("Unable to load splash frame icons");
-		}
+		List<Image> icons = new ArrayList<>();
+		icons.add(Gui.loadImage("icons/icon16.png"));
+		icons.add(Gui.loadImage("icons/qortal_ui_tray_synced.png"));
+		icons.add(Gui.loadImage("icons/qortal_ui_tray_syncing_time-alt.png"));
+		icons.add(Gui.loadImage("icons/qortal_ui_tray_minting.png"));
+		icons.add(Gui.loadImage("icons/qortal_ui_tray_syncing.png"));
+		icons.add(Gui.loadImage("icons/icon64.png"));
+		icons.add(Gui.loadImage("icons/Qlogo_128.png"));
+		this.splashDialog.setIconImages(icons);
 
 		this.splashPanel = new SplashPanel();
 		this.splashDialog.getContentPane().add(this.splashPanel);

src/main/java/org/qortal/gui/SysTray.java

@@ -61,13 +61,7 @@ public class SysTray {
 		this.popupMenu = createJPopupMenu();
 
 		// Build TrayIcon without AWT PopupMenu (which doesn't support Unicode)...
-		try {
-			this.trayIcon = new TrayIcon(Gui.loadImage("icons/qortal_ui_tray_synced.png"), "qortal", null);
-		}
-		catch (IOException e) {
-			LOGGER.warn("Unable to load system tray icon");
-			return;
-		}
+		this.trayIcon = new TrayIcon(Gui.loadImage("icons/qortal_ui_tray_synced.png"), "qortal", null);
 		// ...and attach mouse listener instead so we can use JPopupMenu (which does support Unicode)
 		this.trayIcon.addMouseListener(new MouseAdapter() {
 			@Override

src/main/java/org/qortal/transform/transaction/ArbitraryTransactionTransformer.java

@@ -39,12 +39,12 @@ public class ArbitraryTransactionTransformer extends TransactionTransformer {
 	private static final int IDENTIFIER_SIZE_LENGTH = INT_LENGTH;
 	private static final int COMPRESSION_LENGTH = INT_LENGTH;
 	private static final int METHOD_LENGTH = INT_LENGTH;
-	private static final int SECRET_LENGTH = INT_LENGTH; // TODO: wtf?
+	private static final int SECRET_SIZE_LENGTH = INT_LENGTH;
 
 	private static final int EXTRAS_LENGTH = SERVICE_LENGTH + DATA_TYPE_LENGTH + DATA_SIZE_LENGTH;
 
 	private static final int EXTRAS_V5_LENGTH = NONCE_LENGTH + NAME_SIZE_LENGTH + IDENTIFIER_SIZE_LENGTH +
-			METHOD_LENGTH + SECRET_LENGTH + COMPRESSION_LENGTH + RAW_DATA_SIZE_LENGTH + METADATA_HASH_SIZE_LENGTH;
+			METHOD_LENGTH + SECRET_SIZE_LENGTH + COMPRESSION_LENGTH + RAW_DATA_SIZE_LENGTH + METADATA_HASH_SIZE_LENGTH;
 
 	protected static final TransactionLayout layout;
 

src/main/resources/blockchain.json

@@ -5,7 +5,8 @@
 	"maxBytesPerUnitFee": 1024,
 	"unitFee": "0.001",
 	"nameRegistrationUnitFees": [
-		{ "timestamp": 1645372800000, "fee": "5" }
+		{ "timestamp": 1645372800000, "fee": "5" },
+		{ "timestamp": 1651420800000, "fee": "1.25" }
 	],
 	"useBrokenMD160ForAddresses": false,
 	"requireGroupForApproval": false,

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

@@ -356,8 +356,15 @@ public class MiscTests extends Common {
 			UnitFeesByTimestamp pastFeeIncrease = new UnitFeesByTimestamp();
 			pastFeeIncrease.timestamp = now - 1000L; // 1 second ago
 			pastFeeIncrease.fee = new AmountTypeAdapter().unmarshal("3");
-			FieldUtils.writeField(BlockChain.getInstance(), "nameRegistrationUnitFees", Arrays.asList(pastFeeIncrease), true);
+
+			// Set another increase in the future
+			futureFeeIncrease = new UnitFeesByTimestamp();
+			futureFeeIncrease.timestamp = now + (60 * 60 * 1000L); // 1 hour in the future
+			futureFeeIncrease.fee = new AmountTypeAdapter().unmarshal("10");
+
+			FieldUtils.writeField(BlockChain.getInstance(), "nameRegistrationUnitFees", Arrays.asList(pastFeeIncrease, futureFeeIncrease), true);
 			assertEquals(pastFeeIncrease.fee, BlockChain.getInstance().getNameRegistrationUnitFeeAtTimestamp(pastFeeIncrease.timestamp));
+			assertEquals(futureFeeIncrease.fee, BlockChain.getInstance().getNameRegistrationUnitFeeAtTimestamp(futureFeeIncrease.timestamp));
 
 			// Register a different name
 			// First try with the default unit fee