Extract btc to segwit addresses

assets/src/main/java/bisq/asset/Base58BitcoinAddressValidator.java → assets/src/main/java/bisq/asset/Base58AddressValidator.java

@@ -23,21 +23,21 @@
 import org.bitcoinj.params.MainNetParams;
 
 /**
- * {@link AddressValidator} for Base58-encoded Bitcoin addresses.
+ * {@link AddressValidator} for Base58-encoded addresses.
  *
  * @author Chris Beams
  * @since 0.7.0
  * @see org.bitcoinj.core.LegacyAddress#fromBase58(NetworkParameters, String)
  */
-public class Base58BitcoinAddressValidator implements AddressValidator {
+public class Base58AddressValidator implements AddressValidator {
 
     private final NetworkParameters networkParameters;
 
-    public Base58BitcoinAddressValidator() {
+    public Base58AddressValidator() {
         this(MainNetParams.get());
     }
 
-    public Base58BitcoinAddressValidator(NetworkParameters networkParameters) {
+    public Base58AddressValidator(NetworkParameters networkParameters) {
         this.networkParameters = networkParameters;
     }
 

assets/src/main/java/bisq/asset/BitcoinAddressValidator.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset;
+
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.AddressFormatException;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.params.MainNetParams;
+
+/**
+ * {@link AddressValidator} for Bitcoin addresses.
+ *
+ * @author Oscar Guindzberg
+ */
+public class BitcoinAddressValidator implements AddressValidator {
+
+    private final NetworkParameters networkParameters;
+
+    public BitcoinAddressValidator() {
+        this(MainNetParams.get());
+    }
+
+    public BitcoinAddressValidator(NetworkParameters networkParameters) {
+        this.networkParameters = networkParameters;
+    }
+
+    @Override
+    public AddressValidationResult validate(String address) {
+        try {
+            Address.fromString(networkParameters, address);
+        } catch (AddressFormatException ex) {
+            return AddressValidationResult.invalidAddress(ex);
+        }
+
+        return AddressValidationResult.validAddress();
+    }
+}

assets/src/main/java/bisq/asset/coins/Actinium.java

@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Actinium extends Coin {
 
     public Actinium() {
-        super("Actinium", "ACM", new Base58BitcoinAddressValidator(new ActiniumParams()));
+        super("Actinium", "ACM", new Base58AddressValidator(new ActiniumParams()));
     }
 
 

assets/src/main/java/bisq/asset/coins/Adeptio.java

@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public Adeptio() {
     }
 
 
-    public static class AdeptioAddressValidator extends Base58BitcoinAddressValidator {
+    public static class AdeptioAddressValidator extends Base58AddressValidator {
 
         public AdeptioAddressValidator() {
             super(new AdeptioParams());

assets/src/main/java/bisq/asset/coins/Animecoin.java

@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Animecoin extends Coin {
     public Animecoin() {
-        super("Animecoin", "ANI", new Base58BitcoinAddressValidator(new AnimecoinMainNetParams()));
+        super("Animecoin", "ANI", new Base58AddressValidator(new AnimecoinMainNetParams()));
     }
 
     public static class AnimecoinMainNetParams extends NetworkParametersAdapter {

assets/src/main/java/bisq/asset/coins/Australiacash.java

@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Australiacash extends Coin {
     public Australiacash() {
-        super("Australiacash", "AUS", new Base58BitcoinAddressValidator(new AustraliacashParams()));
+        super("Australiacash", "AUS", new Base58AddressValidator(new AustraliacashParams()));
     }
 	   public static class AustraliacashParams extends NetworkParametersAdapter {
 

assets/src/main/java/bisq/asset/coins/BSQ.java

@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 
 import org.bitcoinj.core.NetworkParameters;
@@ -57,7 +57,7 @@ public Regtest() {
     }
 
 
-    public static class BSQAddressValidator extends Base58BitcoinAddressValidator {
+    public static class BSQAddressValidator extends Base58AddressValidator {
 
         public BSQAddressValidator(NetworkParameters networkParameters) {
             super(networkParameters);

assets/src/main/java/bisq/asset/coins/Bitcoin.java

@@ -17,7 +17,7 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.BitcoinAddressValidator;
 import bisq.asset.Coin;
 
 import org.bitcoinj.core.NetworkParameters;
@@ -28,7 +28,7 @@
 public abstract class Bitcoin extends Coin {
 
     public Bitcoin(Network network, NetworkParameters networkParameters) {
-        super("Bitcoin", "BTC", new Base58BitcoinAddressValidator(networkParameters), network);
+        super("Bitcoin", "BTC", new BitcoinAddressValidator(networkParameters), network);
     }
 
 

assets/src/main/java/bisq/asset/coins/BitcoinRhodium.java

@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class BitcoinRhodium extends Coin {
 
     public BitcoinRhodium() {
-        super("Bitcoin Rhodium", "XRC", new Base58BitcoinAddressValidator(new BitcoinRhodiumParams()));
+        super("Bitcoin Rhodium", "XRC", new Base58AddressValidator(new BitcoinRhodiumParams()));
     }
 
     public static class BitcoinRhodiumParams extends NetworkParametersAdapter {

assets/src/main/java/bisq/asset/coins/Bitmark.java

@@ -17,7 +17,7 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -31,6 +31,6 @@ public BitmarkParams() {
     }
 
     public Bitmark() {
-        super("Bitmark", "BTM", new Base58BitcoinAddressValidator(new BitmarkParams()));
+        super("Bitmark", "BTM", new Base58AddressValidator(new BitmarkParams()));
     }
 }

assets/src/main/java/bisq/asset/coins/CTSCoin.java

@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class CTSCoin extends Coin {
     public CTSCoin() {
-        super("CTSCoin", "CTSC", new Base58BitcoinAddressValidator(new CtscMainNetParams()));
+        super("CTSCoin", "CTSC", new Base58AddressValidator(new CtscMainNetParams()));
     }
 
     public static class CtscMainNetParams extends NetworkParametersAdapter {

assets/src/main/java/bisq/asset/coins/Chaucha.java

@@ -17,18 +17,18 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Chaucha extends Coin {
 
     public Chaucha() {
-        super("Chaucha", "CHA", new Base58BitcoinAddressValidator(new ChauchaParams()));
+        super("Chaucha", "CHA", new Base58AddressValidator(new ChauchaParams()));
     }
 
 	public static class ChauchaParams extends NetworkParametersAdapter {
-	
+
 	    public ChauchaParams() {
 	        addressHeader = 88;
 	        p2shHeader = 50;

assets/src/main/java/bisq/asset/coins/Credits.java

@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public Credits() {
     }
 
 
-    public static class CreditsAddressValidator extends Base58BitcoinAddressValidator {
+    public static class CreditsAddressValidator extends Base58AddressValidator {
 
         public CreditsAddressValidator() {
             super(new CreditsParams());

assets/src/main/java/bisq/asset/coins/DSTRA.java

@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public DSTRA() {
     }
 
 
-    public static class DSTRAAddressValidator extends Base58BitcoinAddressValidator {
+    public static class DSTRAAddressValidator extends Base58AddressValidator {
 
         public DSTRAAddressValidator() {
             super(new DSTRAParams());

assets/src/main/java/bisq/asset/coins/DarkPay.java

@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class DarkPay extends Coin {
     public DarkPay() {
-        super("DarkPay", "D4RK", new Base58BitcoinAddressValidator(new DarkPayMainNetParams()));
+        super("DarkPay", "D4RK", new Base58AddressValidator(new DarkPayMainNetParams()));
     }
 
     public static class DarkPayMainNetParams extends NetworkParametersAdapter {

assets/src/main/java/bisq/asset/coins/Dash.java

@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Dash extends Coin {
     public Dash() {
-        super("Dash", "DASH", new Base58BitcoinAddressValidator(new DashMainNetParams()), Network.MAINNET);
+        super("Dash", "DASH", new Base58AddressValidator(new DashMainNetParams()), Network.MAINNET);
     }
 
     public static class DashMainNetParams extends NetworkParametersAdapter {

assets/src/main/java/bisq/asset/coins/DeepOnion.java

@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -27,7 +27,7 @@ public DeepOnion() {
         super("DeepOnion", "ONION", new DeepOnionAddressValidator());
     }
 
-    public static class DeepOnionAddressValidator extends Base58BitcoinAddressValidator {
+    public static class DeepOnionAddressValidator extends Base58AddressValidator {
 
         public DeepOnionAddressValidator() {
             super(new DeepOnionParams());

assets/src/main/java/bisq/asset/coins/Dextro.java

@@ -18,18 +18,18 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Dextro extends Coin {
 
     public Dextro() {
-        super("Dextro", "DXO", new Base58BitcoinAddressValidator(new DextroParams()));
+        super("Dextro", "DXO", new Base58AddressValidator(new DextroParams()));
     }
 
 
-    public static class DextroAddressValidator extends Base58BitcoinAddressValidator {
+    public static class DextroAddressValidator extends Base58AddressValidator {
 
         public DextroAddressValidator() {
             super(new DextroParams());
@@ -44,7 +44,7 @@ public AddressValidationResult validate(String address) {
         }
     }
 
-    
+
     public static class DextroParams extends NetworkParametersAdapter {
 
         public DextroParams() {

assets/src/main/java/bisq/asset/coins/Dogecoin.java

@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Dogecoin extends Coin {
 
     public Dogecoin() {
-        super("Dogecoin", "DOGE", new Base58BitcoinAddressValidator(new DogecoinMainNetParams()), Network.MAINNET);
+        super("Dogecoin", "DOGE", new Base58AddressValidator(new DogecoinMainNetParams()), Network.MAINNET);
     }
 
     public static class DogecoinMainNetParams extends NetworkParametersAdapter {