mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release-candidate-0.9.0' into do-not-use-tor-for-btcj-testnet

Browse source
This commit is contained in:
Manfred Karrer 2018-12-02 13:37:05 +01:00
commit 5a11314abb
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
13 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

9
assets/src/test/java/bisq/asset/coins/PZDCTest.java
View file

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

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

0
desktop/src/main/resources/images/task_bar_icon_windows@2x.png → desktop/src/main/resources/images/system_tray_icon_windows@2x.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

15
scripts/install_java_rpm-os_based.sh Executable file
View file

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