Merge master

.gitignore

@@ -26,3 +26,5 @@ build
 desktop.ini
 */target/*
 *.class
+deploy
+releases/*

README.md

@@ -18,7 +18,7 @@ Status
 ------
 Bisq has released the beta version on the 27th of April 2016. It is operational since that time without any major incident.
 Please follow the current development state at our [road map]( https://bisq.network/roadmap).
-For the latest version checkout our [releases page](https://github.com/bisq-network/exchange/releases) at Github.
+For the latest version checkout our [releases page](https://github.com/bisq-network/exchange/releases) at GitHub.
 
 Building from source
 --------------------

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
         classpath files('gradle/witness/gradle-witness.jar')
     }
 }
@@ -12,14 +12,21 @@ apply plugin: 'java'
 apply plugin: 'application'
 apply plugin: 'maven'
 apply plugin: 'witness'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 group = 'network.bisq'
-version = '-SNAPSHOT'
+version = '0.7.0-SNAPSHOT'
 
 sourceCompatibility = 1.8
 
 mainClassName = 'bisq.desktop.app.BisqAppMain'
 
+jar {
+    manifest.attributes(
+        'Class-Path': 'bcpg-jdk15on-1.56.jar bcprov-jdk15on-1.56.jar'
+    )
+}
+
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }

doc/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-Contributing to bisq
+Contributing to Bisq
 ============================
 
 Pull requests

doc/bisq-sn.cron.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Restart bisq seed node daemons whose resident memory (RSS)
+# Restart Bisq seed node daemons whose resident memory (RSS)
 # is over MAX_RSS_MiB.
 #
 # Scripts in the INITDIR must contain a ``SN_ADDRESS=<host:port>``
@@ -13,7 +13,7 @@ MAX_RSS_MiB=400
 PIDDIR=/var/run/bisq-sn
 INITDIR=/etc/init.d
 
-# Restart de daemon with the given address.
+# Restart the daemon with the given address.
 restart() {
     rcscript=$(grep -El "^SN_ADDRESS=['\"]?$1['\"]?" $INITDIR/*)
     if [ "$rcscript" ]; then

doc/bisq.conf

@@ -2,7 +2,7 @@
 
 # Here are the typical locations for the data directory:
 
-# Mac OSX: /Users/username/Library/Application Support/bisq/
+# macOS: /Users/username/Library/Application Support/bisq/
 # Linux: /home/username/.bisq/
 # Windows XP: C:\Documents and Settings\username\Application Data\bisq\
 # Windows Vista or 7: %appdata%/bisq/

doc/build.md

@@ -103,7 +103,7 @@ If you want to build the binaries check out the build scripts under the package
 DAO full node
 -----------------
 If you want to run your own BSQ transaction verification node you have to run Bitcoin Core with RPC enabled and
-use dedicated program arguments for the bisq node.
+use dedicated program arguments for the Bisq node.
 See https://github.com/bisq-network/bisq-desktop/blob/master/doc/rpc.md for more details.
 
 

doc/install_on_unix_fin.sh

@@ -10,7 +10,7 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
 # and add JAVA_HOME to .bashrc
 # export JAVA_HOME=/usr/lib/jvm/java-8-oracle
 
-echo "Install bisq"
+echo "Install Bisq"
 cd ~/bisq
 ./gradlew build
 cd ..

doc/protobuffer.md

@@ -6,25 +6,25 @@ NOTE: this doc is out of date and should probably be deleted. Protobuffer stuff
 
 Protobuffer is installed automatically via the Gradle build.
 
-## Why protobuffer?
+## Why Protobuffer?
 
 There are a number of reasons why protobuffer was chosen, here are some of them:
 * avoids java serialisation security issues
 * smaller in size than java serialisation (less network usage)
-* All P2P network messages are described in a clear protobuffer schema
+* All P2P network messages are described in a clear Protobuffer schema
 * allows to evolve your schema in a backward compatible way
 * can generate code in many languages, making alternative bisq clients or monitoring tools easier
 
-## Which classes are transformed to protobuffer?
+## Which classes are transformed to Protobuffer?
 
 All classes in the 'wire' module. This module contains the following classes:
 
 * classes sent over the wire (P2P network)
 * classes serialized to disk
 
-## Where are the protobuffer related files?
+## Where are the Protobuffer related files?
 
-The protobuffer schema file(s), generated classes and domain classes are in the 'wire' module.
+The Protobuffer schema file(s), generated classes and domain classes are in the 'wire' module.
 Look for *.proto for the schema files.
 
 ## How is serialisation done (Java -> Protobuffer)
@@ -36,7 +36,7 @@ Some interfaces have a 'toProtobuf' method to force all extending classes to imp
 Some interfaces have a 'toProtobuf' method to force all extending classes to implement that method.
 
 
-## If fields are not filled in, what are protobuffer's default values?
+## If fields are not filled in, what are Protobuffer's default values?
 
 Read this very carefully:
 
@@ -82,7 +82,7 @@ https://ruedigermoeller.github.io/fast-serialization/
 * Try to use value objects for data which gets serialized with PB
 * Use toProto and a static fromProto in the class which gets serialized
 * Use proto as name for the PB param in the fromProto method
-* If a constructor is used only for PB make it private and put it to the PB section, so its clear it is used only in that context
+* If a constructor is used only for PB make it private and put it to the PB section, so it's clear it is used only in that context
 * Use same name for classes and fields in PB definition as in the java code base
 * Use final
 * Use Lombok Annotations

doc/rpc.md

@@ -20,7 +20,7 @@ For mainnet:
 --fullDaoNode=true --rpcUser=bisq --rpcPassword=bisqPW --rpcPort=8332 --rpcBlockNotificationPort=4159
 
 If you use mainnet it is recommended to use a Bitcoin node with no funds in the wallet to avoid security risks when
-enabling rpc or take sufficient precautions from your network setup.
+enabling RPC or take sufficient precautions from your network setup.
 
 In the bitcoin.conf file you need to set txindex=1.
 That causes a re-index of the whole data base which takes considerable time with a
@@ -31,7 +31,7 @@ If you want to dump the blockchain data to json add: --dumpBlockchainData=true (
 If you use RegTest in development environment you need to create the genesis transaction.
 Create one Bitcoin transaction from Bitcoin Core to one or 2 Bisq instances using the BSQ receive addresses from those apps (1 tx with 2 or more outputs to the Bisq app).
 If you copy the BSQ address and use that in Bitcoin Core you need to remove the "B" at the beginning. This is only for protection to mix up BTC and BSQ addresses but without the B it is a native Bitcoin address.
-Create one block with the debug commandline inside Bitcoin Core (generate 1). Look up the block height in the info screen in the debug window.
+Create one block with the debug command line inside Bitcoin Core (generate 1). Look up the block height in the info screen in the debug window.
 Set the block height and transaction ID at with options genesisBlockHeight and genesisTxId.
 Restart the Bisq apps. After that the app will recognize the received Bitcoin as BSQ.
 

doc/ui-development-notes.md

@@ -1,4 +1,4 @@
-## UI Architecure pattern:
+## UI Architecture pattern:
 We use a variant of the **Presentation Model** pattern which has some similarities with the **Model View ViewModel** 
 (MVVM used in Silverlight and WPF) as we use data bindings, though there are differences in the way the view and 
 the "code behind" is organized (due to different framework features/support).  
@@ -25,7 +25,7 @@ For prototyping the UI we stick first with a more rapid development style approa
 * View/CB is responsible for the visual representation. No logic. No state.
 * Presentation model holds the view/CB state.
 * Presentation model handles view specific logic.
-* Presentation model does validation of user in put and formatting of domain data.
+* Presentation model does validation of user input and formatting of domain data.
 * Model is the domain specific representation of the view. It holds domain data and handles domain logic.
 
 

package/29CDFD3B.asc

@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=9LRS
+-----END PGP PUBLIC KEY BLOCK-----

package/5BC5ED73.asc

@@ -0,0 +1,50 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=AWz+
+-----END PGP PUBLIC KEY BLOCK-----