Renamed the "bindAddress" setting to "bindAddresses". It is now an array of strings, allowing for multiple addresses to be specified in order of importance. Each address is tried in turn until one successfully binds, trying IPv6 first by default and then IPv4. This fixes an issue where the core failed to start on IPv4-only networks unless the bindAddress was manually overridden in Settings.json. This was reported in issue #25, and is also quite commonly reported by new users on Discord. It will now start correctly on both IPv4-only and IPv6-only networks, because it will automatically fall back to an IPv4 bindAddress if the IPv6 one fails to bind.

AutoUpdates.md

@@ -2,7 +2,6 @@
 
 ## TL;DR: how-to
 
-* Prepare new release version (see way below for details)
 * Assuming you are in git 'master' branch, at HEAD
 * Shutdown local node if running
 * Build auto-update download: `tools/build-auto-update.sh` - uploads auto-update file into new git branch
@@ -60,12 +59,4 @@ $ java -cp qortal.jar org.qortal.XorUpdate
 usage: XorUpdate <input-file> <output-file>
 $ java -cp qortal.jar org.qortal.XorUpdate qortal.jar qortal.update
 $
-```
-
-## Preparing new release version
-
-* Shutdown local node
-* Modify `pom.xml` and increase version inside `<version>` tag
-* Commit new `pom.xml` and push to github, e.g. `git commit -m 'Bumped to v1.4.2' -- pom.xml; git push`
-* Tag this new commit with same version: `git tag v1.4.2`
-* Push tag up to github: `git push origin v1.4.2`
+```

WindowsInstaller/Qortal.aip

@@ -19,10 +19,10 @@
     <ROW Property="Manufacturer" Value="Qortal"/>
     <ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
     <ROW Property="NTP_GOOD" Value="false"/>
-    <ROW Property="ProductCode" Value="1033:{DE0C17EF-F9D2-48A3-A0D7-FF7BB01698A2} 1049:{89129011-9CE7-44AD-97EC-152371A87D58} 2052:{C93D5260-C6BD-4341-A96D-7D878EE6D59B} 2057:{AE6EDB44-3120-4588-8C9A-558F1BE42D73} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{9BC18BE1-7E1F-4103-9B2B-EC26CF4CE974} 1049:{6DD00C11-C69C-49FD-BCAF-BE2F0A7175AA} 2052:{9898B095-DAA0-49D5-B190-0B9A14C80E90} 2057:{FAD15601-2960-4759-9CF4-047B69FF6D17} " Type="16"/>
     <ROW Property="ProductLanguage" Value="2057"/>
     <ROW Property="ProductName" Value="Qortal"/>
-    <ROW Property="ProductVersion" Value="1.4.5" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.4.1" Type="32"/>
     <ROW Property="RECONFIG_NTP" Value="true"/>
     <ROW Property="REMOVE_BLOCKCHAIN" Value="YES" Type="4"/>
     <ROW Property="REPAIR_BLOCKCHAIN" Value="YES" Type="4"/>
@@ -174,7 +174,7 @@
     <ROW Component="ADDITIONAL_LICENSE_INFO_97" ComponentId="{D5544706-E2A7-424F-AEA5-3963E355AA29}" Directory_="jdk.crypto.mscapi_Dir" Attributes="0" KeyPath="ADDITIONAL_LICENSE_INFO_97" Type="0"/>
     <ROW Component="ADDITIONAL_LICENSE_INFO_98" ComponentId="{104DBCE8-A458-4B3E-9EFA-2D8613561619}" Directory_="jdk.dynalink_Dir" Attributes="0" KeyPath="ADDITIONAL_LICENSE_INFO_98" Type="0"/>
     <ROW Component="ADDITIONAL_LICENSE_INFO_99" ComponentId="{D02E3C37-E81A-48FA-9E28-B26B728AECD9}" Directory_="jdk.httpserver_Dir" Attributes="0" KeyPath="ADDITIONAL_LICENSE_INFO_99" Type="0"/>
-    <ROW Component="AI_CustomARPName" ComponentId="{CFB6FB43-13A6-4A4F-BCF9-7698463CE032}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
+    <ROW Component="AI_CustomARPName" ComponentId="{23EC1B2A-D6F8-459B-B5CA-6974919022A6}" 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="DATA_PATH" ComponentId="{EE0B6107-E244-4CDB-B195-E9038D2F1E0E}" Directory_="DATA_PATH" Attributes="0"/>

pom.xml

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

src/main/java/org/qortal/api/ApiService.java

@@ -46,6 +46,7 @@ import org.qortal.api.websocket.ChatMessagesWebSocket;
 import org.qortal.api.websocket.PresenceWebSocket;
 import org.qortal.api.websocket.TradeBotWebSocket;
 import org.qortal.api.websocket.TradeOffersWebSocket;
+import org.qortal.network.Network;
 import org.qortal.settings.Settings;
 
 public class ApiService {
@@ -118,13 +119,13 @@ public class ApiService {
 				ServerConnector portUnifiedConnector = new ServerConnector(this.server,
 						new DetectorConnectionFactory(sslConnectionFactory),
 						httpConnectionFactory);
-				portUnifiedConnector.setHost(Settings.getInstance().getBindAddress());
+				portUnifiedConnector.setHost(Network.getInstance().getBindAddress());
 				portUnifiedConnector.setPort(Settings.getInstance().getApiPort());
 
 				this.server.addConnector(portUnifiedConnector);
 			} else {
 				// Non-SSL
-				InetAddress bindAddr = InetAddress.getByName(Settings.getInstance().getBindAddress());
+				InetAddress bindAddr = InetAddress.getByName(Network.getInstance().getBindAddress());
 				InetSocketAddress endpoint = new InetSocketAddress(bindAddr, Settings.getInstance().getApiPort());
 				this.server = new Server(endpoint);
 			}

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

@@ -357,7 +357,7 @@ public class Block {
 			System.arraycopy(onlineAccountData.getSignature(), 0, onlineAccountsSignatures, i * Transformer.SIGNATURE_LENGTH, Transformer.SIGNATURE_LENGTH);
 		}
 
-		byte[] minterSignature = minter.sign(BlockTransformer.getBytesForMinterSignature(parentBlockData,
+		byte[] minterSignature = minter.sign(BlockTransformer.getBytesForMinterSignature(parentBlockData.getMinterSignature(),
 				minter.getPublicKey(), encodedOnlineAccounts));
 
 		// Qortal: minter is always a reward-share, so find actual minter and get their effective minting level
@@ -424,7 +424,7 @@ public class Block {
 		int version = this.blockData.getVersion();
 		byte[] reference = this.blockData.getReference();
 
-		byte[] minterSignature = minter.sign(BlockTransformer.getBytesForMinterSignature(parentBlockData,
+		byte[] minterSignature = minter.sign(BlockTransformer.getBytesForMinterSignature(parentBlockData.getMinterSignature(),
 				minter.getPublicKey(), this.blockData.getEncodedOnlineAccounts()));
 
 		// Qortal: minter is always a reward-share, so find actual minter and get their effective minting level
@@ -738,7 +738,11 @@ public class Block {
 		if (!(this.minter instanceof PrivateKeyAccount))
 			throw new IllegalStateException("Block's minter is not a PrivateKeyAccount - can't sign!");
 
-		this.blockData.setMinterSignature(((PrivateKeyAccount) this.minter).sign(BlockTransformer.getBytesForMinterSignature(this.blockData)));
+		try {
+			this.blockData.setMinterSignature(((PrivateKeyAccount) this.minter).sign(BlockTransformer.getBytesForMinterSignature(this.blockData)));
+		} catch (TransformationException e) {
+			throw new RuntimeException("Unable to calculate block's minter signature", e);
+		}
 	}
 
 	/**

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

@@ -70,8 +70,7 @@ public class BlockChain {
 	private GenesisBlock.GenesisInfo genesisInfo;
 
 	public enum FeatureTrigger {
-		atFindNextTransactionFix,
-		newBlockSigHeight;
+		atFindNextTransactionFix;
 	}
 
 	/** Map of which blockchain features are enabled when (height/timestamp) */
@@ -377,10 +376,6 @@ public class BlockChain {
 		return this.featureTriggers.get(FeatureTrigger.atFindNextTransactionFix.name()).intValue();
 	}
 
-	public int getNewBlockSigHeight() {
-		return this.featureTriggers.get(FeatureTrigger.newBlockSigHeight.name()).intValue();
-	}
-
 	// More complex getters for aspects that change by height or timestamp
 
 	public long getRewardAtHeight(int ourHeight) {

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

@@ -165,14 +165,6 @@ public class BlockMinter extends Thread {
 				// Do we need to build any potential new blocks?
 				List<PrivateKeyAccount> newBlocksMintingAccounts = mintingAccountsData.stream().map(accountData -> new PrivateKeyAccount(repository, accountData.getPrivateKey())).collect(Collectors.toList());
 
-				// We might need to sit the next block out, if one of our minting accounts signed the previous one
-				final byte[] previousBlockMinter = previousBlockData.getMinterPublicKey();
-				final boolean mintedLastBlock = mintingAccountsData.stream().anyMatch(mintingAccount -> Arrays.equals(mintingAccount.getPublicKey(), previousBlockMinter));
-				if (mintedLastBlock) {
-					LOGGER.trace(String.format("One of our keys signed the last block, so we won't sign the next one"));
-					continue;
-				}
-
 				for (PrivateKeyAccount mintingAccount : newBlocksMintingAccounts) {
 					// First block does the AT heavy-lifting
 					if (newBlocks.isEmpty()) {

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

@@ -67,8 +67,8 @@ import org.qortal.gui.SysTray;
 import org.qortal.network.Network;
 import org.qortal.network.Peer;
 import org.qortal.network.message.ArbitraryDataMessage;
+import org.qortal.network.message.BlockMessage;
 import org.qortal.network.message.BlockSummariesMessage;
-import org.qortal.network.message.CachedBlockMessage;
 import org.qortal.network.message.GetArbitraryDataMessage;
 import org.qortal.network.message.GetBlockMessage;
 import org.qortal.network.message.GetBlockSummariesMessage;
@@ -143,15 +143,16 @@ public class Controller extends Thread {
 	private ExecutorService callbackExecutor = Executors.newFixedThreadPool(3);
 	private volatile boolean notifyGroupMembershipChange = false;
 
+	private static final int BLOCK_CACHE_SIZE = 10; // To cover typical Synchronizer request + a few spare
 	/** Latest blocks on our chain. Note: tail/last is the latest block. */
 	private final Deque<BlockData> latestBlocks = new LinkedList<>();
 
 	/** Cache of BlockMessages, indexed by block signature */
 	@SuppressWarnings("serial")
-	private final LinkedHashMap<ByteArray, CachedBlockMessage> blockMessageCache = new LinkedHashMap<>() {
+	private final LinkedHashMap<ByteArray, BlockMessage> blockMessageCache = new LinkedHashMap<>() {
 		@Override
-		protected boolean removeEldestEntry(Map.Entry<ByteArray, CachedBlockMessage> eldest) {
-			return this.size() > Settings.getInstance().getBlockCacheSize();
+		protected boolean removeEldestEntry(Map.Entry<ByteArray, BlockMessage> eldest) {
+			return this.size() > BLOCK_CACHE_SIZE;
 		}
 	};
 
@@ -318,12 +319,11 @@ public class Controller extends Thread {
 		// Set initial chain height/tip
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			BlockData blockData = repository.getBlockRepository().getLastBlock();
-			int blockCacheSize = Settings.getInstance().getBlockCacheSize();
 
 			synchronized (this.latestBlocks) {
 				this.latestBlocks.clear();
 
-				for (int i = 0; i < blockCacheSize && blockData != null; ++i) {
+				for (int i = 0; i < BLOCK_CACHE_SIZE && blockData != null; ++i) {
 					this.latestBlocks.addFirst(blockData);
 					blockData = repository.getBlockRepository().fromHeight(blockData.getHeight() - 1);
 				}
@@ -933,7 +933,6 @@ public class Controller extends Thread {
 	public void onNewBlock(BlockData latestBlockData) {
 		// Protective copy
 		BlockData blockDataCopy = new BlockData(latestBlockData);
-		int blockCacheSize = Settings.getInstance().getBlockCacheSize();
 
 		synchronized (this.latestBlocks) {
 			BlockData cachedChainTip = this.latestBlocks.peekLast();
@@ -943,7 +942,7 @@ public class Controller extends Thread {
 				this.latestBlocks.addLast(latestBlockData);
 
 				// Trim if necessary
-				if (this.latestBlocks.size() >= blockCacheSize)
+				if (this.latestBlocks.size() >= BLOCK_CACHE_SIZE)
 					this.latestBlocks.pollFirst();
 			} else {
 				if (cachedChainTip != null)
@@ -1151,15 +1150,14 @@ public class Controller extends Thread {
 
 		ByteArray signatureAsByteArray = new ByteArray(signature);
 
-		CachedBlockMessage cachedBlockMessage = this.blockMessageCache.get(signatureAsByteArray);
-		int blockCacheSize = Settings.getInstance().getBlockCacheSize();
+		BlockMessage cachedBlockMessage = this.blockMessageCache.get(signatureAsByteArray);
 
 		// Check cached latest block message
 		if (cachedBlockMessage != null) {
 			this.stats.getBlockMessageStats.cacheHits.incrementAndGet();
 
 			// We need to duplicate it to prevent multiple threads setting ID on the same message
-			CachedBlockMessage clonedBlockMessage = cachedBlockMessage.cloneWithNewId(message.getId());
+			BlockMessage clonedBlockMessage = cachedBlockMessage.cloneWithNewId(message.getId());
 
 			if (!peer.sendMessage(clonedBlockMessage))
 				peer.disconnect("failed to send block");
@@ -1187,18 +1185,15 @@ public class Controller extends Thread {
 
 			Block block = new Block(repository, blockData);
 
-			CachedBlockMessage blockMessage = new CachedBlockMessage(block);
+			BlockMessage blockMessage = new BlockMessage(block);
 			blockMessage.setId(message.getId());
 
 			// This call also causes the other needed data to be pulled in from repository
-			if (!peer.sendMessage(blockMessage)) {
+			if (!peer.sendMessage(blockMessage))
 				peer.disconnect("failed to send block");
-				// Don't fall-through to caching because failure to send might be from failure to build message
-				return;
-			}
 
 			// If request is for a recent block, cache it
-			if (getChainHeight() - blockData.getHeight() <= blockCacheSize) {
+			if (getChainHeight() - blockData.getHeight() <= BLOCK_CACHE_SIZE) {
 				this.stats.getBlockMessageStats.cacheFills.incrementAndGet();
 
 				this.blockMessageCache.put(new ByteArray(blockData.getSignature()), blockMessage);
@@ -1212,18 +1207,6 @@ public class Controller extends Thread {
 		TransactionMessage transactionMessage = (TransactionMessage) message;
 		TransactionData transactionData = transactionMessage.getTransactionData();
 
-		/*
-		 *  If we can't obtain blockchain lock immediately,
-		 *  e.g. Synchronizer is active, or another transaction is taking a while to validate,
-		 *  then we're using up a network thread for ages and clogging things up
-		 *  so bail out early
-		 */
-		ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
-		if (!blockchainLock.tryLock()) {
-			LOGGER.trace(() -> String.format("Too busy to import %s transaction %s from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer));
-			return;
-		}
-
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			Transaction transaction = Transaction.fromData(repository, transactionData);
 
@@ -1253,8 +1236,6 @@ public class Controller extends Thread {
 			LOGGER.debug(() -> String.format("Imported %s transaction %s from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer));
 		} catch (DataException e) {
 			LOGGER.error(String.format("Repository issue while processing transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer), e);
-		} finally {
-			blockchainLock.unlock();
 		}
 	}
 

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

@@ -39,23 +39,10 @@ public class Synchronizer {
 
 	private static final Logger LOGGER = LogManager.getLogger(Synchronizer.class);
 
-	/** Max number of new blocks we aim to add to chain tip in each sync round */
-	private static final int SYNC_BATCH_SIZE = 200; // XXX move to Settings?
-
-	/** Initial jump back of block height when searching for common block with peer */
 	private static final int INITIAL_BLOCK_STEP = 8;
-	/** Maximum jump back of block height when searching for common block with peer */
-	private static final int MAXIMUM_BLOCK_STEP = 128;
-
-	/** Maximum difference in block height between tip and peer's common block before peer is considered TOO DIVERGENT */
+	private static final int MAXIMUM_BLOCK_STEP = 500;
 	private static final int MAXIMUM_COMMON_DELTA = 240; // XXX move to Settings?
-
-	/** Maximum number of block signatures we ask from peer in one go */
-	private static final int MAXIMUM_REQUEST_SIZE = 200; // XXX move to Settings?
-
-	/** Number of retry attempts if a peer fails to respond with the requested data */
-	private static final int MAXIMUM_RETRIES = 1; // XXX move to Settings?
-
+	private static final int SYNC_BATCH_SIZE = 200;
 
 	private static Synchronizer instance;
 
@@ -257,13 +244,9 @@ public class Synchronizer {
 		// Currently we work forward from common block until we hit a block we don't have
 		// TODO: rewrite as modified binary search!
 		int i;
-		for (i = 1; i < blockSummariesFromCommon.size(); ++i) {
-			if (Controller.isStopping())
-				return SynchronizationResult.SHUTTING_DOWN;
-
+		for (i = 1; i < blockSummariesFromCommon.size(); ++i)
 			if (!repository.getBlockRepository().exists(blockSummariesFromCommon.get(i).getSignature()))
 				break;
-		}
 
 		// Note: index i - 1 isn't cleared: List.subList is fromIndex inclusive to toIndex exclusive
 		blockSummariesFromCommon.subList(0, i - 1).clear();
@@ -312,9 +295,6 @@ public class Synchronizer {
 
 				// Check peer sent valid heights
 				for (int i = 0; i < moreBlockSummaries.size(); ++i) {
-					if (Controller.isStopping())
-						return SynchronizationResult.SHUTTING_DOWN;
-
 					++lastSummaryHeight;
 
 					BlockSummaryData blockSummary = moreBlockSummaries.get(i);
@@ -361,101 +341,52 @@ public class Synchronizer {
 		final byte[] commonBlockSig = commonBlockData.getSignature();
 		String commonBlockSig58 = Base58.encode(commonBlockSig);
 
-		byte[] latestPeerSignature = commonBlockSig;
-		int height = commonBlockHeight;
-
 		LOGGER.debug(() -> String.format("Fetching peer %s chain from height %d, sig %.8s", peer, commonBlockHeight, commonBlockSig58));
 
+		int ourHeight = ourInitialHeight;
 
 		// Overall plan: fetch peer's blocks first, then orphan, then apply
 
 		// Convert any leftover (post-common) block summaries into signatures to request from peer
 		List<byte[]> peerBlockSignatures = peerBlockSummaries.stream().map(BlockSummaryData::getSignature).collect(Collectors.toList());
 
-		// Keep a list of blocks received so far
+		// Fetch remaining block signatures, if needed
+		int numberSignaturesRequired = peerBlockSignatures.size() - (peerHeight - commonBlockHeight);
+		if (numberSignaturesRequired > 0) {
+			byte[] latestPeerSignature = peerBlockSignatures.isEmpty() ? commonBlockSig : peerBlockSignatures.get(peerBlockSignatures.size() - 1);
+
+			LOGGER.trace(String.format("Requesting %d signature%s after height %d, sig %.8s",
+					numberSignaturesRequired, (numberSignaturesRequired != 1 ? "s": ""), ourHeight, Base58.encode(latestPeerSignature)));
+
+			List<byte[]> moreBlockSignatures = this.getBlockSignatures(peer, latestPeerSignature, numberSignaturesRequired);
+
+			if (moreBlockSignatures == null || moreBlockSignatures.isEmpty()) {
+				LOGGER.info(String.format("Peer %s failed to respond with more block signatures after height %d, sig %.8s", peer,
+						ourHeight, Base58.encode(latestPeerSignature)));
+				return SynchronizationResult.NO_REPLY;
+			}
+
+			LOGGER.trace(String.format("Received %s signature%s", peerBlockSignatures.size(), (peerBlockSignatures.size() != 1 ? "s" : "")));
+
+			peerBlockSignatures.addAll(moreBlockSignatures);
+		}
+
+		// Fetch blocks using signatures
+		LOGGER.debug(String.format("Fetching new blocks from peer %s", peer));
 		List<Block> peerBlocks = new ArrayList<>();
 
-		// Calculate the total number of additional blocks this peer has beyond the common block
-		int additionalPeerBlocksAfterCommonBlock = peerHeight - commonBlockHeight;
-		// Subtract the number of signatures that we already have, as we don't need to request them again
-		int numberSignaturesRequired = additionalPeerBlocksAfterCommonBlock - peerBlockSignatures.size();
-
-		int retryCount = 0;
-		while (height < peerHeight) {
-			if (Controller.isStopping())
-				return SynchronizationResult.SHUTTING_DOWN;
-
-            // Ensure we don't request more than MAXIMUM_REQUEST_SIZE
-            int numberRequested = Math.min(numberSignaturesRequired, MAXIMUM_REQUEST_SIZE);
-
-            // Do we need more signatures?
-			if (peerBlockSignatures.isEmpty() && numberRequested > 0) {
-                LOGGER.trace(String.format("Requesting %d signature%s after height %d, sig %.8s",
-                        numberRequested, (numberRequested != 1 ? "s" : ""), height, Base58.encode(latestPeerSignature)));
-
-                peerBlockSignatures = this.getBlockSignatures(peer, latestPeerSignature, numberRequested);
-
-                if (peerBlockSignatures == null || peerBlockSignatures.isEmpty()) {
-                    LOGGER.info(String.format("Peer %s failed to respond with more block signatures after height %d, sig %.8s", peer,
-                            height, Base58.encode(latestPeerSignature)));
-
-                    // If we have already received blocks from this peer, go ahead and apply them
-                    if (peerBlocks.size() > 0) {
-                        break;
-                    }
-                    // Otherwise, give up and move on to the next peer
-                    return SynchronizationResult.NO_REPLY;
-                }
-
-                numberSignaturesRequired = peerHeight - height - peerBlockSignatures.size();
-                LOGGER.trace(String.format("Received %s signature%s", peerBlockSignatures.size(), (peerBlockSignatures.size() != 1 ? "s" : "")));
-			}
-
-			if (peerBlockSignatures.isEmpty()) {
-				LOGGER.trace(String.format("No more signatures or blocks to request from peer %s", peer));
-				break;
-			}
-
-			byte[] nextPeerSignature = peerBlockSignatures.get(0);
-			int nextHeight = height + 1;
-
-			LOGGER.trace(String.format("Fetching block %d, sig %.8s from %s", nextHeight, Base58.encode(nextPeerSignature), peer));
-			Block newBlock = this.fetchBlock(repository, peer, nextPeerSignature);
+		for (byte[] blockSignature : peerBlockSignatures) {
+			Block newBlock = this.fetchBlock(repository, peer, blockSignature);
 
 			if (newBlock == null) {
 				LOGGER.info(String.format("Peer %s failed to respond with block for height %d, sig %.8s", peer,
-						nextHeight, Base58.encode(nextPeerSignature)));
-
-				if (retryCount >= MAXIMUM_RETRIES) {
-
-					// If we have already received blocks from this peer, go ahead and apply them
-					if (peerBlocks.size() > 0) {
-						break;
-					}
-					// Otherwise, give up and move on to the next peer
-					return SynchronizationResult.NO_REPLY;
-
-				} else {
-					// Re-fetch signatures, in case the peer is now on a different fork
-					peerBlockSignatures.clear();
-					numberSignaturesRequired = peerHeight - height;
-
-					// Retry until retryCount reaches MAXIMUM_RETRIES
-					retryCount++;
-					int triesRemaining = MAXIMUM_RETRIES - retryCount;
-					LOGGER.info(String.format("Re-issuing request to peer %s (%d attempt%s remaining)", peer, triesRemaining, (triesRemaining != 1 ? "s" : "")));
-					continue;
-				}
+						ourHeight, Base58.encode(blockSignature)));
+				return SynchronizationResult.NO_REPLY;
 			}
 
-			// Reset retryCount because the last request succeeded
-			retryCount = 0;
-
-			LOGGER.trace(String.format("Fetched block %d, sig %.8s from %s", nextHeight, Base58.encode(latestPeerSignature), peer));
-
 			if (!newBlock.isSignatureValid()) {
 				LOGGER.info(String.format("Peer %s sent block with invalid signature for height %d, sig %.8s", peer,
-						nextHeight, Base58.encode(latestPeerSignature)));
+						ourHeight, Base58.encode(blockSignature)));
 				return SynchronizationResult.INVALID_DATA;
 			}
 
@@ -464,18 +395,12 @@ public class Synchronizer {
 				transaction.setInitialApprovalStatus();
 
 			peerBlocks.add(newBlock);
-
-			// Now that we've received this block, we can increase our height and move on to the next one
-			latestPeerSignature = nextPeerSignature;
-			peerBlockSignatures.remove(0);
-			++height;
 		}
 
 		// Unwind to common block (unless common block is our latest block)
-		int ourHeight = ourInitialHeight;
-		LOGGER.debug(String.format("Orphaning blocks back to common block height %d, sig %.8s. Our height: %d", commonBlockHeight, commonBlockSig58, ourHeight));
+		LOGGER.debug(String.format("Orphaning blocks back to common block height %d, sig %.8s", commonBlockHeight, commonBlockSig58));
 
-		BlockData orphanBlockData = repository.getBlockRepository().fromHeight(ourInitialHeight);
+		BlockData orphanBlockData = repository.getBlockRepository().fromHeight(ourHeight);
 		while (ourHeight > commonBlockHeight) {
 			if (Controller.isStopping())
 				return SynchronizationResult.SHUTTING_DOWN;
@@ -497,13 +422,10 @@ public class Synchronizer {
 		LOGGER.debug(String.format("Orphaned blocks back to height %d, sig %.8s - applying new blocks from peer %s", commonBlockHeight, commonBlockSig58, peer));
 
 		for (Block newBlock : peerBlocks) {
-			if (Controller.isStopping())
-				return SynchronizationResult.SHUTTING_DOWN;
-
 			ValidationResult blockResult = newBlock.isValid();
 			if (blockResult != ValidationResult.OK) {
 				LOGGER.info(String.format("Peer %s sent invalid block for height %d, sig %.8s: %s", peer,
-						newBlock.getBlockData().getHeight(), Base58.encode(newBlock.getSignature()), blockResult.name()));
+						ourHeight, Base58.encode(newBlock.getSignature()), blockResult.name()));
 				return SynchronizationResult.INVALID_DATA;
 			}
 
@@ -547,8 +469,7 @@ public class Synchronizer {
 
 			// Do we need more signatures?
 			if (peerBlockSignatures.isEmpty()) {
-				int numberRequested = Math.min(maxBatchHeight - ourHeight, MAXIMUM_REQUEST_SIZE);
-
+				int numberRequested = maxBatchHeight - ourHeight;
 				LOGGER.trace(String.format("Requesting %d signature%s after height %d, sig %.8s",
 						numberRequested, (numberRequested != 1 ? "s": ""), ourHeight, Base58.encode(latestPeerSignature)));
 
@@ -652,9 +573,6 @@ public class Synchronizer {
 		final int firstBlockHeight = blockSummaries.get(0).getHeight();
 
 		for (int i = 0; i < blockSummaries.size(); ++i) {
-			if (Controller.isStopping())
-				return;
-
 			BlockSummaryData blockSummary = blockSummaries.get(i);
 
 			// Qortal: minter is always a reward-share, so find actual minter and get their effective minting level

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

@@ -23,7 +23,7 @@ public interface AcctTradeBot {
 	public ResponseResult startResponse(Repository repository, ATData atData, ACCT acct,
 			CrossChainTradeData crossChainTradeData, String foreignKey, String receivingAddress) throws DataException;
 
-	public boolean canDelete(Repository repository, TradeBotData tradeBotData) throws DataException;
+	public boolean canDelete(Repository repository, TradeBotData tradeBotData);
 
 	public void progress(Repository repository, TradeBotData tradeBotData) throws DataException, ForeignBlockchainException;
 

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

@@ -345,15 +345,11 @@ public class BitcoinACCTv1TradeBot implements AcctTradeBot {
 	}
 
 	@Override
-	public boolean canDelete(Repository repository, TradeBotData tradeBotData) throws DataException {
+	public boolean canDelete(Repository repository, TradeBotData tradeBotData) {
 		State tradeBotState = State.valueOf(tradeBotData.getStateValue());
 		if (tradeBotState == null)
 			return true;
 
-		// If the AT doesn't exist then we might as well let the user tidy up
-		if (!repository.getATRepository().exists(tradeBotData.getAtAddress()))
-			return true;
-
 		switch (tradeBotState) {
 			case BOB_WAITING_FOR_AT_CONFIRM:
 			case ALICE_DONE:
@@ -382,16 +378,7 @@ public class BitcoinACCTv1TradeBot implements AcctTradeBot {
 			// Attempt to fetch AT data
 			atData = repository.getATRepository().fromATAddress(tradeBotData.getAtAddress());
 			if (atData == null) {
-				LOGGER.debug(() -> String.format("Unable to fetch trade AT %s from repository", tradeBotData.getAtAddress()));
-
-				// If it has been over 24 hours since we last updated this trade-bot entry then assume AT is never coming back
-				// and so wipe the trade-bot entry
-				if (tradeBotData.getTimestamp() + MAX_AT_CONFIRMATION_PERIOD < NTP.getTime()) {
-					LOGGER.info(() -> String.format("AT %s has been gone for too long - deleting trade-bot entry", tradeBotData.getAtAddress()));
-					repository.getCrossChainRepository().delete(tradeBotData.getTradePrivateKey());
-					repository.saveChanges();
-				}
-
+				LOGGER.warn(() -> String.format("Unable to fetch trade AT %s from repository", tradeBotData.getAtAddress()));
 				return;
 			}
 

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

@@ -343,15 +343,11 @@ public class LitecoinACCTv1TradeBot implements AcctTradeBot {
 	}
 
 	@Override
-	public boolean canDelete(Repository repository, TradeBotData tradeBotData) throws DataException {
+	public boolean canDelete(Repository repository, TradeBotData tradeBotData) {
 		State tradeBotState = State.valueOf(tradeBotData.getStateValue());
 		if (tradeBotState == null)
 			return true;
 
-		// If the AT doesn't exist then we might as well let the user tidy up
-		if (!repository.getATRepository().exists(tradeBotData.getAtAddress()))
-			return true;
-
 		switch (tradeBotState) {
 			case BOB_WAITING_FOR_AT_CONFIRM:
 			case ALICE_DONE:
@@ -380,16 +376,7 @@ public class LitecoinACCTv1TradeBot implements AcctTradeBot {
 			// Attempt to fetch AT data
 			atData = repository.getATRepository().fromATAddress(tradeBotData.getAtAddress());
 			if (atData == null) {
-				LOGGER.debug(() -> String.format("Unable to fetch trade AT %s from repository", tradeBotData.getAtAddress()));
-
-				// If it has been over 24 hours since we last updated this trade-bot entry then assume AT is never coming back
-				// and so wipe the trade-bot entry
-				if (tradeBotData.getTimestamp() + MAX_AT_CONFIRMATION_PERIOD < NTP.getTime()) {
-					LOGGER.info(() -> String.format("AT %s has been gone for too long - deleting trade-bot entry", tradeBotData.getAtAddress()));
-					repository.getCrossChainRepository().delete(tradeBotData.getTradePrivateKey());
-					repository.saveChanges();
-				}
-
+				LOGGER.warn(() -> String.format("Unable to fetch trade AT %s from repository", tradeBotData.getAtAddress()));
 				return;
 			}
 

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

@@ -108,6 +108,8 @@ public class Network {
 	private ServerSocketChannel serverChannel;
 	private Iterator<SelectionKey> channelIterator = null;
 
+	private String bindAddress = null;
+
 	// volatile because value is updated inside any one of the EPC threads
 	private volatile long nextConnectTaskTimestamp = 0L; // ms - try first connect once NTP syncs
 
@@ -138,25 +140,42 @@ public class Network {
 		// Grab P2P port from settings
 		int listenPort = Settings.getInstance().getListenPort();
 
-		// Grab P2P bind address from settings
-		try {
-			InetAddress bindAddr = InetAddress.getByName(Settings.getInstance().getBindAddress());
-			InetSocketAddress endpoint = new InetSocketAddress(bindAddr, listenPort);
+		// Grab P2P bind addresses from settings
+		String[] bindAddresses = Settings.getInstance().getBindAddresses();
+		for (int i=0; i<bindAddresses.length; i++) {
 
-			channelSelector = Selector.open();
+			String bindAddress = bindAddresses[i];
+
+			try {
+				LOGGER.info(String.format("Binding to address %s", bindAddress));
+
+				InetAddress bindAddr = InetAddress.getByName(bindAddress);
+				InetSocketAddress endpoint = new InetSocketAddress(bindAddr, listenPort);
+
+				channelSelector = Selector.open();
+
+				// Set up listen socket
+				serverChannel = ServerSocketChannel.open();
+				serverChannel.configureBlocking(false);
+				serverChannel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
+				serverChannel.bind(endpoint, LISTEN_BACKLOG);
+				serverChannel.register(channelSelector, SelectionKey.OP_ACCEPT);
+				
+				this.bindAddress = bindAddress; // Store the selected address, so that it can be used by other parts of the app
+				break; // We don't want to bind to more than one address
+
+			} catch (UnknownHostException e) {
+				LOGGER.error(String.format("Can't bind listen socket to address %s", bindAddress));
+				if (i == bindAddresses.length-1) { // Only throw an exception if all addresses have been tried
+					throw new IOException("Can't bind listen socket to address", e);
+				}
+			} catch (IOException e) {
+				LOGGER.error(String.format("Can't create listen socket: %s", e.getMessage()));
+				if (i == bindAddresses.length-1) { // Only throw an exception if all addresses have been tried
+					throw new IOException("Can't create listen socket", e);
+				}
+			}
 
-			// Set up listen socket
-			serverChannel = ServerSocketChannel.open();
-			serverChannel.configureBlocking(false);
-			serverChannel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
-			serverChannel.bind(endpoint, LISTEN_BACKLOG);
-			serverChannel.register(channelSelector, SelectionKey.OP_ACCEPT);
-		} catch (UnknownHostException e) {
-			LOGGER.error(String.format("Can't bind listen socket to address %s", Settings.getInstance().getBindAddress()));
-			throw new IOException("Can't bind listen socket to address", e);
-		} catch (IOException e) {
-			LOGGER.error(String.format("Can't create listen socket: %s", e.getMessage()));
-			throw new IOException("Can't create listen socket", e);
 		}
 
 		// Load all known peers from repository
@@ -179,6 +198,10 @@ public class Network {
 		return instance;
 	}
 
+	public String getBindAddress() {
+		return this.bindAddress;
+	}
+
 	public byte[] getMessageMagic() {
 		return Settings.getInstance().isTestNet() ? TESTNET_MESSAGE_MAGIC : MAINNET_MESSAGE_MAGIC;
 	}

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

@@ -46,7 +46,7 @@ public class Peer {
 	private static final int CONNECT_TIMEOUT = 2000; // ms
 
 	/** Maximum time to wait for a message reply to arrive from peer. (ms) */
-	private static final int RESPONSE_TIMEOUT = 3000; // ms
+	private static final int RESPONSE_TIMEOUT = 2000; // ms
 
 	/**
 	 * Interval between PING messages to a peer. (ms)
@@ -507,7 +507,6 @@ public class Peer {
 			}
 		} catch (MessageException e) {
 			LOGGER.warn(String.format("Failed to send %s message with ID %d to peer %s: %s", message.getType().name(), message.getId(), this, e.getMessage()));
-			return false;
 		} catch (IOException e) {
 			// Send failure
 			return false;

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

@@ -1,70 +0,0 @@
-package org.qortal.network.message;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-
-import org.qortal.block.Block;
-import org.qortal.transform.TransformationException;
-import org.qortal.transform.block.BlockTransformer;
-
-import com.google.common.primitives.Ints;
-
-// This is an OUTGOING-only Message which more readily lends itself to being cached
-public class CachedBlockMessage extends Message {
-
-	private Block block = null;
-	private byte[] cachedBytes = null;
-
-	public CachedBlockMessage(Block block) {
-		super(MessageType.BLOCK);
-
-		this.block = block;
-	}
-
-	private CachedBlockMessage(byte[] cachedBytes) {
-		super(MessageType.BLOCK);
-
-		this.block = null;
-		this.cachedBytes = cachedBytes;
-	}
-	
-	public static Message fromByteBuffer(int id, ByteBuffer byteBuffer) throws UnsupportedEncodingException {
-		throw new UnsupportedOperationException("CachedBlockMessage is for outgoing messages only");
-	}
-
-	@Override
-	protected byte[] toData() {
-		// Already serialized?
-		if (this.cachedBytes != null)
-			return cachedBytes;
-
-		if (this.block == null)
-			return null;
-
-		try {
-			ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-
-			bytes.write(Ints.toByteArray(this.block.getBlockData().getHeight()));
-
-			bytes.write(BlockTransformer.toBytes(this.block));
-
-			this.cachedBytes = bytes.toByteArray();
-			// We no longer need source Block
-			// and Block contains repository handle which is highly likely to be invalid after this call
-			this.block = null;
-
-			return this.cachedBytes;
-		} catch (TransformationException | IOException e) {
-			return null;
-		}
-	}
-
-	public CachedBlockMessage cloneWithNewId(int newId) {
-		CachedBlockMessage clone = new CachedBlockMessage(this.cachedBytes);
-		clone.setId(newId);
-		return clone;
-	}
-
-}

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

@@ -1,6 +1,5 @@
 package org.qortal.repository;
 
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
@@ -252,14 +251,6 @@ public interface TransactionRepository {
 	 */
 	public List<TransactionData> getUnconfirmedTransactions(TransactionType txType, byte[] creatorPublicKey) throws DataException;
 
-	/**
-	 * Returns list of unconfirmed transactions excluding specified type(s).
-	 * 
-	 * @return list of transactions, or empty if none.
-	 * @throws DataException
-	 */
-	public List<TransactionData> getUnconfirmedTransactions(EnumSet<TransactionType> excludedTxTypes) throws DataException;
-
 	/**
 	 * Remove transaction from unconfirmed transactions pile.
 	 * 

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

@@ -931,8 +931,6 @@ public class HSQLDBRepository implements Repository {
 
 	/** Logs other HSQLDB sessions then returns passed exception */
 	public SQLException examineException(SQLException e) {
-		// TODO: could log at DEBUG for deadlocks by checking RepositoryManager.isDeadlockRelated(e)?
-
 		LOGGER.error(() -> String.format("[Session %d] HSQLDB error: %s", this.sessionId, e.getMessage()), e);
 
 		logStatements();

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

@@ -14,11 +14,11 @@ import org.hsqldb.jdbc.HSQLDBPool;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryFactory;
-import org.qortal.settings.Settings;
 
 public class HSQLDBRepositoryFactory implements RepositoryFactory {
 
 	private static final Logger LOGGER = LogManager.getLogger(HSQLDBRepositoryFactory.class);
+	private static final int POOL_SIZE = 100;
 
 	/** Log getConnection() calls that take longer than this. (ms) */
 	private static final long SLOW_CONNECTION_THRESHOLD = 1000L;
@@ -57,7 +57,7 @@ public class HSQLDBRepositoryFactory implements RepositoryFactory {
 			HSQLDBRepository.attemptRecovery(connectionUrl);
 		}
 
-		this.connectionPool = new HSQLDBPool(Settings.getInstance().getRepositoryConnectionPoolSize());
+		this.connectionPool = new HSQLDBPool(POOL_SIZE);
 		this.connectionPool.setUrl(this.connectionUrl);
 
 		Properties properties = new Properties();

src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java

@@ -9,7 +9,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.EnumMap;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
@@ -1182,51 +1181,6 @@ public class HSQLDBTransactionRepository implements TransactionRepository {
 		}
 	}
 
-	@Override
-	public List<TransactionData> getUnconfirmedTransactions(EnumSet<TransactionType> excludedTxTypes) throws DataException {
-		StringBuilder sql = new StringBuilder(1024);
-		sql.append("SELECT signature FROM UnconfirmedTransactions ");
-		sql.append("JOIN Transactions USING (signature) ");
-		sql.append("WHERE type NOT IN (");
-
-		boolean firstTxType = true;
-		for (TransactionType txType : excludedTxTypes) {
-			if (firstTxType)
-				firstTxType = false;
-			else
-				sql.append(", ");
-
-			sql.append(txType.value);
-		}
-
-		sql.append(")");
-		sql.append("ORDER BY created_when, signature");
-
-		List<TransactionData> transactions = new ArrayList<>();
-
-		// Find transactions with no corresponding row in BlockTransactions
-		try (ResultSet resultSet = this.repository.checkedExecute(sql.toString())) {
-			if (resultSet == null)
-				return transactions;
-
-			do {
-				byte[] signature = resultSet.getBytes(1);
-
-				TransactionData transactionData = this.fromSignature(signature);
-
-				if (transactionData == null)
-					// Something inconsistent with the repository
-					throw new DataException(String.format("Unable to fetch unconfirmed transaction %s from repository?", Base58.encode(signature)));
-
-				transactions.add(transactionData);
-			} while (resultSet.next());
-
-			return transactions;
-		} catch (SQLException | DataException e) {
-			throw new DataException("Unable to fetch unconfirmed transactions from repository", e);
-		}
-	}
-
 	@Override
 	public void confirmTransaction(byte[] signature) throws DataException {
 		try {

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

@@ -46,8 +46,10 @@ public class Settings {
 	// General
 	private String localeLang = Locale.getDefault().getLanguage();
 
-	// Common to all networking (API/P2P)
-	private String bindAddress = "::"; // Use IPv6 wildcard to listen on all local addresses
+	// Common to all networking (API/P2P). They are tried in order until one successfully binds.
+	private String[] bindAddresses = new String[] {
+			"::", "0.0.0.0"
+	};
 
 	// UI servers
 	private int uiPort = 12388;
@@ -89,8 +91,6 @@ public class Settings {
 	private long repositoryCheckpointInterval = 60 * 60 * 1000L; // 1 hour (ms) default
 	/** Whether to show a notification when we perform repository 'checkpoint'. */
 	private boolean showCheckpointNotification = false;
-	/* How many blocks to cache locally. Defaulted to 10, which covers a typical Synchronizer request + a few spare */
-	private int blockCacheSize = 10;
 
 	/** How long to keep old, full, AT state data (ms). */
 	private long atStatesMaxLifetime = 2 * 7 * 24 * 60 * 60 * 1000L; // milliseconds
@@ -136,8 +136,6 @@ public class Settings {
 	private Long slowQueryThreshold = null;
 	/** Repository storage path. */
 	private String repositoryPath = "db";
-	/** Repository connection pool size. Needs to be a bit bigger than maxNetworkThreadPoolSize */
-	private int repositoryConnectionPoolSize = 100;
 
 	// Auto-update sources
 	private String[] autoUpdateRepos = new String[] {
@@ -365,10 +363,6 @@ public class Settings {
 		return this.maxTransactionTimestampFuture;
 	}
 
-	public int getBlockCacheSize() {
-		return this.blockCacheSize;
-	}
-
 	public boolean isTestNet() {
 		return this.isTestNet;
 	}
@@ -384,8 +378,8 @@ public class Settings {
 		return this.isTestNet ? TESTNET_LISTEN_PORT : MAINNET_LISTEN_PORT;
 	}
 
-	public String getBindAddress() {
-		return this.bindAddress;
+	public String[] getBindAddresses() {
+		return this.bindAddresses;
 	}
 
 	public int getMinBlockchainPeers() {
@@ -432,10 +426,6 @@ public class Settings {
 		return this.repositoryPath;
 	}
 
-	public int getRepositoryConnectionPoolSize() {
-		return this.repositoryConnectionPoolSize;
-	}
-
 	public boolean isAutoUpdateEnabled() {
 		return this.autoUpdateEnabled;
 	}

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

@@ -4,7 +4,6 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -606,8 +605,7 @@ public abstract class Transaction {
 	public static List<TransactionData> getUnconfirmedTransactions(Repository repository) throws DataException {
 		BlockData latestBlockData = repository.getBlockRepository().getLastBlock();
 
-		EnumSet<TransactionType> excludedTxTypes = EnumSet.of(TransactionType.CHAT, TransactionType.PRESENCE);
-		List<TransactionData> unconfirmedTransactions = repository.getTransactionRepository().getUnconfirmedTransactions(excludedTxTypes);
+		List<TransactionData> unconfirmedTransactions = repository.getTransactionRepository().getUnconfirmedTransactions();
 
 		unconfirmedTransactions.sort(getDataComparator());
 

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

@@ -326,36 +326,24 @@ public class BlockTransformer extends Transformer {
 		}
 	}
 
-	private static byte[] getReferenceBytesForMinterSignature(int blockHeight, byte[] reference) {
-		int newBlockSigTriggerHeight = BlockChain.getInstance().getNewBlockSigHeight();
-
-		return blockHeight >= newBlockSigTriggerHeight
-				// 'new' block sig uses all of previous block's signature
-				? reference
-				// 'old' block sig only uses first 64 bytes of previous block's signature
-				: Arrays.copyOf(reference, MINTER_SIGNATURE_LENGTH);
+	public static byte[] getMinterSignatureFromReference(byte[] blockReference) {
+		return Arrays.copyOf(blockReference, MINTER_SIGNATURE_LENGTH);
 	}
 
-	public static byte[] getBytesForMinterSignature(BlockData blockData) {
-		byte[] referenceBytes = getReferenceBytesForMinterSignature(blockData.getHeight(), blockData.getReference());
+	public static byte[] getBytesForMinterSignature(BlockData blockData) throws TransformationException {
+		byte[] minterSignature = getMinterSignatureFromReference(blockData.getReference());
 
-		return getBytesForMinterSignature(referenceBytes, blockData.getMinterPublicKey(), blockData.getEncodedOnlineAccounts());
+		return getBytesForMinterSignature(minterSignature, blockData.getMinterPublicKey(), blockData.getEncodedOnlineAccounts());
 	}
 
-	public static byte[] getBytesForMinterSignature(BlockData parentBlockData, byte[] minterPublicKey, byte[] encodedOnlineAccounts) {
-		byte[] referenceBytes = getReferenceBytesForMinterSignature(parentBlockData.getHeight() + 1, parentBlockData.getSignature());
+	public static byte[] getBytesForMinterSignature(byte[] minterSignature, byte[] minterPublicKey, byte[] encodedOnlineAccounts) {
+		byte[] bytes = new byte[MINTER_SIGNATURE_LENGTH + MINTER_PUBLIC_KEY_LENGTH + encodedOnlineAccounts.length];
 
-		return getBytesForMinterSignature(referenceBytes, minterPublicKey, encodedOnlineAccounts);
-	}
+		System.arraycopy(minterSignature, 0, bytes, 0, MINTER_SIGNATURE_LENGTH);
 
-	private static byte[] getBytesForMinterSignature(byte[] referenceBytes, byte[] minterPublicKey, byte[] encodedOnlineAccounts) {
-		byte[] bytes = new byte[referenceBytes.length + MINTER_PUBLIC_KEY_LENGTH + encodedOnlineAccounts.length];
+		System.arraycopy(minterPublicKey, 0, bytes, MINTER_SIGNATURE_LENGTH, MINTER_PUBLIC_KEY_LENGTH);
 
-		System.arraycopy(referenceBytes, 0, bytes, 0, referenceBytes.length);
-
-		System.arraycopy(minterPublicKey, 0, bytes, referenceBytes.length, MINTER_PUBLIC_KEY_LENGTH);
-
-		System.arraycopy(encodedOnlineAccounts, 0, bytes, referenceBytes.length + MINTER_PUBLIC_KEY_LENGTH, encodedOnlineAccounts.length);
+		System.arraycopy(encodedOnlineAccounts, 0, bytes, MINTER_SIGNATURE_LENGTH + MINTER_PUBLIC_KEY_LENGTH, encodedOnlineAccounts.length);
 
 		return bytes;
 	}

src/main/resources/blockchain.json

@@ -48,8 +48,7 @@
 		"minutesPerBlock": 1
 	},
 	"featureTriggers": {
-		"atFindNextTransactionFix": 275000,
-		"newBlockSigHeight": 320000
+		"atFindNextTransactionFix": 275000
 	},
 	"genesisInfo": {
 		"version": 4,

src/main/resources/i18n/ApiError_it.properties

@@ -1,72 +0,0 @@
-#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
-# Keys are from api.ApiError enum
-# Italian translation by Pabs 2021
-
-# La modifica della lingua dell'UI è fatta nel file Settings.json
-#
-# "localeLang": "it",
-# Si prega ricordare la virgola alla fine, se questo comando non è sull'ultima riga
-
-ADDRESS_UNKNOWN = indirizzo account sconosciuto
-
-BLOCKCHAIN_NEEDS_SYNC = blockchain deve prima sincronizzarsi
-
-# Blocks
-BLOCK_UNKNOWN = blocco sconosciuto
-
-BTC_BALANCE_ISSUE = saldo Bitcoin insufficiente
-
-BTC_NETWORK_ISSUE = Bitcoin/ElectrumX problema di rete
-
-BTC_TOO_SOON = troppo presto per trasmettere transazione Bitcoin (tempo di blocco / tempo di blocco mediano)
-
-CANNOT_MINT = l'account non può coniare
-
-GROUP_UNKNOWN = gruppo sconosciuto
-
-INVALID_ADDRESS = indirizzo non valido
-
-# Assets
-INVALID_ASSET_ID = identificazione risorsa non valida
-
-INVALID_CRITERIA = criteri di ricerca non validi
-
-INVALID_DATA = dati non validi
-
-INVALID_HEIGHT = altezza blocco non valida
-
-INVALID_NETWORK_ADDRESS = indirizzo di rete non valido
-
-INVALID_ORDER_ID = identificazione di ordine di risorsa non valida
-
-INVALID_PRIVATE_KEY = chiave privata non valida
-
-INVALID_PUBLIC_KEY = chiave pubblica non valida
-
-INVALID_REFERENCE = riferimento non valido
-
-# Validation
-INVALID_SIGNATURE = firma non valida
-
-JSON = Impossibile analizzare il messaggio JSON
-
-NAME_UNKNOWN = nome sconosciuto
-
-NON_PRODUCTION = questa chiamata API non è consentita per i sistemi di produzione
-
-NO_TIME_SYNC = nessuna sincronizzazione dell'orologio ancora
-
-ORDER_UNKNOWN = identificazione di ordine di risorsa sconosciuta
-
-PUBLIC_KEY_NOT_FOUND = chiave pubblica non trovata
-
-REPOSITORY_ISSUE = errore del repositorio
-
-# This one is special in that caller expected to pass two additional strings, hence the two %s
-TRANSACTION_INVALID = transazione non valida: %s (%s)
-
-TRANSACTION_UNKNOWN = transazione sconosciuta
-
-TRANSFORMATION_ERROR = non è stato possibile trasformare JSON in transazione
-
-UNAUTHORIZED = Chiamata API non autorizzata

src/main/resources/i18n/SysTray_it.properties

@@ -1,46 +0,0 @@
-#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
-# SysTray pop-up menu
-# Italian translation by Pabs 2021
-
-APPLYING_UPDATE_AND_RESTARTING = Applicando aggiornamento automatico e riavviando...
-
-AUTO_UPDATE = Aggiornamento automatico
-
-BLOCK_HEIGHT = altezza
-
-CHECK_TIME_ACCURACY = Controlla la precisione dell'ora
-
-CONNECTING = Collegando
-
-CONNECTION = connessione
-
-CONNECTIONS = connessioni
-
-CREATING_BACKUP_OF_DB_FILES = Creazione di backup dei file di database...
-
-DB_BACKUP = Backup del database
-
-DB_CHECKPOINT = Punto di controllo del database
-
-EXIT = Uscita
-
-MINTING_DISABLED = NON coniando
-
-MINTING_ENABLED = \u2714 Coniando
-
-# Nagging about lack of NTP time sync
-NTP_NAG_CAPTION = L'orologio del computer è impreciso!
-
-NTP_NAG_TEXT_UNIX = Installare servizio NTP per ottenere un orologio preciso.
-
-NTP_NAG_TEXT_WINDOWS = Seleziona "Sincronizza orologio" dal menu per correggere.
-
-OPEN_UI = Apri UI
-
-PERFORMING_DB_CHECKPOINT = Salvataggio delle modifiche al database non salvate...
-
-SYNCHRONIZE_CLOCK = Sincronizza orologio
-
-SYNCHRONIZING_BLOCKCHAIN = Sincronizzando
-
-SYNCHRONIZING_CLOCK = Sincronizzando orologio

src/main/resources/i18n/TransactionValidity_it.properties

@@ -1,185 +0,0 @@
-# Italian translation by Pabs 2021
-
-ACCOUNT_ALREADY_EXISTS = l'account gia esiste
-
-ACCOUNT_CANNOT_REWARD_SHARE = l'account non può fare la condivisione di ricompensa
-
-ALREADY_GROUP_ADMIN = è già amministratore del gruppo
-
-ALREADY_GROUP_MEMBER = è già membro del gruppo
-
-ALREADY_VOTED_FOR_THAT_OPTION = già votato per questa opzione
-
-ASSET_ALREADY_EXISTS = risorsa già esistente
-
-ASSET_DOES_NOT_EXIST = risorsa non esistente
-
-ASSET_DOES_NOT_MATCH_AT = l'asset non corrisponde all'asset di AT
-
-ASSET_NOT_SPENDABLE = la risorsa non è spendibile
-
-AT_ALREADY_EXISTS = AT gia esiste
-
-AT_IS_FINISHED = AT ha finito
-
-AT_UNKNOWN = AT sconosciuto
-
-BANNED_FROM_GROUP = divietato dal gruppo
-
-BAN_EXISTS = il divieto esiste già
-
-BAN_UNKNOWN = divieto sconosciuto
-
-BUYER_ALREADY_OWNER = l'acquirente è già proprietario
-
-CHAT = Le transazioni CHAT non sono mai valide per l'inclusione nei blocchi
-
-CLOCK_NOT_SYNCED = orologio non sincronizzato
-
-DUPLICATE_OPTION = opzione duplicata
-
-GROUP_ALREADY_EXISTS = gruppo già esistente
-
-GROUP_APPROVAL_DECIDED = approvazione di gruppo già decisa
-
-GROUP_APPROVAL_NOT_REQUIRED = approvazione di gruppo non richiesto
-
-GROUP_DOES_NOT_EXIST = gruppo non esiste
-
-GROUP_ID_MISMATCH = identificazione di gruppo non corrispondente
-
-GROUP_OWNER_CANNOT_LEAVE = il proprietario del gruppo non può lasciare il gruppo
-
-HAVE_EQUALS_WANT = la risorsa avere è uguale a la risorsa volere
-
-INCORRECT_NONCE = PoW nonce sbagliato
-
-INSUFFICIENT_FEE = tariffa insufficiente
-
-INVALID_ADDRESS = indirizzo non valido
-
-INVALID_AMOUNT = importo non valido
-
-INVALID_ASSET_OWNER = proprietario della risorsa non valido
-
-INVALID_AT_TRANSACTION = transazione AT non valida
-
-INVALID_AT_TYPE_LENGTH = lunghezza di "tipo" AT non valida
-
-INVALID_CREATION_BYTES = byte di creazione non validi
-
-INVALID_DATA_LENGTH = lunghezza di dati non valida
-
-INVALID_DESCRIPTION_LENGTH = lunghezza della descrizione non valida
-
-INVALID_GROUP_APPROVAL_THRESHOLD = soglia di approvazione del gruppo non valida
-
-INVALID_GROUP_BLOCK_DELAY = ritardo del blocco di approvazione del gruppo non valido
-
-INVALID_GROUP_ID = identificazione di gruppo non valida
-
-INVALID_GROUP_OWNER = proprietario di gruppo non valido
-
-INVALID_LIFETIME = durata della vita non valida
-
-INVALID_NAME_LENGTH = lunghezza del nome non valida
-
-INVALID_NAME_OWNER = proprietario del nome non valido
-
-INVALID_OPTIONS_COUNT = conteggio di opzioni non validi
-
-INVALID_OPTION_LENGTH = lunghezza di opzioni non valida
-
-INVALID_ORDER_CREATOR = creatore dell'ordine non valido
-
-INVALID_PAYMENTS_COUNT = conteggio pagamenti non validi
-
-INVALID_PUBLIC_KEY = chiave pubblica non valida
-
-INVALID_QUANTITY = quantità non valida
-
-INVALID_REFERENCE = riferimento non valido
-
-INVALID_RETURN = ritorno non valido
-
-INVALID_REWARD_SHARE_PERCENT = percentuale condivisione di ricompensa non valida
-
-INVALID_SELLER = venditore non valido
-
-INVALID_TAGS_LENGTH = lunghezza dei "tag" non valida
-
-INVALID_TX_GROUP_ID = identificazione di gruppo di transazioni non valida
-
-INVALID_VALUE_LENGTH = lunghezza "valore" non valida
-
-INVITE_UNKNOWN = invito di gruppo sconosciuto
-
-JOIN_REQUEST_EXISTS = la richiesta di iscrizione al gruppo già esiste
-
-MAXIMUM_REWARD_SHARES =  numero massimo di condivisione di ricompensa raggiunto per l'account
-
-MISSING_CREATOR = creatore mancante
-
-MULTIPLE_NAMES_FORBIDDEN = è vietata la registrazione di multipli nomi per account
-
-NAME_ALREADY_FOR_SALE = nome già in vendita
-
-NAME_ALREADY_REGISTERED = nome già registrato
-
-NAME_DOES_NOT_EXIST = il nome non esiste
-
-NAME_NOT_FOR_SALE = il nome non è in vendita
-
-NAME_NOT_NORMALIZED = il nome non è in forma "normalizzata" Unicode
-
-NEGATIVE_AMOUNT = importo non valido / negativo
-
-NEGATIVE_FEE = tariffa non valida / negativa
-
-NEGATIVE_PRICE = prezzo non valido / negativo
-
-NOT_GROUP_ADMIN = l'account non è un amministratore di gruppo
-
-NOT_GROUP_MEMBER = l'account non è un membro del gruppo
-
-NOT_MINTING_ACCOUNT = l'account non può coniare
-
-NOT_YET_RELEASED = funzione non ancora rilasciata
-
-NO_BALANCE = equilibrio insufficiente
-
-NO_BLOCKCHAIN_LOCK = nodo di blockchain attualmente occupato
-
-NO_FLAG_PERMISSION = l'account non dispone di questa autorizzazione
-
-OK = OK
-
-ORDER_ALREADY_CLOSED = l'ordine di scambio di risorsa è già chiuso
-
-ORDER_DOES_NOT_EXIST =  l'ordine di scambio di risorsa non esiste
-
-POLL_ALREADY_EXISTS = il sondaggio già esiste
-
-POLL_DOES_NOT_EXIST = il sondaggio non esiste
-
-POLL_OPTION_DOES_NOT_EXIST = le opzioni di sondaggio non esistono
-
-PUBLIC_KEY_UNKNOWN = chiave pubblica sconosciuta
-
-REWARD_SHARE_UNKNOWN = condivisione di ricompensa sconosciuta
-
-SELF_SHARE_EXISTS = condivisione di sé (condivisione di ricompensa) già esiste
-
-TIMESTAMP_TOO_NEW = timestamp troppo nuovo
-
-TIMESTAMP_TOO_OLD = timestamp troppo vecchio
-
-TOO_MANY_UNCONFIRMED = l'account ha troppe transazioni non confermate in sospeso
-
-TRANSACTION_ALREADY_CONFIRMED = la transazione è già confermata
-
-TRANSACTION_ALREADY_EXISTS = la transazione già esiste
-
-TRANSACTION_UNKNOWN = transazione sconosciuta
-
-TX_GROUP_ID_MISMATCH = identificazione di gruppo della transazione non corrisponde

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

@@ -45,8 +45,7 @@
 		"qortalTimestamp": 0,
 		"newAssetPricingTimestamp": 0,
 		"groupApprovalTimestamp": 0,
-		"atFindNextTransactionFix": 0,
-		"newBlockSigHeight": 999999
+		"atFindNextTransactionFix": 0
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -45,8 +45,7 @@
 		"qortalTimestamp": 0,
 		"newAssetPricingTimestamp": 0,
 		"groupApprovalTimestamp": 0,
-		"atFindNextTransactionFix": 0,
-		"newBlockSigHeight": 999999
+		"atFindNextTransactionFix": 0
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -45,8 +45,7 @@
 		"qortalTimestamp": 0,
 		"newAssetPricingTimestamp": 0,
 		"groupApprovalTimestamp": 0,
-		"atFindNextTransactionFix": 0,
-		"newBlockSigHeight": 999999
+		"atFindNextTransactionFix": 0
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -45,8 +45,7 @@
 		"qortalTimestamp": 0,
 		"newAssetPricingTimestamp": 0,
 		"groupApprovalTimestamp": 0,
-		"atFindNextTransactionFix": 0,
-		"newBlockSigHeight": 999999
+		"atFindNextTransactionFix": 0
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -45,8 +45,7 @@
 		"qortalTimestamp": 0,
 		"newAssetPricingTimestamp": 0,
 		"groupApprovalTimestamp": 0,
-		"atFindNextTransactionFix": 0,
-		"newBlockSigHeight": 999999
+		"atFindNextTransactionFix": 0
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -45,8 +45,7 @@
 		"qortalTimestamp": 0,
 		"newAssetPricingTimestamp": 0,
 		"groupApprovalTimestamp": 0,
-		"atFindNextTransactionFix": 0,
-		"newBlockSigHeight": 999999
+		"atFindNextTransactionFix": 0
 	},
 	"genesisInfo": {
 		"version": 4,

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

@@ -45,8 +45,7 @@
 		"qortalTimestamp": 0,
 		"newAssetPricingTimestamp": 0,
 		"groupApprovalTimestamp": 0,
-		"atFindNextTransactionFix": 0,
-		"newBlockSigHeight": 999999
+		"atFindNextTransactionFix": 0
 	},
 	"genesisInfo": {
 		"version": 4,

stop.sh

@@ -21,19 +21,13 @@ fi
 read pid 2>/dev/null <run.pid
 is_pid_valid=$?
 
-# Swap out the API port if the --testnet (or -t) argument is specified
-api_port=12391
-if [[ "$@" = *"--testnet"* ]] || [[  "$@" = *"-t"* ]]; then
-  api_port=62391
-fi
-
 # Ensure curl is installed
 curl_path=$(which curl)
 
 if [[ -f $curl_path ]]; then
 
 	echo 'Calling GET /admin/stop on local Qortal node'
-	if curl --url "http://localhost:${api_port}/admin/stop" 1>/dev/null 2>&1; then
+	if curl --url http://localhost:12391/admin/stop 1>/dev/null 2>&1; then
 		echo "Qortal node responded and should be shutting down"
 
 		if [ "${is_pid_valid}" -eq 0 ]; then
@@ -48,7 +42,7 @@ if [[ -f $curl_path ]]; then
 		fi
 		exit 0
 	else
-		echo "${red}No response from Qortal node - not running on port ${api_port}?${normal}"
+		echo "${red}No response from Qortal node - not running?${normal}"
 		exit 1
 	fi
 

tools/publish-auto-update.pl

@@ -57,11 +57,9 @@ $timestamp *= 1000; # Convert to milliseconds
 
 # locate sha256 utility
 my $SHA256 = `which sha256sum || which sha256`;
-chomp $SHA256;
-die("Can't find sha256sum or sha256\n") unless length($SHA256) > 0;
 
 # SHA256 of actual update file
-my $sha256 = `git show auto-update-${commit_hash}:${project}.update | ${SHA256} | head -c 64`;
+my $sha256 = `git show auto-update-${commit_hash}:${project}.update | ${SHA256}`;
 die("Can't calculate SHA256 of ${project}.update\n") unless $sha256 =~ m/(\S{64})/;
 chomp $sha256;