Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-03 12:16:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

add gold and silver, refactor money types to traditional and crypto

Browse source
This commit is contained in:
woodser 2023-05-15 17:10:01 -04:00
parent 65bc78d3d7
commit 29706339ef
210 changed files with 2629 additions and 2373 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/src/main/java/haveno/asset/AddressValidationResult.java
View file

@ -60,7 +60,7 @@ public class AddressValidationResult {
}
public static AddressValidationResult invalidAddress(String cause) {
return invalidAddress(cause, "validation.altcoin.invalidAddress");
return invalidAddress(cause, "validation.crypto.invalidAddress");
}
public static AddressValidationResult invalidAddress(String cause, String i18nKey) {
@ -68,6 +68,6 @@ public class AddressValidationResult {
}
public static AddressValidationResult invalidStructure() {
return invalidAddress("", "validation.altcoin.wrongStructure");
return invalidAddress("", "validation.crypto.wrongStructure");
}
}

4
assets/src/main/java/haveno/asset/AltCoinAccountDisclaimer.java → assets/src/main/java/haveno/asset/CryptoAccountDisclaimer.java
View file

@ -14,10 +14,10 @@ import java.lang.annotation.Target;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface AltCoinAccountDisclaimer {
public @interface CryptoAccountDisclaimer {
/**
* Translation key of the message to show, i.e. "account.altcoin.popup.xmr.msg"
* Translation key of the message to show, i.e. "account.crypto.popup.xmr.msg"
* @return translation key
*/
String value();

2
assets/src/main/java/haveno/asset/LiquidBitcoinAddressValidator.java
View file

@ -4,6 +4,6 @@ public class LiquidBitcoinAddressValidator extends RegexAddressValidator {
static private final String REGEX = "^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,87}|[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,87})$";
public LiquidBitcoinAddressValidator() {
super(REGEX, "validation.altcoin.liquidBitcoin.invalidAddress");
super(REGEX, "validation.crypto.liquidBitcoin.invalidAddress");
}
}

4
assets/src/main/java/haveno/asset/coins/Monero.java
View file

@ -17,11 +17,11 @@
package haveno.asset.coins;
import haveno.asset.AltCoinAccountDisclaimer;
import haveno.asset.CryptoAccountDisclaimer;
import haveno.asset.Coin;
import haveno.asset.CryptoNoteAddressValidator;
@AltCoinAccountDisclaimer("account.altcoin.popup.xmr.msg")
@CryptoAccountDisclaimer("account.crypto.popup.xmr.msg")
public class Monero extends Coin {
public Monero() {

2
assets/src/main/java/haveno/asset/package-info.java
View file

@ -19,7 +19,7 @@
* Haveno's family of abstractions representing different ("crypto")
* {@link haveno.asset.Asset} types such as {@link haveno.asset.Coin},
* {@link haveno.asset.Token} and {@link haveno.asset.Erc20Token}, as well as concrete
* implementations of each, such as {@link haveno.asset.coins.Bitcoin} itself, altcoins like
* implementations of each, such as {@link haveno.asset.coins.Bitcoin} itself, cryptos like
* {@link haveno.asset.coins.Litecoin} and {@link haveno.asset.coins.Ether} and tokens like
* {@link haveno.asset.tokens.DaiStablecoin}.
* <p>

14
assets/src/main/resources/i18n/displayStrings-assets.properties
View file

@ -19,10 +19,10 @@
# Please try to keep the length of the translated string similar to English. If it is longer it might break layout or
# get truncated. We will need some adjustments in the UI code to support that but we want to keep effort at the minimum.
account.altcoin.popup.validation.XCP=XCP address must start with '1' and must have 34 characters.
account.altcoin.popup.validation.DCR=DCR address must start with 'Dk' or 'Ds' or 'De' or 'DS' or 'Dc' or 'Pm' and must have 34 characters.
account.altcoin.popup.validation.ETC=ETC address must start with '0x' and made up of letters A to F and numbers which are 40 characters long.
account.altcoin.popup.validation.NMC=NMC address must start with 'N' or 'M' and must be 34 characters long.
account.altcoin.popup.validation.SF= Siafund address must be made up of letters A to F and numbers which are 76 characters long.
account.altcoin.popup.validation.UNO=UNO address must start with 'u' and must have 34 characters.
account.altcoin.popup.validation.XZC=XZC address must start with 'a' and must have 34 characters.
account.crypto.popup.validation.XCP=XCP address must start with '1' and must have 34 characters.
account.crypto.popup.validation.DCR=DCR address must start with 'Dk' or 'Ds' or 'De' or 'DS' or 'Dc' or 'Pm' and must have 34 characters.
account.crypto.popup.validation.ETC=ETC address must start with '0x' and made up of letters A to F and numbers which are 40 characters long.
account.crypto.popup.validation.NMC=NMC address must start with 'N' or 'M' and must be 34 characters long.
account.crypto.popup.validation.SF= Siafund address must be made up of letters A to F and numbers which are 76 characters long.
account.crypto.popup.validation.UNO=UNO address must start with 'u' and must have 34 characters.
account.crypto.popup.validation.XZC=XZC address must start with 'a' and must have 34 characters.