Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reformat EtherAddressValidator for EVMAddressValidator #1452

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Reformat EtherAddressValidator for EVMAddressValidator #1452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b35e7c6
Renamed EtherAddressValidator class for EVMAddressValidator
XMRZombie Dec 3, 2024
46687f3
Update Erc20Token.java
XMRZombie Dec 3, 2024
f9bc33b
Update Ether.java
XMRZombie Dec 3, 2024
2f125b3
Merge branch 'haveno-dex:master' into EVMaddresses
XMRZombie Dec 3, 2024
199be4b
Merge branch 'haveno-dex:master' into EVMaddresses
XMRZombie Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...a/haveno/asset/EtherAddressValidator.java → ...ava/haveno/asset/EVMAddressValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@
*
* @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);
}
}
2 changes: 1 addition & 1 deletion assets/src/main/java/haveno/asset/Erc20Token.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
public abstract class Erc20Token extends Token {

public Erc20Token(String name, String tickerSymbol) {
super(name, tickerSymbol, new EtherAddressValidator());
super(name, tickerSymbol, new EVMAddressValidator());
}
}
4 changes: 2 additions & 2 deletions assets/src/main/java/haveno/asset/coins/Ether.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Loading