Fixes after rebase from master

src/main/java/org/qora/api/resource/AddressesResource.java

@@ -27,13 +27,13 @@ import org.qora.api.ApiError;
 import org.qora.api.ApiErrors;
 import org.qora.api.ApiException;
 import org.qora.api.ApiExceptionFactory;
+import org.qora.api.resource.TransactionsResource;
 import org.qora.asset.Asset;
 import org.qora.crypto.Crypto;
 import org.qora.crypto.Ed25519;
 import org.qora.data.account.AccountData;
 import org.qora.data.account.ProxyForgerData;
 import org.qora.data.transaction.ProxyForgingTransactionData;
-import org.qora.group.Group;
 import org.qora.repository.DataException;
 import org.qora.repository.Repository;
 import org.qora.repository.RepositoryManager;
@@ -74,7 +74,7 @@ public class AddressesResource {
 
 			// Not found?
 			if (accountData == null)
-				accountData = new AccountData(address, null, null, Group.NO_GROUP);
+				accountData = new AccountData(address);
 
 			return accountData;
 		} catch (ApiException e) {

src/main/java/org/qora/api/resource/AdminResource.java

@@ -36,9 +36,6 @@ import org.qora.repository.DataException;
 import org.qora.repository.Repository;
 import org.qora.repository.RepositoryManager;
 import org.qora.data.account.ForgingAccountData;
-import org.qora.repository.DataException;
-import org.qora.repository.Repository;
-import org.qora.repository.RepositoryManager;
 import org.qora.utils.Base58;
 
 @Path("/admin")

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

@@ -42,6 +42,7 @@ import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
 import org.qora.settings.Settings;
 import org.qora.transaction.Transaction;
 import org.qora.transaction.Transaction.ValidationResult;
+import org.qora.utils.Base58;
 import org.qora.utils.NTP;
 
 public class Controller extends Thread {

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

@@ -698,7 +698,7 @@ public class HSQLDBDatabaseUpdates {
 							+ "previous_flags INT, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)");
 					break;
 
-				case 38:
+				case 45:
 					// Enabling other accounts to forge
 					// Transaction to allow one account to enable other account to forge
 					stmt.execute("CREATE TABLE EnableForgingTransactions (signature Signature, creator QoraPublicKey NOT NULL, target QoraAddress NOT NULL, "
@@ -707,7 +707,7 @@ public class HSQLDBDatabaseUpdates {
 					stmt.execute("ALTER TABLE Accounts ADD COLUMN forging_enabler QoraAddress");
 					break;
 
-				case 39:
+				case 46:
 					// Proxy forging
 					// Transaction emitted by forger announcing they are forging on behalf of recipient
 					stmt.execute("CREATE TABLE ProxyForgingTransactions (signature Signature, forger QoraPublicKey NOT NULL, recipient QoraAddress NOT NULL, proxy_public_key QoraPublicKey NOT NULL, share DECIMAL(5,2) NOT NULL, "
@@ -719,7 +719,7 @@ public class HSQLDBDatabaseUpdates {
 					stmt.execute("CREATE INDEX ProxyForgersProxyPublicKeyIndex ON ProxyForgers (proxy_public_key)");
 					break;
 
-				case 40:
+				case 47:
 					// Stash of private keys used for generating blocks. These should be proxy keys!
 					stmt.execute("CREATE TYPE QoraKeySeed AS VARBINARY(32)");
 					stmt.execute("CREATE TABLE ForgingAccounts (forger_seed QoraKeySeed NOT NULL, PRIMARY KEY (forger_seed))");