Merge pull request #15 from console-cowboy/list-10grans

* console-cowboy-list-10grans: List 10grans (GRANS)
bisq-network · Mar 20, 2018 · 27a0430 · 27a0430
2 parents 9f8c399 + 6e7086c
commit 27a0430
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/src/main/java/bisq/core/locale/CurrencyUtil.java b/src/main/java/bisq/core/locale/CurrencyUtil.java
@@ -190,6 +190,7 @@ public static List<CryptoCurrency> createAllSortedCryptoCurrenciesList() {
         result.add(new CryptoCurrency("UBQ", "Ubiq"));
         result.add(new CryptoCurrency("QWARK", "Qwark", true));
         result.add(new CryptoCurrency("GEO", "GeoCoin", true));
+        result.add(new CryptoCurrency("GRANS", "10grans"));
 
         result.sort(TradeCurrency::compareTo);
 

diff --git a/src/main/java/bisq/core/payment/validation/AltCoinAddressValidator.java b/src/main/java/bisq/core/payment/validation/AltCoinAddressValidator.java
@@ -568,6 +568,11 @@ public ValidationResult validate(String input) {
                         return regexTestFailed;
                     else
                         return new ValidationResult(true);
+                case "GRANS":
+                    if (!input.matches("^(0x)?[0-9a-fA-F]{40}$"))
+                        return regexTestFailed;
+                    else
+                        return new ValidationResult(true);
 
                     // Add new coins at the end...
                 default:

diff --git a/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java b/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
@@ -304,6 +304,7 @@ private void printAllCurrencyStats() {
         newlyAdded.add("UBQ");
         newlyAdded.add("QWARK");
         newlyAdded.add("GEO");
+        newlyAdded.add("GRANS");
 
         coinsWithValidator.addAll(newlyAdded);
 

diff --git a/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java b/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java
@@ -915,4 +915,18 @@ public void testGEO() {
         assertFalse(validator.validate("2a65Aca4D5fC5B5C859090a6c34d16413539822g").isValid);
         assertFalse(validator.validate("").isValid);
     }
+
+    @Test
+    public void testGRANS() {
+        AltCoinAddressValidator validator = new AltCoinAddressValidator();
+        validator.setCurrencyCode("GRANS");
+
+        assertTrue(validator.validate("0x2a65Aca4D5fC5B5C859090a6c34d164135398226").isValid);
+        assertTrue(validator.validate("2a65Aca4D5fC5B5C859090a6c34d164135398226").isValid);
+
+        assertFalse(validator.validate("0x2a65Aca4D5fC5B5C859090a6c34d1641353982266").isValid);
+        assertFalse(validator.validate("0x2a65Aca4D5fC5B5C859090a6c34d16413539822g").isValid);
+        assertFalse(validator.validate("2a65Aca4D5fC5B5C859090a6c34d16413539822g").isValid);
+        assertFalse(validator.validate("").isValid);
+    }
 }