mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Issue 2021 - Asset validation override issues in many coin extensions

Browse Source 
- 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.
This commit is contained in:
Cave Spectre 2018-12-01 14:57:30 -05:00
parent a9a8703de0
commit 2288042080
26 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/src/main/java/bisq/asset/coins/BitCloud.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/Credits.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/Cryptonodes.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/DRIP.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/FuturoCoin.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/MegaCoin.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/MonetaryUnit.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/Neos.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/NewPowerCoin.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/PIVX.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/PZDC.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/QMCoin.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/SUB1X.java
View File

@ -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);

2
assets/src/main/java/bisq/asset/coins/Wavi.java
View File

@ -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);

7
assets/src/test/java/bisq/asset/coins/BitCloudTest.java
View File

@ -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");
}
}

2
assets/src/test/java/bisq/asset/coins/CreditsTest.java
View File

@ -40,6 +40,6 @@ public class CreditsTest extends AbstractAssetTest {
assertInvalidAddress("1fXBhPhSxx1wqxGQCryfgn6iU1M1XFUuCo32");
assertInvalidAddress("CMde7YERCFWkCL2W5i8uyJmnpCVj8Chh");
assertInvalidAddress("CcbqU3MLZuGAED2CuhUkquyJxKaSJqv6V6#");
assertInvalidAddress("bKaig5pznaUgiLqe6WkoCNGagNMhNLtqhKkggg");
assertInvalidAddress("cKaig5pznaUgiLqe6WkoCNGagNMhNLtqhK");
}
}

7
assets/src/test/java/bisq/asset/coins/CryptonodesTest.java
View File

@ -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");
}
}

7
assets/src/test/java/bisq/asset/coins/DRIPTest.java
View File

@ -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");
}
}

1
assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java
View File

@ -46,5 +46,6 @@ public class FuturoCoinTest extends AbstractAssetTest {
assertInvalidAddress("FheRu8mY47PpUCx4kvjgsRQcLtoG9uDbT9");
assertInvalidAddress("Fd7gZ7dNJ1toY6TeWy3rf2dUvyRudggTL");
assertInvalidAddress("FbRXmJUDgf5URuVGyM223P8R2JArXSSm61");
assertInvalidAddress("fbRXmJUDgf5URuVGyM223P8R2JArXSSm6u");
}
}

7
assets/src/test/java/bisq/asset/coins/MegaCoinTest.java
View File

@ -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");
}
}

1
assets/src/test/java/bisq/asset/coins/NeosTest.java
View File

@ -40,6 +40,7 @@ public class NeosTest extends AbstractAssetTest {
assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq");
assertInvalidAddress("NScgetCW5bqDTVWFH3EYNMtTo5Rc#DxD6B");
assertInvalidAddress("NeeAy35a0irpmTARHEXpP8uTmpPCcSD9Qn");
assertInvalidAddress("neeAy35aQirpmTARHEXpP8uTmpPCcSD9Qn");
assertInvalidAddress("NScgetCWRcvDxD6B");
}
}

7
assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java
View File

@ -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");
}
}

9
assets/src/test/java/bisq/asset/coins/PIVXTest.java
View File

@ -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");
}
}

3
assets/src/test/java/bisq/asset/coins/PZDCTest.java
View File

@ -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");
}

9
assets/src/test/java/bisq/asset/coins/QMCoinTest.java
View File

@ -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");
}
}

1
assets/src/test/java/bisq/asset/coins/SUB1XTest.java
View File

@ -37,6 +37,7 @@ public class SUB1XTest extends AbstractAssetTest {
@Test
public void testInvalidAddresses() {
assertInvalidAddress("zKi6EksPCZoMi6EGXS9vWVed4NeSov2ZS4");
assertInvalidAddress("ZDxdoVuyosZ6vY3LZAP1Z4H4eXMq2ZpAC7");
assertInvalidAddress("ZKi6EksPCZoMi6EGXS9vWVedqwfov2ZS4");
assertInvalidAddress("ZT29B3yDJq1jzkqwrwBs4LnraM3E854MAPRm");