From 188f14f988a6080d7f6ef007190f100effa91bdf Mon Sep 17 00:00:00 2001 From: Albert Palau Date: Sat, 1 Dec 2018 16:30:59 +0100 Subject: [PATCH 1/4] Added script to install Java SE 10 target platform on OS rpm based --- scripts/install_java_rpm-os_based.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 scripts/install_java_rpm-os_based.sh 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 From 228804208022e0c901833b63bafa8f15e2bba221 Mon Sep 17 00:00:00 2001 From: Cave Spectre Date: Sat, 1 Dec 2018 14:57:30 -0500 Subject: [PATCH 2/4] Issue 2021 - Asset validation override issues in many coin extensions - Fix length issue in regular expression of validate() override in main asset coins. PIVX most likely started the 1+{25,34} that was then proliferated through the copies. While it likely should be 1+33, I could only confirm that 35 is too long, so the code is changed to be 1+{24,33} in order to reduce it by the presumed forgotten first character. - Fixup testInvalidAddresses() to better test regex rules in test asset coins. The PIVX base code was testing against 3 addresses, that all had a different first character, therefore none of the rest of the regular expression was being tested. Changed those addresses (and others for other susceptable coins) to accurately test first character match, length, and invalid characters in the 24 to 33 series. --- assets/src/main/java/bisq/asset/coins/BitCloud.java | 2 +- assets/src/main/java/bisq/asset/coins/Credits.java | 2 +- assets/src/main/java/bisq/asset/coins/Cryptonodes.java | 2 +- assets/src/main/java/bisq/asset/coins/DRIP.java | 2 +- assets/src/main/java/bisq/asset/coins/FuturoCoin.java | 2 +- assets/src/main/java/bisq/asset/coins/MegaCoin.java | 2 +- assets/src/main/java/bisq/asset/coins/MonetaryUnit.java | 2 +- assets/src/main/java/bisq/asset/coins/Neos.java | 2 +- assets/src/main/java/bisq/asset/coins/NewPowerCoin.java | 2 +- assets/src/main/java/bisq/asset/coins/PIVX.java | 2 +- assets/src/main/java/bisq/asset/coins/PZDC.java | 2 +- assets/src/main/java/bisq/asset/coins/QMCoin.java | 2 +- assets/src/main/java/bisq/asset/coins/SUB1X.java | 2 +- assets/src/main/java/bisq/asset/coins/Wavi.java | 2 +- assets/src/test/java/bisq/asset/coins/BitCloudTest.java | 7 ++++--- assets/src/test/java/bisq/asset/coins/CreditsTest.java | 2 +- .../src/test/java/bisq/asset/coins/CryptonodesTest.java | 7 ++++--- assets/src/test/java/bisq/asset/coins/DRIPTest.java | 7 ++++--- .../src/test/java/bisq/asset/coins/FuturoCoinTest.java | 1 + assets/src/test/java/bisq/asset/coins/MegaCoinTest.java | 7 ++++--- assets/src/test/java/bisq/asset/coins/NeosTest.java | 1 + .../src/test/java/bisq/asset/coins/NewPowerCoinTest.java | 7 ++++--- assets/src/test/java/bisq/asset/coins/PIVXTest.java | 9 ++++++--- assets/src/test/java/bisq/asset/coins/PZDCTest.java | 3 +++ assets/src/test/java/bisq/asset/coins/QMCoinTest.java | 9 ++++++--- assets/src/test/java/bisq/asset/coins/SUB1XTest.java | 1 + 26 files changed, 53 insertions(+), 36 deletions(-) diff --git a/assets/src/main/java/bisq/asset/coins/BitCloud.java b/assets/src/main/java/bisq/asset/coins/BitCloud.java index 8f2aed4e93..39c885c056 100644 --- a/assets/src/main/java/bisq/asset/coins/BitCloud.java +++ b/assets/src/main/java/bisq/asset/coins/BitCloud.java @@ -37,7 +37,7 @@ public class BitCloud extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[B][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[B][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/Credits.java b/assets/src/main/java/bisq/asset/coins/Credits.java index f3b05050ce..8658a0ec90 100644 --- a/assets/src/main/java/bisq/asset/coins/Credits.java +++ b/assets/src/main/java/bisq/asset/coins/Credits.java @@ -38,7 +38,7 @@ public class Credits extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[C][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[C][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/Cryptonodes.java b/assets/src/main/java/bisq/asset/coins/Cryptonodes.java index 2186a59029..5593b6bc26 100644 --- a/assets/src/main/java/bisq/asset/coins/Cryptonodes.java +++ b/assets/src/main/java/bisq/asset/coins/Cryptonodes.java @@ -37,7 +37,7 @@ public class Cryptonodes extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[c][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[c][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/DRIP.java b/assets/src/main/java/bisq/asset/coins/DRIP.java index fc757377ab..b4ed9d3908 100644 --- a/assets/src/main/java/bisq/asset/coins/DRIP.java +++ b/assets/src/main/java/bisq/asset/coins/DRIP.java @@ -37,7 +37,7 @@ public class DRIP 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/FuturoCoin.java b/assets/src/main/java/bisq/asset/coins/FuturoCoin.java index 55d7aa9371..7d8e1ba6c3 100644 --- a/assets/src/main/java/bisq/asset/coins/FuturoCoin.java +++ b/assets/src/main/java/bisq/asset/coins/FuturoCoin.java @@ -37,7 +37,7 @@ public class FuturoCoin extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[F][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[F][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/MegaCoin.java b/assets/src/main/java/bisq/asset/coins/MegaCoin.java index 69f4231ab6..8e432b7787 100644 --- a/assets/src/main/java/bisq/asset/coins/MegaCoin.java +++ b/assets/src/main/java/bisq/asset/coins/MegaCoin.java @@ -37,7 +37,7 @@ public class MegaCoin extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[M][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[M][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/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/NewPowerCoin.java b/assets/src/main/java/bisq/asset/coins/NewPowerCoin.java index 69cac4cd2f..f4c9fdfe10 100644 --- a/assets/src/main/java/bisq/asset/coins/NewPowerCoin.java +++ b/assets/src/main/java/bisq/asset/coins/NewPowerCoin.java @@ -37,7 +37,7 @@ public class NewPowerCoin 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/main/java/bisq/asset/coins/Wavi.java b/assets/src/main/java/bisq/asset/coins/Wavi.java index 6820916c76..77f6b7096e 100644 --- a/assets/src/main/java/bisq/asset/coins/Wavi.java +++ b/assets/src/main/java/bisq/asset/coins/Wavi.java @@ -37,7 +37,7 @@ public class Wavi extends Coin { @Override public AddressValidationResult validate(String address) { - if (!address.matches("^[W][a-km-zA-HJ-NP-Z1-9]{25,34}$")) + if (!address.matches("^[W][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/BitCloudTest.java b/assets/src/test/java/bisq/asset/coins/BitCloudTest.java index 302f69be30..56be7eba1f 100644 --- a/assets/src/test/java/bisq/asset/coins/BitCloudTest.java +++ b/assets/src/test/java/bisq/asset/coins/BitCloudTest.java @@ -37,8 +37,9 @@ public class BitCloudTest extends AbstractAssetTest { @Test public void testInvalidAddresses() { - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYheO"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#"); + assertInvalidAddress("17dtuCkeYcQQiTdr9wAK7HZtmvvrM24jEH"); + assertInvalidAddress("BGp8DmF5wwpaDUsK9Mi3SByTDuvgy6XJGSq"); + assertInvalidAddress("BDL6jpyNge8VB8LL8dEDX1bxfZ3jHGYz$3"); + assertInvalidAddress("BKuvEvMrXmPFPC3YGGHHnZo0VYxeddxAjC"); } } diff --git a/assets/src/test/java/bisq/asset/coins/CreditsTest.java b/assets/src/test/java/bisq/asset/coins/CreditsTest.java index 334f99264f..1f5a8166fd 100644 --- a/assets/src/test/java/bisq/asset/coins/CreditsTest.java +++ b/assets/src/test/java/bisq/asset/coins/CreditsTest.java @@ -40,6 +40,6 @@ public class CreditsTest extends AbstractAssetTest { assertInvalidAddress("1fXBhPhSxx1wqxGQCryfgn6iU1M1XFUuCo32"); assertInvalidAddress("CMde7YERCFWkCL2W5i8uyJmnpCVj8Chh"); assertInvalidAddress("CcbqU3MLZuGAED2CuhUkquyJxKaSJqv6V6#"); - assertInvalidAddress("bKaig5pznaUgiLqe6WkoCNGagNMhNLtqhKkggg"); + assertInvalidAddress("cKaig5pznaUgiLqe6WkoCNGagNMhNLtqhK"); } } diff --git a/assets/src/test/java/bisq/asset/coins/CryptonodesTest.java b/assets/src/test/java/bisq/asset/coins/CryptonodesTest.java index b3f9168c51..391e32af80 100644 --- a/assets/src/test/java/bisq/asset/coins/CryptonodesTest.java +++ b/assets/src/test/java/bisq/asset/coins/CryptonodesTest.java @@ -37,8 +37,9 @@ public class CryptonodesTest extends AbstractAssetTest { @Test public void testInvalidAddresses() { - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYheO"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#"); + assertInvalidAddress("cmqiMdMJuXf3meR3Qxy9hhHS85tuTRMRbub"); + assertInvalidAddress("CjMRzBHViq7WGgJUuNdiuks39ZCMjyG7UT"); + assertInvalidAddress("cYXaTfAEMrvr3cZEQ30UxKJuzbvBwgTR2e"); + assertInvalidAddress("cX38diq2mcFpBMEWbTRvyrdbINBjyv2nq9"); } } diff --git a/assets/src/test/java/bisq/asset/coins/DRIPTest.java b/assets/src/test/java/bisq/asset/coins/DRIPTest.java index 43bf2b7de4..772e1c3e5e 100644 --- a/assets/src/test/java/bisq/asset/coins/DRIPTest.java +++ b/assets/src/test/java/bisq/asset/coins/DRIPTest.java @@ -37,8 +37,9 @@ public class DRIPTest extends AbstractAssetTest { @Test public void testInvalidAddresses() { - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYheO"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#"); + assertInvalidAddress("dFJku78A14HYwPSzC5PtUmda7jMr5pbD2B"); + assertInvalidAddress("DAeiBSH4nudXgoxS4kY6uhTPobc7ALrWDAe"); + assertInvalidAddress("DRbnCYbuMXdKI4y8dya9EnocL47gFjErWe"); + assertInvalidAddress("DTPAqTryNRCE2FgsxzohTtJXf0BCDnG6Rc"); } } diff --git a/assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java b/assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java index 4cae7e7363..cec6a336f4 100644 --- a/assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java +++ b/assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java @@ -46,5 +46,6 @@ public class FuturoCoinTest extends AbstractAssetTest { assertInvalidAddress("FheRu8mY47PpUCx4kvjgsRQcLtoG9uDbT9"); assertInvalidAddress("Fd7gZ7dNJ1toY6TeWy3rf2dUvyRudggTL"); assertInvalidAddress("FbRXmJUDgf5URuVGyM223P8R2JArXSSm61"); + assertInvalidAddress("fbRXmJUDgf5URuVGyM223P8R2JArXSSm6u"); } } diff --git a/assets/src/test/java/bisq/asset/coins/MegaCoinTest.java b/assets/src/test/java/bisq/asset/coins/MegaCoinTest.java index 5e9f44b0bd..066180e7cd 100644 --- a/assets/src/test/java/bisq/asset/coins/MegaCoinTest.java +++ b/assets/src/test/java/bisq/asset/coins/MegaCoinTest.java @@ -37,8 +37,9 @@ public class MegaCoinTest extends AbstractAssetTest { @Test public void testInvalidAddresses() { - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYheO"); - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#"); + assertInvalidAddress("mWXQfp3wKnir6krS4SQFAxzv1AExpfFMbq"); + assertInvalidAddress("MEfn9iWMjowxQaNOZEbtT7A34pvnJGPZ44"); + assertInvalidAddress("MRal1xTj5eAuxMR3xDPxLUG6RP3qR1ijuo"); + assertInvalidAddress("M9pCgxBES9EgoNxoUnXxrnaMqYUwZVMttMt"); } } 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/NewPowerCoinTest.java b/assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java index 4b3dae7e87..f3c10a5537 100644 --- a/assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java +++ b/assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java @@ -37,8 +37,9 @@ public class NewPowerCoinTest extends AbstractAssetTest { @Test public void testInvalidAddresses() { - assertInvalidAddress("1111111111111111111111111111111111"); - assertInvalidAddress("2222222222222222222222222222222222"); - assertInvalidAddress("3333333333333333333333333333333333"); + assertInvalidAddress("nXNc8LCAe2dHumQ9vTyogRXUzGw3PJHr55"); + assertInvalidAddress("NhWDeD4UaNK20j8oSKr9u7EAUkCFZxEsDr"); + assertInvalidAddress("NNTuHe4p5Xr8kyN2AJjJS9dcBoG1XQKkW6r"); + assertInvalidAddress("NQebfMl6pijp2KvFHTKQktD4y2cSKknQEg"); } } 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..6769753655 100644 --- a/assets/src/test/java/bisq/asset/coins/PZDCTest.java +++ b/assets/src/test/java/bisq/asset/coins/PZDCTest.java @@ -42,6 +42,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"); From 76c8a148f3c1d5ec83d097dbc374b08a3b16d1c5 Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Sun, 2 Dec 2018 00:18:14 -0800 Subject: [PATCH 3/4] Fix incorrectly named Windows system tray 2x icon --- ...ndows@2x.png => system_tray_icon_windows@2x.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename desktop/src/main/resources/images/{task_bar_icon_windows@2x.png => system_tray_icon_windows@2x.png} (100%) 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 From 8507e0d6652f55727b325921b0904b46809388b2 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 2 Dec 2018 12:27:30 +0100 Subject: [PATCH 4/4] Merge branch 'master' into release-candidate-0.9.0 # Conflicts: # assets/src/main/java/bisq/asset/coins/BitCloud.java # assets/src/main/java/bisq/asset/coins/Credits.java # assets/src/main/java/bisq/asset/coins/Cryptonodes.java # assets/src/main/java/bisq/asset/coins/DRIP.java # assets/src/main/java/bisq/asset/coins/FuturoCoin.java # assets/src/main/java/bisq/asset/coins/MegaCoin.java # assets/src/main/java/bisq/asset/coins/NewPowerCoin.java # assets/src/main/java/bisq/asset/coins/Wavi.java # assets/src/test/java/bisq/asset/coins/BitCloudTest.java # assets/src/test/java/bisq/asset/coins/CreditsTest.java # assets/src/test/java/bisq/asset/coins/CryptonodesTest.java # assets/src/test/java/bisq/asset/coins/DRIPTest.java # assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java # assets/src/test/java/bisq/asset/coins/MegaCoinTest.java # assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java --- assets/src/test/java/bisq/asset/coins/PZDCTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/assets/src/test/java/bisq/asset/coins/PZDCTest.java b/assets/src/test/java/bisq/asset/coins/PZDCTest.java index 6769753655..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() {