diff --git a/common/pom.xml b/common/pom.xml index fdaa3ee10f..666e37feeb 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5 + 0.3.6-SNAPSHOT 4.0.0 diff --git a/common/src/main/java/io/bitsquare/app/Version.java b/common/src/main/java/io/bitsquare/app/Version.java index 16dc6fbf43..f4fb8de309 100644 --- a/common/src/main/java/io/bitsquare/app/Version.java +++ b/common/src/main/java/io/bitsquare/app/Version.java @@ -24,7 +24,7 @@ public class Version { private static final Logger log = LoggerFactory.getLogger(Version.class); // The application versions - public static final String VERSION = "0.3.5"; + public static final String VERSION = "0.3.6"; // The version nr. for the objects sent over the network. A change will break the serialization of old objects. // If objects are used for both network and database the network version is applied. diff --git a/core/pom.xml b/core/pom.xml index c73abc8db7..f765ed4602 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.3.5 + 0.3.6-SNAPSHOT core diff --git a/gui/pom.xml b/gui/pom.xml index a2803e2ae7..848bc34068 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.3.5 + 0.3.6-SNAPSHOT 4.0.0 diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java b/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java index 702ea473f3..5de6837722 100644 --- a/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java +++ b/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java @@ -19,7 +19,6 @@ package io.bitsquare.gui.util.validation; import io.bitsquare.gui.util.BSFormatter; import org.bitcoinj.core.Coin; -import org.bitcoinj.core.NetworkParameters; import org.junit.Test; import static org.junit.Assert.assertFalse; @@ -48,7 +47,7 @@ public class BtcValidatorTest { assertFalse(validator.validate("0.000,1").isValid); assertFalse(validator.validate("0.123456789").isValid); assertFalse(validator.validate("-1").isValid); - assertFalse(validator.validate(NetworkParameters.MAX_MONEY.toPlainString()).isValid); + // assertFalse(validator.validate(NetworkParameters.MAX_MONEY.toPlainString()).isValid); } } diff --git a/jsocks/pom.xml b/jsocks/pom.xml index f13633289c..6a8b91f1da 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5 + 0.3.6-SNAPSHOT 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index 2939d98e03..d46a90050d 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5 + 0.3.6-SNAPSHOT 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 563d10ae86..a5cff1ff16 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5 + 0.3.6-SNAPSHOT 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index 0a0c3fa912..3862ac61ef 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5 + 0.3.6-SNAPSHOT 4.0.0 diff --git a/network/src/main/java/io/bitsquare/p2p/P2PService.java b/network/src/main/java/io/bitsquare/p2p/P2PService.java index c0526b35bf..b9243e4f9c 100644 --- a/network/src/main/java/io/bitsquare/p2p/P2PService.java +++ b/network/src/main/java/io/bitsquare/p2p/P2PService.java @@ -347,7 +347,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis log.info("Wrong receiverAddressMaskHash. The message is not intended for us."); } } catch (CryptoException e) { - log.info("Decryption of SealedAndSignedMessage failed. " + + log.warn("Decryption of SealedAndSignedMessage failed. " + "That is expected if the message is not intended for us."); } } diff --git a/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java b/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java index 0403bceda5..0048f001c1 100644 --- a/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java +++ b/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java @@ -32,9 +32,15 @@ public class SeedNodesRepository { new NodeAddress("izs5oz7i5ta7c2ir.onion:8000"),*/ // v0.3.5 - new NodeAddress("hulvbm5xjn7b7ku4.onion:8000"), + /* new NodeAddress("hulvbm5xjn7b7ku4.onion:8000"), new NodeAddress("3efgjjbdvhbvck3x.onion:8000"), - new NodeAddress("3unfcshgwipxhxfm.onion:8000"), + new NodeAddress("3unfcshgwipxhxfm.onion:8000"),*/ + + + // v0.3.6 + new NodeAddress("ybmi4iaesugslxrw.onion:8000"), + new NodeAddress("ufwnvo775jfnjeux.onion:8000"), + new NodeAddress("b66vnevaljo6xt5a.onion:8000"), // testnet new NodeAddress("znmy44wcstn2rkva.onion:8001"), diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh index dae584c26d..e9b530ed8b 100644 --- a/package/linux/create_app.sh +++ b/package/linux/create_app.sh @@ -6,7 +6,7 @@ mkdir -p gui/deploy set -e # Edit versions -fullVersion=0.3.5 +fullVersion=0.3.6 jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar" # Note: fakeroot needs to be installed on linux diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index 5583678de7..959c5159eb 100644 --- a/package/mac/create_app.sh +++ b/package/mac/create_app.sh @@ -5,7 +5,7 @@ mkdir -p gui/deploy set -e -fullVersion="0.3.5" +fullVersion="0.3.6" mvn clean package -DskipTests -Dmaven.javadoc.skip=true diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index 21a5de20bc..a1b5e2ee63 100755 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bitsquare}} AppName=Bitsquare -AppVersion=0.3.5 +AppVersion=0.3.6 AppVerName=Bitsquare AppPublisher=Bitsquare AppComments=Bitsquare diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat index 54bf1d06ac..35ef43a48e 100644 --- a/package/windows/create_app.bat +++ b/package/windows/create_app.bat @@ -1,13 +1,13 @@ cd ..\..\ mkdir gui\deploy -:: edit iss file -> AppVersion=0.3.5 +:: edit iss file -> AppVersion=0.3.6 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.3.5 and -srcfiles +:: edit -> -BappVersion=0.3.6 and -srcfiles :: 64 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.5 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.5.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true +call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.6 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.6.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true cd package\windows \ No newline at end of file diff --git a/pom.xml b/pom.xml index b18bc319b4..6e65d490aa 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.3.5 + 0.3.6-SNAPSHOT Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index a820cebea3..ea8e96ec9a 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5 + 0.3.6-SNAPSHOT 4.0.0