Share leftover block reward to founders, regardless whether online

Added support in AccountRepository to fetch account using flags.

+ renamed some local variables in some Block methods to avoid clashes

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

@@ -1190,6 +1190,8 @@ public class Block {
 		int blockchainHeight = this.repository.getBlockRepository().getBlockchainHeight();
 		this.blockData.setHeight(blockchainHeight + 1);
 
+		LOGGER.trace(() -> String.format("Processing block %d", this.blockData.getHeight()));
+
 		if (this.blockData.getHeight() > 1) {
 			// Increase account levels
 			increaseAccountLevels();
@@ -1287,9 +1289,9 @@ public class Block {
 	protected void processTransactions() throws DataException {
 		// Process transactions (we'll link them to this block after saving the block itself)
 		// AT-generated transactions are already prepended to our transactions at this point.
-		List<Transaction> transactions = this.getTransactions();
+		List<Transaction> blocksTransactions = this.getTransactions();
 
-		for (Transaction transaction : transactions) {
+		for (Transaction transaction : blocksTransactions) {
 			TransactionData transactionData = transaction.getTransactionData();
 
 			// AT_TRANSACTIONs are created locally and need saving into repository before processing
@@ -1413,6 +1415,8 @@ public class Block {
 	 * @throws DataException
 	 */
 	public void orphan() throws DataException {
+		LOGGER.trace(() -> String.format("Orphaning block %d", this.blockData.getHeight()));
+
 		if (this.blockData.getHeight() > 1)
 			// Deduct any transaction fees from minter/reward-share account(s)
 			deductTransactionFees();
@@ -1446,10 +1450,10 @@ public class Block {
 		TransactionRepository transactionRepository = this.repository.getTransactionRepository();
 
 		// AT-generated transactions are already added to our transactions so no special handling is needed here.
-		List<Transaction> transactions = this.getTransactions();
+		List<Transaction> blocksTransactions = this.getTransactions();
 
-		for (int sequence = transactions.size() - 1; sequence >= 0; --sequence) {
+		for (int sequence = blocksTransactions.size() - 1; sequence >= 0; --sequence) {
-			Transaction transaction = transactions.get(sequence);
+			Transaction transaction = blocksTransactions.get(sequence);
 			TransactionData transactionData = transaction.getTransactionData();
 
 			// Orphan transaction
@@ -1485,9 +1489,9 @@ public class Block {
 		TransactionRepository transactionRepository = this.repository.getTransactionRepository();
 
 		// Find all transactions where decision happened at this block height
-		List<TransactionData> transactions = transactionRepository.getApprovalTransactionDecidedAtHeight(this.blockData.getHeight());
+		List<TransactionData> approvedTransactions = transactionRepository.getApprovalTransactionDecidedAtHeight(this.blockData.getHeight());
 
-		for (TransactionData transactionData : transactions) {
+		for (TransactionData transactionData : approvedTransactions) {
 			// Orphan/un-process transaction (if approved)
 			Transaction transaction = Transaction.fromData(repository, transactionData);
 			if (transactionData.getApprovalStatus() == ApprovalStatus.APPROVED)
@@ -1717,20 +1721,18 @@ public class Block {
 		BigDecimal foundersAmount = totalAmount.subtract(sharedAmount);
 		BigDecimal finalSharedAmount = sharedAmount;
 
-		List<ExpandedAccount> founderAccounts = expandedAccounts.stream().filter(accountInfo -> accountInfo.isMinterFounder).collect(Collectors.toList());
+		List<AccountData> founderAccounts = this.repository.getAccountRepository().getFlaggedAccounts(Account.FOUNDER_FLAG);
-		LOGGER.debug(() -> String.format("Shared %s of %s, remaining %s to %d founder%s",
-				finalSharedAmount.toPlainString(), totalAmount.toPlainString(),
-				foundersAmount.toPlainString(), founderAccounts.size(), (founderAccounts.size() != 1 ? "s" : "")));
-		if (founderAccounts.isEmpty())
-			return;
-
 		BigDecimal foundersCount = BigDecimal.valueOf(founderAccounts.size());
-		BigDecimal accountAmount = foundersAmount.divide(foundersCount, RoundingMode.DOWN);
+		BigDecimal perFounderAmount = foundersAmount.divide(foundersCount, RoundingMode.DOWN);
+
+		LOGGER.debug(() -> String.format("Shared %s of %s, remaining %s to %d founder%s, %s each",
+				finalSharedAmount.toPlainString(), totalAmount.toPlainString(),
+				foundersAmount.toPlainString(), founderAccounts.size(), (founderAccounts.size() != 1 ? "s" : ""),
+				perFounderAmount.toPlainString()));
 
 		for (int a = 0; a < founderAccounts.size(); ++a) {
-			ExpandedAccount expandedAccount = founderAccounts.get(a);
+			Account founderAccount = new Account(this.repository, founderAccounts.get(a).getAddress());
-			expandedAccount.distribute(accountAmount);
+			founderAccount.setConfirmedBalance(Asset.QORT, founderAccount.getConfirmedBalance(Asset.QORT).add(perFounderAmount));
-			sharedAmount = sharedAmount.add(accountAmount);
 		}
 	}
 

src/main/java/org/qora/repository/AccountRepository.java

@@ -15,6 +15,9 @@ public interface AccountRepository {
 	/** Returns all general information about account, e.g. public key, last reference, default group ID. */
 	public AccountData getAccount(String address) throws DataException;
 
+	/** Returns accounts with <b>any</b> bit set in given mask. */
+	public List<AccountData> getFlaggedAccounts(int mask) throws DataException;
+
 	/** Returns account's last reference or null if not set or account not found. */
 	public byte[] getLastReference(String address) throws DataException;
 

src/main/java/org/qora/repository/hsqldb/HSQLDBAccountRepository.java

@@ -47,6 +47,35 @@ public class HSQLDBAccountRepository implements AccountRepository {
 		}
 	}
 
+	@Override
+	public List<AccountData> getFlaggedAccounts(int mask) throws DataException {
+		String sql = "SELECT reference, public_key, default_group_id, flags, initial_level, level, blocks_minted, account FROM Accounts WHERE BITAND(flags, ?) != 0";
+
+		List<AccountData> accounts = new ArrayList<>();
+
+		try (ResultSet resultSet = this.repository.checkedExecute(sql, mask)) {
+			if (resultSet == null)
+				return accounts;
+
+			do {
+				byte[] reference = resultSet.getBytes(1);
+				byte[] publicKey = resultSet.getBytes(2);
+				int defaultGroupId = resultSet.getInt(3);
+				int flags = resultSet.getInt(4);
+				int initialLevel = resultSet.getInt(5);
+				int level = resultSet.getInt(6);
+				int blocksMinted = resultSet.getInt(7);
+				String address = resultSet.getString(8);
+
+				accounts.add(new AccountData(address, reference, publicKey, defaultGroupId, flags, initialLevel, level, blocksMinted));
+			} while (resultSet.next());
+
+			return accounts;
+		} catch (SQLException e) {
+			throw new DataException("Unable to fetch flagged accounts from repository", e);
+		}
+	}
+
 	@Override
 	public byte[] getLastReference(String address) throws DataException {
 		String sql = "SELECT reference FROM Accounts WHERE account = ?";