Merge branch 'master_upstream' into fix-trade-protocol-issues

# Conflicts:
#	core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java

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

@@ -17,8 +17,8 @@
 
 package bisq.asset;
 
-import org.bitcoinj.core.Address;
 import org.bitcoinj.core.AddressFormatException;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.params.MainNetParams;
 
@@ -27,7 +27,7 @@
  *
  * @author Chris Beams
  * @since 0.7.0
- * @see org.bitcoinj.core.Address#fromBase58(NetworkParameters, String)
+ * @see org.bitcoinj.core.LegacyAddress#fromBase58(NetworkParameters, String)
  */
 public class Base58BitcoinAddressValidator implements AddressValidator {
 
@@ -44,7 +44,7 @@ public Base58BitcoinAddressValidator(NetworkParameters networkParameters) {
     @Override
     public AddressValidationResult validate(String address) {
         try {
-            Address.fromBase58(networkParameters, address);
+            LegacyAddress.fromBase58(networkParameters, address);
         } catch (AddressFormatException ex) {
             return AddressValidationResult.invalidAddress(ex);
         }

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

@@ -33,7 +33,6 @@ public static class ActiniumParams extends NetworkParametersAdapter {
         public ActiniumParams() {
             addressHeader = 53;
             p2shHeader = 55;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -50,7 +50,6 @@ public static class AdeptioParams extends NetworkParametersAdapter {
         public AdeptioParams() {
             addressHeader = 23;
             p2shHeader = 16;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class AnimecoinMainNetParams extends NetworkParametersAdapter {
         public AnimecoinMainNetParams() {
             this.addressHeader = 23;
             this.p2shHeader = 9;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class AustraliacashParams extends NetworkParametersAdapter {
         public AustraliacashParams() {
             addressHeader = 23;
             p2shHeader = 5;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -32,7 +32,6 @@ public static class BitcoinRhodiumParams extends NetworkParametersAdapter {
         public BitcoinRhodiumParams() {
             addressHeader = 61;
             p2shHeader = 123;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -27,7 +27,6 @@ public static class BitmarkParams extends NetworkParametersAdapter {
         public BitmarkParams() {
             addressHeader = 85;
             p2shHeader = 5;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 

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

@@ -30,7 +30,6 @@ public static class CtscMainNetParams extends NetworkParametersAdapter {
         public CtscMainNetParams() {
             this.addressHeader = 66;
             this.p2shHeader = 16;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -32,7 +32,6 @@ public static class ChauchaParams extends NetworkParametersAdapter {
 	    public ChauchaParams() {
 	        addressHeader = 88;
 	        p2shHeader = 50;
-	        acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
 	    }
 	}
 }

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

@@ -50,7 +50,6 @@ public static class CreditsParams extends NetworkParametersAdapter {
         public CreditsParams() {
             addressHeader = 28;
             p2shHeader = 5;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
-}
+}

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

@@ -50,7 +50,6 @@ public static class DSTRAParams extends NetworkParametersAdapter {
         public DSTRAParams() {
             addressHeader = 30;
             p2shHeader = 33;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class DarkPayMainNetParams extends NetworkParametersAdapter {
         public DarkPayMainNetParams() {
             this.addressHeader = 31;
             this.p2shHeader = 60;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class DashMainNetParams extends NetworkParametersAdapter {
         public DashMainNetParams() {
             this.addressHeader = 76;
             this.p2shHeader = 16;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -48,7 +48,6 @@ public DeepOnionParams() {
             super();
             addressHeader = 31;
             p2shHeader = 78;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -51,7 +51,6 @@ public DextroParams() {
             super();
             addressHeader = 30;
             p2shHeader = 90;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -31,7 +31,6 @@ public static class DogecoinMainNetParams extends NetworkParametersAdapter {
         public DogecoinMainNetParams() {
             this.addressHeader = 30;
             this.p2shHeader = 22;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -31,7 +31,6 @@ public static class DoichainParams extends NetworkParametersAdapter {
         public DoichainParams() {
             addressHeader = 52;
             p2shHeader = 13;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -50,7 +50,6 @@ public static class DonuParams extends NetworkParametersAdapter {
         public DonuParams() {
             addressHeader = 53;
             p2shHeader = 5;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -31,7 +31,6 @@ public static class EmercoinMainNetParams extends NetworkParametersAdapter {
         public EmercoinMainNetParams() {
             this.addressHeader = 33;
             this.p2shHeader = 92;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -32,7 +32,6 @@ public static class FaircoinParams extends NetworkParametersAdapter {
         public FaircoinParams() {
             addressHeader = 95;
             p2shHeader = 36;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 

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

@@ -30,7 +30,6 @@ public static class FujicoinParams extends NetworkParametersAdapter {
         public FujicoinParams() {
             addressHeader = 36;
             p2shHeader = 16;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class GalilelMainNetParams extends NetworkParametersAdapter {
         public GalilelMainNetParams() {
             this.addressHeader = 68;
             this.p2shHeader = 16;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -51,7 +51,6 @@ public GambleCoinParams() {
             super();
             addressHeader = 28;
             p2shHeader = 18;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -51,7 +51,6 @@ public static class GenesisParams extends NetworkParametersAdapter {
         public GenesisParams() {
             addressHeader = 28;
             p2shHeader = 63;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class HatchMainNetParams extends NetworkParametersAdapter {
         public HatchMainNetParams() {
             this.addressHeader = 76;
             this.p2shHeader = 16;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -33,7 +33,6 @@ public static class HeliumParams extends NetworkParametersAdapter {
         public HeliumParams() {
             addressHeader = 63;
             p2shHeader = 5;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -51,7 +51,6 @@ public IdaPayParams() {
             super();
             addressHeader = 29;
             p2shHeader = 36;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -34,7 +34,6 @@ public KekcoinParams() {
             super();
             addressHeader = 45;
             p2shHeader = 88;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
-}
+}

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

@@ -30,7 +30,6 @@ public static class KydMainNetParams extends NetworkParametersAdapter {
         public KydMainNetParams() {
             this.addressHeader = 78;
             this.p2shHeader = 85;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class KoreMainNetParams extends NetworkParametersAdapter {
         public KoreMainNetParams() {
             this.addressHeader = 45;
             this.p2shHeader = 85;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -31,7 +31,6 @@ public static class LBRYCreditsMainNetParams extends NetworkParametersAdapter {
         public LBRYCreditsMainNetParams() {
             this.addressHeader = 0x55;
             this.p2shHeader = 0x7a;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class LitecoinMainNetParams extends NetworkParametersAdapter {
         public LitecoinMainNetParams() {
             this.addressHeader = 48;
             this.p2shHeader = 5;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -31,7 +31,6 @@ public static class LitecoinPlusMainNetParams extends NetworkParametersAdapter {
         public LitecoinPlusMainNetParams() {
             this.addressHeader = 75;
             this.p2shHeader = 8;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -33,7 +33,6 @@ public static class LytixParams extends NetworkParametersAdapter {
         public LytixParams() {
             addressHeader = 19;
             p2shHeader = 11;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -50,7 +50,6 @@ public static class MobitGlobalParams extends NetworkParametersAdapter {
         public MobitGlobalParams() {
             addressHeader = 50;
             p2shHeader = 110;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -50,7 +50,6 @@ public static class MonetaryUnitParams extends NetworkParametersAdapter {
         public MonetaryUnitParams() {
             addressHeader = 16;
             p2shHeader = 76;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -26,12 +26,11 @@ public class Myce extends Coin {
     public Myce() {
         super("Myce", "YCE", new Base58BitcoinAddressValidator(new MyceParams()));
     }
-        
+
     public static class MyceParams extends NetworkParametersAdapter {
         public MyceParams() {
             addressHeader = 50;
             p2shHeader = 85;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -30,7 +30,6 @@ public static class NavcoinParams extends NetworkParametersAdapter {
         public NavcoinParams() {
             this.addressHeader = 53;
             this.p2shHeader = 85;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
 }

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

@@ -50,7 +50,6 @@ public static class PIVXParams extends NetworkParametersAdapter {
         public PIVXParams() {
             addressHeader = 30;
             p2shHeader = 13;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -50,7 +50,6 @@ public static class PZDCParams extends NetworkParametersAdapter {
         public PZDCParams() {
             addressHeader = 55;
             p2shHeader = 13;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -32,7 +32,6 @@ public static class ParticlMainNetParams extends NetworkParametersAdapter {
         public ParticlMainNetParams() {
             this.addressHeader = 56;
             this.p2shHeader = 60;
-            this.acceptableAddressCodes = new int[]{this.addressHeader, this.p2shHeader};
         }
     }
    public static class ParticlMainNetAddressValidator extends Base58BitcoinAddressValidator {
@@ -49,5 +48,5 @@ public AddressValidationResult validate(String address) {
             return super.validate(address);
         }
     }
-    
+
 }

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

@@ -33,7 +33,6 @@ public static class PinkcoinParams extends NetworkParametersAdapter {
         public PinkcoinParams() {
             addressHeader = 3;
             p2shHeader = 28;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -50,7 +50,6 @@ public static class QMCoinParams extends NetworkParametersAdapter {
         public QMCoinParams() {
             addressHeader = 58;
             p2shHeader = 120;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -32,7 +32,6 @@ public static class QbaseParams extends NetworkParametersAdapter {
         public QbaseParams() {
             addressHeader = 25;
             p2shHeader = 5;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
 }

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

@@ -34,7 +34,6 @@ public RadiumParams() {
             super();
             addressHeader = 76;
             p2shHeader = 58;
-            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
         }
     }
-}
+}