From 7c4bf8680bcc7e986ca4676f2f5212b2cf794cda Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Mon, 9 Nov 2015 23:34:47 +0100
Subject: [PATCH] Fix auth handshake, add missing img

---
 doc/build.md                                  |   4 ++
 .../settings/network/NetworkSettingsView.fxml |   4 +-
 .../main/resources/images/connection/tor.png  | Bin 0 -> 1181 bytes
 .../resources/images/connection/tor@2x.png    | Bin 0 -> 3331 bytes
 .../p2p/peers/AuthenticationHandshake.java    |  35 +++++++++---------
 .../messages/auth/AuthenticationRequest.java  |   2 +-
 .../messages/auth/AuthenticationResponse.java |   2 +-
 .../messages/auth/GetPeersAuthRequest.java    |   2 +-
 .../messages/auth/GetPeersAuthResponse.java   |   2 +-
 .../messages/maintenance/GetPeersRequest.java |   2 +-
 .../maintenance/GetPeersResponse.java         |   2 +-
 11 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 gui/src/main/resources/images/connection/tor.png
 create mode 100644 gui/src/main/resources/images/connection/tor@2x.png

diff --git a/doc/build.md b/doc/build.md
index 561e2c4e2e..8589009dd1 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -67,6 +67,10 @@ To run it use:
 
     $ java -jar gui/target/shaded.jar
 
+For developing the following program arguments are useful (regtest mode):
+ 
+    $ java -jar gui/target/shaded.jar --bitcoin.network=regtest --useLocalhost=true --node.port=2222 --devTest=true --app.name=Bitsquare-Regtest-Alice
+
 Problems?
 ---------
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
index 4621f8888a..cfd76a8344 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
@@ -74,8 +74,8 @@
         </GridPane.margin>
     </TextField>
 
-    <Label text="Authenticated peers:" GridPane.rowIndex="5"/>
-    <TextArea fx:id="authenticatedPeersTextArea" GridPane.rowIndex="7" GridPane.columnIndex="1"
+    <Label text="Authenticated peers:" GridPane.rowIndex="4"/>
+    <TextArea fx:id="authenticatedPeersTextArea" GridPane.rowIndex="4" GridPane.columnIndex="1"
               mouseTransparent="true" focusTraversable="false"/>
 
     <columnConstraints>
diff --git a/gui/src/main/resources/images/connection/tor.png b/gui/src/main/resources/images/connection/tor.png
new file mode 100644
index 0000000000000000000000000000000000000000..0038aa52d5a316ce41a39f8c9c0b95133fd1ec73
GIT binary patch
literal 1181
zcmV;O1Y-M%P)<h;3K|Lk000e1NJLTq000mG000;W1^@s6^PqhU0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$KS@MERCwBqRBcRKWfXqy?QL(rDP^Ul
zwdJFbf!m^EY*COgMU5o-!yhJUq9n$TM1L$s6Lg77W;FgInF+y7BhD-fi-?(V%ffVv
zMnN{%U<I~GO9w5KQVMPD=e_NHeOoqVH5kv$xygOcd7k&2bI&;(Hc9ts2F_gsi44Hp
zIg<!b$^!-^gZU_9GcrWavA7Y+=B)%QiX;zY$h`_uuvGE{9SJaEL}J@n5Jmo!Ek^V7
zrKYNsHdF;hCuNzPYjM0oJt}ep-88H}sjHCZ<?g|A1e}HeC)>C+C(;xorX`(a4oZMo
z!9vw&&ApfwnQN{91+)L8S`bGApwdukT7%Aa8SL55AQfST7zs}h3F{_FdP>ic%lW!w
zDPvkFBG@c@+JM8o%yu!&P7(rMr<b1NWMm+huM0(~=|$aL_;(TSi2Bx;`q}AG*<%V#
zj@N0V!?Fw+AV~^HQ6qIYe-aq{3R_F#gN;4ot}n=mGcD`8o6%~o2CC{dv}QY?(c!;E
zt5v@=>;8>=-+P{LC>`9&kKLL;)1*=}$TDF#^|j6Ps2cxMwy9M7@&5iEl1|+u7tWm|
zuk3w~)EFBksI8^gSyuG@%z*<BeK$C8ti7$R4b!eERMy%MSXqH1`LLx#Thi%^xa~P9
zJ3@Vv#RNwVz5nKCeSJL!i`9nlE2A)!>XAwcsM=}6?-!=<fN4MLH0@~gMLbW(GtnO@
zCVZFRU~lh7pLBH{LOATl&zF9I-C>2@UV%_>l~!Dh#iank?i@@dW;B?0o7}5YtqCF4
zpC{P++N&@09Qp8L?d<F|OioPWk=A{vpiy|-9x$u|sZ<)VL<|e#aVU8n8ifvJ>T=7(
z;&6=Rm5R4tf8%9KG&+x4H$CX+cpN2$5_sp_kjZ3NTU(<b6`h<Y(j*R+ks&RnP+isl
zM`_*j+>ZO}AFXxTadqrEnp>J6X4AMl>Oxhu9j0<4GJ=SBJV`+!GK3B@eF%MI3<rn7
zS<RN08+FNK2Ao_DqtSp%7l%<<Wv40FvFKl>eNV@ph!DjzQbH1&$4AZUm27BbEhLCp
z$Q5!52%xO23|5;RE5Rjry?zKnqOeswb3Wv95+!8*-W`cdEX9sry?)M1jdD(b`S~Cv
zFcy}9-xolAy%Uj041RwIKHoBUPF1kw)5y|gv9LZnn{VZ#M?XF8vE4^QUi4wkyHKFd
z2m*Avd><s}uMI&+Nzf@u=`xa_l&j%hb%FN7*Li|J&YT(gpzq65sBt<mGI9mM<shYC
z5sk)Z*gzl{gb-m-uC1U^D6tY>!r7TqLlk@LZX-?obn#a&4X?e*QNhpOUO;V~6CRHj
zGdJ8g{ml=k%r(Jbti{CAFutAq{Oo!v)Jbu%;*C^iHg9{&Vlh2wvzl$9m{m@?W>_|%
v&F-@93r`2fTuag0C#c^5)xu)`OMn3YUS7l;*(Mp<00000NkvXXu0mjfA&w*?

literal 0
HcmV?d00001

diff --git a/gui/src/main/resources/images/connection/tor@2x.png b/gui/src/main/resources/images/connection/tor@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f2924adc061abc73f8e14a3a31a8dfeef2428c3
GIT binary patch
literal 3331
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
N002ovPDHLkV1o8?Od9|I

literal 0
HcmV?d00001

diff --git a/network/src/main/java/io/bitsquare/p2p/peers/AuthenticationHandshake.java b/network/src/main/java/io/bitsquare/p2p/peers/AuthenticationHandshake.java
index aacf7ba6bd..560953c9bc 100644
--- a/network/src/main/java/io/bitsquare/p2p/peers/AuthenticationHandshake.java
+++ b/network/src/main/java/io/bitsquare/p2p/peers/AuthenticationHandshake.java
@@ -21,13 +21,13 @@ import java.util.*;
 
 
 // authentication example: 
-// node2 -> node1 RequestAuthenticationMessage
+// node2 -> node1 AuthenticationRequest
 // node1: close connection
-// node1 -> node2 ChallengeMessage on new connection
+// node1 -> node2 AuthenticationResponse on new connection
 // node2: authentication to node1 done if nonce ok
-// node2 -> node1 GetPeersMessage
+// node2 -> node1 GetPeersAuthRequest
 // node1: authentication to node2 done if nonce ok
-// node1 -> node2 PeersMessage
+// node1 -> node2 GetPeersAuthResponse
 
 public class AuthenticationHandshake implements MessageListener {
     private static final Logger log = LoggerFactory.getLogger(AuthenticationHandshake.class);
@@ -77,12 +77,12 @@ public class AuthenticationHandshake implements MessageListener {
                     Futures.addCallback(future, new FutureCallback<Connection>() {
                         @Override
                         public void onSuccess(Connection connection) {
-                            log.trace("GetPeersMessage sent successfully from " + myAddress + " to " + peerAddress);
+                            log.trace("GetPeersAuthRequest sent successfully from " + myAddress + " to " + peerAddress);
                         }
 
                         @Override
                         public void onFailure(@NotNull Throwable throwable) {
-                            log.info("GetPeersMessage sending failed " + throwable.getMessage());
+                            log.info("GetPeersAuthRequest sending failed " + throwable.getMessage());
                             onFault(throwable);
                         }
                     });
@@ -104,17 +104,17 @@ public class AuthenticationHandshake implements MessageListener {
 
                     SettableFuture<Connection> future = networkNode.sendMessage(peerAddress,
                             new GetPeersAuthResponse(myAddress, new HashSet<>(peerGroup.getAllPeerAddresses())));
-                    log.trace("sent PeersMessage to " + peerAddress + " from " + myAddress
+                    log.trace("sent GetPeersAuthResponse to " + peerAddress + " from " + myAddress
                             + " with allPeers=" + peerGroup.getAllPeerAddresses());
                     Futures.addCallback(future, new FutureCallback<Connection>() {
                         @Override
                         public void onSuccess(Connection connection) {
-                            log.trace("PeersMessage sent successfully from " + myAddress + " to " + peerAddress);
+                            log.trace("GetPeersAuthResponse sent successfully from " + myAddress + " to " + peerAddress);
                         }
 
                         @Override
                         public void onFailure(@NotNull Throwable throwable) {
-                            log.info("PeersMessage sending failed " + throwable.getMessage());
+                            log.info("GetPeersAuthResponse sending failed " + throwable.getMessage());
                             onFault(throwable);
                         }
                     });
@@ -132,16 +132,16 @@ public class AuthenticationHandshake implements MessageListener {
                 // Requesting peer
                 GetPeersAuthResponse getPeersAuthResponse = (GetPeersAuthResponse) message;
                 Address peerAddress = getPeersAuthResponse.address;
-                log.trace("PeersMessage from " + peerAddress + " at " + myAddress);
+                log.trace("GetPeersAuthResponse from " + peerAddress + " at " + myAddress);
                 HashSet<Address> peerAddresses = getPeersAuthResponse.peerAddresses;
                 log.trace("Received peers: " + peerAddresses);
                 peerGroup.addToReportedPeers(peerAddresses, connection);
 
                 // we wait until the handshake is completed before setting the authenticate flag
                 // authentication at both sides of the connection
-                log.info("\n\nAuthenticationComplete\nPeer with address " + peerAddress
+                log.info("AuthenticationComplete: Peer with address " + peerAddress
                         + " authenticated (" + connection.objectId + "). Took "
-                        + (System.currentTimeMillis() - startAuthTs) + " ms. \n\n");
+                        + (System.currentTimeMillis() - startAuthTs) + " ms.");
 
                 onSuccess(connection);
             }
@@ -176,7 +176,7 @@ public class AuthenticationHandshake implements MessageListener {
     }
 
     public SettableFuture<Connection> requestAuthentication(Set<Address> remainingAddresses, Address peerAddress) {
-        Log.traceCall();
+        Log.traceCall(peerAddress.getFullAddress());
         // Requesting peer
         resultFuture = SettableFuture.create();
         startAuthTs = System.currentTimeMillis();
@@ -193,8 +193,9 @@ public class AuthenticationHandshake implements MessageListener {
                 log.info("Send RequestAuthenticationMessage to " + peerAddress + " failed." +
                         "\nThat is expected if seed nodes are offline." +
                         "\nException:" + throwable.getMessage());
-                log.trace("We try to authenticate to another random seed nodes of that list: " + remainingAddresses);
-                authenticateToNextRandomPeer(remainingAddresses);
+                onFault(throwable);
+                // log.trace("We try to authenticate to another random seed nodes of that list: " + remainingAddresses);
+                // authenticateToNextRandomPeer(remainingAddresses);
             }
         });
 
@@ -267,7 +268,7 @@ public class AuthenticationHandshake implements MessageListener {
     // Private
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void authenticateToNextRandomPeer(Set<Address> remainingAddresses) {
+  /*  private void authenticateToNextRandomPeer(Set<Address> remainingAddresses) {
         Log.traceCall();
         Optional<Tuple2<Address, Set<Address>>> tupleOptional = getRandomAddressAndRemainingSet(remainingAddresses);
         if (tupleOptional.isPresent()) {
@@ -277,7 +278,7 @@ public class AuthenticationHandshake implements MessageListener {
             log.info("No other seed node found. That is expected for the first seed node.");
             onSuccess(null);
         }
-    }
+    }*/
 
     private Optional<Tuple2<Address, Set<Address>>> getRandomAddressAndRemainingSet(Set<Address> addresses) {
         Log.traceCall();
diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationRequest.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationRequest.java
index 26e8e419c3..d0b01505e0 100644
--- a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationRequest.java
+++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationRequest.java
@@ -17,7 +17,7 @@ public final class AuthenticationRequest implements AuthenticationMessage {
 
     @Override
     public String toString() {
-        return "RequestAuthenticationMessage{" +
+        return "AuthenticationRequest{" +
                 "address=" + address +
                 ", nonce=" + nonce +
                 '}';
diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationResponse.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationResponse.java
index 5e22c5bcf1..b7fb3bc940 100644
--- a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationResponse.java
+++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationResponse.java
@@ -19,7 +19,7 @@ public final class AuthenticationResponse implements AuthenticationMessage {
 
     @Override
     public String toString() {
-        return "ChallengeMessage{" +
+        return "AuthenticationResponse{" +
                 "address=" + address +
                 ", requesterNonce=" + requesterNonce +
                 ", challengerNonce=" + challengerNonce +
diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/GetPeersAuthRequest.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/GetPeersAuthRequest.java
index cfbeb6dc67..8319b784ee 100644
--- a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/GetPeersAuthRequest.java
+++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/GetPeersAuthRequest.java
@@ -21,7 +21,7 @@ public final class GetPeersAuthRequest implements AuthenticationMessage {
 
     @Override
     public String toString() {
-        return "GetPeersMessage{" +
+        return "GetPeersAuthRequest{" +
                 "address=" + address +
                 ", challengerNonce=" + challengerNonce +
                 ", peerAddresses=" + peerAddresses +
diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/GetPeersAuthResponse.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/GetPeersAuthResponse.java
index 6334e054a3..d78293e2d5 100644
--- a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/GetPeersAuthResponse.java
+++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/GetPeersAuthResponse.java
@@ -19,7 +19,7 @@ public final class GetPeersAuthResponse implements AuthenticationMessage {
 
     @Override
     public String toString() {
-        return "PeersMessage{" + "peerAddresses=" + peerAddresses + '}';
+        return "GetPeersAuthResponse{" + "peerAddresses=" + peerAddresses + '}';
     }
 
 }
diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/maintenance/GetPeersRequest.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/maintenance/GetPeersRequest.java
index 87d115af1f..dae81b8ee3 100644
--- a/network/src/main/java/io/bitsquare/p2p/peers/messages/maintenance/GetPeersRequest.java
+++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/maintenance/GetPeersRequest.java
@@ -19,7 +19,7 @@ public final class GetPeersRequest implements MaintenanceMessage {
 
     @Override
     public String toString() {
-        return "GetPeersMessage{" +
+        return "GetPeersRequest{" +
                 "address=" + address +
                 ", peerAddresses=" + peerAddresses +
                 '}';
diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/maintenance/GetPeersResponse.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/maintenance/GetPeersResponse.java
index 7dc0c91e49..8fce6a6fda 100644
--- a/network/src/main/java/io/bitsquare/p2p/peers/messages/maintenance/GetPeersResponse.java
+++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/maintenance/GetPeersResponse.java
@@ -17,7 +17,7 @@ public final class GetPeersResponse implements MaintenanceMessage {
 
     @Override
     public String toString() {
-        return "GetPeersMessage{" +
+        return "GetPeersResponse{" +
                 ", peerAddresses=" + peerAddresses +
                 '}';
     }