From 86762370d8bf6ce221c7cb51d9004c5a81f5294a Mon Sep 17 00:00:00 2001
From: "cwd.systems | 0KN" <101006007+infinitydaemon@users.noreply.github.com>
Date: Wed, 18 Dec 2024 20:11:30 +0600
Subject: [PATCH] Update PublicKeyAccount.java

Hardened. Try this out and see if this works better.
---
 .../org/qortal/account/PublicKeyAccount.java  | 102 +++++++++++-------
 1 file changed, 64 insertions(+), 38 deletions(-)

diff --git a/src/main/java/org/qortal/account/PublicKeyAccount.java b/src/main/java/org/qortal/account/PublicKeyAccount.java
index 494fe326..0bf05c62 100644
--- a/src/main/java/org/qortal/account/PublicKeyAccount.java
+++ b/src/main/java/org/qortal/account/PublicKeyAccount.java
@@ -5,51 +5,77 @@ import org.qortal.crypto.Crypto;
 import org.qortal.data.account.AccountData;
 import org.qortal.repository.Repository;
 
+import java.util.Objects;
+
 public class PublicKeyAccount extends Account {
 
-	protected final byte[] publicKey;
-	protected final Ed25519PublicKeyParameters edPublicKeyParams;
+    protected final Ed25519PublicKeyParameters edPublicKeyParams;
+    protected final byte[] publicKey;
 
-	public PublicKeyAccount(Repository repository, byte[] publicKey) {
-		this(repository, new Ed25519PublicKeyParameters(publicKey, 0));
-	}
+    /**
+     * Constructs a PublicKeyAccount from a public key byte array.
+     * 
+     * @param repository The repository to use for database operations.
+     * @param publicKey The public key as a byte array.
+     * @throws IllegalArgumentException if the public key is invalid.
+     */
+    public PublicKeyAccount(Repository repository, byte[] publicKey) {
+        this(repository, validatePublicKey(publicKey));
+    }
 
-	protected PublicKeyAccount(Repository repository, Ed25519PublicKeyParameters edPublicKeyParams) {
-		super(repository, Crypto.toAddress(edPublicKeyParams.getEncoded()));
+    protected PublicKeyAccount(Repository repository, Ed25519PublicKeyParameters edPublicKeyParams) {
+        super(repository, Crypto.toAddress(edPublicKeyParams.getEncoded()));
+        this.edPublicKeyParams = edPublicKeyParams;
+        this.publicKey = edPublicKeyParams.getEncoded();
+    }
 
-		this.edPublicKeyParams = edPublicKeyParams;
-		this.publicKey = edPublicKeyParams.getEncoded();
-	}
+    /**
+     * Validates the public key before use.
+     * 
+     * @param publicKey The public key to validate.
+     * @return Ed25519PublicKeyParameters object if valid.
+     * @throws IllegalArgumentException if the public key is invalid.
+     */
+    private static Ed25519PublicKeyParameters validatePublicKey(byte[] publicKey) {
+        if (publicKey == null || publicKey.length != Ed25519PublicKeyParameters.KEY_SIZE) {
+            throw new IllegalArgumentException("Invalid public key size");
+        }
+        return new Ed25519PublicKeyParameters(publicKey, 0);
+    }
 
-	protected PublicKeyAccount(Repository repository, byte[] publicKey, String address) {
-		super(repository, address);
+    public byte[] getPublicKey() {
+        return this.publicKey;
+    }
 
-		this.publicKey = publicKey;
-		this.edPublicKeyParams = null;
-	}
+    @Override
+    protected AccountData buildPublicKeyAccountData() {
+        AccountData accountData = super.buildAccountData();
+        accountData.setPublicKey(this.publicKey);
+        return accountData;
+    }
 
-	protected PublicKeyAccount() {
-		this.publicKey = null;
-		this.edPublicKeyParams = null;
-	}
-
-	public byte[] getPublicKey() {
-		return this.publicKey;
-	}
-
-	@Override
-	protected AccountData buildAccountData() {
-		AccountData accountData = super.buildAccountData();
-		accountData.setPublicKey(this.publicKey);
-		return accountData;
-	}
-
-	public boolean verify(byte[] signature, byte[] message) {
-		return Crypto.verify(this.publicKey, signature, message);
-	}
-
-	public static String getAddress(byte[] publicKey) {
-		return Crypto.toAddress(publicKey);
-	}
+    /**
+     * Verifies the given signature for the message using this account's public key.
+     * 
+     * @param signature The signature to verify.
+     * @param message The original message.
+     * @return true if the signature is valid, false otherwise.
+     * @throws IllegalStateException if the public key parameters are not initialized.
+     */
+    public boolean verify(byte[] signature, byte[] message) {
+        if (edPublicKeyParams == null) {
+            throw new IllegalStateException("Public key parameters not initialized");
+        }
+        return Crypto.verify(this.publicKey, signature, message);
+    }
 
+    /**
+     * Generates an address from a public key.
+     * 
+     * @param publicKey The public key to convert to an address.
+     * @return The address string.
+     */
+    public static String getAddress(byte[] publicKey) {
+        return Crypto.toAddress(publicKey);
+    }
 }