From b35e7c68a643713d6de0258b841882d2a8d292a6 Mon Sep 17 00:00:00 2001 From: XMRZombie Date: Tue, 3 Dec 2024 14:22:06 +0000 Subject: [PATCH 1/3] Renamed EtherAddressValidator class for EVMAddressValidator Using this address validation for all EVM addresses instead of only Ethereum --- ...therAddressValidator.java => EVMAddressValidator.java} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename assets/src/main/java/haveno/asset/{EtherAddressValidator.java => EVMAddressValidator.java} (85%) diff --git a/assets/src/main/java/haveno/asset/EtherAddressValidator.java b/assets/src/main/java/haveno/asset/EVMAddressValidator.java similarity index 85% rename from assets/src/main/java/haveno/asset/EtherAddressValidator.java rename to assets/src/main/java/haveno/asset/EVMAddressValidator.java index 5c7a0b18f8..ca7d04b06d 100644 --- a/assets/src/main/java/haveno/asset/EtherAddressValidator.java +++ b/assets/src/main/java/haveno/asset/EVMAddressValidator.java @@ -27,14 +27,16 @@ package haveno.asset; * * @author Chris Beams * @since 0.7.0 + * + * Edit: renamed EVMAddressValidator for being used by all EVMs */ -public class EtherAddressValidator extends RegexAddressValidator { +public class EVMAddressValidator extends RegexAddressValidator { - public EtherAddressValidator() { + public EVMAddressValidator() { super("^(0x)?[0-9a-fA-F]{40}$"); } - public EtherAddressValidator(String errorMessageI18nKey) { + public EVMAddressValidator(String errorMessageI18nKey) { super("^(0x)?[0-9a-fA-F]{40}$", errorMessageI18nKey); } } From 46687f36316ade147e17ddb9bf74d1a4a71d8749 Mon Sep 17 00:00:00 2001 From: XMRZombie Date: Tue, 3 Dec 2024 14:23:30 +0000 Subject: [PATCH 2/3] Update Erc20Token.java Using EVMAddressValidator instead of EtherAddressValidator --- assets/src/main/java/haveno/asset/Erc20Token.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/main/java/haveno/asset/Erc20Token.java b/assets/src/main/java/haveno/asset/Erc20Token.java index 621f5acae4..710c91af8a 100644 --- a/assets/src/main/java/haveno/asset/Erc20Token.java +++ b/assets/src/main/java/haveno/asset/Erc20Token.java @@ -28,6 +28,6 @@ package haveno.asset; public abstract class Erc20Token extends Token { public Erc20Token(String name, String tickerSymbol) { - super(name, tickerSymbol, new EtherAddressValidator()); + super(name, tickerSymbol, new EVMAddressValidator()); } } From f9bc33ba6490661a47b7d74b01ff6cbb3e78de19 Mon Sep 17 00:00:00 2001 From: XMRZombie Date: Tue, 3 Dec 2024 14:24:38 +0000 Subject: [PATCH 3/3] Update Ether.java Using EVMAddressValidator instead of EtherAddressValidator --- assets/src/main/java/haveno/asset/coins/Ether.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/main/java/haveno/asset/coins/Ether.java b/assets/src/main/java/haveno/asset/coins/Ether.java index 35d5b1986c..0418cfe27b 100644 --- a/assets/src/main/java/haveno/asset/coins/Ether.java +++ b/assets/src/main/java/haveno/asset/coins/Ether.java @@ -18,11 +18,11 @@ package haveno.asset.coins; import haveno.asset.Coin; -import haveno.asset.EtherAddressValidator; +import haveno.asset.EVMAddressValidator; public class Ether extends Coin { public Ether() { - super("Ether", "ETH", new EtherAddressValidator()); + super("Ether", "ETH", new EVMAddressValidator()); } }