diff --git a/assets/src/main/java/bisq/asset/coins/MonetaryUnit.java b/assets/src/main/java/bisq/asset/coins/MonetaryUnit.java index 99f337f2f0..b1cd79a995 100644 --- a/assets/src/main/java/bisq/asset/coins/MonetaryUnit.java +++ b/assets/src/main/java/bisq/asset/coins/MonetaryUnit.java @@ -37,7 +37,7 @@ public class MonetaryUnit extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[7][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[7][a-km-zA-HJ-NP-Z1-9]{24,33}$")) return AddressValidationResult.invalidStructure(); return super.validate(address); diff --git a/assets/src/main/java/bisq/asset/coins/Neos.java b/assets/src/main/java/bisq/asset/coins/Neos.java index f8efecb57f..86f9b6ea6d 100644 --- a/assets/src/main/java/bisq/asset/coins/Neos.java +++ b/assets/src/main/java/bisq/asset/coins/Neos.java @@ -37,7 +37,7 @@ public class Neos extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[N][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[N][a-km-zA-HJ-NP-Z1-9]{24,33}$")) return AddressValidationResult.invalidStructure(); return super.validate(address); diff --git a/assets/src/main/java/bisq/asset/coins/PIVX.java b/assets/src/main/java/bisq/asset/coins/PIVX.java index 35f00ba3e8..12bd6a9111 100644 --- a/assets/src/main/java/bisq/asset/coins/PIVX.java +++ b/assets/src/main/java/bisq/asset/coins/PIVX.java @@ -37,7 +37,7 @@ public class PIVX extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[D][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[D][a-km-zA-HJ-NP-Z1-9]{24,33}$")) return AddressValidationResult.invalidStructure(); return super.validate(address); diff --git a/assets/src/main/java/bisq/asset/coins/PZDC.java b/assets/src/main/java/bisq/asset/coins/PZDC.java index 94ad421dc1..f91c9a623d 100644 --- a/assets/src/main/java/bisq/asset/coins/PZDC.java +++ b/assets/src/main/java/bisq/asset/coins/PZDC.java @@ -37,7 +37,7 @@ public class PZDC extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[P][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[P][a-km-zA-HJ-NP-Z1-9]{24,33}$")) return AddressValidationResult.invalidStructure(); return super.validate(address); diff --git a/assets/src/main/java/bisq/asset/coins/QMCoin.java b/assets/src/main/java/bisq/asset/coins/QMCoin.java index 956c79fd32..984ba4cb21 100644 --- a/assets/src/main/java/bisq/asset/coins/QMCoin.java +++ b/assets/src/main/java/bisq/asset/coins/QMCoin.java @@ -37,7 +37,7 @@ public class QMCoin extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[Q][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[Q][a-km-zA-HJ-NP-Z1-9]{24,33}$")) return AddressValidationResult.invalidStructure(); return super.validate(address); diff --git a/assets/src/main/java/bisq/asset/coins/SUB1X.java b/assets/src/main/java/bisq/asset/coins/SUB1X.java index 59c8e1f98d..14daac5be0 100644 --- a/assets/src/main/java/bisq/asset/coins/SUB1X.java +++ b/assets/src/main/java/bisq/asset/coins/SUB1X.java @@ -37,7 +37,7 @@ public class SUB1X extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[Z][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[Z][a-km-zA-HJ-NP-Z1-9]{24,33}$")) return AddressValidationResult.invalidStructure(); return super.validate(address); diff --git a/assets/src/test/java/bisq/asset/coins/NeosTest.java b/assets/src/test/java/bisq/asset/coins/NeosTest.java index 5c11338bd8..67c2e9521f 100644 --- a/assets/src/test/java/bisq/asset/coins/NeosTest.java +++ b/assets/src/test/java/bisq/asset/coins/NeosTest.java @@ -40,6 +40,7 @@ public class NeosTest extends AbstractAssetTest { assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq"); assertInvalidAddress("NScgetCW5bqDTVWFH3EYNMtTo5Rc#DxD6B"); assertInvalidAddress("NeeAy35a0irpmTARHEXpP8uTmpPCcSD9Qn"); + assertInvalidAddress("neeAy35aQirpmTARHEXpP8uTmpPCcSD9Qn"); assertInvalidAddress("NScgetCWRcvDxD6B"); } } diff --git a/assets/src/test/java/bisq/asset/coins/PIVXTest.java b/assets/src/test/java/bisq/asset/coins/PIVXTest.java index a9092c40e1..7f8e12a3d6 100644 --- a/assets/src/test/java/bisq/asset/coins/PIVXTest.java +++ b/assets/src/test/java/bisq/asset/coins/PIVXTest.java @@ -37,8 +37,11 @@ public class PIVXTest extends AbstractAssetTest { @Test public void testInvalidAddresses() { - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYheO"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#"); + assertInvalidAddress("dFJku78A14HYwPSzC5PtUmda7jMr5pbD2B"); + assertInvalidAddress("DAeiBSH4nudXgoxS4kY6uhTPobc7AlrWDA"); + assertInvalidAddress("DRbnCYbuMXdKU4y8dya9EnocL47gFjErWeg"); + assertInvalidAddress("DTPAqTryNRCE2FgsxzohTtJXfCBODnG6Rc"); + assertInvalidAddress("DTPAqTryNRCE2FgsxzohTtJXfCB0DnG6Rc"); + assertInvalidAddress("DTPAqTryNRCE2FgsxzohTtJXfCBIDnG6Rc"); } } diff --git a/assets/src/test/java/bisq/asset/coins/PZDCTest.java b/assets/src/test/java/bisq/asset/coins/PZDCTest.java index 442d61dea3..5af789200d 100644 --- a/assets/src/test/java/bisq/asset/coins/PZDCTest.java +++ b/assets/src/test/java/bisq/asset/coins/PZDCTest.java @@ -17,12 +17,10 @@ package bisq.asset.coins; -import org.junit.Test; - - - import bisq.asset.AbstractAssetTest; +import org.junit.Test; + public class PZDCTest extends AbstractAssetTest { public PZDCTest() { @@ -42,6 +40,9 @@ public class PZDCTest extends AbstractAssetTest { public void testInvalidAddresses() { assertInvalidAddress("pGXsg0jSMzh1dSqggRvHjPvE3cnwvuXC7s"); assertInvalidAddress("PKfRRcjwzKFq3dIqE9gq8Ztxn922W4GZhm"); + assertInvalidAddress("PKfRRcjwzKFq3d0qE9gq8Ztxn922W4GZhm"); + assertInvalidAddress("PKfRRcjwzKFq3dOqE9gq8Ztxn922W4GZhm"); + assertInvalidAddress("PKfRRcjwzKFq3dlqE9gq8Ztxn922W4GZhm"); assertInvalidAddress("PXP75NnwDryYswQb9RaPFBchqLRSvBmDP"); assertInvalidAddress("PKr3vQ7S"); } diff --git a/assets/src/test/java/bisq/asset/coins/QMCoinTest.java b/assets/src/test/java/bisq/asset/coins/QMCoinTest.java index 44e29cd992..0cdaa1c29a 100644 --- a/assets/src/test/java/bisq/asset/coins/QMCoinTest.java +++ b/assets/src/test/java/bisq/asset/coins/QMCoinTest.java @@ -39,8 +39,11 @@ public class QMCoinTest extends AbstractAssetTest { @Test public void testInvalidAddresses() { - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYheO"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#"); + assertInvalidAddress("qSXwS2opau1PYsvj4PrirPkP6LQHeKbQDx"); + assertInvalidAddress("QbvD8CPJwAmpQoE8CQhzcfWp1EAmT2E2989"); + assertInvalidAddress("QUAzsb7nq07XVsRy9vjaE4kTUpgP1pFeoL"); + assertInvalidAddress("QQDvVM2s3WYa8EZQS1s2OsRkR4zmrjy94d"); + assertInvalidAddress("QgdkWtsy1inr9j8RUrqDIVnrJmhE28WnLX"); + assertInvalidAddress("Qii56aanBMiEPpjHoaE4lgEW4jPuhGjuj5"); } } diff --git a/assets/src/test/java/bisq/asset/coins/SUB1XTest.java b/assets/src/test/java/bisq/asset/coins/SUB1XTest.java index 4a4ea4d333..183c2f9c7c 100644 --- a/assets/src/test/java/bisq/asset/coins/SUB1XTest.java +++ b/assets/src/test/java/bisq/asset/coins/SUB1XTest.java @@ -37,6 +37,7 @@ public class SUB1XTest extends AbstractAssetTest { @Test public void testInvalidAddresses() { + assertInvalidAddress("zKi6EksPCZoMi6EGXS9vWVed4NeSov2ZS4"); assertInvalidAddress("ZDxdoVuyosZ6vY3LZAP1Z4H4eXMq2ZpAC7"); assertInvalidAddress("ZKi6EksPCZoMi6EGXS9vWVedqwfov2ZS4"); assertInvalidAddress("ZT29B3yDJq1jzkqwrwBs4LnraM3E854MAPRm"); diff --git a/desktop/src/main/resources/images/task_bar_icon_windows@2x.png b/desktop/src/main/resources/images/system_tray_icon_windows@2x.png similarity index 100% rename from desktop/src/main/resources/images/task_bar_icon_windows@2x.png rename to desktop/src/main/resources/images/system_tray_icon_windows@2x.png diff --git a/scripts/install_java_rpm-os_based.sh b/scripts/install_java_rpm-os_based.sh new file mode 100755 index 0000000000..ad4a33f3c0 --- /dev/null +++ b/scripts/install_java_rpm-os_based.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +JAVA_HOME=/usr/lib/jvm/openjdk-10.0.2 + +if [ ! -d "$JAVA_HOME" ]; then + yum install curl + + curl -L -O https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz + mkdir -p $JAVA_HOME + tar -zxf openjdk-10.0.2_linux-x64_bin.tar.gz -C $JAVA_HOME --strip 1 + rm openjdk-10.0.2_linux-x64_bin.tar.gz + + update-alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 2000 + update-alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 2000 +fi